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>,
Sasha Levin <alexander.levin@verizon.com>,
Ursula Braun <ubraun@linux.vnet.ibm.com>
Subject: linux-next: manual merge of the akpm-current tree with the net-next tree
Date: Thu, 2 Nov 2017 18:52:49 +1100 [thread overview]
Message-ID: <20171102185249.1938e778@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/net/inet_sock.h
between commit:
60e2a7780793 ("tcp: TCP experimental option for SMC")
from the net-next tree and commit:
8a3e1a11b8af ("kmemcheck: remove annotations")
from the akpm-current tree.
I fixed it up (see below) 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
diff --cc include/net/inet_sock.h
index 2135c9ba6ac3,21c3e4d73b88..000000000000
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@@ -92,12 -90,10 +90,11 @@@ struct inet_request_sock
wscale_ok : 1,
ecn_ok : 1,
acked : 1,
- no_srccheck: 1;
+ no_srccheck: 1,
+ smc_ok : 1;
- kmemcheck_bitfield_end(flags);
u32 ir_mark;
union {
- struct ip_options_rcu *opt;
+ struct ip_options_rcu __rcu *ireq_opt;
#if IS_ENABLED(CONFIG_IPV6)
struct {
struct ipv6_txoptions *ipv6_opt;
next reply other threads:[~2017-11-02 7:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 7:52 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-05 4:10 linux-next: manual merge of the akpm-current tree with the net-next tree Stephen Rothwell
2020-07-21 9:47 Stephen Rothwell
2020-07-13 8:20 Stephen Rothwell
2019-07-03 8:40 Stephen Rothwell
2019-06-07 5:44 Stephen Rothwell
2019-05-06 10:43 Stephen Rothwell
2019-05-06 14:42 ` Andy Shevchenko
2017-11-03 8:07 Stephen Rothwell
2017-09-05 5:27 Stephen Rothwell
2015-12-17 5:31 Stephen Rothwell
2015-12-17 5:31 ` Stephen Rothwell
2015-12-10 4:54 Stephen Rothwell
2015-12-10 4:54 ` Stephen Rothwell
2015-02-09 9:31 Stephen Rothwell
2015-02-09 9:31 ` 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=20171102185249.1938e778@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=alexander.levin@verizon.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ubraun@linux.vnet.ibm.com \
/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.