From: Joerg Roedel <joro@8bytes.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Rafael J. Wysocki" <rjw@sisk.pl>,
Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: linux-next: manual merge of the iommu tree with the pci-current tree
Date: Fri, 16 Dec 2011 09:52:47 +0100 [thread overview]
Message-ID: <20111216085247.GA28302@8bytes.org> (raw)
In-Reply-To: <20111216133026.8bac235bb8495cfd8669b761@canb.auug.org.au>
Hi Stephen,
On Fri, Dec 16, 2011 at 01:30:26PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the iommu tree got a conflict in
> drivers/pci/hotplug/acpiphp_glue.c between commit 619a5182d1f3 ("PCI
> hotplug: Always allow acpiphp to handle non-PCIe bridges") from the
> pci-current tree and commit d90116ea38f7 ("PCI/ACPI: Make acpiphp ignore
> root bridges using SHPC native hotplug") from the iommu tree.
That's weird. This conflict is between a patch in my tree which I pulled
in from the PCI tree and another patch from the PCI tree. So any
conflict should already be solved in the PCI tree, no?
Jesse, the pri-changes branch you provided me is a subset of your
linux-next branch, right?
> I fixed it up (I think - see below) and can carry the fix as necessary.
Jesse should comment on the correctness of the fix :)
Joerg
next prev parent reply other threads:[~2011-12-16 8:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-16 2:30 linux-next: manual merge of the iommu tree with the pci-current tree Stephen Rothwell
2011-12-16 8:52 ` Joerg Roedel [this message]
2011-12-16 15:18 ` Jesse Barnes
2011-12-16 15:30 ` Joerg Roedel
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=20111216085247.GA28302@8bytes.org \
--to=joro@8bytes.org \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@sisk.pl \
--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.