* linux-next: manual merge of the scsi tree with the pci tree
@ 2012-09-17 3:17 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2012-09-17 3:17 UTC (permalink / raw)
To: James Bottomley
Cc: linux-next, linux-kernel, Jiang Liu, Bjorn Helgaas,
Atul Deshmukh, Chad Dupuis
[-- Attachment #1: Type: text/plain, Size: 557 bytes --]
Hi James,
Today's linux-next merge of the scsi tree got a conflict in
drivers/scsi/qla2xxx/qla_nx.c between commit 100924388407 ("[SCSI]
qla4xxx: Use PCI Express Capability accessors") from the pci tree and
commit 8fbb85e5f4c0 ("[SCSI] qla2xxx: Wrong PCIe(2.5Gb/s x8) speed in the
kerenel message for ISP82xx") from the scsi tree.
The latter removes one of the functions updated by the former. So I
removed it and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-09-17 3:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-17 3:17 linux-next: manual merge of the scsi tree with the pci tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).