From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@chromium.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Thibaut Sautereau <thibaut.sautereau@ssi.gouv.fr>
Subject: linux-next: manual merge of the kspp tree with Linus' tree
Date: Fri, 9 Oct 2020 17:41:36 +1100 [thread overview]
Message-ID: <20201009174136.5ef09d00@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 792 bytes --]
Hi all,
Today's linux-next merge of the kspp tree got a conflict in:
lib/random32.c
between commit:
09a6b0bc3be7 ("random32: Restore __latent_entropy attribute on net_rand_state")
from Linus' tree and commit:
2ce6b0d4293b ("random32: Restore __latent_entropy attribute on net_rand_state")
from the kspp tree.
I fixed it up (I used Linus' version - just a white space difference)
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:[~2020-10-09 6:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 6:41 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 10:49 linux-next: manual merge of the kspp tree with Linus' tree Stephen Rothwell
2021-09-14 4:04 Stephen Rothwell
2021-06-11 6:17 Stephen Rothwell
2020-06-29 5:43 Stephen Rothwell
2020-04-08 2:00 Stephen Rothwell
2020-01-06 4:48 Stephen Rothwell
2017-02-08 1:41 Stephen Rothwell
2016-11-08 2:31 Stephen Rothwell
2016-11-08 18:44 ` 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=20201009174136.5ef09d00@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=thibaut.sautereau@ssi.gouv.fr \
/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;
as well as URLs for NNTP newsgroup(s).