From: Jesse Barnes <email@example.com>
To: Greg KH <firstname.lastname@example.org>
Cc: Stephen Rothwell <email@example.com>,
firstname.lastname@example.org, Kay Sievers <email@example.com>,
"Rafael J. Wysocki" <firstname.lastname@example.org>
Subject: Re: linux-next: pci/driver-core merge conflicts
Date: Thu, 29 May 2008 08:57:16 -0700 [thread overview]
Message-ID: <email@example.com> (raw)
On Wednesday, May 28, 2008 7:59 pm Greg KH wrote:
> On Thu, May 29, 2008 at 12:18:47PM +1000, Stephen Rothwell wrote:
> > Hi Jesse, Greg,
> > Today's linux-next merge of the pci tree got a trivial conflict in
> > drivers/base/power/main.c between commit
> > bd24b944eb93549b1ca5becbf27c7373504f7eed ("driver-core: prepare for
> > removal of 20 char limit from struct device") from the driver-core tree
> > and commit 4ba09608f82f2273b731560f702f8bbb167f4c23 ("Introduce new top
> > level suspend and hibernation callbacks") from the pci tree. I took the
> > latter version except to use "dev_name(dev->parent)" instead of
> > "dev->parent->bus_id".
> Yes, that is correct.
> > The second conflict was in include/linux/device.h between commit
> > 9c77d9cc76e424a3c59822c405cbf75a45465170 ("class: move driver core
> > specific parts to a private structure") from the driver-core tree and
> > commit 4ba09608f82f2273b731560f702f8bbb167f4c23 ("Introduce new top level
> > suspend and hibernation callbacks") from the pci tree. I just added both
> > new fields of struct class.
> That should be fine.
Hm, I knew this would cause problems eventually. :) Should I put these fixups
in my tree? Or can you track them somehow, Stephen?
next prev parent reply other threads:[~2008-05-29 15:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-29 2:18 linux-next: pci/driver-core merge conflicts Stephen Rothwell
2008-05-29 2:59 ` Greg KH
2008-05-29 15:57 ` Jesse Barnes [this message]
2008-05-29 16:02 ` Greg KH
2008-05-30 0:55 ` Stephen Rothwell
2008-05-30 0:53 ` Stephen Rothwell
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:
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
* 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).