Messages in this thread | | | Date | Tue, 25 Oct 2011 20:07:08 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the block tree |
| |
Hi James,
Today's linux-next merge of the akpm tree got a conflict in drivers/block/cciss.c between commit ab5dbebe33e0 ("cciss: add small delay when using PCI Power Management to reset for kump") from the block tree and commit c9e69629e873 ("cciss: add half second delay to PCI PM reset code") from the akpm tree.
These are essentially the same patch, so I dropped the akpm tree one. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |