lkml.org 
[lkml]   [2017]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the net-next tree with Linus' tree
From
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 10 Nov 2017 10:31:00 +1100

> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/sched/cls_basic.c
> net/sched/cls_u32.c
>
> between commits:
>
> 0b2a59894b76 ("cls_basic: use tcf_exts_get_net() before call_rcu()")
> 35c55fc156d8 ("cls_u32: use tcf_exts_get_net() before call_rcu()")
>
> from Linus' tree and commit:
>
> 1d8134fea2eb ("net_sched: use idr to allocate basic filter handles")
>
> from the net-next tree.

This should be resolved as I've just merged 'net' into 'net-next'.

\
 
 \ /
  Last update: 2017-11-10 05:40    [W:1.138 / U:0.208 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site