lkml.org 
[lkml]   [2014]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the trivial tree with the pm tree
Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/pci/pci-driver.c between commit 0144fd0c8842 ("PCI / PM: Drop
CONFIG_PM_RUNTIME from the PCI core") from the pm tree and commit
2386dc4fb001 ("PCI: Fix comment typo 'COMFIG_PM_OPS") from the trivial
tree.

I fixed it up (the pm tree change was a subset of the trivial tree one)
and can carry the fix as necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2014-12-03 05:41    [W:0.195 / U:0.124 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site