24 Oct, 2020
10 commits
-
…nux-block") into android-mainline
Steps on the way to 5.10-rc1
Resolves conflicts in:
include/linux/blk-crypto.hSigned-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4012850c2e4b804d9e87e90b8e03a3b9ce21b5e7 -
Bisection on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman
Change-Id: Ib96c933a2903e2f30edc0ca13929a318537f77d8 -
Bisection on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman
Change-Id: I3f67860c970bea3019c374ba34e051ca78282a92 -
Bisection on the way to 5.10-rc1
Change-Id: I601c029848bafea95f6a40682264ca5ce76c8b8d
Signed-off-by: Greg Kroah-Hartman -
Bisection on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman
Change-Id: Ic074e5010e8b4480d50bb84b56c3cf64c3afaaeb -
…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 -
Steps on the way to 5.10-rc1
Change-Id: I13aee94a526318eb64fd6b5c2c02a6c7c980e4ac
Signed-off-by: Greg Kroah-Hartman -
Enable idle drivers to wakeup idle CPUs by exporting wake_up_if_idle().
Bug: 169136276
Signed-off-by: Lina Iyer
Change-Id: If1529ad4b883f36de1692cd3ac1853ff722e3522 -
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 -
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
23 Oct, 2020
23 commits
-
…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> -
…/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> -
…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 -
…/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 -
…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> -
…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> -
Steps on the way to 5.10-rc1
Change-Id: Ia787e650d54f44cb47b7f567adf5c1f2cf198cd5
Signed-off-by: Greg Kroah-Hartman -
…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> -
…/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> -
This reverts commit fb041b598997d63c0f7d7305dfae70046bf66fe1.
Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: I325ae5c3edd6b4cd4213a5c63fec17df842930b7 -
This reverts commit bfdc59701d6d100c99c3b987bcffd1c204e393c8.
Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: Ibf840a8fb38cb7d5888fb1bb1313647edf0b336e -
This reverts commit 89cd35c58bc2e36bfdc23dde67a429b08cf4ae03.
Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: I44ac1575af118ddbc3ee22a70f81cba282f5372a -
This reverts commit 3523a9d45478984169d7f4416a00c83afc964e2a.
Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: I680effca58fd0fd38fd9ff551d81e9dc26183b5f -
This reverts commit 5f764d624a89d4d00d282157077878d4e7c69869.
Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: Ib733da773e5b3adae34ee75a766c8fe8217b8ef3 -
This reverts commit 598b3cec831fd6ccb3cbe4919a722e868c6364a8.
Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: Ic4f6f6cd43c87ab1e2cbfd610ef26616a718f47d -
This reverts commit c3973b401ef2b0b8005f8074a10e96e3ea093823.
Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: I050b6767cbb0a958ebf3cc7e3475e552deee4048 -
This reverts commit 5d47b394794d3086c1c338cc014011a9ee34005c.
Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: I08f80f63ab81079046628e9558475ceaf22273c2 -
…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> -
…m/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> -
A line from commit b19f0cc3fe48 ("ANDROID: power: wakeup_reason: wake
reason enhancements") got dropped.Fixes: eb87047f0823 ("Merge c457cc800e89 ("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 -
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
Change-Id: Iffc1d90419378e1f3cf13c3e5ecddadd84dc1540 -
Send uevent when received control request 51 and 52
to help debug and recover when the handshake not finished.Description about control request 51 and 52
control_request 51 :
Send a 51 control request ("Get Protocol") to figure out
if the device supports the Android accessory protocol.
A non-zero number is returned if the protocol is supported,
which represents the version of the protocol that
the device supports (currently, only version 1 exists).control_request 52 :
If the device returns a proper protocol version,
send identifying string information to the device.
This information allows the device to figure out
an appropriate application for this accessory and
also present the user with a URL if
an appropriate application does not exist.The detail description could reference below link.
https://tool.oschina.net/uploads/apidocs/android/tools/adk/aoa.htmlBug: 139264038
Change-Id: Ie80302321b58d247a5faa83dc3cabba316743c87
Signed-off-by: rickyniu -
Print out informational messages when a user connects a USB device.
Bug: 170928377
Signed-off-by: Alistair Delva
Change-Id: I9838d5aff51fe9c6cfa3b5e7c46cbe84ee878090
22 Oct, 2020
3 commits
-
When submitting a cherry-picked version of commit c700bdd2233e
("ANDROID: dma-heap: Add proper kref handling on dma-buf heaps")
from the android-mainline tree, Greg had some feedback that
tracking the minor number wasn't necessary as it was already
stored in the heap_devt:
https://android-review.googlesource.com/c/kernel/common/+/1433176/4#message-b07e73548e082ae85b97c3f3ff889ae4ab6ab09dSo this patch reworks those changes so we don't need an extra
minor field in the dma_heap struct.Fixes: c700bdd2233e ("ANDROID: dma-heap: Add proper kref handling on dma-buf heaps")
Signed-off-by: John Stultz
Change-Id: I5f12e2249a6a02ee02dc19049b7b3577e094b0ce
Bug: 154341375 -
This reverts commit ff0771e5f881fa5596ff35856fc0df11429c9d80.
ANDROID_VENDOR_HOOKS was temporarily disabled since it needed
refactoring to work with commit d25e37d89dd2 ("tracepoint: Optimize
using static_call()"). It can be enabled again now.Change-Id: Id4920fe20cf07736679f22228d192a251467bbb2
Signed-off-by: Todd Kjos -
commit d25e37d89dd2 ("tracepoint: Optimize using static_call()")
refactored tracepoints to use static_call(). Add the same
optimization for restricted vendor hooks.Fixes: d25e37d89dd2 ("tracepoint: Optimize using static_call()")
Signed-off-by: Todd Kjos
Change-Id: I336db7e90b733ac4098ce342001cc31fd215d137
21 Oct, 2020
4 commits
-
…ub/scm/linux/kernel/git/viro/vfs") into android-mainline
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I64f970f0cd1bfe4edf42b4170a54bef3ca613c02 -
Steps on the way to 5.10-rc1
Change-Id: Ie936eb552cef5285deba6d52c62251db6b7fbd8c
Signed-off-by: Greg Kroah-Hartman -
…inux/kernel/git/aegl/linux") into android-mainline
Steps on the way to 5.10-rc1
Change-Id: I27e93251d6061f1a190ca5c6d5e16f38fbbf6697
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> -
…ub/scm/linux/kernel/git/tip/tip") into android-mainline
Steps on the way to 5.10-rc1
Change-Id: Ia139025f801a615e94550f8cc4934bf296663f32
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>