The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 23e3404de1aecc62c14ac96d4b63403c3e0f52d5 Mon Sep 17 00:00:00 2001
From: Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com>
Date: Wed, 22 Dec 2021 13:48:12 +0900
Subject: [PATCH] spi: uniphier: Fix a bug that doesn't point to private data
correctly
In uniphier_spi_remove(), there is a wrong code to get private data from
the platform device, so the driver can't be removed properly.
The driver should get spi_master from the platform device and retrieve
the private data from it.
Cc: <stable(a)vger.kernel.org>
Fixes: 5ba155a4d4cc ("spi: add SPI controller driver for UniPhier SoC")
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com>
Link: https://lore.kernel.org/r/1640148492-32178-1-git-send-email-hayashi.kunihik…
Signed-off-by: Mark Brown <broonie(a)kernel.org>
diff --git a/drivers/spi/spi-uniphier.c b/drivers/spi/spi-uniphier.c
index 8900e51e1a1c..342ee8d2c476 100644
--- a/drivers/spi/spi-uniphier.c
+++ b/drivers/spi/spi-uniphier.c
@@ -767,12 +767,13 @@ static int uniphier_spi_probe(struct platform_device *pdev)
static int uniphier_spi_remove(struct platform_device *pdev)
{
- struct uniphier_spi_priv *priv = platform_get_drvdata(pdev);
+ struct spi_master *master = platform_get_drvdata(pdev);
+ struct uniphier_spi_priv *priv = spi_master_get_devdata(master);
- if (priv->master->dma_tx)
- dma_release_channel(priv->master->dma_tx);
- if (priv->master->dma_rx)
- dma_release_channel(priv->master->dma_rx);
+ if (master->dma_tx)
+ dma_release_channel(master->dma_tx);
+ if (master->dma_rx)
+ dma_release_channel(master->dma_rx);
clk_disable_unprepare(priv->clk);
The patch below does not apply to the 5.16-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 23e3404de1aecc62c14ac96d4b63403c3e0f52d5 Mon Sep 17 00:00:00 2001
From: Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com>
Date: Wed, 22 Dec 2021 13:48:12 +0900
Subject: [PATCH] spi: uniphier: Fix a bug that doesn't point to private data
correctly
In uniphier_spi_remove(), there is a wrong code to get private data from
the platform device, so the driver can't be removed properly.
The driver should get spi_master from the platform device and retrieve
the private data from it.
Cc: <stable(a)vger.kernel.org>
Fixes: 5ba155a4d4cc ("spi: add SPI controller driver for UniPhier SoC")
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com>
Link: https://lore.kernel.org/r/1640148492-32178-1-git-send-email-hayashi.kunihik…
Signed-off-by: Mark Brown <broonie(a)kernel.org>
diff --git a/drivers/spi/spi-uniphier.c b/drivers/spi/spi-uniphier.c
index 8900e51e1a1c..342ee8d2c476 100644
--- a/drivers/spi/spi-uniphier.c
+++ b/drivers/spi/spi-uniphier.c
@@ -767,12 +767,13 @@ static int uniphier_spi_probe(struct platform_device *pdev)
static int uniphier_spi_remove(struct platform_device *pdev)
{
- struct uniphier_spi_priv *priv = platform_get_drvdata(pdev);
+ struct spi_master *master = platform_get_drvdata(pdev);
+ struct uniphier_spi_priv *priv = spi_master_get_devdata(master);
- if (priv->master->dma_tx)
- dma_release_channel(priv->master->dma_tx);
- if (priv->master->dma_rx)
- dma_release_channel(priv->master->dma_rx);
+ if (master->dma_tx)
+ dma_release_channel(master->dma_tx);
+ if (master->dma_rx)
+ dma_release_channel(master->dma_rx);
clk_disable_unprepare(priv->clk);
Upstream commit id in Linux 5.17-rc:
99510e1afb4863a225207146bd988064c5fd0629 ("drm/i915: Disable DSB usage
for now").
I'd like to nominate that patch for application to the 5.15-stable
tree. It applies trivially after dropping the ...
.has_pxp = 1, \
... line of context. That line of context was introduced by the
unrelated feature introduced later by
6f8e203897144e59de00ed910982af3d7c3e4a7f ("drm/i915/pxp: enable PXP
for integrated Gen12"), so can be safely dropped.
Disabling use of the DSB for GAMMA_LUT updates should fix corrupted
display colors on Intel Tigerlake, Rocketlake, DG-1 and Alderlake-S
Generation 12 graphics. Good explanation is in the upstream commit,
but for reference here the bug report which led to the bug diagnosis
and fix:
https://gitlab.freedesktop.org/drm/intel/-/issues/3916
This would make high color precision and HDR display modes usable on
Gen 12 graphics with Linux 5.51-stable.
Thanks for consideration,
-mario
I'm announcing the release of the 5.15.20 kernel.
All users of the 5.15 kernel series must upgrade.
The updated 5.15.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.15.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2
drivers/gpu/drm/vc4/vc4_hdmi.c | 25 +++----
drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 14 +++-
drivers/net/ethernet/intel/e1000e/netdev.c | 6 +
drivers/net/ethernet/intel/i40e/i40e.h | 1
drivers/net/ethernet/intel/i40e/i40e_main.c | 31 ++++++++
drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 3
drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c | 32 ++++-----
drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c | 6 +
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 13 +++
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c | 4 +
drivers/net/ethernet/mellanox/mlx5/core/esw/diag/bridge_tracepoint.h | 2
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 2
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c | 9 +-
drivers/net/ethernet/mellanox/mlx5/core/port.c | 9 +-
drivers/net/ipa/ipa_endpoint.c | 21 ++++--
drivers/net/ipa/ipa_endpoint.h | 17 ++++
drivers/net/usb/ipheth.c | 6 -
drivers/pci/hotplug/pciehp_hpc.c | 7 +-
fs/lockd/svcsubs.c | 18 ++---
fs/notify/fanotify/fanotify_user.c | 6 -
fs/overlayfs/copy_up.c | 16 +++-
kernel/cgroup/cgroup-v1.c | 14 ++++
kernel/cgroup/cpuset.c | 3
mm/gup.c | 35 ++++++++--
net/core/rtnetlink.c | 6 +
net/ipv4/tcp_input.c | 2
net/packet/af_packet.c | 8 +-
net/sched/cls_api.c | 11 ++-
tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 -
30 files changed, 240 insertions(+), 94 deletions(-)
Alex Elder (2):
net: ipa: use a bitmap for endpoint replenish_enabled
net: ipa: prevent concurrent replenish
Christoph Fritz (1):
ovl: fix NULL pointer dereference in copy up warning
Dan Carpenter (1):
fanotify: Fix stale file descriptor in copy_event_to_user()
Dima Chumak (1):
net/mlx5: Fix offloading with ESWITCH_IPV4_TTL_MODIFY_ENABLE
Eric Dumazet (4):
net: sched: fix use-after-free in tc_new_tfilter()
rtnetlink: make sure to refresh master_dev/m_ops in __rtnl_newlink()
af_packet: fix data-race in packet_setsockopt / packet_setsockopt
tcp: add missing tcp_skb_can_collapse() test in tcp_shift_skb_data()
Eric W. Biederman (1):
cgroup-v1: Require capabilities to set release_agent
Gal Pressman (1):
net/mlx5e: Fix module EEPROM query
Georgi Valkov (1):
ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback
Greg Kroah-Hartman (1):
Linux 5.15.20
J. Bruce Fields (2):
lockd: fix server crash on reboot of client holding lock
lockd: fix failure to cleanup client locks
Jedrzej Jagielski (1):
i40e: Fix reset bw limit when DCB enabled with 1 TC
John Hubbard (1):
Revert "mm/gup: small refactoring: simplify try_grab_page()"
Karen Sornek (1):
i40e: Fix reset path while removing the driver
Lukas Wunner (1):
PCI: pciehp: Fix infinite loop in IRQ handler upon power fault
Maher Sanalla (1):
net/mlx5: Use del_timer_sync in fw reset flow of halting poll
Maor Dickman (2):
net/mlx5e: Fix handling of wrong devices during bond netevent
net/mlx5: E-Switch, Fix uninitialized variable modact
Maxim Mikityanskiy (1):
net/mlx5e: Don't treat small ceil values as unlimited in HTB offload
Maxime Ripard (1):
drm/vc4: hdmi: Make sure the device is powered with CEC
Miklos Szeredi (1):
ovl: don't fail copy up if no fileattr support on upper
Paolo Abeni (1):
selftests: mptcp: fix ipv6 routing setup
Raed Salem (1):
net/mlx5e: IPsec: Fix tunnel mode crypto offload for non TCP/UDP traffic
Raju Rangoju (1):
net: amd-xgbe: ensure to reset the tx_timer_active flag
Roi Dayan (1):
net/mlx5: Bridge, Fix devlink deadlock on net namespace deletion
Sasha Neftin (1):
e1000e: Handshake with CSME starts from ADL platforms
Shyam Sundar S K (1):
net: amd-xgbe: Fix skb data length underflow
Tianchen Ding (1):
cpuset: Fix the bug that subpart_cpus updated wrongly in update_cpumask()
Vlad Buslov (2):
net/mlx5: Bridge, take rtnl lock in init error handler
net/mlx5: Bridge, ensure dev_name is null-terminated
I'm announcing the release of the 5.10.97 kernel.
All users of the 5.10 kernel series must upgrade.
The updated 5.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/accounting/psi.rst | 3
Makefile | 2
arch/x86/include/asm/kvm_host.h | 1
arch/x86/kernel/cpu/mce/intel.c | 2
arch/x86/kvm/svm/nested.c | 10 +-
arch/x86/kvm/svm/svm.c | 2
arch/x86/kvm/svm/svm.h | 2
arch/x86/kvm/vmx/nested.c | 1
arch/x86/kvm/x86.c | 2
drivers/bus/simple-pm-bus.c | 39 ---------
drivers/gpu/drm/vc4/vc4_hdmi.c | 25 +++---
drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 14 +++
drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c | 32 +++----
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 2
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c | 2
drivers/net/ipa/ipa_endpoint.c | 25 ++++--
drivers/net/ipa/ipa_endpoint.h | 15 +++
drivers/net/usb/ipheth.c | 6 -
drivers/pci/hotplug/pciehp_hpc.c | 7 -
fs/notify/fanotify/fanotify_user.c | 6 -
include/linux/psi.h | 2
include/linux/psi_types.h | 3
kernel/cgroup/cgroup-v1.c | 14 +++
kernel/cgroup/cgroup.c | 11 +-
kernel/cgroup/cpuset.c | 3
kernel/sched/psi.c | 66 +++++++---------
net/core/rtnetlink.c | 6 -
net/ipv4/tcp_input.c | 2
net/packet/af_packet.c | 8 +
net/sched/cls_api.c | 11 +-
30 files changed, 175 insertions(+), 149 deletions(-)
Alex Elder (3):
net: ipa: fix atomic update in ipa_endpoint_replenish()
net: ipa: use a bitmap for endpoint replenish_enabled
net: ipa: prevent concurrent replenish
Dan Carpenter (1):
fanotify: Fix stale file descriptor in copy_event_to_user()
Eric Dumazet (4):
net: sched: fix use-after-free in tc_new_tfilter()
rtnetlink: make sure to refresh master_dev/m_ops in __rtnl_newlink()
af_packet: fix data-race in packet_setsockopt / packet_setsockopt
tcp: add missing tcp_skb_can_collapse() test in tcp_shift_skb_data()
Eric W. Biederman (1):
cgroup-v1: Require capabilities to set release_agent
Georgi Valkov (1):
ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback
Greg Kroah-Hartman (1):
Linux 5.10.97
Kevin Hilman (1):
Revert "drivers: bus: simple-pm-bus: Add support for probing simple bus only devices"
Lukas Wunner (1):
PCI: pciehp: Fix infinite loop in IRQ handler upon power fault
Maher Sanalla (1):
net/mlx5: Use del_timer_sync in fw reset flow of halting poll
Maor Dickman (2):
net/mlx5e: Fix handling of wrong devices during bond netevent
net/mlx5: E-Switch, Fix uninitialized variable modact
Maxime Ripard (1):
drm/vc4: hdmi: Make sure the device is powered with CEC
Raju Rangoju (1):
net: amd-xgbe: ensure to reset the tx_timer_active flag
Sean Christopherson (1):
KVM: x86: Forcibly leave nested virt when SMM state is toggled
Shyam Sundar S K (1):
net: amd-xgbe: Fix skb data length underflow
Suren Baghdasaryan (1):
psi: Fix uaf issue when psi trigger is destroyed while being polled
Tianchen Ding (1):
cpuset: Fix the bug that subpart_cpus updated wrongly in update_cpumask()
Tony Luck (2):
x86/mce: Add Xeon Sapphire Rapids to list of CPUs that support PPIN
x86/cpu: Add Xeon Icelake-D to list of CPUs that support PPIN
I'm announcing the release of the 5.4.177 kernel.
All users of the 5.4 kernel series must upgrade.
The updated 5.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/accounting/psi.rst | 3 -
Makefile | 2
drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 14 ++++++
drivers/net/usb/ipheth.c | 6 +-
drivers/pci/hotplug/pciehp_hpc.c | 7 +--
include/linux/psi.h | 2
include/linux/psi_types.h | 3 -
kernel/cgroup/cgroup-v1.c | 14 ++++++
kernel/cgroup/cgroup.c | 11 +++--
kernel/cgroup/cpuset.c | 3 -
kernel/sched/psi.c | 66 +++++++++++++------------------
net/core/rtnetlink.c | 6 +-
net/packet/af_packet.c | 8 ++-
net/sched/cls_api.c | 11 +++--
14 files changed, 93 insertions(+), 63 deletions(-)
Eric Dumazet (3):
net: sched: fix use-after-free in tc_new_tfilter()
rtnetlink: make sure to refresh master_dev/m_ops in __rtnl_newlink()
af_packet: fix data-race in packet_setsockopt / packet_setsockopt
Eric W. Biederman (1):
cgroup-v1: Require capabilities to set release_agent
Georgi Valkov (1):
ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback
Greg Kroah-Hartman (1):
Linux 5.4.177
Lukas Wunner (1):
PCI: pciehp: Fix infinite loop in IRQ handler upon power fault
Raju Rangoju (1):
net: amd-xgbe: ensure to reset the tx_timer_active flag
Shyam Sundar S K (1):
net: amd-xgbe: Fix skb data length underflow
Suren Baghdasaryan (1):
psi: Fix uaf issue when psi trigger is destroyed while being polled
Tianchen Ding (1):
cpuset: Fix the bug that subpart_cpus updated wrongly in update_cpumask()