From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jesse Barnes <jbarnes@virtuousgeek•org>
Cc: linux-next@vger•kernel.org,
Robert Richter <robert.richter@amd•com>,
Gary Hade <garyhade@us•ibm.com>, Ingo Molnar <mingo@elte•hu>
Subject: linux-next: manual merge of the pci tree
Date: Wed, 25 Jun 2008 13:01:04 +1000 [thread overview]
Message-ID: <20080625130104.b376c221.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
Hi Jesse,
Today's linux-next merge of the pci tree got a conflict in
arch/x86/pci/pci.h between commit
547084aab406ea46c1b9bebb115dc86787720c11 ("x86: Move PCI IO ECS code to
x86/pci") from the x86 tree and commit
bb71ad880204b79d60331d3384103976e086cb9f ("PCI: boot parameter to avoid
expansion ROM memory allocation") from the pci tree.
Both commits wanted to use 0x40000 for a define (PCI_HAS_IO_ECS and
PCI_NOASSIGN_ROMS). I set PCI_NOASSIGN_ROMS to 0x80000.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-06-25 3:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-25 3:01 Stephen Rothwell [this message]
2008-06-25 19:28 ` linux-next: manual merge of the pci tree Jesse Barnes
-- strict thread matches above, loose matches on Subject: below --
2017-02-19 22:40 Stephen Rothwell
2009-01-06 0:54 Stephen Rothwell
2008-12-11 0:53 Stephen Rothwell
2008-10-20 4:00 Stephen Rothwell
2008-10-20 18:36 ` Jesse Barnes
2008-10-16 3:24 Stephen Rothwell
2008-10-16 12:32 ` Jesse Barnes
2008-07-08 1:13 Stephen Rothwell
2008-07-03 2:10 Stephen Rothwell
2008-07-03 2:15 ` Stephen Rothwell
2008-07-03 3:28 ` Greg KH
2008-07-03 19:23 ` Jesse Barnes
2008-07-04 0:09 ` Stephen Rothwell
2008-07-04 0:13 ` Jesse Barnes
2008-07-04 0:14 ` Stephen Rothwell
2008-07-01 3:53 Stephen Rothwell
2008-07-01 5:58 ` Ingo Molnar
2008-07-01 6:29 ` Stephen Rothwell
2008-07-02 1:56 ` Jesse Barnes
2008-07-02 2:09 ` Yinghai Lu
2008-07-02 3:19 ` Stephen Rothwell
2008-06-25 2:57 Stephen Rothwell
2008-06-25 19:27 ` 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=20080625130104.b376c221.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=garyhade@us$(echo .)ibm.com \
--cc=jbarnes@virtuousgeek$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=robert.richter@amd$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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