From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Theodore Tso <tytso@MIT.EDU>, LKML <linux-kernel@vger.kernel.org>,
linuxppc-dev@ozlabs.org, linux-next@vger.kernel.org,
Paul Mackerras <paulus@samba.org>,
Dan Williams <dan.j.williams@intel.com>
Subject: Re: linux-next: Tree for March 20
Date: Tue, 25 Mar 2008 00:31:11 -0700 [thread overview]
Message-ID: <20080325073111.GA17879@kroah.com> (raw)
In-Reply-To: <20080325174817.6018edd8.sfr@canb.auug.org.au>
On Tue, Mar 25, 2008 at 05:48:17PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> On Wed, 19 Mar 2008 21:57:19 -0700 Greg KH <greg@kroah.com> wrote:
> >
> > On Thu, Mar 20, 2008 at 02:39:53PM +1100, Stephen Rothwell wrote:
> > >
> > > driver-core/driver-core-remove-no-longer-used-struct-class_device.patch
> > > should be merged late
>
> I still need to revert this so that the scsi tree can build (st.c).
I'll be sending this to Linus after -rc1 comes out, so it's fine that it
needs to be reverted for now.
> > > driver-core/ib-convert-struct-class_device-to-struct-device.patch
> > > conflicts with the infiniband tree
>
> This still has the same conflicts, but they are papered over by my use of
> git-rerere (which remembers my previous merge fixup and applies it for
> me).
Yeah, __FUNCTION__ fun :(
> > > driver-core/pm-make-wakeup-flags-available-whenever-config_pm-is-set.patch
> > > breaks non CONFIG_PM builds of drivers/serial/serial_core.c
>
> This one seems to be fixed.
Glad to hear it.
greg k-h
prev parent reply other threads:[~2008-03-25 7:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-20 3:39 linux-next: Tree for March 20 Stephen Rothwell
2008-03-20 4:21 ` Randy Dunlap
2008-03-20 15:14 ` Mauro Carvalho Chehab
2008-03-20 4:57 ` Greg KH
2008-03-20 6:17 ` Stephen Rothwell
2008-03-25 6:48 ` Stephen Rothwell
2008-03-25 7:31 ` Greg KH [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=20080325073111.GA17879@kroah.com \
--to=greg@kroah.com \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
--cc=sfr@canb.auug.org.au \
--cc=tytso@MIT.EDU \
/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).