From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Jonathan Corbet <corbet@lwn.net>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Henrik Austad <henrik@austad.us>,
"Tobin C. Harding" <me@tobin.cc>
Subject: linux-next: manual merge of the net-next tree with the jc_docs tree
Date: Tue, 18 Sep 2018 10:14:44 +1000 [thread overview]
Message-ID: <20180918101444.6466090c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 754 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
Documentation/networking/00-INDEX
between commit:
a7ddcea58ae2 ("Drop all 00-INDEX files from Documentation/")
from the jc_docs tree and commit:
a20625e49dde ("docs: net: Remove TCP congestion document")
from the net-next tree.
I fixed it up (I just removed the file) 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:[~2018-09-18 0:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-18 0:14 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-07-25 0:54 linux-next: manual merge of the net-next tree with the jc_docs tree Stephen Rothwell
2021-06-18 1:55 Stephen Rothwell
2021-06-18 17:25 ` Jonathan Corbet
2023-02-06 23:07 Stephen Rothwell
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=20180918101444.6466090c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=henrik@austad.us \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=me@tobin.cc \
--cc=netdev@vger.kernel.org \
/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).