All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-omap <linux-omap@vger.kernel.org>,
	linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
	Kevin Hilman <khilman@linaro.org>,
	Olof Johansson <olof@lixom.net>
Subject: Re: [GIT PULL] OMAPDSS: use new display drivers
Date: Thu, 29 Aug 2013 00:07:33 -0700	[thread overview]
Message-ID: <20130829070732.GP7656@atomide.com> (raw)
In-Reply-To: <521EF102.5020607@ti.com>

* Tomi Valkeinen <tomi.valkeinen@ti.com> [130829 00:05]:
> On 29/08/13 09:35, Tony Lindgren wrote:
> > * Tomi Valkeinen <tomi.valkeinen@ti.com> [130828 23:33]:
> >> On 29/08/13 09:19, Tony Lindgren wrote:
> >>> * Tomi Valkeinen <tomi.valkeinen@ti.com> [130828 00:59]:
> 
> >>> I suggest you keep this branch immutable in case it need to be merged to arm-soc
> >>> tree, and merge it yourself along with the DSS patches. That way you
> >>
> >> I do feel a bit uneasy with merging lots of arch changes via fbdev tree,
> >> but yes, I guess I can do that. Is that an "ack" from you for all the
> >> patches? If I do merge it via fbdev, I want to have at least acked-by in
> >> the commits. If that was an ack, I'll add them, but it means I need to
> >> update the branch.
> > 
> > I would not start messing with the patches at this point to add acks
> > as then your branch is no longer immutable. If you prefer, then it's
> > best that Kevin and Olof merge take this pull request directly.
> 
> Well, the branch was just created yesterday anyway, as I rebased on -rc6
> as you requested.
> 
> I created a new branch with acks, 3.12/linux-omap-acked. I'll keep the
> old branch in place.

Oh OK, please remove the old branch ASAP so Kevin or Olof won't
accidentally pulls it!
 
> >>> don't have a dependency to arm-soc for removal of the old drivers.
> >>
> >> The dependency is run-time dependency, so the removal series does not
> >> need to be based on this. As long as this series is merged first, things
> >> should work.
> > 
> > OK, that's good. The only issue is that we're pretty much out of time
> > right now for v3.12 merge window.
> 
> Yep. Well, maybe it's easier if I try to merge this via fbdev. The
> problem there is that the fbdev maintainer has been inactive more or
> less for the whole summer, so how the pull requests will be managed is a
> bit unclear. But my guess is that I will be handling fbdev, which makes
> merging this series via fbdev easier.

Sounds good to me.

Regards,

Tony

WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] OMAPDSS: use new display drivers
Date: Thu, 29 Aug 2013 00:07:33 -0700	[thread overview]
Message-ID: <20130829070732.GP7656@atomide.com> (raw)
In-Reply-To: <521EF102.5020607@ti.com>

* Tomi Valkeinen <tomi.valkeinen@ti.com> [130829 00:05]:
> On 29/08/13 09:35, Tony Lindgren wrote:
> > * Tomi Valkeinen <tomi.valkeinen@ti.com> [130828 23:33]:
> >> On 29/08/13 09:19, Tony Lindgren wrote:
> >>> * Tomi Valkeinen <tomi.valkeinen@ti.com> [130828 00:59]:
> 
> >>> I suggest you keep this branch immutable in case it need to be merged to arm-soc
> >>> tree, and merge it yourself along with the DSS patches. That way you
> >>
> >> I do feel a bit uneasy with merging lots of arch changes via fbdev tree,
> >> but yes, I guess I can do that. Is that an "ack" from you for all the
> >> patches? If I do merge it via fbdev, I want to have at least acked-by in
> >> the commits. If that was an ack, I'll add them, but it means I need to
> >> update the branch.
> > 
> > I would not start messing with the patches at this point to add acks
> > as then your branch is no longer immutable. If you prefer, then it's
> > best that Kevin and Olof merge take this pull request directly.
> 
> Well, the branch was just created yesterday anyway, as I rebased on -rc6
> as you requested.
> 
> I created a new branch with acks, 3.12/linux-omap-acked. I'll keep the
> old branch in place.

Oh OK, please remove the old branch ASAP so Kevin or Olof won't
accidentally pulls it!
 
> >>> don't have a dependency to arm-soc for removal of the old drivers.
> >>
> >> The dependency is run-time dependency, so the removal series does not
> >> need to be based on this. As long as this series is merged first, things
> >> should work.
> > 
> > OK, that's good. The only issue is that we're pretty much out of time
> > right now for v3.12 merge window.
> 
> Yep. Well, maybe it's easier if I try to merge this via fbdev. The
> problem there is that the fbdev maintainer has been inactive more or
> less for the whole summer, so how the pull requests will be managed is a
> bit unclear. But my guess is that I will be handling fbdev, which makes
> merging this series via fbdev easier.

Sounds good to me.

Regards,

Tony

  reply	other threads:[~2013-08-29  7:07 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-28  7:52 [GIT PULL] OMAPDSS: use new display drivers Tomi Valkeinen
2013-08-28  7:52 ` Tomi Valkeinen
2013-08-29  6:19 ` Tony Lindgren
2013-08-29  6:19   ` Tony Lindgren
2013-08-29  6:26   ` Tomi Valkeinen
2013-08-29  6:26     ` Tomi Valkeinen
2013-08-29  6:35     ` Tony Lindgren
2013-08-29  6:35       ` Tony Lindgren
2013-08-29  6:58       ` Tomi Valkeinen
2013-08-29  6:58         ` Tomi Valkeinen
2013-08-29  7:07         ` Tony Lindgren [this message]
2013-08-29  7:07           ` Tony Lindgren

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=20130829070732.GP7656@atomide.com \
    --to=tony@atomide.com \
    --cc=khilman@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=tomi.valkeinen@ti.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.