shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-29 05:50:28 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
5e49ecd49eeadb5810626dffe45ddc8ef2c7bb3e
linux/drivers
History
Greg Kroah-Hartman 5e49ecd49e Merge 7fb68b6c82 ("Merge tag 'platform-drivers-x86-v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86") into android-mainline 
Steps on the way to 6.1-rc1

Resolves merge conflicts in:
	kernel/power/suspend.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1a8e29f82573bc9927adb04a9de5ef9162062653
2022-10-11 21:22:54 +02:00
..
accessibility
Merge tag 'tty-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2022-08-08 11:31:40 -07:00
acpi
Merge tag 'platform-drivers-x86-v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
2022-10-05 10:38:24 -07:00
amba
ARM: 9229/1: amba: Fix use-after-free in amba_read_periphid()
2022-08-30 11:12:52 +01:00
android
ANDROID: subsystem-specific vendor_hooks.c for sched
2022-09-07 20:00:36 +00:00
ata
Merge tag 'thermal-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2022-10-03 15:33:38 -07:00
atm
atm: idt77252: fix use-after-free bugs caused by tst_timer
2022-08-08 20:51:59 -07:00
auxdisplay
i2c: Make remove callback return void
2022-08-16 12:46:26 +02:00
base
Merge d40c874573 ("Merge tag 'regulator-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator") into android-mainline
2022-10-09 20:33:45 +02:00
bcma
bcma: Fix typo in comments
2022-09-07 11:00:30 +03:00
block
Merge tag 'net-next-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2022-10-04 13:38:03 -07:00
bluetooth
Bluetooth: hci_{ldisc,serdev}: check percpu_init_rwsem() failure
2022-09-19 10:33:39 -07:00
bus
bus: mhi: host: pci_generic: Add a secondary AT port to Telit FN990
2022-09-20 16:07:12 -07:00
cdrom
…
char
Merge tag 'v6.0-rc5' into i2c/for-mergewindow
2022-09-16 20:42:18 +01:00
clk
Merge b86406d42a ("Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline
2022-10-09 14:09:50 +02:00
clocksource
Merge tag 'v6.0-rc1' into android-mainline
2022-08-25 12:19:15 +02:00
comedi
Merge c4f36c3ab0 ("Merge tag 'pci-v5.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git") into android-mainline
2022-08-08 22:49:02 +00:00
connector
…
counter
counter: 104-quad-8: Fix skipped IRQ lines during events configuration
2022-09-22 14:26:37 +02:00
cpufreq
Merge c79e6fa98c ("Merge tag 'pm-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline
2022-10-04 14:40:09 +02:00
cpuidle
Merge c79e6fa98c ("Merge tag 'pm-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline
2022-10-04 14:40:09 +02:00
crypto
Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2022-10-04 18:54:33 -07:00
cxl
cxl/hdm: Fix skip allocations vs multiple pmem allocations
2022-08-05 16:11:38 -07:00
dax
devdax: Fix soft-reservation memory description
2022-09-24 18:05:53 -07:00
dca
…
devfreq
PM / devfreq: rockchip-dfi: Fix an error message
2022-09-26 03:59:43 +09:00
dio
…
dma
dmaengine: zynqmp_dma: Typecast with enum to fix the coverity warning
2022-09-05 11:54:50 +05:30
dma-buf
BACKPORT: FROMLIST: dma-heap: Let dma heap use dma_map_attrs to map & unmap iova
2022-09-30 15:45:18 +00:00
edac
Merge branches 'edac-drivers' and 'edac-misc' into edac-updates-for-v6.1
2022-10-04 10:00:25 +02:00
eisa
…
extcon
i2c: Make remove callback return void
2022-08-16 12:46:26 +02:00
firewire
firewire: net: Make use of get_unaligned_be48(), put_unaligned_be48()
2022-07-28 22:21:54 -07:00
firmware
Merge tag 'net-next-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2022-10-04 13:38:03 -07:00
fpga
fpga: m10bmc-sec: Fix possible memory leak of flash_buf
2022-09-19 12:58:19 +08:00
fsi
…
gnss
…
gpio
Merge tag 'platform-drivers-x86-v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
2022-10-05 10:38:24 -07:00
gpu
Merge 7fb68b6c82 ("Merge tag 'platform-drivers-x86-v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86") into android-mainline
2022-10-11 21:22:54 +02:00
greybus
…
hid
Merge tag 'v6.0-rc5' into i2c/for-mergewindow
2022-09-16 20:42:18 +01:00
hsi
…
hte
…
hv
Merge branch 'acpi-dev'
2022-09-30 20:05:16 +02:00
hwmon
Merge tag 'hwmon-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
2022-10-04 19:02:54 -07:00
hwspinlock
hwspinlock: qcom: Add support for mmio usage to sfpb-mutex
2022-07-16 21:47:44 -05:00
hwtracing
Merge tag 'asm-generic-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
2022-08-05 10:07:23 -07:00
i2c
Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2022-10-04 18:54:33 -07:00
i3c
…
idle
intel_idle: Add AlderLake-N support
2022-09-21 20:33:49 +02:00
iio
Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2022-10-04 18:54:33 -07:00
infiniband
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
2022-09-28 19:20:49 -07:00
input
Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2022-10-04 18:54:33 -07:00
interconnect
…
iommu
Merge dc164f4fb0 ("Merge tag 'for-linus-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux") into android-mainline
2022-09-22 15:56:57 +02:00
ipack
…
irqchip
irqchip/loongson-pch-lpc: Add dependence on LoongArch
2022-09-16 09:25:51 +01:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2022-10-03 17:44:18 -07:00
leds
Merge tag 'platform-drivers-x86-v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
2022-10-05 10:38:24 -07:00
macintosh
macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change
2022-09-17 20:37:23 +02:00
mailbox
Merge tag 'mailbox-v5.20' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2022-08-08 10:19:40 -07:00
mcb
…
md
Merge f4309528f3 ("Merge tag 'dlm-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline
2022-10-08 08:53:30 +02:00
media
Merge b86406d42a ("Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline
2022-10-09 14:09:50 +02:00
memory
Merge tag 'pm-5.20-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2022-08-08 14:29:00 -07:00
memstick
Merge tag 'mmc-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
2022-08-04 19:41:09 -07:00
message
…
mfd
Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2022-10-04 18:54:33 -07:00
misc
Merge b86406d42a ("Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline
2022-10-09 14:09:50 +02:00
mmc
Merge c3f13bbfc2 ("Merge tag 'mmc-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc") into android-mainline
2022-10-09 20:34:11 +02:00
most
…
mtd
i2c: Make remove callback return void
2022-08-16 12:46:26 +02:00
mux
…
net
Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2022-10-04 18:54:33 -07:00
nfc
Merge tag 'v6.0-rc5' into i2c/for-mergewindow
2022-09-16 20:42:18 +01:00
ntb
NTB: epf: Allow more flexibility in the memory BAR map method
2022-08-09 17:54:03 -04:00
nubus
…
nvdimm
Merge branch 'for-6.0/dax' into libnvdimm-fixes
2022-09-24 18:14:12 -07:00
nvme
Merge tag 'block-6.0-2022-09-29' of git://git.kernel.dk/linux
2022-09-30 09:33:33 -07:00
nvmem
Merge tag 'spdx-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx
2022-08-04 12:12:54 -07:00
of
Merge b86406d42a ("Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline
2022-10-09 14:09:50 +02:00
opp
OPP: Fix an un-initialized variable usage
2022-08-16 10:48:08 +05:30
parisc
parisc: remove obsolete manual allocation aligning in iosapic
2022-09-15 07:33:26 +02:00
parport
…
pci
Merge tag 'v6.0-rc1' into android-mainline
2022-08-25 12:19:15 +02:00
pcmcia
pcmcia: remove AT91RM9200 Compact Flash driver
2022-09-27 08:12:16 +02:00
peci
peci: cpu: Fix use-after-free in adev_release()
2022-08-15 20:31:35 +02:00
perf
Merge tag 'acpi-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2022-10-03 13:19:53 -07:00
phy
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2022-09-29 14:30:51 -07:00
pinctrl
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2022-09-22 13:02:10 -07:00
platform
Merge tag 'platform-drivers-x86-v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
2022-10-05 10:38:24 -07:00
pnp
PNPBIOS: remove unused pnpid32_to_pnpid() declaration
2022-09-24 18:07:42 +02:00
power
Merge b86406d42a ("Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline
2022-10-09 14:09:50 +02:00
powercap
powercap: intel_rapl: Use standard Energy Unit for SPR Dram RAPL domain
2022-09-24 19:32:46 +02:00
pps
…
ps3
…
ptp
ptp: Remove usage of the deprecated ida_simple_xxx API
2022-09-27 17:33:11 -07:00
pwm
Merge tag 'hwmon-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
2022-10-04 19:02:54 -07:00
rapidio
…
ras
RAS/CEC: Reduce offline page threshold for Intel systems
2022-08-22 19:30:02 +02:00
regulator
Merge tag 'regulator-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
2022-10-04 19:27:45 -07:00
remoteproc
Merge tag 'v6.0-rc2' into android-mainline
2022-08-29 12:23:02 +02:00
reset
reset: npcm: fix iprst2 and iprst4 setting
2022-09-22 17:48:35 +02:00
rpmsg
rpmsg: convert sysfs snprintf to sysfs_emit
2022-07-16 23:08:47 -05:00
rtc
i2c: Make remove callback return void
2022-08-16 12:46:26 +02:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2022-09-29 14:30:51 -07:00
sbus
…
scsi
Merge tag 'ata-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata
2022-09-29 05:40:59 -07:00
sh
…
siox
…
slimbus
…
soc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2022-09-29 14:30:51 -07:00
soundwire
soundwire: qcom: fix device status array range
2022-09-01 14:26:44 +05:30
spi
Merge tag 'spi-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
2022-10-04 19:36:53 -07:00
spmi
…
ssb
…
staging
Merge b86406d42a ("Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline
2022-10-09 14:09:50 +02:00
target
genetlink: start to validate reserved header bytes
2022-08-29 12:47:15 +01:00
tc
…
tee
tee: fix compiler warning in tee_shm_register()
2022-08-25 11:40:06 +02:00
thermal
Merge 0326074ff4 ("Merge tag 'net-next-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline
2022-10-09 14:09:35 +02:00
thunderbolt
Merge tag 'net-next-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2022-10-04 13:38:03 -07:00
tty
Merge b86406d42a ("Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline
2022-10-09 14:09:50 +02:00
ufs
Merge tag 'v6.0-rc3' into android-mainline
2022-08-29 13:10:43 +02:00
uio
…
usb
Merge b86406d42a ("Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline
2022-10-09 14:09:50 +02:00
vdpa
Merge tag 'net-next-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2022-10-04 13:38:03 -07:00
vfio
Merge tag 'vfio-v6.0-rc5' of https://github.com/awilliam/linux-vfio
2022-09-09 07:44:33 -04:00
vhost
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2022-10-03 17:44:18 -07:00
video
Merge branch 'master' into i2c/for-mergewindow
2022-09-27 21:33:37 +02:00
virt
kunit: fix Kconfig for build-in tests USB4 and Nitro Enclaves
2022-09-01 13:00:48 -06:00
virtio
Merge tag 'v6.0-rc2' into android-mainline
2022-08-29 12:23:02 +02:00
vlynq
…
w1
i2c: Make remove callback return void
2022-08-16 12:46:26 +02:00
watchdog
i2c: Make remove callback return void
2022-08-16 12:46:26 +02:00
xen
Merge tag 'for-linus-6.0-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2022-09-23 08:31:24 -07:00
zorro
…
Kconfig
…
Makefile
Merge tag 'staging-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2022-08-04 12:01:42 -07:00
OWNERS
…