[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190215.124125.1781326145216021027.davem@davemloft.net>
Date: Fri, 15 Feb 2019 12:41:25 -0800 (PST)
From: David Miller <davem@...emloft.net>
To: netdev@...r.kernel.org
CC: xiyou.wangcong@...il.com, vladbu@...lanox.com
Subject: [MERGE HELP] cls_tcindex.c
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!
Powered by blists - more mailing lists