Message ID | YZ+X/qGC6/w3bp2c@infradead.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [GIT,PULL] nvme fixes for Linux 5.16 | expand |
On 11/25/21 7:04 AM, Christoph Hellwig wrote: > drivers/nvme/host/core.c | 29 +++++++++++++++++-- > drivers/nvme/host/fabrics.c | 3 ++ > drivers/nvme/host/tcp.c | 61 +++++++++++++++++++-------------------- > drivers/nvme/target/io-cmd-file.c | 2 ++ > drivers/nvme/target/tcp.c | 44 ++++++++++++++++++++-------- > 5 files changed, 93 insertions(+), 46 deletions(-) This doesn't match what I get: drivers/nvme/host/core.c | 29 +++++++++++++++++++--- drivers/nvme/host/fabrics.c | 3 +++ drivers/nvme/host/tcp.c | 61 +++++++++++++++++++++++----------------------- drivers/nvme/target/io-cmd-file.c | 4 ++- drivers/nvme/target/tcp.c | 44 ++++++++++++++++++++++++--------- 5 files changed, 94 insertions(+), 47 deletions(-) Hmm?
On Thu, Nov 25, 2021 at 07:55:38AM -0700, Jens Axboe wrote: > On 11/25/21 7:04 AM, Christoph Hellwig wrote: > > drivers/nvme/host/core.c | 29 +++++++++++++++++-- > > drivers/nvme/host/fabrics.c | 3 ++ > > drivers/nvme/host/tcp.c | 61 +++++++++++++++++++-------------------- > > drivers/nvme/target/io-cmd-file.c | 2 ++ > > drivers/nvme/target/tcp.c | 44 ++++++++++++++++++++-------- > > 5 files changed, 93 insertions(+), 46 deletions(-) > > This doesn't match what I get: > > drivers/nvme/host/core.c | 29 +++++++++++++++++++--- > drivers/nvme/host/fabrics.c | 3 +++ > drivers/nvme/host/tcp.c | 61 +++++++++++++++++++++++----------------------- > drivers/nvme/target/io-cmd-file.c | 4 ++- > drivers/nvme/target/tcp.c | 44 ++++++++++++++++++++++++--------- > 5 files changed, 94 insertions(+), 47 deletions(-) > > Hmm? Looks like the diffstt doesn't include the the requested reformatting in io-cmd-file.c. But I have no idea why.
On 11/25/21 8:05 AM, Christoph Hellwig wrote: > On Thu, Nov 25, 2021 at 07:55:38AM -0700, Jens Axboe wrote: >> On 11/25/21 7:04 AM, Christoph Hellwig wrote: >>> drivers/nvme/host/core.c | 29 +++++++++++++++++-- >>> drivers/nvme/host/fabrics.c | 3 ++ >>> drivers/nvme/host/tcp.c | 61 +++++++++++++++++++-------------------- >>> drivers/nvme/target/io-cmd-file.c | 2 ++ >>> drivers/nvme/target/tcp.c | 44 ++++++++++++++++++++-------- >>> 5 files changed, 93 insertions(+), 46 deletions(-) >> >> This doesn't match what I get: >> >> drivers/nvme/host/core.c | 29 +++++++++++++++++++--- >> drivers/nvme/host/fabrics.c | 3 +++ >> drivers/nvme/host/tcp.c | 61 +++++++++++++++++++++++----------------------- >> drivers/nvme/target/io-cmd-file.c | 4 ++- >> drivers/nvme/target/tcp.c | 44 ++++++++++++++++++++++++--------- >> 5 files changed, 94 insertions(+), 47 deletions(-) >> >> Hmm? > > Looks like the diffstt doesn't include the the requested reformatting > in io-cmd-file.c. But I have no idea why. Funky... I pulled it and pushed it out, just double check if it looks consistent with what you expect.