]>
Gentwo Git Trees - linux/.git/log
Stephen Rothwell [Tue, 25 Feb 2025 06:08:29 +0000 (17:08 +1100)]
Add linux-next specific files for
20250225
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Stephen Rothwell [Tue, 25 Feb 2025 05:07:50 +0000 (16:07 +1100)]
Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 05:07:46 +0000 (16:07 +1100)]
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git
Stephen Rothwell [Tue, 25 Feb 2025 05:07:42 +0000 (16:07 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 05:07:36 +0000 (16:07 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git
Stephen Rothwell [Tue, 25 Feb 2025 05:07:32 +0000 (16:07 +1100)]
Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 05:07:27 +0000 (16:07 +1100)]
Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 05:07:24 +0000 (16:07 +1100)]
Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 05:07:21 +0000 (16:07 +1100)]
Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git
# Conflicts:
# kernel/sysctl.c
Stephen Rothwell [Tue, 25 Feb 2025 05:07:17 +0000 (16:07 +1100)]
Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 05:07:13 +0000 (16:07 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 05:07:10 +0000 (16:07 +1100)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git
Stephen Rothwell [Tue, 25 Feb 2025 05:07:07 +0000 (16:07 +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 [Tue, 25 Feb 2025 05:07:03 +0000 (16:07 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
Stephen Rothwell [Tue, 25 Feb 2025 05:07:00 +0000 (16:07 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git
Stephen Rothwell [Tue, 25 Feb 2025 05:06:56 +0000 (16:06 +1100)]
Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git
Stephen Rothwell [Tue, 25 Feb 2025 04:42:10 +0000 (15:42 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git
Stephen Rothwell [Tue, 25 Feb 2025 04:42:07 +0000 (15:42 +1100)]
Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 04:42:04 +0000 (15:42 +1100)]
Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git
Stephen Rothwell [Tue, 25 Feb 2025 04:41:57 +0000 (15:41 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git
Stephen Rothwell [Tue, 25 Feb 2025 04:41:54 +0000 (15:41 +1100)]
Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 04:41:51 +0000 (15:41 +1100)]
Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git
Stephen Rothwell [Tue, 25 Feb 2025 04:41:43 +0000 (15:41 +1100)]
Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 04:41:40 +0000 (15:41 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
Stephen Rothwell [Tue, 25 Feb 2025 04:38:25 +0000 (15:38 +1100)]
Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
Stephen Rothwell [Tue, 25 Feb 2025 04:38:23 +0000 (15:38 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
Stephen Rothwell [Tue, 25 Feb 2025 04:38:21 +0000 (15:38 +1100)]
Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 04:31:29 +0000 (15:31 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
Stephen Rothwell [Tue, 25 Feb 2025 04:31:27 +0000 (15:31 +1100)]
Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
Stephen Rothwell [Tue, 25 Feb 2025 04:31:25 +0000 (15:31 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
Stephen Rothwell [Tue, 25 Feb 2025 04:31:23 +0000 (15:31 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
Stephen Rothwell [Tue, 25 Feb 2025 04:31:21 +0000 (15:31 +1100)]
Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 04:28:41 +0000 (15:28 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 04:28:39 +0000 (15:28 +1100)]
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
Stephen Rothwell [Tue, 25 Feb 2025 04:25:01 +0000 (15:25 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
# Conflicts:
# drivers/scsi/scsi_debug.c
Stephen Rothwell [Tue, 25 Feb 2025 03:24:39 +0000 (14:24 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
Stephen Rothwell [Tue, 25 Feb 2025 03:24:37 +0000 (14:24 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
Stephen Rothwell [Tue, 25 Feb 2025 03:24:36 +0000 (14:24 +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
Stephen Rothwell [Tue, 25 Feb 2025 02:59:40 +0000 (13:59 +1100)]
Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git
Stephen Rothwell [Tue, 25 Feb 2025 02:59:39 +0000 (13:59 +1100)]
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
Stephen Rothwell [Tue, 25 Feb 2025 02:59:37 +0000 (13:59 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git
Stephen Rothwell [Tue, 25 Feb 2025 02:59:35 +0000 (13:59 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git
Stephen Rothwell [Tue, 25 Feb 2025 02:59:33 +0000 (13:59 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
Stephen Rothwell [Tue, 25 Feb 2025 02:59:31 +0000 (13:59 +1100)]
Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
Stephen Rothwell [Tue, 25 Feb 2025 02:59:29 +0000 (13:59 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git
Stephen Rothwell [Tue, 25 Feb 2025 02:59:27 +0000 (13:59 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 02:59:25 +0000 (13:59 +1100)]
Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
Stephen Rothwell [Tue, 25 Feb 2025 02:59:24 +0000 (13:59 +1100)]
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
Stephen Rothwell [Tue, 25 Feb 2025 02:59:22 +0000 (13:59 +1100)]
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
Stephen Rothwell [Tue, 25 Feb 2025 02:59:20 +0000 (13:59 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
Stephen Rothwell [Tue, 25 Feb 2025 02:59:19 +0000 (13:59 +1100)]
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
# Conflicts:
# drivers/usb/typec/ucsi/ucsi_acpi.c
Stephen Rothwell [Tue, 25 Feb 2025 02:59:16 +0000 (13:59 +1100)]
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
Stephen Rothwell [Tue, 25 Feb 2025 02:34:30 +0000 (13:34 +1100)]
Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git
Stephen Rothwell [Tue, 25 Feb 2025 02:34:29 +0000 (13:34 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
Stephen Rothwell [Tue, 25 Feb 2025 02:34:27 +0000 (13:34 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 02:34:25 +0000 (13:34 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
Stephen Rothwell [Tue, 25 Feb 2025 02:34:22 +0000 (13:34 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git
Stephen Rothwell [Tue, 25 Feb 2025 02:34:20 +0000 (13:34 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
Stephen Rothwell [Tue, 25 Feb 2025 02:31:31 +0000 (13:31 +1100)]
Merge branch 'next' of https://github.com/kvm-x86/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 02:31:29 +0000 (13:31 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
Stephen Rothwell [Tue, 25 Feb 2025 02:06:42 +0000 (13:06 +1100)]
Merge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
Stephen Rothwell [Tue, 25 Feb 2025 02:06:40 +0000 (13:06 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 02:06:39 +0000 (13:06 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
Stephen Rothwell [Tue, 25 Feb 2025 02:06:37 +0000 (13:06 +1100)]
Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git
Stephen Rothwell [Tue, 25 Feb 2025 02:06:36 +0000 (13:06 +1100)]
Merge branch 'timers/drivers/next' of https://git.linaro.org/people/daniel.lezcano/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 02:06:33 +0000 (13:06 +1100)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
# Conflicts:
# arch/riscv/include/asm/io.h
Stephen Rothwell [Tue, 25 Feb 2025 02:06:30 +0000 (13:06 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
Stephen Rothwell [Tue, 25 Feb 2025 02:03:51 +0000 (13:03 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git
Stephen Rothwell [Tue, 25 Feb 2025 02:03:50 +0000 (13:03 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 02:01:12 +0000 (13:01 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
Bart Van Assche [Mon, 24 Feb 2025 11:55:17 +0000 (11:55 +0000)]
scsi: scsi_debug: Do not sleep in atomic sections
Function stop_qc_helper() is called while the debug_scsi_cmd lock is held,
and from here we may call cancel_work_sync(), which may sleep.
Sleeping in atomic sections is not allowed.
Hence change the cancel_work_sync() call into a cancel_work() call.
However now it is not possible to know if the work callback is running when
we return. This is relevant for eh_abort_handler handling, as the semantics
of that callback are that success means that we do not keep a reference to
the scsi_cmnd - now this is not possible. So return FAIL when we are unsure
if the callback still running.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
jpg: return FAILED from scsi_debug_abort() when possible callback running
Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20250224115517.495899-5-john.g.garry@oracle.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Bart Van Assche [Mon, 24 Feb 2025 11:55:16 +0000 (11:55 +0000)]
scsi: scsi_debug: Simplify command handling
Simplify command handling by moving struct sdebug_defer into the private
SCSI command data instead of allocating it separately. The only functional
change is that aborting a SCSI command now fails and is retried at a later
time if the completion handler can't be cancelled.
See also commit
1107c7b24ee3 ("scsi: scsi_debug: Dynamically allocate
sdebug_queued_cmd").
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20250224115517.495899-4-john.g.garry@oracle.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Bart Van Assche [Mon, 24 Feb 2025 11:55:15 +0000 (11:55 +0000)]
scsi: scsi_debug: Remove a reference to in_use_bm
Commit
f1437cd1e535 ("scsi: scsi_debug: Drop sdebug_queue") removed the
'in_use_bm' struct member. Hence remove a reference to that struct member
from the procfs host info file.
Fixes: f1437cd1e535 ("scsi: scsi_debug: Drop sdebug_queue")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20250224115517.495899-3-john.g.garry@oracle.com
Reviewed-by: John Garry <john.g.garry@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
John Garry [Mon, 24 Feb 2025 11:55:14 +0000 (11:55 +0000)]
scsi: scsi_debug: Remove sdebug_device_access_info
This structure is not used, so delete it.
It was originally intended for supporting checking for atomic writes
overlapping with ongoing reads and writes, but that support never got
added.
SBC-4 r22 section 4.29.3.2 "Performing operations during an atomic write
operation" describes two methods of handling overlapping atomic writes.
Currently the only method supported is for the ongoing read or write to
complete.
Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20250224115517.495899-2-john.g.garry@oracle.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Stephen Rothwell [Tue, 25 Feb 2025 01:51:30 +0000 (12:51 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
Stephen Rothwell [Tue, 25 Feb 2025 01:51:28 +0000 (12:51 +1100)]
Merge branch 'next' of git://github.com/cschaufler/smack-next
Stephen Rothwell [Tue, 25 Feb 2025 01:51:27 +0000 (12:51 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
Stephen Rothwell [Tue, 25 Feb 2025 01:51:25 +0000 (12:51 +1100)]
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
Stephen Rothwell [Tue, 25 Feb 2025 01:51:23 +0000 (12:51 +1100)]
Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
Stephen Rothwell [Tue, 25 Feb 2025 01:51:20 +0000 (12:51 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
Stephen Rothwell [Tue, 25 Feb 2025 01:26:35 +0000 (12:26 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
Stephen Rothwell [Tue, 25 Feb 2025 01:26:33 +0000 (12:26 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
Stephen Rothwell [Tue, 25 Feb 2025 01:26:32 +0000 (12:26 +1100)]
Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git
Stephen Rothwell [Tue, 25 Feb 2025 01:26:30 +0000 (12:26 +1100)]
Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
Stephen Rothwell [Tue, 25 Feb 2025 01:26:28 +0000 (12:26 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
Stephen Rothwell [Tue, 25 Feb 2025 01:26:27 +0000 (12:26 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux
Stephen Rothwell [Tue, 25 Feb 2025 01:26:25 +0000 (12:26 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git
Stephen Rothwell [Tue, 25 Feb 2025 01:26:23 +0000 (12:26 +1100)]
Merge branch 'for-next' of git://git.kernel.dk/linux-block.git
Stephen Rothwell [Tue, 25 Feb 2025 01:26:22 +0000 (12:26 +1100)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
Stephen Rothwell [Tue, 25 Feb 2025 01:26:18 +0000 (12:26 +1100)]
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git
Stephen Rothwell [Tue, 25 Feb 2025 01:20:28 +0000 (12:20 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
Stephen Rothwell [Tue, 25 Feb 2025 01:20:26 +0000 (12:20 +1100)]
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git
Stephen Rothwell [Tue, 25 Feb 2025 01:20:25 +0000 (12:20 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
Stephen Rothwell [Tue, 25 Feb 2025 01:17:50 +0000 (12:17 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
Stephen Rothwell [Tue, 25 Feb 2025 01:17:49 +0000 (12:17 +1100)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git
Stephen Rothwell [Tue, 25 Feb 2025 01:12:43 +0000 (12:12 +1100)]
Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel
# Conflicts:
# drivers/gpu/drm/xe/display/xe_display.c
# drivers/gpu/drm/xe/xe_gt_sriov_pf.c
Stephen Rothwell [Tue, 25 Feb 2025 01:12:38 +0000 (12:12 +1100)]
Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git
Stephen Rothwell [Tue, 25 Feb 2025 01:12:36 +0000 (12:12 +1100)]
Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel
# Conflicts:
# drivers/gpu/drm/i915/display/intel_dp.c
# drivers/gpu/drm/i915/display/intel_dp_mst.c
# drivers/gpu/drm/i915/i915_reg.h
Stephen Rothwell [Tue, 25 Feb 2025 01:12:32 +0000 (12:12 +1100)]
Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux
# Conflicts:
# drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Stephen Rothwell [Tue, 25 Feb 2025 01:12:29 +0000 (12:12 +1100)]
Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git