| 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
| ||
|
Message-Id: <20110617131515.f6e6c5a9.sfr@canb.auug.org.au>
Date: Fri, 17 Jun 2011 13:15:15 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Grant Likely <grant.likely@...retlab.ca>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Ryan Mallon <rmallon@...il.com>,
H Hartley Sweeten <hartleys@...ionengravers.com>
Subject: linux-next: manual merge of the gpio tree with the trivial tree
Hi Grant,
Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/gpio-ep93xx.c between commit 1c5454eed85a ("Change Ryan
Mallon's email address across the kernel") from the trivial tree and
commit 1e4c88420e0d ("gpio/ep93xx: convert to platform_driver and use
basic_mmio_gpio library") from the gpio tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc drivers/gpio/gpio-ep93xx.c
index 1a0f852,3bfd341..0000000
--- a/drivers/gpio/gpio-ep93xx.c
+++ b/drivers/gpio/gpio-ep93xx.c
@@@ -1,9 -1,8 +1,8 @@@
/*
- * linux/arch/arm/mach-ep93xx/gpio.c
- *
* Generic EP93xx GPIO handling
*
- * Copyright (c) 2008 Ryan Mallon <ryan@...ewatersys.com>
+ * Copyright (c) 2008 Ryan Mallon
+ * Copyright (c) 2011 H Hartley Sweeten <hsweeten@...ionengravers.com>
*
* Based on code originally from:
* linux/arch/arm/mach-ep93xx/core.c
--
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