Re: net-next MERGE

2017-11-02 Thread Jiri Pirko
Thu, Nov 02, 2017 at 07:08:12PM CET, xiyou.wangc...@gmail.com wrote: >On Wed, Nov 1, 2017 at 11:51 PM, David Miller wrote: >> >> Cong, I just did another net --> net-next merge. >> >> Please look at how I resolved the cls_api.c conflict. >> >> Thank you. > >Looks good to me. Also looks fine to me

Re: net-next MERGE

2017-11-02 Thread Cong Wang
On Wed, Nov 1, 2017 at 11:51 PM, David Miller wrote: > > Cong, I just did another net --> net-next merge. > > Please look at how I resolved the cls_api.c conflict. > > Thank you. Looks good to me. Thanks for solving the pain! ;)