]>
www.infradead.org Git - users/willy/pagecache.git/log
Matthew Wilcox (Oracle) [Mon, 10 Jul 2023 15:41:22 +0000 (11:41 -0400)]
minmax: Add in_range() macro
Determine if a value lies within a range more efficiently (subtraction +
comparison vs two comparisons and an AND). It also has useful (under
some circumstances) behaviour if the range exceeds the maximum value of
the type. Convert all the conflicting definitions of in_range() within
the kernel; some can use the generic definition while others need their
own definition.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Stephen Rothwell [Mon, 31 Jul 2023 04:08:15 +0000 (14:08 +1000)]
Add linux-next specific files for
20230731
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Stephen Rothwell [Mon, 31 Jul 2023 03:16:45 +0000 (13:16 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git
Stephen Rothwell [Mon, 31 Jul 2023 03:16:42 +0000 (13:16 +1000)]
Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 03:16:40 +0000 (13:16 +1000)]
Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 03:16:38 +0000 (13:16 +1000)]
Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 03:16:36 +0000 (13:16 +1000)]
Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 03:16:33 +0000 (13:16 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
Stephen Rothwell [Mon, 31 Jul 2023 03:16:31 +0000 (13:16 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git
Stephen Rothwell [Mon, 31 Jul 2023 03:16:18 +0000 (13:16 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git
Stephen Rothwell [Mon, 31 Jul 2023 03:16:16 +0000 (13:16 +1000)]
Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git
Stephen Rothwell [Mon, 31 Jul 2023 03:00:38 +0000 (13:00 +1000)]
Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git
Stephen Rothwell [Mon, 31 Jul 2023 03:00:36 +0000 (13:00 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git
Stephen Rothwell [Mon, 31 Jul 2023 03:00:34 +0000 (13:00 +1000)]
Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 03:00:32 +0000 (13:00 +1000)]
Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git
Stephen Rothwell [Mon, 31 Jul 2023 03:00:29 +0000 (13:00 +1000)]
Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
Stephen Rothwell [Mon, 31 Jul 2023 03:00:28 +0000 (13:00 +1000)]
Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 03:00:26 +0000 (13:00 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
Stephen Rothwell [Mon, 31 Jul 2023 02:57:46 +0000 (12:57 +1000)]
Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
Stephen Rothwell [Mon, 31 Jul 2023 02:57:44 +0000 (12:57 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
Stephen Rothwell [Mon, 31 Jul 2023 02:55:05 +0000 (12:55 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git
Stephen Rothwell [Mon, 31 Jul 2023 02:54:57 +0000 (12:54 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git
Stephen Rothwell [Mon, 31 Jul 2023 02:52:22 +0000 (12:52 +1000)]
Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
Stephen Rothwell [Mon, 31 Jul 2023 02:52:20 +0000 (12:52 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
Stephen Rothwell [Mon, 31 Jul 2023 02:52:18 +0000 (12:52 +1000)]
Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 02:41:58 +0000 (12:41 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 02:41:57 +0000 (12:41 +1000)]
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
# Conflicts:
# drivers/net/virtio_net.c
Stephen Rothwell [Mon, 31 Jul 2023 02:41:53 +0000 (12:41 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
Stephen Rothwell [Mon, 31 Jul 2023 02:41:51 +0000 (12:41 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
Stephen Rothwell [Mon, 31 Jul 2023 02:41:49 +0000 (12:41 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
Stephen Rothwell [Mon, 31 Jul 2023 02:41:47 +0000 (12:41 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
Stephen Rothwell [Mon, 31 Jul 2023 02:38:34 +0000 (12:38 +1000)]
Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git
Stephen Rothwell [Mon, 31 Jul 2023 02:38:32 +0000 (12:38 +1000)]
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
Stephen Rothwell [Mon, 31 Jul 2023 02:38:31 +0000 (12:38 +1000)]
Merge branch 'next' of git://github.com/awilliam/linux-vfio.git
Stephen Rothwell [Mon, 31 Jul 2023 02:38:29 +0000 (12:38 +1000)]
Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git
Stephen Rothwell [Mon, 31 Jul 2023 02:38:27 +0000 (12:38 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git
Stephen Rothwell [Mon, 31 Jul 2023 02:38:26 +0000 (12:38 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
Stephen Rothwell [Mon, 31 Jul 2023 02:38:24 +0000 (12:38 +1000)]
Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
Stephen Rothwell [Mon, 31 Jul 2023 02:38:23 +0000 (12:38 +1000)]
Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git
Stephen Rothwell [Mon, 31 Jul 2023 02:38:21 +0000 (12:38 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git
Stephen Rothwell [Mon, 31 Jul 2023 02:38:19 +0000 (12:38 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 02:38:18 +0000 (12:38 +1000)]
Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git
# Conflicts:
# drivers/accel/habanalabs/common/habanalabs.h
Stephen Rothwell [Mon, 31 Jul 2023 02:38:16 +0000 (12:38 +1000)]
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
Stephen Rothwell [Mon, 31 Jul 2023 02:38:14 +0000 (12:38 +1000)]
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
Stephen Rothwell [Mon, 31 Jul 2023 02:38:13 +0000 (12:38 +1000)]
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Stephen Rothwell [Mon, 31 Jul 2023 02:22:42 +0000 (12:22 +1000)]
Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git
Stephen Rothwell [Mon, 31 Jul 2023 02:22:39 +0000 (12:22 +1000)]
Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git
Stephen Rothwell [Mon, 31 Jul 2023 02:22:37 +0000 (12:22 +1000)]
Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 02:22:35 +0000 (12:22 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
Stephen Rothwell [Mon, 31 Jul 2023 02:22:34 +0000 (12:22 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
Stephen Rothwell [Mon, 31 Jul 2023 02:22:32 +0000 (12:22 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git
Stephen Rothwell [Mon, 31 Jul 2023 02:09:31 +0000 (12:09 +1000)]
Merge branch 'next' of https://github.com/kvm-x86/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 02:09:29 +0000 (12:09 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
Stephen Rothwell [Mon, 31 Jul 2023 01:54:01 +0000 (11:54 +1000)]
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
Stephen Rothwell [Mon, 31 Jul 2023 01:53:59 +0000 (11:53 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
Stephen Rothwell [Mon, 31 Jul 2023 01:53:57 +0000 (11:53 +1000)]
Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git
Stephen Rothwell [Mon, 31 Jul 2023 01:53:55 +0000 (11:53 +1000)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
Stephen Rothwell [Mon, 31 Jul 2023 01:53:53 +0000 (11:53 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
Stephen Rothwell [Mon, 31 Jul 2023 01:46:36 +0000 (11:46 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git
Stephen Rothwell [Mon, 31 Jul 2023 01:46:35 +0000 (11:46 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 01:42:51 +0000 (11:42 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
Stephen Rothwell [Mon, 31 Jul 2023 01:42:50 +0000 (11:42 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
Stephen Rothwell [Mon, 31 Jul 2023 01:29:31 +0000 (11:29 +1000)]
Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git
Stephen Rothwell [Mon, 31 Jul 2023 01:29:30 +0000 (11:29 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
Stephen Rothwell [Mon, 31 Jul 2023 01:29:28 +0000 (11:29 +1000)]
Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
Stephen Rothwell [Mon, 31 Jul 2023 01:29:26 +0000 (11:29 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
Stephen Rothwell [Mon, 31 Jul 2023 01:14:48 +0000 (11:14 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
Stephen Rothwell [Mon, 31 Jul 2023 01:14:47 +0000 (11:14 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
Stephen Rothwell [Mon, 31 Jul 2023 01:14:45 +0000 (11:14 +1000)]
Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
Stephen Rothwell [Mon, 31 Jul 2023 01:14:43 +0000 (11:14 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
Stephen Rothwell [Mon, 31 Jul 2023 01:14:42 +0000 (11:14 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
Stephen Rothwell [Mon, 31 Jul 2023 01:14:40 +0000 (11:14 +1000)]
Merge branch 'for-next' of git://git.kernel.dk/linux-block.git
Stephen Rothwell [Mon, 31 Jul 2023 01:14:39 +0000 (11:14 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
Stephen Rothwell [Mon, 31 Jul 2023 01:14:36 +0000 (11:14 +1000)]
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 00:59:04 +0000 (10:59 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
Stephen Rothwell [Mon, 31 Jul 2023 00:59:03 +0000 (10:59 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
Stephen Rothwell [Mon, 31 Jul 2023 00:55:25 +0000 (10:55 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
Stephen Rothwell [Mon, 31 Jul 2023 00:51:34 +0000 (10:51 +1000)]
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux
Stephen Rothwell [Mon, 31 Jul 2023 00:51:31 +0000 (10:51 +1000)]
Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git
Stephen Rothwell [Mon, 31 Jul 2023 00:51:28 +0000 (10:51 +1000)]
Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel
# Conflicts:
# drivers/gpu/drm/i915/display/intel_display_power_well.h
# drivers/gpu/drm/i915/selftests/mock_gem_device.c
Stephen Rothwell [Mon, 31 Jul 2023 00:51:24 +0000 (10:51 +1000)]
Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux
# Conflicts:
# drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
# drivers/gpu/drm/amd/amdgpu/atom.c
# drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
# drivers/gpu/drm/amd/amdkfd/kfd_debug.c
# drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
# drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c
Sergey Shtylyov [Sat, 29 Jul 2023 20:17:53 +0000 (23:17 +0300)]
ata: sata_sil24: fix parameter type of sil24_exec_polled_cmd()
sil24_exec_polled_cmd() passes its 'unsigned long timeout_msec' parameter
to ata_wait_register() that now takes 'unsigned int' -- eliminate unneeded
implicit casts, not forgetting about sil24_do_softreset()...
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Sergey Shtylyov [Sat, 29 Jul 2023 20:17:52 +0000 (23:17 +0300)]
ata: ahci_xgene: fix parameter types of xgene_ahci_poll_reg_val()
xgene_ahci_poll_reg_val() passes its 'unsigned long {interval|timeout}'
params verbatim to ata_{msleep|deadline}() that just take 'unsigned int'
param for the time intervals in ms -- eliminate unneeded implicit cast...
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Sergey Shtylyov [Sat, 29 Jul 2023 20:17:51 +0000 (23:17 +0300)]
ata: libahci: fix parameter type of ahci_exec_polled_cmd()
ahci_exec_polled_cmd() passes its 'unsigned long timeout_msec' parameter
to ata_wait_register() that now takes 'unsigned int' -- eliminate unneeded
implicit casts, not forgetting about ahci_do_softreset()...
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Sergey Shtylyov [Sat, 29 Jul 2023 20:17:50 +0000 (23:17 +0300)]
ata: libata-scsi: fix timeout type in ata_scsi_park_store()
ata_scsi_park_store() passes its 'long input' variable (if it's >= 0) to
ata_deadline() that now takes 'unsigned int' -- eliminate unneeded implicit
cast...
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Sergey Shtylyov [Sat, 29 Jul 2023 20:17:49 +0000 (23:17 +0300)]
ata: fix debounce timings type
sata_deb_timing_{hotplug|long|normal}[] store 'unsigned long' debounce
timeouts in ms, while sata_link_debounce() eventually uses those timeouts
by calling ata_{deadline|msleep}( which take just 'unsigned int'. Change
the debounce timeout table element's type to 'unsigned int' -- all these
timeouts happily fit into 'unsigned int'...
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Sergey Shtylyov [Sat, 29 Jul 2023 20:17:48 +0000 (23:17 +0300)]
ata: libata-eh: fix reset timeout type
ata_eh_reset_timeouts[] stores 'unsigned long' timeouts in ms, while
ata_eh_reset() passes these values to ata_deadline() that takes just
'unsigned int timeout_msecs' parameter. Change the reset timeout table
element's type to 'unsigned int' -- all timeouts fit into 'unsigned int'
but we have to change ULONG_MAX to UINT_MAX...
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Sergey Shtylyov [Sat, 29 Jul 2023 20:17:47 +0000 (23:17 +0300)]
ata: libata-core: fix parameter types of ata_wait_register()
ata_wait_register() passes its 'unsigned long {interval|timeout}' params
verbatim to ata_{msleep|deadline}() that just take 'unsigned int' param
for the time intervals in ms -- eliminate unneeded implicit casts...
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Sergey Shtylyov [Sat, 29 Jul 2023 20:17:46 +0000 (23:17 +0300)]
ata: libata: fix parameter type of ata_deadline()
ata_deadline() passes its 'unsigned long timeout_msecs' parameter verbatim
to msecs_to_jiffies() which takes just 'unsigned int' -- eliminate unneeded
implicit cast...
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Stephen Rothwell [Mon, 31 Jul 2023 00:44:33 +0000 (10:44 +1000)]
Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc
Stephen Rothwell [Mon, 31 Jul 2023 00:44:31 +0000 (10:44 +1000)]
Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git
Stephen Rothwell [Mon, 31 Jul 2023 00:41:53 +0000 (10:41 +1000)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
Stephen Rothwell [Mon, 31 Jul 2023 00:41:51 +0000 (10:41 +1000)]
Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 00:41:50 +0000 (10:41 +1000)]
Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 00:41:49 +0000 (10:41 +1000)]
Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
Stephen Rothwell [Mon, 31 Jul 2023 00:26:14 +0000 (10:26 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
Stephen Rothwell [Mon, 31 Jul 2023 00:26:13 +0000 (10:26 +1000)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
# Conflicts:
# net/bluetooth/hci_core.c
Stephen Rothwell [Mon, 31 Jul 2023 00:26:11 +0000 (10:26 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
Stephen Rothwell [Mon, 31 Jul 2023 00:26:08 +0000 (10:26 +1000)]
Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
# Conflicts:
# net/dsa/port.c
# net/xdp/xsk.c
Stephen Rothwell [Mon, 31 Jul 2023 00:16:12 +0000 (10:16 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git