diff -u linux-6.5.0/debian.master/changelog linux-6.5.0/debian.master/changelog --- linux-6.5.0/debian.master/changelog +++ linux-6.5.0/debian.master/changelog @@ -1,23 +1,6 @@ -linux (6.5.0-34.34) mantic; urgency=medium +linux (6.5.0-40.40) mantic; urgency=medium - * mantic/linux: 6.5.0-34.34 -proposed tracker (LP: #2061443) - - * CVE-2024-2201 - - x86/bugs: Change commas to semicolons in 'spectre_v2' sysfs file - - x86/syscall: Don't force use of indirect calls for system calls - - x86/bhi: Add support for clearing branch history at syscall entry - - x86/bhi: Define SPEC_CTRL_BHI_DIS_S - - x86/bhi: Enumerate Branch History Injection (BHI) bug - - x86/bhi: Add BHI mitigation knob - - x86/bhi: Mitigate KVM by default - - KVM: x86: Add BHI_NO - - [Config] Set CONFIG_BHI to enabled (auto) - - -- Stefan Bader Mon, 15 Apr 2024 15:09:54 +0200 - -linux (6.5.0-33.33) mantic; urgency=medium - - * mantic/linux: 6.5.0-33.33 -proposed tracker (LP: #2060448) + * mantic/linux: 6.5.0-40.40 -proposed tracker (LP: #2063709) * [Mantic] Compile broken on armhf (cc1 out of memory) (LP: #2060446) - Revert "minmax: relax check to allow comparison between unsigned arguments @@ -27,15 +10,6 @@ signedness." - Revert "minmax: add umin(a, b) and umax(a, b)" - -- Stefan Bader Mon, 08 Apr 2024 11:39:11 +0200 - -linux (6.5.0-32.32) mantic; urgency=medium - - * mantic/linux: 6.5.0-32.32 -proposed tracker (LP: #2059443) - - * Packaging resync (LP: #1786013) - - [Packaging] drop getabis data - * Drop fips-checks script from trees (LP: #2055083) - [Packaging] Remove fips-checks script @@ -43,9 +17,6 @@ (LP: #2058573) - ALSA: hda/realtek: fix the hp playback volume issue for LG machines - * Remove getabis scripts (LP: #2059143) - - [Packaging] Remove getabis - * Mantic update: upstream stable patchset 2024-03-27 (LP: #2059284) - asm-generic: make sparse happy with odd-sized put_unaligned_*() - powerpc/mm: Fix null-pointer dereference in pgtable_cache_add @@ -72,7 +43,6 @@ - ACPI: APEI: set memory failure flags as MF_ACTION_REQUIRED on synchronous events - FS:JFS:UBSAN:array-index-out-of-bounds in dbAdjTree - - jfs: fix slab-out-of-bounds Read in dtSearch - jfs: fix array-index-out-of-bounds in dbAdjTree - pstore/ram: Fix crash when setting number of cpus to an odd number - crypto: octeontx2 - Fix cptvf driver cleanup @@ -377,13 +347,6 @@ - pds_core: Prevent health thread from running during reset/remove - Upstream stable to v6.1.77, v6.6.16 - * Mantic update: upstream stable patchset 2024-03-27 (LP: #2059284) // - CVE-2023-52603 - - UBSAN: array-index-out-of-bounds in dtSplitRoot - - * iwlwifi disconnect and crash - intel wifi7 (LP: #2058808) - - wifi: iwlwifi: pcie: fix RB status reading - * Mantic update: upstream stable patchset 2024-03-26 (LP: #2059068) - iio: adc: ad7091r: Set alert bit in config register - iio: adc: ad7091r: Allow users to configure device events @@ -393,7 +356,6 @@ - btrfs: sysfs: validate scrub_speed_max value - crypto: api - Disallow identical driver names - PM: hibernate: Enforce ordering during image compression/decompression - - hwrng: core - Fix page fault dead lock on mmap-ed hwrng - crypto: s390/aes - Fix buffer overread in CTR mode - s390/vfio-ap: unpin pages on gisc registration failure - PM / devfreq: Fix buffer overflow in trans_stat_show @@ -461,11 +423,9 @@ - Revert "drm/amd: Enable PCIe PME from D3" - wifi: mac80211: fix potential sta-link leak - net/smc: fix illegal rmb_desc access in SMC-D connection dump - - tcp: make sure init the accept_queue's spinlocks once - bnxt_en: Wait for FLR to complete during probe - vlan: skip nested type that is not IFLA_VLAN_QOS_MAPPING - llc: make llc_ui_sendmsg() more robust against bonding changes - - llc: Drop support for ETH_P_TR_802_2. - udp: fix busy polling - net: fix removing a namespace with conflicting altnames - tun: fix missing dropped counter in tun_xdp_act @@ -477,7 +437,6 @@ - afs: Hide silly-rename files from userspace - tcp: Add memory barrier to tcp_push() - netlink: fix potential sleeping issue in mqueue_flush_file - - ipv6: init the accept_queue's spinlocks in inet6_create - net/mlx5: DR, Use the right GVMI number for drop action - net/mlx5: DR, Can't go to uplink vport on RX rule - net/mlx5: Use mlx5 device constant for selecting CQ period mode for ASO @@ -682,7 +641,6 @@ & write_dpcd()' functions - net/bpf: Avoid unused "sin_addr_len" warning when CONFIG_CGROUP_BPF is not set - - thermal: core: Store trip pointer in struct thermal_instance - thermal: gov_power_allocator: avoid inability to reset a cdev - mm: migrate: record the mlocked page status to remove unnecessary lru drain - mm: migrate: fix getting incorrect page mapping during page migration @@ -702,7 +660,6 @@ - drm: bridge: samsung-dsim: Don't use FORCE_STOP_STATE - genirq: Initialize resend_node hlist for all interrupt descriptors - clocksource: Skip watchdog check for large watchdog intervals - - thermal: trip: Drop lockdep assertion from thermal_zone_trip_id() - platform/x86: intel-uncore-freq: Fix types in sysfs callbacks - Upstream stable to v6.1.76, v6.6.15 @@ -721,16 +678,10 @@ - net: tls: factor out tls_*crypt_async_wait() - tls: fix race between async notify and socket close - * CVE-2023-52600 - - jfs: fix uaf in jfs_evict_inode - * Fix headphone mic detection issue on ALC897 (LP: #2056418) - ALSA: hda/realtek - Fix headset Mic no show at resume back for Lenovo ALC897 platform - * CVE-2024-26581 - - netfilter: nft_set_rbtree: skip end interval element from gc - * The screen brightness is unable to adjust on BOE panel DPN#R6FD8 (LP: #2057430) - drm/amd/display: Re-add aux intercept disable delay generically for 2+ @@ -1304,6 +1255,79 @@ CVE-2024-26583 - net: tls, fix WARNIING in __sk_msg_free + -- Roxana Nicolescu Tue, 30 Apr 2024 14:51:16 +0200 + +linux (6.5.0-35.35) mantic; urgency=medium + + * mantic/linux: 6.5.0-35.35 -proposed tracker (LP: #2063581) + + * cifs: Copying file to same directory results in page fault (LP: #2060919) + - SAUCE: Revert "cifs: fix flushing folio regression for 6.1 backport" + + * CVE-2024-26805 + - netlink: Fix kernel-infoleak-after-free in __skb_datagram_iter + + * CVE-2024-26801 + - Bluetooth: Avoid potential use-after-free in hci_error_reset + + * CVE-2024-26704 + - ext4: fix double-free of blocks due to wrong extents moved_len + + * CVE-2023-52601 + - jfs: fix array-index-out-of-bounds in dbAdjTree + + * CVE-2024-26635 + - llc: Drop support for ETH_P_TR_802_2. + + * CVE-2024-26622 + - tomoyo: fix UAF write bug in tomoyo_write_control() + + * CVE-2024-26614 + - tcp: make sure init the accept_queue's spinlocks once + - ipv6: init the accept_queue's spinlocks in inet6_create + + * CVE-2024-52615 + - hwrng: core - Fix page fault dead lock on mmap-ed hwrng + + * CVE-2024-52602 + - jfs: fix slab-out-of-bounds Read in dtSearch + + * CVE-2023-47233 + - wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach + + * CVE-2024-2201 + - x86/bugs: Change commas to semicolons in 'spectre_v2' sysfs file + - x86/syscall: Don't force use of indirect calls for system calls + - x86/bhi: Add support for clearing branch history at syscall entry + - x86/bhi: Define SPEC_CTRL_BHI_DIS_S + - x86/bhi: Enumerate Branch History Injection (BHI) bug + - x86/bhi: Add BHI mitigation knob + - x86/bhi: Mitigate KVM by default + - KVM: x86: Add BHI_NO + - [Config] Set CONFIG_BHI to enabled (auto) + + -- Stefan Bader Fri, 26 Apr 2024 11:32:29 +0200 + +linux (6.5.0-28.29) mantic; urgency=medium + + * mantic/linux: 6.5.0-28.29 -proposed tracker (LP: #2059706) + + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + + * Remove getabis scripts (LP: #2059143) + - [Packaging] Remove getabis + + * CVE-2023-52600 + - jfs: fix uaf in jfs_evict_inode + + * Mantic update: upstream stable patchset 2024-03-27 (LP: #2059284) // + CVE-2023-52603 + - UBSAN: array-index-out-of-bounds in dtSplitRoot + + * CVE-2024-26581 + - netfilter: nft_set_rbtree: skip end interval element from gc + * Mantic update: upstream stable patchset 2024-03-07 (LP: #2056403) // CVE-2024-26589 - bpf: Reject variable offset alu on PTR_TO_FLOW_KEYS @@ -1312,7 +1336,10 @@ CVE-2024-26591 - bpf: Fix re-attachment branch in bpf_tracing_prog_attach - -- Roxana Nicolescu Thu, 28 Mar 2024 15:20:29 +0100 + * iwlwifi disconnect and crash - intel wifi7 (LP: #2058808) + - wifi: iwlwifi: pcie: fix RB status reading + + -- Manuel Diewald Thu, 28 Mar 2024 19:28:42 +0100 linux (6.5.0-27.28) mantic; urgency=medium diff -u linux-6.5.0/debian.master/tracking-bug linux-6.5.0/debian.master/tracking-bug --- linux-6.5.0/debian.master/tracking-bug +++ linux-6.5.0/debian.master/tracking-bug @@ -1 +1 @@ -2061443 2024.04.01-3 +2063709 2024.04.29-1 diff -u linux-6.5.0/debian/changelog linux-6.5.0/debian/changelog --- linux-6.5.0/debian/changelog +++ linux-6.5.0/debian/changelog @@ -1,23 +1,6 @@ -linux (6.5.0-34.34) mantic; urgency=medium +linux (6.5.0-40.40) mantic; urgency=medium - * mantic/linux: 6.5.0-34.34 -proposed tracker (LP: #2061443) - - * CVE-2024-2201 - - x86/bugs: Change commas to semicolons in 'spectre_v2' sysfs file - - x86/syscall: Don't force use of indirect calls for system calls - - x86/bhi: Add support for clearing branch history at syscall entry - - x86/bhi: Define SPEC_CTRL_BHI_DIS_S - - x86/bhi: Enumerate Branch History Injection (BHI) bug - - x86/bhi: Add BHI mitigation knob - - x86/bhi: Mitigate KVM by default - - KVM: x86: Add BHI_NO - - [Config] Set CONFIG_BHI to enabled (auto) - - -- Stefan Bader Mon, 15 Apr 2024 15:09:54 +0200 - -linux (6.5.0-33.33) mantic; urgency=medium - - * mantic/linux: 6.5.0-33.33 -proposed tracker (LP: #2060448) + * mantic/linux: 6.5.0-40.40 -proposed tracker (LP: #2063709) * [Mantic] Compile broken on armhf (cc1 out of memory) (LP: #2060446) - Revert "minmax: relax check to allow comparison between unsigned arguments @@ -27,15 +10,6 @@ signedness." - Revert "minmax: add umin(a, b) and umax(a, b)" - -- Stefan Bader Mon, 08 Apr 2024 11:39:11 +0200 - -linux (6.5.0-32.32) mantic; urgency=medium - - * mantic/linux: 6.5.0-32.32 -proposed tracker (LP: #2059443) - - * Packaging resync (LP: #1786013) - - [Packaging] drop getabis data - * Drop fips-checks script from trees (LP: #2055083) - [Packaging] Remove fips-checks script @@ -43,9 +17,6 @@ (LP: #2058573) - ALSA: hda/realtek: fix the hp playback volume issue for LG machines - * Remove getabis scripts (LP: #2059143) - - [Packaging] Remove getabis - * Mantic update: upstream stable patchset 2024-03-27 (LP: #2059284) - asm-generic: make sparse happy with odd-sized put_unaligned_*() - powerpc/mm: Fix null-pointer dereference in pgtable_cache_add @@ -72,7 +43,6 @@ - ACPI: APEI: set memory failure flags as MF_ACTION_REQUIRED on synchronous events - FS:JFS:UBSAN:array-index-out-of-bounds in dbAdjTree - - jfs: fix slab-out-of-bounds Read in dtSearch - jfs: fix array-index-out-of-bounds in dbAdjTree - pstore/ram: Fix crash when setting number of cpus to an odd number - crypto: octeontx2 - Fix cptvf driver cleanup @@ -377,13 +347,6 @@ - pds_core: Prevent health thread from running during reset/remove - Upstream stable to v6.1.77, v6.6.16 - * Mantic update: upstream stable patchset 2024-03-27 (LP: #2059284) // - CVE-2023-52603 - - UBSAN: array-index-out-of-bounds in dtSplitRoot - - * iwlwifi disconnect and crash - intel wifi7 (LP: #2058808) - - wifi: iwlwifi: pcie: fix RB status reading - * Mantic update: upstream stable patchset 2024-03-26 (LP: #2059068) - iio: adc: ad7091r: Set alert bit in config register - iio: adc: ad7091r: Allow users to configure device events @@ -393,7 +356,6 @@ - btrfs: sysfs: validate scrub_speed_max value - crypto: api - Disallow identical driver names - PM: hibernate: Enforce ordering during image compression/decompression - - hwrng: core - Fix page fault dead lock on mmap-ed hwrng - crypto: s390/aes - Fix buffer overread in CTR mode - s390/vfio-ap: unpin pages on gisc registration failure - PM / devfreq: Fix buffer overflow in trans_stat_show @@ -461,11 +423,9 @@ - Revert "drm/amd: Enable PCIe PME from D3" - wifi: mac80211: fix potential sta-link leak - net/smc: fix illegal rmb_desc access in SMC-D connection dump - - tcp: make sure init the accept_queue's spinlocks once - bnxt_en: Wait for FLR to complete during probe - vlan: skip nested type that is not IFLA_VLAN_QOS_MAPPING - llc: make llc_ui_sendmsg() more robust against bonding changes - - llc: Drop support for ETH_P_TR_802_2. - udp: fix busy polling - net: fix removing a namespace with conflicting altnames - tun: fix missing dropped counter in tun_xdp_act @@ -477,7 +437,6 @@ - afs: Hide silly-rename files from userspace - tcp: Add memory barrier to tcp_push() - netlink: fix potential sleeping issue in mqueue_flush_file - - ipv6: init the accept_queue's spinlocks in inet6_create - net/mlx5: DR, Use the right GVMI number for drop action - net/mlx5: DR, Can't go to uplink vport on RX rule - net/mlx5: Use mlx5 device constant for selecting CQ period mode for ASO @@ -682,7 +641,6 @@ & write_dpcd()' functions - net/bpf: Avoid unused "sin_addr_len" warning when CONFIG_CGROUP_BPF is not set - - thermal: core: Store trip pointer in struct thermal_instance - thermal: gov_power_allocator: avoid inability to reset a cdev - mm: migrate: record the mlocked page status to remove unnecessary lru drain - mm: migrate: fix getting incorrect page mapping during page migration @@ -702,7 +660,6 @@ - drm: bridge: samsung-dsim: Don't use FORCE_STOP_STATE - genirq: Initialize resend_node hlist for all interrupt descriptors - clocksource: Skip watchdog check for large watchdog intervals - - thermal: trip: Drop lockdep assertion from thermal_zone_trip_id() - platform/x86: intel-uncore-freq: Fix types in sysfs callbacks - Upstream stable to v6.1.76, v6.6.15 @@ -721,16 +678,10 @@ - net: tls: factor out tls_*crypt_async_wait() - tls: fix race between async notify and socket close - * CVE-2023-52600 - - jfs: fix uaf in jfs_evict_inode - * Fix headphone mic detection issue on ALC897 (LP: #2056418) - ALSA: hda/realtek - Fix headset Mic no show at resume back for Lenovo ALC897 platform - * CVE-2024-26581 - - netfilter: nft_set_rbtree: skip end interval element from gc - * The screen brightness is unable to adjust on BOE panel DPN#R6FD8 (LP: #2057430) - drm/amd/display: Re-add aux intercept disable delay generically for 2+ @@ -1304,6 +1255,79 @@ CVE-2024-26583 - net: tls, fix WARNIING in __sk_msg_free + -- Roxana Nicolescu Tue, 30 Apr 2024 14:51:16 +0200 + +linux (6.5.0-35.35) mantic; urgency=medium + + * mantic/linux: 6.5.0-35.35 -proposed tracker (LP: #2063581) + + * cifs: Copying file to same directory results in page fault (LP: #2060919) + - SAUCE: Revert "cifs: fix flushing folio regression for 6.1 backport" + + * CVE-2024-26805 + - netlink: Fix kernel-infoleak-after-free in __skb_datagram_iter + + * CVE-2024-26801 + - Bluetooth: Avoid potential use-after-free in hci_error_reset + + * CVE-2024-26704 + - ext4: fix double-free of blocks due to wrong extents moved_len + + * CVE-2023-52601 + - jfs: fix array-index-out-of-bounds in dbAdjTree + + * CVE-2024-26635 + - llc: Drop support for ETH_P_TR_802_2. + + * CVE-2024-26622 + - tomoyo: fix UAF write bug in tomoyo_write_control() + + * CVE-2024-26614 + - tcp: make sure init the accept_queue's spinlocks once + - ipv6: init the accept_queue's spinlocks in inet6_create + + * CVE-2024-52615 + - hwrng: core - Fix page fault dead lock on mmap-ed hwrng + + * CVE-2024-52602 + - jfs: fix slab-out-of-bounds Read in dtSearch + + * CVE-2023-47233 + - wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach + + * CVE-2024-2201 + - x86/bugs: Change commas to semicolons in 'spectre_v2' sysfs file + - x86/syscall: Don't force use of indirect calls for system calls + - x86/bhi: Add support for clearing branch history at syscall entry + - x86/bhi: Define SPEC_CTRL_BHI_DIS_S + - x86/bhi: Enumerate Branch History Injection (BHI) bug + - x86/bhi: Add BHI mitigation knob + - x86/bhi: Mitigate KVM by default + - KVM: x86: Add BHI_NO + - [Config] Set CONFIG_BHI to enabled (auto) + + -- Stefan Bader Fri, 26 Apr 2024 11:32:29 +0200 + +linux (6.5.0-28.29) mantic; urgency=medium + + * mantic/linux: 6.5.0-28.29 -proposed tracker (LP: #2059706) + + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + + * Remove getabis scripts (LP: #2059143) + - [Packaging] Remove getabis + + * CVE-2023-52600 + - jfs: fix uaf in jfs_evict_inode + + * Mantic update: upstream stable patchset 2024-03-27 (LP: #2059284) // + CVE-2023-52603 + - UBSAN: array-index-out-of-bounds in dtSplitRoot + + * CVE-2024-26581 + - netfilter: nft_set_rbtree: skip end interval element from gc + * Mantic update: upstream stable patchset 2024-03-07 (LP: #2056403) // CVE-2024-26589 - bpf: Reject variable offset alu on PTR_TO_FLOW_KEYS @@ -1312,7 +1336,10 @@ CVE-2024-26591 - bpf: Fix re-attachment branch in bpf_tracing_prog_attach - -- Roxana Nicolescu Thu, 28 Mar 2024 15:20:29 +0100 + * iwlwifi disconnect and crash - intel wifi7 (LP: #2058808) + - wifi: iwlwifi: pcie: fix RB status reading + + -- Manuel Diewald Thu, 28 Mar 2024 19:28:42 +0100 linux (6.5.0-27.28) mantic; urgency=medium diff -u linux-6.5.0/debian/control linux-6.5.0/debian/control --- linux-6.5.0/debian/control +++ linux-6.5.0/debian/control @@ -94,7 +94,7 @@ you do not want this package. Install the appropriate linux-headers package instead. -Package: linux-headers-6.5.0-34 +Package: linux-headers-6.5.0-40 Build-Profiles: Architecture: all Multi-Arch: foreign @@ -104,7 +104,7 @@ Description: Header files related to Linux kernel version 6.5.0 This package provides kernel header files for version 6.5.0, for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-6.5.0-34/debian.README.gz for details + /usr/share/doc/linux-headers-6.5.0-40/debian.README.gz for details Package: linux-tools-common Build-Profiles: @@ -119,18 +119,18 @@ version locked tools (such as perf and x86_energy_perf_policy) for version 6.5.0. -Package: linux-tools-6.5.0-34 +Package: linux-tools-6.5.0-40 Build-Profiles: Architecture: amd64 armhf arm64 ppc64el s390x Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common -Description: Linux kernel version specific tools for version 6.5.0-34 +Description: Linux kernel version specific tools for version 6.5.0-40 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 6.5.0-34 on + version 6.5.0-40 on 64 bit x86. - You probably want to install linux-tools-6.5.0-34-. + You probably want to install linux-tools-6.5.0-40-. Package: linux-cloud-tools-common Build-Profiles: @@ -143,17 +143,17 @@ This package provides the architecture independent parts for kernel version locked tools for cloud tools for version 6.5.0. -Package: linux-cloud-tools-6.5.0-34 +Package: linux-cloud-tools-6.5.0-40 Build-Profiles: Architecture: amd64 armhf Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-cloud-tools-common -Description: Linux kernel version specific cloud tools for version 6.5.0-34 +Description: Linux kernel version specific cloud tools for version 6.5.0-40 This package provides the architecture dependant parts for kernel - version locked tools for cloud tools for version 6.5.0-34 on + version locked tools for cloud tools for version 6.5.0-40 on 64 bit x86. - You probably want to install linux-cloud-tools-6.5.0-34-. + You probably want to install linux-cloud-tools-6.5.0-40-. Package: linux-tools-host Build-Profiles: @@ -193,17 +193,17 @@ contained in each file. -Package: linux-image-unsigned-6.5.0-34-generic +Package: linux-image-unsigned-6.5.0-40-generic Build-Profiles: Architecture: amd64 armhf arm64 ppc64el s390x Section: kernel Priority: optional Provides: linux-image, fuse-module, kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64], ${linux:rprovides} -Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-6.5.0-34-generic +Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-6.5.0-40-generic Recommends: grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [armhf arm64] | grub-efi-arm64 [arm64] | grub-efi-arm [armhf] | grub-ieee1275 [ppc64el], initramfs-tools | linux-initramfs-tool Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x] -Conflicts: linux-image-6.5.0-34-generic -Suggests: fdutils, linux-doc | linux-source-6.5.0, linux-tools, linux-headers-6.5.0-34-generic, linux-modules-extra-6.5.0-34-generic +Conflicts: linux-image-6.5.0-40-generic +Suggests: fdutils, linux-doc | linux-source-6.5.0, linux-tools, linux-headers-6.5.0-40-generic, linux-modules-extra-6.5.0-40-generic Description: Linux kernel image for version 6.5.0 on 64 bit x86 SMP This package contains the unsigned Linux kernel image for version 6.5.0 on 64 bit x86 SMP. @@ -216,7 +216,7 @@ the linux-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-6.5.0-34-generic +Package: linux-modules-6.5.0-40-generic Build-Profiles: Architecture: amd64 armhf arm64 ppc64el s390x Section: kernel @@ -236,12 +236,12 @@ the linux-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-extra-6.5.0-34-generic +Package: linux-modules-extra-6.5.0-40-generic Build-Profiles: Architecture: amd64 armhf arm64 ppc64el s390x Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-modules-6.5.0-34-generic, wireless-regdb +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-modules-6.5.0-40-generic, wireless-regdb Description: Linux kernel extra modules for version 6.5.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 6.5.0 on 64 bit x86 SMP. @@ -258,21 +258,21 @@ the linux-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-6.5.0-34-generic +Package: linux-headers-6.5.0-40-generic Build-Profiles: Architecture: amd64 armhf arm64 ppc64el s390x Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-6.5.0-34, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-6.5.0-40, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 6.5.0 on 64 bit x86 SMP This package provides kernel header files for version 6.5.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-6.5.0-34/debian.README.gz for details. + /usr/share/doc/linux-headers-6.5.0-40/debian.README.gz for details. -Package: linux-lib-rust-6.5.0-34-generic +Package: linux-lib-rust-6.5.0-40-generic Build-Profiles: Architecture: amd64 Multi-Arch: foreign @@ -283,7 +283,7 @@ This package provides kernel library files for version 6.5.0, that allow to compile out-of-tree kernel modules written in Rust. -Package: linux-image-unsigned-6.5.0-34-generic-dbgsym +Package: linux-image-unsigned-6.5.0-40-generic-dbgsym Build-Profiles: Architecture: amd64 armhf arm64 ppc64el s390x Section: devel @@ -300,31 +300,31 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-6.5.0-34-generic +Package: linux-tools-6.5.0-40-generic Build-Profiles: Architecture: amd64 armhf arm64 ppc64el s390x Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-6.5.0-34 -Description: Linux kernel version specific tools for version 6.5.0-34 +Depends: ${misc:Depends}, linux-tools-6.5.0-40 +Description: Linux kernel version specific tools for version 6.5.0-40 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 6.5.0-34 on + version 6.5.0-40 on 64 bit x86. -Package: linux-cloud-tools-6.5.0-34-generic +Package: linux-cloud-tools-6.5.0-40-generic Build-Profiles: Architecture: amd64 armhf arm64 ppc64el s390x Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-6.5.0-34 -Description: Linux kernel version specific cloud tools for version 6.5.0-34 +Depends: ${misc:Depends}, linux-cloud-tools-6.5.0-40 +Description: Linux kernel version specific cloud tools for version 6.5.0-40 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 6.5.0-34 on + version locked tools for cloud for version 6.5.0-40 on 64 bit x86. -Package: linux-buildinfo-6.5.0-34-generic +Package: linux-buildinfo-6.5.0-40-generic Build-Profiles: Architecture: amd64 armhf arm64 ppc64el s390x Section: kernel @@ -338,18 +338,18 @@ You likely do not want to install this package. -Package: linux-modules-ipu6-6.5.0-34-generic +Package: linux-modules-ipu6-6.5.0-40-generic Build-Profiles: Architecture: amd64 armhf arm64 ppc64el s390x Section: kernel Priority: optional Depends: ${misc:Depends}, - linux-image-6.5.0-34-generic | linux-image-unsigned-6.5.0-34-generic, + linux-image-6.5.0-40-generic | linux-image-unsigned-6.5.0-40-generic, Built-Using: ${linux:BuiltUsing} -Description: Linux kernel ipu6 modules for version 6.5.0-34 +Description: Linux kernel ipu6 modules for version 6.5.0-40 This package provides the Linux kernel ipu6 modules for version - 6.5.0-34. + 6.5.0-40. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-ipu6-generic* meta-packages, @@ -357,18 +357,18 @@ also installed. -Package: linux-modules-ivsc-6.5.0-34-generic +Package: linux-modules-ivsc-6.5.0-40-generic Build-Profiles: Architecture: amd64 armhf arm64 ppc64el s390x Section: kernel Priority: optional Depends: ${misc:Depends}, - linux-image-6.5.0-34-generic | linux-image-unsigned-6.5.0-34-generic, + linux-image-6.5.0-40-generic | linux-image-unsigned-6.5.0-40-generic, Built-Using: ${linux:BuiltUsing} -Description: Linux kernel ivsc modules for version 6.5.0-34 +Description: Linux kernel ivsc modules for version 6.5.0-40 This package provides the Linux kernel ivsc modules for version - 6.5.0-34. + 6.5.0-40. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-ivsc-generic* meta-packages, @@ -376,18 +376,18 @@ also installed. -Package: linux-modules-iwlwifi-6.5.0-34-generic +Package: linux-modules-iwlwifi-6.5.0-40-generic Build-Profiles: Architecture: amd64 armhf arm64 ppc64el s390x Section: kernel Priority: optional Depends: ${misc:Depends}, - linux-image-6.5.0-34-generic | linux-image-unsigned-6.5.0-34-generic, + linux-image-6.5.0-40-generic | linux-image-unsigned-6.5.0-40-generic, Built-Using: ${linux:BuiltUsing} -Description: Linux kernel iwlwifi modules for version 6.5.0-34 +Description: Linux kernel iwlwifi modules for version 6.5.0-40 This package provides the Linux kernel iwlwifi modules for version - 6.5.0-34. + 6.5.0-40. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-iwlwifi-generic* meta-packages, @@ -395,17 +395,17 @@ also installed. -Package: linux-image-unsigned-6.5.0-34-generic-64k +Package: linux-image-unsigned-6.5.0-40-generic-64k Build-Profiles: Architecture: arm64 Section: kernel Priority: optional Provides: linux-image, fuse-module, kvm-api-4, redhat-cluster-modules, ivtv-modules, ${linux:rprovides} -Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-6.5.0-34-generic-64k +Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-6.5.0-40-generic-64k Recommends: grub-efi-arm64 [arm64] | flash-kernel [arm64], initramfs-tools | linux-initramfs-tool Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x] -Conflicts: linux-image-6.5.0-34-generic-64k -Suggests: fdutils, linux-doc | linux-source-6.5.0, linux-tools, linux-headers-6.5.0-34-generic-64k, linux-modules-extra-6.5.0-34-generic-64k +Conflicts: linux-image-6.5.0-40-generic-64k +Suggests: fdutils, linux-doc | linux-source-6.5.0, linux-tools, linux-headers-6.5.0-40-generic-64k, linux-modules-extra-6.5.0-40-generic-64k Description: Linux kernel image for version 6.5.0 on 64 bit x86 SMP This package contains the unsigned Linux kernel image for version 6.5.0 on 64 bit x86 SMP. @@ -418,7 +418,7 @@ the linux-generic-64k meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-6.5.0-34-generic-64k +Package: linux-modules-6.5.0-40-generic-64k Build-Profiles: Architecture: arm64 Section: kernel @@ -438,12 +438,12 @@ the linux-generic-64k meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-extra-6.5.0-34-generic-64k +Package: linux-modules-extra-6.5.0-40-generic-64k Build-Profiles: Architecture: arm64 Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-modules-6.5.0-34-generic-64k, wireless-regdb +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-modules-6.5.0-40-generic-64k, wireless-regdb Description: Linux kernel extra modules for version 6.5.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 6.5.0 on 64 bit x86 SMP. @@ -460,21 +460,21 @@ the linux-generic-64k meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-6.5.0-34-generic-64k +Package: linux-headers-6.5.0-40-generic-64k Build-Profiles: Architecture: arm64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-6.5.0-34, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-6.5.0-40, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 6.5.0 on 64 bit x86 SMP This package provides kernel header files for version 6.5.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-6.5.0-34/debian.README.gz for details. + /usr/share/doc/linux-headers-6.5.0-40/debian.README.gz for details. -Package: linux-lib-rust-6.5.0-34-generic-64k +Package: linux-lib-rust-6.5.0-40-generic-64k Build-Profiles: Architecture: amd64 Multi-Arch: foreign @@ -485,7 +485,7 @@ This package provides kernel library files for version 6.5.0, that allow to compile out-of-tree kernel modules written in Rust. -Package: linux-image-unsigned-6.5.0-34-generic-64k-dbgsym +Package: linux-image-unsigned-6.5.0-40-generic-64k-dbgsym Build-Profiles: Architecture: arm64 Section: devel @@ -502,31 +502,31 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-6.5.0-34-generic-64k +Package: linux-tools-6.5.0-40-generic-64k Build-Profiles: Architecture: arm64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-6.5.0-34 -Description: Linux kernel version specific tools for version 6.5.0-34 +Depends: ${misc:Depends}, linux-tools-6.5.0-40 +Description: Linux kernel version specific tools for version 6.5.0-40 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 6.5.0-34 on + version 6.5.0-40 on 64 bit x86. -Package: linux-cloud-tools-6.5.0-34-generic-64k +Package: linux-cloud-tools-6.5.0-40-generic-64k Build-Profiles: Architecture: arm64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-6.5.0-34 -Description: Linux kernel version specific cloud tools for version 6.5.0-34 +Depends: ${misc:Depends}, linux-cloud-tools-6.5.0-40 +Description: Linux kernel version specific cloud tools for version 6.5.0-40 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 6.5.0-34 on + version locked tools for cloud for version 6.5.0-40 on 64 bit x86. -Package: linux-buildinfo-6.5.0-34-generic-64k +Package: linux-buildinfo-6.5.0-40-generic-64k Build-Profiles: Architecture: arm64 Section: kernel @@ -540,18 +540,18 @@ You likely do not want to install this package. -Package: linux-modules-ipu6-6.5.0-34-generic-64k +Package: linux-modules-ipu6-6.5.0-40-generic-64k Build-Profiles: Architecture: arm64 Section: kernel Priority: optional Depends: ${misc:Depends}, - linux-image-6.5.0-34-generic-64k | linux-image-unsigned-6.5.0-34-generic-64k, + linux-image-6.5.0-40-generic-64k | linux-image-unsigned-6.5.0-40-generic-64k, Built-Using: ${linux:BuiltUsing} -Description: Linux kernel ipu6 modules for version 6.5.0-34 +Description: Linux kernel ipu6 modules for version 6.5.0-40 This package provides the Linux kernel ipu6 modules for version - 6.5.0-34. + 6.5.0-40. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-ipu6-generic-64k* meta-packages, @@ -559,18 +559,18 @@ also installed. -Package: linux-modules-ivsc-6.5.0-34-generic-64k +Package: linux-modules-ivsc-6.5.0-40-generic-64k Build-Profiles: Architecture: arm64 Section: kernel Priority: optional Depends: ${misc:Depends}, - linux-image-6.5.0-34-generic-64k | linux-image-unsigned-6.5.0-34-generic-64k, + linux-image-6.5.0-40-generic-64k | linux-image-unsigned-6.5.0-40-generic-64k, Built-Using: ${linux:BuiltUsing} -Description: Linux kernel ivsc modules for version 6.5.0-34 +Description: Linux kernel ivsc modules for version 6.5.0-40 This package provides the Linux kernel ivsc modules for version - 6.5.0-34. + 6.5.0-40. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-ivsc-generic-64k* meta-packages, @@ -578,18 +578,18 @@ also installed. -Package: linux-modules-iwlwifi-6.5.0-34-generic-64k +Package: linux-modules-iwlwifi-6.5.0-40-generic-64k Build-Profiles: Architecture: arm64 Section: kernel Priority: optional Depends: ${misc:Depends}, - linux-image-6.5.0-34-generic-64k | linux-image-unsigned-6.5.0-34-generic-64k, + linux-image-6.5.0-40-generic-64k | linux-image-unsigned-6.5.0-40-generic-64k, Built-Using: ${linux:BuiltUsing} -Description: Linux kernel iwlwifi modules for version 6.5.0-34 +Description: Linux kernel iwlwifi modules for version 6.5.0-40 This package provides the Linux kernel iwlwifi modules for version - 6.5.0-34. + 6.5.0-40. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-iwlwifi-generic-64k* meta-packages, @@ -597,17 +597,17 @@ also installed. -Package: linux-image-unsigned-6.5.0-34-generic-lpae +Package: linux-image-unsigned-6.5.0-40-generic-lpae Build-Profiles: Architecture: armhf Section: kernel Priority: optional Provides: linux-image, fuse-module, kvm-api-4, redhat-cluster-modules, ivtv-modules, ${linux:rprovides} -Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-6.5.0-34-generic-lpae +Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-6.5.0-40-generic-lpae Recommends: flash-kernel [armhf] | grub-efi-arm [armhf], initramfs-tools | linux-initramfs-tool Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x] -Conflicts: linux-image-6.5.0-34-generic-lpae -Suggests: fdutils, linux-doc | linux-source-6.5.0, linux-tools, linux-headers-6.5.0-34-generic-lpae, linux-modules-extra-6.5.0-34-generic-lpae +Conflicts: linux-image-6.5.0-40-generic-lpae +Suggests: fdutils, linux-doc | linux-source-6.5.0, linux-tools, linux-headers-6.5.0-40-generic-lpae, linux-modules-extra-6.5.0-40-generic-lpae Description: Linux kernel image for version 6.5.0 on 64 bit x86 SMP This package contains the unsigned Linux kernel image for version 6.5.0 on 64 bit x86 SMP. @@ -620,7 +620,7 @@ the linux-generic-lpae meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-6.5.0-34-generic-lpae +Package: linux-modules-6.5.0-40-generic-lpae Build-Profiles: Architecture: armhf Section: kernel @@ -640,12 +640,12 @@ the linux-generic-lpae meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-extra-6.5.0-34-generic-lpae +Package: linux-modules-extra-6.5.0-40-generic-lpae Build-Profiles: Architecture: armhf Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-modules-6.5.0-34-generic-lpae, wireless-regdb +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-modules-6.5.0-40-generic-lpae, wireless-regdb Description: Linux kernel extra modules for version 6.5.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 6.5.0 on 64 bit x86 SMP. @@ -662,21 +662,21 @@ the linux-generic-lpae meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-6.5.0-34-generic-lpae +Package: linux-headers-6.5.0-40-generic-lpae Build-Profiles: Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-6.5.0-34, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-6.5.0-40, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 6.5.0 on 64 bit x86 SMP This package provides kernel header files for version 6.5.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-6.5.0-34/debian.README.gz for details. + /usr/share/doc/linux-headers-6.5.0-40/debian.README.gz for details. -Package: linux-lib-rust-6.5.0-34-generic-lpae +Package: linux-lib-rust-6.5.0-40-generic-lpae Build-Profiles: Architecture: amd64 Multi-Arch: foreign @@ -687,7 +687,7 @@ This package provides kernel library files for version 6.5.0, that allow to compile out-of-tree kernel modules written in Rust. -Package: linux-image-unsigned-6.5.0-34-generic-lpae-dbgsym +Package: linux-image-unsigned-6.5.0-40-generic-lpae-dbgsym Build-Profiles: Architecture: armhf Section: devel @@ -704,31 +704,31 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-6.5.0-34-generic-lpae +Package: linux-tools-6.5.0-40-generic-lpae Build-Profiles: Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-6.5.0-34 -Description: Linux kernel version specific tools for version 6.5.0-34 +Depends: ${misc:Depends}, linux-tools-6.5.0-40 +Description: Linux kernel version specific tools for version 6.5.0-40 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 6.5.0-34 on + version 6.5.0-40 on 64 bit x86. -Package: linux-cloud-tools-6.5.0-34-generic-lpae +Package: linux-cloud-tools-6.5.0-40-generic-lpae Build-Profiles: Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-6.5.0-34 -Description: Linux kernel version specific cloud tools for version 6.5.0-34 +Depends: ${misc:Depends}, linux-cloud-tools-6.5.0-40 +Description: Linux kernel version specific cloud tools for version 6.5.0-40 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 6.5.0-34 on + version locked tools for cloud for version 6.5.0-40 on 64 bit x86. -Package: linux-buildinfo-6.5.0-34-generic-lpae +Package: linux-buildinfo-6.5.0-40-generic-lpae Build-Profiles: Architecture: armhf Section: kernel @@ -742,18 +742,18 @@ You likely do not want to install this package. -Package: linux-modules-ipu6-6.5.0-34-generic-lpae +Package: linux-modules-ipu6-6.5.0-40-generic-lpae Build-Profiles: Architecture: armhf Section: kernel Priority: optional Depends: ${misc:Depends}, - linux-image-6.5.0-34-generic-lpae | linux-image-unsigned-6.5.0-34-generic-lpae, + linux-image-6.5.0-40-generic-lpae | linux-image-unsigned-6.5.0-40-generic-lpae, Built-Using: ${linux:BuiltUsing} -Description: Linux kernel ipu6 modules for version 6.5.0-34 +Description: Linux kernel ipu6 modules for version 6.5.0-40 This package provides the Linux kernel ipu6 modules for version - 6.5.0-34. + 6.5.0-40. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-ipu6-generic-lpae* meta-packages, @@ -761,18 +761,18 @@ also installed. -Package: linux-modules-ivsc-6.5.0-34-generic-lpae +Package: linux-modules-ivsc-6.5.0-40-generic-lpae Build-Profiles: Architecture: armhf Section: kernel Priority: optional Depends: ${misc:Depends}, - linux-image-6.5.0-34-generic-lpae | linux-image-unsigned-6.5.0-34-generic-lpae, + linux-image-6.5.0-40-generic-lpae | linux-image-unsigned-6.5.0-40-generic-lpae, Built-Using: ${linux:BuiltUsing} -Description: Linux kernel ivsc modules for version 6.5.0-34 +Description: Linux kernel ivsc modules for version 6.5.0-40 This package provides the Linux kernel ivsc modules for version - 6.5.0-34. + 6.5.0-40. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-ivsc-generic-lpae* meta-packages, @@ -780,18 +780,18 @@ also installed. -Package: linux-modules-iwlwifi-6.5.0-34-generic-lpae +Package: linux-modules-iwlwifi-6.5.0-40-generic-lpae Build-Profiles: Architecture: armhf Section: kernel Priority: optional Depends: ${misc:Depends}, - linux-image-6.5.0-34-generic-lpae | linux-image-unsigned-6.5.0-34-generic-lpae, + linux-image-6.5.0-40-generic-lpae | linux-image-unsigned-6.5.0-40-generic-lpae, Built-Using: ${linux:BuiltUsing} -Description: Linux kernel iwlwifi modules for version 6.5.0-34 +Description: Linux kernel iwlwifi modules for version 6.5.0-40 This package provides the Linux kernel iwlwifi modules for version - 6.5.0-34. + 6.5.0-40. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-iwlwifi-generic-lpae* meta-packages, reverted: --- linux-6.5.0/drivers/thermal/gov_bang_bang.c +++ linux-6.5.0.orig/drivers/thermal/gov_bang_bang.c @@ -13,21 +13,28 @@ #include "thermal_core.h" +static int thermal_zone_trip_update(struct thermal_zone_device *tz, int trip_id) -static int thermal_zone_trip_update(struct thermal_zone_device *tz, int trip_index) { + struct thermal_trip trip; - const struct thermal_trip *trip = &tz->trips[trip_index]; struct thermal_instance *instance; + int ret; + ret = __thermal_zone_get_trip(tz, trip_id, &trip); + if (ret) { + pr_warn_once("Failed to retrieve trip point %d\n", trip_id); + return ret; + } + + if (!trip.hysteresis) - if (!trip->hysteresis) dev_info_once(&tz->device, "Zero hysteresis value for thermal zone %s\n", tz->type); dev_dbg(&tz->device, "Trip%d[temp=%d]:temp=%d:hyst=%d\n", + trip_id, trip.temperature, tz->temperature, + trip.hysteresis); - trip_index, trip->temperature, tz->temperature, - trip->hysteresis); list_for_each_entry(instance, &tz->thermal_instances, tz_node) { + if (instance->trip != trip_id) - if (instance->trip != trip) continue; /* in case fan is in initial state, switch the fan off */ @@ -45,10 +52,10 @@ * enable fan when temperature exceeds trip_temp and disable * the fan in case it falls below trip_temp minus hysteresis */ + if (instance->target == 0 && tz->temperature >= trip.temperature) - if (instance->target == 0 && tz->temperature >= trip->temperature) instance->target = 1; else if (instance->target == 1 && + tz->temperature <= trip.temperature - trip.hysteresis) - tz->temperature <= trip->temperature - trip->hysteresis) instance->target = 0; dev_dbg(&instance->cdev->device, "target=%d\n", reverted: --- linux-6.5.0/drivers/thermal/gov_fair_share.c +++ linux-6.5.0.orig/drivers/thermal/gov_fair_share.c @@ -49,7 +49,7 @@ /** * fair_share_throttle - throttles devices associated with the given zone * @tz: thermal_zone_device + * @trip: trip point index - * @trip_index: trip point index * * Throttling Logic: This uses three parameters to calculate the new * throttle state of the cooling devices associated with the given zone. @@ -65,9 +65,8 @@ * (Heavily assumes the trip points are in ascending order) * new_state of cooling device = P3 * P2 * P1 */ +static int fair_share_throttle(struct thermal_zone_device *tz, int trip) -static int fair_share_throttle(struct thermal_zone_device *tz, int trip_index) { - const struct thermal_trip *trip = &tz->trips[trip_index]; struct thermal_instance *instance; int total_weight = 0; int total_instance = 0; diff -u linux-6.5.0/drivers/thermal/gov_power_allocator.c linux-6.5.0/drivers/thermal/gov_power_allocator.c --- linux-6.5.0/drivers/thermal/gov_power_allocator.c +++ linux-6.5.0/drivers/thermal/gov_power_allocator.c @@ -90,14 +90,12 @@ u32 sustainable_power = 0; struct thermal_instance *instance; struct power_allocator_params *params = tz->governor_data; - const struct thermal_trip *trip_max_desired_temperature = - &tz->trips[params->trip_max_desired_temperature]; list_for_each_entry(instance, &tz->thermal_instances, tz_node) { struct thermal_cooling_device *cdev = instance->cdev; u32 min_power; - if (instance->trip != trip_max_desired_temperature) + if (instance->trip != params->trip_max_desired_temperature) continue; if (!cdev_is_power_actor(cdev)) @@ -385,13 +383,12 @@ { struct thermal_instance *instance; struct power_allocator_params *params = tz->governor_data; - const struct thermal_trip *trip_max_desired_temperature = - &tz->trips[params->trip_max_desired_temperature]; u32 *req_power, *max_power, *granted_power, *extra_actor_power; u32 *weighted_req_power; u32 total_req_power, max_allocatable_power, total_weighted_req_power; u32 total_granted_power, power_range; int i, num_actors, total_weight, ret = 0; + int trip_max_desired_temperature = params->trip_max_desired_temperature; num_actors = 0; total_weight = 0; @@ -567,14 +564,12 @@ { struct thermal_instance *instance; struct power_allocator_params *params = tz->governor_data; - const struct thermal_trip *trip_max_desired_temperature = - &tz->trips[params->trip_max_desired_temperature]; u32 req_power; list_for_each_entry(instance, &tz->thermal_instances, tz_node) { struct thermal_cooling_device *cdev = instance->cdev; - if ((instance->trip != trip_max_desired_temperature) || + if ((instance->trip != params->trip_max_desired_temperature) || (!cdev_is_power_actor(instance->cdev))) continue; reverted: --- linux-6.5.0/drivers/thermal/gov_step_wise.c +++ linux-6.5.0.orig/drivers/thermal/gov_step_wise.c @@ -81,24 +81,26 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip_id) { - const struct thermal_trip *trip = &tz->trips[trip_id]; enum thermal_trend trend; struct thermal_instance *instance; + struct thermal_trip trip; bool throttle = false; int old_target; + __thermal_zone_get_trip(tz, trip_id, &trip); + trend = get_tz_trend(tz, trip_id); + if (tz->temperature >= trip.temperature) { - if (tz->temperature >= trip->temperature) { throttle = true; + trace_thermal_zone_trip(tz, trip_id, trip.type); - trace_thermal_zone_trip(tz, trip_id, trip->type); } dev_dbg(&tz->device, "Trip%d[type=%d,temp=%d]:trend=%d,throttle=%d\n", + trip_id, trip.type, trip.temperature, trend, throttle); - trip_id, trip->type, trip->temperature, trend, throttle); list_for_each_entry(instance, &tz->thermal_instances, tz_node) { + if (instance->trip != trip_id) - if (instance->trip != trip) continue; old_target = instance->target; @@ -112,11 +114,11 @@ /* Activate a passive thermal instance */ if (old_target == THERMAL_NO_TARGET && instance->target != THERMAL_NO_TARGET) + update_passive_instance(tz, trip.type, 1); - update_passive_instance(tz, trip->type, 1); /* Deactivate a passive thermal instance */ else if (old_target != THERMAL_NO_TARGET && instance->target == THERMAL_NO_TARGET) + update_passive_instance(tz, trip.type, -1); - update_passive_instance(tz, trip->type, -1); instance->initialized = true; mutex_lock(&instance->cdev->lock); diff -u linux-6.5.0/drivers/thermal/thermal_core.c linux-6.5.0/drivers/thermal/thermal_core.c --- linux-6.5.0/drivers/thermal/thermal_core.c +++ linux-6.5.0/drivers/thermal/thermal_core.c @@ -582,7 +582,7 @@ /** * thermal_zone_bind_cooling_device() - bind a cooling device to a thermal zone * @tz: pointer to struct thermal_zone_device - * @trip_index: indicates which trip point the cooling devices is + * @trip: indicates which trip point the cooling devices is * associated with in this thermal zone. * @cdev: pointer to struct thermal_cooling_device * @upper: the Maximum cooling state for this trip point. @@ -602,7 +602,7 @@ * Return: 0 on success, the proper error value otherwise. */ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, - int trip_index, + int trip, struct thermal_cooling_device *cdev, unsigned long upper, unsigned long lower, unsigned int weight) @@ -611,15 +611,12 @@ struct thermal_instance *pos; struct thermal_zone_device *pos1; struct thermal_cooling_device *pos2; - const struct thermal_trip *trip; bool upper_no_limit; int result; - if (trip_index >= tz->num_trips || trip_index < 0) + if (trip >= tz->num_trips || trip < 0) return -EINVAL; - trip = &tz->trips[trip_index]; - list_for_each_entry(pos1, &thermal_tz_list, node) { if (pos1 == tz) break; @@ -724,7 +721,7 @@ * thermal_zone_unbind_cooling_device() - unbind a cooling device from a * thermal zone. * @tz: pointer to a struct thermal_zone_device. - * @trip_index: indicates which trip point the cooling devices is + * @trip: indicates which trip point the cooling devices is * associated with in this thermal zone. * @cdev: pointer to a struct thermal_cooling_device. * @@ -735,15 +732,13 @@ * Return: 0 on success, the proper error value otherwise. */ int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz, - int trip_index, + int trip, struct thermal_cooling_device *cdev) { struct thermal_instance *pos, *next; - const struct thermal_trip *trip; mutex_lock(&tz->lock); mutex_lock(&cdev->lock); - trip = &tz->trips[trip_index]; list_for_each_entry_safe(pos, next, &tz->thermal_instances, tz_node) { if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) { list_del(&pos->tz_node); reverted: --- linux-6.5.0/drivers/thermal/thermal_core.h +++ linux-6.5.0.orig/drivers/thermal/thermal_core.h @@ -91,7 +91,7 @@ char name[THERMAL_NAME_LENGTH]; struct thermal_zone_device *tz; struct thermal_cooling_device *cdev; + int trip; - const struct thermal_trip *trip; bool initialized; unsigned long upper; /* Highest cooling state for this trip point */ unsigned long lower; /* Lowest cooling state for this trip point */ @@ -123,8 +123,6 @@ void __thermal_zone_set_trips(struct thermal_zone_device *tz); int __thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id, struct thermal_trip *trip); -int thermal_zone_trip_id(struct thermal_zone_device *tz, - const struct thermal_trip *trip); int __thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp); /* sysfs I/F */ reverted: --- linux-6.5.0/drivers/thermal/thermal_helpers.c +++ linux-6.5.0.orig/drivers/thermal/thermal_helpers.c @@ -41,17 +41,14 @@ struct thermal_instance * get_thermal_instance(struct thermal_zone_device *tz, + struct thermal_cooling_device *cdev, int trip) - struct thermal_cooling_device *cdev, int trip_index) { struct thermal_instance *pos = NULL; struct thermal_instance *target_instance = NULL; - const struct thermal_trip *trip; mutex_lock(&tz->lock); mutex_lock(&cdev->lock); - trip = &tz->trips[trip_index]; - list_for_each_entry(pos, &tz->thermal_instances, tz_node) { if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) { target_instance = pos; diff -u linux-6.5.0/drivers/thermal/thermal_sysfs.c linux-6.5.0/drivers/thermal/thermal_sysfs.c --- linux-6.5.0/drivers/thermal/thermal_sysfs.c +++ linux-6.5.0/drivers/thermal/thermal_sysfs.c @@ -943,8 +943,7 @@ instance = container_of(attr, struct thermal_instance, attr); - return sprintf(buf, "%d\n", - thermal_zone_trip_id(instance->tz, instance->trip)); + return sprintf(buf, "%d\n", instance->trip); } ssize_t diff -u linux-6.5.0/drivers/thermal/thermal_trip.c linux-6.5.0/drivers/thermal/thermal_trip.c --- linux-6.5.0/drivers/thermal/thermal_trip.c +++ linux-6.5.0/drivers/thermal/thermal_trip.c @@ -198,13 +197,0 @@ - -int thermal_zone_trip_id(struct thermal_zone_device *tz, - const struct thermal_trip *trip) -{ - int i; - - for (i = 0; i < tz->num_trips; i++) { - if (&tz->trips[i] == trip) - return i; - } - - return -ENODATA; -} diff -u linux-6.5.0/fs/ext4/move_extent.c linux-6.5.0/fs/ext4/move_extent.c --- linux-6.5.0/fs/ext4/move_extent.c +++ linux-6.5.0/fs/ext4/move_extent.c @@ -622,6 +622,7 @@ goto out; o_end = o_start + len; + *moved_len = 0; while (o_start < o_end) { struct ext4_extent *ex; ext4_lblk_t cur_blk, next_blk; @@ -676,7 +677,7 @@ */ ext4_double_up_write_data_sem(orig_inode, donor_inode); /* Swap original branches with new branches */ - move_extent_per_page(o_filp, donor_inode, + *moved_len += move_extent_per_page(o_filp, donor_inode, orig_page_index, donor_page_index, offset_in_page, cur_len, unwritten, &ret); @@ -686,9 +687,6 @@ o_start += cur_len; d_start += cur_len; } - *moved_len = o_start - orig_blk; - if (*moved_len > len) - *moved_len = len; out: if (*moved_len) { diff -u linux-6.5.0/fs/smb/client/cifsfs.c linux-6.5.0/fs/smb/client/cifsfs.c --- linux-6.5.0/fs/smb/client/cifsfs.c +++ linux-6.5.0/fs/smb/client/cifsfs.c @@ -1245,7 +1245,7 @@ int rc = 0; folio = filemap_get_folio(inode->i_mapping, index); - if (!folio) + if (IS_ERR(folio)) return 0; size = folio_size(folio); diff -u linux-6.5.0/net/bluetooth/hci_core.c linux-6.5.0/net/bluetooth/hci_core.c --- linux-6.5.0/net/bluetooth/hci_core.c +++ linux-6.5.0/net/bluetooth/hci_core.c @@ -1049,6 +1049,7 @@ { struct hci_dev *hdev = container_of(work, struct hci_dev, error_reset); + hci_dev_hold(hdev); BT_DBG("%s", hdev->name); if (hdev->hw_error) @@ -1056,10 +1057,10 @@ else bt_dev_err(hdev, "hardware error 0x%2.2x", hdev->hw_error_code); - if (hci_dev_do_close(hdev)) - return; + if (!hci_dev_do_close(hdev)) + hci_dev_do_open(hdev); - hci_dev_do_open(hdev); + hci_dev_put(hdev); } void hci_uuids_clear(struct hci_dev *hdev) diff -u linux-6.5.0/net/netlink/af_netlink.c linux-6.5.0/net/netlink/af_netlink.c --- linux-6.5.0/net/netlink/af_netlink.c +++ linux-6.5.0/net/netlink/af_netlink.c @@ -167,7 +167,7 @@ static struct sk_buff *netlink_to_full_skb(const struct sk_buff *skb, gfp_t gfp_mask) { - unsigned int len = skb_end_offset(skb); + unsigned int len = skb->len; struct sk_buff *new; new = alloc_skb(len, gfp_mask); only in patch2: unchanged: --- linux-6.5.0.orig/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ linux-6.5.0/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -1179,8 +1179,7 @@ scan_request = cfg->scan_request; cfg->scan_request = NULL; - if (timer_pending(&cfg->escan_timeout)) - del_timer_sync(&cfg->escan_timeout); + timer_delete_sync(&cfg->escan_timeout); if (fw_abort) { /* Do a scan abort to stop the driver's scan engine */ @@ -8436,6 +8435,7 @@ brcmf_btcoex_detach(cfg); wiphy_unregister(cfg->wiphy); wl_deinit_priv(cfg); + cancel_work_sync(&cfg->escan_timeout_work); brcmf_free_wiphy(cfg->wiphy); kfree(cfg); } only in patch2: unchanged: --- linux-6.5.0.orig/security/tomoyo/common.c +++ linux-6.5.0/security/tomoyo/common.c @@ -2648,13 +2648,14 @@ { int error = buffer_len; size_t avail_len = buffer_len; - char *cp0 = head->write_buf; + char *cp0; int idx; if (!head->write) return -EINVAL; if (mutex_lock_interruptible(&head->io_sem)) return -EINTR; + cp0 = head->write_buf; head->read_user_buf_avail = 0; idx = tomoyo_read_lock(); /* Read a line and dispatch it to the policy handler. */