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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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-vt8500 gpio driver") from the
arm-soc tree.

The latter removed the file, so I did that and can carry the fix as
necessary (no action is required).

That's the correct solution

Regards
Tony P

--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux