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, 29 Jul 2013 12:26:49 -0700 From: Greg KH <greg@...ah.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Arnd Bergmann <arnd@...db.de>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Tomas Winkler <tomas.winkler@...el.com> Subject: Re: linux-next: manual merge of the char-misc tree with Linus' tree On Mon, Jul 29, 2013 at 03:01:29PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in > drivers/misc/mei/init.c between commit 99f22c4ef24c ("mei: don't have to > clean the state on power up") from Linus' tree and commit b950ac1dabfc > ("mei: don't get stuck in select during reset") from the char-misc tree. > > (Unrelated white space changes are a pest :-() > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Thanks, I've merged the char-misc-next branch into 3.11-rc3, so this merge problem should no longer be there. 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