From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Theodore Ts'o <tytso@mit.edu>, Chao Yu <chao@kernel.org>,
Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>,
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 ext4 tree with Linus' tree
Date: Tue, 27 Jun 2023 08:37:53 +0200 [thread overview]
Message-ID: <20230627063753.GA18674@lst.de> (raw)
In-Reply-To: <20230627103900.04fa564f@canb.auug.org.au>
On Tue, Jun 27, 2023 at 10:39:00AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the ext4 tree got a conflict in:
>
> fs/ext4/ioctl.c
>
> between commit:
>
> 97524b454bc5 ("ext4: split ext4_shutdown")
>
> from Linus' tree and commit:
>
> c4d13222afd8 ("ext4: fix to check return value of freeze_bdev() in ext4_shutdown()")
Hmm, I can't actually find the latter commit in linux-next and the context
below also doesn't make it obviously cler to me what the conflict was.
next prev parent reply other threads:[~2023-06-27 6:38 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-27 0:39 linux-next: manual merge of the ext4 tree with Linus' tree Stephen Rothwell
2023-06-27 6:37 ` Christoph Hellwig [this message]
2023-06-27 7:26 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-06-07 0:27 Stephen Rothwell
2020-12-17 23:12 Stephen Rothwell
2020-10-20 23:03 Stephen Rothwell
2019-09-19 11:44 Mark Brown
2016-03-21 0:29 Stephen Rothwell
2013-08-13 1:33 Stephen Rothwell
2011-03-25 1:56 Stephen Rothwell
2011-03-25 14:45 ` Tejun Heo
2011-03-25 16:30 ` Sedat Dilek
2011-03-25 19:58 ` Ted Ts'o
2011-02-14 2:19 Stephen Rothwell
2010-10-28 0:45 Stephen Rothwell
2010-05-22 5:50 Stephen Rothwell
2009-09-17 1:56 linux-next: manual merge of the ext4 tree with Linus tree Stephen Rothwell
2009-09-17 13:22 ` Theodore Tso
2009-09-17 13:30 ` Stephen Rothwell
2009-02-02 2:56 linux-next: manual merge of the ext4 tree with Linus' tree 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=20230627063753.GA18674@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=chao@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).