| 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: Mon, 31 Jan 2011 09:52:03 +0100 From: "Arend van Spriel" <arend@...adcom.com> To: "Greg KH" <greg@...ah.com>, "Stephen Rothwell" <sfr@...b.auug.org.au> cc: "linux-next@...r.kernel.org" <linux-next@...r.kernel.org>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org> Subject: Re: linux-next: manual merge of the staging tree with the staging.current tree Hi Stephen, On Mon, 31 Jan 2011 06:09:26 +0100, Stephen Rothwell <sfr@...b.auug.org.au> wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/brcm80211/brcmsmac/wl_mac80211.c, > drivers/staging/brcm80211/sys/wlc_mac80211.c and > drivers/staging/brcm80211/sys/wlc_mac80211.c (these three files names are > the same file, it has been renamed twice, I think ..) between wl_mac80211.c and wlc_mac80211.c are different source files. The driver source tree has been restructured in the staging-next branch and files that were located in brcm80211/sys are moved to brcm80211/brcmsmac. > > I fixed it up (see below) and can carry the fix as necessary. The fix looks ok and I also verified the wl_mac80211.c in linux-next on gitweb. Regards, Arend van Spriel -- "The most merciful thing in the world, I think, is the inability of the human mind to correlate all its contents." - "The Call of Cthulhu" -- 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