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: Thu, 25 Aug 2011 21:33:57 -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, Larry Finger <Larry.Finger@...inger.net> Subject: Re: linux-next: manual merge of the staging tree with the net tree On Fri, Aug 26, 2011 at 01:47:05PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/rtl8192e/r8192E_core.c between commit afc4b13df143 ("net: > remove use of ndo_set_multicast_list in drivers") from the net tree and > commit 09505184ec3d ("staging: rtl8192e: Remove files that are not used") > from the staging tree. > > The latter removed the file, so I did that. Thanks, that should be the correct thing :) greg k-h -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists