From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Theodore Ts'o <tytso@mit•edu>,
"Jason A. Donenfeld" <Jason@zx2c4•com>,
Catalin Marinas <catalin.marinas@arm•com>,
Will Deacon <will@kernel•org>
Cc: Ard Biesheuvel <ardb@kernel•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 random tree with the arm64 tree
Date: Mon, 18 Jul 2022 18:43:18 +1000 [thread overview]
Message-ID: <20220718184318.25d75848@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 836 bytes --]
Hi all,
Today's linux-next merge of the random tree got a conflict in:
arch/arm64/kernel/kaslr.c
between commit:
fc5a89f75d2a ("arm64: kaslr: defer initialization to initcall where permitted")
from the arm64 tree and commit:
29abd7758699 ("random: handle archrandom in plural words")
from the random tree.
I fixed it up (the former has removed tha call to
arch_get_random_seed_words_early() that is updated in the latter) 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 --]
reply other threads:[~2022-07-18 8:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220718184318.25d75848@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jason@zx2c4$(echo .)com \
--cc=ardb@kernel$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tytso@mit$(echo .)edu \
--cc=will@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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