1. 16 Oct, 2024 3 commits
  2. 15 Oct, 2024 3 commits
    • Linus Torvalds's avatar
      Merge tag 'trace-ringbuffer-v6.12-rc3' of... · 2f87d091
      Linus Torvalds authored
      Merge tag 'trace-ringbuffer-v6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
      
      Pull ring-buffer fixes from Steven Rostedt:
      
       - Fix ref counter of buffers assigned at boot up
      
         A tracing instance can be created from the kernel command line. If it
         maps to memory, it is considered permanent and should not be deleted,
         or bad things can happen. If it is not mapped to memory, then the
         user is fine to delete it via rmdir from the instances directory. But
         the ref counts assumed 0 was free to remove and greater than zero was
         not. But this was not the case. When an instance is created, it
         should have the reference of 1, and if it should not be removed, it
         must be greater than 1. The boot up code set normal instances with a
         ref count of 0, which could get removed if something accessed it and
         then released it. And memory mapped instances had a ref count of 1
         which meant it could be deleted, and bad things happen. Keep normal
         instances ref count as 1, and set memory mapped instances ref count
         to 2.
      
       - Protect sub buffer size (order) updates from other modifications
      
         When a ring buffer is changing the size of its sub-buffers, no other
         operations should be performed on the ring buffer. That includes
         reading it. But the locking only grabbed the buffer->mutex that keeps
         some operations from touching the ring buffer. It also must hold the
         cpu_buffer->reader_lock as well when updates happen as other paths
         use that to do some operations on the ring buffer.
      
      * tag 'trace-ringbuffer-v6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
        ring-buffer: Fix reader locking when changing the sub buffer order
        ring-buffer: Fix refcount setting of boot mapped buffers
      2f87d091
    • Linus Torvalds's avatar
      Merge tag 'bcachefs-2024-10-14' of git://evilpiepirate.org/bcachefs · bdc72765
      Linus Torvalds authored
      Pull bcachefs fixes from Kent Overstreet:
      
       - New metadata version inode_has_child_snapshots
      
         This fixes bugs with handling of unlinked inodes + snapshots, in
         particular when an inode is reattached after taking a snapshot;
         deleted inodes now get correctly cleaned up across snapshots.
      
       - Disk accounting rewrite fixes
           - validation fixes for when a device has been removed
           - fix journal replay failing with "journal_reclaim_would_deadlock"
      
       - Some more small fixes for erasure coding + device removal
      
       - Assorted small syzbot fixes
      
      * tag 'bcachefs-2024-10-14' of git://evilpiepirate.org/bcachefs: (27 commits)
        bcachefs: Fix sysfs warning in fstests generic/730,731
        bcachefs: Handle race between stripe reuse, invalidate_stripe_to_dev
        bcachefs: Fix kasan splat in new_stripe_alloc_buckets()
        bcachefs: Add missing validation for bch_stripe.csum_granularity_bits
        bcachefs: Fix missing bounds checks in bch2_alloc_read()
        bcachefs: fix uaf in bch2_dio_write_done()
        bcachefs: Improve check_snapshot_exists()
        bcachefs: Fix bkey_nocow_lock()
        bcachefs: Fix accounting replay flags
        bcachefs: Fix invalid shift in member_to_text()
        bcachefs: Fix bch2_have_enough_devs() for BCH_SB_MEMBER_INVALID
        bcachefs: __wait_for_freeing_inode: Switch to wait_bit_queue_entry
        bcachefs: Check if stuck in journal_res_get()
        closures: Add closure_wait_event_timeout()
        bcachefs: Fix state lock involved deadlock
        bcachefs: Fix NULL pointer dereference in bch2_opt_to_text
        bcachefs: Release transaction before wake up
        bcachefs: add check for btree id against max in try read node
        bcachefs: Disk accounting device validation fixes
        bcachefs: bch2_inode_or_descendents_is_open()
        ...
      bdc72765
    • Petr Pavlu's avatar
      ring-buffer: Fix reader locking when changing the sub buffer order · 09661f75
      Petr Pavlu authored
      The function ring_buffer_subbuf_order_set() updates each
      ring_buffer_per_cpu and installs new sub buffers that match the requested
      page order. This operation may be invoked concurrently with readers that
      rely on some of the modified data, such as the head bit (RB_PAGE_HEAD), or
      the ring_buffer_per_cpu.pages and reader_page pointers. However, no
      exclusive access is acquired by ring_buffer_subbuf_order_set(). Modifying
      the mentioned data while a reader also operates on them can then result in
      incorrect memory access and various crashes.
      
      Fix the problem by taking the reader_lock when updating a specific
      ring_buffer_per_cpu in ring_buffer_subbuf_order_set().
      
      Link: https://lore.kernel.org/linux-trace-kernel/20240715145141.5528-1-petr.pavlu@suse.com/
      Link: https://lore.kernel.org/linux-trace-kernel/20241010195849.2f77cc3f@gandalf.local.home/
      Link: https://lore.kernel.org/linux-trace-kernel/20241011112850.17212b25@gandalf.local.home/
      
      Cc: Masami Hiramatsu <mhiramat@kernel.org>
      Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
      Link: https://lore.kernel.org/20241015112440.26987-1-petr.pavlu@suse.com
      Fixes: 8e7b58c2 ("ring-buffer: Just update the subbuffers when changing their allocation order")
      Signed-off-by: default avatarPetr Pavlu <petr.pavlu@suse.com>
      Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
      09661f75
  3. 14 Oct, 2024 7 commits
  4. 13 Oct, 2024 9 commits
  5. 12 Oct, 2024 7 commits
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 7234e2ea
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "Four small fixes, three in drivers and one in the FC transport class
        to add idempotence to state setting"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: scsi_transport_fc: Allow setting rport state to current state
        scsi: wd33c93: Don't use stale scsi_pointer value
        scsi: fnic: Move flush_work initialization out of if block
        scsi: ufs: Use pre-calculated offsets in ufshcd_init_lrb()
      7234e2ea
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-v6.12-rc3' of... · 05749ecf
      Linus Torvalds authored
      Merge tag 'hwmon-for-v6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fixes from Guenter Roeck:
      
       - Add missing dependencies on REGMAP_I2C for several drivers
      
       - Fix memory leak in adt7475 driver
      
       - Relabel Columbiaville temperature sensor in intel-m10-bmc-hwmon
         driver to match other sensor labels
      
      * tag 'hwmon-for-v6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (max1668) Add missing dependency on REGMAP_I2C
        hwmon: (ltc2991) Add missing dependency on REGMAP_I2C
        hwmon: (adt7470) Add missing dependency on REGMAP_I2C
        hwmon: (adm9240) Add missing dependency on REGMAP_I2C
        hwmon: (mc34vr500) Add missing dependency on REGMAP_I2C
        hwmon: (tmp513) Add missing dependency on REGMAP_I2C
        hwmon: (adt7475) Fix memory leak in adt7475_fan_pwm_config()
        hwmon: intel-m10-bmc-hwmon: relabel Columbiaville to CVL Die Temperature
      05749ecf
    • Kent Overstreet's avatar
      bcachefs: Improve check_snapshot_exists() · c986dd7e
      Kent Overstreet authored
      Check if we have snapshot_trees or subvolumes that refer to the snapshot
      node being reconstructed, and use them.
      
      With this, the kill_btree_root test that blows away the snapshots btree
      now passes, and we're able to successfully reconstruct.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      c986dd7e
    • Kent Overstreet's avatar
      bcachefs: Fix bkey_nocow_lock() · 9183c2b1
      Kent Overstreet authored
      This fixes an assertion pop in nocow_locking.c
      
      00243 kernel BUG at fs/bcachefs/nocow_locking.c:41!
      00243 Internal error: Oops - BUG: 00000000f2000800 [#1] SMP
      00243 Modules linked in:
      00243 Hardware name: linux,dummy-virt (DT)
      00243 pstate: 60001005 (nZCv daif -PAN -UAO -TCO -DIT +SSBS BTYPE=--)
      00244 pc : bch2_bucket_nocow_unlock (/home/testdashboard/linux-7/fs/bcachefs/nocow_locking.c:41)
      00244 lr : bkey_nocow_lock (/home/testdashboard/linux-7/fs/bcachefs/data_update.c:79)
      00244 sp : ffffff80c82373b0
      00244 x29: ffffff80c82373b0 x28: ffffff80e08958c0 x27: ffffff80e0880000
      00244 x26: ffffff80c8237a98 x25: 00000000000000a0 x24: ffffff80c8237ab0
      00244 x23: 00000000000000c0 x22: 0000000000000008 x21: 0000000000000000
      00244 x20: ffffff80c8237a98 x19: 0000000000000018 x18: 0000000000000000
      00244 x17: 0000000000000000 x16: 000000000000003f x15: 0000000000000000
      00244 x14: 0000000000000008 x13: 0000000000000018 x12: 0000000000000000
      00244 x11: 0000000000000000 x10: ffffff80e0880000 x9 : ffffffc0803ac1a4
      00244 x8 : 0000000000000018 x7 : ffffff80c8237a88 x6 : ffffff80c8237ab0
      00244 x5 : ffffff80e08988d0 x4 : 00000000ffffffff x3 : 0000000000000000
      00244 x2 : 0000000000000004 x1 : 0003000000000d1e x0 : ffffff80e08988c0
      00244 Call trace:
      00244 bch2_bucket_nocow_unlock (/home/testdashboard/linux-7/fs/bcachefs/nocow_locking.c:41)
      00245 bch2_data_update_init (/home/testdashboard/linux-7/fs/bcachefs/data_update.c:627 (discriminator 1))
      00245 promote_alloc.isra.0 (/home/testdashboard/linux-7/fs/bcachefs/io_read.c:242 /home/testdashboard/linux-7/fs/bcachefs/io_read.c:304)
      00245 __bch2_read_extent (/home/testdashboard/linux-7/fs/bcachefs/io_read.c:949)
      00246 __bch2_read (/home/testdashboard/linux-7/fs/bcachefs/io_read.c:1215)
      00246 bch2_direct_IO_read (/home/testdashboard/linux-7/fs/bcachefs/fs-io-direct.c:132)
      00246 bch2_read_iter (/home/testdashboard/linux-7/fs/bcachefs/fs-io-direct.c:201)
      00247 aio_read.constprop.0 (/home/testdashboard/linux-7/fs/aio.c:1602)
      00247 io_submit_one.constprop.0 (/home/testdashboard/linux-7/fs/aio.c:2003 /home/testdashboard/linux-7/fs/aio.c:2052)
      00248 __arm64_sys_io_submit (/home/testdashboard/linux-7/fs/aio.c:2111 /home/testdashboard/linux-7/fs/aio.c:2081 /home/testdashboard/linux-7/fs/aio.c:2081)
      00248 invoke_syscall.constprop.0 (/home/testdashboard/linux-7/arch/arm64/include/asm/syscall.h:61 /home/testdashboard/linux-7/arch/arm64/kernel/syscall.c:54)
      00248 ========= FAILED TIMEOUT tiering_variable_buckets_replicas in 1200s
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      9183c2b1
    • Kent Overstreet's avatar
      bcachefs: Fix accounting replay flags · 672f7523
      Kent Overstreet authored
      BCH_TRANS_COMMIT_journal_reclaim without BCH_WATERMARK_reclaim means
      "return an error if low on journal space" - but accounting replay must
      succeed.
      
      Fixes https://github.com/koverstreet/bcachefs/issues/656Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      672f7523
    • Kent Overstreet's avatar
      bcachefs: Fix invalid shift in member_to_text() · c1bd21bb
      Kent Overstreet authored
      Reported-by: syzbot+064ce437a1ad63d3f6ef@syzkaller.appspotmail.com
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      c1bd21bb
    • Kent Overstreet's avatar
      bcachefs: Fix bch2_have_enough_devs() for BCH_SB_MEMBER_INVALID · 7d84d9f4
      Kent Overstreet authored
      This fixes a kasan splat in the ec device removal tests.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      7d84d9f4
  6. 11 Oct, 2024 11 commits
    • Linus Torvalds's avatar
      Merge tag 'linux_kselftest-fixes-6.12-rc3' of... · 09f6b0c8
      Linus Torvalds authored
      Merge tag 'linux_kselftest-fixes-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest fixes from Shuah Khan:
       "Fixes for build, run-time errors, and reporting errors:
      
         - ftrace: regression test for a kernel crash when running function
           graph tracing and then enabling function profiler.
      
         - rseq: fix for mm_cid test failure.
      
         - vDSO:
            - fixes to reporting skip and other error conditions
            - changes unconditionally build chacha and getrandom tests on all
              architectures to make it easier for them to run in CIs
            - build error when sched.h to bring in CLONE_NEWTIME define"
      
      * tag 'linux_kselftest-fixes-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        ftrace/selftest: Test combination of function_graph tracer and function profiler
        selftests/rseq: Fix mm_cid test failure
        selftests: vDSO: Explicitly include sched.h
        selftests: vDSO: improve getrandom and chacha error messages
        selftests: vDSO: unconditionally build getrandom test
        selftests: vDSO: unconditionally build chacha test
      09f6b0c8
    • Linus Torvalds's avatar
      Merge tag 'devicetree-fixes-for-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 974099e4
      Linus Torvalds authored
      Pull devicetree fixes from Rob Herring:
      
       - Disable kunit tests for arm64+ACPI
      
       - Fix refcount issue in kunit tests
      
       - Drop constraints on non-conformant 'interrupt-map' in fsl,ls-extirq
      
       - Drop type ref on 'msi-parent in fsl,qoriq-mc binding
      
       - Move elgin,jg10309-01 to its own binding from trivial-devices
      
      * tag 'devicetree-fixes-for-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        of: Skip kunit tests when arm64+ACPI doesn't populate root node
        of: Fix unbalanced of node refcount and memory leaks
        dt-bindings: interrupt-controller: fsl,ls-extirq: workaround wrong interrupt-map number
        dt-bindings: misc: fsl,qoriq-mc: remove ref for msi-parent
        dt-bindings: display: elgin,jg10309-01: Add own binding
      974099e4
    • Linus Torvalds's avatar
      Merge tag 'fbdev-for-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev · 9066258d
      Linus Torvalds authored
      Pull fbdev platform driver fix from Helge Deller:
       "Switch fbdev drivers back to struct platform_driver::remove()
      
        Now that 'remove()' has been converted to the sane new API, there's
        no reason for the 'remove_new()' use, so this converts back to the
        traditional and simpler name.
      
        See commits
      
           5c5a7680 ("platform: Provide a remove callback that returns no value")
           0edb555a ("platform: Make platform_driver::remove() return void")
      
        for background to this all"
      
      * tag 'fbdev-for-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
        fbdev: Switch back to struct platform_driver::remove()
      9066258d
    • Linus Torvalds's avatar
      Merge tag 'gpio-fixes-for-v6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux · 547fc322
      Linus Torvalds authored
      Pull gpio fixes from Bartosz Golaszewski:
      
       - fix clock handle leak in probe() error path in gpio-aspeed
      
       - add a dummy register read to ensure the write actually completed
      
      * tag 'gpio-fixes-for-v6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
        gpio: aspeed: Use devm_clk api to manage clock source
        gpio: aspeed: Add the flush write to ensure the write complete.
      547fc322
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-6.12-2' of git://git.linux-nfs.org/projects/anna/linux-nfs · 6254d537
      Linus Torvalds authored
      Pull NFS client fixes from Anna Schumaker:
       "Localio Bugfixes:
         - remove duplicated include in localio.c
         - fix race in NFS calls to nfsd_file_put_local() and nfsd_serv_put()
         - fix Kconfig for NFS_COMMON_LOCALIO_SUPPORT
         - fix nfsd_file tracepoints to handle NULL rqstp pointers
      
        Other Bugfixes:
         - fix program selection loop in svc_process_common
         - fix integer overflow in decode_rc_list()
         - prevent NULL-pointer dereference in nfs42_complete_copies()
         - fix CB_RECALL performance issues when using a large number of
           delegations"
      
      * tag 'nfs-for-6.12-2' of git://git.linux-nfs.org/projects/anna/linux-nfs:
        NFS: remove revoked delegation from server's delegation list
        nfsd/localio: fix nfsd_file tracepoints to handle NULL rqstp
        nfs_common: fix Kconfig for NFS_COMMON_LOCALIO_SUPPORT
        nfs_common: fix race in NFS calls to nfsd_file_put_local() and nfsd_serv_put()
        NFSv4: Prevent NULL-pointer dereference in nfs42_complete_copies()
        SUNRPC: Fix integer overflow in decode_rc_list()
        sunrpc: fix prog selection loop in svc_process_common
        nfs: Remove duplicated include in localio.c
      6254d537
    • Linus Torvalds's avatar
      Merge tag 'rcu.fixes.6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux · a1029768
      Linus Torvalds authored
      Pull RCU fix from Neeraj Upadhyay:
       "Fix rcuog kthread wakeup invocation from softirq context on a CPU
        which has been marked offline.
      
        This can happen when new callbacks are enqueued from a softirq on an
        offline CPU before it calls rcutree_report_cpu_dead(). When this
        happens on NOCB configuration, the rcuog wake-up is deferred through
        an IPI to an online CPU. This is done to avoid call into the scheduler
        which can risk arming the RT-bandwidth after hrtimers have been
        migrated out and disabled.
      
        However, doing IPI call from softirq is not allowed: Fix this by
        forcing deferred rcuog wakeup through the NOCB timer when the CPU is
        offline"
      
      * tag 'rcu.fixes.6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux:
        rcu/nocb: Fix rcuog wake-up from offline softirq
      a1029768
    • Linus Torvalds's avatar
      Merge tag 'for-linus-6.12a-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · d947d684
      Linus Torvalds authored
      Pull xen fix from Juergen Gross:
       "A fix for topology information of Xen PV guests"
      
      * tag 'for-linus-6.12a-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        x86/xen: mark boot CPU of PV guest in MSR_IA32_APICBASE
      d947d684
    • Steven Rostedt's avatar
      ftrace/selftest: Test combination of function_graph tracer and function profiler · 4ee5ca9a
      Steven Rostedt authored
      Masami reported a bug when running function graph tracing then the
      function profiler. The following commands would cause a kernel crash:
      
        # cd /sys/kernel/tracing/
        # echo function_graph > current_tracer
        # echo 1 > function_profile_enabled
      
      In that order. Create a test to test this two to make sure this does not
      come back as a regression.
      
      Link: https://lore.kernel.org/172398528350.293426.8347220120333730248.stgit@devnote2
      
      Link: https://lore.kernel.org/all/20241010165235.35122877@gandalf.local.home/Acked-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
      Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      4ee5ca9a
    • Mathieu Desnoyers's avatar
      selftests/rseq: Fix mm_cid test failure · a0cc6493
      Mathieu Desnoyers authored
      Adapt the rseq.c/rseq.h code to follow GNU C library changes introduced by:
      
      glibc commit 2e456ccf0c34 ("Linux: Make __rseq_size useful for feature detection (bug 31965)")
      
      Without this fix, rseq selftests for mm_cid fail:
      
      ./run_param_test.sh
      Default parameters
      Running test spinlock
      Running compare-twice test spinlock
      Running mm_cid test spinlock
      Error: cpu id getter unavailable
      
      Fixes: 18c23558 ("selftests/rseq: Implement rseq mm_cid field support")
      Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      CC: Boqun Feng <boqun.feng@gmail.com>
      CC: "Paul E. McKenney" <paulmck@kernel.org>
      Cc: Shuah Khan <skhan@linuxfoundation.org>
      CC: Carlos O'Donell <carlos@redhat.com>
      CC: Florian Weimer <fweimer@redhat.com>
      CC: linux-kselftest@vger.kernel.org
      CC: stable@vger.kernel.org
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      a0cc6493
    • Linus Torvalds's avatar
      Merge tag 'io_uring-6.12-20241011' of git://git.kernel.dk/linux · 9e4c6c1a
      Linus Torvalds authored
      Pull io_uring fixes from Jens Axboe:
      
       - Explicitly have a mshot_finished condition for IORING_OP_RECV in
         multishot mode, similarly to what IORING_OP_RECVMSG has. This doesn't
         fix a bug right now, but it makes it harder to actually have a bug
         here if a request takes multiple iterations to finish.
      
       - Fix handling of retry of read/write of !FMODE_NOWAIT files. If they
         are pollable, that's all we need.
      
      * tag 'io_uring-6.12-20241011' of git://git.kernel.dk/linux:
        io_uring/rw: allow pollable non-blocking attempts for !FMODE_NOWAIT
        io_uring/rw: fix cflags posting for single issue multishot read
      9e4c6c1a
    • Linus Torvalds's avatar
      Merge tag 'pm-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · e643edac
      Linus Torvalds authored
      Pull power management fixes from Rafael Wysocki:
       "These address two issues in the TPMI module of the Intel RAPL power
        capping driver and one issue in the processor part of the Intel
        int340x thermal driver, update a CPU ID list and register definitions
        needed for RAPL PL4 support and remove some unused code.
      
        Specifics:
      
         - Fix the TPMI_RAPL_REG_DOMAIN_INFO register offset in the TPMI part
           of the Intel RAPL power capping driver, make it ignore minor
           hardware version mismatches (which only indicate exposing
           additional features) and update register definitions in it to
           enable PL4 support (Zhang Rui)
      
         - Add Arrow Lake-U to the list of processors supporting PL4 in the
           MSR part of the Intel RAPL power capping driver (Sumeet Pawnikar)
      
         - Remove excess pci_disable_device() calls from the processor part of
           the int340x thermal driver to address a warning triggered during
           module unload and remove unused CPU hotplug code related to RAPL
           support from it (Zhang Rui)"
      
      * tag 'pm-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        thermal: intel: int340x: processor: Add MMIO RAPL PL4 support
        thermal: intel: int340x: processor: Remove MMIO RAPL CPU hotplug support
        powercap: intel_rapl_msr: Add PL4 support for Arrowlake-U
        powercap: intel_rapl_tpmi: Ignore minor version change
        thermal: intel: int340x: processor: Fix warning during module unload
        powercap: intel_rapl_tpmi: Fix bogus register reading
      e643edac