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 <da...@davemloft.net> 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.
