From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Paul E. McKenney" <paulmck@kernel•org>,
Jonathan Corbet <corbet@lwn•net>
Cc: Akhil Raj <lf32.dev@gmail•com>,
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 jc_docs tree
Date: Fri, 23 Sep 2022 13:48:34 +1000 [thread overview]
Message-ID: <20220923134834.299646cd@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 770 bytes --]
Hi all,
Today's linux-next merge of the rcu tree got a conflict in:
Documentation/RCU/checklist.rst
between commit:
712e1dea2e4f ("Delete duplicate words from kernel docs")
from the jc_docs tree and commit:
1f0e704eea04 ("doc: Update checklist.txt")
from the rcu tree.
I fixed it up (I just used the latter since it removed the words removed
by the former) 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-09-23 3:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-23 3:48 Stephen Rothwell [this message]
2022-09-26 17:50 ` linux-next: manual merge of the rcu tree with the jc_docs tree Paul E. McKenney
-- strict thread matches above, loose matches on Subject: below --
2023-12-18 3:25 Stephen Rothwell
2024-01-02 9:39 ` Vlastimil Babka
2020-09-02 4:31 Stephen Rothwell
2020-09-03 17:02 ` Paul E. McKenney
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=20220923134834.299646cd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=lf32.dev@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paulmck@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