Messages in this thread | | | From | Or Gerlitz <> | Date | Mon, 10 Dec 2018 13:38:54 +0200 | Subject | Re: linux-next: manual merge of the net-next tree with the net tree |
| |
On Mon, Dec 10, 2018 at 3:38 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/cls_flower.c > > between commit: > > 35cc3cefc4de ("net/sched: cls_flower: Reject duplicated rules also under skip_sw") > > from the net tree and commit: > > 5c72299fba9d ("net: sched: cls_flower: Classify packets using port ranges") > > from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary. This
[..]
The fix LGTM, thanks for addressing this.
Or.
| |