Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

Excerpts from Stephen Rothwell's message of June 18, 2021 7:44 pm: > Hi all, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > arch/powerpc/kernel/smp.c > > between commit: > > 86f46f343272 ("powerpc/32s: Initialise KUAP and KUEP in C") > > from the powerpc tree

linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/kernel/smp.c between commit: 86f46f343272 ("powerpc/32s: Initialise KUAP and KUEP in C") from the powerpc tree and commit: 103e676c91d0 ("lazy tlb: introduce lazy mm refcount helper functions")

Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, On Wed, 5 May 2021 11:39:59 +1000 Stephen Rothwell 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") > >

Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi Michael, On Wed, 05 May 2021 14:57:18 +1000 Michael Ellerman 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

Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

Stephen Rothwell 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: > >

linux-next: manual merge of the akpm-current tree with the powerpc tree

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

Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

Le 15/04/2021 à 12:08, Christophe Leroy a écrit : Le 15/04/2021 à 12:07, Christophe Leroy a écrit : Le 15/04/2021 à 11:58, Stephen Rothwell a écrit : Hi all, On Thu, 15 Apr 2021 19:44:17 +1000 Stephen Rothwell wrote: Today's linux-next merge of the akpm-current tree got a conflict

Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

Le 15/04/2021 à 12:07, Christophe Leroy a écrit : Le 15/04/2021 à 11:58, Stephen Rothwell a écrit : Hi all, On Thu, 15 Apr 2021 19:44:17 +1000 Stephen Rothwell wrote: Today's linux-next merge of the akpm-current tree got a conflict in:    arch/powerpc/kernel/module.c between commit:

Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

Le 15/04/2021 à 11:58, Stephen Rothwell a écrit : Hi all, On Thu, 15 Apr 2021 19:44:17 +1000 Stephen Rothwell wrote: Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/kernel/module.c between commit: 2ec13df16704 ("powerpc/modules: Load modules

Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, On Thu, 15 Apr 2021 19:44:17 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > arch/powerpc/kernel/module.c > > between commit: > > 2ec13df16704 ("powerpc/modules: Load modules closer to kernel text") > > from the powerpc

linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/kernel/module.c between commit: 2ec13df16704 ("powerpc/modules: Load modules closer to kernel text") from the powerpc tree and commit: 4930ba789f8d ("powerpc/64s/radix: enable huge vmalloc

Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, On Tue, 8 Dec 2020 20:40:16 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got conflicts in: > > drivers/misc/lkdtm/Makefile > drivers/misc/lkdtm/lkdtm.h > tools/testing/selftests/lkdtm/tests.txt > > between commit: > > 3ba150fb2120

linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, Today's linux-next merge of the akpm-current tree got conflicts in: drivers/misc/lkdtm/Makefile drivers/misc/lkdtm/lkdtm.h tools/testing/selftests/lkdtm/tests.txt between commit: 3ba150fb2120 ("lkdtm/powerpc: Add SLB multihit test") from the powerpc tree and commit:

linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/mm/kasan/kasan_init_32.c between commit: 4c42dc5c69a8 ("powerpc/kasan: Fix CONFIG_KASAN_VMALLOC for 8xx") from the powerpc tree and commit: 76713c119a9d ("arch, drivers: replace for_each_membock()

linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/mm/ptdump/ptdump.c between commit: 6b789a26d7da ("powerpc/ptdump: Handle hugepd at PGD level") from the powerpc tree and patch: "powerpc: add support for folded p4d page tables" from the

linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/include/asm/pgtable.h between commit: d6eacedd1f0e ("powerpc/book3s: Use config independent helpers for page table walk") from the powerpc tree and commit: be66a174b253 ("mm/nvdimm: add

linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/mm/mem.c between commit: f172acbfae1a ("powerpc/mm: move warning from resize_hpt_for_hotplug()") 26ad26718dfa ("powerpc/mm: Fix section mismatch warning") from the powerpc tree and commit:

Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, On Mon, 25 Feb 2019 17:42:48 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: This was actually the akpm tree. -- Cheers, Stephen Rothwell pgp1M_ZXESUtL.pgp Description: OpenPGP digital signature

linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/kernel/irq.c between commit: c8e409a33cf8 ("powerpc/irq: use memblock functions returning virtual address") and other patches in the powerpc tree from the powerpc tree and patch: "powerpc: use

linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/kernel/setup_64.c between commits: c8e409a33cf8 ("powerpc/irq: use memblock functions returning virtual address") d608898abc74 ("powerpc: clean stack pointers naming") from the powerpc tree and

Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

On Thu, Dec 06, 2018 at 05:44:17PM +1100, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got conflicts in: > > arch/powerpc/include/asm/book3s/32/pgalloc.h > arch/powerpc/include/asm/nohash/32/pgalloc.h > arch/powerpc/mm/pgtable-book3s64.c > >

linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got conflicts in: arch/powerpc/include/asm/book3s/32/pgalloc.h arch/powerpc/include/asm/nohash/32/pgalloc.h arch/powerpc/mm/pgtable-book3s64.c between commits: a95d133c8643 ("powerpc/mm: Move pte_fragment_alloc() to a common

linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: mm/huge_memory.c between commit: ff20c2e0acc5 ("mm: Some arch may want to use HPAGE_PMD related values as variables") from the powerpc tree and commit: 82fdbe051e29 ("mm: make optimistic check for swapin

Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi all, On Fri, 18 Dec 2015 16:33:51 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > arch/powerpc/include/asm/pgtable.h > > between commit: > > ee4889c7bc2a ("powerpc/mm: Don't have generic headers

linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/include/asm/pgtable.h between commit: ee4889c7bc2a ("powerpc/mm: Don't have generic headers introduce functions touching pte bits") from the powerpc tree and commit: e0e8474c0d55 ("mm, dax,

Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

Stephen Rothwell writes: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got conflicts in: > > arch/powerpc/include/asm/nohash/64/pgtable.h > arch/powerpc/mm/pgtable_64.c > > between various commits from the powerpc tree and commits: > >

Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi Andrew, On Tue, 15 Dec 2015 16:53:42 +1100 Stephen Rothwell wrote: > > diff --git a/arch/powerpc/include/asm/book3s/64/hash.h > b/arch/powerpc/include/asm/book3s/64/hash.h > index 8b929e531758..4e69d9a273ed 100644 > --- a/arch/powerpc/include/asm/book3s/64/hash.h >

linux-next: manual merge of the akpm-current tree with the powerpc tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got conflicts in: arch/powerpc/include/asm/nohash/64/pgtable.h arch/powerpc/mm/pgtable_64.c between various commits from the powerpc tree and commits: e56ebae0dd4c ("powerpc, thp: remove infrastructure for handling splitting