shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity
960,391 Commits 55 Branches 2,486 Tags
cc5b1bd7fa8be262a5a686854771301d890401ef
Commit Graph

960391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Kroah-Hartman
cc5b1bd7fa Merge c48b75b727 ("Merge tag 'sound-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound") into android-mainline 
Steps on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2833b58dbd8d715935ac010349f6e28657078bd0
 2020-10-26 08:01:08 +01:00
Greg Kroah-Hartman
5baf8a8e5c Merge 93b694d096 ("Merge tag 'drm-next-2020-10-15' of git://anongit.freedesktop.org/drm/drm") into android-mainline 
Steps on the way to 5.10-rc1

Fixes merge conflicts in:
	drivers/gpu/drm/bridge/lontium-lt9611.c
	drivers/gpu/drm/virtio/virtgpu_display.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I65d9d4c69ea7c79854d275462c9aca0a37d42654
 2020-10-26 07:53:47 +01:00
Greg Kroah-Hartman
1e8a6b61a6 Merge 726eb70e0d ("Merge tag 'char-misc-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into android-mainline 
Steps on the way to 5.10-rc1

Resolves conflicts in:
	drivers/hwtracing/stm/ftrace.c
	drivers/misc/Makefile

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I8ac53000bf0c61973970f47b383904a2067bd353
 2020-10-26 07:40:57 +01:00
Greg Kroah-Hartman
5462941039 Merge c6dbef7307 ("Merge tag 'usb-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb") into android-mainline 
Steps on the way to 5.10-rc1

Fixes merges in:
	drivers/usb/typec/tcpm/tcpm.c
	include/linux/usb/tcpm.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie6de88b6cdc3415679c2f931fc03147a7609d333
 2020-10-26 07:14:55 +01:00
Greg Kroah-Hartman
558647c507 Merge ade7afe3e6 ("Merge tag 'staging-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging") into android-mainline 
Steps on the way to 5.10-rc1

Resolves conflicts in:
	drivers/staging/android/ion/ion.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I77e65fccc386a64a46a394fba2ea312d82d84d36
 2020-10-26 07:09:59 +01:00
Greg Kroah-Hartman
a11fd12c23 Merge 3e4fb4346c ("Merge tag 'spdx-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx") into android-mailine 
Steps on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifd6acb7037073d3b8411647e2087aa0df71c8830
 2020-10-26 07:05:05 +01:00
Greg Kroah-Hartman
22a7eefbeb Merge 55e0500eb5 ("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.10-rc1

Fixes merge issues in:
	drivers/scsi/ufs/ufs-qcom.c
	drivers/scsi/ufs/ufshcd.c
	drivers/scsi/ufs/ufshcd.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I69dcb6886b123c75dddf0781fe7bc04db7004032
 2020-10-25 16:58:34 +01:00
Greg Kroah-Hartman
cf785fec62 Merge 4815519ed0 ("Merge tag 'for-5.10/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm") into android-mainline 
Steps on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Icc39c31375d6446d72331f8ace728a44199bbc5e
 2020-10-25 16:27:51 +01:00
Greg Kroah-Hartman
8c3d23ed9c Merge 6e4dc3d592 ("Merge tag 'for-linus-5.10-1' of git://github.com/cminyard/linux-ipmi") into android-mainline 
Steps on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Idbd0577a495237bf5628333110e2c98a77b39c77
 2020-10-25 16:26:30 +01:00
Greg Kroah-Hartman
1316a9db4d Merge 531d29b0b6 ("Merge tag 'iommu-updates-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu") into android-mainline 
Steps on the way to 5.10-rc1

Resolves conflicts in:
        drivers/iommu/arm/arm-smmu/arm-smmu.c
        drivers/iommu/arm/arm-smmu/arm-smmu.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If295967f3cc66a76c442e72ceabb95365bfc2ff6
 2020-10-25 16:21:39 +01:00
Eric Biggers
e131b06892 ANDROID: adjust 5.10 fscrypt merge resolution 
Remove a redundant declaration and adjust a comment in order to get
android-mainline in sync with how this merge resolution was done in
android12-5.4 (http://aosp/1469924).

Fixes: 9d77f49849 ("Merge 6f5032a852 ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline")
Change-Id: Ib005bec74f0fb7e7f6aaf2ba03fa293b6bfb6835
Signed-off-by: Eric Biggers <ebiggers@google.com>
 2020-10-25 15:20:15 +00:00
Greg Kroah-Hartman
2f33651bdf ANDROID: GKI: fix up arguments for trace_android_vh_arch_set_freq_scale() 
The 'cpus' parameter is now a constant pointer, so fix up the parameter
definition so that the build no longer breaks.

This was caused by upstream commit a20b7053b5 ("cpufreq,arm,arm64:
restructure definitions of arch_set_freq_scale()")

Bug: 167126223
Fixes: 07f80e7c1e ("ANDROID: sched: add cpumask parameter to cpu capacity vendor hook")
Cc: Yun Hsiang <yun.hsiang@mediatek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic96ff16028980fd8609c5d295454b9080c66fbe2
 2020-10-25 15:14:13 +01:00
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
Greg Kroah-Hartman
83f76c848d ANDROID: GKI: remove explicit CONFIG_SECCOMP from defconfig for arm64 
This gets pulled in automatically now, so we don't have to explicitly
set it.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia1d0735ac3113c152da85ac59d7302b3f9a9aed6
 2020-10-25 12:33:20 +01:00
Greg Kroah-Hartman
75c90a8c3a Merge d5660df4a5 ("Merge branch 'akpm' (patches from Andrew)") into android-mainline 
steps on the way to 5.10-rc1

Change-Id: Iddc84c25b6a9d71fa8542b927d6f69c364131c3d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
 2020-10-25 11:57:29 +01:00
Greg Kroah-Hartman
aedaedc749 Merge 7cd4ecd917 ("Merge tag 'drivers-5.10-2020-10-12' of git://git.kernel.dk/linux-block") into android-mainline 
Steps on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie4e2b65874248082be3c0e05b1bb591f9f46128c
 2020-10-25 11:56:29 +01:00
Greg Kroah-Hartman
6a83be9696 Merge 79ec6d9cac ("Merge tag 'libata-5.10-2020-10-12' of git://git.kernel.dk/linux-block") into android-mainline 
Steps on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I162904ccd4c5919c6747f97bb673523cfa44891a
 2020-10-25 11:51:17 +01:00
Greg Kroah-Hartman
e24a525c0d Merge 6ad4bf6ea1 ("Merge tag 'io_uring-5.10-2020-10-12' of git://git.kernel.dk/linux-block") into android-mainline 
Resolves conflict with:
	kernel/fork.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6c031ef388bfddfe80a64929d62969718755f740
 2020-10-25 11:50:09 +01:00
Greg Kroah-Hartman
35cda5af62 Revert "block: grant IOPRIO_CLASS_RT to CAP_SYS_NICE" 
This reverts commit 9d3a39a5f1 as that
commit causes a bunch of SELinux errors.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I73dc15c4ecddcf1950ca7fca2cc107be27da8f3f
 2020-10-24 17:30:14 +02:00
Greg Kroah-Hartman
c62fe038fe Merge 3ad11d7ac8 ("Merge tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block") into android-mainline 
Steps on the way to 5.10-rc1

Resolves conflicts in:
	include/linux/blk-crypto.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4012850c2e4b804d9e87e90b8e03a3b9ce21b5e7
 2020-10-24 17:29:43 +02:00
Greg Kroah-Hartman
072f3a5b28 Merge a7863b3423 ("blk-iocost: update iocost_monitor.py") into android-mainline 
Bisection on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib96c933a2903e2f30edc0ca13929a318537f77d8
 2020-10-24 14:40:14 +02:00
Greg Kroah-Hartman
6c45f08d88 Merge 0460375517 ("blk-iocost: restore inuse update tracepoints") into android-mailine 
Bisection on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3f67860c970bea3019c374ba34e051ca78282a92
 2020-10-24 13:14:50 +02:00
Greg Kroah-Hartman
b5a717365a Merge c421a3eb2e ("blk-iocost: revamp debt handling") into android-mainline 
Bisection on the way to 5.10-rc1

Change-Id: I601c029848bafea95f6a40682264ca5ce76c8b8d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
 2020-10-24 12:09:26 +02:00
Greg Kroah-Hartman
dcc7dd95ad Merge 97eb19751f ("blk-iocost: add absolute usage stat") into android-mainline 
Bisection on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic074e5010e8b4480d50bb84b56c3cf64c3afaaeb
 2020-10-24 12:07:50 +02:00
Greg Kroah-Hartman
e92900328d Merge 1f06959bd2 ("block: remove the unused q argument to part_in_flight and part_in_flight_rw") into android-mailine 
Bisection on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2cd6d1d4deabeb7f9a17cf558aebd589449a37da
 2020-10-24 10:17:17 +02:00
Greg Kroah-Hartman
9494704faf Merge a98278ecfb ("Merge branch 'block-5.9' into for-5.10/block") into android-mainline 
Steps on the way to 5.10-rc1

Change-Id: I13aee94a526318eb64fd6b5c2c02a6c7c980e4ac
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
 2020-10-24 10:17:16 +02:00
Lina Iyer
dbdf52541a ANDROID: sched: export wake_up_if_idle() 
Enable idle drivers to wakeup idle CPUs by exporting wake_up_if_idle().

Bug: 169136276
Signed-off-by: Lina Iyer <ilina@codeaurora.org>
Change-Id: If1529ad4b883f36de1692cd3ac1853ff722e3522
 2020-10-23 18:05:44 +00:00
Lina Iyer
4de53aef65 ANDROID: tick/nohz: export tick_nohz_get_sleep_length() 
Export tick_nohz_get_sleep_length() so idle drivers may use this to
determine the available idle time before the next timer wakeup.

Bug: 169136276
Signed-off-by: Lina Iyer <ilina@codeaurora.org>
Change-Id: I0d18638d63c032862ae048bc2c3d49fa1bd90291
 2020-10-23 18:05:30 +00:00
Lina Iyer
96c860fcf4 FROMLIST: cpuidle: governor: export cpuidle governor functions 
Commit 83788c0cae ("cpuidle: remove unused exports") removed
capability of registering cpuidle governors, which was unused at that
time. By exporting the symbol, let's allow platform specific modules to
register cpuidle governors and use cpuidle_governor_latency_req() to get
the QoS for the CPU.

Bug: 169136276
Link: https://lore.kernel.org/linux-pm/010101746fc98add-45e77496-d2d6-4bc1-a1ce-0692599a9a7a-000000@us-west-2.amazonses.com/
Signed-off-by: Lina Iyer <ilina@codeaurora.org>
Change-Id: Ifa91576af0a3ae92ce9b216cb67728f037546c5b
 2020-10-23 18:04:09 +00:00
Greg Kroah-Hartman
0b405dbc60 Merge 857d64485e ("Merge tag 'x86_urgent_for_v5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline 
Steps on the way to 5.10-rc1

Change-Id: I74f0a930f0709b6663074b9a44eb56b0b6737183
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
 2020-10-23 14:15:45 +02:00
Greg Kroah-Hartman
cc35535c27 Merge c4439713e8 ("Merge tag 'hwmon-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging") into android-mainline 
Steps on the way to 5.10-rc1

Change-Id: Iedfa9db7fb606a00d6da3d8216d9c4fa4fd9bea4
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
 2020-10-23 14:13:57 +02:00
Greg Kroah-Hartman
56860c8542 Merge 0486beaf88 ("Merge tag 'gpio-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio") into android-mainline 
Steps on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7395903c218c84b8d629829069690a8f9f618f58
 2020-10-23 12:01:26 +02:00
Greg Kroah-Hartman
aec7085396 Merge 647412daeb ("Merge tag 'mmc-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc") into android-mainline 
Steps on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7ef0b81d31025e256bd85102013ed3ad038a54b1
 2020-10-23 11:59:44 +02:00
Greg Kroah-Hartman
9d77f49849 Merge 6f5032a852 ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline 
Steps on the way to 5.10-rc1

Change-Id: Ifceecc1b9f94ea893484002c69aeb7b82d246f64
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
 2020-10-23 11:56:31 +02:00
Greg Kroah-Hartman
f52c09b3c9 Merge 39a5101f98 ("Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6") into android-mainline 
Steps on the way to 5.10-rc1

Change-Id: I4f485a6b5b9811e2cd3cfb45e58bca3d965b64ed
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
 2020-10-23 11:44:49 +02:00
Greg Kroah-Hartman
0438bd576f Merge 865c50e1d2 ("x86/uaccess: utilize CONFIG_CC_HAS_ASM_GOTO_OUTPUT") into android-mainline 
Steps on the way to 5.10-rc1

Change-Id: Ia787e650d54f44cb47b7f567adf5c1f2cf198cd5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
 2020-10-23 11:40:57 +02:00
Greg Kroah-Hartman
04e9454d59 Merge 53acd35050 ("Merge tag 'locks-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux") into android-mainline 
Steps on the way to 5.10-rc1

Change-Id: I916b08256c0d290ae8d9fa5d4621570ccd1ec707
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
 2020-10-23 10:25:52 +02:00
Greg Kroah-Hartman
1158041ed1 Merge 22230cd2c5 ("Merge branch 'compat.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-mainline 
Steps on the way to 5.10-rc1

Change-Id: I7dcdfa12eb9c3ff9fe23ae48fb58110538a520a7
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
 2020-10-23 10:23:55 +02:00
Greg Kroah-Hartman
1c9bbee578 Revert "iov_iter: move rw_copy_check_uvector() into lib/iov_iter.c" 
This reverts commit fb041b5989.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I325ae5c3edd6b4cd4213a5c63fec17df842930b7
 2020-10-23 10:21:32 +02:00
Greg Kroah-Hartman
d59c65253c Revert "iov_iter: refactor rw_copy_check_uvector and import_iovec" 
This reverts commit bfdc59701d.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibf840a8fb38cb7d5888fb1bb1313647edf0b336e
 2020-10-23 10:21:30 +02:00
Greg Kroah-Hartman
836219141f Revert "iov_iter: transparently handle compat iovecs in import_iovec" 
This reverts commit 89cd35c58b.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I44ac1575af118ddbc3ee22a70f81cba282f5372a
 2020-10-23 10:21:28 +02:00
Greg Kroah-Hartman
75bd2bca50 Revert "fs: remove various compat readv/writev helpers" 
This reverts commit 3523a9d454.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I680effca58fd0fd38fd9ff551d81e9dc26183b5f
 2020-10-23 10:21:24 +02:00
Greg Kroah-Hartman
9b71b12a27 Revert "fs: remove the compat readv/writev syscalls" 
This reverts commit 5f764d624a.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib733da773e5b3adae34ee75a766c8fe8217b8ef3
 2020-10-23 10:21:21 +02:00
Greg Kroah-Hartman
3ea6bc5890 Revert "fs: remove compat_sys_vmsplice" 
This reverts commit 598b3cec83.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic4f6f6cd43c87ab1e2cbfd610ef26616a718f47d
 2020-10-23 10:21:18 +02:00
Greg Kroah-Hartman
61e719d64f Revert "mm: remove compat_process_vm_{readv,writev}" 
This reverts commit c3973b401e.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I050b6767cbb0a958ebf3cc7e3475e552deee4048
 2020-10-23 10:21:17 +02:00
Greg Kroah-Hartman
4cfe64ac4c Revert "security/keys: remove compat_keyctl_instantiate_key_iov" 
This reverts commit 5d47b39479.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I08f80f63ab81079046628e9558475ceaf22273c2
 2020-10-23 10:21:15 +02:00
Greg Kroah-Hartman
4742d2d830 Merge e18afa5bfa ("Merge branch 'work.quota-compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-mainline 
Steps on the way to 5.10-rc1

Change-Id: I9aedb672731bbc03099d8e7dc11351b02ec2ceb6
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
 2020-10-23 10:13:50 +02:00
Greg Kroah-Hartman
87b0d10a70 Merge 85ed13e78d ("Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-common 
Steps in the way to 5.10-rc1

Change-Id: Ida014e494f8c8b8cc44209df17d8b07b3bd94f1a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
 2020-10-23 10:13:30 +02:00
Eric Biggers
dfd572c112 ANDROID: irqchip/gic-v3: fix bad merge resolution 
A line from commit b19f0cc3fe ("ANDROID: power: wakeup_reason: wake
reason enhancements") got dropped.

Fixes: eb87047f08 ("Merge c457cc800e ("Merge tag 'irq-core-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline")
Bug: 120445600
Change-Id: I2ac07946b60adb42114d8322b44806dce0ffc407
Signed-off-by: Eric Biggers <ebiggers@google.com>
 2020-10-23 06:41:00 +00:00
Chanho Park
bfa46ee8cb ANDROID: GKI: add built-in PCIE_DW_PLAT_EP 
To build an EP driver which is based on PCIe designware as module, we
need to get some symbols from pcie-designware_ep.c. To select the
source from GKI kernel, we should enable PCIE_DW_PLAT_EP driver as
prebuilt.

Bug: 167931570
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
Change-Id: Iffc1d90419378e1f3cf13c3e5ecddadd84dc1540
 2020-10-23 06:36:07 +00:00