From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>
Cc: linux-next@vger.kernel.org,
Robert Richter <robert.richter@amd.com>,
Olaf Dabrunz <od@suse.de>
Subject: linux-next: manual merge of the timers tree
Date: Fri, 12 Sep 2008 16:57:34 +1000 [thread overview]
Message-ID: <20080912165734.a8f8e64f.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the timers tree got a conflict in
include/linux/pci_ids.h between commit
ca1af29a733629b9158a4a32a927d16ff9009a95 ("x86, pci: add northbridge pci
ids for fam 0x11 processors") from the x86 tree and commit
021f8b75e78f9da67421a2c2e320e8934a90914a ("x86: add PCI IDs for AMD
Barcelona PCI devices") from the timers tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc include/linux/pci_ids.h
index 58bb4bc,f719d91..0000000
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -497,11 -497,11 +497,16 @@@
#define PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP 0x1101
#define PCI_DEVICE_ID_AMD_K8_NB_MEMCTL 0x1102
#define PCI_DEVICE_ID_AMD_K8_NB_MISC 0x1103
+ #define PCI_DEVICE_ID_AMD_10H_NB_HT 0x1200
+ #define PCI_DEVICE_ID_AMD_10H_NB_MAP 0x1201
+ #define PCI_DEVICE_ID_AMD_10H_NB_DRAM 0x1202
+ #define PCI_DEVICE_ID_AMD_10H_NB_MISC 0x1203
+ #define PCI_DEVICE_ID_AMD_10H_NB_LINK 0x1204
+#define PCI_DEVICE_ID_AMD_11H_NB_HT 0x1300
+#define PCI_DEVICE_ID_AMD_11H_NB_MAP 0x1301
+#define PCI_DEVICE_ID_AMD_11H_NB_DRAM 0x1302
+#define PCI_DEVICE_ID_AMD_11H_NB_MISC 0x1303
+#define PCI_DEVICE_ID_AMD_11H_NB_LINK 0x1304
#define PCI_DEVICE_ID_AMD_LANCE 0x2000
#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
#define PCI_DEVICE_ID_AMD_SCSI 0x2020
next reply other threads:[~2008-09-12 6:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-12 6:57 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-09-12 7:10 linux-next: manual merge of the timers tree Stephen Rothwell
2008-10-14 5:51 Stephen Rothwell
2008-10-14 5:59 Stephen Rothwell
2008-10-14 6:03 Stephen Rothwell
2008-10-14 6:12 Stephen Rothwell
2008-10-21 1:43 Stephen Rothwell
2008-10-21 12:15 ` Ingo Molnar
2008-10-21 12:18 ` Stephen Rothwell
2008-12-29 2:02 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=20080912165734.a8f8e64f.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=od@suse.de \
--cc=robert.richter@amd.com \
--cc=tglx@linutronix.de \
/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