From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jikos@kernel•org>, Jonathan Corbet <corbet@lwn•net>
Cc: Jiri Kosina <jkosina@suse•cz>, Joe Perches <joe@perches•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Miguel Ojeda <ojeda@kernel•org>
Subject: linux-next: manual merge of the trivial tree with the jc_docs tree
Date: Tue, 11 Jan 2022 15:08:46 +1100 [thread overview]
Message-ID: <20220111150846.563d051f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 788 bytes --]
Hi all,
Today's linux-next merge of the trivial tree got a conflict in:
Documentation/process/submitting-patches.rst
between commit:
6c5ccd24ff17 ("Remove mentions of the Trivial Patch Monkey")
from the jc_docs tree and commit:
081c8919b02b ("Documentation: remove trivial tree")
from the trivial tree.
I fixed it up (it was just an empty line difference, I used 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-01-11 4:08 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=20220111150846.563d051f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=jikos@kernel$(echo .)org \
--cc=jkosina@suse$(echo .)cz \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ojeda@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