Linux 5.10.167
Greg Kroah-Hartman
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 10 -SUBLEVEL = 166 +SUBLEVEL = 167 EXTRAVERSION = NAME = Dare mighty things
arch/arm/boot/dts/imx53-ppd.dts +1 -1
@@ -487,7 +487,7 @@ &i2c1 { scl-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; status = "okay"; - i2c-switch@70 { + i2c-mux@70 { compatible = "nxp,pca9547"; #address-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/vf610-zii-dev-rev-b.dts +1 -1
@@ -345,7 +345,7 @@ gpio6: io-expander@22 { }; &i2c2 { - tca9548@70 { + i2c-mux@70 { compatible = "nxp,pca9548"; pinctrl-0 = <&pinctrl_i2c_mux_reset>; pinctrl-names = "default";
arch/arm/boot/dts/vf610-zii-dev-rev-c.dts +1 -1
@@ -340,7 +340,7 @@ eeprom@50 { }; &i2c2 { - tca9548@70 { + i2c-mux@70 { compatible = "nxp,pca9548"; pinctrl-0 = <&pinctrl_i2c_mux_reset>; pinctrl-names = "default";
arch/arm64/boot/dts/freescale/imx8mq-thor96.dts +2 -2
@@ -339,7 +339,7 @@ &usdhc1 { bus-width = <4>; non-removable; no-sd; - no-emmc; + no-mmc; status = "okay"; brcmf: wifi@1 {
@@ -359,7 +359,7 @@ &usdhc2 { cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; bus-width = <4>; no-sdio; - no-emmc; + no-mmc; disable-wp; status = "okay"; };
block/blk-cgroup.c +4 -0
@@ -1370,6 +1370,10 @@ int blkcg_activate_policy(struct request_queue *q,list_for_each_entry_reverse (blkg, &q->blkg_list, q_node) pol->pd_init_fn (blkg->pd[pol->plid]); +if (pol->pd_online_fn) +list_for_each_entry_reverse (blkg, &q->blkg_list, q_node) + pol->pd_online_fn (blkg->pd[pol->plid]); +__set_bit (pol->plid, q->blkcg_pols); ret =0 ;
drivers/acpi/processor_idle.c +20 -3
@@ -536,10 +536,27 @@ static void wait_for_freeze(void)/* No delay is needed if we are in guest */ if (boot_cpu_has (X86_FEATURE_HYPERVISOR ))return ; +/* +* Modern (>=Nehalem) Intel systems use ACPI via intel_idle, +* not this code. Assume that any Intel systems using this +* are ancient and may need the dummy wait. This also assumes +* that the motivating chipset issue was Intel-only. +*/ +if (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL ) +return ;#endif -/* Dummy wait op - must do something useless after P_LVL2 read -because chipsets cannot guarantee that STPCLK# signal -gets asserted in time to freeze execution properly. */ +/* +* Dummy wait op - must do something useless after P_LVL2 read +* because chipsets cannot guarantee that STPCLK# signal gets +* asserted in time to freeze execution properly +* +* This workaround has been in place since the original ACPI +* implementation was merged, circa 2002. +* +* If a profile is pointing to this instruction, please first +* consider moving your system to a more modern idle +* mechanism. +*/ inl (acpi_gbl_FADT.xpm_timer_block.address); }
drivers/dma/imx-sdma.c +3 -1
@@ -1363,10 +1363,12 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac,sdma_config_ownership (sdmac, false, true, false);if (sdma_load_context (sdmac)) - goto err_desc_out; + goto err_bd_out;return desc; +err_bd_out: +sdma_free_bd (desc); err_desc_out:kfree (desc); err_out:
kernel/trace/bpf_trace.c +3 -0
@@ -1072,6 +1072,9 @@ static int bpf_send_signal_common(u32 sig, enum pid_type type)return -EPERM ;if (unlikely (!nmi_uaccess_okay ()))return -EPERM ; +/* Task should not be pid=1 to avoid kernel panic. */ +if (unlikely (is_global_init (current))) +return -EPERM ;if (irqs_disabled ()) {/* Do an early check on signal validity. Otherwise,
net/bluetooth/hci_event.c +13 -0
@@ -4307,6 +4307,19 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev,struct hci_ev_sync_conn_complete *ev = (void *) skb->data;struct hci_conn *conn; +switch (ev->link_type) { +case SCO_LINK : +case ESCO_LINK : +break ; +default : +/* As per Core 5.3 Vol 4 Part E 7.7.35 (p.2219), Link_Type +* for HCI_Synchronous_Connection_Complete is limited to +* either SCO or eSCO +*/ +bt_dev_err (hdev,"Ignoring connect complete event for invalid link type" ); +return ; + } +BT_DBG ("%s status 0x%2.2x" , hdev->name, ev->status);hci_dev_lock (hdev);
net/core/skbuff.c +2 -3
@@ -3688,7 +3688,7 @@ struct sk_buff *skb_segment_list(struct sk_buff *skb,skb_shinfo (skb)->frag_list =NULL ; - do { +while (list_skb) { nskb = list_skb; list_skb = list_skb->next;
@@ -3732,8 +3732,7 @@ struct sk_buff *skb_segment_list(struct sk_buff *skb,if (skb_needs_linearize (nskb, features) &&__skb_linearize (nskb)) goto err_linearize; - - }while (list_skb); + } skb->truesize = skb->truesize - delta_truesize; skb->data_len = skb->data_len - delta_len;
Greg Kroah-Hartman
maintainerI'm announcing the release of the 5.10.167 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
------------
Makefile | 2 +- arch/arm/boot/dts/imx53-ppd.dts | 2 +- arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 2 +- arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 2 +- arch/arm64/boot/dts/freescale/imx8mq-thor96.dts | 4 ++-- block/blk-cgroup.c | 4 ++++ drivers/acpi/processor_idle.c | 23 ++++++++++++++++++++--- drivers/dma/imx-sdma.c | 4 +++- kernel/trace/bpf_trace.c | 3 +++ net/bluetooth/hci_event.c | 13 +++++++++++++ net/core/skbuff.c | 5 ++--- 11 files changed, 51 insertions(+), 13 deletions(-)
Dave Hansen (1):
ACPI: processor idle: Practically limit "Dummy wait" workaround to old Intel systems
Geert Uytterhoeven (2):
ARM: dts: imx: Fix pca9547 i2c-mux node name
ARM: dts: vf610: Fix pca9548 i2c-mux node names
Greg Kroah-Hartman (1):
Linux 5.10.167
Hao Sun (1):
bpf: Skip task with pid=1 in send_signal_common()
Hui Wang (1):
dmaengine: imx-sdma: Fix a possible memory leak in sdma_transfer_init
Krzysztof Kozlowski (1):
arm64: dts: imx8mq-thor96: fix no-mmc property for SDHCI
Soenke Huster (1):
Bluetooth: fix null ptr deref on hci_sync_conn_complete_evt
Yan Zhai (1):
net: fix NULL pointer in skb_segment_list
Yu Kuai (1):
blk-cgroup: fix missing pd_online_fn() while activating policy