Re: linux-next: manual merge of the arm-soc tree with the gpio-lw tree

2013-04-09 Thread Tony Prisk
On 09/04/13 19:47, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/gpio/gpio-vt8500.c between commit 808c513ee64b ("gpio/vt8500: Convert to devm_ioremap_resource()") from the gpio-lw tree and commit dc1010860b03 ("gpio: vt8500: Remove arch-v

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

2013-04-09 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/gpio/gpio-vt8500.c between commit 808c513ee64b ("gpio/vt8500: Convert to devm_ioremap_resource()") from the gpio-lw tree and commit dc1010860b03 ("gpio: vt8500: Remove arch-vt8500 gpio driver") from the arm-soc tree. T

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

2012-10-25 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/Kconfig between commit a3b8d4a51357 ("GPIO: Add support for GPIO on CLPS711X-target platform") from the gpio-lw tree and commit 4a8355c4c34f ("ARM: clps711x: convert to clockevents") from the arm-soc tree. I fixed it

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

2012-07-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/gpio/gpio-mxc.c between commit fef2bca203e9 ("gpio/mxc: use the edge_sel feature if available") from the gpio-lw tree and commit 1ab7ef158dfb ("gpio/mxc: move irq_domain_add_legacy call into gpio driver") from the arm-s