Re: linux-next: manual merge of the arm-soc tree with the mfd tree
From: Olof Johansson
Date: Mon Feb 11 2013 - 14:08:48 EST
On Mon, Feb 11, 2013 at 10:52 AM, Tony Lindgren <tony@xxxxxxxxxxx> wrote:
> * Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> [130210 22:11]:
>> Hi all,
>> Today's linux-next merge of the arm-soc tree got a conflict in
>> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
>> omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
>> and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
>> pm_lats and early_device code") from the arm-soc tree.
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
> Thanks again.
> Samuel, up to you, but I suggest you just drop these patches for
> now if still possible unless other patches are based on these.
Yes, as I replied on the original patch series last night, please sort
this out so we can avoid these nagging merge conflicts. Tony's steps
in the previous email is the right way to handle these kind of things.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/