From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Paul E. McKenney" <paulmck@kernel•org>, Petr Mladek <pmladek@suse•com>
Cc: 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 rcu tree with the printk tree
Date: Thu, 1 Dec 2022 10:55:04 +1100 [thread overview]
Message-ID: <20221201105504.71c318f0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 775 bytes --]
Hi all,
Today's linux-next merge of the rcu tree got a conflict in:
kernel/rcu/update.c
between commit:
64e838679e14 ("rcu: Make SRCU mandatory")
from the printk tree and commit:
0cd7e350abc4 ("rcu: Make SRCU mandatory")
from the rcu tree.
I fixed it up (I just used the latter - it kept the WARN_ON_ONCE) 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.
Maybe you could share a (non rebasing) topic branch?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-11-30 23:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-30 23:55 Stephen Rothwell [this message]
2022-11-30 23:59 ` linux-next: manual merge of the rcu tree with the printk tree Paul E. McKenney
2022-12-01 10:41 ` Petr Mladek
-- strict thread matches above, loose matches on Subject: below --
2024-08-09 2:23 Stephen Rothwell
2024-08-09 7:25 ` Neeraj Upadhyay
2024-08-09 9:17 ` Petr Mladek
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=20221201105504.71c318f0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paulmck@kernel$(echo .)org \
--cc=pmladek@suse$(echo .)com \
/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