]>
www.infradead.org Git - users/willy/pagecache.git/log
Matthew Wilcox (Oracle) [Fri, 14 Mar 2025 04:33:29 +0000 (00:33 -0400)]
mpage: Use writeback_iter() instead of write_cache_pages()
Using the iterator directly adds a little type safety, converts
an indirect call into a direct call and may allow the compiler
to inline __mpage_writepage() into mpage_writepages().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Matthew Wilcox (Oracle) [Fri, 7 Mar 2025 06:07:46 +0000 (01:07 -0500)]
fs: Remove aops->writepage
All callers and implementations are now removed, so remove the operation
and update the documentation to match.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Matthew Wilcox (Oracle) [Fri, 7 Mar 2025 05:52:22 +0000 (00:52 -0500)]
mm: Remove swap_writepage() and shmem_writepage()
Call swap_writeout() and shmem_writeout() from pageout() instead.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Matthew Wilcox (Oracle) [Mon, 17 Mar 2025 22:25:33 +0000 (18:25 -0400)]
ttm: Call shmem_writeout() from ttm_backup_backup_page()
The ->writepage operation is being removed. Since this function
exclusively deals with shmem folios, we can call shmem_writeout()
to write it.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Matthew Wilcox (Oracle) [Fri, 7 Mar 2025 05:38:35 +0000 (00:38 -0500)]
i915: Use writeback_iter()
Convert from an inefficient loop to the standard writeback iterator.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Matthew Wilcox (Oracle) [Fri, 7 Mar 2025 04:55:42 +0000 (23:55 -0500)]
shmem: Add shmem_writeout()
This will be the replacement for shmem_writepage().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Matthew Wilcox (Oracle) [Fri, 7 Mar 2025 04:43:13 +0000 (23:43 -0500)]
writeback: Remove writeback_use_writepage()
The ->writepage operation is going away. Remove this alternative to
calling ->writepages.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Matthew Wilcox (Oracle) [Fri, 7 Mar 2025 04:38:29 +0000 (23:38 -0500)]
migrate: Remove call to ->writepage
The writepage callback is going away; filesystems must implement
migrate_folio or else dirty folios will not be migratable.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Matthew Wilcox (Oracle) [Thu, 19 Dec 2024 22:57:46 +0000 (22:57 +0000)]
vboxsf: Convert to writepages
If we add a migrate_folio operation, we can convert the writepage
operation to writepages. Further, this lets us optimise by using
the same write handle for multiple folios. The large folio support here
is illusory; we would need to kmap each page in turn for proper support.
But we do remove a few hidden calls to compound_head().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Stephen Rothwell [Mon, 17 Mar 2025 12:58:07 +0000 (23:58 +1100)]
Add linux-next specific files for
20250317
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Stephen Rothwell [Mon, 17 Mar 2025 12:34:19 +0000 (23:34 +1100)]
Revert "pidfs: ensure that PIDFS_INFO_EXIT is available"
This reverts commit
b0f4119d8b2a680c8cd019f41c64e8b5444c6b83 .
Stephen Rothwell [Mon, 17 Mar 2025 11:23:12 +0000 (22:23 +1100)]
Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 11:23:08 +0000 (22:23 +1100)]
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git
Stephen Rothwell [Mon, 17 Mar 2025 11:23:03 +0000 (22:23 +1100)]
Merge branch 'caps-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 11:22:59 +0000 (22:22 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 11:22:52 +0000 (22:22 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git
Stephen Rothwell [Mon, 17 Mar 2025 11:22:03 +0000 (22:22 +1100)]
Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 11:21:56 +0000 (22:21 +1100)]
Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 11:21:52 +0000 (22:21 +1100)]
Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 11:21:48 +0000 (22:21 +1100)]
Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git
# Conflicts:
# include/linux/mm.h
# kernel/sysctl.c
# mm/filemap.c
Stephen Rothwell [Mon, 17 Mar 2025 11:21:42 +0000 (22:21 +1100)]
Merge branch 'hrtimer-next' of https://github.com/Rust-for-Linux/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 10:55:50 +0000 (21:55 +1100)]
next-
20250314 /rust
# Conflicts:
# drivers/gpu/drm/drm_panic_qr.rs
Stephen Rothwell [Mon, 17 Mar 2025 09:22:30 +0000 (20:22 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 09:22:26 +0000 (20:22 +1100)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git
Stephen Rothwell [Mon, 17 Mar 2025 09:22:23 +0000 (20:22 +1100)]
Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
# Conflicts:
# kernel/rcu/tiny.c
Stephen Rothwell [Mon, 17 Mar 2025 09:22:18 +0000 (20:22 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
Stephen Rothwell [Mon, 17 Mar 2025 09:22:14 +0000 (20:22 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git
Stephen Rothwell [Mon, 17 Mar 2025 08:57:18 +0000 (19:57 +1100)]
Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
Stephen Rothwell [Mon, 17 Mar 2025 08:57:14 +0000 (19:57 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git
Stephen Rothwell [Mon, 17 Mar 2025 08:57:10 +0000 (19:57 +1100)]
Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 08:57:06 +0000 (19:57 +1100)]
Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git
Stephen Rothwell [Mon, 17 Mar 2025 08:56:59 +0000 (19:56 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git
Stephen Rothwell [Mon, 17 Mar 2025 08:56:55 +0000 (19:56 +1100)]
Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 08:56:51 +0000 (19:56 +1100)]
Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git
Stephen Rothwell [Mon, 17 Mar 2025 08:56:41 +0000 (19:56 +1100)]
Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
Stephen Rothwell [Mon, 17 Mar 2025 08:56:38 +0000 (19:56 +1100)]
Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 08:56:34 +0000 (19:56 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
Stephen Rothwell [Mon, 17 Mar 2025 08:35:09 +0000 (19:35 +1100)]
Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
# Conflicts:
# lib/Makefile
Stephen Rothwell [Mon, 17 Mar 2025 08:31:40 +0000 (19:31 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
Stephen Rothwell [Mon, 17 Mar 2025 08:31:37 +0000 (19:31 +1100)]
Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 08:28:59 +0000 (19:28 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
Stephen Rothwell [Mon, 17 Mar 2025 08:07:05 +0000 (19:07 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
Stephen Rothwell [Mon, 17 Mar 2025 08:07:02 +0000 (19:07 +1100)]
Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 07:43:12 +0000 (18:43 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 07:43:10 +0000 (18:43 +1100)]
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
Stephen Rothwell [Mon, 17 Mar 2025 07:43:07 +0000 (18:43 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
Stephen Rothwell [Mon, 17 Mar 2025 07:43:05 +0000 (18:43 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
# Conflicts:
# arch/arm64/boot/dts/rockchip/rk3576.dtsi
# drivers/scsi/scsi_debug.c
Stephen Rothwell [Mon, 17 Mar 2025 07:43:01 +0000 (18:43 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
Stephen Rothwell [Mon, 17 Mar 2025 07:42:59 +0000 (18:42 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
# Conflicts:
# Documentation/devicetree/bindings/misc/atmel-ssc.txt
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:29 +0000 (13:40 +0100)]
gpio: da9055: use new line value setter callbacks
struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-15-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:28 +0000 (13:40 +0100)]
gpio: da9052: use new line value setter callbacks
struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-14-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:27 +0000 (13:40 +0100)]
gpio: cs5535: use new line value setter callbacks
struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-13-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:26 +0000 (13:40 +0100)]
gpio: crystalcove: use new line value setter callbacks
struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-12-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:25 +0000 (13:40 +0100)]
gpio: cros-ec: use new line value setter callbacks
struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.
Reviewed-by: Tzung-Bi Shih <tzungbi@kernel.org>
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-11-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:24 +0000 (13:40 +0100)]
gpio: creg-snps: use new line value setter callbacks
struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-10-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:23 +0000 (13:40 +0100)]
gpio: cgbc: use new line value setter callbacks
struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-9-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:22 +0000 (13:40 +0100)]
gpio: bt8xx: use new line value setter callbacks
struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-8-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:21 +0000 (13:40 +0100)]
gpio: bt8xx: use lock guards
Reduce the code complexity by using automatic lock guards with the
spinlock.
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-7-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:20 +0000 (13:40 +0100)]
gpio: bt8xx: allow to build the module with COMPILE_TEST=y
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-6-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:19 +0000 (13:40 +0100)]
gpio: bd9571mwv: use new line value setter callbacks
struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.
Reviewed-by: Matti Vaittinen <mazziesaccount@gmail.com>
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-5-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:18 +0000 (13:40 +0100)]
gpio:
bd71828 : use new line value setter callbacks
struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.
Reviewed-by: Matti Vaittinen <mazziesaccount@gmail.com>
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-4-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:17 +0000 (13:40 +0100)]
gpio:
bd71815 : use new line value setter callbacks
struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.
Reviewed-by: Matti Vaittinen <mazziesaccount@gmail.com>
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-3-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:16 +0000 (13:40 +0100)]
gpio: bcm-kona: use new line value setter callbacks
struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-2-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 10 Mar 2025 12:40:15 +0000 (13:40 +0100)]
gpio: bcm-kona: use lock guards
Reduce the code complexity by using automatic lock guards with the raw
spinlock.
Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-1-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Bartosz Golaszewski [Mon, 17 Mar 2025 07:27:10 +0000 (08:27 +0100)]
Merge tag 'v6.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into gpio/for-next
Linux 6.14-rc7
Stephen Rothwell [Mon, 17 Mar 2025 07:18:09 +0000 (18:18 +1100)]
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
Stephen Rothwell [Mon, 17 Mar 2025 07:18:07 +0000 (18:18 +1100)]
Merge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
Stephen Rothwell [Mon, 17 Mar 2025 07:18:04 +0000 (18:18 +1100)]
Merge branch 'next' of git://github.com/awilliam/linux-vfio.git
Stephen Rothwell [Mon, 17 Mar 2025 07:18:01 +0000 (18:18 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git
Stephen Rothwell [Mon, 17 Mar 2025 07:17:59 +0000 (18:17 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
Stephen Rothwell [Mon, 17 Mar 2025 07:17:55 +0000 (18:17 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 07:17:53 +0000 (18:17 +1100)]
Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
# Conflicts:
# drivers/regulator/dummy.c
Stephen Rothwell [Mon, 17 Mar 2025 07:08:10 +0000 (18:08 +1100)]
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
Stephen Rothwell [Mon, 17 Mar 2025 07:08:08 +0000 (18:08 +1100)]
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
Stephen Rothwell [Mon, 17 Mar 2025 07:08:06 +0000 (18:08 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
Stephen Rothwell [Mon, 17 Mar 2025 07:08:02 +0000 (18:08 +1100)]
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Stephen Rothwell [Mon, 17 Mar 2025 07:07:58 +0000 (18:07 +1100)]
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
Stephen Rothwell [Mon, 17 Mar 2025 06:42:31 +0000 (17:42 +1100)]
Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git
Stephen Rothwell [Mon, 17 Mar 2025 06:42:29 +0000 (17:42 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
Stephen Rothwell [Mon, 17 Mar 2025 06:42:26 +0000 (17:42 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 06:42:23 +0000 (17:42 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
Stephen Rothwell [Mon, 17 Mar 2025 06:42:19 +0000 (17:42 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git
Stephen Rothwell [Mon, 17 Mar 2025 06:42:16 +0000 (17:42 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
Stephen Rothwell [Mon, 17 Mar 2025 06:20:57 +0000 (17:20 +1100)]
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
Stephen Rothwell [Mon, 17 Mar 2025 06:20:54 +0000 (17:20 +1100)]
Merge branch 'next' of https://github.com/kvm-x86/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 06:20:52 +0000 (17:20 +1100)]
Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 06:20:49 +0000 (17:20 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
# Conflicts:
# arch/arm64/kernel/cpufeature.c
# arch/arm64/kernel/proton-pack.c
# arch/arm64/kvm/arm.c
# arch/arm64/kvm/hypercalls.c
# drivers/perf/apple_m1_cpu_pmu.c
Stephen Rothwell [Mon, 17 Mar 2025 05:25:05 +0000 (16:25 +1100)]
Merge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
Stephen Rothwell [Mon, 17 Mar 2025 05:25:03 +0000 (16:25 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 05:25:01 +0000 (16:25 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
# Conflicts:
# include/linux/module.h
Stephen Rothwell [Mon, 17 Mar 2025 05:24:57 +0000 (16:24 +1100)]
Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git
Stephen Rothwell [Mon, 17 Mar 2025 05:24:54 +0000 (16:24 +1100)]
Merge branch 'timers/drivers/next' of https://git.linaro.org/people/daniel.lezcano/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 04:54:49 +0000 (15:54 +1100)]
next-
20250303 /tip
# Conflicts:
# arch/riscv/include/asm/io.h
# arch/x86/kernel/paravirt.c
# arch/x86/mm/pgtable.c
# drivers/gpu/drm/i915/i915_pmu.c
# drivers/mailbox/mailbox.c
# lib/vdso/datastore.c
# net/core/dev.c
Greg Kroah-Hartman [Mon, 17 Mar 2025 04:37:15 +0000 (05:37 +0100)]
Merge tag 'w1-drv-6.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1 into char-misc-next
Krzysztof writes:
1-Wire bus drivers for v6.14
1. W1 UART: Fix theoretical NULL pointer dereference in probe due to
serdev ops being set too late. That's said such scenario is unlikely
to happen as serdev read would need to happen before writing
anything.
2. W1 therm: Simplify with HWMON_CHANNEL_INFO.
* tag 'w1-drv-6.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1:
w1: w1_therm: w1: Use HWMON_CHANNEL_INFO macro to simplify code
w1: fix NULL pointer dereference in probe
Stephen Rothwell [Mon, 17 Mar 2025 04:31:49 +0000 (15:31 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
Stephen Rothwell [Mon, 17 Mar 2025 04:31:46 +0000 (15:31 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git
Stephen Rothwell [Mon, 17 Mar 2025 04:12:49 +0000 (15:12 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git
Stephen Rothwell [Mon, 17 Mar 2025 04:12:47 +0000 (15:12 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
# Conflicts:
# drivers/of/of_private.h
Stephen Rothwell [Mon, 17 Mar 2025 04:08:47 +0000 (15:08 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
Stephen Rothwell [Mon, 17 Mar 2025 04:08:45 +0000 (15:08 +1100)]
Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git