From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: Kumar, Kay Sievers <kay.sievers@vrfy.org>,
linuxppc-dev@ozlabs.org, linux-next@vger.kernel.org,
Paul Mackerras <paulus@samba.org>
Subject: Re: linux-next: manual merge of the driver-core tree
Date: Mon, 5 Jan 2009 10:28:00 +1100 [thread overview]
Message-ID: <20090105102800.c73bed11.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20081204042154.GA18027@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 1129 bytes --]
Hi Greg,
On Wed, 3 Dec 2008 20:21:54 -0800 Greg KH <greg@kroah.com> wrote:
>
> On Thu, Dec 04, 2008 at 10:44:18AM +1100, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the driver-core tree got a conflict in
> > arch/powerpc/platforms/85xx/mpc85xx_mds.c between commit
> > 24a99596f7465274a8e65ddd29a7d9028969b9f9 ("powerpc/85xx: Fix compile
> > warnings in mpc85xx_mds.c") from the galak tree and commit
> > f58f23751464d095f9942304bc5f6072b79a2cc3 ("powerpc: struct device -
> > replace bus_id with dev_name(), dev_set_name()") from the driver-core
> > tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary.
> >
> > Paul, maybe you should apply the patch from the driver-core tree as it
> > was cc'd to you and all its prerequisites are upstream.
>
> Yes, Paul, please apply the patch, and let me know. It will make things
> much easier in the end for everyone involved.
It looks like this has been applied to the powerpc tree and is now in
Linus' tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2009-01-04 23:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-03 23:44 linux-next: manual merge of the driver-core tree Stephen Rothwell
2008-12-04 4:21 ` Greg KH
2008-12-04 10:42 ` Paul Mackerras
2008-12-04 18:00 ` Greg KH
2009-01-04 23:28 ` Stephen Rothwell [this message]
2009-01-05 4:36 ` Greg KH
2009-01-05 5:57 ` Stephen Rothwell
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=20090105102800.c73bed11.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=kay.sievers@vrfy.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.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