From: Olof Johansson <olof@lixom.net>
To: Tony Lindgren <tony@atomide.com>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>,
Arnd Bergmann <arnd@arndb.de>,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] two trivial omap build error fixes for v3.8 merge window
Date: Thu, 20 Dec 2012 07:56:14 -0800 [thread overview]
Message-ID: <20121220155614.GA1034@quad.lixom.net> (raw)
In-Reply-To: <20121220152508.GW4989@atomide.com>
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
WARNING: multiple messages have this Message-ID (diff)
From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] two trivial omap build error fixes for v3.8 merge window
Date: Thu, 20 Dec 2012 07:56:14 -0800 [thread overview]
Message-ID: <20121220155614.GA1034@quad.lixom.net> (raw)
In-Reply-To: <20121220152508.GW4989@atomide.com>
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
next prev parent reply other threads:[~2012-12-20 15:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-19 17:18 [GIT PULL] two trivial omap build error fixes for v3.8 merge window Tony Lindgren
2012-12-19 17:18 ` Tony Lindgren
2012-12-20 15:01 ` Russell King - ARM Linux
2012-12-20 15:01 ` Russell King - ARM Linux
2012-12-20 15:25 ` Tony Lindgren
2012-12-20 15:25 ` Tony Lindgren
2012-12-20 15:56 ` Olof Johansson [this message]
2012-12-20 15:56 ` Olof Johansson
2012-12-20 16:03 ` Tony Lindgren
2012-12-20 16:03 ` Tony Lindgren
2012-12-20 16:03 ` Olof Johansson
2012-12-20 16:03 ` Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121220155614.GA1034@quad.lixom.net \
--to=olof@lixom.net \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.