* Patches to apply to stable releases
@ 2020-04-15 0:31 Guenter Roeck
2020-04-15 9:56 ` Greg Kroah-Hartman
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Guenter Roeck @ 2020-04-15 0:31 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, Sasha Levin
Hi,
Please consider applying the following patches to the listed stable releases.
The following patches were found to be missing in stable releases by the
Chrome OS missing patch robot. The patches meet the following criteria.
- The patch includes a Fixes: tag
- The patch referenced in the Fixes: tag has been applied to the listed
stable release(s)
- The patch has not been applied to the listed stable release(s)
All patches have been applied to the respective stable release(s) and to at
least one Chrome OS branch. Resulting images have been build- and runtime-
tested (where applicable) on real hardware and with virtual hardware on
kerneltests.org.
Thanks,
Guenter
---
Upstream commit e78c38f6bdd9 ("futex: futex_wake_op, do not fail on invalid op")
Fixes: 30d6e0a4190d ("futex: Remove duplicated code and fix undefined behaviour")
in linux-4.4.y: 177a981885cf
Applies to:
v4.4.y
Upstream commit 93f0750dcdae ("Revert "[media] videobuf2-v4l2: Verify planes array in buffer dequeueing"")
Fixes: 2c1f6951a8a8 ("videobuf2-v4l2: Verify planes array in buffer dequeueing")
in linux-4.4.y: 19a4e46b4513
Applies to:
v4.4.y
Upstream commit 2e356101e72a ("KEYS: reaching the keys quotas correctly")
Fixes: a08bf91ce28e ("KEYS: allow reaching the keys quotas exactly")
in linux-4.4.y: 1e73c0aeb3ee
in linux-4.9.y: 6704b9d8a075
in linux-4.14.y: fe303ba7ab93
in linux-4.19.y: f812bec554d0
Applies to:
v4.4.y, v4.9.y, v4.14.y, v4.19.y
Upstream commit 538d92912d31 ("xen-netfront: Rework the fix for Rx stall during OOM and network stress")
Fixes: 90c311b0eeea ("xen-netfront: Fix Rx stall during network stress and OOM")
in linux-4.4.y: 230fe9c7d814
Applies to:
v4.4.y
Upstream commit 183ab39eb0ea ("ALSA: hda: Initialize power_state field properly")
Fixes: 98081ca62cba ("ALSA: hda - Record the current power state before suspend/resume calls")
in linux-4.4.y: 2569eed24d93
in linux-4.9.y: 5ee86945565e
in linux-4.14.y: 886e8316b599
Applies to:
v4.4.y, v4.9.y, v4.14.y
Upstream commit 24e52b11e0ca ("Btrfs: incremental send, fix invalid memory access")
Fixes: e1cbfd7bf6da ("Btrfs: send, fix file hole not being preserved due to inline extent")
in linux-4.4.y: 266bbc907c3f
Applies to:
v4.4.y
Upstream commit 1f80bd6a6cc8 ("IB/ipoib: Fix lockdep issue found on ipoib_ib_dev_heavy_flush")
Fixes: b4b678b06f6e ("IB/ipoib: Grab rtnl lock on heavy flush when calling ndo_open/stop")
in linux-4.4.y: 26c66554d7bf
Applies to:
v4.4.y
Upstream commit 56a49d704870 ("net: rtnl_configure_link: fix dev flags changes arg to __dev_notify_flags")
Fixes: 5025f7f7d506 ("rtnetlink: add rtnl_link_state check in rtnl_configure_link")
in linux-4.14.y: 23557c5d34b9
Applies to:
v4.14.y
Upstream commit 11dd34f3eae5 ("powerpc/pseries: Drop pointless static qualifier in vpa_debugfs_init()")
Fixes: c6c26fb55e8e ("powerpc/pseries: Export raw per-CPU VPA data via debugfs")
in linux-4.14.y: 27b1ef75f579
in linux-4.19.y: ee35e01b0f08
Applies to:
v4.14.y, v4.19.y
Upstream commit 34d66caf251d ("x86/speculation: Remove redundant arch_smt_update() invocation")
Fixes: a74cfffb03b7 ("x86/speculation: Rework SMT state change")
in linux-4.14.y: 36a4c5fc9285
in linux-4.19.y: f55e301ec4d5
Applies to:
v4.14.y, v4.19.y
Upstream commit cc41f11a21a5 ("scsi: mpt3sas: Fix kernel panic observed on soft HBA unplug")
Fixes: c666d3be99c0 ("scsi: mpt3sas: wait for and flush running commands on shutdown/unload")
in linux-4.14.y: 3748694f1b91
Applies to:
v4.14.y
Upstream commit 82f04bfe2aff ("tools: gpio: Fix out-of-tree build regression")
Fixes: 0161a94e2d1c ("tools: gpio: Correctly add make dependencies for gpio_utils")
in linux-4.14.y: f71e52cb3270
in linux-4.19.y: 036588ec6888
Applies to:
v4.14.y, v4.19.y
Upstream commit 3e487d2e4aa4 ("PCI: pciehp: Fix indefinite wait on sysfs requests")
Fixes: 157c1062fcd8 ("PCI: pciehp: Avoid returning prematurely from sysfs requests")
in linux-4.19.y: 248e65f3220e
in linux-5.4.y: 9bd9d123399b
Applies to:
v4.19.y, v5.4.y
Upstream commit 8644772637de ("mm: Use fixed constant in page_frag_alloc instead of size + 1")
Fixes: 2c2ade81741c ("mm: page_alloc: fix ref bias in page_frag_alloc() for 1-byte allocs")
in linux-4.14.y: a977209627ca
in linux-4.19.y: 33e83ea302c0
Applies to:
v4.14.y, v4.19.y
Upstream commit 2abb5792387e ("net: qualcomm: rmnet: Allow configuration updates to existing devices")
Fixes: 1dc49e9d164c ("net: rmnet: do not allow to change mux id if mux id is duplicated")
in linux-4.19.y: 48c5bfbbcec1
in linux-5.4.y: 835bbd892683
Applies to:
v4.19.y, v5.4.y
Upstream commit 36eb7dc1bd42 ("cpufreq: imx6q: Fixes unwanted cpu overclocking on i.MX6ULL")
Fixes: 2733fb0d0699 ("cpufreq: imx6q: read OCOTP through nvmem for imx6ul/imx6ull")
in linux-4.19.y: 4ef576e99d29
Applies to:
v4.19.y
Upstream commit 4c7eeb9af3e4 ("arm64: dts: allwinner: h6: Fix PMU compatible")
Fixes: 7aa9b9eb7d6a ("arm64: dts: allwinner: H6: Add PMU mode")
in linux-4.19.y: 8f1046b33f1b
in linux-5.4.y: 02dfae36b03f
Applies to:
v4.19.y, v5.4.y
Upstream commit ae769d355664 ("ALSA: pcm: oss: Fix regression by buffer overflow fix")
Fixes: f2ecf903ef06 ("ALSA: pcm: oss: Avoid plugin buffer overflow")
in linux-4.14.y: 5ac3462e1921
in linux-4.19.y: 8c5bd5520334
in linux-5.4.y: 07ec940ceda5
Applies to:
v4.14.y, v4.19.y, v5.4.y
Upstream commit 82e0516ce3a1 ("sched/core: Remove duplicate assignment in sched_tick_remote()")
Fixes: ebc0f83c78a2 ("timers/nohz: Update NOHZ load in remote tick")
in linux-5.4.y: 166d6008fa2a
Applies to:
v5.4.y
Upstream commit 4ae7a3c3d7d3 ("arm64: dts: allwinner: h5: Fix PMU compatible")
Fixes: c35a516a4618 ("arm64: dts: allwinner: H5: Add PMU node")
in linux-5.4.y: 5a241d7bf1e6
Applies to:
v5.4.y
Upstream commit 9b8b17541f13 ("mm, memcg: do not high throttle allocators based on wraparound")
Fixes: e26733e0d0ec ("mm, memcg: throttle allocators based on ancestral memory.high")
in linux-5.4.y: 61cfbcce9e09
Applies to:
v5.4.y
Upstream commit 8c5c66052920 ("nvme-fc: Revert "add module to ops template to allow module references"")
Fixes: 863fbae929c7 ("nvme_fc: add module to ops template to allow module references")
in linux-4.14.y: a123233fc320
in linux-4.19.y: 6c786e656cd9
in linux-5.4.y: 6b49a5a9eb46
Applies to:
v4.14.y, v4.19.y, v5.4.y
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Patches to apply to stable releases
2020-04-15 0:31 Patches to apply to stable releases Guenter Roeck
@ 2020-04-15 9:56 ` Greg Kroah-Hartman
2020-04-15 9:58 ` Greg Kroah-Hartman
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2020-04-15 9:56 UTC (permalink / raw)
To: Guenter Roeck; +Cc: stable, Sasha Levin
On Tue, Apr 14, 2020 at 05:31:48PM -0700, Guenter Roeck wrote:
> Upstream commit 93f0750dcdae ("Revert "[media] videobuf2-v4l2: Verify planes array in buffer dequeueing"")
> Fixes: 2c1f6951a8a8 ("videobuf2-v4l2: Verify planes array in buffer dequeueing")
> in linux-4.4.y: 19a4e46b4513
> Applies to:
> v4.4.y
That commit is already in 4.4.11, are you sure you want it applied
again?
Ugh, it came back, as commit 83934b75c368 ("[media] videobuf2-v4l2:
Verify planes array in buffer dequeueing") Nothing like different git
commit ids for the same patch to cause confusions...
nevermind...
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Patches to apply to stable releases
2020-04-15 0:31 Patches to apply to stable releases Guenter Roeck
2020-04-15 9:56 ` Greg Kroah-Hartman
@ 2020-04-15 9:58 ` Greg Kroah-Hartman
2020-04-15 9:58 ` Greg Kroah-Hartman
2020-04-15 10:15 ` Greg Kroah-Hartman
3 siblings, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2020-04-15 9:58 UTC (permalink / raw)
To: Guenter Roeck; +Cc: stable, Sasha Levin
On Tue, Apr 14, 2020 at 05:31:48PM -0700, Guenter Roeck wrote:
> Upstream commit 2e356101e72a ("KEYS: reaching the keys quotas correctly")
> Fixes: a08bf91ce28e ("KEYS: allow reaching the keys quotas exactly")
> in linux-4.4.y: 1e73c0aeb3ee
> in linux-4.9.y: 6704b9d8a075
> in linux-4.14.y: fe303ba7ab93
> in linux-4.19.y: f812bec554d0
> Applies to:
> v4.4.y, v4.9.y, v4.14.y, v4.19.y
Already has a cc: stable tag, and is currently queued up. Considering
it just came out in 5.7-rc1, you need to give me a chance to catch up on
those, I have 150+ still to go on that huge dump right now...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Patches to apply to stable releases
2020-04-15 0:31 Patches to apply to stable releases Guenter Roeck
2020-04-15 9:56 ` Greg Kroah-Hartman
2020-04-15 9:58 ` Greg Kroah-Hartman
@ 2020-04-15 9:58 ` Greg Kroah-Hartman
2020-04-15 10:15 ` Greg Kroah-Hartman
3 siblings, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2020-04-15 9:58 UTC (permalink / raw)
To: Guenter Roeck; +Cc: stable, Sasha Levin
On Tue, Apr 14, 2020 at 05:31:48PM -0700, Guenter Roeck wrote:
> Upstream commit e78c38f6bdd9 ("futex: futex_wake_op, do not fail on invalid op")
> Fixes: 30d6e0a4190d ("futex: Remove duplicated code and fix undefined behaviour")
> in linux-4.4.y: 177a981885cf
> Applies to:
> v4.4.y
Now queued up.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Patches to apply to stable releases
2020-04-15 0:31 Patches to apply to stable releases Guenter Roeck
` (2 preceding siblings ...)
2020-04-15 9:58 ` Greg Kroah-Hartman
@ 2020-04-15 10:15 ` Greg Kroah-Hartman
2020-04-15 14:21 ` Guenter Roeck
3 siblings, 1 reply; 9+ messages in thread
From: Greg Kroah-Hartman @ 2020-04-15 10:15 UTC (permalink / raw)
To: Guenter Roeck; +Cc: stable, Sasha Levin
On Tue, Apr 14, 2020 at 05:31:48PM -0700, Guenter Roeck wrote:
> Upstream commit 538d92912d31 ("xen-netfront: Rework the fix for Rx stall during OOM and network stress")
> Fixes: 90c311b0eeea ("xen-netfront: Fix Rx stall during network stress and OOM")
> in linux-4.4.y: 230fe9c7d814
> Applies to:
> v4.4.y
Now queued up.
> Upstream commit 183ab39eb0ea ("ALSA: hda: Initialize power_state field properly")
> Fixes: 98081ca62cba ("ALSA: hda - Record the current power state before suspend/resume calls")
> in linux-4.4.y: 2569eed24d93
> in linux-4.9.y: 5ee86945565e
> in linux-4.14.y: 886e8316b599
> Applies to:
> v4.4.y, v4.9.y, v4.14.y
Now queued up.
> Upstream commit 24e52b11e0ca ("Btrfs: incremental send, fix invalid memory access")
> Fixes: e1cbfd7bf6da ("Btrfs: send, fix file hole not being preserved due to inline extent")
> in linux-4.4.y: 266bbc907c3f
> Applies to:
> v4.4.y
Now queued up.
> Upstream commit 1f80bd6a6cc8 ("IB/ipoib: Fix lockdep issue found on ipoib_ib_dev_heavy_flush")
> Fixes: b4b678b06f6e ("IB/ipoib: Grab rtnl lock on heavy flush when calling ndo_open/stop")
> in linux-4.4.y: 26c66554d7bf
> Applies to:
> v4.4.y
ChromeOS cares about IB devices? That's funny...
Anyway, now queued up.
> Upstream commit 56a49d704870 ("net: rtnl_configure_link: fix dev flags changes arg to __dev_notify_flags")
> Fixes: 5025f7f7d506 ("rtnetlink: add rtnl_link_state check in rtnl_configure_link")
> in linux-4.14.y: 23557c5d34b9
> Applies to:
> v4.14.y
Nice catch, now queued up.
> Upstream commit 11dd34f3eae5 ("powerpc/pseries: Drop pointless static qualifier in vpa_debugfs_init()")
> Fixes: c6c26fb55e8e ("powerpc/pseries: Export raw per-CPU VPA data via debugfs")
> in linux-4.14.y: 27b1ef75f579
> in linux-4.19.y: ee35e01b0f08
> Applies to:
> v4.14.y, v4.19.y
Also needed in 5.4.y, thanks.
> Upstream commit 34d66caf251d ("x86/speculation: Remove redundant arch_smt_update() invocation")
> Fixes: a74cfffb03b7 ("x86/speculation: Rework SMT state change")
> in linux-4.14.y: 36a4c5fc9285
> in linux-4.19.y: f55e301ec4d5
> Applies to:
> v4.14.y, v4.19.y
4.9.y and 4.4.y also need this. 4.9.y was simple, ugh, 4.4.y doesn't
care about speculation issues so I didn't attempt the backport.
> Upstream commit cc41f11a21a5 ("scsi: mpt3sas: Fix kernel panic observed on soft HBA unplug")
> Fixes: c666d3be99c0 ("scsi: mpt3sas: wait for and flush running commands on shutdown/unload")
> in linux-4.14.y: 3748694f1b91
> Applies to:
> v4.14.y
This also belongs to 4.19.y, 5.4.y, 5.5.y, and 5.6.y as it is cc:
stable. But it doesn't backport cleanly to all, so I need a working
backport in order to be able to take it...
> Upstream commit 82f04bfe2aff ("tools: gpio: Fix out-of-tree build regression")
> Fixes: 0161a94e2d1c ("tools: gpio: Correctly add make dependencies for gpio_utils")
> in linux-4.14.y: f71e52cb3270
> in linux-4.19.y: 036588ec6888
> Applies to:
> v4.14.y, v4.19.y
Also belongs to 4.9.y, 5.6.y, 5.5.y, and 5.4.y. Also has a cc: stable
that I hadn't gotten to yet, now applied.
> Upstream commit 3e487d2e4aa4 ("PCI: pciehp: Fix indefinite wait on sysfs requests")
> Fixes: 157c1062fcd8 ("PCI: pciehp: Avoid returning prematurely from sysfs requests")
> in linux-4.19.y: 248e65f3220e
> in linux-5.4.y: 9bd9d123399b
> Applies to:
> v4.19.y, v5.4.y
Already queued up yesterday, and to 5.5.y and 5.6.y.
> Upstream commit 8644772637de ("mm: Use fixed constant in page_frag_alloc instead of size + 1")
> Fixes: 2c2ade81741c ("mm: page_alloc: fix ref bias in page_frag_alloc() for 1-byte allocs")
> in linux-4.14.y: a977209627ca
> in linux-4.19.y: 33e83ea302c0
> Applies to:
> v4.14.y, v4.19.y
Also needed in 4.9.y, now queued up.
> Upstream commit 2abb5792387e ("net: qualcomm: rmnet: Allow configuration updates to existing devices")
> Fixes: 1dc49e9d164c ("net: rmnet: do not allow to change mux id if mux id is duplicated")
> in linux-4.19.y: 48c5bfbbcec1
> in linux-5.4.y: 835bbd892683
> Applies to:
> v4.19.y, v5.4.y
Normally I wait for DavidM to send me these as they are also applicable
to 5.6.y and 5.5.y. Now queued up.
> Upstream commit 36eb7dc1bd42 ("cpufreq: imx6q: Fixes unwanted cpu overclocking on i.MX6ULL")
> Fixes: 2733fb0d0699 ("cpufreq: imx6q: read OCOTP through nvmem for imx6ul/imx6ull")
> in linux-4.19.y: 4ef576e99d29
> Applies to:
> v4.19.y
Queued up yesterday.
> Upstream commit 4c7eeb9af3e4 ("arm64: dts: allwinner: h6: Fix PMU compatible")
> Fixes: 7aa9b9eb7d6a ("arm64: dts: allwinner: H6: Add PMU mode")
> in linux-4.19.y: 8f1046b33f1b
> in linux-5.4.y: 02dfae36b03f
> Applies to:
> v4.19.y, v5.4.y
Also needed in 5.5.y and 5.6.y.
> Upstream commit ae769d355664 ("ALSA: pcm: oss: Fix regression by buffer overflow fix")
> Fixes: f2ecf903ef06 ("ALSA: pcm: oss: Avoid plugin buffer overflow")
> in linux-4.14.y: 5ac3462e1921
> in linux-4.19.y: 8c5bd5520334
> in linux-5.4.y: 07ec940ceda5
> Applies to:
> v4.14.y, v4.19.y, v5.4.y
Already queued up yesterday all the way back to 4.4.y and 4.9.y as well
because f2ecf903ef06 ("ALSA: pcm: oss: Avoid plugin buffer overflow")
went that far back. Did your scripts miss that?
> Upstream commit 82e0516ce3a1 ("sched/core: Remove duplicate assignment in sched_tick_remote()")
> Fixes: ebc0f83c78a2 ("timers/nohz: Update NOHZ load in remote tick")
> in linux-5.4.y: 166d6008fa2a
> Applies to:
> v5.4.y
Also applied to 5.5.y and 5.6.y
> Upstream commit 4ae7a3c3d7d3 ("arm64: dts: allwinner: h5: Fix PMU compatible")
> Fixes: c35a516a4618 ("arm64: dts: allwinner: H5: Add PMU node")
> in linux-5.4.y: 5a241d7bf1e6
> Applies to:
> v5.4.y
Also applied to 5.5.y and 5.6.y
> Upstream commit 9b8b17541f13 ("mm, memcg: do not high throttle allocators based on wraparound")
> Fixes: e26733e0d0ec ("mm, memcg: throttle allocators based on ancestral memory.high")
> in linux-5.4.y: 61cfbcce9e09
> Applies to:
> v5.4.y
Hadn't gotten to it yet, also queued up for 5.5.y and 5.6.y
> Upstream commit 8c5c66052920 ("nvme-fc: Revert "add module to ops template to allow module references"")
> Fixes: 863fbae929c7 ("nvme_fc: add module to ops template to allow module references")
> in linux-4.14.y: a123233fc320
> in linux-4.19.y: 6c786e656cd9
> in linux-5.4.y: 6b49a5a9eb46
> Applies to:
> v4.14.y, v4.19.y, v5.4.y
Queued up yesterday, also for 5.5.y and 5.6.y.
Many thanks for these, I think they should now all be handled.
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Patches to apply to stable releases
2020-04-15 10:15 ` Greg Kroah-Hartman
@ 2020-04-15 14:21 ` Guenter Roeck
2020-04-15 14:49 ` Greg Kroah-Hartman
0 siblings, 1 reply; 9+ messages in thread
From: Guenter Roeck @ 2020-04-15 14:21 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: stable, Sasha Levin
On 4/15/20 3:15 AM, Greg Kroah-Hartman wrote:
> On Tue, Apr 14, 2020 at 05:31:48PM -0700, Guenter Roeck wrote:
>> Upstream commit 538d92912d31 ("xen-netfront: Rework the fix for Rx stall during OOM and network stress")
>> Fixes: 90c311b0eeea ("xen-netfront: Fix Rx stall during network stress and OOM")
>> in linux-4.4.y: 230fe9c7d814
>> Applies to:
>> v4.4.y
>
> Now queued up.
>
>> Upstream commit 183ab39eb0ea ("ALSA: hda: Initialize power_state field properly")
>> Fixes: 98081ca62cba ("ALSA: hda - Record the current power state before suspend/resume calls")
>> in linux-4.4.y: 2569eed24d93
>> in linux-4.9.y: 5ee86945565e
>> in linux-4.14.y: 886e8316b599
>> Applies to:
>> v4.4.y, v4.9.y, v4.14.y
>
> Now queued up.
>
>> Upstream commit 24e52b11e0ca ("Btrfs: incremental send, fix invalid memory access")
>> Fixes: e1cbfd7bf6da ("Btrfs: send, fix file hole not being preserved due to inline extent")
>> in linux-4.4.y: 266bbc907c3f
>> Applies to:
>> v4.4.y
>
> Now queued up.
>
>> Upstream commit 1f80bd6a6cc8 ("IB/ipoib: Fix lockdep issue found on ipoib_ib_dev_heavy_flush")
>> Fixes: b4b678b06f6e ("IB/ipoib: Grab rtnl lock on heavy flush when calling ndo_open/stop")
>> in linux-4.4.y: 26c66554d7bf
>> Applies to:
>> v4.4.y
>
> ChromeOS cares about IB devices? That's funny...
>
No, it doesn't, but the script doesn't know that, and if a patch
applies cleanly I add it to the list anyway.
> Anyway, now queued up.
>
>> Upstream commit 56a49d704870 ("net: rtnl_configure_link: fix dev flags changes arg to __dev_notify_flags")
>> Fixes: 5025f7f7d506 ("rtnetlink: add rtnl_link_state check in rtnl_configure_link")
>> in linux-4.14.y: 23557c5d34b9
>> Applies to:
>> v4.14.y
>
> Nice catch, now queued up.
>
>> Upstream commit 11dd34f3eae5 ("powerpc/pseries: Drop pointless static qualifier in vpa_debugfs_init()")
>> Fixes: c6c26fb55e8e ("powerpc/pseries: Export raw per-CPU VPA data via debugfs")
>> in linux-4.14.y: 27b1ef75f579
>> in linux-4.19.y: ee35e01b0f08
>> Applies to:
>> v4.14.y, v4.19.y
>
> Also needed in 5.4.y, thanks.
>
Sorry, script didn't tell me. See below for reason/details.
>> Upstream commit 34d66caf251d ("x86/speculation: Remove redundant arch_smt_update() invocation")
>> Fixes: a74cfffb03b7 ("x86/speculation: Rework SMT state change")
>> in linux-4.14.y: 36a4c5fc9285
>> in linux-4.19.y: f55e301ec4d5
>> Applies to:
>> v4.14.y, v4.19.y
>
> 4.9.y and 4.4.y also need this. 4.9.y was simple, ugh, 4.4.y doesn't
> care about speculation issues so I didn't attempt the backport.
>
Yes, that may happen. I only list it if it applies cleanly.
I can add a note in the future that it would be needed but require
a backport.
>> Upstream commit cc41f11a21a5 ("scsi: mpt3sas: Fix kernel panic observed on soft HBA unplug")
>> Fixes: c666d3be99c0 ("scsi: mpt3sas: wait for and flush running commands on shutdown/unload")
>> in linux-4.14.y: 3748694f1b91
>> Applies to:
>> v4.14.y
>
> This also belongs to 4.19.y, 5.4.y, 5.5.y, and 5.6.y as it is cc:
> stable. But it doesn't backport cleanly to all, so I need a working
> backport in order to be able to take it...
>
I tracked this one down. The offending patch (c666d3be99c0) was applied
to v4.16 and to v4.14.y. The script takes that as clue to request a backport;
it assumes that the normal stable processs (whatever you and Sasha run to
identify patches to apply) takes care of more recent releases, and doesn't
look into those. This is intentional. We can change it, but I don't really
want to duplicate your and Sasha's work.
Oops, and I completely forgot about 5.5 and 5.6. The script doesn't tell
me (and neither about 4.9) because there is no such Chrome OS release,
so I have to check those manually.
Either case, the patch applies cleanly to 4.19.y and later for me.
Did you see conflicts, or build problems, when trying to apply it ?
Note that we don't really care about mpt3sas; missing that patch
is not a problem for us. My qemu emulations test basic mpt3sas
operation, but not unplug situations, so I would not miss the patch
there either. So feel free to ignore/drop if it causes issues.
>> Upstream commit 82f04bfe2aff ("tools: gpio: Fix out-of-tree build regression")
>> Fixes: 0161a94e2d1c ("tools: gpio: Correctly add make dependencies for gpio_utils")
>> in linux-4.14.y: f71e52cb3270
>> in linux-4.19.y: 036588ec6888
>> Applies to:
>> v4.14.y, v4.19.y
>
> Also belongs to 4.9.y, 5.6.y, 5.5.y, and 5.4.y. Also has a cc: stable
> that I hadn't gotten to yet, now applied.
>
The offending patch (0161a94e2d1c) is in 5.4, and thus the script assumes
that the normal stable process would take care of it. Same situation as
above. And I forgot to check 4.9, sorry.
>> Upstream commit 3e487d2e4aa4 ("PCI: pciehp: Fix indefinite wait on sysfs requests")
>> Fixes: 157c1062fcd8 ("PCI: pciehp: Avoid returning prematurely from sysfs requests")
>> in linux-4.19.y: 248e65f3220e
>> in linux-5.4.y: 9bd9d123399b
>> Applies to:
>> v4.19.y, v5.4.y
>
> Already queued up yesterday, and to 5.5.y and 5.6.y.
>
>> Upstream commit 8644772637de ("mm: Use fixed constant in page_frag_alloc instead of size + 1")
>> Fixes: 2c2ade81741c ("mm: page_alloc: fix ref bias in page_frag_alloc() for 1-byte allocs")
>> in linux-4.14.y: a977209627ca
>> in linux-4.19.y: 33e83ea302c0
>> Applies to:
>> v4.14.y, v4.19.y
>
> Also needed in 4.9.y, now queued up.
>
>> Upstream commit 2abb5792387e ("net: qualcomm: rmnet: Allow configuration updates to existing devices")
>> Fixes: 1dc49e9d164c ("net: rmnet: do not allow to change mux id if mux id is duplicated")
>> in linux-4.19.y: 48c5bfbbcec1
>> in linux-5.4.y: 835bbd892683
>> Applies to:
>> v4.19.y, v5.4.y
>
> Normally I wait for DavidM to send me these as they are also applicable
> to 5.6.y and 5.5.y. Now queued up.
>
>> Upstream commit 36eb7dc1bd42 ("cpufreq: imx6q: Fixes unwanted cpu overclocking on i.MX6ULL")
>> Fixes: 2733fb0d0699 ("cpufreq: imx6q: read OCOTP through nvmem for imx6ul/imx6ull")
>> in linux-4.19.y: 4ef576e99d29
>> Applies to:
>> v4.19.y
>
> Queued up yesterday.
>
>> Upstream commit 4c7eeb9af3e4 ("arm64: dts: allwinner: h6: Fix PMU compatible")
>> Fixes: 7aa9b9eb7d6a ("arm64: dts: allwinner: H6: Add PMU mode")
>> in linux-4.19.y: 8f1046b33f1b
>> in linux-5.4.y: 02dfae36b03f
>> Applies to:
>> v4.19.y, v5.4.y
>
> Also needed in 5.5.y and 5.6.y.
>
>> Upstream commit ae769d355664 ("ALSA: pcm: oss: Fix regression by buffer overflow fix")
>> Fixes: f2ecf903ef06 ("ALSA: pcm: oss: Avoid plugin buffer overflow")
>> in linux-4.14.y: 5ac3462e1921
>> in linux-4.19.y: 8c5bd5520334
>> in linux-5.4.y: 07ec940ceda5
>> Applies to:
>> v4.14.y, v4.19.y, v5.4.y
>
> Already queued up yesterday all the way back to 4.4.y and 4.9.y as well
> because f2ecf903ef06 ("ALSA: pcm: oss: Avoid plugin buffer overflow")
> went that far back. Did your scripts miss that?
>
It was dropped from 4.4 because it causes a conflict when trying to apply
it to chromeos-4.4. I'll see what I can do about that.
>> Upstream commit 82e0516ce3a1 ("sched/core: Remove duplicate assignment in sched_tick_remote()")
>> Fixes: ebc0f83c78a2 ("timers/nohz: Update NOHZ load in remote tick")
>> in linux-5.4.y: 166d6008fa2a
>> Applies to:
>> v5.4.y
>
> Also applied to 5.5.y and 5.6.y
>
>> Upstream commit 4ae7a3c3d7d3 ("arm64: dts: allwinner: h5: Fix PMU compatible")
>> Fixes: c35a516a4618 ("arm64: dts: allwinner: H5: Add PMU node")
>> in linux-5.4.y: 5a241d7bf1e6
>> Applies to:
>> v5.4.y
>
> Also applied to 5.5.y and 5.6.y
>
>> Upstream commit 9b8b17541f13 ("mm, memcg: do not high throttle allocators based on wraparound")
>> Fixes: e26733e0d0ec ("mm, memcg: throttle allocators based on ancestral memory.high")
>> in linux-5.4.y: 61cfbcce9e09
>> Applies to:
>> v5.4.y
>
> Hadn't gotten to it yet, also queued up for 5.5.y and 5.6.y
>
>> Upstream commit 8c5c66052920 ("nvme-fc: Revert "add module to ops template to allow module references"")
>> Fixes: 863fbae929c7 ("nvme_fc: add module to ops template to allow module references")
>> in linux-4.14.y: a123233fc320
>> in linux-4.19.y: 6c786e656cd9
>> in linux-5.4.y: 6b49a5a9eb46
>> Applies to:
>> v4.14.y, v4.19.y, v5.4.y
>
> Queued up yesterday, also for 5.5.y and 5.6.y.
>
> Many thanks for these, I think they should now all be handled.
>
Thanks a lot, and sorry for missing 5.5/5.6. Those really completely
slipped my mind.
So the big question is if we should report patches such as 82f04bfe2aff,
ie patches missing from stable releases where the offending patch was
not applied to a stable release but to mainline. This would overlap
with Sasha's script, though, so I am not sure if it would be a good
idea. What is your take ?
Thanks,
Guenter
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Patches to apply to stable releases
2020-04-15 14:21 ` Guenter Roeck
@ 2020-04-15 14:49 ` Greg Kroah-Hartman
2020-04-15 15:13 ` Guenter Roeck
0 siblings, 1 reply; 9+ messages in thread
From: Greg Kroah-Hartman @ 2020-04-15 14:49 UTC (permalink / raw)
To: Guenter Roeck; +Cc: stable, Sasha Levin
On Wed, Apr 15, 2020 at 07:21:44AM -0700, Guenter Roeck wrote:
> >> Upstream commit cc41f11a21a5 ("scsi: mpt3sas: Fix kernel panic observed on soft HBA unplug")
> >> Fixes: c666d3be99c0 ("scsi: mpt3sas: wait for and flush running commands on shutdown/unload")
> >> in linux-4.14.y: 3748694f1b91
> >> Applies to:
> >> v4.14.y
> >
> > This also belongs to 4.19.y, 5.4.y, 5.5.y, and 5.6.y as it is cc:
> > stable. But it doesn't backport cleanly to all, so I need a working
> > backport in order to be able to take it...
> >
> I tracked this one down. The offending patch (c666d3be99c0) was applied
> to v4.16 and to v4.14.y. The script takes that as clue to request a backport;
> it assumes that the normal stable processs (whatever you and Sasha run to
> identify patches to apply) takes care of more recent releases, and doesn't
> look into those. This is intentional. We can change it, but I don't really
> want to duplicate your and Sasha's work.
>
> Oops, and I completely forgot about 5.5 and 5.6. The script doesn't tell
> me (and neither about 4.9) because there is no such Chrome OS release,
> so I have to check those manually.
>
> Either case, the patch applies cleanly to 4.19.y and later for me.
> Did you see conflicts, or build problems, when trying to apply it ?
When trying to patch 4.19.y:
checking file drivers/scsi/mpt3sas/mpt3sas_scsih.c
Hunk #1 succeeded at 9919 (offset 11 lines).
Hunk #2 FAILED at 9992.
1 out of 2 hunks FAILED
> Note that we don't really care about mpt3sas; missing that patch
> is not a problem for us. My qemu emulations test basic mpt3sas
> operation, but not unplug situations, so I would not miss the patch
> there either. So feel free to ignore/drop if it causes issues.
I've asked the developers for a backport, if they think it is needed.
> >> Upstream commit 82f04bfe2aff ("tools: gpio: Fix out-of-tree build regression")
> >> Fixes: 0161a94e2d1c ("tools: gpio: Correctly add make dependencies for gpio_utils")
> >> in linux-4.14.y: f71e52cb3270
> >> in linux-4.19.y: 036588ec6888
> >> Applies to:
> >> v4.14.y, v4.19.y
> >
> > Also belongs to 4.9.y, 5.6.y, 5.5.y, and 5.4.y. Also has a cc: stable
> > that I hadn't gotten to yet, now applied.
> >
> The offending patch (0161a94e2d1c) is in 5.4, and thus the script assumes
> that the normal stable process would take care of it. Same situation as
> above. And I forgot to check 4.9, sorry.
>
> >> Upstream commit 3e487d2e4aa4 ("PCI: pciehp: Fix indefinite wait on sysfs requests")
> >> Fixes: 157c1062fcd8 ("PCI: pciehp: Avoid returning prematurely from sysfs requests")
> >> in linux-4.19.y: 248e65f3220e
> >> in linux-5.4.y: 9bd9d123399b
> >> Applies to:
> >> v4.19.y, v5.4.y
> >
> > Already queued up yesterday, and to 5.5.y and 5.6.y.
> >
> >> Upstream commit 8644772637de ("mm: Use fixed constant in page_frag_alloc instead of size + 1")
> >> Fixes: 2c2ade81741c ("mm: page_alloc: fix ref bias in page_frag_alloc() for 1-byte allocs")
> >> in linux-4.14.y: a977209627ca
> >> in linux-4.19.y: 33e83ea302c0
> >> Applies to:
> >> v4.14.y, v4.19.y
> >
> > Also needed in 4.9.y, now queued up.
> >
> >> Upstream commit 2abb5792387e ("net: qualcomm: rmnet: Allow configuration updates to existing devices")
> >> Fixes: 1dc49e9d164c ("net: rmnet: do not allow to change mux id if mux id is duplicated")
> >> in linux-4.19.y: 48c5bfbbcec1
> >> in linux-5.4.y: 835bbd892683
> >> Applies to:
> >> v4.19.y, v5.4.y
> >
> > Normally I wait for DavidM to send me these as they are also applicable
> > to 5.6.y and 5.5.y. Now queued up.
> >
> >> Upstream commit 36eb7dc1bd42 ("cpufreq: imx6q: Fixes unwanted cpu overclocking on i.MX6ULL")
> >> Fixes: 2733fb0d0699 ("cpufreq: imx6q: read OCOTP through nvmem for imx6ul/imx6ull")
> >> in linux-4.19.y: 4ef576e99d29
> >> Applies to:
> >> v4.19.y
> >
> > Queued up yesterday.
> >
> >> Upstream commit 4c7eeb9af3e4 ("arm64: dts: allwinner: h6: Fix PMU compatible")
> >> Fixes: 7aa9b9eb7d6a ("arm64: dts: allwinner: H6: Add PMU mode")
> >> in linux-4.19.y: 8f1046b33f1b
> >> in linux-5.4.y: 02dfae36b03f
> >> Applies to:
> >> v4.19.y, v5.4.y
> >
> > Also needed in 5.5.y and 5.6.y.
> >
> >> Upstream commit ae769d355664 ("ALSA: pcm: oss: Fix regression by buffer overflow fix")
> >> Fixes: f2ecf903ef06 ("ALSA: pcm: oss: Avoid plugin buffer overflow")
> >> in linux-4.14.y: 5ac3462e1921
> >> in linux-4.19.y: 8c5bd5520334
> >> in linux-5.4.y: 07ec940ceda5
> >> Applies to:
> >> v4.14.y, v4.19.y, v5.4.y
> >
> > Already queued up yesterday all the way back to 4.4.y and 4.9.y as well
> > because f2ecf903ef06 ("ALSA: pcm: oss: Avoid plugin buffer overflow")
> > went that far back. Did your scripts miss that?
> >
> It was dropped from 4.4 because it causes a conflict when trying to apply
> it to chromeos-4.4. I'll see what I can do about that.
>
> >> Upstream commit 82e0516ce3a1 ("sched/core: Remove duplicate assignment in sched_tick_remote()")
> >> Fixes: ebc0f83c78a2 ("timers/nohz: Update NOHZ load in remote tick")
> >> in linux-5.4.y: 166d6008fa2a
> >> Applies to:
> >> v5.4.y
> >
> > Also applied to 5.5.y and 5.6.y
> >
> >> Upstream commit 4ae7a3c3d7d3 ("arm64: dts: allwinner: h5: Fix PMU compatible")
> >> Fixes: c35a516a4618 ("arm64: dts: allwinner: H5: Add PMU node")
> >> in linux-5.4.y: 5a241d7bf1e6
> >> Applies to:
> >> v5.4.y
> >
> > Also applied to 5.5.y and 5.6.y
> >
> >> Upstream commit 9b8b17541f13 ("mm, memcg: do not high throttle allocators based on wraparound")
> >> Fixes: e26733e0d0ec ("mm, memcg: throttle allocators based on ancestral memory.high")
> >> in linux-5.4.y: 61cfbcce9e09
> >> Applies to:
> >> v5.4.y
> >
> > Hadn't gotten to it yet, also queued up for 5.5.y and 5.6.y
> >
> >> Upstream commit 8c5c66052920 ("nvme-fc: Revert "add module to ops template to allow module references"")
> >> Fixes: 863fbae929c7 ("nvme_fc: add module to ops template to allow module references")
> >> in linux-4.14.y: a123233fc320
> >> in linux-4.19.y: 6c786e656cd9
> >> in linux-5.4.y: 6b49a5a9eb46
> >> Applies to:
> >> v4.14.y, v4.19.y, v5.4.y
> >
> > Queued up yesterday, also for 5.5.y and 5.6.y.
> >
> > Many thanks for these, I think they should now all be handled.
> >
>
> Thanks a lot, and sorry for missing 5.5/5.6. Those really completely
> slipped my mind.
>
> So the big question is if we should report patches such as 82f04bfe2aff,
> ie patches missing from stable releases where the offending patch was
> not applied to a stable release but to mainline. This would overlap
> with Sasha's script, though, so I am not sure if it would be a good
> idea. What is your take ?
The "offending" patch in that case was applied to mainline and all the
way back to 4.9.y (was in 4.9.204) , so yes, it is good to be notified
of this.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Patches to apply to stable releases
2020-04-15 14:49 ` Greg Kroah-Hartman
@ 2020-04-15 15:13 ` Guenter Roeck
2020-04-15 16:52 ` Greg Kroah-Hartman
0 siblings, 1 reply; 9+ messages in thread
From: Guenter Roeck @ 2020-04-15 15:13 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: stable, Sasha Levin
On Wed, Apr 15, 2020 at 04:49:19PM +0200, Greg Kroah-Hartman wrote:
> On Wed, Apr 15, 2020 at 07:21:44AM -0700, Guenter Roeck wrote:
> > >> Upstream commit cc41f11a21a5 ("scsi: mpt3sas: Fix kernel panic observed on soft HBA unplug")
> > >> Fixes: c666d3be99c0 ("scsi: mpt3sas: wait for and flush running commands on shutdown/unload")
> > >> in linux-4.14.y: 3748694f1b91
> > >> Applies to:
> > >> v4.14.y
> > >
> > > This also belongs to 4.19.y, 5.4.y, 5.5.y, and 5.6.y as it is cc:
> > > stable. But it doesn't backport cleanly to all, so I need a working
> > > backport in order to be able to take it...
> > >
> > I tracked this one down. The offending patch (c666d3be99c0) was applied
> > to v4.16 and to v4.14.y. The script takes that as clue to request a backport;
> > it assumes that the normal stable processs (whatever you and Sasha run to
> > identify patches to apply) takes care of more recent releases, and doesn't
> > look into those. This is intentional. We can change it, but I don't really
> > want to duplicate your and Sasha's work.
> >
> > Oops, and I completely forgot about 5.5 and 5.6. The script doesn't tell
> > me (and neither about 4.9) because there is no such Chrome OS release,
> > so I have to check those manually.
> >
> > Either case, the patch applies cleanly to 4.19.y and later for me.
> > Did you see conflicts, or build problems, when trying to apply it ?
>
> When trying to patch 4.19.y:
> checking file drivers/scsi/mpt3sas/mpt3sas_scsih.c
> Hunk #1 succeeded at 9919 (offset 11 lines).
> Hunk #2 FAILED at 9992.
> 1 out of 2 hunks FAILED
>
Interesting. Both "git cherry-pick" and "git am" (I don't even need
"git am -3") on top of v4.19.115 work fine for me. But, yes, trying
to apply the patch using the patch command does indeed fail with this
error. Wonder what git does differently when running "git am".
> > Note that we don't really care about mpt3sas; missing that patch
> > is not a problem for us. My qemu emulations test basic mpt3sas
> > operation, but not unplug situations, so I would not miss the patch
> > there either. So feel free to ignore/drop if it causes issues.
>
> I've asked the developers for a backport, if they think it is needed.
>
> > >> Upstream commit 82f04bfe2aff ("tools: gpio: Fix out-of-tree build regression")
> > >> Fixes: 0161a94e2d1c ("tools: gpio: Correctly add make dependencies for gpio_utils")
> > >> in linux-4.14.y: f71e52cb3270
> > >> in linux-4.19.y: 036588ec6888
> > >> Applies to:
> > >> v4.14.y, v4.19.y
> > >
> > > Also belongs to 4.9.y, 5.6.y, 5.5.y, and 5.4.y. Also has a cc: stable
> > > that I hadn't gotten to yet, now applied.
> > >
> > The offending patch (0161a94e2d1c) is in 5.4, and thus the script assumes
> > that the normal stable process would take care of it. Same situation as
> > above. And I forgot to check 4.9, sorry.
> >
> > >> Upstream commit 3e487d2e4aa4 ("PCI: pciehp: Fix indefinite wait on sysfs requests")
> > >> Fixes: 157c1062fcd8 ("PCI: pciehp: Avoid returning prematurely from sysfs requests")
> > >> in linux-4.19.y: 248e65f3220e
> > >> in linux-5.4.y: 9bd9d123399b
> > >> Applies to:
> > >> v4.19.y, v5.4.y
> > >
> > > Already queued up yesterday, and to 5.5.y and 5.6.y.
> > >
> > >> Upstream commit 8644772637de ("mm: Use fixed constant in page_frag_alloc instead of size + 1")
> > >> Fixes: 2c2ade81741c ("mm: page_alloc: fix ref bias in page_frag_alloc() for 1-byte allocs")
> > >> in linux-4.14.y: a977209627ca
> > >> in linux-4.19.y: 33e83ea302c0
> > >> Applies to:
> > >> v4.14.y, v4.19.y
> > >
> > > Also needed in 4.9.y, now queued up.
> > >
> > >> Upstream commit 2abb5792387e ("net: qualcomm: rmnet: Allow configuration updates to existing devices")
> > >> Fixes: 1dc49e9d164c ("net: rmnet: do not allow to change mux id if mux id is duplicated")
> > >> in linux-4.19.y: 48c5bfbbcec1
> > >> in linux-5.4.y: 835bbd892683
> > >> Applies to:
> > >> v4.19.y, v5.4.y
> > >
> > > Normally I wait for DavidM to send me these as they are also applicable
> > > to 5.6.y and 5.5.y. Now queued up.
> > >
> > >> Upstream commit 36eb7dc1bd42 ("cpufreq: imx6q: Fixes unwanted cpu overclocking on i.MX6ULL")
> > >> Fixes: 2733fb0d0699 ("cpufreq: imx6q: read OCOTP through nvmem for imx6ul/imx6ull")
> > >> in linux-4.19.y: 4ef576e99d29
> > >> Applies to:
> > >> v4.19.y
> > >
> > > Queued up yesterday.
> > >
> > >> Upstream commit 4c7eeb9af3e4 ("arm64: dts: allwinner: h6: Fix PMU compatible")
> > >> Fixes: 7aa9b9eb7d6a ("arm64: dts: allwinner: H6: Add PMU mode")
> > >> in linux-4.19.y: 8f1046b33f1b
> > >> in linux-5.4.y: 02dfae36b03f
> > >> Applies to:
> > >> v4.19.y, v5.4.y
> > >
> > > Also needed in 5.5.y and 5.6.y.
> > >
> > >> Upstream commit ae769d355664 ("ALSA: pcm: oss: Fix regression by buffer overflow fix")
> > >> Fixes: f2ecf903ef06 ("ALSA: pcm: oss: Avoid plugin buffer overflow")
> > >> in linux-4.14.y: 5ac3462e1921
> > >> in linux-4.19.y: 8c5bd5520334
> > >> in linux-5.4.y: 07ec940ceda5
> > >> Applies to:
> > >> v4.14.y, v4.19.y, v5.4.y
> > >
> > > Already queued up yesterday all the way back to 4.4.y and 4.9.y as well
> > > because f2ecf903ef06 ("ALSA: pcm: oss: Avoid plugin buffer overflow")
> > > went that far back. Did your scripts miss that?
> > >
> > It was dropped from 4.4 because it causes a conflict when trying to apply
> > it to chromeos-4.4. I'll see what I can do about that.
> >
> > >> Upstream commit 82e0516ce3a1 ("sched/core: Remove duplicate assignment in sched_tick_remote()")
> > >> Fixes: ebc0f83c78a2 ("timers/nohz: Update NOHZ load in remote tick")
> > >> in linux-5.4.y: 166d6008fa2a
> > >> Applies to:
> > >> v5.4.y
> > >
> > > Also applied to 5.5.y and 5.6.y
> > >
> > >> Upstream commit 4ae7a3c3d7d3 ("arm64: dts: allwinner: h5: Fix PMU compatible")
> > >> Fixes: c35a516a4618 ("arm64: dts: allwinner: H5: Add PMU node")
> > >> in linux-5.4.y: 5a241d7bf1e6
> > >> Applies to:
> > >> v5.4.y
> > >
> > > Also applied to 5.5.y and 5.6.y
> > >
> > >> Upstream commit 9b8b17541f13 ("mm, memcg: do not high throttle allocators based on wraparound")
> > >> Fixes: e26733e0d0ec ("mm, memcg: throttle allocators based on ancestral memory.high")
> > >> in linux-5.4.y: 61cfbcce9e09
> > >> Applies to:
> > >> v5.4.y
> > >
> > > Hadn't gotten to it yet, also queued up for 5.5.y and 5.6.y
> > >
> > >> Upstream commit 8c5c66052920 ("nvme-fc: Revert "add module to ops template to allow module references"")
> > >> Fixes: 863fbae929c7 ("nvme_fc: add module to ops template to allow module references")
> > >> in linux-4.14.y: a123233fc320
> > >> in linux-4.19.y: 6c786e656cd9
> > >> in linux-5.4.y: 6b49a5a9eb46
> > >> Applies to:
> > >> v4.14.y, v4.19.y, v5.4.y
> > >
> > > Queued up yesterday, also for 5.5.y and 5.6.y.
> > >
> > > Many thanks for these, I think they should now all be handled.
> > >
> >
> > Thanks a lot, and sorry for missing 5.5/5.6. Those really completely
> > slipped my mind.
> >
> > So the big question is if we should report patches such as 82f04bfe2aff,
> > ie patches missing from stable releases where the offending patch was
> > not applied to a stable release but to mainline. This would overlap
> > with Sasha's script, though, so I am not sure if it would be a good
> > idea. What is your take ?
>
> The "offending" patch in that case was applied to mainline and all the
> way back to 4.9.y (was in 4.9.204) , so yes, it is good to be notified
> of this.
>
Ok, I'll see what I can do. I'll try to get it done in time for next
week's report.
Thanks,
Guenter
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Patches to apply to stable releases
2020-04-15 15:13 ` Guenter Roeck
@ 2020-04-15 16:52 ` Greg Kroah-Hartman
0 siblings, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2020-04-15 16:52 UTC (permalink / raw)
To: Guenter Roeck; +Cc: stable, Sasha Levin
On Wed, Apr 15, 2020 at 08:13:56AM -0700, Guenter Roeck wrote:
> On Wed, Apr 15, 2020 at 04:49:19PM +0200, Greg Kroah-Hartman wrote:
> > On Wed, Apr 15, 2020 at 07:21:44AM -0700, Guenter Roeck wrote:
> > > >> Upstream commit cc41f11a21a5 ("scsi: mpt3sas: Fix kernel panic observed on soft HBA unplug")
> > > >> Fixes: c666d3be99c0 ("scsi: mpt3sas: wait for and flush running commands on shutdown/unload")
> > > >> in linux-4.14.y: 3748694f1b91
> > > >> Applies to:
> > > >> v4.14.y
> > > >
> > > > This also belongs to 4.19.y, 5.4.y, 5.5.y, and 5.6.y as it is cc:
> > > > stable. But it doesn't backport cleanly to all, so I need a working
> > > > backport in order to be able to take it...
> > > >
> > > I tracked this one down. The offending patch (c666d3be99c0) was applied
> > > to v4.16 and to v4.14.y. The script takes that as clue to request a backport;
> > > it assumes that the normal stable processs (whatever you and Sasha run to
> > > identify patches to apply) takes care of more recent releases, and doesn't
> > > look into those. This is intentional. We can change it, but I don't really
> > > want to duplicate your and Sasha's work.
> > >
> > > Oops, and I completely forgot about 5.5 and 5.6. The script doesn't tell
> > > me (and neither about 4.9) because there is no such Chrome OS release,
> > > so I have to check those manually.
> > >
> > > Either case, the patch applies cleanly to 4.19.y and later for me.
> > > Did you see conflicts, or build problems, when trying to apply it ?
> >
> > When trying to patch 4.19.y:
> > checking file drivers/scsi/mpt3sas/mpt3sas_scsih.c
> > Hunk #1 succeeded at 9919 (offset 11 lines).
> > Hunk #2 FAILED at 9992.
> > 1 out of 2 hunks FAILED
> >
>
> Interesting. Both "git cherry-pick" and "git am" (I don't even need
> "git am -3") on top of v4.19.115 work fine for me. But, yes, trying
> to apply the patch using the patch command does indeed fail with this
> error. Wonder what git does differently when running "git am".
Odd, let me dig into that, I can do a 'cherry-pick' and then export it
as a patch, I've had to do that before...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-04-15 16:52 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-15 0:31 Patches to apply to stable releases Guenter Roeck
2020-04-15 9:56 ` Greg Kroah-Hartman
2020-04-15 9:58 ` Greg Kroah-Hartman
2020-04-15 9:58 ` Greg Kroah-Hartman
2020-04-15 10:15 ` Greg Kroah-Hartman
2020-04-15 14:21 ` Guenter Roeck
2020-04-15 14:49 ` Greg Kroah-Hartman
2020-04-15 15:13 ` Guenter Roeck
2020-04-15 16:52 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).