linux-next: duplicate patch in the risc-v tree

linux-next: duplicate patch in the risc-v tree

[Stephen Rothwell]

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

Hi all,

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

  36d37f11f555 ("export.h: remove include/asm-generic/export.h")

This is commit

  0316e4b04e01 ("export.h: remove include/asm-generic/export.h")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patch in the risc-v tree

[Palmer Dabbelt]

On Wed, 10 Apr 2024 15:06:22 PDT (-0700), Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in Linus Torvalds' tree as a different commit
> (but the same patch):
>
>   36d37f11f555 ("export.h: remove include/asm-generic/export.h")
>
> This is commit
>
>   0316e4b04e01 ("export.h: remove include/asm-generic/export.h")
>
> in Linus' tree.

Sorry about that, I guess I just picked it up as part of the series.  
I'm just going to throw away the version in my tree, it's a cleanup so 
it shouldn't matter too much.

>
> -- 
> Cheers,
> Stephen Rothwell

linux-next: duplicate patch in the risc-v tree

[Stephen Rothwell]

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

Hi all,

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

  bac292e849d7 ("selftests: sud_test: return correct emulated syscall value on RISC-V")

This is commit

  17c67ed752d6 ("selftests: sud_test: return correct emulated syscall value on RISC-V")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patch in the risc-v tree

[Palmer Dabbelt]

On Sun, 28 Apr 2024 14:35:53 PDT (-0700), Stephen Rothwell wrote:
> Hi all,
>
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patch):
>
>   bac292e849d7 ("selftests: sud_test: return correct emulated syscall value on RISC-V")
>
> This is commit
>
>   17c67ed752d6 ("selftests: sud_test: return correct emulated syscall value on RISC-V")
>
> in Linus' tree.

Sorry about that, looks like I accidentally merge this into both 
for-next and fixes.  It's a fix, though not strictly a regression (the 
selftest never worked), so maybe I just was being too careful the first 
time.

I dropped it from for-next.

>
> -- 
> Cheers,
> Stephen Rothwell

linux-next: duplicate patch in the risc-v tree

[Stephen Rothwell]

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

Hi all,

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

  e8620de3f26b ("riscv: errata: fix T-Head dcache.cva encoding")

This is commit

  8eb8fe67e2c8 ("riscv: errata: fix T-Head dcache.cva encoding")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patch in the risc-v tree

[Palmer Dabbelt]

On Thu, 02 Nov 2023 13:58:40 PDT (-0700), Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in Linus Torvalds' tree as a different commit
> (but the same patch):
>
>   e8620de3f26b ("riscv: errata: fix T-Head dcache.cva encoding")
>
> This is commit
>
>   8eb8fe67e2c8 ("riscv: errata: fix T-Head dcache.cva encoding")
>
> in Linus' tree.

Thanks, I think I got this one too -- I'd tried to pick up the feature 
on top of the fix, but I'd managed to get something wrong in the 
process.

>
> -- 
> Cheers,
> Stephen Rothwell

linux-next: duplicate patch in the risc-v tree

[Stephen Rothwell]

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

Hi all,

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

  5392534a1954 ("riscv: Kconfig: Add select ARM_AMBA to SOC_STARFIVE")

This is commit

  78a03b9f8e6b ("riscv: Kconfig: Add select ARM_AMBA to SOC_STARFIVE")

in the arm-soc tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the risc-v tree

[Stephen Rothwell]

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

Hi all,

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

  3aaad36808b5 ("riscv: include asm/cacheflush.h in asm/hugetlb.h")

This is commit

  33a9fb09836a ("riscv: include asm/cacheflush.h in asm/hugetlb.h")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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