Skip to contentSkip to conversation

PCI fix

GIT PULL Jesse Barnes 2 participants 2 messages Aug 22, 2009

lore
Share & tools
lore
#0 lore raw

The following changes since commit 6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f:
Linus Torvalds (1):
Merge branch 'for-linus' of git://git.kernel.org/.../ryusuke/nilfs2

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Just one fix here that turns out to fix a suspend/resume regression. It is a core change though, and I'm a little nervous about pushing it at this point. So feel free to ignore it if you think it's too risky; we can always land it in 2.6.31.1 during the merge window instead (to get it a little more coverage first).

Alek Du (1):
PCI: check saved state before restore

 drivers/pci/pci-driver.c |    2 +-
 drivers/pci/pci.c        |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

Thanks,

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
#1 lore raw
Quoted 6 lines · Jesse Barnes

Just one fix here that turns out to fix a suspend/resume regression. It is a core change though, and I'm a little nervous about pushing it at this point. So feel free to ignore it if you think it's too risky; we can always land it in 2.6.31.1 during the merge window instead (to get it a little more coverage first).

The patch looks so trivially correct that I have no qualms about taking it.

Not that "trivially correct" code hasn't triggered latent bugs before, but if it's known to fix a regressio I think this is a no-brainer. So pulled,

Linus