From: Karen Xie <kxie@chelsio.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
James Bottomley <James.Bottomley@HansenPartnership.com>,
David Miller <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Anish Bhatt <anish@chelsio.com>,
Manoj Malviya <manojmalviya@chelsio.com>,
"Hannes Reinecke" <hare@suse.de>, Christoph Hellwig <hch@lst.de>
Subject: RE: linux-next: manual merge of the scsi tree with the net-next tree
Date: Wed, 23 Jul 2014 15:54:27 +0000 [thread overview]
Message-ID: <1442C3287A121140B690F7F20F94463D05BB32@nice.asicdesigners.com> (raw)
In-Reply-To: <20140723164049.413272e8@canb.auug.org.au>
Stephen, thanks a lot!
________________________________________
From: Stephen Rothwell [sfr@canb.auug.org.au]
Sent: Tuesday, July 22, 2014 11:40 PM
To: James Bottomley; David Miller; netdev@vger.kernel.org
Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Anish Bhatt; Karen Xie; Manoj Malviya; Hannes Reinecke; Christoph Hellwig
Subject: linux-next: manual merge of the scsi tree with the net-next tree
Hi James,
Today's linux-next merge of the scsi tree got a conflict in
drivers/scsi/cxgbi/libcxgbi.h between commit fc8d0590d914 ("libcxgbi:
Add ipv6 api to driver") from the net-next tree and commit 1abf635d2f33
("scsi: use 64-bit value for 'max_luns'") from the scsi tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/scsi/cxgbi/libcxgbi.h
index 8ad73d913f02,538d7a64e138..000000000000
--- a/drivers/scsi/cxgbi/libcxgbi.h
+++ b/drivers/scsi/cxgbi/libcxgbi.h
@@@ -708,8 -692,7 +708,8 @@@ struct cxgbi_device *cxgbi_device_regis
void cxgbi_device_unregister(struct cxgbi_device *);
void cxgbi_device_unregister_all(unsigned int flag);
struct cxgbi_device *cxgbi_device_find_by_lldev(void *);
+struct cxgbi_device *cxgbi_device_find_by_netdev(struct net_device *, int *);
- int cxgbi_hbas_add(struct cxgbi_device *, unsigned int, unsigned int,
+ int cxgbi_hbas_add(struct cxgbi_device *, u64, unsigned int,
struct scsi_host_template *,
struct scsi_transport_template *);
void cxgbi_hbas_remove(struct cxgbi_device *);
next prev parent reply other threads:[~2014-07-23 15:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-23 6:40 linux-next: manual merge of the scsi tree with the net-next tree Stephen Rothwell
2014-07-23 6:40 ` Stephen Rothwell
2014-07-23 15:54 ` Karen Xie [this message]
2015-06-02 7:31 Stephen Rothwell
2015-06-02 7:31 ` Stephen Rothwell
2018-05-25 1:38 Mark Brown
2018-06-08 3:11 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1442C3287A121140B690F7F20F94463D05BB32@nice.asicdesigners.com \
--to=kxie@chelsio.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=anish@chelsio.com \
--cc=davem@davemloft.net \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=manojmalviya@chelsio.com \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.