2023-12-21 02:56:21

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: duplicate patches in the block tree

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()")

--
Cheers,
Stephen Rothwell

Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2023-12-21 03:15:37

by Jens Axboe

[permalink] [raw]
Subject: Re: linux-next: duplicate patches in the block tree

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?

--
Jens Axboe


2023-12-21 12:31:34

by Christian Brauner

[permalink] [raw]
Subject: Re: linux-next: duplicate patches in the block tree

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.

2023-12-21 15:32:24

by Jens Axboe

[permalink] [raw]
Subject: Re: linux-next: duplicate patches in the block tree

On 12/21/23 5:29 AM, Christian Brauner wrote:
> 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.

OK good, thanks!

--
Jens Axboe