From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jake Oshins <jakeo@microsoft.com>
Subject: linux-next: manual merge of the pci tree with the pci-current tree
Date: Wed, 24 Feb 2016 11:02:09 +1100 [thread overview]
Message-ID: <20160224110209.424b22bd@canb.auug.org.au> (raw)
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in:
drivers/pci/probe.c
between commit:
788858ebc49a ("PCI: Look up IRQ domain by fwnode_handle")
from the pci-current tree and commit:
5bd28338d681 ("PCI: Remove includes of empty asm-generic/pci-bridge.h")
from the pci tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/pci/probe.c
index 1e34d211389a,5eb378fbe849..000000000000
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -15,8 -15,6 +15,7 @@@
#include <linux/pci-aspm.h>
#include <linux/aer.h>
#include <linux/acpi.h>
+#include <linux/irqdomain.h>
- #include <asm-generic/pci-bridge.h>
#include "pci.h"
#define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */
next reply other threads:[~2016-02-24 0:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 0:02 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-10-09 19:27 linux-next: manual merge of the pci tree with the pci-current tree Mark Brown
2026-10-13 7:55 ` Geert Uytterhoeven
2026-10-13 11:15 ` Lukas Wunner
2026-01-05 0:55 Stephen Rothwell
2024-10-24 0:25 Stephen Rothwell
2024-10-24 6:56 ` Bartosz Golaszewski
2024-10-24 18:50 ` Bjorn Helgaas
2024-06-03 0:24 Stephen Rothwell
2018-08-01 0:42 Stephen Rothwell
2014-03-12 13:00 Mark Brown
2010-03-26 0:57 Stephen Rothwell
2010-03-26 2:10 ` Jesse Barnes
2010-03-26 2:48 ` Stephen Rothwell
2010-03-26 16:03 ` Jesse Barnes
2010-03-26 14:43 ` Bjorn Helgaas
2009-02-06 2:50 Stephen Rothwell
2009-02-06 17:09 ` Jesse Barnes
2009-02-06 23:49 ` Rafael J. Wysocki
2009-02-07 0:07 ` 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=20160224110209.424b22bd@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bhelgaas@google.com \
--cc=jakeo@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.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 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.