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, 22 Aug 2011 09:27:00 +0100 From: Russell King - ARM Linux <linux@....linux.org.uk> To: Linus Walleij <linus.walleij@...aro.org> Cc: Grant Likely <grant.likely@...retlab.ca>, Linus Walleij <linus.walleij@...ricsson.com>, linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org, Lee Jones <lee.jones@...aro.org>, H Hartley Sweeten <hartleys@...ionengravers.com> Subject: Re: [PATCH 00/19] GPIO exodus and cleanup On Mon, Aug 22, 2011 at 09:53:48AM +0200, Linus Walleij wrote: > On Sun, Aug 21, 2011 at 9:09 AM, Grant Likely <grant.likely@...retlab.ca> wrote: > > On Fri, Aug 19, 2011 at 5:45 AM, Linus Walleij <linus.walleij@...aro.org> wrote: > >> Ping on this, on monday I'll pretend it's no big deal and pour them > >> into Russells patch tracker anyway, since he's managing more than > >> half of the kernels GPIO code in arch/arm/* anyway. > > > > If Russell is okay with it, then go ahead and merge it. I'm being > > pretty liberal about GPIO driver moves. I'm fine with them getting > > cleaned up after the drivers/gpio move. > > Okay! Russell I've put them into your patch tracker as patches > 7032/1 thru 7050/1 so you can pick and choose. I've rebased on > top of what's in -next hoping that the stuff there affecting these > file will mainly be identical to what's on your "gpio" branch. > > Tell me if I should rebase on something specific or if there are > any problems. I've applied as many as I can, but 7042/1, 7046/1, 7047/1 and 7048/1 failed: Patching 7042/1... git apply --whitespace=fix -p1 --index --check > /tmp/pdb.26923 2>&1 exited with non-zero status: 256 error: patch failed: drivers/gpio/gpio-ep93xx.c:24 error: drivers/gpio/gpio-ep93xx.c: patch does not apply Patching 7046/1... git apply --whitespace=fix -p1 --index --check > /tmp/pdb.26923 2>&1 exited with non-zero status: 256 error: patch failed: arch/arm/mach-mmp/gplugd.c:9 error: arch/arm/mach-mmp/gplugd.c: patch does not apply error: drivers/gpio/gpio-pxa.c: does not exist in index Patching 7047/1... git apply --whitespace=fix -p1 --index --check > /tmp/pdb.26923 2>&1 exited with non-zero status: 256 error: patch failed: drivers/gpio/Makefile:40 error: drivers/gpio/Makefile: patch does not apply Patching 7048/1... git apply --whitespace=fix -p1 --index --check > /tmp/pdb.26923 2>&1 exited with non-zero status: 256 error: drivers/gpio/gpio-pnx4008.c: does not exist in index It looks like there are changes to these in other trees which conflict. -- 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