From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752102AbdKIFx1 (ORCPT ); Thu, 9 Nov 2017 00:53:27 -0500 Received: from ozlabs.org ([103.22.144.67]:59313 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751190AbdKIFx0 (ORCPT ); Thu, 9 Nov 2017 00:53:26 -0500 Date: Thu, 9 Nov 2017 16:53:24 +1100 From: Stephen Rothwell To: Andrew Morton , Bjorn Helgaas Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Randy Dunlap Subject: linux-next: manual merge of the akpm tree with the pci tree Message-ID: <20171109165324.51eafb68@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in: init/Kconfig between commit: 03ea2263c2ef ("PCI: Move PCI_QUIRKS to the PCI bus menu") from the pci tree and patch: "EXPERT Kconfig menu: fix broken EXPERT menu" from the akpm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc init/Kconfig index 7d5a6fbac56a,a05d8938c016..000000000000 --- a/init/Kconfig +++ b/init/Kconfig @@@ -1378,14 -1308,15 +1308,6 @@@ config ADVISE_SYSCALL applications use these syscalls, you can disable this option to save space. - config USERFAULTFD - bool "Enable userfaultfd() system call" - select ANON_INODES - depends on MMU -config PCI_QUIRKS - default y - bool "Enable PCI quirk workarounds" if EXPERT - depends on PCI -- help - Enable the userfaultfd() system call that allows to intercept and - handle page faults in userland. - This enables workarounds for various PCI chipset - bugs/quirks. Disable this only if your target machine is - unaffected by PCI quirks. -- config MEMBARRIER bool "Enable membarrier() system call" if EXPERT default y