From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>,
Damien Le Moal <dlemoal@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the block tree
Date: Thu, 18 Apr 2024 07:57:07 +0200 [thread overview]
Message-ID: <20240418055707.GA24656@lst.de> (raw)
In-Reply-To: <20240418145554.7a93325b@canb.auug.org.au>
Thanks Stephen,
the conflict resolution looks good to me.
next prev parent reply other threads:[~2024-04-18 5:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 4:55 linux-next: manual merge of the scsi-mkp tree with the block tree Stephen Rothwell
2024-04-18 5:57 ` Christoph Hellwig [this message]
2024-04-26 6:01 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-02-21 22:06 broonie
2022-03-01 7:29 ` Stephen Rothwell
2022-02-21 21:59 broonie
2022-02-22 5:57 ` Jinpu Wang
2022-03-01 7:31 ` Stephen Rothwell
2021-01-27 6:58 Stephen Rothwell
2019-02-11 4:23 Stephen Rothwell
2017-04-26 5:47 Stephen Rothwell
2016-11-09 2:54 Stephen Rothwell
2016-11-11 19:55 ` Martin K. Petersen
2016-11-17 2:44 ` Stephen Rothwell
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=20240418055707.GA24656@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=dlemoal@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.