Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/Kconfig
between commit:
c0c3319917db ("mm: remove devmap related functions and page table bits")
from the mm-unstable branch of the mm tree and commit:
00199ed6f2ca ("powerpc: Add preempt lazy support")
Stephen Rothwell writes:
> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/powerpc/mm/nohash/Makefile
>
...
> diff --cc arch/powerpc/mm/nohash/Makefile
> index 90e846f0c46c,86d0fe434824..
> --- a/arch/powerpc/mm/nohash/Makefile
> +++ b/arch/powerp
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/mm/nohash/Makefile
between commit:
9e49846e4d65 ("powerpc/64e: split out nohash Book3E 64-bit code")
from the mm-unstable branch of the mm tree and commit:
732b32daef80 ("powerpc: Remove core support fo
