Groups > linux.kernel > #1520467

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

From	David Miller <davem@davemloft.net>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the net-next tree with the netfilter tree
Date	2016-11-13 05:50 +0100
Message-ID	<sCUTU-3LN-13@gated-at.bofh.it> (permalink)
References	<sBKWB-5VH-21@gated-at.bofh.it> <sBLzj-6wR-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 10 Nov 2016 01:31:17 +0100

> I think I cannot help to address this conflict myself.
> 
> 8fbfef7f505b is in my nf tree, while 489111e5c25b is in net-next. So
> you will hit this conflict by when you pull net into net-next.
> 
> So please keep this patch from Stephen to resolve the conflict in your
> radar to solve this.

I will, thank you.

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the net-next tree with the netfilter  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-11-10 01:00 +0100
  Re: linux-next: manual merge of the net-next tree with the netfilter  tree Pablo Neira Ayuso <pablo@netfilter.org> - 2016-11-10 01:40 +0100
    Re: linux-next: manual merge of the net-next tree with the  netfilter tree David Miller <davem@davemloft.net> - 2016-11-13 05:50 +0100

csiph-web