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 Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Ido Schimmel <idosch@mellanox•com>,
Emil S Tantilov <emils.tantilov@gmail•com>,
David Ahern <dsahern@gmail•com>
Subject: linux-next: manual merge of the akpm tree with the net-next tree
Date: Tue, 16 Jan 2018 15:51:00 +1100 [thread overview]
Message-ID: <20180116155100.3ac44bf1@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
net/ipv6/route.c
between commit:
6802f3adcb3f ("ipv6: Fix build with gcc-4.4.5")
from the net-next tree and patch:
"net/ipv6/route.c: work around gcc-4.4.4 anon union initializer issue"
from the akpm tree.
I fixed it up (I just used the net-next tree version) 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:[~2018-01-16 4:51 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-16 4:51 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
2017-03-20 5:10 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:38 Stephen Rothwell
2014-07-23 8:18 Stephen Rothwell
2013-11-06 9:00 Stephen Rothwell
2013-11-06 8:55 Stephen Rothwell
2013-05-21 4:32 Stephen Rothwell
2013-05-21 4:29 Stephen Rothwell
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 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:11 Stephen Rothwell
2013-02-20 6:02 Stephen Rothwell
2013-02-20 6:43 ` Cong Wang
2013-02-15 6:56 Stephen Rothwell
2012-06-08 3:56 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=20180116155100.3ac44bf1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=dsahern@gmail$(echo .)com \
--cc=emils.tantilov@gmail$(echo .)com \
--cc=idosch@mellanox$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.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