Commit Graph

933897 Commits

Author SHA1 Message Date
Greg Kroah-Hartman
fd0cd97281 Revert "FROMLIST: pwm: Convert period and duty cycle to u64"
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
2020-06-25 15:20:58 +00:00
Greg Kroah-Hartman
3be0477f5a ANDROID: Incremental fs: fix up attempt to copy structures with READ/WRITE_ONCE
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
2020-06-25 15:20:35 +00:00
Greg Kroah-Hartman
a33191d441 Merge 5.8-rc1 into android-mainline
Linux 5.8-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I00f2168bc9b6fd8e48c7c0776088d2c6cb8e1629
2020-06-25 14:25:32 +02:00
Greg Kroah-Hartman
8912845e4e Merge 42612e7763 ("Merge tag 'f2fs-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline
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>
2020-06-25 08:23:49 +02:00
Greg Kroah-Hartman
1da58ab555 ANDROID: fix up direct access to mmap_sem
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
2020-06-24 18:17:12 +02:00
Greg Kroah-Hartman
3203312829 ANDROID: GKI: fix up gki_defconfig due to pinctrl upstream merges
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
2020-06-24 17:58:41 +02:00
Greg Kroah-Hartman
a253db8915 Merge ad57a1022f ("Merge tag 'exfat-for-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat") into android-mainline
Steps on the way to 5.8-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4bc42f572167ea2f815688b4d1eb6124b6d260d4
2020-06-24 17:54:12 +02:00
Greg Kroah-Hartman
87b344db7a Merge cf0c97f148 ("Merge tag 'pinctrl-v5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl") into android-mainline
Baby steps to 5.8-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia5ec011460c5041520483b43e129abbf4a298a99
2020-06-24 17:41:09 +02:00
Greg Kroah-Hartman
21d332c18e Merge e611c0fe31 ("Merge tag 'usb-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb") into android-mainline
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>
2020-06-24 17:28:15 +02:00
Greg Kroah-Hartman
714dbb2e31 ANDROID: GKI: remove CONFIG_EDAC from arm64 gki_defconfig
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
2020-06-24 14:28:11 +02:00
Greg Kroah-Hartman
2f9c5c39bf Merge 3b69e8b457 ("Merge tag 'sh-for-5.8' of git://git.libc.org/linux-sh") into android-mainline
Steps on the way to 5.8-rc1.

Change-Id: I9fcdd820bc1555c51a93d77278079ec8c1b4c186
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2020-06-24 12:27:21 +02:00
Greg Kroah-Hartman
3330492ef1 Revert "ANDROID: kbuild: add support for Clang LTO"
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
2020-06-24 10:31:15 +02:00
Greg Kroah-Hartman
16fe007e61 Revert "ANDROID: kbuild: fix dynamic ftrace with clang LTO"
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
2020-06-24 10:31:11 +02:00
Greg Kroah-Hartman
4f60494720 Revert "ANDROID: scripts/mod: disable LTO for empty.c"
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
2020-06-24 08:51:01 +02:00
Greg Kroah-Hartman
068dbd8a6d Revert "ANDROID: efi/libstub: disable LTO"
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
2020-06-24 08:49:36 +02:00
Greg Kroah-Hartman
226fd68780 Revert "ANDROID: drivers/misc/lkdtm: disable LTO for rodata.o"
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
2020-06-24 08:47:45 +02:00
Greg Kroah-Hartman
0472716d99 Revert "ANDROID: init: ensure initcall ordering with LTO"
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
2020-06-24 08:47:44 +02:00
Greg Kroah-Hartman
5c1311f758 Revert "ANDROID: soc/tegra: disable ARCH_TEGRA_210_SOC with LTO"
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
2020-06-24 08:47:43 +02:00
Greg Kroah-Hartman
d22ba28620 Revert "ANDROID: irqchip/gic-v3: rename gic_of_init to work around a ThinLTO+CFI bug"
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
2020-06-24 08:47:42 +02:00
Greg Kroah-Hartman
f9703749df Revert "ANDROID: arm64: disable HAVE_ARCH_PREL32_RELOCATIONS with LTO_CLANG"
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
2020-06-24 08:47:41 +02:00
Greg Kroah-Hartman
5b5ef1903c Revert "ANDROID: arm64: allow LTO_CLANG and THINLTO to be selected"
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
2020-06-24 08:40:18 +02:00
Greg Kroah-Hartman
6c80b2e494 Revert "ANDROID: gki_defconfig: enable LTO, CFI, and SCS"
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
2020-06-24 08:34:49 +02:00
Greg Kroah-Hartman
677093625d Revert "ANDROID: kbuild: fix modfinal with LTO"
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
2020-06-24 08:34:47 +02:00
Greg Kroah-Hartman
f3ab3cc850 Revert "ANDROID: kbuild: merge module sections with LTO"
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
2020-06-24 08:34:46 +02:00
Greg Kroah-Hartman
820fe5fe36 Revert "ANDROID: kbuild: limit LTO inlining"
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
2020-06-24 08:34:45 +02:00
Greg Kroah-Hartman
bb06582632 Revert "ANDROID: x86/vdso: disable LTO only for VDSO"
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
2020-06-24 08:08:30 +02:00
Greg Kroah-Hartman
11f0146a49 Revert "ANDROID: x86: disable HAVE_ARCH_PREL32_RELOCATIONS with LTO_CLANG"
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
2020-06-24 08:08:29 +02:00
Greg Kroah-Hartman
4efebc9981 Revert "ANDROID: x86: disable STACK_VALIDATION with LTO_CLANG"
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
2020-06-24 08:08:28 +02:00
Greg Kroah-Hartman
513ee6ef8a Revert "ANDROID: x86: disable UNWINDER_ORC with LTO_CLANG"
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
2020-06-24 08:06:08 +02:00
Greg Kroah-Hartman
3a8961d3a1 Revert "ANDROID: x86, build: allow LTO_CLANG and THINLTO to be selected"
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
2020-06-24 07:38:06 +02:00
Greg Kroah-Hartman
49b2507414 Revert "ANDROID: x86: gki_defconfig: enable LTO and CFI"
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
2020-06-24 07:36:37 +02:00
Greg Kroah-Hartman
c5a5355e10 Revert "ANDROID: kallsyms: strip hashes from static functions with ThinLTO and CFI"
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
2020-06-24 07:34:49 +02:00
Greg Kroah-Hartman
536adca27b Revert "ANDROID: kbuild: merge more sections with LTO"
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
2020-06-24 07:33:39 +02:00
Greg Kroah-Hartman
b378328f2a Merge 818dbde78e ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") into android-mainline
Steps on the way to 5.8-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3beac21380f95fa9eaa9eb4c708c47c9c6addf11
2020-06-24 07:11:16 +02:00
Greg Kroah-Hartman
dbea740a7e Merge 7ae77150d9 ("Merge tag 'powerpc-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux") into android-mainline
Small steps on the way to 5.8-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic41e7ca6e9ea1dd506ec44a4251f1ded701efbf6
2020-06-23 21:47:20 +02:00
Greg Kroah-Hartman
94d5fade60 Revert "Revert "module: Make module_enable_ro() static again""
This reverts commit 95a06095ff as it
should now be resolved.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I521215f77e69ac4d26d4977d2a16a40298d96509
2020-06-23 21:46:26 +02:00
Greg Kroah-Hartman
44699162a3 Merge 9ff7258575 ("Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace") into android-mainline
Baby steps on the way to 5.8-rc1.

Change-Id: Ie10408266ea00e8b989c6f31c824231da1da90c2
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2020-06-23 09:37:17 +02:00
Greg Kroah-Hartman
428ec716d3 Revert "ANDROID: make sure proc mount options are applied"
This reverts commit 1d92317c73 as it
should not be needed anymore with the recent changes in fa10fed30f
("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
2020-06-23 09:36:15 +02:00
Greg Kroah-Hartman
dfd0059142 Merge 051c3556e3 ("Merge tag 'for_v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs") into android-mainline
Small steps on the way to 5.8-rc1

Change-Id: I664ad93f8264c07f34ac1fefb4046d879e6129ed
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2020-06-23 08:32:23 +02:00
Christian Brauner
6663a9e9de FROMLIST: nsproxy: restore EINVAL for non-namespace file descriptor
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: 303cc571d1 ("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
2020-06-23 07:45:19 +02:00
John Stultz
96331e0dc4 ANDROID: bpf: Workaround for bpf permissions check regression
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>
2020-06-22 18:59:35 +02:00
Greg Kroah-Hartman
95a06095ff Revert "module: Make module_enable_ro() static again"
This reverts commit e6eff4376e.

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
2020-06-22 18:11:11 +02:00
Greg Kroah-Hartman
b5e512c42c ANDROID: GKI: update gki defconfigs
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
2020-06-22 15:45:56 +02:00
Greg Kroah-Hartman
bf8bebd9d9 Merge d77d1dbba9 ("Merge tag 'zonefs-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs") into android-mainline
Steps on the way to 5.8-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I8dbf41fda6489c8511dc7154d5a0609444ac5e8b
2020-06-22 15:25:40 +02:00
Greg Kroah-Hartman
1ec3464acb Merge ee01c4d72a ("Merge branch 'akpm' (patches from Andrew)") into android-mainline
Steps along the way to 5.8-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6cca4fa48322228c8182201d68dc05f9b72cfc50
2020-06-22 15:13:57 +02:00
Greg Kroah-Hartman
8a8d41512f Merge cb8e59cc87 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline
Steps along the way to 5.8-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I280c0a50b5e137596b1c327759c6a18675908179
2020-06-22 14:58:18 +02:00
Greg Kroah-Hartman
9052db6554 Merge 2e63f6ce7e ("Merge branch 'uaccess.comedi' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-mainline
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
2020-06-22 14:41:28 +02:00
Matthias Maennich
82ce726a3f ANDROID: Use depmod from the hermetic toolchain
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
2020-06-22 08:19:19 +00:00
Greg Kroah-Hartman
035f08016d Merge 039aeb9deb ("Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm") into android-mainline
Baby steps on the way to 5.8-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5962e12546d3d215c73c3d74b00ad6263d96f64e
2020-06-20 09:49:29 +02:00
Eric Biggers
228804d48c ANDROID: dm-bow: avoid truncating the logical block size
Upstream commit ad6bf88a6c ("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 64611a15ca ("dm crypt: avoid truncating
the logical block size") which fixed the same bug in dm-crypt.

Fixes: 7df64f6216 ("ANDROID: dm-bow: Add block_size option")
Change-Id: I45eba7d21cf178e4b8e624ef5f819a1ffb015a8d
Signed-off-by: Eric Biggers <ebiggers@google.com>
2020-06-19 18:51:08 +00:00