Received-SPF: pass (google.com: domain of linux-kernel+bounces-172768-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Wed, 8 May 2024 08:47:00 +0200
From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christian Brauner <brauner@kernel.org>, Theodore Ts'o <tytso@mit.edu>,
	Christoph Hellwig <hch@lst.de>,
	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
Message-ID: <20240508064700.GB10736@lst.de>
References: <20240508103436.589bb440@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240508103436.589bb440@canb.auug.org.au>
User-Agent: Mutt/1.5.17 (2007-11-01)

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.