From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the staging tree with the tree
Date: Thu, 19 Mar 2009 08:32:45 -0700 [thread overview]
Message-ID: <20090319153245.GA13963@kroah.com> (raw)
In-Reply-To: <20090319211247.5976c505.sfr@canb.auug.org.au>
On Thu, Mar 19, 2009 at 09:12:47PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts due to the
> removal of the benet driver from staging in Linus' tree.
Yes, sorry, Linus took that patch and I didn't have a chance to update
my tree yet. Give me an hour or so to get it merged up properly.
thanks,
greg k-h
next prev parent reply other threads:[~2009-03-19 15:33 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-19 10:12 linux-next: manual merge of the staging tree with the tree Stephen Rothwell
2009-03-19 15:32 ` Greg KH [this message]
2009-03-19 15:53 ` Greg KH
2009-03-19 21:42 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-11-10 2:24 Stephen Rothwell
2010-11-10 18:40 ` Greg KH
2014-03-12 1:27 Mark Brown
2014-03-12 1:48 ` Greg KH
2014-03-12 1:32 Mark Brown
2014-03-12 1:49 ` Greg KH
2014-03-12 1:37 Mark Brown
2014-03-13 0:50 Mark Brown
2014-03-13 9:17 ` Laurent Pinchart
2014-03-20 15:44 ` Grant Likely
2014-03-20 17:09 ` Mauro Carvalho Chehab
2014-03-20 18:51 ` Grant Likely
2014-07-11 5:21 Stephen Rothwell
2014-07-11 5:32 ` Sachin Kamat
2014-07-11 6:10 ` Stephen Rothwell
2014-07-11 6:22 ` Sachin Kamat
2014-07-12 16:53 ` Greg KH
2014-08-01 6:21 Stephen Rothwell
2014-08-01 7:38 ` Greg KH
2015-12-02 20:17 Mark Brown
2015-12-02 22:07 ` Greg KH
2015-12-03 0:07 ` Mark Brown
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=20090319153245.GA13963@kroah.com \
--to=greg@kroah.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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.