From mboxrd@z Thu Jan 1 00:00:00 1970 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 633CFC433EF for ; Thu, 26 May 2022 03:02:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344404AbiEZDCm (ORCPT ); Wed, 25 May 2022 23:02:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244248AbiEZDCg (ORCPT ); Wed, 25 May 2022 23:02:36 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20B30A5006; Wed, 25 May 2022 20:02:34 -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 4L7t5d4YdFz4xD7; Thu, 26 May 2022 13:02:29 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1653534152; bh=Y1CWBrTGeBug7/NRRfM5Ch83WIwakEjgYsahfyMDPPA=; h=Date:From:To:Cc:Subject:From; b=pFawtkQGTV/y66bZ1SLwz7dvat11iqg5B3nFfUnA7VlvTtEIEepq0OddtFxpVlnlT b+igWxlpbqp6BLl0MtrL0iHWNJ/s5Dt4MgMXxW/ryFaR7oUQE8PBnpsS/YZqIA5teY vksqUXUChZsCqXd2zTAP4PU93HJukWh2DxoXz/pAo9PHWz0cvfT+6puSHIE/vImws+ 7bBl3m1xp/3mqPH9uFy0iy9YlKoStfMxXjnpEnzHhuPsHeXtkGk91IhkUXwbD44nJZ +ce7LKc2TJrIpsEAhmI1xfTnotIz7jBGNNxfETOrv7cw/gtGHWHB0Z9rBVFwiTVR+e kGkpy5E62rKwA== Date: Thu, 26 May 2022 13:02:28 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Palmer Dabbelt , Paul Walmsley Cc: Guo Ren , Guo Ren , Ingo Molnar , Juerg Haefliger , Linux Kernel Mailing List , Linux Next Mailing List , Palmer Dabbelt Subject: linux-next: manual merge of the tip tree with the risc-v tree Message-ID: <20220526130228.332e59a7@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/ugnS0S/C+hwX6FgrZ2SYL2n"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/ugnS0S/C+hwX6FgrZ2SYL2n Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/Kconfig between commit: 0cbed0ee1dbc ("arch: Add SYSVIPC_COMPAT for all architectures") from the risc-v tree and commit: 758cd94a0e16 ("x86/Kconfig: Fix indentation and add endif comments to arc= h/x86/Kconfig") 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/Kconfig index 98eaa8870f28,4d610ae216ce..000000000000 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@@ -2869,7 -2861,11 +2867,7 @@@ config COMPA if COMPAT config COMPAT_FOR_U64_ALIGNMENT def_bool y - endif - -config SYSVIPC_COMPAT - def_bool y - depends on SYSVIPC + endif # COMPAT =20 endmenu =20 --Sig_/ugnS0S/C+hwX6FgrZ2SYL2n Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKO7cQACgkQAVBC80lX 0GwVhwf+Ih7Sk6dvVrNDkZ7ishMucMzwdtmcwP6ICHXD8UlB9O5HDnf94gmVl9cK sDLJE0Axx2kShnpXl2k9K1xBywQzDkEKH5oMJPyKDJTgDNMez68NP+hZQ08iiSdk mHu957rSMzAHIgErtOTCV60aig2QyL3d6A0/JuuWqHeDbRt9OrY6DE2TYskhvCQk bOBO4XMqkYEILzAE1Dv09hgKXMdGyoGwhk2S1xSW4CHdbHxMdye8NN3khwLVaUmG C05VuJmkqQUJNfKJA5Ql5l0e4R+XFjT4VpPtGt1utOpubeUh7ljSZc6OMMu/9rZG J5GPOX4cGdOuRkOSbJ8g99vTbxjBMw== =nVH8 -----END PGP SIGNATURE----- --Sig_/ugnS0S/C+hwX6FgrZ2SYL2n--