shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
5febb590b7ac7787aacb5be7fddedc6235e13daf
linux/drivers
History
Greg Kroah-Hartman 5febb590b7 Merge a9c9a6f741 ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") into android-mainline 
Steps on the way to 5.15-rc1

Resolved merge issues in:
	drivers/scsi/ufs/ufshcd.c

and build issues in:
	drivers/scsi/ufs/ufshcd.c
	drivers/scsi/ufs/ufshcd-crypto.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4d4887e9d391f63308d856d8c1c6e40bc61f1bca
2021-09-14 12:57:12 +02:00
..
accessibility
…
acpi
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
2021-09-02 14:17:24 -07:00
amba
…
android
Merge ba1dc7f273 ("Merge tag 'char-misc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into android-mainline
2021-09-07 16:40:58 +02:00
ata
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2021-09-02 15:09:46 -07:00
atm
…
auxdisplay
…
base
Merge a9c9a6f741 ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") into android-mainline
2021-09-14 12:57:12 +02:00
bcma
Merge tag 'driver-core-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2021-09-01 08:44:42 -07:00
block
Merge a9c9a6f741 ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") into android-mainline
2021-09-14 12:57:12 +02:00
bluetooth
Bluetooth: btusb: Remove WAKEUP_DISABLE and add WAKEUP_AUTOSUSPEND for Realtek devices
2021-08-19 17:08:31 +02:00
bus
Merge tag 'drivers-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2021-09-01 15:25:28 -07:00
cdrom
…
char
Merge tag 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
2021-09-02 13:16:00 -07:00
clk
Merge 75d6e7d9ce ("Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux") into android-mainline
2021-09-14 08:46:39 +02:00
clocksource
Merge 4ac6d90867 ("Merge tag 'docs-5.15' of git://git.lwn.net/linux") into android-mainline
2021-09-09 14:00:42 +02:00
comedi
…
connector
…
counter
…
cpufreq
Merge 9e9fb7655e ("Merge tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline
2021-09-07 14:40:30 +02:00
cpuidle
Revert "Revert "FROMLIST: cpuidle: governor: export cpuidle governor functions""
2021-08-17 18:44:04 +00:00
crypto
crypto: ccp - Add support for new CCP/PSP device ID
2021-08-27 16:30:18 +08:00
cxl
…
dax
Merge tag 'driver-core-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2021-09-01 08:44:42 -07:00
dca
…
devfreq
…
dio
…
dma
Merge tag 'drivers-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2021-09-01 15:25:28 -07:00
dma-buf
Merge 477f70cd2a ("Merge tag 'drm-next-2021-08-31-1' of git://anongit.freedesktop.org/drm/drm") into android-mainline
2021-09-09 13:53:33 +02:00
edac
Merge tag 'irq-core-2021-08-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2021-08-30 14:38:37 -07:00
eisa
…
extcon
…
firewire
…
firmware
Merge 4ac6d90867 ("Merge tag 'docs-5.15' of git://git.lwn.net/linux") into android-mainline
2021-09-09 14:00:42 +02:00
fpga
Merge tag 'driver-core-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2021-09-01 08:44:42 -07:00
fsi
…
gnss
…
gpio
Merge tag 'irqchip-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
2021-08-29 21:19:50 +02:00
gpu
Merge 23852bec53 ("Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma") into android-mainline
2021-09-14 08:46:39 +02:00
greybus
…
hid
Merge 83ec916974 ("Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid") into android-mainline
2021-09-14 08:46:39 +02:00
hsi
…
hv
Merge tag 'hyperv-next-signed-20210831' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
2021-09-01 18:25:20 -07:00
hwmon
hwmon: add driver for Aquacomputer D5 Next
2021-08-28 08:53:30 -07:00
hwspinlock
…
hwtracing
Merge tag 'driver-core-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2021-09-01 08:44:42 -07:00
i2c
Merge tag 'platform-drivers-x86-v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
2021-09-02 13:49:39 -07:00
i3c
…
idle
…
iio
Merge tag 'staging-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2021-09-01 09:45:57 -07:00
infiniband
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2021-09-02 15:09:46 -07:00
input
Merge tag 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
2021-09-02 13:16:00 -07:00
interconnect
Merge tag 'icc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next
2021-08-24 15:33:04 +02:00
iommu
Merge tag 'dma-mapping-5.15' of git://git.infradead.org/users/hch/dma-mapping
2021-09-02 10:32:06 -07:00
ipack
Merge tag 'tty-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2021-09-01 09:51:16 -07:00
irqchip
Merge 7d6e3fa87e ("Merge tag 'irq-core-2021-08-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline
2021-09-06 13:34:16 +02:00
isdn
…
leds
leds: pca955x: Switch to i2c probe_new
2021-08-20 11:00:08 +02:00
macintosh
…
mailbox
mailbox: cmdq: add multi-gce clocks support for mt8195
2021-08-31 22:57:45 -05:00
mcb
…
md
Merge aef4892a63 ("Merge tag 'integrity-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity") into android-mainline
2021-09-14 08:42:24 +02:00
media
Merge 835d31d319 ("Merge tag 'media/v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media") into android-mainline
2021-09-09 13:47:07 +02:00
memory
…
memstick
Merge tag 'driver-core-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2021-09-01 08:44:42 -07:00
message
…
mfd
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
2021-09-02 14:17:24 -07:00
misc
Merge 7ba88a2a09 ("Merge tag 'platform-drivers-x86-v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86") into android-mainline
2021-09-14 08:46:38 +02:00
mmc
Merge 07281a257a ("Merge tag 'usb-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb") into android-mainline
2021-09-09 13:45:17 +02:00
most
…
mtd
Merge tag 'mtd/fixes-for-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux
2021-08-16 06:36:01 -10:00
mux
…
net
Merge 23852bec53 ("Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma") into android-mainline
2021-09-14 08:46:39 +02:00
nfc
nfc: st95hf: remove unused header includes
2021-08-26 09:13:36 +01:00
ntb
…
nubus
…
nvdimm
Merge tag 'driver-core-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2021-09-01 08:44:42 -07:00
nvme
Merge tag 'for-5.15/drivers-2021-08-30' of git://git.kernel.dk/linux-block
2021-08-30 19:01:46 -07:00
nvmem
nvmem: nintendo-otp: Add new driver for the Wii and Wii U OTP
2021-08-13 10:27:20 +02:00
of
Merge 4ac6d90867 ("Merge tag 'docs-5.15' of git://git.lwn.net/linux") into android-mainline
2021-09-09 14:00:42 +02:00
opp
Merge branches 'pm-pci', 'pm-sleep', 'pm-domains' and 'powercap'
2021-08-30 19:25:42 +02:00
parisc
Merge tag 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
2021-09-02 13:16:00 -07:00
parport
Merge tag 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
2021-09-02 13:16:00 -07:00
pci
Merge 89b6b8cd92 ("Merge tag 'vfio-v5.15-rc1' of git://github.com/awilliam/linux-vfio") into android-mainline
2021-09-14 08:46:38 +02:00
pcmcia
…
perf
…
phy
Merge tag 'char-misc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2021-09-01 08:35:06 -07:00
pinctrl
Merge tag 'pinctrl-v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
2021-09-02 14:22:56 -07:00
platform
Merge tag 'platform-drivers-x86-v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
2021-09-02 13:49:39 -07:00
pnp
…
power
Merge 4520dcbe0d ("Merge tag 'for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply") into android-mainline
2021-09-02 09:42:36 +02:00
powercap
powercap: Add Power Limit4 support for Alder Lake SoC
2021-08-25 20:12:16 +02:00
pps
…
ps3
…
ptp
ptp: ocp: Simplify Kconfig.
2021-08-26 12:06:42 +01:00
pwm
…
rapidio
…
ras
…
regulator
Merge remote-tracking branch 'regulator/for-5.14' into regulator-linus
2021-08-25 16:05:24 +01:00
remoteproc
…
reset
Merge tag 'drivers-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2021-09-01 15:25:28 -07:00
rpmsg
Merge c6c3c5704b ("Merge tag 'driver-core-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core") into android-mainline
2021-09-07 16:40:59 +02:00
rtc
…
s390
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2021-09-02 15:09:46 -07:00
sbus
…
scsi
Merge a9c9a6f741 ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") into android-mainline
2021-09-14 12:57:12 +02:00
sh
…
siox
…
slimbus
Merge tag 'driver-core-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2021-09-01 08:44:42 -07:00
soc
Merge tag 'drivers-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2021-09-01 15:25:28 -07:00
soundwire
Merge tag 'sound-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2021-09-01 10:29:29 -07:00
spi
Merge tag 'drivers-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2021-09-01 15:25:28 -07:00
spmi
…
ssb
…
staging
ANDROID: kernel: fix module info for debug_kinfo
2021-09-11 01:46:56 +08:00
target
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2021-09-02 15:09:46 -07:00
tc
…
tee
…
thermal
Merge tag 'platform-drivers-x86-v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
2021-09-02 13:49:39 -07:00
thunderbolt
Merge tag 'usb-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2021-09-01 09:59:34 -07:00
tty
Merge a2d616b935 ("Merge tag 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux") into android-mainline
2021-09-14 08:46:37 +02:00
uio
…
usb
Merge a9c9a6f741 ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") into android-mainline
2021-09-14 12:57:12 +02:00
vdpa
Merge tag 'driver-core-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2021-09-01 08:44:42 -07:00
vfio
Merge tag 'vfio-v5.15-rc1' of git://github.com/awilliam/linux-vfio
2021-09-02 13:41:33 -07:00
vhost
sock: remove one redundant SKB_FRAG_PAGE_ORDER macro
2021-08-26 10:46:20 +01:00
video
…
virt
…
virtio
ANDROID: virtio: disable virtio_dma_buf callback checks with CFI
2021-09-13 18:32:57 +00:00
visorbus
…
vlynq
…
vme
…
w1
…
watchdog
…
xen
Merge tag 'for-linus-5.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2021-09-02 13:20:11 -07:00
zorro
…
Kconfig
remove the lightnvm subsystem
2021-08-14 15:54:09 -06:00
Makefile
remove the lightnvm subsystem
2021-08-14 15:54:09 -06:00
OWNERS
…