[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20120917131744.2f646ebfca9806ee5850fe03@canb.auug.org.au>
Date: Mon, 17 Sep 2012 13:17:44 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: James Bottomley <James.Bottomley@...senPartnership.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Jiang Liu <jiang.liu@...wei.com>,
Bjorn Helgaas <bhelgaas@...gle.com>,
Atul Deshmukh <atul.deshmukh@...gic.com>,
Chad Dupuis <chad.dupuis@...gic.com>
Subject: linux-next: manual merge of the scsi tree with the pci tree
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@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists