From nobody Sat Apr 18 02:47:56 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43EEAC43334 for ; Tue, 19 Jul 2022 04:10:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234087AbiGSEKB (ORCPT ); Tue, 19 Jul 2022 00:10:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232269AbiGSEJ7 (ORCPT ); Tue, 19 Jul 2022 00:09:59 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8BD03E765; Mon, 18 Jul 2022 21:09:57 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Ln52R2hSGz4xXF; Tue, 19 Jul 2022 14:09:51 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1658203793; bh=QvJ/FceJdvHwM73DpSa5VCJrfobFpvQQEAqrJjR4+50=; h=Date:From:To:Cc:Subject:From; b=mkWGYmAJSfBMFoupPUG8j/8Xq5pAz1k2v7XLLuThpxL4Td+mjH1tPRXQgyeUU9sJA +oTmtpXy3r/7T2MEsP4P2a4R/c2LylmJobBcDXn8O+FB1d86nEBqaY6PmC9aJFIAWd 8ZjRc4W+r1BG+ejkZj7b7QzqCegEZ15pXSuNCcIthAOwVGa8sLyLCqerjPoCMiePVw lwnf4QeqmWav6vYz86qrDBCfHu626uPcHmsA3/kmjaCp0hb/qSVNF05yMZVO+Qwk91 bLIxPFFxEu8icLiY/vHKjLKuTe9igRNFatxAeIG+L3V/dQayFUXm3WfD0SqxP83wYy 7YEqU36INaDTQ== Date: Tue, 19 Jul 2022 14:09:50 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Mimi Zohar , Dmitry Kasatkin Cc: Borislav Petkov , Coiby Xu , "Jason A. Donenfeld" , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the tip tree with the integrity tree Message-ID: <20220719140950.67296570@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/2REtEWfzEoKM.S8d/NObwI1"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/2REtEWfzEoKM.S8d/NObwI1 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/kernel/kexec-bzimage64.c between commit: c903dae8941d ("kexec, KEYS: make the code in bzImage64_verify_sig generic= ") from the integrity tree and commit: 68b8e9713c8e ("x86/setup: Use rng seeds from setup_data") from the tip tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc arch/x86/kernel/kexec-bzimage64.c index f299b48f9c9f,b9bdb40364a6..000000000000 --- a/arch/x86/kernel/kexec-bzimage64.c +++ b/arch/x86/kernel/kexec-bzimage64.c @@@ -17,6 -17,8 +17,7 @@@ #include #include #include -#include + #include =20 #include #include --Sig_/2REtEWfzEoKM.S8d/NObwI1 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLWLo4ACgkQAVBC80lX 0GyWlwf/beoR63X8M01XkW+ECW3+xTckMcf30XYHAkdevi8SIVho25t+kxVwMyEE tQ9GvOqs50v0O0vvKUgda+j/yE1r/JyvNCJCFqWwbA+EfF7NqoYfhc+ZKUTmo9FY HKIIP+WO9tY+jf/AzpVMjnHJ6IX/SV7JXoekeYIMe6us8RWF1PAHxHzs3Wx4MoZ0 B5+a2DZeR5ijawGTub5kUl1TeaCD0LtH5C9kVyHQq9f+rFzsZ+cRi25C+LBzWRzp QqcydfhyiccKi0C1QNWHvA9EgwbE76f0hkBfvv/qhc38DOyC8ykXRI5kd/jWbQrV WQ9a2zq2or/+wFne28rM4c2LhgMoPw== =GC2v -----END PGP SIGNATURE----- --Sig_/2REtEWfzEoKM.S8d/NObwI1--