From: Bjorn Helgaas <bjorn.helgaas@hp•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Jesse Barnes <jbarnes@virtuousgeek•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the pci tree with the pci-current tree
Date: Fri, 26 Mar 2010 08:43:35 -0600 [thread overview]
Message-ID: <201003260843.35458.bjorn.helgaas@hp.com> (raw)
In-Reply-To: <20100326115712.2d800053.sfr@canb.auug.org.au>
On Thursday 25 March 2010 06:57:12 pm Stephen Rothwell wrote:
> Hi Jesse,
>
> Today's linux-next merge of the pci tree got a conflict in
> arch/x86/pci/acpi.c between commit
> eb9fc8ef7cb1362374e55d9503e3e7458f319991 ("x86/PCI: for host bridge
> address space collisions, show conflicting resource") from the
> pci-current tree and commit 7589c4d809ccfc88100ba224e3358706fd21f37e
> ("x86/PCI: trim _CRS windows when they conflict with previous
> reservations") from the pci tree.
I'm sure Jesse has straightened this out already, but my intent
was to drop the "trim _CRS windows when they conflict" patch.
I replaced it with one called "truncate _CRS windows with _LEN >
_MAX - _MIN + 1".
Bjorn
next prev parent reply other threads:[~2010-03-26 14:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-26 0:57 linux-next: manual merge of the pci tree with the pci-current tree 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 [this message]
-- strict thread matches above, loose matches on Subject: below --
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
2016-02-24 0:02 Stephen Rothwell
2014-03-12 13:00 Mark Brown
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=201003260843.35458.bjorn.helgaas@hp.com \
--to=bjorn.helgaas@hp$(echo .)com \
--cc=jbarnes@virtuousgeek$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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