From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, Theodore Ts'o <tytso@mit.edu>,
Eric Biggers <ebiggers@kernel.org>,
Christoph Hellwig <hch@lst.de>,
Eric Biggers <ebiggers@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Satya Tangirala <satyat@google.com>
Subject: Re: linux-next: manual merge of the block tree with the fscrypt tree
Date: Mon, 14 Feb 2022 08:15:31 +0100 [thread overview]
Message-ID: <20220214071531.GA17137@lst.de> (raw)
In-Reply-To: <20220214121139.2e5a4be5@canb.auug.org.au>
On Mon, Feb 14, 2022 at 12:11:39PM +1100, Stephen Rothwell wrote:
> I fixed it up (I think - see below) and can carry the fix as necessary.
> This is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Thanks,
the fixup looks good to me.
next prev parent reply other threads:[~2022-02-14 7:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 1:11 linux-next: manual merge of the block tree with the fscrypt tree Stephen Rothwell
2022-02-14 7:15 ` Christoph Hellwig [this message]
2022-02-14 19:26 ` Eric Biggers
-- strict thread matches above, loose matches on Subject: below --
2022-02-21 16:47 broonie
2022-02-21 16:45 broonie
2020-07-09 3:02 Stephen Rothwell
2020-07-23 1:03 ` Stephen Rothwell
2019-01-16 2:25 Stephen Rothwell
2019-01-16 2:55 ` Jens Axboe
2019-01-16 3:13 ` Ming Lei
2019-01-16 3:17 ` Jens Axboe
2019-01-16 7:39 ` Ming Lei
2019-01-16 14:27 ` Jens Axboe
2019-01-18 2:45 ` Ming Lei
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=20220214071531.GA17137@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=ebiggers@google.com \
--cc=ebiggers@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=satyat@google.com \
--cc=sfr@canb.auug.org.au \
--cc=tytso@mit.edu \
/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.