linux-next: duplicate patch in the vfs-brauner tree

linux-next: duplicate patch in the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

The following commit is also in Linus Torvalds' tree as a different commit
(but the same patch):

  7c62794bc37f ("open: make RESOLVE_CACHED correctly test for O_TMPFILE")

This is commit

  a0fc452a5d7f ("open: make RESOLVE_CACHED correctly test for O_TMPFILE")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

The following commit is also in Linus Torvalds' tree as a different commit
(but the same patch):

  9ddf5fe47f2e ("fs,block: get holder during claim")

This is commit

  59a55a63c246 ("fs,block: get holder during claim")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

The following commit is also in Linus Torvalds' tree as a different commit
(but the same patch):

  0b9887fae769 ("fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion")

This is commit

  961ebd120565 ("fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

The following commit is also in the mm tree as a different commit (but
the same patch):

  41ef33da2c49 ("iov_iter: Avoid wrap-around instrumentation in copy_compat_iovec_from_user()")

This is commit

  40bd16cd9ec8 ("iov_iter: avoid wrap-around instrumentation in copy_compat_iovec_from_user()")

in the mm-nonmm-unstable branch of the mm tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patch in the vfs-brauner tree

[Christian Brauner]

> I'll push that patch, then.

Ok, dropping.

Re: linux-next: duplicate patch in the vfs-brauner tree

[Darrick J. Wong]

On Tue, Sep 19, 2023 at 02:34:01PM +0200, Christian Brauner wrote:
> On Mon, Sep 18, 2023 at 01:52:06PM -0700, Darrick J. Wong wrote:
> > On Fri, Sep 15, 2023 at 09:39:53AM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > The following commit is also in the iomap tree as a different commit
> > > (but the same patch):
> > > 
> > >   de5b0b257ee3 ("iomap: handle error conditions more gracefully in iomap_to_bh")
> > > 
> > > This is commit
> > > 
> > >   4aa8cdd5e523 ("iomap: handle error conditions more gracefully in iomap_to_bh")
> > > 
> > > in the iomap tree.
> > 
> > Christian, do you want to push this to Linus instead of me?  I've a
> > couple more fixes that I'm about to send out to fsdevel and could just
> > roll all the iomap stuff into a single branch... but if you were about
> > to this to Linus I don't mind letting that happen.
> 
> So I was about to send a pull request tomorrow. I thought I was supposed
> to pick up iomap stuff. Let me know what you prefer. I can easily drop
> this patch. :)

I'll push that patch, then.

In general, you can fling any non-trivial iomap patches at me, since I
will likely want to run them through my testing cloud anyway.

(And just to be clear: I don't mind if you push things like trivial api
cleanups that are part of another series through your main vfs tree.)

--D

Re: linux-next: duplicate patch in the vfs-brauner tree

[Christian Brauner]

On Mon, Sep 18, 2023 at 01:52:06PM -0700, Darrick J. Wong wrote:
> On Fri, Sep 15, 2023 at 09:39:53AM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > The following commit is also in the iomap tree as a different commit
> > (but the same patch):
> > 
> >   de5b0b257ee3 ("iomap: handle error conditions more gracefully in iomap_to_bh")
> > 
> > This is commit
> > 
> >   4aa8cdd5e523 ("iomap: handle error conditions more gracefully in iomap_to_bh")
> > 
> > in the iomap tree.
> 
> Christian, do you want to push this to Linus instead of me?  I've a
> couple more fixes that I'm about to send out to fsdevel and could just
> roll all the iomap stuff into a single branch... but if you were about
> to this to Linus I don't mind letting that happen.

So I was about to send a pull request tomorrow. I thought I was supposed
to pick up iomap stuff. Let me know what you prefer. I can easily drop
this patch. :)

Re: linux-next: duplicate patch in the vfs-brauner tree

[Darrick J. Wong]

On Fri, Sep 15, 2023 at 09:39:53AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the iomap tree as a different commit
> (but the same patch):
> 
>   de5b0b257ee3 ("iomap: handle error conditions more gracefully in iomap_to_bh")
> 
> This is commit
> 
>   4aa8cdd5e523 ("iomap: handle error conditions more gracefully in iomap_to_bh")
> 
> in the iomap tree.

Christian, do you want to push this to Linus instead of me?  I've a
couple more fixes that I'm about to send out to fsdevel and could just
roll all the iomap stuff into a single branch... but if you were about
to this to Linus I don't mind letting that happen.

--D

> -- 
> Cheers,
> Stephen Rothwell

linux-next: duplicate patch in the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

The following commit is also in the iomap tree as a different commit
(but the same patch):

  de5b0b257ee3 ("iomap: handle error conditions more gracefully in iomap_to_bh")

This is commit

  4aa8cdd5e523 ("iomap: handle error conditions more gracefully in iomap_to_bh")

in the iomap tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patch in the vfs-brauner tree

[Tyler Hicks]

On 2023-07-19 08:16:03, Christian Brauner wrote:
> On Mon, Jul 17, 2023 at 10:11:14AM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > The following commit is also in the ecryptfs tree as a different commit
> > (but the same patch):
> > 
> >   8b70deb8ca90 ("fs/ecryptfs: Replace kmap() with kmap_local_page()")
> > 
> > This is commit
> > 
> >   031a0300f2c9 ("ecryptfs: Replace kmap() with kmap_local_page()")
> > 
> > in the ecryptfs tree (where it has been since Sept, 2022).
> 
> @Tyler, mind dropping it? I'll send it all in one go for v6.6.

Done. Thank you!

Tyler

Re: linux-next: duplicate patch in the vfs-brauner tree

[Christian Brauner]

On Mon, Jul 17, 2023 at 10:11:14AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the ecryptfs tree as a different commit
> (but the same patch):
> 
>   8b70deb8ca90 ("fs/ecryptfs: Replace kmap() with kmap_local_page()")
> 
> This is commit
> 
>   031a0300f2c9 ("ecryptfs: Replace kmap() with kmap_local_page()")
> 
> in the ecryptfs tree (where it has been since Sept, 2022).

@Tyler, mind dropping it? I'll send it all in one go for v6.6.

linux-next: duplicate patch in the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

The following commit is also in the ecryptfs tree as a different commit
(but the same patch):

  8b70deb8ca90 ("fs/ecryptfs: Replace kmap() with kmap_local_page()")

This is commit

  031a0300f2c9 ("ecryptfs: Replace kmap() with kmap_local_page()")

in the ecryptfs tree (where it has been since Sept, 2022).

-- 
Cheers,
Stephen Rothwell

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