Received-SPF: pass (google.com: domain of linux-kernel+bounces-8338-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Thu, 21 Dec 2023 13:29:33 +0100
From: Christian Brauner <brauner@kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patches in the block tree
Message-ID: <20231221-notieren-abbaggern-98327276ee4c@brauner>
References: <20231221135602.12bf82f5@canb.auug.org.au>
 <f31dae39-7c62-453a-8ca5-bd0b0e58769f@kernel.dk>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <f31dae39-7c62-453a-8ca5-bd0b0e58769f@kernel.dk>

On Wed, Dec 20, 2023 at 08:11:34PM -0700, Jens Axboe wrote:
> On 12/20/23 7:56 PM, Stephen Rothwell wrote:
> > Hi all,
> > 
> > The following commits are also in the vfs-brauner tree as different
> > commits (but the same patches):
> > 
> >   24fa3ae9467f ("file: remove pointless wrapper")
> >   253ca8678d30 ("Improve __fget_files_rcu() code generation (and thus __fget_light())")
> >   372a34e66fb7 ("fs: replace f_rcuhead with f_task_work")
> >   4e94ddfe2aab ("file: remove __receive_fd()")
> >   7cb537b6f6d7 ("file: massage cleanup of files that failed to open")
> >   a88c955fcfb4 ("file: s/close_fd_get_file()/file_close_fd()/g")
> >   eac9189c9619 ("file: stop exposing receive_fd_user()")
> 
> Hmm confused, assumed vfs.file got rebased again, but doesn't look to be
> the case. Christian?

Nope, vfs.file definitely didn't get rebased. That was just me being
stupid and not merging vfs.file cleanly into vfs.all. Sorry about this.
Fixed now.