Greg Kroah-Hartman 37afce95bb Merge 79db2b74aa ("Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb") into android-mainline ... Resolves merge issues with: drivers/cpufreq/cpufreq.c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ic2907cf71867dab7b8e1b5fcbd4c888fc01f8c22		2020-10-25 13:05:17 +01:00
..
accessibility	Char/Misc driver fixes for 5.9-rc3	2020-08-26 10:50:50 -07:00
acpi	PNP updates for 5.10-rc1	2020-10-14 11:50:01 -07:00
amba
android	Revert "ANDROID: disable ANDROID_VENDOR_HOOKS"	2020-10-21 17:41:18 +00:00
ata	ata: ahci: mvebu: Make SATA PHY optional for Armada 3720	2020-10-09 12:47:56 -06:00
atm	atm: eni: fix the missed pci_disable_device() for eni_init_one()	2020-09-04 21:42:57 -07:00
auxdisplay	A trivial patch for auxdisplay:	2020-09-05 14:22:46 -07:00
base	Merge 79db2b74aa ("Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb") into android-mainline	2020-10-25 13:05:17 +01:00
bcma	bcma: gpio: Use irqchip template	2020-08-02 18:26:51 +03:00
block	Merge 7cd4ecd917 ("Merge tag 'drivers-5.10-2020-10-12' of git://git.kernel.dk/linux-block") into android-mainline	2020-10-25 11:56:29 +01:00
bluetooth	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next	2020-07-31 15:11:52 -07:00
bus	arch, drivers: replace for_each_membock() with for_each_mem_range()	2020-10-13 18:38:35 -07:00
cdrom	gdrom: use bdev_check_media_change	2020-09-10 09:32:31 -06:00
char	Merge 1f06959bd2 ("block: remove the unused q argument to part_in_flight and part_in_flight_rw") into android-mailine	2020-10-24 10:17:17 +02:00
clk	FROMLIST: clk: versatile: remove dependency on ARCH_*	2020-10-16 18:07:02 +00:00
clocksource	hyperv-next for 5.10	2020-10-14 10:32:10 -07:00
connector
counter	counter: microchip-tcb-capture: check the correct variable	2020-08-22 11:38:42 +01:00
cpufreq	Merge 79db2b74aa ("Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb") into android-mainline	2020-10-25 13:05:17 +01:00
cpuidle	Merge 79db2b74aa ("Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb") into android-mainline	2020-10-25 13:05:17 +01:00
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2020-10-13 08:50:16 -07:00
dax	device-dax: add a range mapping allocation attribute	2020-10-13 18:38:29 -07:00
dca
devfreq	PM / devfreq: tegra30: Improve initial hardware resetting	2020-09-29 17:50:10 +09:00
dio
dma	dmaengine: dmatest: Prevent to run on misconfigured channel	2020-09-22 20:18:05 +05:30
dma-buf	ANDROID: dma-buf: Cleanup minor usage in "Add proper kref handling on dma-buf heaps"	2020-10-22 04:48:12 +00:00
edac	EFI changes for v5.10:	2020-10-12 13:26:49 -07:00
eisa
extcon
firewire	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
firmware	Merge 79db2b74aa ("Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb") into android-mainline	2020-10-25 13:05:17 +01:00
fpga
fsi
gnss	ANDROID: fix up Android-specific Kconfig ---help--- strings	2020-08-17 09:13:01 +02:00
gpio	GPIO bulk changes for the v5.10 kernel cycle:	2020-10-13 10:09:33 -07:00
gpu	Merge 79db2b74aa ("Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb") into android-mainline	2020-10-25 13:05:17 +01:00
greybus	greybus: Use fallthrough pseudo-keyword	2020-07-29 16:58:08 +02:00
hid	Merge 79db2b74aa ("Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb") into android-mainline	2020-10-25 13:05:17 +01:00
hsi	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
hv	hyperv-next for 5.10	2020-10-14 10:32:10 -07:00
hwmon	hwmon: (pmbus/max20730) adjust the vout reading given voltage divider	2020-10-06 14:54:55 -07:00
hwspinlock
hwtracing	Merge 5.9-rc3 into android-mainline	2020-08-31 19:51:25 +02:00
i2c	i2c: owl: Clear NACK and BUS error bits	2020-10-10 13:15:46 +02:00
i3c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
ide	block-5.10-2020-10-12	2020-10-13 12:12:44 -07:00
idle	cpuidle: Make CPUIDLE_FLAG_TLB_FLUSHED generic	2020-08-26 12:41:53 +02:00
iio	iio: adc: qcom-spmi-adc5: fix driver name	2020-09-22 13:33:19 +01:00
infiniband	block-5.10-2020-10-12	2020-10-13 12:12:44 -07:00
input	hyperv-next for 5.10	2020-10-14 10:32:10 -07:00
interconnect	interconnect: qcom: Fix small BW votes being truncated to zero	2020-09-04 00:07:12 +03:00
iommu	Merge 79db2b74aa ("Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb") into android-mainline	2020-10-25 13:05:17 +01:00
ipack
irqchip	Merge 79db2b74aa ("Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb") into android-mainline	2020-10-25 13:05:17 +01:00
isdn	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
leds	LEDs changes for 5.9-rc1.	2020-08-05 19:24:27 -07:00
lightnvm	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
macintosh	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
mailbox	iomap: constify ioreadX() iomem argument (as in generic implementation)	2020-08-14 19:56:57 -07:00
mcb
md	Merge 7cd4ecd917 ("Merge tag 'drivers-5.10-2020-10-12' of git://git.kernel.dk/linux-block") into android-mainline	2020-10-25 11:56:29 +01:00
media	Merge 0486beaf88 ("Merge tag 'gpio-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio") into android-mainline	2020-10-23 12:01:26 +02:00
memory	PM / devfreq: event: Change prototype of devfreq_event_get_edev_by_phandle function	2020-09-29 17:50:10 +09:00
memstick	Merge branch 'fixes' into next	2020-09-28 12:17:36 +02:00
message	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
mfd	- Bug Fixes	2020-08-28 10:15:33 -07:00
misc	Merge ac74075e5d ("Merge tag 'x86_pasid_for_5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2020-10-21 08:37:04 +02:00
mmc	Merge 3ad11d7ac8 ("Merge tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block") into android-mainline	2020-10-24 17:29:43 +02:00
most	drivers: most: add USB adapter driver	2020-07-31 14:38:12 +02:00
mtd	block-5.10-2020-10-12	2020-10-13 12:12:44 -07:00
mux	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
net	Merge 79db2b74aa ("Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb") into android-mainline	2020-10-25 13:05:17 +01:00
nfc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-09-03 18:50:48 -07:00
ntb	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
nubus
nvdimm	mm/memremap_pages: support multiple ranges per invocation	2020-10-13 18:38:28 -07:00
nvme	Merge 1f06959bd2 ("block: remove the unused q argument to part_in_flight and part_in_flight_rw") into android-mailine	2020-10-24 10:17:17 +02:00
nvmem	nvmem: qcom-spmi-sdam: Enable multiple devices	2020-07-29 17:12:09 +02:00
of	Linux 5.9-rc2	2020-08-24 10:01:23 +02:00
opp	Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm	2020-10-06 12:26:45 +02:00
oprofile	module: Fix up module_notifier return values	2020-09-01 09:58:03 +02:00
parisc	Merge branch 'parisc-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux	2020-08-12 12:41:15 -07:00
parport	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
pci	Power management updates for 5.10-rc1	2020-10-14 10:45:41 -07:00
pcmcia	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
perf	perf: arm-cmn: Fix conversion specifiers for node type	2020-10-01 22:30:07 +01:00
phy	phy: Second round of fixes for 5.9	2020-09-29 17:21:54 +02:00
pinctrl	Merge 0486beaf88 ("Merge tag 'gpio-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio") into android-mainline	2020-10-23 12:01:26 +02:00
platform	platform-drivers-x86 for v5.10-1	2020-10-14 10:43:24 -07:00
pnp	PNP: remove the now unused pnp_find_card() function	2020-10-08 18:00:08 +02:00
power	Merge 79db2b74aa ("Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb") into android-mainline	2020-10-25 13:05:17 +01:00
powercap	powercap: include header to fix -Wmissing-prototypes	2020-09-25 16:46:01 +02:00
pps
ps3	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
ptp	ptp: ptp_clockmatrix: use i2c_master_send for i2c write	2020-08-19 16:23:22 -07:00
pwm	Merge 4b6c093e21 ("Merge tag 'block-5.9-2020-08-14' of git://git.kernel.dk/linux-block") into android-mainline	2020-08-17 09:19:35 +02:00
rapidio	rapidio: Replace 'select' DMAENGINES 'with depends on'	2020-09-05 19:52:54 +03:00
ras	RAS/CEC: Convert to DEFINE_SHOW_ATTRIBUTE()	2020-09-25 19:05:31 +02:00
regulator	Merge remote-tracking branch 'regulator/for-5.10' into regulator-next	2020-10-05 16:54:56 +01:00
remoteproc	remoteproc: scp: add COMPILE_TEST dependency	2020-09-26 09:40:05 +02:00
reset	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
rpmsg	ANDROID: rpmsg: core: Add signal API support	2020-09-29 23:20:55 +00:00
rtc	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
s390	Merge 1f06959bd2 ("block: remove the unused q argument to part_in_flight and part_in_flight_rw") into android-mailine	2020-10-24 10:17:17 +02:00
sbus
scsi	Merge 79db2b74aa ("Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb") into android-mainline	2020-10-25 13:05:17 +01:00
sfi
sh	iomap: constify ioreadX() iomem argument (as in generic implementation)	2020-08-14 19:56:57 -07:00
siox
slimbus
soc	Merge 79db2b74aa ("Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb") into android-mainline	2020-10-25 13:05:17 +01:00
soundwire	soundwire: fix double free of dangling pointer	2020-09-03 14:10:19 +05:30
spi	spi: Fix for v5.9	2020-10-09 18:05:12 -07:00
spmi
ssb	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
staging	Merge 0486beaf88 ("Merge tag 'gpio-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio") into android-mainline	2020-10-23 12:01:26 +02:00
target	block-5.10-2020-10-12	2020-10-13 12:12:44 -07:00
tc
tee
thermal	- Fix bogus thermal shutdowns for omap4430 where bogus values	2020-09-04 12:49:03 -07:00
thunderbolt	thunderbolt: Fix for v5.9-rc6	2020-09-15 13:52:14 +02:00
tty	ANDROID: serial: msm_geni_serial_earlycon: Remove unused variable	2020-10-16 16:00:20 +00:00
uio
usb	ANDROID: usb: f_accessory: Send uevent when receive control request	2020-10-23 03:49:21 +00:00
vdpa	vdpa/mlx5: Fix dependency on MLX5_CORE	2020-10-08 16:02:00 -04:00
vfio	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
vhost	vhost-vdpa: fix page pinning leakage in error path	2020-10-04 03:47:02 -04:00
video	drm-misc-fixes for v5.9:	2020-10-06 12:38:28 +10:00
virt
virtio	Merge d5660df4a5 ("Merge branch 'akpm' (patches from Andrew)") into android-mainline	2020-10-25 11:57:29 +01:00
visorbus
vlynq
vme
w1
watchdog	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
xen	xen: branch for v5.10-rc1	2020-10-14 10:34:45 -07:00
zorro	zorro: Fix address space collision message with RAM expansion boards	2020-08-26 13:26:52 +02:00
Kconfig
Makefile