Message ID | alpine.DEB.2.00.1204041658200.7161@utopia.booyaka.com |
---|---|
State | New |
Headers | show |
* Paul Walmsley <paul@pwsan.com> [120404 16:03]: > Hi Tony, > > The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928: > > Linux 3.4-rc1 (2012-03-31 16:24:09 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending tags/omap-fixes-a-for-3.4rc > > for you to fetch changes up to cf1a9298231d7719b67ad0eae6236c91888b7a32: > > Merge branches 'clock_fixes_3.4rc', 'clockdomain_fixes_3.4rc', 'hsmmc_erratum_2_1_1_128_refine_3.4rc1', 'hwmod_data_fixes_a_3.4rc', 'hwmod_fixes_3.4rc', 'powerdomain_fixes_a_3.4rc' and 'prcm_fixes_3.4rc' into fixes_for_3.4rc2 (2012-04-04 14:53:33 -0600) > > These changes have been boot-tested on OMAP37xx ES1.0 Beagleboard-XM, > OMAP2420 N800, OMAP4430 ES2.0 Pandaboard, and OMAP35xx ES3.0 > BeagleBoard. System suspend and serial wakeup has been tested > on OMAP4430 ES2.0 Pandaboard, and dynamic retention idle and serial > wakeup has been tested on OMAP35xx ES3.0 BeagleBoard. Thanks, looks like two of these patches I already merged into fixes yesterday from your earlier pull request. So merging this in would cause duplicate commits. Can you please update your branch to remove those two commits? Meanwhile, I've merged your branch into linux-omap master branch for some more testing while waiting for the update. Regards, Tony
On Wed, 4 Apr 2012, Tony Lindgren wrote: > Thanks, looks like two of these patches I already merged into > fixes yesterday from your earlier pull request. So merging this > in would cause duplicate commits. Can you please update your > branch to remove those two commits? Do you happen to recall which ones they are? - Paul
On Wed, 4 Apr 2012, Paul Walmsley wrote: > On Wed, 4 Apr 2012, Tony Lindgren wrote: > > > Thanks, looks like two of these patches I already merged into > > fixes yesterday from your earlier pull request. So merging this > > in would cause duplicate commits. Can you please update your > > branch to remove those two commits? > > Do you happen to recall which ones they are? Anyway, am guessing that you are planning to pull these into your 'fixes' branch? If so then probably the conflicts are with the misc_devel_3.4 branch patches. Will post another pull request for you with those two patches dropped. But if you're pulling these into a different branch, please let me know... - Paul
* Paul Walmsley <paul@pwsan.com> [120405 01:53]: > On Wed, 4 Apr 2012, Paul Walmsley wrote: > > > On Wed, 4 Apr 2012, Tony Lindgren wrote: > > > > > Thanks, looks like two of these patches I already merged into > > > fixes yesterday from your earlier pull request. So merging this > > > in would cause duplicate commits. Can you please update your > > > branch to remove those two commits? > > > > Do you happen to recall which ones they are? > > Anyway, am guessing that you are planning to pull these into your > 'fixes' branch? If so then probably the conflicts are with the > misc_devel_3.4 branch patches. Will post another pull request for you > with those two patches dropped. But if you're pulling these into a > different branch, please let me know... Yes it's the fixes branch I was talking about, thanks for updating it. Tony
On Thu, 5 Apr 2012, Tony Lindgren wrote:
> Yes it's the fixes branch I was talking about, thanks for updating it.
Thanks -- sorry about the confusion...
- Paul