| Message ID | 20210505113959.43340f19@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: manual merge of the akpm-current tree with the powerpc tree | expand |
| Related | show |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/merge (7619d98e5041d5c25aba5428704dba6121237a9a) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/next (c6b05f4e233cc666f003e9fe68b2f765952875a9) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch linus/master (d665ea6ea86c785760ee4bad4543dab3267ad074) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/fixes (791f9e36599d94af5a76d3f74d04e16326761aae) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch linux-next (5e321ded302da4d8c5d5dd953423d9b748ab3775) |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
Stephen Rothwell <sfr@canb.auug.org.au> writes: > Hi all, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > arch/powerpc/Kconfig > > between commit: > > c6b05f4e233c ("powerpc/kconfig: Restore alphabetic order of the selects under CONFIG_PPC") > > from the powerpc tree and commits: > > fd7d5c273c43 ("mm: generalize HUGETLB_PAGE_SIZE_VARIABLE") > 301ba77ae03c ("mm: generalize ARCH_ENABLE_MEMORY_[HOTPLUG|HOTREMOVE]") > > from the akpm-current 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. Urgh, I did check linux-next to see if that patch would conflict but didn't think it would conflict *that* badly. I guess I'll leave it for now, but I can drop it if necessary. cheers > diff --cc arch/powerpc/Kconfig > index ab17a56c3d10,d4333049b813..000000000000 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@@ -118,11 -118,10 +118,13 @@@ config PP > # Please keep this list sorted alphabetically. > # > select ARCH_32BIT_OFF_T if PPC32 > + select ARCH_ENABLE_MEMORY_HOTPLUG > + select ARCH_ENABLE_MEMORY_HOTREMOVE > + select ARCH_HAS_COPY_MC if PPC64 > select ARCH_HAS_DEBUG_VIRTUAL > + select ARCH_HAS_DEBUG_VM_PGTABLE > select ARCH_HAS_DEVMEM_IS_ALLOWED > + select ARCH_HAS_DMA_MAP_DIRECT if PPC_PSERIES > select ARCH_HAS_ELF_RANDOMIZE > select ARCH_HAS_FORTIFY_SOURCE > select ARCH_HAS_GCOV_PROFILE_ALL > @@@ -163,8 -162,9 +165,8 @@@ > select BUILDTIME_TABLE_SORT > select CLONE_BACKWARDS > select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN > - select DMA_OPS_BYPASS if PPC64 > select DMA_OPS if PPC64 > + select DMA_OPS_BYPASS if PPC64 > - select ARCH_HAS_DMA_MAP_DIRECT if PPC64 && PPC_PSERIES > select DYNAMIC_FTRACE if FUNCTION_TRACER > select EDAC_ATOMIC_SCRUB > select EDAC_SUPPORT > @@@ -182,15 -181,12 +184,15 @@@ > select GENERIC_STRNCPY_FROM_USER > select GENERIC_STRNLEN_USER > select GENERIC_TIME_VSYSCALL > - select GENERIC_GETTIMEOFDAY > + select GENERIC_VDSO_TIME_NS > select HAVE_ARCH_AUDITSYSCALL > - select HAVE_ARCH_HUGE_VMAP if PPC_BOOK3S_64 && PPC_RADIX_MMU > + select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP > + select HAVE_ARCH_HUGE_VMAP if PPC_BOOK3S_64 && PPC_RADIX_MMU > select HAVE_ARCH_JUMP_LABEL > + select HAVE_ARCH_JUMP_LABEL_RELATIVE > select HAVE_ARCH_KASAN if PPC32 && PPC_PAGE_SHIFT <= 14 > select HAVE_ARCH_KASAN_VMALLOC if PPC32 && PPC_PAGE_SHIFT <= 14 > + select HAVE_ARCH_KFENCE if PPC32 > select HAVE_ARCH_KGDB > select HAVE_ARCH_MMAP_RND_BITS > select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT > @@@ -231,19 -227,23 +233,20 @@@ > select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS > select HAVE_MOD_ARCH_SPECIFIC > select HAVE_NMI if PERF_EVENTS || (PPC64 && PPC_BOOK3S) > - select HAVE_HARDLOCKUP_DETECTOR_ARCH if (PPC64 && PPC_BOOK3S) > - select HAVE_OPTPROBES if PPC64 > + select HAVE_OPTPROBES > select HAVE_PERF_EVENTS > select HAVE_PERF_EVENTS_NMI if PPC64 > - select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH > select HAVE_PERF_REGS > select HAVE_PERF_USER_STACK_DUMP > - select HUGETLB_PAGE_SIZE_VARIABLE if PPC_BOOK3S_64 && HUGETLB_PAGE > - select MMU_GATHER_RCU_TABLE_FREE > - select MMU_GATHER_PAGE_SIZE > select HAVE_REGS_AND_STACK_ACCESS_API > - select HAVE_RELIABLE_STACKTRACE if PPC_BOOK3S_64 && CPU_LITTLE_ENDIAN > + select HAVE_RELIABLE_STACKTRACE > + select HAVE_RSEQ > select HAVE_SOFTIRQ_ON_OWN_STACK > + select HAVE_STACKPROTECTOR if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2) > + select HAVE_STACKPROTECTOR if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13) > select HAVE_SYSCALL_TRACEPOINTS > select HAVE_VIRT_CPU_ACCOUNTING > - select HAVE_IRQ_TIME_ACCOUNTING > - select HAVE_RSEQ > ++ select HUGETLB_PAGE_SIZE_VARIABLE if PPC_BOOK3S_64 && HUGETLB_PAGE > select IOMMU_HELPER if PPC64 > select IRQ_DOMAIN > select IRQ_FORCED_THREADING
Hi Michael, On Wed, 05 May 2021 14:57:18 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote: > > Urgh, I did check linux-next to see if that patch would conflict but > didn't think it would conflict *that* badly. Its not as bad as it looks, the akpm-current patches just added three selects and just need to be put in the proper place.
Hi all, On Wed, 5 May 2021 11:39:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > arch/powerpc/Kconfig > > between commit: > > c6b05f4e233c ("powerpc/kconfig: Restore alphabetic order of the selects under CONFIG_PPC") > > from the powerpc tree and commits: > > fd7d5c273c43 ("mm: generalize HUGETLB_PAGE_SIZE_VARIABLE") > 301ba77ae03c ("mm: generalize ARCH_ENABLE_MEMORY_[HOTPLUG|HOTREMOVE]") > > from the akpm-current 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/powerpc/Kconfig > index ab17a56c3d10,d4333049b813..000000000000 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@@ -118,11 -118,10 +118,13 @@@ config PP > # Please keep this list sorted alphabetically. > # > select ARCH_32BIT_OFF_T if PPC32 > + select ARCH_ENABLE_MEMORY_HOTPLUG > + select ARCH_ENABLE_MEMORY_HOTREMOVE > + select ARCH_HAS_COPY_MC if PPC64 > select ARCH_HAS_DEBUG_VIRTUAL > + select ARCH_HAS_DEBUG_VM_PGTABLE > select ARCH_HAS_DEVMEM_IS_ALLOWED > + select ARCH_HAS_DMA_MAP_DIRECT if PPC_PSERIES > select ARCH_HAS_ELF_RANDOMIZE > select ARCH_HAS_FORTIFY_SOURCE > select ARCH_HAS_GCOV_PROFILE_ALL > @@@ -163,8 -162,9 +165,8 @@@ > select BUILDTIME_TABLE_SORT > select CLONE_BACKWARDS > select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN > - select DMA_OPS_BYPASS if PPC64 > select DMA_OPS if PPC64 > + select DMA_OPS_BYPASS if PPC64 > - select ARCH_HAS_DMA_MAP_DIRECT if PPC64 && PPC_PSERIES > select DYNAMIC_FTRACE if FUNCTION_TRACER > select EDAC_ATOMIC_SCRUB > select EDAC_SUPPORT > @@@ -182,15 -181,12 +184,15 @@@ > select GENERIC_STRNCPY_FROM_USER > select GENERIC_STRNLEN_USER > select GENERIC_TIME_VSYSCALL > - select GENERIC_GETTIMEOFDAY > + select GENERIC_VDSO_TIME_NS > select HAVE_ARCH_AUDITSYSCALL > - select HAVE_ARCH_HUGE_VMAP if PPC_BOOK3S_64 && PPC_RADIX_MMU > + select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP > + select HAVE_ARCH_HUGE_VMAP if PPC_BOOK3S_64 && PPC_RADIX_MMU > select HAVE_ARCH_JUMP_LABEL > + select HAVE_ARCH_JUMP_LABEL_RELATIVE > select HAVE_ARCH_KASAN if PPC32 && PPC_PAGE_SHIFT <= 14 > select HAVE_ARCH_KASAN_VMALLOC if PPC32 && PPC_PAGE_SHIFT <= 14 > + select HAVE_ARCH_KFENCE if PPC32 > select HAVE_ARCH_KGDB > select HAVE_ARCH_MMAP_RND_BITS > select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT > @@@ -231,19 -227,23 +233,20 @@@ > select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS > select HAVE_MOD_ARCH_SPECIFIC > select HAVE_NMI if PERF_EVENTS || (PPC64 && PPC_BOOK3S) > - select HAVE_HARDLOCKUP_DETECTOR_ARCH if (PPC64 && PPC_BOOK3S) > - select HAVE_OPTPROBES if PPC64 > + select HAVE_OPTPROBES > select HAVE_PERF_EVENTS > select HAVE_PERF_EVENTS_NMI if PPC64 > - select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH > select HAVE_PERF_REGS > select HAVE_PERF_USER_STACK_DUMP > - select HUGETLB_PAGE_SIZE_VARIABLE if PPC_BOOK3S_64 && HUGETLB_PAGE > - select MMU_GATHER_RCU_TABLE_FREE > - select MMU_GATHER_PAGE_SIZE > select HAVE_REGS_AND_STACK_ACCESS_API > - select HAVE_RELIABLE_STACKTRACE if PPC_BOOK3S_64 && CPU_LITTLE_ENDIAN > + select HAVE_RELIABLE_STACKTRACE > + select HAVE_RSEQ > select HAVE_SOFTIRQ_ON_OWN_STACK > + select HAVE_STACKPROTECTOR if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2) > + select HAVE_STACKPROTECTOR if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13) > select HAVE_SYSCALL_TRACEPOINTS > select HAVE_VIRT_CPU_ACCOUNTING > - select HAVE_IRQ_TIME_ACCOUNTING > - select HAVE_RSEQ > ++ select HUGETLB_PAGE_SIZE_VARIABLE if PPC_BOOK3S_64 && HUGETLB_PAGE > select IOMMU_HELPER if PPC64 > select IRQ_DOMAIN > select IRQ_FORCED_THREADING This is now a conflict between the powerpc tree and Linus' tree.
diff --cc arch/powerpc/Kconfig index ab17a56c3d10,d4333049b813..000000000000 --- a/arch/powerpc/Kconfig
Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/Kconfig between commit: c6b05f4e233c ("powerpc/kconfig: Restore alphabetic order of the selects under CONFIG_PPC") from the powerpc tree and commits: fd7d5c273c43 ("mm: generalize HUGETLB_PAGE_SIZE_VARIABLE") 301ba77ae03c ("mm: generalize ARCH_ENABLE_MEMORY_[HOTPLUG|HOTREMOVE]") from the akpm-current 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.