Messages in this thread | | | Date | Thu, 1 Oct 2020 16:34:43 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the vfs tree |
| |
Hi all,
Today's linux-next merge of the tip tree got conflicts in:
arch/ia64/Kconfig arch/s390/Kconfig
between commit:
5e6e9852d6f7 ("uaccess: add infrastructure for kernel builds with set_fs()")
from the vfs tree and commit:
077ee78e3928 ("PCI/MSI: Make arch_.*_msi_irq[s] fallbacks selectable") 981aa1d366bf ("PCI: MSI: Fix Kconfig dependencies for PCI_MSI_ARCH_FALLBACKS")
from the tip 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 arch/ia64/Kconfig index 3414e67229b3,9d0f1e13c918..000000000000 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@@ -55,7 -56,7 +55,8 @@@ config IA6 select NEED_DMA_MAP_STATE select NEED_SG_DMA_LENGTH select NUMA if !FLATMEM + select PCI_MSI_ARCH_FALLBACKS if PCI_MSI + select SET_FS default y help The Itanium Processor Family is Intel's 64-bit successor to diff --cc arch/s390/Kconfig index dde501bc6304,0a3899386a51..000000000000 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@@ -190,7 -185,7 +190,8 @@@ config S39 select OLD_SIGSUSPEND3 select PCI_DOMAINS if PCI select PCI_MSI if PCI + select PCI_MSI_ARCH_FALLBACKS if PCI_MSI + select SET_FS select SPARSE_IRQ select SYSCTL_EXCEPTION_TRACE select THREAD_INFO_IN_TASK [unhandled content-type:application/pgp-signature] | |