From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Kees Cook <keescook@chromium.org>
Cc: Bart Van Assche <bvanassche@acm.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the mm tree with the kspp tree
Date: Tue, 30 Aug 2022 17:00:51 +1000 [thread overview]
Message-ID: <20220830170051.6c190838@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 837 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-08-30 7:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 7:00 Stephen Rothwell [this message]
2022-08-31 17:51 ` linux-next: manual merge of the mm tree with the kspp tree Kees Cook
2022-08-31 22:05 ` Stephen Rothwell
2022-08-31 22:24 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220830170051.6c190838@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=bvanassche@acm.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox