This reverts commit c285ecc449 as it is no
longer needed for 5.8-rc3.
Cc: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6ae749611867e34c1ffffcdd5f30acec92cc9edc
This reverts commit cf3d0afc47.
An alternative solution was merged upstream so this
can be dropped.
Fixes: cf3d0afc47 ("FROMLIST: arm64: dts: sdm845: Set the virtual address range for GMU allocations")
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: Ibd802555caea9ed72d674b23fc0b777d94e9371c
This reverts commit 8cd58de551
An alternative solution was merged upstream so this
can be dropped.
Fixes: 8cd58de551 ("FROMLIST: dt-bindings: display: msm: Add required dma-range property")
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I892b05ec7e0026060182430ad5c920a6d3f38385
Can cause known issues, so good to get merged into the tree now.
Change-Id: If71170a490cf833a4db4d730f76ceda10cfe19ed
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
In current implementation the Linux version string that is attached to
the kernel linux image as well as the all kernel modules includes the
sha1 of the main git project for the kernel.
This Commit adds the BUILD_NUMBER env variable with an 'ab' prefix to
the Linux version string. This maps to both the Linux Image and all
kernel modules version strings.
Bug: 159842160
Bug: 137521202
Test: Build the kernel and test the version string
Change-Id: I4795955f36f477b257ca86495726e24d6b196d05
Signed-off-by: Alex Hong <rurumihong@google.com>
(cherry picked from commit e60f995403c9799dd0dc14d62d77d6698a8a7126)
[willmcvicker: fix uts_len check to include -ab$(BUILD_NUMBER)]
Signed-off-by: Will McVicker <willmcvicker@google.com>
The Type-C Port Controller Manager provides a USB PD and USB Type-C
state machine for use with Type-C Port Controllers.
No hardware involved. Vendor who enable TYPE-C need build-in it by default.
Bug: 159732196
Signed-off-by: zhang sanshan <pete.zhang@nxp.com>
Change-Id: I5453b40fd6047e4258942242259292f50419d28a
enable build in driver drivers/input/touchscreen in gki configure
touch screen should been enable in gki configure which is need by vendor.
Bug: 159736147
Signed-off-by: zhang sanshan <pete.zhang@nxp.com>
Change-Id: I3b1d348791aa9e762374a4965893b3a4a490394b
Compress the kernel with lz4 instead of gzip. On x86 this must be
controlled explicitly by kbuild, as decompressor code is prepended
to the compressed kernel artifact.
On arm64 this option is not needed as "make Image.lz4" can be used
instead, or the Image can be compressed in a separate step.
Bug: 150391496
Change-Id: I2d0ce7f937f2a952b4310f53c8b03dc8d721b050
Signed-off-by: Alistair Delva <adelva@google.com>
Use 'lz4' instead of 'lz4c' and increase the compression level. This
also optimizes for decompression speed at this higher level.
Bug: 159285792
Test: launch_cvd -kernel_path bzImage
Signed-off-by: Alistair Delva <adelva@google.com>
Change-Id: I9604cc7d1f3600dec27ceb460f7c29d977a919b1
Matching names with casefolded encrypting directories requires
decrypting entries to confirm case since we are case preserving. We can
avoid needing to decrypt if our hash values don't match.
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Test: Boots, /data/media is case insensitive
Bug: 138322712
Change-Id: Id6024fc2a3bbde1e46a29070981fa64b3f667075
This adds support for encryption with casefolding.
Since the name on disk is case preserving, and also encrypted, we can no
longer just recompute the hash on the fly. Additionally, to avoid
leaking extra information from the hash of the unencrypted name, we use
siphash via an fscrypt v2 policy.
The hash is stored at the end of the directory entry for all entries
inside of an encrypted and casefolded directory apart from those that
deal with '.' and '..'. This way, the change is backwards compatible
with existing ext4 filesystems.
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Test: Boots, /data/media is case insensitive
Bug: 138322712
Change-Id: I07354e3129aa07d309fbe36c002fee1af718f348
Needed by some GPU/DRM drivers that are built out-of-tree
Bug: 159733980
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: Ia156d1b0a74c82d9f15b144131aff2ddeead0672
The encrypt+casefold support needed to be adjusted following refactoring
of f2fs filename handing upstream. Also, the upstream change to
f2fs_d_compare() needed to be moved to generic_ci_d_compare(). See
http://aosp/1341990 and also the other branches like android-5.4-stable.
Also, a call f2fs_set_bio_crypt_ctx() went missing.
Fixes: 8912845e4e ("Merge 42612e7763 ("Merge tag 'f2fs-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline")
Change-Id: Icd92029bab74e161497a1f03201826a737955725
Signed-off-by: Eric Biggers <ebiggers@google.com>
It is useful to some partners to debug in-field lockups, and can
disabled by those who don't need it via command line or sysfs.
Bug: 159101622
Signed-off-by: Quentin Perret <qperret@google.com>
Change-Id: I14d2b112d2d4d1a4a920c71f254fc4ba4d3cd57c
This reverts commit d2ee0ef1e0
Causes build errors on 5.8-rc1, hopefully a new version will be
submitted upstream, no need to keep this around at the moment.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9d13a5b727ebc9dd4aaa591bb64d28adef8cb38c
READ/WRITE_ONCE are for atomic data types, not for structures. Fix this
up by doing a memcpy to make it explicit just how messy this copy is...
This fixes a build error on 5.8-rc1, as things are more strict, odds are
it's also wrong in other kernel versions as well...
Cc: Daniel Mentz <danielmentz@google.com>
Cc: Paul Lawrence <paullawrence@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7ecd3d05bd94c936dd5e69c63028458786f37a78
Steps on the way to 5.8-rc1.
Thanks to Eric for showing the way on how to do this one.
Change-Id: I5d32b592e31932eafab272e4014a9ea472d37f0b
Cc: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
It's now being abstracted away, so fix up the ANDROID specific code that
touches the lock to use the correct functions instead.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9cedb62118cd1bba7af27deb11499d312d24d7fc
CONFIG_PINCTRL_AMD needs to be removed from gki_defconfig as it's no
longer needed.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I19a5f8b86f514d4f82c46468d5bcec25ab55157d
Required backing out the renesas-xhci changes that never made it
upstream yet. If they are really needed, someone will work to get them
merged upstream properly...
Baby steps on the way to 5.8-rc1.
Change-Id: I6a450d3630c6d015d0e4cd00068fa7c702b96f41
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
It's no longer a needed option due to upstream changes so remove it from
the defconfig for arm64.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id1723b7b5a59c53671df19dddbd07f16d13da16f
This reverts commit 310afefe71 as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4f30d8544545860dd1a70bd18a63b9a1673c6c6a
This reverts commit c4fa71e251 as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id688d5e1e8b69b13aeb49da2716bfe45415e7c39
This reverts commit c7aaf58a4d as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ieb86309df7bf7899c26e815077a0db1ddbb8a486
This reverts commit a4fa5799c0 as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia81e7927c504b549faf75c65ab3418bda0930d79
This reverts commit 95788bcf46 as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iae782ce51812ecc9b7f8508e428f0db504b5d169
This reverts commit 6c5ad8b10e as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0b67a8a0d4b54c5be30f0bfc5abdd1422b7ab2f1
This reverts commit 79ff0889f8 as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id685f8e997e7e941ea1b1a7e00a2188581c1c794
This reverts commit 23141e2689 as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4c8d4a523ad46af98162a6f453d39f81eb70be34
This reverts commit a516ca1ee7 as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I753a5af94ce247d1929b79a01725ce392de1a547
This reverts commit f08b8ec58c as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic9c6fd69bec1e4e7535019cbd38436a5bd6f6d69
This reverts commit 59ec77600f as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I361630df79f3cd19de62908233e2d10204627910
This reverts commit 2d939f16c3 as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I36ab73538f0ea727b82b52edb2a3c049d440aaed
This reverts commit b4205c196f as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I63a1a1e99642b0f4b4437e9c10cdc2ff99045b9e
This reverts commit 1bca3d0382 as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia2f1ba9327547f297065f3c72b769f04ff3a7efc
This reverts commit 92381c512b as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0cf09578c03cda54181a252eba3457e9fb5278cc
This reverts commit c8ad0a80c3 as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I369f8f4c0c36d87f29174077bfcc9fdb4ec55711
This reverts commit d5a3eb9d1e as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iee3a7be4b32a8c37d55962317421330ff03de24c
This reverts commit 8e1a228356 as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6d7faff1f85ed73e7f1b1829e65b1c84f80cbf86
This reverts commit 9145ef459e as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I970783b2bc64c725d0478991c82bcdc089ee8a19
This reverts commit 56d519e9e2 as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id1a082986d0637d5906f517484cc7de3b7f10bd7
This reverts commit dd447e0f04 as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Idb31c3db0d358b250b241d5c04e8bafd9cd3d2d5
This reverts commit 269e56aa35 as the LTO
feature causes merge issues with 5.8-rc1. So remove it for now and
allow the developer to add the latest version of the patches later on.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0f30445f7c4da610be9ac865c005d152b0d0b2c8
