From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7E549138350 for ; Wed, 1 Apr 2020 13:13:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8A61E0BB7; Wed, 1 Apr 2020 13:13:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C418E0BB7 for ; Wed, 1 Apr 2020 13:13:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91E6634F829 for ; Wed, 1 Apr 2020 13:13:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5432F18E for ; Wed, 1 Apr 2020 13:13:03 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1585746744.0bf9749b455d1fe18a7e6a56ba00efadff057106.mpagano@gentoo> Subject: [gentoo-commits] proj/linux-patches:5.5 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 1800_x86-ioremap-Fix-CONFIG_EFI-equals-n-build.patch X-VCS-Directories: / X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 0bf9749b455d1fe18a7e6a56ba00efadff057106 X-VCS-Branch: 5.5 Date: Wed, 1 Apr 2020 13:13:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 38948494-fd7a-4a93-8199-e74650fe781d X-Archives-Hash: 996b825ba812f93c688febabbf3cd682 commit: 0bf9749b455d1fe18a7e6a56ba00efadff057106 Author: Mike Pagano gentoo org> AuthorDate: Wed Apr 1 13:12:24 2020 +0000 Commit: Mike Pagano gentoo org> CommitDate: Wed Apr 1 13:12:24 2020 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=0bf9749b Remove redundant patch Removed: 1800_x86-ioremap-Fix-CONFIG_EFI-equals-n-build.patch Signed-off-by: Mike Pagano gentoo.org> 0000_README | 4 --- ...x86-ioremap-Fix-CONFIG_EFI-equals-n-build.patch | 33 ---------------------- 2 files changed, 37 deletions(-) diff --git a/0000_README b/0000_README index 60b3027..835b96f 100644 --- a/0000_README +++ b/0000_README @@ -107,10 +107,6 @@ Patch: 1510_fs-enable-link-security-restrictions-by-default.patch From: http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch/ Desc: Enable link security restrictions by default. -Patch: 1800_x86-ioremap-Fix-CONFIG_EFI-equals-n-build.patch -From: https://lkml.org/lkml/diff/2020/3/18/809/1 -Desc: x86/ioremap: Fix CONFIG_EFI=n build. See bug #713460. Thanks to Phil Stracchino. - Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@holtmann.org/raw Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 diff --git a/1800_x86-ioremap-Fix-CONFIG_EFI-equals-n-build.patch b/1800_x86-ioremap-Fix-CONFIG_EFI-equals-n-build.patch deleted file mode 100644 index e6bc74f..0000000 --- a/1800_x86-ioremap-Fix-CONFIG_EFI-equals-n-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Borislav Petkov -Date: Wed, 18 Mar 2020 19:27:48 +0100 - -In order to use efi_mem_type(), one needs CONFIG_EFI enabled. Otherwise -that function is undefined. Use IS_ENABLED() to check and avoid the -ifdeffery as the compiler optimizes away the following unreachable code -then. - -Fixes: 985e537a4082 ("x86/ioremap: Map EFI runtime services data as encrypted for SEV") -Reported-by: Randy Dunlap -Signed-off-by: Borislav Petkov -Cc: Tom Lendacky -Link: https://lkml.kernel.org/r/7561e981-0d9b-d62c-0ef2-ce6007aff1ab@infradead.org ---- - arch/x86/mm/ioremap.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c -index 935a91e1fd77..18c637c0dc6f 100644 ---- a/arch/x86/mm/ioremap.c -+++ b/arch/x86/mm/ioremap.c -@@ -115,6 +115,9 @@ static void __ioremap_check_other(resource_size_t addr, struct ioremap_desc *des - if (!sev_active()) - return; - -+ if (!IS_ENABLED(CONFIG_EFI)) -+ return; -+ - if (efi_mem_type(addr) == EFI_RUNTIME_SERVICES_DATA) - desc->flags |= IORES_MAP_ENCRYPTED; - } --- -2.21.0