linux-next: duplicate patch in the pm tree

linux-next: duplicate patch in the pm tree

[Stephen Rothwell]

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

Hi all,

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

  bb796d5112d2 ("ACPI: resource: Add Medion S17413 to IRQ override quirk")

This is commit

  2d0ab14634a2 ("ACPI: resource: Add Medion S17413 to IRQ override quirk")

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 pm tree

[Wysocki, Rafael J]

On 3/26/2023 10:45 PM, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in Linus Torvalds' tree as a different commit
> (but the same patch):
>
>    bb796d5112d2 ("ACPI: resource: Add Medion S17413 to IRQ override quirk")
>
> This is commit
>
>    2d0ab14634a2 ("ACPI: resource: Add Medion S17413 to IRQ override quirk")
>
> in Linus' tree.

The duplicate patch should be gone from linux-next tomorrow, sorry for 
the trouble.

linux-next: duplicate patch in the pm tree

[Stephen Rothwell]

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

Hi all,

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

  8f0e8597a7fa ("ACPI: NFIT: Add declaration in a local header")

This is commit

  40d3f4a65a07 ("acpi: nfit: add declaration in a local header")

in the nvdimm-fixes tree.

-- 
Cheers,
Stephen Rothwell

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

RE: linux-next: duplicate patch in the pm tree

[Dan Williams]

Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in nvdimm-fixes tree as a different commit
> (but the same patch):
> 
>   8f0e8597a7fa ("ACPI: NFIT: Add declaration in a local header")
> 
> This is commit
> 
>   40d3f4a65a07 ("acpi: nfit: add declaration in a local header")
> 
> in the nvdimm-fixes tree.

I have now dropped this patch from nvdimm-fixes.

linux-next: duplicate patch in the pm 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):

  6711564863de ("thermal/debugfs: Add missing count increment to thermal_debug_tz_trip_up()")

This is commit

  b552f63cd437 ("thermal/debugfs: Add missing count increment to thermal_debug_tz_trip_up()")

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 pm tree

[Rafael J. Wysocki]

Hi Stephen,

On Monday, April 22, 2024 12:15:47 AM CEST Stephen Rothwell wrote:
> 
> --Sig_/2mWov6L/1T3YTV5TB80hoeT
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
> 
> Hi all,
> 
> The following commit is also in Linus Torvalds' tree as a different
> commit (but the same patch):
> 
>   6711564863de ("thermal/debugfs: Add missing count increment to thermal_de=
> bug_tz_trip_up()")
> 
> This is commit
> 
>   b552f63cd437 ("thermal/debugfs: Add missing count increment to thermal_de=
> bug_tz_trip_up()")
> 
> in Linus' tree.

Thanks for the report, this should be fixed now in the PM tree.

Cheers,
Rafael

linux-next: duplicate patch in the pm tree

[Stephen Rothwell]

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

Hi all,

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

  0f127178892e ("cpufreq: powerpc: add missing MODULE_DESCRIPTION() macros")

This is commit

  93bc6ba3e8c7 ("cpufreq: powerpc: add missing MODULE_DESCRIPTION() macros")

from 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 pm tree

[Andrew Morton]

On Mon, 5 Aug 2024 11:58:22 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> The following commit is also in the mm tree as a different commit (but
> the same patch):
> 
>   0f127178892e ("cpufreq: powerpc: add missing MODULE_DESCRIPTION() macros")
> 
> This is commit
> 
>   93bc6ba3e8c7 ("cpufreq: powerpc: add missing MODULE_DESCRIPTION() macros")
> 
> from the mm-nonmm-unstable branch of the mm tree.

Thanks, I dropped the mm.git copy.

linux-next: duplicate patch in the pm tree

[Stephen Rothwell]

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

Hi all,

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

  efbc5b4ac98e ("Documentation: amd-pstate:fix minimum performance state label error")

This is commit

  4613bf5fd045 ("Documentation: amd-pstate:fix minimum performance state label error")

in the jc_docs tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Jonathan Corbet]

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

> Hi all,
>
> The following commit is also in the jc_docs tree as a different commit
> (but the same patch):
>
>   efbc5b4ac98e ("Documentation: amd-pstate:fix minimum performance state label error")
>
> This is commit
>
>   4613bf5fd045 ("Documentation: amd-pstate:fix minimum performance state label error")
>
> in the jc_docs tree.

Ah, I hadn't realized it had been picked up there, I can drop my copy.

Thanks,

jon