Re: [MERGE HELP] cls_tcindex.c

2019-02-15 Thread David Miller
From: Cong Wang Date: Fri, 15 Feb 2019 17:31:41 -0800 > I will cherry-pick the first two patches for net-next and send them to you. Ok, thanks Cong.

Re: [MERGE HELP] cls_tcindex.c

2019-02-15 Thread Cong Wang
On Fri, Feb 15, 2019 at 12:41 PM David Miller wrote: > > > 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

[MERGE HELP] cls_tcindex.c

2019-02-15 Thread David Miller
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 nece