Eric Lee / smarc-fsl-linux-kernel

25 Oct, 2020

11 commits

cf785fec6 Merge 4815519ed0af ("Merge tag 'for-5.10/dm-changes' of git://git.kernel.org/pub… ... Browse Code »

…/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

Greg Kroah-Hartman
2020-10-25 23:27:51 +0800
8c3d23ed9 Merge 6e4dc3d59284 ("Merge tag 'for-linus-5.10-1' of git://github.com/cminyard/l… ... Browse Code »

…inux-ipmi") into android-mainline

Steps on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Idbd0577a495237bf5628333110e2c98a77b39c77

Greg Kroah-Hartman
2020-10-25 23:26:30 +0800
1316a9db4 Merge 531d29b0b674 ("Merge tag 'iommu-updates-v5.10' of git://git.kernel.org/pub… ... Browse Code »

…/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

Greg Kroah-Hartman
2020-10-25 23:21:39 +0800
e131b0689 ANDROID: adjust 5.10 fscrypt merge resolution ... Browse Code »

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: 9d77f49849d3 ("Merge 6f5032a852f9 ("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

Eric Biggers
2020-10-25 23:20:15 +0800
2f33651bd ANDROID: GKI: fix up arguments for trace_android_vh_arch_set_freq_scale() ... Browse Code »

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 a20b7053b5c4 ("cpufreq,arm,arm64:
restructure definitions of arch_set_freq_scale()")

Bug: 167126223
Fixes: 07f80e7c1e5f ("ANDROID: sched: add cpumask parameter to cpu capacity vendor hook")
Cc: Yun Hsiang
Signed-off-by: Greg Kroah-Hartman
Change-Id: Ic96ff16028980fd8609c5d295454b9080c66fbe2

Greg Kroah-Hartman
2020-10-25 22:14:13 +0800
37afce95b Merge 79db2b74aa14 ("Merge branch 'stable/for-linus-5.10' of git://git.kernel.or… ... Browse Code »

…g/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

Greg Kroah-Hartman
2020-10-25 20:05:17 +0800
83f76c848 ANDROID: GKI: remove explicit CONFIG_SECCOMP from defconfig for arm64 ... Browse Code »

This gets pulled in automatically now, so we don't have to explicitly
set it.

Signed-off-by: Greg Kroah-Hartman
Change-Id: Ia1d0735ac3113c152da85ac59d7302b3f9a9aed6

Greg Kroah-Hartman
2020-10-25 19:33:20 +0800
75c90a8c3 Merge d5660df4a555 ("Merge branch 'akpm' (patches from Andrew)") into android-mainline ... Browse Code »

steps on the way to 5.10-rc1

Change-Id: Iddc84c25b6a9d71fa8542b927d6f69c364131c3d
Signed-off-by: Greg Kroah-Hartman

Greg Kroah-Hartman
2020-10-25 18:57:29 +0800
aedaedc74 Merge 7cd4ecd9177b ("Merge tag 'drivers-5.10-2020-10-12' of git://git.kernel.dk/… ... Browse Code »

…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

Greg Kroah-Hartman
2020-10-25 18:56:29 +0800
6a83be969 Merge 79ec6d9cac46 ("Merge tag 'libata-5.10-2020-10-12' of git://git.kernel.dk/l… ... Browse Code »

…inux-block") into android-mainline

Steps on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I162904ccd4c5919c6747f97bb673523cfa44891a

Greg Kroah-Hartman
2020-10-25 18:51:17 +0800
e24a525c0 Merge 6ad4bf6ea160 ("Merge tag 'io_uring-5.10-2020-10-12' of git://git.kernel.dk… ... Browse Code »

…/linux-block") into android-mainline

Resolves conflict with:
kernel/fork.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6c031ef388bfddfe80a64929d62969718755f740

Greg Kroah-Hartman
2020-10-25 18:50:09 +0800

24 Oct, 2020

11 commits

35cda5af6 Revert "block: grant IOPRIO_CLASS_RT to CAP_SYS_NICE" ... Browse Code »

This reverts commit 9d3a39a5f1e45827b008fff1ee9cf3cac3409665 as that
commit causes a bunch of SELinux errors.

Signed-off-by: Greg Kroah-Hartman
Change-Id: I73dc15c4ecddcf1950ca7fca2cc107be27da8f3f

Greg Kroah-Hartman
2020-10-24 23:30:14 +0800
c62fe038f Merge 3ad11d7ac887 ("Merge tag 'block-5.10-2020-10-12' of git://git.kernel.dk/li… ... Browse Code »

…nux-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

Greg Kroah-Hartman
2020-10-24 23:29:43 +0800
072f3a5b2 Merge a7863b3423fd ("blk-iocost: update iocost_monitor.py") into android-mainline ... Browse Code »

Bisection on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman
Change-Id: Ib96c933a2903e2f30edc0ca13929a318537f77d8

Greg Kroah-Hartman
2020-10-24 20:40:14 +0800
6c45f08d8 Merge 046037551721 ("blk-iocost: restore inuse update tracepoints") into android-mailine ... Browse Code »

Bisection on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman
Change-Id: I3f67860c970bea3019c374ba34e051ca78282a92

Greg Kroah-Hartman
2020-10-24 19:14:50 +0800
b5a717365 Merge c421a3eb2e27 ("blk-iocost: revamp debt handling") into android-mainline ... Browse Code »

Bisection on the way to 5.10-rc1

Change-Id: I601c029848bafea95f6a40682264ca5ce76c8b8d
Signed-off-by: Greg Kroah-Hartman

Greg Kroah-Hartman
2020-10-24 18:09:26 +0800
dcc7dd95a Merge 97eb19751f15 ("blk-iocost: add absolute usage stat") into android-mainline ... Browse Code »

Bisection on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman
Change-Id: Ic074e5010e8b4480d50bb84b56c3cf64c3afaaeb

Greg Kroah-Hartman
2020-10-24 18:07:50 +0800
e92900328 Merge 1f06959bd2c9 ("block: remove the unused q argument to part_in_flight and p… ... Browse Code »

…art_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

Greg Kroah-Hartman
2020-10-24 16:17:17 +0800
9494704fa Merge a98278ecfb96 ("Merge branch 'block-5.9' into for-5.10/block") into android-mainline ... Browse Code »

Steps on the way to 5.10-rc1

Change-Id: I13aee94a526318eb64fd6b5c2c02a6c7c980e4ac
Signed-off-by: Greg Kroah-Hartman

Greg Kroah-Hartman
2020-10-24 16:17:16 +0800
dbdf52541 ANDROID: sched: export wake_up_if_idle() ... Browse Code »

Enable idle drivers to wakeup idle CPUs by exporting wake_up_if_idle().

Bug: 169136276
Signed-off-by: Lina Iyer
Change-Id: If1529ad4b883f36de1692cd3ac1853ff722e3522

Lina Iyer
2020-10-24 02:05:44 +0800
4de53aef6 ANDROID: tick/nohz: export tick_nohz_get_sleep_length() ... Browse Code »

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
Change-Id: I0d18638d63c032862ae048bc2c3d49fa1bd90291

Lina Iyer
2020-10-24 02:05:30 +0800
96c860fcf FROMLIST: cpuidle: governor: export cpuidle governor functions ... Browse Code »

Commit 83788c0caed3 ("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
Change-Id: Ifa91576af0a3ae92ce9b216cb67728f037546c5b

Lina Iyer
2020-10-24 02:04:09 +0800

23 Oct, 2020

18 commits

0b405dbc6 Merge 857d64485e7c ("Merge tag 'x86_urgent_for_v5.10-rc1' of git://git.kernel.or… ... Browse Code »

…g/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>

Greg Kroah-Hartman
2020-10-23 20:15:45 +0800
cc35535c2 Merge c4439713e82a ("Merge tag 'hwmon-for-v5.10' of git://git.kernel.org/pub/scm… ... Browse Code »

…/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>

Greg Kroah-Hartman
2020-10-23 20:13:57 +0800
56860c854 Merge 0486beaf88d2 ("Merge tag 'gpio-v5.10-1' of git://git.kernel.org/pub/scm/li… ... Browse Code »

…nux/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

Greg Kroah-Hartman
2020-10-23 18:01:26 +0800
aec708539 Merge 647412daeb45 ("Merge tag 'mmc-v5.10' of git://git.kernel.org/pub/scm/linux… ... Browse Code »

…/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

Greg Kroah-Hartman
2020-10-23 17:59:44 +0800
9d77f4984 Merge 6f5032a852f9 ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/s… ... Browse Code »

…cm/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>

Greg Kroah-Hartman
2020-10-23 17:56:31 +0800
f52c09b3c Merge 39a5101f989e ("Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/… ... Browse Code »

…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>

Greg Kroah-Hartman
2020-10-23 17:44:49 +0800
0438bd576 Merge 865c50e1d279 ("x86/uaccess: utilize CONFIG_CC_HAS_ASM_GOTO_OUTPUT") into android-mainline ... Browse Code »

Steps on the way to 5.10-rc1

Change-Id: Ia787e650d54f44cb47b7f567adf5c1f2cf198cd5
Signed-off-by: Greg Kroah-Hartman

Greg Kroah-Hartman
2020-10-23 17:40:57 +0800
04e9454d5 Merge 53acd350503d ("Merge tag 'locks-v5.10-1' of git://git.kernel.org/pub/scm/l… ... Browse Code »

…inux/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>

Greg Kroah-Hartman
2020-10-23 16:25:52 +0800
1158041ed Merge 22230cd2c55b ("Merge branch 'compat.mount' of git://git.kernel.org/pub/scm… ... Browse Code »

…/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>

Greg Kroah-Hartman
2020-10-23 16:23:55 +0800
1c9bbee57 Revert "iov_iter: move rw_copy_check_uvector() into lib/iov_iter.c" ... Browse Code »

This reverts commit fb041b598997d63c0f7d7305dfae70046bf66fe1.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: I325ae5c3edd6b4cd4213a5c63fec17df842930b7

Greg Kroah-Hartman
2020-10-23 16:21:32 +0800
d59c65253 Revert "iov_iter: refactor rw_copy_check_uvector and import_iovec" ... Browse Code »

This reverts commit bfdc59701d6d100c99c3b987bcffd1c204e393c8.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: Ibf840a8fb38cb7d5888fb1bb1313647edf0b336e

Greg Kroah-Hartman
2020-10-23 16:21:30 +0800
836219141 Revert "iov_iter: transparently handle compat iovecs in import_iovec" ... Browse Code »

This reverts commit 89cd35c58bc2e36bfdc23dde67a429b08cf4ae03.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: I44ac1575af118ddbc3ee22a70f81cba282f5372a

Greg Kroah-Hartman
2020-10-23 16:21:28 +0800
75bd2bca5 Revert "fs: remove various compat readv/writev helpers" ... Browse Code »

This reverts commit 3523a9d45478984169d7f4416a00c83afc964e2a.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: I680effca58fd0fd38fd9ff551d81e9dc26183b5f

Greg Kroah-Hartman
2020-10-23 16:21:24 +0800
9b71b12a2 Revert "fs: remove the compat readv/writev syscalls" ... Browse Code »

This reverts commit 5f764d624a89d4d00d282157077878d4e7c69869.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: Ib733da773e5b3adae34ee75a766c8fe8217b8ef3

Greg Kroah-Hartman
2020-10-23 16:21:21 +0800
3ea6bc589 Revert "fs: remove compat_sys_vmsplice" ... Browse Code »

This reverts commit 598b3cec831fd6ccb3cbe4919a722e868c6364a8.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: Ic4f6f6cd43c87ab1e2cbfd610ef26616a718f47d

Greg Kroah-Hartman
2020-10-23 16:21:18 +0800
61e719d64 Revert "mm: remove compat_process_vm_{readv,writev}" ... Browse Code »

This reverts commit c3973b401ef2b0b8005f8074a10e96e3ea093823.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: I050b6767cbb0a958ebf3cc7e3475e552deee4048

Greg Kroah-Hartman
2020-10-23 16:21:17 +0800
4cfe64ac4 Revert "security/keys: remove compat_keyctl_instantiate_key_iov" ... Browse Code »

This reverts commit 5d47b394794d3086c1c338cc014011a9ee34005c.

Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: I08f80f63ab81079046628e9558475ceaf22273c2

Greg Kroah-Hartman
2020-10-23 16:21:15 +0800
4742d2d83 Merge e18afa5bfa4a ("Merge branch 'work.quota-compat' of git://git.kernel.org/pu… ... Browse Code »

…b/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>

Greg Kroah-Hartman
2020-10-23 16:13:50 +0800