Steps on the way to 5.10-rc1
Resolves conflicts in:
Documentation/admin-guide/sysctl/vm.rst
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic58f28718f28dae42948c935dfb0c62122fe86fc
Steps on the way to 5.10-rc1
Resolves conflicts in:
arch/arm64/kernel/vdso32/Makefile
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic9edce8127b3717469dc4fa96ca95166be419e9d
Steps on the way to 5.10-rc1
Resolves conflicts in:
fs/ext4/dir.c
fs/ext4/ext4.h
fs/ext4/namei.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id6e2b1b8af69519089493f32617f1b2b06dbf434
Steps on the way to 5.10-rc1
Resolves conflicts in:
fs/ext4/dir.c
fs/ext4/ext4.h
fs/ext4/namei.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I397787046920175eb183fa5342d2923f819bb2f4
kzfree() is about to go away, as it was attempted in 5.9-rc1, but will
really happen in 5.10-rc1. So move the dm-default-key.c file to use
kfree_sensitive() as it should be using.
Bug: 137270441
Bug: 147814592
Cc: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Idc1c004eabbda7e4854866f6c9cf71bd61f9b1df
Steps on the way to 5.10-rc1
Resolves conflicts in:
drivers/net/virtio_net.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I72bb00e45bb7b6154b56f31a2e9040c4e8fe899a
Steps on the way to 5.10-rc1
Resolves conflicts in:
fs/fuse/fuse_i.h
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifa200ce8fae0e3b38c86351006824c62328c00f7
Steps on the way to 5.10-rc1
Resolves conflicts in:
fs/overlayfs/namei.c
fs/overlayfs/ovl_entry.h
fs/overlayfs/super.c
fs/overlayfs/util.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9d65b6a11ebeeca5adf0e54436b10da68a253532
Steps on the way to 5.10-rc1
Resolves conflicts in:
fs/f2fs/dir.c
fs/f2fs/super.c
fs/libfs.c
include/linux/fs.h
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9c6dc54ebbdf914bc87aa583b34a9eadcc133a58
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
