linux-next: Tree for Jan 2

2019-01-01 Thread Stephen Rothwell
Hi all, Please do not add any material destined for the next merge window to your linux-next included trees until after -rc1 has been released. Changes since 20181224: The vfs tree gained conflicts against Linus' and the ext3 trees. It also gained a build failure for which I added a work around

linux-next: Tree for Jan 2

2018-01-01 Thread Stephen Rothwell
Hi all, Changes since 20171222: New tree: iversion The clk tree gained a build failure so I used the version from next-20171222. The vfs tree gained a conflict against Linus' tree The v4l-dvb tree gained conflicts against the vfs tree. The drm tree gained a build failure due to a bad automati

Re: linux-next: Tree for Jan 2 (netfilter)

2013-01-03 Thread Randy Dunlap
On 01/02/13 18:30, Pablo Neira Ayuso wrote: > On Thu, Jan 03, 2013 at 02:35:59AM +0100, Pablo Neira Ayuso wrote: >>> when NF_CONNTRACK is not enabled (build was on i386): >>> >>> CC [M] net/netfilter/xt_CT.o >>> In file included from net/netfilter/xt_CT.c:16:0: >>> include/net/netfilter/nf_connt

Re: linux-next: Tree for Jan 2 (netfilter)

2013-01-02 Thread Pablo Neira Ayuso
On Thu, Jan 03, 2013 at 02:35:59AM +0100, Pablo Neira Ayuso wrote: > > when NF_CONNTRACK is not enabled (build was on i386): > > > > CC [M] net/netfilter/xt_CT.o > > In file included from net/netfilter/xt_CT.c:16:0: > > include/net/netfilter/nf_conntrack.h:77:22: error: field 'ct_general' has

Re: linux-next: Tree for Jan 2 (netfilter)

2013-01-02 Thread Pablo Neira Ayuso
Hi, On Wed, Jan 02, 2013 at 10:39:43AM -0800, Randy Dunlap wrote: > On 01/01/13 20:12, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20121224: > > > > when NF_CONNTRACK is not enabled (build was on i386): > > CC [M] net/netfilter/xt_CT.o > In file included from net/netfilter/xt_

linux-next: Tree for Jan 2

2013-01-01 Thread Stephen Rothwell
Hi all, Changes since 20121224: The driver-core.current tree gained a conflict against Linus' tree. The s390 tree gained a conflict against the driver-core.current tree. The v4l-dvb tree gained a conflict against the driver-core.current tree. The drivers-x86 tree gained conflicts against the d