* net-next MERGE
@ 2017-11-02 6:51 David Miller
2017-11-02 18:08 ` Cong Wang
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2017-11-02 6:51 UTC (permalink / raw)
To: xiyou.wangcong; +Cc: netdev
Cong, I just did another net --> net-next merge.
Please look at how I resolved the cls_api.c conflict.
Thank you.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: net-next MERGE
2017-11-02 6:51 net-next MERGE David Miller
@ 2017-11-02 18:08 ` Cong Wang
2017-11-02 20:52 ` Jiri Pirko
0 siblings, 1 reply; 3+ messages in thread
From: Cong Wang @ 2017-11-02 18:08 UTC (permalink / raw)
To: David Miller, Jiri Pirko; +Cc: Linux Kernel Network Developers
On Wed, Nov 1, 2017 at 11:51 PM, David Miller <davem@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.
Thanks for solving the pain! ;)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: net-next MERGE
2017-11-02 18:08 ` Cong Wang
@ 2017-11-02 20:52 ` Jiri Pirko
0 siblings, 0 replies; 3+ messages in thread
From: Jiri Pirko @ 2017-11-02 20:52 UTC (permalink / raw)
To: Cong Wang; +Cc: David Miller, Linux Kernel Network Developers
Thu, Nov 02, 2017 at 07:08:12PM CET, xiyou.wangcong@gmail.com wrote:
>On Wed, Nov 1, 2017 at 11:51 PM, David Miller <davem@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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-02 20:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-02 6:51 net-next MERGE David Miller
2017-11-02 18:08 ` Cong Wang
2017-11-02 20:52 ` Jiri Pirko
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).