linux-next: manual merge of the staging-next tree with the net tree
in [Kernel]
|
Prev: perf tools: Fix libdw-dev package name in error message
Next: [PATCH] Fix NULL pointer for Xen guests
From: Greg KH on 27 Apr 2010 11:20 On Tue, Apr 27, 2010 at 02:26:55PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging-next tree got a conflict in > drivers/staging/arlan/arlan-main.c between commit > 22bedad3ce112d5ca1eaf043d4990fa2ed698c87 ("net: convert multicast list to > list_head") from the net tree and commit > 8db2022b08e232bb237b2162f03ff5f6e7c0c35e ("staging: arlan: fix errors > reported by checkpatch.pl tool") from the staging-next tree. > > I fixed it up (see below) and can carry the fix as necessary. That looks fine, 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/
From: Stephen Rothwell on 6 May 2010 00:30
Hi Greg, On Wed, 5 May 2010 21:20:48 -0700 Greg KH <greg(a)kroah.com> wrote: > > Thanks for doing this. Hm, the arlan driver is scheduled to be deleted > in .35, so it would make things easier if I just do it now to keep these > kinds of merge issues from happening. I'll queue that up tomorrow. Ah, yes, that would be easier. Thanks. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |