linux-next: duplicate patches in the block tree

linux-next: duplicate patches in the block tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 591 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patches in the block tree

[Jens Axboe]

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

Re: linux-next: duplicate patches in the block tree

[Christian Brauner]

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.

Re: linux-next: duplicate patches in the block tree

[Jens Axboe]

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

linux-next: duplicate patches in the block tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2542 bytes --]

Hi all,

The following commits are also in the vfs-brauner tree as different
commits (but the same patches):

  45257bc34f6e ("fs: add Jan Kara as reviewer")
  a6945447b3f5 ("fs/inode: Make relatime_need_update return bool")
  79b667a29e41 ("file: remove __receive_fd()")
  cc0f58c94dae ("file: stop exposing receive_fd_user()")
  ede533a19a06 ("fs: replace f_rcuhead with f_task_work")
  0e79bba572b3 ("file: remove pointless wrapper")
  f71d810fb8fa ("file: s/close_fd_get_file()/file_close_fd()/g")
  c5eb80cff4cc ("pipe: wakeup wr_wait after setting max_usage")
  9da5933ccd0f ("Improve __fget_files_rcu() code generation (and thus __fget_light())")
  115df1ef9d9a ("file: massage cleanup of files that failed to open")
  8c76d6d99499 ("fs/pipe: Fix lockdep false-positive in watchqueue pipe_write()")
  5e62251b344c ("fs: reformat idmapped mounts entry")
  4224a79cbaaf ("mnt_idmapping: decouple from namespaces")
  8917f5d092cf ("mnt_idmapping: remove nop check")
  f2b04f053aad ("mnt_idmapping: remove check_fsmapping()")
  1c146b0406bd ("fs/aio: obey min_nr when doing wakeups")
  4a6fa23bd7cc ("eventfd: make eventfd_signal{_mask}() void")
  21aeae27900f ("eventfd: simplify eventfd_signal_mask()")
  1808acc4fab2 ("eventfd: simplify eventfd_signal()")

These are commits

  2b0400c00405 ("fs: add Jan Kara as reviewer")
  5aa67665b0d5 ("fs/inode: Make relatime_need_update return bool")
  a125c59d2754 ("file: remove __receive_fd()")
  475febe21987 ("file: stop exposing receive_fd_user()")
  5a13208f07dc ("fs: replace f_rcuhead with f_task_work")
  b89315e5d229 ("file: remove pointless wrapper")
  33cbb3ccbc3c ("file: s/close_fd_get_file()/file_close_fd()/g")
  24d78612cdf8 ("pipe: wakeup wr_wait after setting max_usage")
  a567958e07c9 ("Improve __fget_files_rcu() code generation (and thus __fget_light())")
  e87d822a8f96 ("file: massage cleanup of files that failed to open")
  055ca8355991 ("fs/pipe: Fix lockdep false-positive in watchqueue pipe_write()")
  12c1b632d970 ("fs: reformat idmapped mounts entry")
  783822e44594 ("mnt_idmapping: decouple from namespaces")
  90fbd8b175ee ("mnt_idmapping: remove nop check")
  e65a29f0235a ("mnt_idmapping: remove check_fsmapping()")
  71eb6b6b0ba9 ("fs/aio: obey min_nr when doing wakeups")
  b7638ad0c780 ("eventfd: make eventfd_signal{_mask}() void")
  120ae5859363 ("eventfd: simplify eventfd_signal_mask()")
  3652117f8548 ("eventfd: simplify eventfd_signal()")

in the vfs-brauner tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patches in the block tree

[Christian Brauner]

On Tue, Dec 12, 2023 at 01:02:13PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in the vfs-brauner tree as different
> commits (but the same patches):

Thanks, Stephen. I gave Jens a stable vfs.file branch that he can pull
into his so this shouldn't become an issue again.

Re: linux-next: duplicate patches in the block tree

[Jens Axboe]

On 12/12/23 6:38 AM, Christian Brauner wrote:
> On Tue, Dec 12, 2023 at 01:02:13PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> The following commits are also in the vfs-brauner tree as different
>> commits (but the same patches):
> 
> Thanks, Stephen. I gave Jens a stable vfs.file branch that he can pull
> into his so this shouldn't become an issue again.

Should be clean now, rebased with the stable branch pulled in first.

-- 
Jens Axboe

linux-next: duplicate patches in the block tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

Hi all,

The following commits are also in the iomap tree as different commits
(but the same patches):

  634aae6c3333 ("iomap: support IOCB_DIO_CALLER_COMP")
  4d184b3fd1ab ("io_uring/rw: add write support for IOCB_DIO_CALLER_COMP")
  d6cb42b086fe ("fs: add IOCB flags related to passing back dio completions")
  7e8dcad9affa ("iomap: add IOMAP_DIO_INLINE_COMP")
  448373a0bd1d ("iomap: only set iocb->private for polled bio")
  661687f531ef ("iomap: treat a write through cache the same as FUA")
  0e40c9e86011 ("iomap: use an unsigned type for IOMAP_DIO_* defines")
  062ef9f4932e ("iomap: cleanup up iomap_dio_bio_end_io()")

These are commits

  8c052fb3002e ("iomap: support IOCB_DIO_CALLER_COMP")
  099ada2c8726 ("io_uring/rw: add write support for IOCB_DIO_CALLER_COMP")
  9cf3516c29e6 ("fs: add IOCB flags related to passing back dio completions")
  7b3c14d1a96b ("iomap: add IOMAP_DIO_INLINE_COMP")
  daa99c5a3319 ("iomap: only set iocb->private for polled bio")
  3a0be38cc84d ("iomap: treat a write through cache the same as FUA")
  44842f647346 ("iomap: use an unsigned type for IOMAP_DIO_* defines")
  3486237c6fe8 ("iomap: cleanup up iomap_dio_bio_end_io()")

in the iomap tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patches in the block tree

[Jens Axboe]

On 8/6/23 10:51?PM, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in the iomap tree as different commits
> (but the same patches):
> 
>   634aae6c3333 ("iomap: support IOCB_DIO_CALLER_COMP")
>   4d184b3fd1ab ("io_uring/rw: add write support for IOCB_DIO_CALLER_COMP")
>   d6cb42b086fe ("fs: add IOCB flags related to passing back dio completions")
>   7e8dcad9affa ("iomap: add IOMAP_DIO_INLINE_COMP")
>   448373a0bd1d ("iomap: only set iocb->private for polled bio")
>   661687f531ef ("iomap: treat a write through cache the same as FUA")
>   0e40c9e86011 ("iomap: use an unsigned type for IOMAP_DIO_* defines")
>   062ef9f4932e ("iomap: cleanup up iomap_dio_bio_end_io()")
> 
> These are commits
> 
>   8c052fb3002e ("iomap: support IOCB_DIO_CALLER_COMP")
>   099ada2c8726 ("io_uring/rw: add write support for IOCB_DIO_CALLER_COMP")
>   9cf3516c29e6 ("fs: add IOCB flags related to passing back dio completions")
>   7b3c14d1a96b ("iomap: add IOMAP_DIO_INLINE_COMP")
>   daa99c5a3319 ("iomap: only set iocb->private for polled bio")
>   3a0be38cc84d ("iomap: treat a write through cache the same as FUA")
>   44842f647346 ("iomap: use an unsigned type for IOMAP_DIO_* defines")
>   3486237c6fe8 ("iomap: cleanup up iomap_dio_bio_end_io()")
> 
> in the iomap tree.

I'll drop them on my side since Darrick has them merged now.

-- 
Jens Axboe

linux-next: duplicate patches in the block tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  78e11ab5adf7 ("mm: Pass info, not iter, into filemap_get_pages()")
  a53cad008099 ("splice: Add a func to do a splice from a buffered file without ITER_PIPE")
  f2aa2c5707ac ("splice: Add a func to do a splice from an O_DIRECT file without ITER_PIPE")
  51e851b5d16f ("iov_iter: Define flags to qualify page extraction.")
  0fff5a38a770 ("iov_iter: Add a function to extract a page list from an iterator")

These are commits

  c935d7b85ae1 ("mm: Pass info, not iter, into filemap_get_pages()")
  03aaa67b45e7 ("splice: Add a func to do a splice from a buffered file without ITER_PIPE")
  1dba0a6d58da ("splice: Add a func to do a splice from an O_DIRECT file without ITER_PIPE")
  f48b6bcd02a1 ("iov_iter: Define flags to qualify page extraction.")
  c82edb69b878 ("iov_iter: Add a function to extract a page list from an iterator")

in the cifs tree.

(A few of these are not exactly the same, but very similar)

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patches in the block tree

[David Howells]

Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
>   78e11ab5adf7 ("mm: Pass info, not iter, into filemap_get_pages()")
>   a53cad008099 ("splice: Add a func to do a splice from a buffered file without ITER_PIPE")
>   f2aa2c5707ac ("splice: Add a func to do a splice from an O_DIRECT file without ITER_PIPE")
>   51e851b5d16f ("iov_iter: Define flags to qualify page extraction.")
>   0fff5a38a770 ("iov_iter: Add a function to extract a page list from an iterator")

In Linus's tree?  Did you mean the block tree?

David

Re: linux-next: duplicate patches in the block tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 852 bytes --]

Hi David,

On Mon, 20 Feb 2023 01:47:40 +0000 David Howells <dhowells@redhat.com> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > The following commits are also in Linus Torvalds' tree as different
> > commits (but the same patches):
> > 
> >   78e11ab5adf7 ("mm: Pass info, not iter, into filemap_get_pages()")
> >   a53cad008099 ("splice: Add a func to do a splice from a buffered file without ITER_PIPE")
> >   f2aa2c5707ac ("splice: Add a func to do a splice from an O_DIRECT file without ITER_PIPE")
> >   51e851b5d16f ("iov_iter: Define flags to qualify page extraction.")
> >   0fff5a38a770 ("iov_iter: Add a function to extract a page list from an iterator")  
> 
> In Linus's tree?  Did you mean the block tree?

Oops, actually they are in the block tree and the cifs tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]