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 310afefe71d480d563f3691b74bff61a53ba81ca 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 c4fa71e25126d32473493b648af0767e4492a85b 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 c7aaf58a4dfaa918544e20f68bfe1f4774166917 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 a4fa5799c0b342d25f38f5c6cd31984efe2aa61c 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 95788bcf4649a8c522efccf0fbc8cacb42970a4b 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 6c5ad8b10ebb0c1ba514e78da4a739b2f5a6ba9f 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 79ff0889f8e35c0494fa7297948329b5c18e4da3 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 23141e26893e8a5614ccecd2b2d5b78e31d99313 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 a516ca1ee79cb27cd4116bfd46137113371bde6e 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 f08b8ec58c70c278ffc39ddb3934a245a4bcf4c0 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 59ec77600ff12528d1afd644914fff759eb719fa 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 2d939f16c34039a6b411fb656ffc49434c195ccf 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 b4205c196ffcaa36c98e9b18b953b4517c16e97e 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 1bca3d03829eaac8d56a6f55512ca903376441cb 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 92381c512b9d155d06cab0b014eb206353b765ef 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 c8ad0a80c3f49de28021047194e2809a4ef750b3 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 d5a3eb9d1e500e0e0db94d4aff7c4cdd03547dc9 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 8e1a228356e3c6ba2e54b54e6b3d05d4cb3d8e44 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 9145ef459e30660f6cdb355bc1b7cca7f5b51292 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 56d519e9e2b7d8c47b01b94c49da9932ad118347 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 dd447e0f0487e8cf6ffcd417db009a0192ee2c9b 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 269e56aa35625cc17b7672c683223127333ab5ef 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
This reverts commit 95a06095ff3e280f35a69858a69857c1953dfbd3 as it
should now be resolved.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I521215f77e69ac4d26d4977d2a16a40298d96509
This reverts commit 1d92317c73b52515e5d52e5152db446b9f5a3a82 as it
should not be needed anymore with the recent changes in fa10fed30f25
("proc: allow to mount many instances of proc in one pid namespace")
Cc: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3ddd939c081e0485ce3b46e4f6544d00cffad3dc
The LTP testsuite reported a regression where users would now see EBADF
returned instead of EINVAL when an fd was passed that referred to an open
file but the file was not a nsfd. Fix this by continuing to report EINVAL.
Bug: 159609060
Link: https://lore.kernel.org/lkml/20200615085836.GR12456@shao2-debian
Fixes: 303cc571d107 ("nsproxy: attach to namespaces via pidfds")
Cc: Jan Stancek <jstancek@redhat.com>
Cc: Cyril Hrubis <chrubis@suse.cz>
Reported-by: kernel test robot <rong.a.chen@intel.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Link: https://lore.kernel.org/lkml/20200616225612.4068799-1-christian.brauner@ubuntu.com/
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I659d41efb883f641b8db06f2c3b1f0dae8bab064
From an email thread on how to try to fix up the current Android boot
issues...
Change-Id: If4a4ef96acc09708727451fb79233b3cc1f18482
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This reverts commit e6eff4376e2897c2e14b70d87bf7284cdb093830.
It causes a build-breakage on the network test configuration so revert
it for now to hopefully add back after -rc2 is merged.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I866dcc31dc3d3eb68929708d28935c5e13a7fb3d
Update the gki defconfig files based on upstream changes causing some
symbols to no longer be needed in the defconfig files.
This means the following symbols are removed for x86 and arm64 gki
defconfigs:
CONFIG_MEMCG_SWAP=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
And the following only for arm64:
CONFIG_MEDIA_CONTROLLER=y
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie1fac5c6c873bea04f199a2b7df33d56ee3f246f
Baby steps on the way to 5.8-rc1.
A clean merge state for once...
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I35a7b84b14b046c3cc850f3cd0b4e5aad83706f1
DEPMOD=depmod overwrites the default DEPMOD=/sbin/depmod and uses the
depmod version from PATH (coming from the hermetic toolchain).
Bug: 130657633
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: I73eefaa5508298bc61e9e586f981c5ddabed7656
Upstream commit ad6bf88a6c19 ("block: fix an integer overflow in logical
block size") changed queue_limits::logical_block_size from 'unsigned
short' to 'unsigned int', and this commit has been backported to the LTS
branches. Update the computation in dm_bow_io_hints() to match.
This mirrors upstream commit 64611a15ca9d ("dm crypt: avoid truncating
the logical block size") which fixed the same bug in dm-crypt.
Fixes: 7df64f62169c ("ANDROID: dm-bow: Add block_size option")
Change-Id: I45eba7d21cf178e4b8e624ef5f819a1ffb015a8d
Signed-off-by: Eric Biggers <ebiggers@google.com>
Upstream commit ad6bf88a6c19 ("block: fix an integer overflow in logical
block size") changed queue_limits::logical_block_size from 'unsigned
short' to 'unsigned int', and this commit has been backported to the LTS
branches. Update the computation in default_key_io_hints() to match.
This mirrors upstream commit 64611a15ca9d ("dm crypt: avoid truncating
the logical block size") which fixed the same bug in dm-crypt.
Fixes: cb39ec0c1040 ("ANDROID: dm: add dm-default-key target for metadata encryption")
Change-Id: I98dd65afdb120073203af3b201d0831edd6e245c
Signed-off-by: Eric Biggers <ebiggers@google.com>
Enable CONFIG_USB_CONFIGFS_ACM and CONFIG_USB_CONFIGFS_F_HID as these
options were somehow not selected before.
Bug: 158724286
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I79c47a598601d2316fb3ff66d3eef8b6f0a6149e
