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 E2ADDC433F5 for ; Tue, 22 Mar 2022 00:12:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233877AbiCVANv (ORCPT ); Mon, 21 Mar 2022 20:13:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233876AbiCVANu (ORCPT ); Mon, 21 Mar 2022 20:13:50 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0CC52D4D7A; Mon, 21 Mar 2022 17:11:06 -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 4KMsKy5bk3z4xL3; Tue, 22 Mar 2022 11:09:26 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1647907767; bh=4nqnqth803i/Xf8RxS2LPdwAs0gytBUqS/Ki9UbFU/o=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=WkyHmOlGWeOcConUsOwGb5wtziOlfFWgr3Pqf1iBP9uPQ9AhTO3RafUR7aldIjINl RtIxaFZkziB5SMLc4FofJ8dBOhnd4pa5WqDssv+yEH37otNPV0G4evYR+Y+3Qc92KP qhMAYyWc5qVPPQYpQAfFpK6SW2PQLVZwQDgfEctjWZEqu5ankEEmoxPnppTwyCVilF nidqkuMoT8b5S28dTvugDeApUpiLudT0PVamTRxSlKXpTk/i30feDdwuIDsfwMXBd7 39CFr463iSLpEPnRyWv92UFOYuE/FGODRi5eXJ0+koyZymRYpdDTg6jntu19Z4gWSa 5e5+TDK3Cq6dA== Date: Tue, 22 Mar 2022 11:09:25 +1100 From: Stephen Rothwell To: Arnd Bergmann Cc: Helge Deller , Parisc List , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the parisc-hd tree with the asm-generic tree Message-ID: <20220322110925.7b295e54@canb.auug.org.au> In-Reply-To: <20220228114523.03b2f921@canb.auug.org.au> References: <20220228114523.03b2f921@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/JECP/m+MkvZbCsBV3x2wGku"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/JECP/m+MkvZbCsBV3x2wGku Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Mon, 28 Feb 2022 11:45:23 +1100 Stephen Rothwell = wrote: > > Today's linux-next merge of the parisc-hd tree got a conflict in: >=20 > arch/parisc/lib/memcpy.c >=20 > between commit: >=20 > 967747bbc084 ("uaccess: remove CONFIG_SET_FS") >=20 > from the asm-generic tree and commit: >=20 > d4a767ea8b0e ("parisc: Use constants to encode the space registers like= SR_KERNEL") >=20 > from the parisc-hd tree. This is now a conflict between the asm-generic tree and commit 360bd6c65807 ("parisc: Use constants to encode the space registers like S= R_KERNEL") in Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/JECP/m+MkvZbCsBV3x2wGku Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmI5E7UACgkQAVBC80lX 0GxbDggAn6FQaXTvpmAOqqfelYM0EN747gukeBKFXbUP64zbqUjQg9wzpSULUR0I bIrR4kAJEmic2i5goPHE5c/KgG+pGC80muNBL2KXtEPwSBk5cJHv0v7tUC9SYgSD ePEI75xwHjd2fc6iWjXTewd8CTEcfw+n+DSHsF9GHBD30+JG76OfdbgU3Bjx+NZq guwsbqCaoqkBGF4lmj+tWi0dopokNfCRkXzVx7RxHuvQSsGyYbSSzp6a5SjUfxQH 0ferJuYWLMTNO13pyhxdMhlHsnzVabnFh61/uGsZNp3pdKC6y0O6Hs+j409edwR+ FiuFT1zPrK+48+jZTqfOQZPIRsDKoQ== =FBOi -----END PGP SIGNATURE----- --Sig_/JECP/m+MkvZbCsBV3x2wGku--