Steps on the way to 5.10-rc1
Resolves conflicts in:
fs/userfaultfd.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie3fe3c818f1f6565cfd4fa551de72d2b72ef60af
Steps on the way to 5.10-rc1
Resolves merge issues in:
drivers/net/virtio_net.c
net/xfrm/xfrm_state.c
net/xfrm/xfrm_user.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3132e7802f25cb775eb02d0b3a03068da39a6fe2
Commit 9f4df96b87 ("dma-mapping: merge <linux/dma-noncoherent.h> into
<linux/dma-map-ops.h>") moved the header file, so do the same thing for
our out-of-tree ION code as well, to fix the build issues.
Fixes: 9f4df96b87 ("dma-mapping: merge <linux/dma-noncoherent.h> into <linux/dma-map-ops.h>")
Fixes: b2117ae840 ("ANDROID: ion: flush cache before exporting non-cached buffers")
Cc: Vincent Donnefort <vincent.donnefort@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I20e2f47598bee9dcf311cd62b49541ebcb061fca
Resolves conflicts in:
kernel/dma/mapping.c
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I61292201a3ac4b92c39f330585692652cf985550
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
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
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
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
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
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
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>
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
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
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
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
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
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
