linux-kernel - Re: [git pull] first round of PCI updates for 2.6.32

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <alpine.LFD.2.01.0909160753000.4950@localhost.localdomain>
Date:	Wed, 16 Sep 2009 07:55:59 -0700 (PDT)
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Jesse Barnes <jbarnes@...tuousgeek.org>,
	Grant Likely <grant.likely@...retlab.ca>,
	Kumar Gala <galak@...nel.crashing.org>,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>
cc:	linux-pci@...r.kernel.org,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [git pull] first round of PCI updates for 2.6.32



On Tue, 15 Sep 2009, Jesse Barnes wrote:
>
> The following changes since commit 332a3392188e0ad966543c87b8da2b9d246f301d:
>   Linus Torvalds (1):
>         Merge git://git.kernel.org/.../herbert/crypto-2.6
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 linux-next
> 
> There are a few important changes in here:
>   - support for PCIe fundamental reset from Mike (needed for error recovery on
>     some devices)

This one clashed trivially with the powerpc merge ("move pci_64.c device 
tree scanning code into pci-common.c" clashes with "PCI/powerpc: support
PCIe fundamental reset.")

I fixed it up, and I'm pretty sure it's all ok (it really was just a 
function movement and a single new added line), but ppc PCI people should 
double-check the result.

		Linus
--
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/