From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoph Hellwig <hch@lst.de>
Cc: Christian Brauner <brauner@kernel.org>,
Theodore Ts'o <tytso@mit.edu>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the ext4 tree
Date: Wed, 8 May 2024 16:59:53 +1000 [thread overview]
Message-ID: <20240508165953.67afc064@canb.auug.org.au> (raw)
In-Reply-To: <20240508064700.GB10736@lst.de>
[-- Attachment #1: Type: text/plain, Size: 860 bytes --]
Hi Christoph,
On Wed, 8 May 2024 08:47:00 +0200 Christoph Hellwig <hch@lst.de> wrote:
>
> On Wed, May 08, 2024 at 10:34:36AM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the vfs-brauner tree got a conflict in:
> >
> > fs/ext4/file.c
> >
> > between commit:
> >
> > a0c7cce824a5 ("ext4: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method")
> >
> > from the ext4 tree and commit:
> >
> > 210a03c9d51a ("fs: claw back a few FMODE_* bits")
> >
> > from the vfs-brauner tree.
>
> Ted, if you still can maybe just drop the ext4 patch for now? I can
> redo it for next merge window with the moved flag.
If the resolution I did is fine, I am sure Linus will cope (but worth
mentioning it to him in the pull request). Its a simple enough conflict.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-05-08 6:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-08 0:34 linux-next: manual merge of the vfs-brauner tree with the ext4 tree Stephen Rothwell
2024-05-08 6:47 ` Christoph Hellwig
2024-05-08 6:59 ` Stephen Rothwell [this message]
2024-05-08 22:04 ` Theodore Ts'o
2024-05-14 1:28 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2026-06-11 13:45 Mark Brown
2026-06-11 14:07 ` Matthew Wilcox
2026-03-27 17:38 Mark Brown
2026-03-30 8:30 ` Jan Kara
2024-09-03 23:15 Stephen Rothwell
2024-09-16 22:23 ` Stephen Rothwell
2023-08-21 0:07 Stephen Rothwell
2023-08-21 0:25 ` 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=20240508165953.67afc064@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=brauner@kernel.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ritesh.list@gmail.com \
--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.