linux-next: duplicate patch in the mm tree

linux-next: duplicate patch in the mm tree

[Stephen Rothwell]

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

Hi all,

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

  dc5c294a71a5 ("fs: prevent out-of-bounds array speculation when closing a file descriptor")

This is commit

  609d54441493 ("fs: prevent out-of-bounds array speculation when closing a file descriptor")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the mm tree

[Stephen Rothwell]

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

Hi all,

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

  5ad6c1f83fb9 ("kbuild: flatten KBUILD_CFLAGS")

This is commit

  0817d2599cfe ("kbuild: flatten KBUILD_CFLAGS")

in Lunus' tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patch in the mm tree

[Jan Kara]

Hello!

On Tue 31-01-23 14:56:54, Stephen Rothwell wrote:
> The following commit is also in the ext3 tree as a different commit
> (but the same patch):
> 
>   05a4851d2729 ("fs: gracefully handle ->get_block not mapping bh in __mpage_writepage")
> 
> This is commit
> 
>   7010839ccfd4 ("fs: gracefully handle ->get_block not mapping bh in __mpage_writepage")
> 
> in the ext3 tree.

Yes, as we already discussed with Andrew, I've merged the patch to my tree
because otherwise UDF fixes result in triggering this problem and crashing
machine left-and-right (which results in a flood of emails from testing
infrastructure). So carrying the patch in my tree seems like by far
the simplest option (otherwise I'd have to either rebase on top of MM tree
or pull MM tree into my tree, neither of which looks particularly
attractive).
								Honza

[1] https://lore.kernel.org/all/20230127133213.su4cl6zuiuuv2p35@quack3

-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

linux-next: duplicate patch in the mm tree

[Stephen Rothwell]

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

Hi all,

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

  05a4851d2729 ("fs: gracefully handle ->get_block not mapping bh in __mpage_writepage")

This is commit

  7010839ccfd4 ("fs: gracefully handle ->get_block not mapping bh in __mpage_writepage")

in the ext3 tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the mm tree

[Stephen Rothwell]

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

Hi all,

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

  72082700a92e ("Revert "mm/compaction: fix set skip in fast_find_migrateblock"")

It is commit

  95e7a450b819 ("Revert "mm/compaction: fix set skip in fast_find_migrateblock"")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the mm tree

[Stephen Rothwell]

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

Hi all,

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

  9bf96454b9dd ("Revert "remoteproc: qcom_q6v5_mss: map/unmap metadata region before/after use"")

This is also commit

  a899d542b687 ("Revert "remoteproc: qcom_q6v5_mss: map/unmap metadata region before/after use"")

in the rpmsg tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the mm tree

[Stephen Rothwell]

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

Hi all,

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

  ca5716c63719 ("kernel/irq/manage.c: disable_irq() might sleep.")

This is commit

  17549b0f184d ("genirq: Add might_sleep() to disable_irq()")

in the tip tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the mm tree

[Stephen Rothwell]

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

Hi all,

Commit

  afcd2f4f5629 ("of: overlay: fix trivial typo")

also exists in the devicetree tree as commit

  8e5d0c68f23a ("of: overlay: Fix trivial typo")

-- 
Cheers,
Stephen Rothwell

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