linux-kernel - Re: linux-next: manual merge of the pci tree with the pci-current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <201003260843.35458.bjorn.helgaas@hp.com>
Date:	Fri, 26 Mar 2010 08:43:35 -0600
From:	Bjorn Helgaas <bjorn.helgaas@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Jesse Barnes <jbarnes@...tuousgeek.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the pci tree with the pci-current tree

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/