From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Stephen Boyd <swboyd@chromium.org>
Subject: linux-next: manual merge of the net-next tree with the arm-soc tree
Date: Thu, 5 Sep 2019 13:42:13 +1000 [thread overview]
Message-ID: <20190905134213.739ca375@canb.auug.org.au> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 760 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/nuvoton/w90p910_ether.c
between commit:
00d2fbf73d55 ("net: remove w90p910-ether driver")
from the arm-soc tree and commit:
d1a55841ab24 ("net: Remove dev_err() usage after platform_get_irq()")
from the net-next tree.
I fixed it up (I 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 #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2019-09-05 3:42 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-05 3:42 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-13 2:55 linux-next: manual merge of the net-next tree with the arm-soc tree Stephen Rothwell
2021-02-16 2:04 Stephen Rothwell
2021-02-16 2:20 ` nobuhiro1.iwamatsu
2021-02-16 10:11 ` Arnd Bergmann
2021-02-16 11:53 ` Yoshihiro Shimoda
2021-02-16 12:28 ` Naresh Kamboju
2021-02-16 13:47 ` nobuhiro1.iwamatsu
2021-02-16 14:21 ` nobuhiro1.iwamatsu
2021-02-16 21:17 ` Stephen Rothwell
2021-02-17 0:23 ` Yoshihiro Shimoda
2016-12-01 1:31 Stephen Rothwell
2016-07-27 2:53 Stephen Rothwell
2016-07-27 20:41 ` Duc Dang
2016-06-21 1:18 Stephen Rothwell
2016-06-21 8:56 ` Arnd Bergmann
2016-05-10 0:18 Stephen Rothwell
2015-01-27 2:04 Stephen Rothwell
2014-09-25 2:58 Stephen Rothwell
2014-09-10 4:48 Stephen Rothwell
2014-09-10 8:06 ` Arnd Bergmann
2014-03-31 2:24 Stephen Rothwell
2012-01-04 4:06 Stephen Rothwell
2012-01-04 4:46 ` Richard Zhao
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=20190905134213.739ca375@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olof@lixom.net \
--cc=swboyd@chromium.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).