From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Doug Berger <opendmb@gmail.com>,
Stephen Boyd <sboyd@codeaurora.org>
Subject: linux-next: manual merge of the akpm tree with the net-next tree
Date: Mon, 20 Mar 2017 16:10:51 +1100 [thread overview]
Message-ID: <20170320161051.55a2927d@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
between commit:
0ce5aa1d6c97 ("dt-bindings: net: update bcmgenet binding for GENETv5")
from the net-next tree and patch:
"scripts/spelling.txt: Add regsiter -> register spelling mistake"
from the akpm tree.
I fixed it up (the former also fixed the typo from the latter, so I just
used that) 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
next reply other threads:[~2017-03-20 5:10 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-20 5:10 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-06-02 9:30 linux-next: manual merge of the akpm tree with the net-next tree Stephen Rothwell
2020-06-02 9:45 ` Stephen Rothwell
2019-07-03 10:49 Stephen Rothwell
2018-01-16 4:51 Stephen Rothwell
2017-02-07 5:23 Stephen Rothwell
2017-02-07 8:40 ` Marc Kleine-Budde
2017-02-07 9:45 ` Stephen Rothwell
2015-05-14 7:39 Stephen Rothwell
2015-05-14 7:39 ` Stephen Rothwell
2015-05-14 7:38 Stephen Rothwell
2015-05-14 7:38 ` Stephen Rothwell
2014-07-23 8:18 Stephen Rothwell
2014-07-23 8:18 ` Stephen Rothwell
2013-11-06 9:00 Stephen Rothwell
2013-11-06 9:00 ` Stephen Rothwell
2013-11-06 8:55 Stephen Rothwell
2013-11-06 8:55 ` Stephen Rothwell
2013-05-21 4:32 Stephen Rothwell
2013-05-21 4:32 ` Stephen Rothwell
2013-05-21 4:29 Stephen Rothwell
2013-05-21 4:29 ` Stephen Rothwell
2013-05-21 20:04 ` Andrew Morton
2013-05-21 20:04 ` Andrew Morton
2013-05-22 7:07 ` David Miller
2013-05-22 7:14 ` Andrew Morton
2013-05-22 7:19 ` David Miller
2013-05-22 7:48 ` Daniel Borkmann
2013-05-21 4:25 Stephen Rothwell
2013-05-21 4:25 ` Stephen Rothwell
2013-05-21 7:44 ` Daniel Borkmann
2013-05-21 23:54 ` Stephen Rothwell
2013-05-22 9:20 ` Daniel Borkmann
2013-05-20 4:14 Stephen Rothwell
2013-05-20 4:14 ` Stephen Rothwell
2013-05-20 4:11 Stephen Rothwell
2013-05-20 4:11 ` Stephen Rothwell
2013-02-20 6:02 Stephen Rothwell
2013-02-20 6:02 ` Stephen Rothwell
2013-02-20 6:43 ` Cong Wang
2013-02-15 6:56 Stephen Rothwell
2013-02-15 6:56 ` Stephen Rothwell
2012-06-08 3:56 Stephen Rothwell
2012-06-08 3:56 ` Stephen Rothwell
2011-11-23 3:27 Stephen Rothwell
2011-11-23 3:27 ` Stephen Rothwell
2011-11-23 3:40 ` Neil Horman
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=20170320161051.55a2927d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=opendmb@gmail.com \
--cc=sboyd@codeaurora.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.