linux/drivers
Miguel Ojeda 924740496b gpu: nova-core: fix up formatting after merge
In the merge 260f6f4fda ("Merge tag 'drm-next-2025-07-30' of
https://gitlab.freedesktop.org/drm/kernel"), the formatting in the
conflict resolution doesn't match what `make rustfmt` wants to make it.

Fix it up appropriately.

Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2025-07-31 13:24:26 -07:00
..
accel drm for 6.17-rc1 2025-07-30 19:26:49 -07:00
accessibility
acpi Driver core changes for 6.17-rc1 2025-07-29 12:15:39 -07:00
amba
android Char / Misc / IIO / other driver updates for 6.17-rc1 2025-07-29 09:52:01 -07:00
ata ata: libata-eh: Simplify reset operation management 2025-07-16 09:31:43 +02:00
atm
auxdisplay
base drm for 6.17-rc1 2025-07-30 19:26:49 -07:00
bcma
block for-6.17/block-20250728 2025-07-28 16:43:54 -07:00
bluetooth Bluetooth: btintel_pcie: Fix Alive Context State Handling 2025-07-23 10:34:30 -04:00
bus soc: driver updates for 6.17 2025-07-29 11:13:27 -07:00
cache
cdrom cdrom: Call cdrom_mrw_exit from cdrom_release function 2025-07-22 19:10:17 -06:00
cdx cdx: Fix missing GENERIC_MSI_IRQ on compile test 2025-07-16 14:17:31 +02:00
char This update includes the following changes: 2025-07-31 09:45:28 -07:00
clk soc: driver updates for 6.17 2025-07-29 11:13:27 -07:00
clocksource A treewide cleanup of struct cycle_counter const annotations: 2025-07-29 14:02:53 -07:00
comedi Char / Misc / IIO / other driver updates for 6.17-rc1 2025-07-29 09:52:01 -07:00
connector
counter
cpufreq Remove or hide unused tracepoints 2025-07-30 16:41:58 -07:00
cpuidle pmdomain core: 2025-07-29 11:42:31 -07:00
crypto This update includes the following changes: 2025-07-31 09:45:28 -07:00
cxl libnvdimm fixes for 6.17 2025-07-31 13:05:44 -07:00
dax
dca
devfreq
dio
dma spidev: introduce trivial abb sensor device 2025-07-21 15:39:07 +01:00
dma-buf drm for 6.17-rc1 2025-07-30 19:26:49 -07:00
dpll dpll: zl3073x: Fix build failure 2025-07-26 12:05:33 -07:00
edac - i10nm: 2025-07-29 16:30:38 -07:00
eisa
extcon
firewire
firmware arm64 updates for 6.17: 2025-07-29 20:21:54 -07:00
fpga
fsi Driver core changes for 6.17-rc1 2025-07-29 12:15:39 -07:00
fwctl
gnss
gpio gpio updates for v6.17-rc1 2025-07-28 21:58:46 -07:00
gpu gpu: nova-core: fix up formatting after merge 2025-07-31 13:24:26 -07:00
greybus
hid Driver core changes for 6.17-rc1 2025-07-29 12:15:39 -07:00
hsi
hte
hv ARM: 2025-07-30 17:14:01 -07:00
hwmon pwm: Changes for v6.17-rc1 2025-07-28 23:17:46 -07:00
hwspinlock
hwtracing
i2c drm for 6.17-rc1 2025-07-30 19:26:49 -07:00
i3c
idle
iio Driver core changes for 6.17-rc1 2025-07-29 12:15:39 -07:00
infiniband RDMA v6.17 merge window pull request 2025-07-31 12:19:55 -07:00
input Driver core changes for 6.17-rc1 2025-07-29 12:15:39 -07:00
interconnect Char / Misc / IIO / other driver updates for 6.17-rc1 2025-07-29 09:52:01 -07:00
iommu iommufd 6.17 merge window pull 2025-07-31 12:43:08 -07:00
ipack
irqchip ARM: 2025-07-30 17:14:01 -07:00
isdn
leds LEDs for for v6.17 2025-07-31 11:54:01 -07:00
macintosh
mailbox Merge branch 'newsoc/cix-p1' into soc/newsoc 2025-07-21 17:16:16 +02:00
mcb mcb: use sysfs_emit_at() instead of scnprintf() in show functions 2025-07-16 14:17:07 +02:00
md for-6.17/block-20250728 2025-07-28 16:43:54 -07:00
media [GIT PULL for v6.17] media updates 2025-07-31 13:16:09 -07:00
memory Memory controller drivers for v6.17 2025-07-22 22:47:00 +02:00
memstick memstick: core: Zero initialize id_reg in h_memstick_read_dev_id() 2025-07-16 12:01:09 +02:00
message
mfd MFD for v6.17 2025-07-31 11:50:25 -07:00
misc Driver core changes for 6.17-rc1 2025-07-29 12:15:39 -07:00
mmc MMC core: 2025-07-29 12:05:38 -07:00
most
mtd This pull request contains the following changes for UBI and UBIFS: 2025-07-31 10:08:44 -07:00
mux hardening updates for v6.17-rc1 2025-07-28 17:16:12 -07:00
net RDMA v6.17 merge window pull request 2025-07-31 12:19:55 -07:00
nfc
ntb
nubus
nvdimm
nvme for-6.17/block-20250728 2025-07-28 16:43:54 -07:00
nvmem Driver core changes for 6.17-rc1 2025-07-29 12:15:39 -07:00
of ARM: 2025-07-30 17:14:01 -07:00
opp
parisc parisc/power: Move soft-power into power.c 2025-07-23 11:52:48 +02:00
parport
pci RDMA v6.17 merge window pull request 2025-07-31 12:19:55 -07:00
pcmcia
peci
perf
phy phy: qcom: fix error code in snps_eusb2_hsphy_probe() 2025-07-15 20:36:47 +05:30
pinctrl soc: driver updates for 6.17 2025-07-29 11:13:27 -07:00
platform [GIT PULL for v6.17] media updates 2025-07-31 13:16:09 -07:00
pmdomain pmdomain: qcom: rpmhpd: Add Glymur RPMh Power Domains 2025-07-23 12:12:16 +02:00
pnp
power Driver core changes for 6.17-rc1 2025-07-29 12:15:39 -07:00
powercap platform-drivers-x86 for v6.17-1 2025-07-28 23:21:28 -07:00
pps
ps3
ptp Networking changes for 6.17. 2025-07-30 08:58:55 -07:00
pwm pwm: Changes for v6.17-rc1 2025-07-28 23:17:46 -07:00
rapidio
ras
regulator regulator: mt6370: Fix spelling mistake in mt6370_regualtor_register 2025-07-24 18:04:38 +01:00
remoteproc remoteproc: imx_rproc: detect and attach to pre-booted remote cores 2025-07-18 12:43:46 +02:00
reset
rpmsg
rtc
s390 Networking changes for 6.17. 2025-07-30 08:58:55 -07:00
sbus
scsi SCSI misc on 20250730 2025-07-31 12:13:53 -07:00
sh
siox
slimbus
soc drm for 6.17-rc1 2025-07-30 19:26:49 -07:00
soundwire Power management updates for 6.17-rc1 2025-07-28 20:13:36 -07:00
spi Locking updates for v6.16: 2025-07-29 18:11:32 -07:00
spmi
ssb ssb: use new GPIO line value setter callbacks for the second GPIO chip 2025-07-24 09:06:46 +02:00
staging [GIT PULL for v6.17] media updates 2025-07-31 13:16:09 -07:00
target
tc
tee
thermal Driver core changes for 6.17-rc1 2025-07-29 12:15:39 -07:00
thunderbolt thunderbolt: Fix copy+paste error in match_service_id() 2025-07-21 16:33:43 +02:00
tty DT updates for ralink, mobileye and ralink 2025-07-31 11:08:55 -07:00
ufs SCSI misc on 20250730 2025-07-31 12:13:53 -07:00
uio
usb Driver core changes for 6.17-rc1 2025-07-29 12:15:39 -07:00
vdpa
vfio
vhost ARM: 2025-07-30 17:14:01 -07:00
video drm for 6.17-rc1 2025-07-30 19:26:49 -07:00
virt - Map the SNP calling area pages too so that OVMF EFI fw can issue SVSM 2025-07-29 17:18:46 -07:00
virtio Networking changes for 6.17. 2025-07-30 08:58:55 -07:00
w1
watchdog
xen xen/gntdev: remove struct gntdev_copy_batch from stack 2025-07-14 17:10:09 +02:00
zorro
Kconfig drm for 6.17-rc1 2025-07-30 19:26:49 -07:00
Makefile