Re: linux-next: fix ups for clashes between akpm and powerpc trees

Stephen Rothwell writes: > Hi all, > > On Thu, 4 Jun 2020 16:52:46 +1000 Stephen Rothwell > wrote: >> >> diff --git a/arch/powerpc/mm/kasan/8xx.c b/arch/powerpc/mm/kasan/8xx.c >> index db4ef44af22f..569d98a41881 100644 >> --- a/arch/powerpc/mm/kasan/8xx.c >> +++ b/arch/powerpc/mm/kasan/8xx.c >>

Re: linux-next: fix ups for clashes between akpm and powerpc trees

Stephen Rothwell writes: > Hi all, > > On Thu, 4 Jun 2020 16:52:46 +1000 Stephen Rothwell > wrote: >> >> diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h >> b/arch/powerpc/include/asm/book3s/64/pgtable.h >> index 25c3cb8272c0..a6799723cd98 100644 >> --- a/arch/powerpc/include/asm/book3

Re: linux-next: fix ups for clashes between akpm and powerpc trees

Hi all, On Thu, 4 Jun 2020 17:49:25 +1000 Stephen Rothwell wrote: > > diff --cc arch/powerpc/include/asm/nohash/32/pgtable.h > index 639f3b3713ec,eb8538c85077..1927e1b653f2 > --- a/arch/powerpc/include/asm/nohash/32/pgtable.h > +++ b/arch/powerpc/include/asm/nohash/32/pgtable.h > @@@ -342,15 -33

Re: linux-next: fix ups for clashes between akpm and powerpc trees

Hi all, On Thu, 4 Jun 2020 17:49:25 +1000 Stephen Rothwell wrote: > > diff --cc arch/powerpc/include/asm/nohash/32/pgtable.h > index 639f3b3713ec,eb8538c85077..1927e1b653f2 > --- a/arch/powerpc/include/asm/nohash/32/pgtable.h > +++ b/arch/powerpc/include/asm/nohash/32/pgtable.h > @@@ -204,13 -20

Re: linux-next: fix ups for clashes between akpm and powerpc trees

Hi all, On Thu, 4 Jun 2020 16:52:46 +1000 Stephen Rothwell wrote: > > diff --git a/arch/powerpc/mm/kasan/8xx.c b/arch/powerpc/mm/kasan/8xx.c > index db4ef44af22f..569d98a41881 100644 > --- a/arch/powerpc/mm/kasan/8xx.c > +++ b/arch/powerpc/mm/kasan/8xx.c > @@ -10,7 +10,7 @@ > static int __init

Re: linux-next: fix ups for clashes between akpm and powerpc trees

Hi all, On Thu, 4 Jun 2020 16:52:46 +1000 Stephen Rothwell wrote: > > diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h > b/arch/powerpc/include/asm/book3s/64/pgtable.h > index 25c3cb8272c0..a6799723cd98 100644 > --- a/arch/powerpc/include/asm/book3s/64/pgtable.h > +++ b/arch/powerpc/in

Re: linux-next: fix ups for clashes between akpm and powerpc trees

Hi all, On Thu, 4 Jun 2020 16:52:46 +1000 Stephen Rothwell wrote: > > diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h > b/arch/powerpc/include/asm/nohash/32/pgtable.h > index c188a6f64bcd..1927e1b653f2 100644 > --- a/arch/powerpc/include/asm/nohash/32/pgtable.h > +++ b/arch/powerpc/in

Re: linux-next: fix ups for clashes between akpm and powerpc trees

Hi all, On Wed, 3 Jun 2020 20:26:55 +1000 Stephen Rothwell wrote: > > Some things turned up in the powerpc tree today that required some changes > to patches in the akpm tree and also the following fixup patch provided > (mostly) by Michael. I have applied this as a single patch today, but > par