Re: linux-next: manual merge of the net-next tree with the net tree

[Cong Wang]

On Tue, Oct 31, 2017 at 5:58 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
>   net/sched/cls_api.c
>
> between commit:
>
>   822e86d997e4 ("net_sched: remove tcf_block_put_deferred()")
>
> from the net tree and commit:
>
>   8c4083b30e56 ("net: sched: add block bind/unbind notif. and extended block_get/put")
>
> from the net-next tree.

Seems good.

Thanks!