From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6195A282F33 for ; Fri, 3 Apr 2026 06:41:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775198492; cv=none; b=hRCfQnMt9I5wi1SBxKk4IYaVxeLbgfS/QTjbyZtNGlZG33ng+tWGHWE4diuJld0CqWGLwwdOWiaIgvsSxx1X4yxsz+YULZ7a1ekVsIk4xT34wAU5qt8Am/9JubsjrsdqP2Cqq+ErUD/Ig6/abcyMrLsjX61tXNXkRZ5xTqZsHOw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775198492; c=relaxed/simple; bh=rYaLR0G1UiI+Z0bi16z7ZZ2RUsUORzz5FF54goAxOH8=; h=Date:To:From:Subject:Message-Id; b=nUW+D5ZQO+rz1aB5v5N/anqynKAScbTznkQnnmQusdw9/1gsm2NYWz4RepGZ1vhMSn8tJXgchbKpOXSppck5VsfeKws988inJD0kDTotjCdkG7RbNfaYZXFH1S10GloKbM02VXLumFwQ0hvkHsaBBTeNH+Apx1jlvE304Mowk58= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=CTwpr3zg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="CTwpr3zg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB0B4C4CEF7; Fri, 3 Apr 2026 06:41:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1775198492; bh=rYaLR0G1UiI+Z0bi16z7ZZ2RUsUORzz5FF54goAxOH8=; h=Date:To:From:Subject:From; b=CTwpr3zg1VEodDEb9Jsviq3pM+GyqtR/qynva4O0WcTx7IEnXGdsHgvz+MzQ4Pnlh MIOkydw9b4dtR5owfNodtS1+A3adJojKAKCOBN8E5MQBb87Oxt4sBgmWGrA+rVQH1S lg6RUJ2nEoZM5OVOa2uvrPpcc3RQ4R7trAkLpBso= Date: Thu, 02 Apr 2026 23:41:31 -0700 To: mm-commits@vger.kernel.org,will@kernel.org,tytso@mit.edu,svens@linux.ibm.com,song@kernel.org,richard@nod.at,richard.henderson@linaro.org,palmer@dabbelt.com,npiggin@gmail.com,mpe@ellerman.id.au,mingo@redhat.com,mattst88@gmail.com,maddy@linux.ibm.com,linux@armlinux.org.uk,linmag7@gmail.com,linan122@huawei.com,kernel@xen0n.name,johannes@sipsolutions.net,jason@zx2c4.com,hpa@zytor.com,herbert@gondor.apana.org.au,hca@linux.ibm.com,gor@linux.ibm.com,ebiggers@kernel.org,dsterba@suse.com,davem@davemloft.net,dan.j.williams@intel.com,clm@fb.com,chenhuacai@kernel.org,catalin.marinas@arm.com,bp@alien8.de,borntraeger@linux.ibm.com,arnd@arndb.de,ardb@kernel.org,aou@eecs.berkeley.edu,anton.ivanov@cambridgegreys.com,andreas@gaisler.com,alex@ghiti.fr,agordeev@linux.ibm.com,hch@lst.de,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-nonmm-stable] um-xor-cleanup-xorh.patch removed from -mm tree Message-Id: <20260403064131.EB0B4C4CEF7@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: um/xor: cleanup xor.h has been removed from the -mm tree. Its filename was um-xor-cleanup-xorh.patch This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Christoph Hellwig Subject: um/xor: cleanup xor.h Date: Fri, 27 Mar 2026 07:16:36 +0100 Since commit c055e3eae0f1 ("crypto: xor - use ktime for template benchmarking") the benchmarking works just fine even for TT_MODE_INFCPU, so drop the workarounds. Note that for CPUs supporting AVX2, which includes almost everything built in the last 10 years, the AVX2 implementation is forced anyway. CONFIG_X86_32 is always correctly set for UM in arch/x86/um/Kconfig, so don't override it either. Link: https://lkml.kernel.org/r/20260327061704.3707577-5-hch@lst.de Signed-off-by: Christoph Hellwig Acked-by: Richard Weinberger Reviewed-by: Eric Biggers Tested-by: Eric Biggers Cc: Albert Ou Cc: Alexander Gordeev Cc: Alexandre Ghiti Cc: Andreas Larsson Cc: Anton Ivanov Cc: Ard Biesheuvel Cc: Arnd Bergmann Cc: "Borislav Petkov (AMD)" Cc: Catalin Marinas Cc: Chris Mason Cc: Christian Borntraeger Cc: Dan Williams Cc: David S. Miller Cc: David Sterba Cc: Heiko Carstens Cc: Herbert Xu Cc: "H. Peter Anvin" Cc: Huacai Chen Cc: Ingo Molnar Cc: Jason A. Donenfeld Cc: Johannes Berg Cc: Li Nan Cc: Madhavan Srinivasan Cc: Magnus Lindholm Cc: Matt Turner Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Palmer Dabbelt Cc: Richard Henderson Cc: Russell King Cc: Song Liu Cc: Sven Schnelle Cc: Ted Ts'o Cc: Vasily Gorbik Cc: WANG Xuerui Cc: Will Deacon Signed-off-by: Andrew Morton --- arch/um/include/asm/xor.h | 16 ---------------- 1 file changed, 16 deletions(-) --- a/arch/um/include/asm/xor.h~um-xor-cleanup-xorh +++ a/arch/um/include/asm/xor.h @@ -2,23 +2,7 @@ #ifndef _ASM_UM_XOR_H #define _ASM_UM_XOR_H -#ifdef CONFIG_64BIT -#undef CONFIG_X86_32 -#define TT_CPU_INF_XOR_DEFAULT (AVX_SELECT(&xor_block_sse_pf64)) -#else -#define CONFIG_X86_32 1 -#define TT_CPU_INF_XOR_DEFAULT (AVX_SELECT(&xor_block_8regs)) -#endif - #include #include <../../x86/include/asm/xor.h> -#include - -#ifdef CONFIG_UML_TIME_TRAVEL_SUPPORT -#undef XOR_SELECT_TEMPLATE -/* pick an arbitrary one - measuring isn't possible with inf-cpu */ -#define XOR_SELECT_TEMPLATE(x) \ - (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x) -#endif #endif _ Patches currently in -mm which might be from hch@lst.de are