linux-next: manual merge of the driver-core tree with the net tree
in [Kernel]
|
Prev: vfs/eCryptfs: Handle ioctl calls with unlocked and compat functions
Next: [GIT PULL] Arm i.MX changes
From: Stephen Rothwell on 21 May 2010 02:40 Hi Greg, On Fri, 21 May 2010 16:21:34 +1000 Stephen Rothwell <sfr(a)canb.auug.org.au> wrote: > > Today's linux-next merge of the driver-core tree got a conflict in > net/core/net-sysfs.c between commits > 0a9627f2649a02bea165cfd529d7bcb625c2fcad ("rps: Receive Packet Steering") > and fec5e652e58fa6017b2c9e06466cb2a6538de5b4 ("rfs: Receive Flow > Steering") from the net tree and commits > bc28c84244da26bafb0d3bce95ef45212b31c6b8 ("net/sysfs: Fix the bitrot in > network device kobject namespace support") and > 83dc0fbf37495691219d019ec16b40d8592d2956 ("net: Expose all network > devices in a namespaces in sysfs") from the driver-core tree. > > I fixed it up (I think - see below) and can carry the fix as necessary. The net tree has been merged by Linus, so this should be fixable in the driver-core tree now. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell on 21 May 2010 02:50 Hi Eric, On Thu, 20 May 2010 23:46:22 -0700 ebiederm(a)xmission.com (Eric W. Biederman) wrote: > > It looks right, except perhaps the RPS code looks like it will cause a > build failure with sysfs disabled, but that has nothing to do with your > changes. I don't see any real conflicts here, just two patches passing > very close to each other. Thanks for the confirmation. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: David Miller on 21 May 2010 03:00 From: ebiederm(a)xmission.com (Eric W. Biederman) Date: Thu, 20 May 2010 23:46:22 -0700 > It looks right, except perhaps the RPS code looks like it will cause a > build failure with sysfs disabled, but that has nothing to do with your > changes. CONFIG_RPS depends upon CONFIG_SMP && CONFIG_SYSFS, so no that build failure is not possible. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 21 May 2010 11:20
On Fri, May 21, 2010 at 12:43:55AM -0700, Eric W. Biederman wrote: > David Miller <davem(a)davemloft.net> writes: > > > From: ebiederm(a)xmission.com (Eric W. Biederman) > > Date: Thu, 20 May 2010 23:46:22 -0700 > > > >> It looks right, except perhaps the RPS code looks like it will cause a > >> build failure with sysfs disabled, but that has nothing to do with your > >> changes. > > > > CONFIG_RPS depends upon CONFIG_SMP && CONFIG_SYSFS, so no that build > > failure is not possible. > > That's the bit I'm missing. My apologies if I caused any unnecessary worry. I've now fixed this all up in my tree and have pushed it out. I'll also go push the patches themselves to Linus later today. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |