From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: target-devel <target-devel@vger.kernel.org>,
linux-scsi <linux-scsi@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Christoph Hellwig <hch@lst.de>, Andy Grover <agrover@redhat.com>,
Hannes Reinecke <hare@suse.de>, Roland Dreier <roland@kernel.org>,
James Bottomley <James.Bottomley@HansenPartnership.com>,
Boaz Harrosh <openosd@gmail.com>,
Mike Christie <michaelc@cs.wisc.edu>
Subject: [GIT PULL-v2] iscsi-target merge for v3.1-rc1
Date: Tue, 26 Jul 2011 19:13:59 -0700 [thread overview]
Message-ID: <1311732839.10646.132.camel@haakon2.linux-iscsi.org> (raw)
Hi Linus,
Here is an updated pull request for an initial v3.1-rc1 merge of
iscsi_target including the updates to address some recent build breakage
with iscsi_proto.h in linux-next, and minor build warnings on 32-bit.
This also includes the DIV_ROUND_UP_SECTOR_T bit and associated change
for targte_core_mod from this morning that address the 32-bit unsigned
long long division build issues as per your direction on LKML. This can
definately use some more discussion and testing in linux-next, so please
let me know if how you prefer to merge these.
The series is available directly here:
master.kernel.org:/pub/scm/linux/kernel/git/nab/target-pending.git for-next
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git for-next
The series is based on the following mainline HEAD:
commit bbd9d6f7fbb0305c9a592bf05a32e87eb364a4ff
Merge: 8e20487 5a9a436
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri Jul 22 19:02:39 2011 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
Also just double checking, here the for-next branch is merge conflict
free on yesterdays linux-next (20110725), and latest mainline HEAD from
afternoon.
Thank you,
Signed-of-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Andy Grover (1):
iscsi: Use struct scsi_lun in iscsi structs instead of u8[8]
Nicholas Bellinger (5):
iscsi: Resolve iscsi_proto.h naming conflicts with
drivers/target/iscsi
iscsi: Add Serial Number Arithmetic LT and GT into iscsi_proto.h
iscsi-target: Add iSCSI fabric support for target v4.1
kernel.h: Add DIV_ROUND_UP_ULL and DIV_ROUND_UP_SECTOR_T macro usage
target: Convert to DIV_ROUND_UP_SECTOR_T usage for sectors /
dev_max_sectors
drivers/infiniband/ulp/iser/iser_initiator.c | 2 +-
drivers/scsi/be2iscsi/be_main.c | 5 +-
drivers/scsi/be2iscsi/be_main.h | 4 +-
drivers/scsi/bnx2i/bnx2i_hwi.c | 16 +-
drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +-
drivers/scsi/libiscsi.c | 36 +-
drivers/target/Kconfig | 1 +
drivers/target/Makefile | 2 +-
drivers/target/iscsi/Kconfig | 8 +
drivers/target/iscsi/Makefile | 20 +
drivers/target/iscsi/iscsi_target.c | 4559 +++++++++++++++++++++
drivers/target/iscsi/iscsi_target.h | 42 +
drivers/target/iscsi/iscsi_target_auth.c | 490 +++
drivers/target/iscsi/iscsi_target_auth.h | 31 +
drivers/target/iscsi/iscsi_target_configfs.c | 1882 +++++++++
drivers/target/iscsi/iscsi_target_configfs.h | 7 +
drivers/target/iscsi/iscsi_target_core.h | 859 ++++
drivers/target/iscsi/iscsi_target_datain_values.c | 531 +++
drivers/target/iscsi/iscsi_target_datain_values.h | 12 +
drivers/target/iscsi/iscsi_target_device.c | 87 +
drivers/target/iscsi/iscsi_target_device.h | 9 +
drivers/target/iscsi/iscsi_target_erl0.c | 1004 +++++
drivers/target/iscsi/iscsi_target_erl0.h | 15 +
drivers/target/iscsi/iscsi_target_erl1.c | 1299 ++++++
drivers/target/iscsi/iscsi_target_erl1.h | 26 +
drivers/target/iscsi/iscsi_target_erl2.c | 474 +++
drivers/target/iscsi/iscsi_target_erl2.h | 18 +
drivers/target/iscsi/iscsi_target_login.c | 1232 ++++++
drivers/target/iscsi/iscsi_target_login.h | 12 +
drivers/target/iscsi/iscsi_target_nego.c | 1067 +++++
drivers/target/iscsi/iscsi_target_nego.h | 17 +
drivers/target/iscsi/iscsi_target_nodeattrib.c | 263 ++
drivers/target/iscsi/iscsi_target_nodeattrib.h | 14 +
drivers/target/iscsi/iscsi_target_parameters.c | 1905 +++++++++
drivers/target/iscsi/iscsi_target_parameters.h | 269 ++
drivers/target/iscsi/iscsi_target_seq_pdu_list.c | 664 +++
drivers/target/iscsi/iscsi_target_seq_pdu_list.h | 86 +
drivers/target/iscsi/iscsi_target_stat.c | 950 +++++
drivers/target/iscsi/iscsi_target_stat.h | 64 +
drivers/target/iscsi/iscsi_target_tmr.c | 849 ++++
drivers/target/iscsi/iscsi_target_tmr.h | 14 +
drivers/target/iscsi/iscsi_target_tpg.c | 759 ++++
drivers/target/iscsi/iscsi_target_tpg.h | 41 +
drivers/target/iscsi/iscsi_target_tq.c | 551 +++
drivers/target/iscsi/iscsi_target_tq.h | 88 +
drivers/target/iscsi/iscsi_target_util.c | 1819 ++++++++
drivers/target/iscsi/iscsi_target_util.h | 60 +
drivers/target/target_core_transport.c | 7 +-
include/linux/kernel.h | 8 +
include/scsi/iscsi_proto.h | 78 +-
include/scsi/libiscsi.h | 2 +-
51 files changed, 22196 insertions(+), 64 deletions(-)
create mode 100644 drivers/target/iscsi/Kconfig
create mode 100644 drivers/target/iscsi/Makefile
create mode 100644 drivers/target/iscsi/iscsi_target.c
create mode 100644 drivers/target/iscsi/iscsi_target.h
create mode 100644 drivers/target/iscsi/iscsi_target_auth.c
create mode 100644 drivers/target/iscsi/iscsi_target_auth.h
create mode 100644 drivers/target/iscsi/iscsi_target_configfs.c
create mode 100644 drivers/target/iscsi/iscsi_target_configfs.h
create mode 100644 drivers/target/iscsi/iscsi_target_core.h
create mode 100644 drivers/target/iscsi/iscsi_target_datain_values.c
create mode 100644 drivers/target/iscsi/iscsi_target_datain_values.h
create mode 100644 drivers/target/iscsi/iscsi_target_device.c
create mode 100644 drivers/target/iscsi/iscsi_target_device.h
create mode 100644 drivers/target/iscsi/iscsi_target_erl0.c
create mode 100644 drivers/target/iscsi/iscsi_target_erl0.h
create mode 100644 drivers/target/iscsi/iscsi_target_erl1.c
create mode 100644 drivers/target/iscsi/iscsi_target_erl1.h
create mode 100644 drivers/target/iscsi/iscsi_target_erl2.c
create mode 100644 drivers/target/iscsi/iscsi_target_erl2.h
create mode 100644 drivers/target/iscsi/iscsi_target_login.c
create mode 100644 drivers/target/iscsi/iscsi_target_login.h
create mode 100644 drivers/target/iscsi/iscsi_target_nego.c
create mode 100644 drivers/target/iscsi/iscsi_target_nego.h
create mode 100644 drivers/target/iscsi/iscsi_target_nodeattrib.c
create mode 100644 drivers/target/iscsi/iscsi_target_nodeattrib.h
create mode 100644 drivers/target/iscsi/iscsi_target_parameters.c
create mode 100644 drivers/target/iscsi/iscsi_target_parameters.h
create mode 100644 drivers/target/iscsi/iscsi_target_seq_pdu_list.c
create mode 100644 drivers/target/iscsi/iscsi_target_seq_pdu_list.h
create mode 100644 drivers/target/iscsi/iscsi_target_stat.c
create mode 100644 drivers/target/iscsi/iscsi_target_stat.h
create mode 100644 drivers/target/iscsi/iscsi_target_tmr.c
create mode 100644 drivers/target/iscsi/iscsi_target_tmr.h
create mode 100644 drivers/target/iscsi/iscsi_target_tpg.c
create mode 100644 drivers/target/iscsi/iscsi_target_tpg.h
create mode 100644 drivers/target/iscsi/iscsi_target_tq.c
create mode 100644 drivers/target/iscsi/iscsi_target_tq.h
create mode 100644 drivers/target/iscsi/iscsi_target_util.c
create mode 100644 drivers/target/iscsi/iscsi_target_util.h
next reply other threads:[~2011-07-27 2:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-27 2:13 Nicholas A. Bellinger [this message]
2011-07-27 22:48 ` Nicholas A. Bellinger
2011-07-30 9:30 ` Bart Van Assche
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=1311732839.10646.132.camel@haakon2.linux-iscsi.org \
--to=nab@linux-iscsi.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=agrover@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=michaelc@cs.wisc.edu \
--cc=openosd@gmail.com \
--cc=roland@kernel.org \
--cc=target-devel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®