* linux-next: duplicate patches in the drivers-x86 tree
@ 2023-02-02 21:34 Stephen Rothwell
2023-02-03 9:14 ` Hans de Goede
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2023-02-02 21:34 UTC (permalink / raw)
To: Hans de Goede, Mark Gross
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 920 bytes --]
Hi all,
The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):
037d07aeef02 ("platform/x86/amd/pmf: Fix to update SPS default pprof thermals")
5cca42fb5578 ("platform/x86/amd/pmf: Fix to update SPS thermals when power supply change")
66dc77b5c2a7 ("platform/x86/amd: pmc: add CONFIG_SERIO dependency")
8b6ad2361561 ("platform/x86: thinkpad_acpi: Fix thinklight LED brightness returning 255")
9f093aff1dda ("platform/x86: touchscreen_dmi: Add Chuwi Vi8 (CWI501) DMI match")
a63149e5d662 ("platform/x86/amd/pmf: update to auto-mode limits only after AMT event")
b3c37edce7dc ("platform/x86/amd/pmf: Add helper routine to update SPS thermals")
c02576762825 ("platform/x86/amd/pmf: Add helper routine to check pprof is balanced")
f1db3f08b51d ("platform/x86/amd/pmf: Ensure mutexes are initialized before use")
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: duplicate patches in the drivers-x86 tree
2023-02-02 21:34 linux-next: duplicate patches in the drivers-x86 tree Stephen Rothwell
@ 2023-02-03 9:14 ` Hans de Goede
0 siblings, 0 replies; 4+ messages in thread
From: Hans de Goede @ 2023-02-03 9:14 UTC (permalink / raw)
To: Stephen Rothwell, Mark Gross
Cc: Linux Kernel Mailing List, Linux Next Mailing List
Hi,
On 2/2/23 22:34, Stephen Rothwell wrote:
> Hi all,
>
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
>
> 037d07aeef02 ("platform/x86/amd/pmf: Fix to update SPS default pprof thermals")
> 5cca42fb5578 ("platform/x86/amd/pmf: Fix to update SPS thermals when power supply change")
> 66dc77b5c2a7 ("platform/x86/amd: pmc: add CONFIG_SERIO dependency")
> 8b6ad2361561 ("platform/x86: thinkpad_acpi: Fix thinklight LED brightness returning 255")
> 9f093aff1dda ("platform/x86: touchscreen_dmi: Add Chuwi Vi8 (CWI501) DMI match")
> a63149e5d662 ("platform/x86/amd/pmf: update to auto-mode limits only after AMT event")
> b3c37edce7dc ("platform/x86/amd/pmf: Add helper routine to update SPS thermals")
> c02576762825 ("platform/x86/amd/pmf: Add helper routine to check pprof is balanced")
> f1db3f08b51d ("platform/x86/amd/pmf: Ensure mutexes are initialized before use")
Hmm, this appears to be a new warning.
This is the result of my workflow for bug-fix patches, I first
merge all patches into the for-next branch and then I cherry-pick
fixes into the fixes branch and send out a pull-req from the fixes
branch for the current cycle.
AFAIK this is a pretty standard workflow ?
Bit I agree that ideally the duplicate commit ids from this workflow
should be avoided, so I'll try to change my workflow to putting fixes
directly on the fixes branch and then merging the fixes branch into
for-next and see how that goes.
I've also fixed the set of above duplicates by rebasing my current
for-next on top of fixes since I needed to do a forced push because
of the missing S-o-b-s anyways.
Regards,
Hans
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: duplicate patches in the drivers-x86 tree
@ 2025-03-25 6:23 Stephen Rothwell
2025-03-26 21:12 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2025-03-25 6:23 UTC (permalink / raw)
To: Hans de Goede, Mark Gross, Andrew Morton
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 542 bytes --]
Hi all,
The following commits are also in the mm-nonmm-stable tree as different
commits (but the same patches):
96b8f4658b70 ("platform/x86/amd/pmf: convert timeouts to secs_to_jiffies()")
b3e8dc1143b9 ("platform/x86: thinkpad_acpi: convert timeouts to secs_to_jiffies()")
These are commits
8ba1b428cf1a ("platform/x86/amd/pmf: convert timeouts to secs_to_jiffies()")
66644d80a4f9 ("platform/x86: thinkpad_acpi: convert timeouts to secs_to_jiffies()")
in the mm-nonmm-stable tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-03-26 21:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-02 21:34 linux-next: duplicate patches in the drivers-x86 tree Stephen Rothwell
2023-02-03 9:14 ` Hans de Goede
-- strict thread matches above, loose matches on Subject: below --
2025-03-25 6:23 Stephen Rothwell
2025-03-26 21:12 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox