linux-kernel - linux-next: manual merge of the arm-soc tree with the arm tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 12 Sep 2011 12:05:13 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>,
	Shawn Guo <shawn.guo@...aro.org>,
	Sascha Hauer <s.hauer@...gutronix.de>
Subject: linux-next: manual merge of the arm-soc tree with the arm tree

Hi Arnd,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-mxc/include/mach/gpio.h between commits 22fe67837614 ("ARM:
gpio: consolidate trivial gpiolib implementations") and 8f3c4537bb08
("ARM: gpio: make trivial GPIOLIB implementation the default") from the
arm tree and commits df1bac2e2f18 ("arm/mxc: use gpiolib helper for
gpio_to_irq"), a4395612290c ("gpio/mxc: move irq_to_gpio() into gpio-mxc
driver") and 1dfa86bb9d3f ("arm/mxc: move IMX_GPIO_NR into
mach/hardware.h")  from the arm-soc tree.

I fixed it up (which leaves this file essentially empty - see below) anc
can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/plat-mxc/include/mach/gpio.h
index 3e1ffc8,44af006..0000000
--- a/arch/arm/plat-mxc/include/mach/gpio.h
+++ b/arch/arm/plat-mxc/include/mach/gpio.h
@@@ -21,13 -21,12 +21,5 @@@
  
  #include <linux/spinlock.h>
  #include <mach/hardware.h>
 -#include <asm-generic/gpio.h>
 -
 -/* use gpiolib dispatchers */
 -#define gpio_get_value		__gpio_get_value
 -#define gpio_set_value		__gpio_set_value
 -#define gpio_cansleep		__gpio_cansleep
 -#define gpio_to_irq		__gpio_to_irq
  
- 
- /* There's a off-by-one betweem the gpio bank number and the gpiochip */
- /* range e.g. GPIO_1_5 is gpio 5 under linux */
- #define IMX_GPIO_NR(bank, nr)		(((bank) - 1) * 32 + (nr))
- 
- #define gpio_to_irq(gpio)	(MXC_GPIO_IRQ_START + (gpio))
- #define irq_to_gpio(irq)	((irq) - MXC_GPIO_IRQ_START)
- 
  #endif
--
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/