From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Christoph Hellwig <hch@lst.de>,
target-devel <target-devel@vger.kernel.org>,
linux-scsi <linux-scsi@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Roland Dreier <roland@purestorage.com>
Subject: Re: [GIT PULL] target: Updates for v3.2-rc1 (round one)
Date: Tue, 25 Oct 2011 03:07:30 -0700 [thread overview]
Message-ID: <1319537250.18871.23.camel@haakon2.linux-iscsi.org> (raw)
In-Reply-To: <CA+55aFyBgZoaN2di1iE4fyMh0r1rECG3stgiqGtiGY4SY7nBmw@mail.gmail.com>
On Tue, 2011-10-25 at 11:45 +0200, Linus Torvalds wrote:
> On Tue, Oct 25, 2011 at 11:42 AM, Christoph Hellwig <hch@lst.de> wrote:
> > On Tue, Oct 25, 2011 at 11:29:39AM +0200, Linus Torvalds wrote:
> >> On Tue, Oct 25, 2011 at 11:00 AM, Nicholas A. Bellinger
> >> <nab@linux-iscsi.org> wrote:
> >> >
> >> > ?36 files changed, 937 insertions(+), 2068 deletions(-)
> >>
> >> Hmm. This is not what I get. It might be a git version issue or diff
> >> algorithm one - although that's actually pretty unusual. Do you do
> >> something odd/special?
> >
> > It's mostly me looking at the code and factoring code and removing
> > unneeded things from old versions.
>
> No, I'm saying that the diffstat doesn't match what I get when I pull.
>
> I get
>
> 36 files changed, 955 insertions(+), 2086 deletions(-)
>
> which is *close*, but not identical. I'm wondering where the numbers
> Nicholas has came from..
>
Ok, just verified with git 1.7.2.3 from target-pending.git and the
numbers match up with your pull. Here is the full diff-stat for
reference. My apologies for the extra noise.
--nab
drivers/target/Makefile | 1 -
drivers/target/iscsi/iscsi_target.c | 39 +-
drivers/target/iscsi/iscsi_target_auth.c | 34 +-
drivers/target/iscsi/iscsi_target_core.h | 4 +-
drivers/target/iscsi/iscsi_target_erl2.c | 49 +-
drivers/target/iscsi/iscsi_target_tmr.c | 6 +-
drivers/target/iscsi/iscsi_target_util.c | 20 +-
drivers/target/iscsi/iscsi_target_util.h | 1 +
drivers/target/loopback/tcm_loop.c | 18 +-
drivers/target/target_core_alua.c | 21 +-
drivers/target/target_core_cdb.c | 79 ++-
drivers/target/target_core_configfs.c | 16 +-
drivers/target/target_core_device.c | 70 +-
drivers/target/target_core_fabric_configfs.c | 1 -
drivers/target/target_core_file.c | 56 +-
drivers/target/target_core_file.h | 4 +-
drivers/target/target_core_iblock.c | 274 ++----
drivers/target/target_core_iblock.h | 2 -
drivers/target/target_core_pr.c | 1 -
drivers/target/target_core_pscsi.c | 261 ++----
drivers/target/target_core_pscsi.h | 1 -
drivers/target/target_core_rd.c | 19 +-
drivers/target/target_core_rd.h | 2 -
drivers/target/target_core_scdb.c | 105 --
drivers/target/target_core_scdb.h | 10 -
drivers/target/target_core_stat.c | 1 -
drivers/target/target_core_tmr.c | 251 +++--
drivers/target/target_core_transport.c | 1513 ++++++++------------------
drivers/target/target_core_ua.c | 1 -
drivers/target/tcm_fc/tfc_cmd.c | 18 +-
drivers/target/tcm_fc/tfc_conf.c | 13 +-
drivers/target/tcm_fc/tfc_io.c | 1 -
drivers/target/tcm_fc/tfc_sess.c | 1 -
include/target/target_core_base.h | 71 +-
include/target/target_core_tmr.h | 2 +-
include/target/target_core_transport.h | 75 +-
36 files changed, 955 insertions(+), 2086 deletions(-)
delete mode 100644 drivers/target/target_core_scdb.c
delete mode 100644 drivers/target/target_core_scdb.h
next prev parent reply other threads:[~2011-10-25 10:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-25 9:00 [GIT PULL] target: Updates for v3.2-rc1 (round one) Nicholas A. Bellinger
2011-10-25 9:29 ` Linus Torvalds
2011-10-25 9:42 ` Christoph Hellwig
2011-10-25 9:45 ` Linus Torvalds
2011-10-25 10:07 ` Nicholas A. Bellinger [this message]
2011-10-25 9:44 ` Linus Torvalds
2011-10-25 9:51 ` Nicholas A. Bellinger
2011-10-25 9:45 ` Nicholas A. Bellinger
2011-10-25 9:48 ` Linus Torvalds
2011-10-25 9:56 ` Nicholas A. Bellinger
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=1319537250.18871.23.camel@haakon2.linux-iscsi.org \
--to=nab@linux-iscsi.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=roland@purestorage.com \
--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