mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
6ca445d8af0ed5950ebf899415fd6bfcd7d9d7a3
linux/drivers
History
Palmer Dabbelt 46cad6cd9b irqchip: riscv-imsic: Fixup riscv_ipi_set_virq_range() conflict 
There was a semantic conflict between 21a8f8a0eb ("irqchip: Add RISC-V
incoming MSI controller early driver") and dc892fb443 ("riscv: Use
IPIs for remote cache/TLB flushes by default") due to an API change.
This manifests as a build failure post-merge.

Reported-by: Tomasz Jeznach <tjeznach@rivosinc.com>
Link: https://lore.kernel.org/all/mhng-10b71228-cf3e-42ca-9abf-5464b15093f1@palmer-ri-x1c9/
Fixes: 0bfbc914d9 ("Merge tag 'riscv-for-linus-6.10-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux")
Reviewed-by: Anup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20240522184953.28531-3-palmer@rivosinc.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
2024-05-23 04:48:40 -07:00
..
accel
Merge tag 'mm-stable-2024-05-17-19-19' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-05-19 09:21:03 -07:00
accessibility
…
acpi
Merge tag 'acpi-6.10-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2024-05-21 11:37:51 -07:00
amba
…
android
…
ata
Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
2024-05-21 10:09:28 -07:00
atm
atm/fore200e: Delete unused 'fore200e_boards'
2024-05-06 18:26:47 -07:00
auxdisplay
…
base
Merge tag 'sched-urgent-2024-05-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2024-05-19 11:38:15 -07:00
bcma
…
block
Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2024-05-21 13:11:44 -07:00
bluetooth
Merge tag 'mmc-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
2024-05-16 08:56:49 -07:00
bus
Merge tag 'net-next-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2024-05-14 19:42:24 -07:00
cache
…
cdrom
…
cdx
…
char
Merge tag 'mm-stable-2024-05-17-19-19' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-05-19 09:21:03 -07:00
clk
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
2024-05-18 12:48:37 -07:00
clocksource
Merge tag 'riscv-for-linus-6.10-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
2024-05-22 09:56:00 -07:00
comedi
…
connector
…
counter
…
cpufreq
Merge tag 'pm-6.10-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2024-05-21 11:40:49 -07:00
cpuidle
Merge tag 'pmdomain-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm
2024-05-16 08:50:32 -07:00
crypto
Merge tag 'v6.10-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2024-05-20 08:47:54 -07:00
cxl
Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
2024-05-21 10:09:28 -07:00
dax
Merge tag 'mm-stable-2024-05-17-19-19' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-05-19 09:21:03 -07:00
dca
…
devfreq
PM / devfreq: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions
2024-05-09 00:30:37 +09:00
dio
…
dma
Merge tag 'dmaengine-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine
2024-05-21 11:15:56 -07:00
dma-buf
…
dpll
dpll: fix return value check for kmemdup
2024-05-13 16:53:53 -07:00
edac
Merge tag 'edac_updates_for_v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
2024-05-14 08:31:10 -07:00
eisa
alpha: remove DECpc AXP150 (Jensen) support
2024-05-03 22:09:50 +02:00
extcon
…
firewire
Merge tag 'firewire-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
2024-05-14 18:57:22 -07:00
firmware
Merge tag 'efi-fixes-for-v6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
2024-05-21 11:50:26 -07:00
fpga
…
fsi
…
gnss
…
gpio
gpiolib: acpi: Fix failed in acpi_gpiochip_find() by adding parent node match
2024-05-21 18:46:45 +03:00
gpu
Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
2024-05-21 10:09:28 -07:00
greybus
…
hid
Merge tag 'kbuild-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
2024-05-18 12:39:20 -07:00
hsi
…
hte
…
hv
Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'core' and 'x86/vt-d' into next
2024-05-13 14:06:54 +02:00
hwmon
Merge tag 'pwm/for-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux
2024-05-14 15:03:19 -07:00
hwspinlock
…
hwtracing
Merge tag 'mm-nonmm-stable-2024-05-19-11-56' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-05-19 14:02:03 -07:00
i2c
Merge tag 'i2c-for-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2024-05-20 08:55:18 -07:00
i3c
…
idle
…
iio
Merge tag 'i2c-for-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2024-05-20 08:55:18 -07:00
infiniband
Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
2024-05-21 10:09:28 -07:00
input
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux
2024-05-17 08:53:47 -07:00
interconnect
…
iommu
Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
2024-05-21 10:09:28 -07:00
ipack
…
irqchip
irqchip: riscv-imsic: Fixup riscv_ipi_set_virq_range() conflict
2024-05-23 04:48:40 -07:00
isdn
…
leds
…
macintosh
Merge tag 'powerpc-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
2024-05-17 09:05:46 -07:00
mailbox
mailbox: Convert from tasklet to BH workqueue
2024-05-19 22:33:28 -05:00
mcb
…
md
Merge tag 'for-6.10/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
2024-05-21 11:43:11 -07:00
media
Merge tag 'i2c-for-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2024-05-20 08:55:18 -07:00
memory
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux
2024-05-17 08:53:47 -07:00
memstick
…
message
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2024-05-14 18:25:53 -07:00
mfd
Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
2024-05-21 10:09:28 -07:00
misc
Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
2024-05-21 10:09:28 -07:00
mmc
Merge tag 'mmc-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
2024-05-16 08:56:49 -07:00
most
…
mtd
Merge tag 'pull-bd_inode-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2024-05-21 09:51:42 -07:00
mux
…
net
Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
2024-05-21 10:09:28 -07:00
nfc
…
ntb
…
nubus
…
nvdimm
…
nvme
Merge tag 'for-6.10/block-20240511' of git://git.kernel.dk/linux
2024-05-13 13:03:54 -07:00
nvmem
…
of
Merge tag 'i2c-for-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2024-05-20 08:55:18 -07:00
opp
Merge tag 'opp-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm into pm-opp
2024-05-17 13:01:24 +02:00
parisc
…
parport
…
pci
Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
2024-05-21 10:09:28 -07:00
pcmcia
…
peci
…
perf
Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
2024-05-21 10:09:28 -07:00
phy
Merge tag 'phy-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy
2024-05-21 11:19:18 -07:00
pinctrl
Merge tag 'pinctrl-v6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
2024-05-20 08:51:53 -07:00
platform
Merge tag 'acpi-6.10-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2024-05-21 11:37:51 -07:00
pmdomain
Merge tag 'pm-6.10-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2024-05-21 11:40:49 -07:00
pnp
…
power
Merge tag 'i2c-for-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2024-05-20 08:55:18 -07:00
powercap
powercap: intel_rapl_tpmi: Enable PMU support
2024-04-30 21:10:37 +02:00
pps
…
ps3
…
ptp
Merge tag 'net-next-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2024-05-14 19:42:24 -07:00
pwm
pwm: pca9685: Drop explicit initialization of struct i2c_device_id::driver_data to 0
2024-05-10 07:30:27 +02:00
rapidio
rapidio: remove choice for enumeration
2024-05-14 23:36:19 +09:00
ras
…
regulator
Merge tag 'regulator-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
2024-05-14 14:36:09 -07:00
remoteproc
remoteproc: k3-r5: Jump to error handling labels in start/stop errors
2024-05-06 13:34:12 -06:00
reset
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
2024-05-18 12:48:37 -07:00
rpmsg
rpmsg: qcom_glink_ssr: fix module autoloading
2024-05-06 19:26:28 -07:00
rtc
…
s390
Merge tag 's390-6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2024-05-21 12:09:36 -07:00
sbus
…
scsi
Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
2024-05-21 10:09:28 -07:00
sh
…
siox
…
slimbus
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
2024-05-03 07:30:32 +02:00
soc
Merge tag 'spi-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
2024-05-14 14:41:01 -07:00
soundwire
Merge tag 'soundwire-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire
2024-05-21 11:23:36 -07:00
spi
Merge tag 'spi-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
2024-05-14 14:41:01 -07:00
spmi
…
ssb
…
staging
Merge tag 'mm-stable-2024-05-17-19-19' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-05-19 09:21:03 -07:00
target
Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2024-05-21 13:11:44 -07:00
tc
…
tee
…
thermal
Merge tag 'thermal-6.10-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2024-05-21 11:35:45 -07:00
thunderbolt
…
tty
Merge tag 's390-6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2024-05-21 12:09:36 -07:00
ufs
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2024-05-14 18:25:53 -07:00
uio
…
usb
Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
2024-05-21 10:09:28 -07:00
vdpa
…
vfio
Merge tag 'vfio-v6.10-rc1' of https://github.com/awilliam/linux-vfio
2024-05-20 14:56:50 -07:00
vhost
…
video
Merge tag 'asm-generic-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
2024-05-20 15:18:34 -07:00
virt
Merge tag 'mm-stable-2024-05-17-19-19' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-05-19 09:21:03 -07:00
virtio
Merge tag 'mm-stable-2024-05-17-19-19' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-05-19 09:21:03 -07:00
w1
…
watchdog
watchdog: LENOVO_SE10_WDT should depend on X86 && DMI
2024-05-11 11:32:06 +02:00
xen
Merge tag 'dma-mapping-6.10-2024-05-20' of git://git.infradead.org/users/hch/dma-mapping
2024-05-20 10:23:39 -07:00
zorro
…
Kconfig
…
Makefile
kbuild: use $(src) instead of $(srctree)/$(src) for source directory
2024-05-10 04:34:52 +09:00