Re: [GIT PULL] ARM: OMAP2+: clean up and standardize WFI handling for 3.9

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

 



On Mon, 11 Feb 2013, Tony Lindgren wrote:

> This branch should probably have been based on your earlier PM branch
> based on v3.8-rc5 that was already merged as omap-for-v3.9/pm-signed into
> arm-soc for-next.
> 
> Now merging this branch based on v3.8-rc6 requires me to create a merge
> base by merging the earlier branch with v3.8-rc6 and then resolving
> the self-inflicted merge conflict in order for me to generate a pull request
> without a non-trivial merge conflict. Just a bunch of extra hassle to
> deal with with additional risk of merging things wrong. Anyways merging
> into omap-for-v3.9/pm-wfi-take2.

Sorry about that.  Will try to find better merge bases for future 
branches.  

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


[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux