public inbox for [email protected]
 help / color / mirror / Atom feed
From: Linus Torvalds <[email protected]>
To: Jens Axboe <[email protected]>
Cc: io-uring <[email protected]>
Subject: Re: [GIT PULL] Final io_uring updates for 6.4-rc1
Date: Sun, 7 May 2023 09:59:23 -0700	[thread overview]
Message-ID: <CAHk-=wjvZQeXHUDUJZKJnej+cLvq8OdkFifg1McWLmrHo=Y_0w@mail.gmail.com> (raw)
In-Reply-To: <[email protected]>

On Sun, May 7, 2023 at 5:00 AM Jens Axboe <[email protected]> wrote:
>
> Note that this will throw a merge conflict in the ublk_drv code, due
> to this branch still being based off the original for-6.4/io_uring
> branch. Resolution is pretty straight forward, I'm including it below
> for reference.

Mine is somewhat different - I think the "ub_cmd" argument to
__ublk_ch_uring_cmd() should also have been made a 'const' pointer.

And then using an actual initializer allows us to do the same thing
for the copy in ublk_ch_uring_cmd() (and also makes it clear that it
initializes the whole struct - which it did, but still...)

So my conflict resolution looks a bit more complicated, but I think
it's the RightThing(tm) to do, and is consistent with the
constification in commit fd9b8547bc5c ("io_uring: Pass whole sqe to
commands").

                Linus

  reply	other threads:[~2023-05-07 16:59 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-07 12:00 [GIT PULL] Final io_uring updates for 6.4-rc1 Jens Axboe
2023-05-07 16:59 ` Linus Torvalds [this message]
2023-05-08 18:41   ` Jens Axboe
2023-05-07 18:12 ` pr-tracker-bot
2023-05-08  3:18 ` Chen-Yu Tsai
2023-05-08 18:41   ` Jens Axboe
2023-05-09  2:35     ` Chen-Yu Tsai
2023-05-09 13:59       ` Jens Axboe
2023-05-09 16:52         ` Linus Torvalds
2023-05-09 16:55           ` Jens Axboe

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='CAHk-=wjvZQeXHUDUJZKJnej+cLvq8OdkFifg1McWLmrHo=Y_0w@mail.gmail.com' \
    [email protected] \
    [email protected] \
    [email protected] \
    /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