lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20250423204657.3ab28816@canb.auug.org.au>
Date: Wed, 23 Apr 2025 20:46:57 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Linux Next Mailing List <linux-next@...r.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: Tree for Apr 23

Hi all,

News: there will be no linux-next release this coming Friday.

Changes since 20250422:

New trees: fwctl and fwctl-fixes

The bacachefs tree lost its build failure.

The kvm-fixes tree still had its build failure so I used the version from
next-20250417.  This affected the kvm tree as well.

The mm-unstable tree still produced a runtime warning messages.

The tip tree still had its build failure so I used the version from
next-20250414.

The workqueues tree still had its build failure so I used the version
from next-20250414.

Non-merge commits (relative to Linus' tree): 5141
 5396 files changed, 216530 insertions(+), 115858 deletions(-)

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" and checkout or reset to the new
master.

You can see which trees have been included by looking in the Next/Trees
file in the source.  There is also the merge.log file in the Next
directory.  Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 391 trees (counting Linus' and 148 trees of bug
fix patches pending for the current release).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

-- 
Cheers,
Stephen Rothwell

$ git checkout master
$ git reset --hard stable
Merging origin/master (bc3372351d0c Merge tag 'for-6.15-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging fixes/fixes (b3c623b9a94f Merge tag 'thermal-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging ext4-fixes/fixes (4bbf9020becb Linux 6.13-rc4)
Merging vfs-brauner-fixes/vfs.fixes (d1f7256a5a52 fs: fall back to file_ref_put() for non-last reference)
Merging fscrypt-current/for-current (0af2f6be1b42 Linux 6.15-rc1)
Merging fsverity-current/for-current (0af2f6be1b42 Linux 6.15-rc1)
Merging btrfs-fixes/next-fixes (16ce647f8360 Merge branch 'misc-6.15' into next-fixes)
Merging vfs-fixes/fixes (00cdfdcfa080 hypfs_create_cpu_files(): add missing check for hypfs_mkdir() failure)
Merging erofs-fixes/fixes (f5ffef9881a7 erofs: remove duplicate code)
Merging nfsd-fixes/nfsd-fixes (a1d14d931bf7 nfsd: decrease sc_count directly if fail to queue dl_recall)
Merging v9fs-fixes/fixes/next (2014c95afece Linux 6.14-rc1)
Merging overlayfs-fixes/ovl-fixes (a6eb9a4a69cc ovl: remove unused forward declaration)
Merging bcachefs/for-next (60041107a57b bcachefs: Make various async objs visible in debugfs)
Merging fscrypt/for-next (c07d3aede2b2 fscrypt: add support for hardware-wrapped keys)
Merging btrfs/for-next (2e23dc44f920 Merge branch 'for-next-next-v6.15-20250415' into for-next-20250415)
CONFLICT (content): Merge conflict in fs/btrfs/file.c
Merging ceph/master (f452a2204614 ceph: Fix incorrect flush end position calculation)
Merging cifs/for-next (9c32cda43eb7 Linux 6.15-rc3)
Merging configfs/configfs-next (8ffd015db85f Linux 6.15-rc2)
Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros())
Merging dlm/next (03d2b62208a3 dlm: make tcp still work in multi-link env)
Merging erofs/dev (0f24e3c05afe erofs: enable 48-bit layout support)
Merging exfat/dev (7819f9549ec0 exfat: do not clear volume dirty flag during sync)
Merging exportfs/exportfs-next (adc218676eef Linux 6.12)
Merging ext3/for_next (209e834cd5e6 Pull FAN_PRE_ACCESS on directory fanotify event support)
Merging ext4/dev (94824ac9a8aa ext4: fix off-by-one error in do_split)
Merging f2fs/dev (42cb74a92ada f2fs: prevent kernel warning due to negative i_nlink from corrupted image)
Merging fsverity/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging fuse/for-next (0c58a97f919c fuse: remove tmp folio for writebacks and internal rb tree)
Merging gfs2/for-next (98d43c09ced8 gfs2: deallocate inodes in gfs2_create_inode)
Merging jfs/jfs-next (5dff41a86377 jfs: fix array-index-out-of-bounds read in add_missing_indices)
Merging ksmbd/ksmbd-for-next (9c32cda43eb7 Linux 6.15-rc3)
Merging nfs/linux-next (0af2f6be1b42 Linux 6.15-rc1)
Merging nfs-anna/linux-next (9084ed79ddaa lsm,nfs: fix memory leak of lsm_context)
Merging nfsd/nfsd-next (4462c4dbf465 MAINTAINERS: Update Neil Brown's email address)
Merging ntfs3/master (0af2f6be1b42 Linux 6.15-rc1)
Merging orangefs/for-next (121a83ce6fe6 orangefs: Bufmap deadcoding)
Merging overlayfs/overlayfs-next (aabe43431746 ovl: Use str_on_off() helper in ovl_show_options())
Merging ubifs/next (69146a8c893f ubi: ubi_get_ec_info: Fix compiling error 'cast specifies array type')
Merging v9fs/9p-next (4210030d8bc4 docs: fs/9p: Add missing "not" in cache documentation)
Merging v9fs-ericvh/ericvh/for-next (2014c95afece Linux 6.14-rc1)
Merging xfs/for-next (f0447f80aec8 xfs: remove duplicate Zoned Filesystems sections in admin-guide)
Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSSYSFSPATH)
Merging vfs-brauner/vfs.all (e3f181b2471f Merge branch 'vfs-6.16.iomap' into vfs.all)
Merging vfs/for-next (2e72b1e0aac2 Merge branch 'work.d_revalidate' into for-next)
Merging mm-hotfixes/mm-hotfixes-unstable (04c643e4ff75 mm/contig_alloc: fix alloc_contig_range when __GFP_COMP and order < MAX_ORDER)
Merging fs-current (1a14a8f9edce Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git)
Merging kbuild-current/fixes (80e54e84911a Linux 6.14-rc6)
Merging arc-current/for-curr (78d4f34e2115 Linux 6.13-rc3)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (f7edb07ad7c6 Fix mmu notifiers for range-based invalidates)
Merging arm-soc-fixes/arm/fixes (45d5fe1c53ba ARM: davinci: da850: fix selecting ARCH_DAVINCI_DA8XX)
Merging davinci-current/davinci/for-current (0af2f6be1b42 Linux 6.15-rc1)
Merging drivers-memory-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging sophgo-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging m68k-current/for-linus (c94cf023dce3 m68k: defconfig: Update defconfigs for v6.14-rc1)
Merging powerpc-fixes/fixes (b2accfe7ca5b powerpc/boot: Check for ld-option support)
Merging s390-fixes/fixes (8ffd015db85f Linux 6.15-rc2)
Merging net/main (4c8925cb9db1 net: phylink: fix suspend/resume with WoL enabled and link down)
Merging bpf/master (2fc7a47c0b0a selftests/bpf: Mitigate sockmap_ktls disconnect_after_delete failure)
Merging ipsec/master (e3fd05777685 xfrm: Fix UDP GRO handling for some corner cases)
Merging netfilter/main (eaa517b77e63 ethtool: cmis_cdb: Fix incorrect read / write length extension)
Merging ipvs/main (61f96e684edd Merge tag 'net-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging wireless/for-next (0937cb5f345c Revert "wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()")
Merging ath/for-current (0937cb5f345c Revert "wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()")
Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return)
Merging rdma-fixes/for-rc (ffc59e32c67e RDMA/bnxt_re: Remove unusable nq variable)
Merging sound-current/for-linus (f406005e162b ALSA: usb-audio: Add retry on -EPROTO from usb_set_interface())
Merging sound-asoc-fixes/for-linus (68715cb5c0e0 ASoC: Intel: sof_sdw: Add NULL check in asoc_sdw_rt_dmic_rtd_init())
Merging regmap-fixes/for-linus (6ea36a3e12c5 Merge remote-tracking branch 'regmap/for-6.14' into regmap-linus)
Merging regulator-fixes/for-linus (8ffd015db85f Linux 6.15-rc2)
Merging spi-fixes/for-linus (9c32cda43eb7 Linux 6.15-rc3)
Merging pci-current/for-linus (0747c136753e MAINTAINERS: Move Manivannan Sadhasivam as PCI Native host bridge and endpoint maintainer)
Merging driver-core.current/driver-core-linus (b9792abb76ae drivers/base/memory: Avoid overhead from for_each_present_section_nr())
Merging tty.current/tty-linus (e1ca3ff28ab1 serial: sifive: lock port in startup()/shutdown() callbacks)
Merging usb.current/usb-linus (9788792ad0a0 Merge tag 'usb-serial-6.15-rc3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-serial-fixes/usb-linus (4cc01410e1c1 USB: serial: simple: add OWON HDS200 series oscilloscope support)
Merging phy/fixes (9cf118aafd66 phy: rockchip-samsung-dcphy: Add missing assignment)
Merging staging.current/staging-linus (0af2f6be1b42 Linux 6.15-rc1)
Merging iio-fixes/fixes-togreg (609bc31eca06 iio: adis16201: Correct inclinometer channel resolution)
Merging counter-current/counter-current (0af2f6be1b42 Linux 6.15-rc1)
Merging char-misc.current/char-misc-linus (4d239f447f96 firmware: stratix10-svc: Add of_platform_default_populate())
Merging soundwire-fixes/fixes (fd15594ba7d5 soundwire: bus: Fix race on the creation of the IRQ domain)
Merging thunderbolt-fixes/fixes (9c32cda43eb7 Linux 6.15-rc3)
Merging input-current/for-linus (946661e3bef8 Merge branch 'next' into for-linus)
Merging crypto-current/master (aece1cf14674 Revert "crypto: testmgr - Add multibuffer acomp testing")
Merging vfio-fixes/for-linus (2bd42b03ab6b vfio/pci: Virtualize zero INTx PIN if no pdev->irq)
Merging kselftest-fixes/fixes (07be53cfa81a selftests/ftrace: Differentiate bash and dash in dynevent_limitations.tc)
Merging dmaengine-fixes/fixes (fca280992af8 dmaengine: ti: k3-udma: Add missing locking)
Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1)
Merging mtd-fixes/mtd/fixes (1c1fd374a2fe mtd: spinand: Fix build with gcc < 7.5)
Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range)
Merging v4l-dvb-fixes/fixes (d51adf038ebe media: cec: tda9950: add back i2c dependency)
Merging reset-fixes/reset/fixes (38fec10eb60d Linux 6.14)
Merging mips-fixes/mips-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging at91-fixes/at91-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging omap-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging kvm-fixes/master (9cf353943e2a KVM: x86: Do not use kvm_rip_read() unconditionally for KVM_PROFILING)
$ git reset --hard HEAD^
Merging next-20250417 version of kvm-fixes
Merging kvms390-fixes/master (d8dfda5af0be KVM: s390: pv: fix race when making a page secure)
Merging hwmon-fixes/hwmon (9c32cda43eb7 Linux 6.15-rc3)
Merging nvdimm-fixes/libnvdimm-fixes (265e98f72bac acpi: nfit: vmalloc-out-of-bounds Read in acpi_nfit_ctl)
Merging cxl-fixes/fixes (078d3ee7c162 cxl/core/regs.c: Skip Memory Space Enable check for RCD and RCH Ports)
Merging dma-mapping-fixes/dma-mapping-fixes (89461db349cc dma-coherent: Warn if OF reserved memory is beyond current coherent DMA mask)
Merging drivers-x86-fixes/fixes (4a8e04e2bdcb platform/x86: alienware-wmi-wmax: Fix uninitialized variable due to bad error handling)
Merging samsung-krzk-fixes/fixes (dd303e021996 soc: samsung: usi: prevent wrong bits inversion during unconfiguring)
Merging pinctrl-samsung-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging devicetree-fixes/dt/linus (d5f49921707c dt-bindings: soc: fsl: fsl,ls1028a-reset: Fix maintainer entry)
Merging dt-krzk-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging scsi-fixes/fixes (b0b7ee3b574a scsi: mpi3mr: Add level check to control event logging)
Merging drm-fixes/drm-fixes (0467145fab3b Merge tag 'drm-msm-fixes-2025-04-18' of https://gitlab.freedesktop.org/drm/msm into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (7e21ea8149a0 drm/i915/pxp: fix undefined reference to `intel_pxp_gsccs_is_ready_for_sessions')
Merging mmc-fixes/fixes (77183db6b8db mmc: renesas_sdhi: disable clocks if registering regulator failed)
Merging rtc-fixes/rtc-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging gnss-fixes/gnss-linus (0af2f6be1b42 Linux 6.15-rc1)
Merging hyperv-fixes/hyperv-fixes (261ffd53cc8e Drivers: hv: Fix bad pointer dereference in hv_get_partition_id)
Merging risc-v-fixes/fixes (615e705fc8c7 Merge tag 'riscv-fixes-6.15-rc3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/alexghiti/linux into fixes)
Merging riscv-dt-fixes/riscv-dt-fixes (1b133129ad6b riscv: dts: starfive: Fix a typo in StarFive JH7110 pin function definitions)
Merging riscv-soc-fixes/riscv-soc-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1)
Merging spdx/spdx-linus (0af2f6be1b42 Linux 6.15-rc1)
Merging gpio-brgl-fixes/gpio/for-current (9c32cda43eb7 Linux 6.15-rc3)
Merging gpio-intel-fixes/fixes (2014c95afece Linux 6.14-rc1)
Merging pinctrl-intel-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging auxdisplay-fixes/fixes (2014c95afece Linux 6.14-rc1)
Merging kunit-fixes/kunit-fixes (b26c1a85f3fc kunit: qemu_configs: SH: Respect kunit cmdline)
Merging memblock-fixes/fixes (ed471e198493 memblock tests: Fix mutex related build error)
Merging renesas-fixes/fixes (379c590113ce ARM: shmobile: smp: Enforce shmobile_smp_* alignment)
Merging perf-current/perf-tools (2b7070291733 perf tools: Remove evsel__handle_error_quirks())
Merging efi-fixes/urgent (11092db5b573 efivarfs: fix NULL dereference on resume)
Merging battery-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging iommufd-fixes/for-rc (0af2f6be1b42 Linux 6.15-rc1)
Merging rust-fixes/rust-fixes (9d7a0577c9db gcc-15: disable '-Wunterminated-string-initialization' entirely for now)
Merging w1-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging pmdomain-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging i2c-host-fixes/i2c/i2c-host-fixes (424eafe65647 i2c: cros-ec-tunnel: defer probe if parent EC is not present)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging pwrseq-fixes/pwrseq/for-current (0af2f6be1b42 Linux 6.15-rc1)
Merging thead-dt-fixes/thead-dt-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging ftrace-fixes/ftrace/fixes (2fa6a01345b5 tracing: Fix memory leak when reading set_event file)
Merging ring-buffer-fixes/ring-buffer/fixes (e4d4b8670c44 ring-buffer: Use flush_kernel_vmap_range() over flush_dcache_folio())
Merging trace-fixes/trace/fixes (d481ee35247d tracing: selftests: Add testing a user string to filters)
Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tracefs mount options test)
Merging spacemit-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging tip-fixes/tip/urgent (c725f1f0943e Merge branch into tip/master: 'x86/urgent')
Merging slab-fixes/slab/for-next-fixes (e33b7ae3d802 mm, slab: clean up slab->obj_exts always)
Merging drm-msm-fixes/msm-fixes (9d78f0250322 drm/msm/a6xx+: Don't let IB_SIZE overflow)
Merging uml-fixes/fixes (96178631c3f5 um: convert irq_lock to raw spinlock)
Merging fwctl-fixes/for-rc (c92ae5d4f53e fwctl: Fix repeated device word in log message)
Merging drm-misc-fixes/for-linux-next-fixes (095c8e61f4c7 drm: panel: jd9365da: fix reset signal polarity in unprepare)
Merging linus/for-next (ffd294d346d1 Linux 6.13)
Merging mm-stable/mm-stable (fc96b232f8e7 Merge tag 'pci-v6.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci)
Merging mm-nonmm-stable/mm-nonmm-stable (fc96b232f8e7 Merge tag 'pci-v6.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci)
Merging mm-unstable/mm-unstable (2c01d9f3c611 Update Christoph's Email address and make it consistent)
CONFLICT (content): Merge conflict in arch/x86/kernel/e820.c
Merging mm-nonmm-unstable/mm-nonmm-unstable (3b9600729d2d watchdog: fix watchdog may detect false positive of softlockup)
Merging kbuild/for-next (a7c699d090a1 kbuild: rpm-pkg: build a debuginfo RPM)
Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list)
Merging perf/perf-tools-next (1741189d843a perf ui browser hists: Set actions->thread before calling do_zoom_thread())
Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11)
Merging dma-mapping/dma-mapping-for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging asm-generic/master (47a60391ae0e rwonce: fix crash by removing READ_ONCE() for unaligned read)
Merging alpha/alpha-next (1523226edda5 alpha: Use str_yes_no() helper in pci_dac_dma_supported())
Merging arm/for-next (96e0b3558830 ARM: 9447/1: arm/memremap: fix arch_memremap_can_ram_remap())
Merging arm64/for-next/core (0af2f6be1b42 Linux 6.15-rc1)
Merging arm-perf/for-next/perf (70cbcb2850ec perf: Do not enable by default during compile testing)
Merging arm-soc/for-next (1990c01f0bcc Merge branch 'cznic/platform' into for-next)
Merging amlogic/for-next (8f5f9fc2ee8c Merge branch 'v6.16/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (7ebc140f5ef3 Merge branch 'asahi-soc/fixes' into asahi-soc/for-next)
Merging aspeed/for-next (bf8f48263c0e Merge remote-tracking branches 'aspeed/dt', 'aspeed/drivers', 'aspeed/fixes' and 'nuvoton/dt' into for-next)
Merging at91/at91-next (eec6ff604b20 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (87b8fa3195af Merge branch 'devicetree-arm64/next' into next)
Merging davinci/davinci/for-next (78e6b545e558 ARM: davinci: remove support for da830)
Merging drivers-memory/for-next (eda787a933ad Merge branch 'mem-ctrl-next' into for-next)
Merging imx-mxs/for-next (468d481b6ba2 Merge branch 'imx/dt64' into for-next)
Merging mediatek/for-next (baedd9376ff6 Merge branch 'v6.15-next/dts64' into for-next)
Merging mvebu/for-next (e85dce9d1b78 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (4349ce7c41af Merge branch 'omap-for-v6.16/drivers' into tmp/omap-next-20250410.174249)
Merging qcom/for-next (39155a896925 Merge branches 'arm32-for-6.16', 'arm64-defconfig-for-6.16', 'arm64-for-6.16' and 'clk-for-6.16' into for-next)
Merging renesas/next (512c05ad0b88 Merge branches 'renesas-dts-for-v6.16' and 'renesas-r9a09g077-dt-binding-defs' into renesas-next)
Merging reset/reset/next (4a65326311ab reset: thead: Add TH1520 reset controller driver)
Merging rockchip/for-next (f92b0e5479aa Merge branch 'v6.16-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (430c1c7fbfcc Merge branch 'next/drivers' into for-next)
Merging scmi/for-linux-next (d520c7f6560e Merge branch 'for-next/scmi/updates', tags 'juno-fix-6.15', 'ffa-fix-6.15' and 'scmi-fixes-6.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging spacemit/for-next (279d51ad9f6d riscv: dts: spacemit: Add clock tree for SpacemiT K1)
Merging stm32/stm32-next (65954899a157 arm64: dts: st: add stm32mp215f-dk board support)
Merging sunxi/sunxi/for-next (69714722df19 arm64: dts: allwinner: h700: Add hp-det-gpios for Anbernic RG35XX)
Merging tee/next (a7562ff02879 Merge branch 'optee_for_v6.14' into next)
Merging tegra/for-next (4e16110559c3 Merge branch for-6.15/arm64/dt into for-next)
Merging thead-dt/thead-dt-for-next (2bae46e3de2a riscv: dts: thead: Introduce power domain nodes with aon firmware)
Merging ti/ti-next (4ca9c20e98f6 Merge branches 'ti-k3-dts-next' and 'ti-drivers-soc-next' into ti-next)
Merging xilinx/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging clk/clk-next (0af2f6be1b42 Linux 6.15-rc1)
Merging clk-imx/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging clk-renesas/renesas-clk (93f287813626 clk: renesas: r9a09g057: Add clock and reset entries for USB2)
Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working)
Merging loongarch/loongarch-next (17ba839c3c6c LoongArch: Update Loongson-3 default config file)
Merging m68k/for-next (c94cf023dce3 m68k: defconfig: Update defconfigs for v6.14-rc1)
Merging m68knommu/for-next (80d2737ea705 m68k: coldfire: gpio: use new line value setter callbacks)
Merging microblaze/next (920354d7818b microblaze: Use of_property_present() for non-boolean properties)
Merging mips/mips-next (0af2f6be1b42 Linux 6.15-rc1)
Merging openrisc/for-next (66ffd2f31611 Documentation: openrisc: Update toolchain binaries URL)
Merging parisc-hd/for-next (38fec10eb60d Linux 6.14)
Merging powerpc/next (8ffd015db85f Linux 6.15-rc2)
Merging risc-v/for-next (bafa451a96d0 riscv: defconfig: Remove EXPERT)
Merging riscv-dt/riscv-dt-for-next (38818f7c9c17 riscv: dts: starfive: jh7110-pine64-star64: enable USB 3.0 port)
Merging riscv-soc/riscv-soc-for-next (071afdd47346 Merge branches 'riscv-cache-for-next' and 'riscv-config-for-next' into riscv-soc-for-next)
Merging s390/for-next (e7ae507c024c s390: Remove optional third argument of strscpy() if possible)
Merging sh/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging sparc/for-next (2cec2c4dc90c sparc/irq: Remove unneeded if check in sun4v_cookie_only_virqs())
Merging uml/next (33c9da5dfb18 um: Rewrite the sigio workaround based on epoll and tgkill)
Merging xtensa/xtensa-for-next (3d6d238851df arch: xtensa: defconfig: Drop obsolete CONFIG_NET_CLS_TCINDEX)
Merging fs-next (28b48f78f88d Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git)
Merging printk/for-next (9827cd0d6498 Merge branch 'for-6.15-printf-attribute' into for-next)
Merging pci/next (ab86b3b79139 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (8ffd015db85f Linux 6.15-rc2)
Merging hid/for-next (160957abbf99 Merge branch 'for-6.15/intel-ish' into for-next)
Merging i2c/i2c/for-next (02cfd9ef8917 Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (7cfa6946c589 i2c: omap: fix deprecated of_property_read_bool() use)
Merging i3c/i3c/next (0af2f6be1b42 Linux 6.15-rc1)
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (79fe57966578 hwmon: (pmbus/lt3074): add support for lt3074)
Merging jc_docs/docs-next (9d9bec3d90e3 docs: sphinx: kerneldoc: Use python class if available)
Merging v4l-dvb/next (14423fc3a4a2 media: venus: pm_helpers: add compatibility for dev_pm_genpd_set_hwmode on V4)
Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init())
Merging pm/linux-next (c200734c6a49 Merge branch 'pm-sleep' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (a374f28700ab cpufreq: fix compile-test defaults)
Merging cpupower/cpupower (0af2f6be1b42 Linux 6.15-rc1)
Merging devfreq/devfreq-next (f3253b23535f PM / devfreq: exynos: remove unused function parameter)
Merging pmdomain/next (08c42b51c804 pmdomain: core: Reset genpd->states to avoid freeing invalid data)
Merging opp/opp/linux-next (0af2f6be1b42 Linux 6.15-rc1)
Merging thermal/thermal/linux-next (1b4ef46fd666 thermal/drivers/qcom-spmi-temp-alarm: Drop unused driver data)
Merging rdma/for-next (d85080df12f3 RDMA/rxe: Remove unused rxe_run_task)
CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_mr.c
CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_resp.c
Merging net-next/main (0e0a7e3719bc xdp: create locked/unlocked instances of xdp redirect target setters)
Merging bpf-next/for-next (b0feb30ab412 Merge branch 'bpf-next/master' into for-next)
Merging ipsec-next/master (86e530c84c97 Merge branch 'Update offload configuration with SA')
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
Merging mlx5-next/mlx5-next (f550694e88b7 net/mlx5: Add IFC bits for PPCNT recovery counters group)
Merging netfilter-next/main (61f96e684edd Merge tag 'net-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (61f96e684edd Merge tag 'net-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (e0af21b30c82 Bluetooth: btmtksdio: Do close if SDIO card removed without close)
Merging wireless-next/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging ath-next/for-next (75f90ba47b2c wifi: wcn36xx: Don't use %pK through printk)
Merging wpan-next/master (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit())
Merging wpan-staging/staging (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit())
Merging mtd/mtd/next (0af2f6be1b42 Linux 6.15-rc1)
Merging nand/nand/next (b0e63a0847ee dt-bindings: mtd: gpmi-nand: Add compatible string for i.MX8 chips)
Merging spi-nor/spi-nor/next (eec373688d91 mtd: spi-nor: drop unused <linux/of_platform.h>)
Merging crypto/master (ed4d1c61aa7b crypto: padlock-sha - Use API partial block handling)
Merging drm/drm-next (b60301774a8f Merge tag 'drm-intel-next-2025-04-11' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next)
Merging drm-exynos/for-linux-next (81a50378559b drm/exynos: Remove unnecessary checking)
Merging drm-misc/for-linux-next (b848cd418aeb drm/bridge: lt9611uxc: Fix an error handling path in lt9611uxc_probe())
Merging amdgpu/drm-next (127e612bf167 drm/amdgpu: update fence ptr with context:seqno)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
Merging drm-intel/for-linux-next (246b259f1dbd drm/i915/pch: abstract fake PCH detection better)
  b484c1e225a6 ("drm/i915/pxp: fix undefined reference to `intel_pxp_gsccs_is_ready_for_sessions'")
Merging drm-msm/msm-next (83ee6d2ec52f dt-bindings: display/msm: dsi-controller-main: Add missing minItems)
Merging drm-msm-lumag/msm-next-lumag (83ee6d2ec52f dt-bindings: display/msm: dsi-controller-main: Add missing minItems)
Merging drm-nova/nova-next (0c848b3adb45 samples: rust: convert PCI rust sample driver to use try_access_with())
Merging drm-xe/drm-xe-next (fa597710be6e drm/xe/guc: Cache DSS info when creating capture register list)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_pc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_pci.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_survivability_mode.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_survivability_mode.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_wa_oob.rules
Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset support)
Merging fbdev/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging regmap/for-next (2385ba6d1dc4 Merge branch 'regmap-linus' into regmap-next)
Merging sound/for-next (171bb5123fbc ALSA: usb-audio: Add Pioneer DJ DJM-V10 support)
Merging ieee1394/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging sound-asoc/for-next (bbd18dbc7ef7 Merge remote-tracking branch 'asoc/for-6.16' into asoc-next)
Merging modules/modules-next (1b7b9e30cf33 module: Make .static_call_sites read-only after init)
Merging input/next (4d395cb071a3 Input: goodix_berlin - add support for Berlin-A series)
Merging block/for-next (98344f56952e Merge branch 'for-6.16/block' into for-next)
Merging device-mapper/for-next (a644cfb7a819 dm: lock limits when reading them)
Merging libata/for-next (ecd9ecc75d15 ata: libata-sata: Use BIT() macro to convert tag to bit field)
Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros)
Merging mmc/next (1be38f81251f mmc: mtk-sd: Add condition to enable 'single' burst type)
Merging mfd/for-mfd-next (d0eceba4d133 dt-bindings: mfd: syscon: Add microchip,sama7d65-secumod)
Merging backlight/for-backlight-next (e12d3e1624a0 backlight: pm8941: Add NULL check in wled_configure())
Merging battery/for-next (51212ce95354 power: supply: gpio-charger: Fix wakeup source leaks on device unbind)
Merging regulator/for-next (14daefd22065 Merge remote-tracking branch 'regulator/for-6.16' into regulator-next)
Merging security/next (74e5b13a1b0f lsm: Move security_netlink_send to under CONFIG_SECURITY_NETWORK)
Merging apparmor/apparmor-next (3e45553acb14 apparmor: Remove unused variable 'sock' in __file_sock_perm())
Merging integrity/next-integrity (976e5b974fef ima: process_measurement() needlessly takes inode_lock() on MAY_READ)
Merging selinux/next (05f1a939225e selinux: fix the kdoc header for task_avdcache_update)
Merging smack/next (a158a937d864 smack: recognize ipv4 CIPSO w/o categories)
Merging tomoyo/master (834a4a689699 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma)
Merging tpmdd/next (ebaf911ba6e1 char: tpm: tpm-buf: Add sanity check fallback in read helpers)
Merging watchdog/master (9bc64d338b0b watchdog: sunxi_wdt: Add support for Allwinner A523)
Merging iommu/next (e52e6500a343 Merge branches 'fixes', 'mediatek', 's390' and 'core' into next)
Merging audit/next (654d61b8e0e2 audit: record AUDIT_ANOM_* events regardless of presence of rules)
Merging devicetree/for-next (243787ad694a of: Build warn for missing fn() in _OF_DECLARE)
Merging dt-krzk/for-next (62db22c2af6c Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (1ec12fd31ecc mailbox: Remove unneeded semicolon)
Merging spi/for-next (41a5a54f2017 Merge remote-tracking branch 'spi/for-6.16' into spi-next)
Merging tip/master (7ab869c799fc Merge branch into tip/master: 'x86/sev')
CONFLICT (content): Merge conflict in arch/x86/Kconfig.assembler
$ git reset --hard HEAD^
Merging next-20250414 version of tip
CONFLICT (content): Merge conflict in arch/x86/Kconfig.assembler
CONFLICT (content): Merge conflict in arch/x86/events/intel/core.c
CONFLICT (content): Merge conflict in arch/x86/kernel/e820.c
[master 99554718252d] next-20250414/tip
Merging clockevents/timers/drivers/next (0f920690a82c dt-bindings: timer: Add SiFive CLINT2)
Merging edac/edac-for-next (f53deda1a997 Merge branch 'edac-drivers' into edac-for-next)
Merging ftrace/for-next (d85852264728 Merge tools/for-next)
Merging rcu/next (7fca2a80b81a Merge branches 'rcu/misc-for-6.16', 'rcu/seq-counters-for-6.16' and 'rcu/torture-for-6.16' into rcu/for-next)
Merging paulmck/non-rcu/next (739a99afe89b Merge branches 'lkmm.2025.04.22a' and 'ratelimit.2025.04.22a' into HEAD)
Merging kvm/next (2ae06ae44beb Merge branch 'kvm-fixes-6.15-rc3' into HEAD)
CONFLICT (content): Merge conflict in arch/x86/kvm/vmx/vmx.c
$ git reset --hard HEAD^
Merging next-20250417 version of kvm
CONFLICT (content): Merge conflict in arch/x86/kvm/vmx/vmx.c
[master 114207fcb8f0] next-20250417/kvm
Merging kvm-arm/next (369c0122682c Merge branch 'kvm-arm64/pmu-fixes' into kvmarm/next)
Merging kvms390/next (0c7fbae5bc78 KVM: s390: Don't use %pK through debug printing)
Merging kvm-ppc/topic/ppc-kvm (fac04efc5c79 Linux 6.13-rc2)
Merging kvm-riscv/riscv_kvm_next (b3f263a98d30 RISC-V: KVM: Optimize comments in kvm_riscv_vcpu_isa_disable_allowed)
Merging kvm-x86/next (c9ea48bb6ee6 Merge branch 'xen')
Merging xen-tip/linux-next (715ad3e0ec2b xen: fix multicall debug feature)
Merging percpu/for-next (87d6aab2389e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
Merging workqueues/for-next (2762750ac5c6 workqueue: Better document teardown for delayed_work)
$ git reset --hard HEAD^
Merging next-20250414 version of workqueues
Merging sched-ext/for-next (ac47c272b266 Merge branch 'for-6.15-fixes' into for-6.16)
Merging drivers-x86/for-next (981527828c30 platform/mellanox: Rename field to improve code readability)
CONFLICT (content): Merge conflict in drivers/platform/x86/dell/alienware-wmi-wmax.c
Merging chrome-platform/for-next (31d3bd592df5 platform/chrome: cros_kbd_led_backlight: Fix build dependencies)
Merging chrome-platform-firmware/for-firmware-next (0af2f6be1b42 Linux 6.15-rc1)
Merging hsi/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging leds-lj/for-leds-next (cd704688cb84 leds: lp8860: Disable GPIO with devm action)
Merging ipmi/for-next (37631eee2063 ipmi:si: Move SI type information into an info structure)
Merging driver-core/driver-core-next (8117b017f382 Merge tag 'topic/device-context-2025-04-17' into driver-core-next)
Merging usb/usb-next (f41f7b3d9daf MAINTAINERS: Update Intel LJCA maintainer)
CONFLICT (content): Merge conflict in drivers/usb/chipidea/ci_hdrc_imx.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci.h
Merging thunderbolt/next (4fd7a1f0f7f2 usb: typec: Connect Type-C port with associated USB4 port)
Merging usb-serial/usb-next (0af2f6be1b42 Linux 6.15-rc1)
Merging tty/tty-next (926040da6064 serial: 8250_of: manage bus clock in suspend/resume)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml
Merging char-misc/char-misc-next (a7924f4c489b comedi: ni_atmio: avoid warning for unused device_ids[] table)
Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging coresight/next (5442d22da7db Coresight: Fix a NULL vs IS_ERR() bug in probe)
Merging fastrpc/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging fpga/for-next (e19890a0088b fpga: versal: remove incorrect of_match_ptr annotation)
Merging icc/icc-next (be73df376a97 Merge branch 'icc-sa8775p' into icc-next)
Merging iio/togreg (b475195fecc7 staging: iio: ad5933: Correct settling cycles encoding per datasheet)
Merging phy-next/next (9d0ec51d7c22 phy: rockchip: samsung-hdptx: Add high color depth management)
Merging soundwire/next (0af2f6be1b42 Linux 6.15-rc1)
Merging extcon/extcon-next (7041ed0dde83 extcon: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging gnss/gnss-next (0af2f6be1b42 Linux 6.15-rc1)
Merging vfio/next (860be250fc32 vfio/pci: Handle INTx IRQ_NOTCONNECTED)
Merging w1/for-next (a9b3ecc7bcf6 w1: Avoid -Wflex-array-member-not-at-end warnings)
Merging spmi/spmi-next (a35fc095fc52 spmi: add a spmi driver for Apple SoC)
Merging staging/staging-next (4960bce324fe staging: gpib: Add return value to request_control)
Merging counter-next/counter-next (0af2f6be1b42 Linux 6.15-rc1)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (59b723cd2adb Linux 6.12-rc6)
Merging dmaengine/next (5d099706449d dmaengine: Add Arm DMA-350 driver)
Merging cgroup/for-next (68d22e7da593 Merge branch 'for-6.16' into for-next)
Merging scsi/for-next (75e7dd94417f Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (37c15b72815b Merge patch series "scsi: qedi deadcoding")
Merging vhost/linux-next (1f69fe75a328 vhost-scsi: log event queue write descriptors)
Merging rpmsg/for-next (afc760ba751c Merge branch 'rproc-next' into for-next)
Merging gpio-brgl/gpio/for-next (29f4c4da74ac gpio: Restrict GPIO_ICH to compile testing with HAS_IOPORT)
Merging gpio-intel/for-next (a02af05f41c7 Merge patch series "gpiolib: acpi: Fix missing info filling")
Merging pinctrl/for-next (150977480774 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging pinctrl-renesas/renesas-pinctrl (abcdeb4e299a pinctrl: renesas: rza2: Fix missing of_node_put() call)
Merging pinctrl-samsung/for-next (a30692b4f81b pinctrl: samsung: Add filter selection support for alive bank on gs101)
Merging pwm/pwm/for-next (061f087f5d0b pwm: Add support for RZ/G2L GPT)
Merging ktest/for-next (5a1bed232781 ktest: Fix Test Failures Due to Missing LOG_FILE Directories)
Merging kselftest/next (0af2f6be1b42 Linux 6.15-rc1)
Merging kunit/test (0af2f6be1b42 Linux 6.15-rc1)
Merging kunit-next/kunit (1d31d536871f kunit: qemu_configs: Disable faulting tests on 32-bit SPARC)
Merging livepatching/for-next (a8e905a819fd Merge branch 'for-6.15/ftrace-test' into for-next)
Merging rtc/rtc-next (d37058674646 rtc: da9063: simplify irq management)
Merging nvdimm/libnvdimm-for-next (ef1d3455bbc1 libnvdimm/labels: Fix divide error in nd_label_data_init())
Merging at24/at24/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging ntb/ntb-next (0cadf92e93d4 NTB/msi: Remove unused functions)
Merging seccomp/for-next/seccomp (8ffd015db85f Linux 6.15-rc2)
Merging slimbus/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging nvmem/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends)
Merging hyperv/hyperv-next (628cc040b3a2 x86/hyperv: fix an indentation issue in mshyperv.h)
Merging auxdisplay/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging kgdb/kgdb/for-next (afdbe49276ac kdb: Remove optional size arguments from strscpy() calls)
Merging hmm/hmm (c92ae5d4f53e fwctl: Fix repeated device word in log message)
Merging cfi/cfi/next (0af2f6be1b42 Linux 6.15-rc1)
Merging mhi/mhi-next (b60a0538cd7f bus: mhi: host: Address conflict between power_up and syserr)
Merging memblock/for-next (3b394dff15e1 memblock tests: add test for memblock_set_node)
Merging cxl/next (73c117c17b56 cxl: core/region - ignore interleave granularity when ways=1)
Merging zstd/zstd-next (65d1f5507ed2 zstd: Import upstream v1.5.7)
Merging efi/next (0dc1754e16b4 efi/libstub: Avoid legacy decompressor zlib/zstd wrappers)
Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree)
Merging slab/slab/for-next (1cabeb548de6 Merge branch 'slab/for-6.16/testing' into slab/for-next)
Merging random/master (602c988b7827 prandom: remove next_pseudo_random32)
Merging landlock/next (47ce2af848b7 landlock: Update log documentation)
Merging rust/rust-next (9d7a0577c9db gcc-15: disable '-Wunterminated-string-initialization' entirely for now)
Merging rust-alloc/alloc-next (85f8e98dbb01 rust: alloc: allow coercion from `Box<T>` to `Box<dyn U>` if T implements U)
Merging rust-pin-init/pin-init-next (39051adb0704 rust: pin-init: examples: use `allow` instead of `expect`)
Merging rust-timekeeping/timekeeping-next (8ffd015db85f Linux 6.15-rc2)
Merging sysctl/sysctl-next (23b8bacf1547 sysctl: Close test ctl_headers with a for loop)
Merging execve/for-next/execve (8ffd015db85f Linux 6.15-rc2)
Merging bitmap/bitmap-for-next (1f11411b56ea bitfield: Add FIELD_MODIFY() helper)
Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro)
Merging kspp/for-next/kspp (f4e2f3f28908 Merge branch 'for-linus/hardening' into for-next/kspp)
Merging nolibc/nolibc (0af2f6be1b42 Linux 6.15-rc1)
Merging iommufd/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging turbostat/next (447c98c1ca4a tools/power turbostat: Add idle governor statistics reporting)
CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.8
CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.c
Merging pwrseq/pwrseq/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging capabilities-next/caps-next (4ae89b1fe7c2 capability: Remove unused has_capability)
Merging ipe/next (925df32541da ipe: add errno field to IPE policy load auditing)
Merging kcsan/next (9d89551994a4 Linux 6.13-rc6)
Merging crc/crc-next (1ec3d4ff5c77 s390/crc32: Remove no-op module init and exit functions)
Merging fwctl/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function name to match code)

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ