From: David Miller <davem@davemloft.net>
To: netdev@vger.kernel.org
Cc: xiyou.wangcong@gmail.com, vladbu@mellanox.com
Subject: [MERGE HELP] cls_tcindex.c
Date: Fri, 15 Feb 2019 12:41:25 -0800 (PST) [thread overview]
Message-ID: <20190215.124125.1781326145216021027.davem@davemloft.net> (raw)
I've merged net into net-next.
The worst conflict was cls_tcindex.c as Cong's fixes collided heavily
with Vlad's work.
The interim solution I used for this merge was to revert back to RCU.
Please take a look at what I did and send me followups because I am
absolutely certain that some are necessary :-)))
Thanks!
next reply other threads:[~2019-02-15 20:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-15 20:41 David Miller [this message]
2019-02-16 1:31 ` [MERGE HELP] cls_tcindex.c Cong Wang
2019-02-16 4:49 ` David Miller
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=20190215.124125.1781326145216021027.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=vladbu@mellanox.com \
--cc=xiyou.wangcong@gmail.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 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).