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
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")
>
> fr
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
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:
>
>
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 i
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:
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 clos
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
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 ("lkdtm
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
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
>
> be
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 introduce functions
> touching
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:
>
> e56ebae0dd4c ("powerpc, thp: remov
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
> +++ b/arch/powerpc/include
14 matches
Mail list logo
