anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
68d0da6f3e6b97e4e81aee17cad3791c10175813
msm-5.15/drivers
History
Greg Kroah-Hartman fd30fc5ebe Merge ff49c86f27 ("Merge tag 'f2fs-for-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline 
Steps on the way to 5.11-rc1

Resolves conflicts in:
	drivers/soc/qcom/rpmh-rsc.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Idc5921088554d0eb5bed7eca94c7fd7ca0fa6fb5
2020-12-21 09:54:59 +01:00
..
accessibility
speakup: fix uninitialized flush_lock
2020-12-09 15:38:13 +01:00
acpi
Merge tag 'acpi-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2020-12-15 16:39:06 -08:00
amba
…
android
Merge faf145d6f3 ("Merge branch 'exec-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace") into android-mainline
2020-12-18 23:03:21 +01:00
ata
…
atm
…
auxdisplay
…
base
Merge b4ec805464 ("Merge tag 'pm-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline
2020-12-18 15:32:45 +01:00
bcma
…
block
Merge 69f637c335 ("Merge tag 'for-5.11/drivers-2020-12-14' of git://git.kernel.dk/linux-block") into android-mainline
2020-12-19 16:06:54 +01:00
bluetooth
Bluetooth: btusb: Add workaround for remote-wakeup issues with Barrot 8041a02 fake CSR controllers
2020-12-07 17:01:54 +02:00
bus
Merge tag 'arm-soc-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2020-12-16 16:38:41 -08:00
cdrom
cdrom: Reset sector_size back it is not 2048.
2020-12-12 11:12:25 -07:00
char
Merge tag 'for-linus-5.11-1' of git://github.com/cminyard/linux-ipmi
2020-12-16 14:54:39 -08:00
clk
Merge ff49c86f27 ("Merge tag 'f2fs-for-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline
2020-12-21 09:54:59 +01:00
clocksource
Merge 7a932e5702 ("Merge tag 'asm-generic-timers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic") into android-mainline
2020-12-19 14:38:32 +01:00
connector
…
counter
counter: microchip-tcb-capture: Fix CMR value check
2020-12-03 19:40:31 +00:00
cpufreq
Merge b4ec805464 ("Merge tag 'pm-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline
2020-12-18 15:32:45 +01:00
cpuidle
Merge ff49c86f27 ("Merge tag 'f2fs-for-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline
2020-12-21 09:54:59 +01:00
crypto
Merge tag 'net-next-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2020-12-15 13:22:29 -08:00
dax
vm_ops: rename .split() callback to .may_split()
2020-12-15 12:13:41 -08:00
dca
…
devfreq
Merge branches 'pm-devfreq' and 'pm-tools'
2020-12-15 15:27:16 +01:00
dio
…
dma
…
dma-buf
Merge ac73e3dc8a ("Merge branch 'akpm' (patches from Andrew)") into android-mainline
2020-12-17 07:57:30 +01:00
edac
Merge branch 'akpm' (patches from Andrew)
2020-12-15 12:53:37 -08:00
eisa
…
extcon
extcon: max77693: Fix modalias string
2020-12-11 17:18:10 +09:00
firewire
…
firmware
Merge ff49c86f27 ("Merge tag 'f2fs-for-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline
2020-12-21 09:54:59 +01:00
fpga
Merge 5.10-rc7 into char-misc-next
2020-12-07 10:08:14 +01:00
fsi
Merge tag 'hwmon-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
2020-12-15 16:06:14 -08:00
gnss
…
gpio
Merge tag 'mfd-next-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2020-12-16 14:48:32 -08:00
gpu
Merge ff49c86f27 ("Merge tag 'f2fs-for-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline
2020-12-21 09:54:59 +01:00
greybus
…
hid
Merge 9805529ec5 ("Merge tag 'arm-soc-dt-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc") into android-mainline
2020-12-21 09:39:37 +01:00
hsi
…
hv
Merge tag 'hyperv-next-signed-20201214' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
2020-12-16 11:49:46 -08:00
hwmon
Merge tag 'arm-soc-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2020-12-16 16:38:41 -08:00
hwspinlock
hwspinlock: sirf: Remove the redundant 'of_match_ptr'
2020-12-10 13:34:40 -06:00
hwtracing
Merge tag 'char-misc-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2020-12-15 14:10:09 -08:00
i2c
Merge tag 'pm-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2020-12-15 16:30:31 -08:00
i3c
…
ide
Merge tag 'for-5.11/block-2020-12-14' of git://git.kernel.dk/linux-block
2020-12-16 12:57:51 -08:00
idle
…
iio
Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2020-12-15 14:18:40 -08:00
infiniband
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
2020-12-16 13:42:26 -08:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2020-12-15 16:18:23 -08:00
interconnect
Merge tag 'arm-soc-dt-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2020-12-16 16:27:35 -08:00
iommu
Merge 19778dd504 ("Merge tag 'iommu-updates-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux") into android-mainline
2020-12-20 17:17:58 +01:00
ipack
…
irqchip
Merge 2cffa11e2a ("Merge tag 'irq-core-2020-12-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline
2020-12-18 14:49:53 +01:00
isdn
…
leds
…
lightnvm
drivers/lightnvm: fix a null-ptr-deref bug in pblk-core.c
2020-12-08 10:02:45 -07:00
macintosh
macintosh/adb-iop: Send correct poll command
2020-12-07 10:48:16 +01:00
mailbox
…
mcb
…
md
Merge 69f637c335 ("Merge tag 'for-5.11/drivers-2020-12-14' of git://git.kernel.dk/linux-block") into android-mainline
2020-12-19 16:06:54 +01:00
media
Merge ff49c86f27 ("Merge tag 'f2fs-for-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline
2020-12-21 09:54:59 +01:00
memory
Merge tag 'memory-controller-drv-tegra-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers
2020-12-09 00:40:02 +01:00
memstick
memstick: r592: Fix error return in r592_probe()
2020-12-04 12:27:10 +01:00
message
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2020-12-16 13:34:31 -08:00
mfd
…
misc
Merge e2dc495734 ("Merge tag 'asm-generic-cleanup-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic") into android-mainline
2020-12-19 14:09:26 +01:00
mmc
Merge ce51c2b7ce ("Merge tag 'mmc-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc") into android-mainline
2020-12-18 15:11:42 +01:00
most
…
mtd
Merge tag 'mtd/for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux
2020-12-16 14:58:35 -08:00
mux
…
net
Merge 69f637c335 ("Merge tag 'for-5.11/drivers-2020-12-14' of git://git.kernel.dk/linux-block") into android-mainline
2020-12-19 16:06:54 +01:00
nfc
Merge tag 'net-next-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2020-12-15 13:22:29 -08:00
ntb
…
nubus
…
nvdimm
…
nvme
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
2020-12-16 13:42:26 -08:00
nvmem
…
of
Merge 7240153a9b ("Merge tag 'driver-core-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core") into android-mainline
2020-12-17 12:16:57 +01:00
opp
Merge branch 'pm-cpufreq'
2020-12-15 15:24:52 +01:00
oprofile
…
parisc
…
parport
…
pci
Merge 009bd55dfc ("Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma") into android-mainline
2020-12-19 16:07:13 +01:00
pcmcia
…
perf
perf/imx_ddr: Add system PMU identifier for userspace
2020-12-09 14:14:02 +00:00
phy
Merge tag 'char-misc-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2020-12-15 14:10:09 -08:00
pinctrl
Merge 3db1a3fa98 ("Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging") into android-mainline
2020-12-17 19:17:54 +01:00
platform
Merge tag 'thermal-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux
2020-12-15 16:21:37 -08:00
pnp
…
power
…
powercap
Merge branches 'pm-sleep', 'pm-acpi', 'pm-domains' and 'powercap'
2020-12-15 15:26:14 +01:00
pps
…
ps3
…
ptp
ptp: clockmatrix: deprecate firmware older than 4.8.7
2020-12-09 15:00:55 -08:00
pwm
Merge 5.10-rc7 into android-mainline
2020-12-09 08:09:26 +01:00
rapidio
rapidio: remove unused rio_get_asm() and rio_get_device()
2020-12-15 22:46:18 -08:00
ras
…
regulator
Merge remote-tracking branch 'regulator/for-5.11' into regulator-next
2020-12-11 17:48:32 +00:00
remoteproc
Merge tag 'arm-soc-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2020-12-16 16:38:41 -08:00
reset
Merge tag 'arm-soc-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2020-12-16 16:38:41 -08:00
rpmsg
Merge 9867cb1fd5 ("Merge tag 'jfs-5.11' of git://github.com/kleikamp/linux-shaggy") into android-mainline
2020-12-18 17:01:19 +01:00
rtc
ntp: Make the RTC sync offset less obscure
2020-12-11 10:40:53 +01:00
s390
Merge tag 'vfio-v5.11-rc1' of git://github.com/awilliam/linux-vfio
2020-12-16 15:51:15 -08:00
sbus
…
scsi
Merge 60f7c503d9 ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") into android-mainline
2020-12-19 16:07:11 +01:00
sfi
…
sh
…
siox
siox: Make remove callback return void
2020-12-10 16:17:15 +01:00
slimbus
slimbus: qcom: fix potential NULL dereference in qcom_slim_prg_slew()
2020-12-10 16:23:56 +01:00
soc
Merge b4ec805464 ("Merge tag 'pm-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline
2020-12-18 15:32:45 +01:00
soundwire
soundwire: intel: fix another unused-function warning
2020-12-05 13:11:54 +05:30
spi
Merge 605ea5aafe ("Merge tag 'spi-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi") into android-mainline
2020-12-18 15:09:55 +01:00
spmi
spmi: Add driver shutdown support
2020-12-10 10:45:36 +01:00
ssb
…
staging
ANDROID: delete ION code
2020-12-17 19:16:56 +01:00
target
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2020-12-16 13:34:31 -08:00
tc
…
tee
Merge tag 'arm-soc-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2020-12-16 16:38:41 -08:00
thermal
Revert "ANDROID: Revert "thermal: Make thermal_zone_device_is_enabled() available to core only""
2020-12-18 15:23:13 +01:00
thunderbolt
Merge tag 'thunderbolt-for-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next
2020-12-08 13:41:45 +01:00
tty
Merge d3eb52113d ("Merge tag 'printk-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux") into android-mainline
2020-12-19 16:06:36 +01:00
uio
uio: uio_hv_generic: use devm_kzalloc() for private data alloc
2020-12-09 19:59:00 +01:00
usb
Merge 69f637c335 ("Merge tag 'for-5.11/drivers-2020-12-14' of git://git.kernel.dk/linux-block") into android-mainline
2020-12-19 16:06:54 +01:00
vdpa
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
2020-12-07 18:36:21 -08:00
vfio
Merge tag 'vfio-v5.11-rc1' of git://github.com/awilliam/linux-vfio
2020-12-16 15:51:15 -08:00
vhost
vhost: vringh: use krealloc_array()
2020-12-15 12:13:37 -08:00
video
Merge tag 'backlight-next-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
2020-12-16 14:52:37 -08:00
virt
…
virtio
Merge ac73e3dc8a ("Merge branch 'akpm' (patches from Andrew)") into android-mainline
2020-12-17 07:57:30 +01:00
visorbus
…
vlynq
…
vme
vme: switch from 'pci_' to 'dma_' API
2020-12-09 19:44:34 +01:00
w1
…
watchdog
…
xen
Merge tag 'for-linus-5.11-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2020-12-16 11:53:09 -08:00
zorro
…
Kconfig
…
Makefile
Merge tag 'asm-generic-timers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
2020-12-16 00:07:17 -08:00