lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 27 Apr 2010 08:13:35 -0700 From: Greg KH <greg@...ah.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Jiri Pirko <jpirko@...hat.com>, David Miller <davem@...emloft.net>, netdev@...r.kernel.org, John Sheehan <john.d.sheehan@...il.com> Subject: Re: linux-next: manual merge of the staging-next tree with the net tree 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@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists