All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Chiang <achiang@hp.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>,
	linux-next@vger.kernel.org, Greg KH <greg@kroah.com>,
	Kay Sievers <kay.sievers@vrfy.org>
Subject: Re: linux-next: pci merge conflict
Date: Tue, 10 Jun 2008 21:38:29 -0600	[thread overview]
Message-ID: <20080611033829.GC12778@ldl.fc.hp.com> (raw)
In-Reply-To: <20080611132338.f68e6cb1.sfr@canb.auug.org.au>

* Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi Jesse,
> 
> Today's linux-next merge of the pci tree got a conflict in
> drivers/pci/hotplug/fakephp.c between commit
> b9a4a152420e0158822ffb0cf0e57d36019604c7 ("driver-core: prepare for
> removal of 20 char limit from struct device") from the driver-core tree
> and commit fe99740cac117f208707488c03f3789cf4904957 ("PCI: construct one
> fakephp slot per PCI slot") from the pci tree.
> 
> I did what seemed to be the right thing - it seems that the driver-core
> patch to this file is no longer needed.  It is worth a check.

Yes, I mentioned the possibility of this conflict here:

	http://lkml.org/lkml/2008/6/10/382

And yes, dropping the driver-core hunk is the correct thing to
do.

Thanks Stephen!

/ac


  reply	other threads:[~2008-06-11  3:38 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-11  3:23 linux-next: pci merge conflict Stephen Rothwell
2008-06-11  3:38 ` Alex Chiang [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-05-28  2:27 Stephen Rothwell
2008-05-28  2:50 ` Kenji Kaneshige
2008-05-28  3:19   ` Stephen Rothwell
2008-05-28  4:04   ` Jesse Barnes
2008-05-28  4:08   ` Jesse Barnes
2008-05-28  5:53     ` Kenji Kaneshige
2008-05-28 17:57       ` Jesse Barnes

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=20080611033829.GC12778@ldl.fc.hp.com \
    --to=achiang@hp.com \
    --cc=greg@kroah.com \
    --cc=jbarnes@virtuousgeek.org \
    --cc=kay.sievers@vrfy.org \
    --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.