From: Linus Torvalds <torvalds@linux-foundation.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>,
Grant Likely <grant.likely@secretlab.ca>,
Kumar Gala <galak@kernel.crashing.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linux-pci@vger.kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [git pull] first round of PCI updates for 2.6.32
Date: Wed, 16 Sep 2009 07:55:59 -0700 (PDT) [thread overview]
Message-ID: <alpine.LFD.2.01.0909160753000.4950@localhost.localdomain> (raw)
In-Reply-To: <20090915132105.2fdd1d45@jbarnes-g45>
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
next prev parent reply other threads:[~2009-09-16 14:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-15 20:21 Jesse Barnes
2009-09-16 14:55 ` Linus Torvalds [this message]
2009-09-16 15:20 ` Stephen Rothwell
2009-09-17 17:30 ` Ingo Molnar
2009-09-17 17:36 ` Jesse Barnes
2009-09-17 17:59 ` Ingo Molnar
2009-09-17 18:46 ` Jesse Barnes
2009-09-18 7:59 ` [crash] BUG: unable to handle kernel NULL pointer dereference at (null), last sysfs file: /sys/devices/pci0000:00/0000:00:01.0/local_cpus Ingo Molnar
2009-09-18 9:37 ` David Rientjes
2009-09-18 15:38 ` Linus Torvalds
2009-09-18 15:44 ` Jesse Barnes
2009-09-24 8:18 ` Rusty Russell
2009-09-24 12:18 ` [tip:x86/urgent] x86: Remove redundant non-NUMA topology functions tip-bot for Rusty Russell
2009-09-18 16:24 ` [crash] BUG: unable to handle kernel NULL pointer dereference at (null), last sysfs file: /sys/devices/pci0000:00/0000:00:01.0/local_cpus Yinghai Lu
2009-09-18 16:34 ` Jesse Barnes
2009-09-18 16:51 ` Linus Torvalds
2009-09-18 17:10 ` Jesse Barnes
2009-09-18 15:27 ` [git pull] first round of PCI updates for 2.6.32 Jesse Barnes
2009-09-18 15:52 ` Ingo Molnar
2009-09-18 16:17 ` Jesse Barnes
2009-09-17 17:45 ` Yinghai Lu
2009-09-17 18:31 ` Ingo Molnar
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=alpine.LFD.2.01.0909160753000.4950@localhost.localdomain \
--to=torvalds@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=galak@kernel.crashing.org \
--cc=grant.likely@secretlab.ca \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
/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
Powered by JetHome