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, 12 Aug 2014 03:11:06 +0200 From: "Rafael J. Wysocki" <rjw@...ysocki.net> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Andrew Lunn <andrew@...n.ch>, Jason Cooper <jason@...edaemon.net> Subject: Re: linux-next: manual merge of the pm tree with Linus' tree On Monday, August 11, 2014 11:43:09 AM Stephen Rothwell wrote: > > --Sig_/=CGwKOD1=eH3=syU/3wkRPC > Content-Type: text/plain; charset=US-ASCII > Content-Transfer-Encoding: quoted-printable > > Hi Rafael, > > Today's linux-next merge of the pm tree got a conflict in > arch/arm/mach-kirkwood/pm.c between commit ba364fc752da ("ARM: > Kirkwood: Remove mach-kirkwood") from Linus' tree and commit > bb3274b6442d ("PM / sleep: Rename symbols, functions and variables > related to sleep") from the pm tree. > > I fixed it up (I removed the file) and can carry the fix as necessary > (no action is required). Thanks a lot! I've decided to drop the above commit for now. Rafael -- 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