Patchwork [GIT,PULL] two trivial omap build error fixes for v3.8 merge window

login
register
mail settings
Submitter Tony Lindgren
Date Dec. 19, 2012, 5:18 p.m.
Message ID <20121219171828.GP4989@atomide.com>
Download mbox
Permalink /patch/207460/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/fixes-for-merge-window-part2-signed

Comments

Tony Lindgren - Dec. 19, 2012, 5:18 p.m.
Hi Arnd & Olof,

Here's few more trivial build fixes caused by the merge
conflicts.

Tony


The following changes since commit 5031a2a7c12b837a0913c4139ebeb6bbff5e1aa5:

  Merge tag 'for-v3.8-part2' of git://git.infradead.org/battery-2.6 (2012-12-19 08:14:08 -0800)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/fixes-for-merge-window-part2-signed

for you to fetch changes up to a702e279da5154d09a894bf9eac594845da3f390:

  ARM: OMAP: Fix build breakage due to missing include in i2c.c (2012-12-19 08:37:30 -0800)

----------------------------------------------------------------
Looks like few more trivial merge errors caused by the
multiplatform related header clean-up popped up.

----------------------------------------------------------------
Peter Ujfalusi (1):
      ARM: OMAP2+: Fix compillation error in mach-omap2/timer.c

Vaibhav Bedia (1):
      ARM: OMAP: Fix build breakage due to missing include in i2c.c

 arch/arm/mach-omap2/i2c.c   | 1 +
 arch/arm/mach-omap2/timer.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
Russell King - ARM Linux - Dec. 20, 2012, 3:01 p.m.
On Wed, Dec 19, 2012 at 09:18:28AM -0800, Tony Lindgren wrote:
> Here's few more trivial build fixes caused by the merge
> conflicts.

If Olof isn't able to pull this stuff in tonight, I'll pull it into my
tree and send it up with my stuff.  I'll also see about picking up
on the previous one with the common.c vram.h fix too.

I'm not sure what Olof's plans are, but I know Arnd isn't around at
the moment, and Olof was travelling a couple of days ago and hasn't
reappeared since.  I don't think we can leave these fixes any longer
as OMAP has been broken in mainline for at least the last four days
and we're nearing the end of the merge window.
Tony Lindgren - Dec. 20, 2012, 3:25 p.m.
* Russell King - ARM Linux <linux@arm.linux.org.uk> [121220 07:03]:
> On Wed, Dec 19, 2012 at 09:18:28AM -0800, Tony Lindgren wrote:
> > Here's few more trivial build fixes caused by the merge
> > conflicts.
> 
> If Olof isn't able to pull this stuff in tonight, I'll pull it into my
> tree and send it up with my stuff.  I'll also see about picking up
> on the previous one with the common.c vram.h fix too.

I just replied to the "[GIT PULL] ARM: arm-soc fixes for 3.8" thread
suggesting Linus pull it. It seems that the issue with that one
.dts file can easily be fixed later on and there's no need to go
tinker with that branch.

Please go ahead and pull in the $Subject: branch though, these two
are not yet in Olof's branch.

> I'm not sure what Olof's plans are, but I know Arnd isn't around at
> the moment, and Olof was travelling a couple of days ago and hasn't
> reappeared since.  I don't think we can leave these fixes any longer
> as OMAP has been broken in mainline for at least the last four days
> and we're nearing the end of the merge window.

Yes, Olof mentioned that he should be back online within few days.
He's probably enjoying the bastu :)

Regards,

Tony
Olof Johansson - Dec. 20, 2012, 3:56 p.m.
On Thu, Dec 20, 2012 at 07:25:08AM -0800, Tony Lindgren wrote:
> * Russell King - ARM Linux <linux@arm.linux.org.uk> [121220 07:03]:
> > On Wed, Dec 19, 2012 at 09:18:28AM -0800, Tony Lindgren wrote:
> > > Here's few more trivial build fixes caused by the merge
> > > conflicts.
> > 
> > If Olof isn't able to pull this stuff in tonight, I'll pull it into my
> > tree and send it up with my stuff.  I'll also see about picking up
> > on the previous one with the common.c vram.h fix too.
> 
> I just replied to the "[GIT PULL] ARM: arm-soc fixes for 3.8" thread
> suggesting Linus pull it. It seems that the issue with that one
> .dts file can easily be fixed later on and there's no need to go
> tinker with that branch.
> 
> Please go ahead and pull in the $Subject: branch though, these two
> are not yet in Olof's branch.
> 
> > I'm not sure what Olof's plans are, but I know Arnd isn't around at
> > the moment, and Olof was travelling a couple of days ago and hasn't
> > reappeared since.  I don't think we can leave these fixes any longer
> > as OMAP has been broken in mainline for at least the last four days
> > and we're nearing the end of the merge window.
> 
> Yes, Olof mentioned that he should be back online within few days.
> He's probably enjoying the bastu :)

More like dealing with sick and jetlagged kids, and having issues with
a decent 3G connection where I'm staying (almost literally in the middle
of nowhere). It's the first time my current workflow of ssh:ing to my main
workstation has not worked well, unfortunately.

I've redone the sunxi pieces of the fixes branch now, and will apply the other
recent pull requests and will include those. Since Tony's patches are on
a branch, if Russell overtakes me and gets his pull request in, there won't be
any problems caused by it.

I'll have a fresh pull request for Linus in an hour or so.


-Olof
Tony Lindgren - Dec. 20, 2012, 4:03 p.m.
* Olof Johansson <olof@lixom.net> [121220 07:58]:
> On Thu, Dec 20, 2012 at 07:25:08AM -0800, Tony Lindgren wrote:
> > * Russell King - ARM Linux <linux@arm.linux.org.uk> [121220 07:03]:
> > > On Wed, Dec 19, 2012 at 09:18:28AM -0800, Tony Lindgren wrote:
> > > > Here's few more trivial build fixes caused by the merge
> > > > conflicts.
> > > 
> > > If Olof isn't able to pull this stuff in tonight, I'll pull it into my
> > > tree and send it up with my stuff.  I'll also see about picking up
> > > on the previous one with the common.c vram.h fix too.
> > 
> > I just replied to the "[GIT PULL] ARM: arm-soc fixes for 3.8" thread
> > suggesting Linus pull it. It seems that the issue with that one
> > .dts file can easily be fixed later on and there's no need to go
> > tinker with that branch.
> > 
> > Please go ahead and pull in the $Subject: branch though, these two
> > are not yet in Olof's branch.
> > 
> > > I'm not sure what Olof's plans are, but I know Arnd isn't around at
> > > the moment, and Olof was travelling a couple of days ago and hasn't
> > > reappeared since.  I don't think we can leave these fixes any longer
> > > as OMAP has been broken in mainline for at least the last four days
> > > and we're nearing the end of the merge window.
> > 
> > Yes, Olof mentioned that he should be back online within few days.
> > He's probably enjoying the bastu :)
> 
> More like dealing with sick and jetlagged kids, and having issues with
> a decent 3G connection where I'm staying (almost literally in the middle
> of nowhere). It's the first time my current workflow of ssh:ing to my main
> workstation has not worked well, unfortunately.

Welcome back :)
 
> I've redone the sunxi pieces of the fixes branch now, and will apply the other
> recent pull requests and will include those. Since Tony's patches are on
> a branch, if Russell overtakes me and gets his pull request in, there won't be
> any problems caused by it.

Right, those branches are safe to merge into whichever branches
need them.
 
> I'll have a fresh pull request for Linus in an hour or so.

OK, hope my reply to that thread does not confuse things further.

Regards,

Tony
Olof Johansson - Dec. 20, 2012, 4:03 p.m.
On Wed, Dec 19, 2012 at 09:18:28AM -0800, Tony Lindgren wrote:
> Hi Arnd & Olof,
> 
> Here's few more trivial build fixes caused by the merge
> conflicts.
> 
> Tony
> 
> 
> The following changes since commit 5031a2a7c12b837a0913c4139ebeb6bbff5e1aa5:
> 
>   Merge tag 'for-v3.8-part2' of git://git.infradead.org/battery-2.6 (2012-12-19 08:14:08 -0800)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/fixes-for-merge-window-part2-signed

Thanks, pulled.

-Olof