public inbox for linux-block@vger.kernel.org
 help / color / mirror / Atom feed
From: Jens Axboe <axboe@kernel.dk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>
Subject: Re: [GIT PULL] Block driver updates for 5.18-rc1
Date: Mon, 21 Mar 2022 20:14:58 -0600	[thread overview]
Message-ID: <799b2135-ddb3-225e-761f-a03c82e7c12e@kernel.dk> (raw)
In-Reply-To: <CAHk-=wiXy_WR5=z+tWFY8NiuXtwfnOC5cOZeFN41MjBGcG4tsg@mail.gmail.com>

On 3/21/22 6:13 PM, Linus Torvalds wrote:
> On Fri, Mar 18, 2022 at 2:59 PM Jens Axboe <axboe@kernel.dk> wrote:
>>
>> This will throw a merge conflict in drivers/nvme/target/configfs.c,
>> resolution is just to delete the two discovery helpers and the configfs
>> attribute, basically everything in the conflict section. This is due to
>> conflicting with a last minute revert in 5.17.
> 
> Only because I looked at this conflict did I notice that some of the
> changes are kind of pointless..
> 
> I mean, this is well-meaning, but I'm really not convinced it's
> actually *useful*:
> 
>   -   return sprintf(page, "\n");
>   +   return snprintf(page, PAGE_SIZE, "\n");
> 
> It's not like a two-byte copy can ever overflow PAGE_SIZE.
> 
> Sometimes 'sprintf() -> snprintf()' conversions don't really buy you
> anything.

Yeah agree, that does seem kind of pointless as an isolated change. At
least maybe it helps cut down on copy/paste related issues, where
someone copies it and changes it to dump more into 'page'.

-- 
Jens Axboe


  reply	other threads:[~2022-03-22  2:16 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-18 21:59 [GIT PULL] Block driver updates for 5.18-rc1 Jens Axboe
2022-03-22  0:13 ` Linus Torvalds
2022-03-22  2:14   ` Jens Axboe [this message]
2022-03-22  3:13   ` Chaitanya Kulkarni
2022-03-22  0:25 ` pr-tracker-bot

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=799b2135-ddb3-225e-761f-a03c82e7c12e@kernel.dk \
    --to=axboe@kernel.dk \
    --cc=linux-block@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