linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: ben-linux@fluff.org (Ben Dooks)
To: linux-arm-kernel@lists.infradead.org
Subject: SAMSUNG kernel tree merge plans
Date: Thu, 6 May 2010 10:15:25 +0100	[thread overview]
Message-ID: <20100506091524.GD6684@trinity.fluff.org> (raw)
In-Reply-To: <201005061021.06125.anarsoul@gmail.com>

On Thu, May 06, 2010 at 10:21:02AM +0300, Vasily Khoruzhick wrote:
> ?? ?????????????????? ???? 6 ?????? 2010 08:46:51 ?????????? Ben Dooks ??????????????:
> > I'm busy sorting out the trees for the next mege window, and should
> > have a new next-samsung out in the next two or three days.
> > 
> > As such, if there is anything that needs to go via Russell's tree, then
> > it needs to be merged as soon as possible. I would like to send a pull
> > before Wednesday.
> > 
> > Anything else, if it is not merged into one of my trees by the end of
> > next week (May 14th) then there is no guarantees that it will be merged.
> > 
> > If everyone interested in this could check my trees after the weekend and
> > make any reminders of other stuff to fix at that point as there is still
> > items being processed.
> > 
> > http://git.fluff.org/gitweb?p=bjdooks/linux.git;a=summary
> 
> Is there any chance that my rx1950-support patch series will be merged? I've 
> almost finished moving to gpiolib and can send series after this weekend. What 
> branch of your tree should I use as base?

At the worst, just use linus' latest and any merge differences can be
dealt with when merging. Given that gpiolib mostly works already, it
shouldn't be necessary to do any machine changes when merging.

I'll announce a new samsung-next as soon as possible.

-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

      reply	other threads:[~2010-05-06  9:15 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-06  5:46 SAMSUNG kernel tree merge plans Ben Dooks
2010-05-06  6:50 ` Marek Szyprowski
2010-05-10  3:49   ` Ben Dooks
2010-05-11  7:57     ` Marek Szyprowski
2010-05-06  7:21 ` Vasily Khoruzhick
2010-05-06  9:15   ` Ben Dooks [this message]

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=20100506091524.GD6684@trinity.fluff.org \
    --to=ben-linux@fluff.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).