Skip to contentSkip to conversation

linux-next: manual merge of the mm tree with the kspp tree

DISCUSSION Stephen Rothwell 2 participants 4 messages Aug 30, 2022 – Aug 31, 2022 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi all,

Today's linux-next merge of the mm tree got a conflict in:

lib/Makefile

between commit:

5e3ad11bfc5a ("testing/selftests: Add tests for the is_signed_type() macro")

from the kspp tree and commit:

7a2791666971 ("testing/selftests: add tests for the is_signed_type() macro")

from the mm tree.

I fixed it up (I dropped the latter commit by using the former version of this file and deleting lib/is_signed_type_test.c) 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.

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw
Quoted 16 lines · Stephen Rothwell

Hi all,

Today's linux-next merge of the mm tree got a conflict in:

lib/Makefile

between commit:

5e3ad11bfc5a ("testing/selftests: Add tests for the is_signed_type() macro")

from the kspp tree and commit:

7a2791666971 ("testing/selftests: add tests for the is_signed_type() macro")

from the mm tree.

Quoted 7 lines

I fixed it up (I dropped the latter commit by using the former version of this file and deleting lib/is_signed_type_test.c) 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.

Thanks! Andrew, can you drop these patches from -mm please? I corrected the filename convention in the above named patch.

Signature · 1 line
Kees Cook
#2 lore raw

Hi Kees,

Quoted 3 lines · On Wed, 31 Aug 2022 10:51:08 -0700 Kees Cook <[email protected]> wrote:

Thanks! Andrew, can you drop these patches from -mm please? I corrected the filename convention in the above named patch.

He did that yesterday, so all good.

Signature · 2 lines
Cheers,
Stephen Rothwell
#3 lore raw
Quoted 8 lines · Stephen Rothwell

Hi Kees,

Quoted 3 lines · On Wed, 31 Aug 2022 10:51:08 -0700 Kees Cook <[email protected]> wrote:

Thanks! Andrew, can you drop these patches from -mm please? I corrected the filename convention in the above named patch.

He did that yesterday, so all good.

Thanks! Yeah, I saw the drop right after I sent my email. :) Sorry for the noise!

Signature · 1 line
Kees Cook