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 3C1AA130AC8 for ; Tue, 23 Jul 2024 02:29:22 +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=1721701763; cv=none; b=JxTvlZNG9Y6wSYQF3IVW/9flo//TCaJfSBsLTvjg/pX+gYdqdfb1dZ1tD8w3tkoy9kpnGnnuPJlNtWGhO0uzsjDidbp0LqKPTqZo4nmL8cVSvYCQH/fM2uvhMNUjvw1FPL05Xoznayow/J+vAhz+PKeyPUR3gccFJZiW3uHNPMQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721701763; c=relaxed/simple; bh=8etnvcsEn9ov7KchYXGpq9gVb6jNkgseWDnyie3LPD8=; h=Date:To:From:Subject:Message-Id; b=Vr/FfcVQsi3v6xj5tDybS5o4Whf1KnTdIvykjVPlHkqfA+oyYIB5hsfPamx3Loim1CyvjYPZLN6Mq63LLV3vfDkSCkIm2wFnRT0jvFlNbpId5NW1RBfECD3SU/6sa9ssGJoopKcmrRJdQPeeWFoJhuedYuzuF/17nKYWUDAHmOY= 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=q354dfO/; 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="q354dfO/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFA27C116B1; Tue, 23 Jul 2024 02:29:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1721701762; bh=8etnvcsEn9ov7KchYXGpq9gVb6jNkgseWDnyie3LPD8=; h=Date:To:From:Subject:From; b=q354dfO/UHrD34iDuioMY4WzyvTkbfO+gYhx2UP+thjZrbNYr4FazOA6jPf2ta82D dsEkP3WZSCZyGZ/mQh946j6s8Zxw+mt5aXZ+QJhXid/4/3bhkU2wdsfR1ERV5Oq9Cb WeqUHEULaa0pnsfHIPIczq6cIayHIo4D7tXHKVpA= Date: Mon, 22 Jul 2024 19:29:22 -0700 To: mm-commits@vger.kernel.org,zhongjubin@huawei.com,will@kernel.org,tglx@linutronix.de,sjg@chromium.org,sam@gentoo.org,rdunlap@infradead.org,paul.walmsley@sifive.com,palmer@dabbelt.com,mpe@ellerman.id.au,me@lirui.org,krzk@kernel.org,joel@jms.id.au,jmaselbas@zdiv.net,herbert@gondor.apana.org.au,gregkh@linuxfoundation.org,emil.renner.berthing@canonical.com,corbet@lwn.net,catalin.marinas@arm.com,aou@eecs.berkeley.edu,lasse.collin@tukaani.org,akpm@linux-foundation.org From: Andrew Morton Subject: + xz-cleanup-crc32-edits-from-2018.patch added to mm-nonmm-unstable branch Message-Id: <20240723022922.BFA27C116B1@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: xz: cleanup CRC32 edits from 2018 has been added to the -mm mm-nonmm-unstable branch. Its filename is xz-cleanup-crc32-edits-from-2018.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/xz-cleanup-crc32-edits-from-2018.patch This patch will later appear in the mm-nonmm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Lasse Collin Subject: xz: cleanup CRC32 edits from 2018 Date: Sun, 21 Jul 2024 16:36:24 +0300 In 2018, a dependency on was added to avoid duplicating the same constant in multiple files. Two months later it was found to be a bad idea and the definition of CRC32_POLY_LE macro was moved into xz_private.h to avoid including . xz_private.h is a wrong place for it too. Revert back to the upstream version which has the poly in xz_crc32_init() in xz_crc32.c. Link: https://lkml.kernel.org/r/20240721133633.47721-10-lasse.collin@tukaani.org Fixes: faa16bc404d7 ("lib: Use existing define with polynomial") Fixes: 242cdad873a7 ("lib/xz: Put CRC32_POLY_LE in xz_private.h") Signed-off-by: Lasse Collin Reviewed-by: Sam James Tested-by: Michael Ellerman (powerpc) Cc: Krzysztof Kozlowski Cc: Herbert Xu Cc: Joel Stanley Cc: Albert Ou Cc: Catalin Marinas Cc: Emil Renner Berthing Cc: Greg Kroah-Hartman Cc: Jonathan Corbet Cc: Jubin Zhong Cc: Jules Maselbas Cc: Palmer Dabbelt Cc: Paul Walmsley Cc: Randy Dunlap Cc: Rui Li Cc: Simon Glass Cc: Thomas Gleixner Cc: Will Deacon Signed-off-by: Andrew Morton --- lib/xz/xz_crc32.c | 2 +- lib/xz/xz_private.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) --- a/lib/xz/xz_crc32.c~xz-cleanup-crc32-edits-from-2018 +++ a/lib/xz/xz_crc32.c @@ -28,7 +28,7 @@ STATIC_RW_DATA uint32_t xz_crc32_table[2 XZ_EXTERN void xz_crc32_init(void) { - const uint32_t poly = CRC32_POLY_LE; + const uint32_t poly = 0xEDB88320; uint32_t i; uint32_t j; --- a/lib/xz/xz_private.h~xz-cleanup-crc32-edits-from-2018 +++ a/lib/xz/xz_private.h @@ -104,10 +104,6 @@ # endif #endif -#ifndef CRC32_POLY_LE -#define CRC32_POLY_LE 0xedb88320 -#endif - /* * Allocate memory for LZMA2 decoder. xz_dec_lzma2_reset() must be used * before calling xz_dec_lzma2_run(). _ Patches currently in -mm which might be from lasse.collin@tukaani.org are maintainers-add-xz-embedded-maintainer.patch licenses-add-0bsd-license-text.patch xz-switch-from-public-domain-to-bsd-zero-clause-license-0bsd.patch xz-fix-comments-and-coding-style.patch xz-fix-kernel-doc-formatting-errors-in-xzh.patch xz-improve-the-microlzma-kernel-doc-in-xzh.patch xz-documentation-staging-xzrst-revise-thoroughly.patch docs-add-xz_extern-to-c_id_attributes.patch xz-cleanup-crc32-edits-from-2018.patch xz-optimize-for-loop-conditions-in-the-bcj-decoders.patch xz-add-arm64-bcj-filter.patch xz-add-risc-v-bcj-filter.patch xz-use-128-mib-dictionary-and-force-single-threaded-mode.patch xz-adjust-arch-specific-options-for-better-kernel-compression.patch arm64-boot-add-imagexz-support.patch riscv-boot-add-imagexz-support.patch