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 X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E139FC433DF for ; Wed, 10 Jun 2020 01:50:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ABFBC20734 for ; Wed, 10 Jun 2020 01:50:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="N/gZK7ru" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726040AbgFJBuB (ORCPT ); Tue, 9 Jun 2020 21:50:01 -0400 Received: from ozlabs.org ([203.11.71.1]:53073 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725944AbgFJBuA (ORCPT ); Tue, 9 Jun 2020 21:50:00 -0400 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 49hVKx341vz9sRh; Wed, 10 Jun 2020 11:49:57 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1591753798; bh=JcCB3Jwjs8Ym9pdEb48PmqG0PTcVsLFh5SQbcLiEZG4=; h=Date:From:To:Cc:Subject:From; b=N/gZK7ruVgtDgJ0nOuefiQ5U2Ck0OEQCiRy2MIXwZnhvICr4YvK9bSlE+3zU3yRFh Ss4LqJgbKS1ddNB2S6rspzBM9JB0DsLcS337rEwgAtTkbTLSHnuoqOwtr/i5A7RhHB Pea8BBxSNaXSK+4nwvMcshuVJcJJm7N7JdHDRUXpPJwmhjfdUUGJca3ZueLpWy69ki EYcgcTezXmGYl9Kha0n/lhF91kXMUNnYBx9hhyoVkqG5J1EJJ7XCCQMKNMA60fYCf/ DUl48NXmcW3EBruMF9Aq0LbKkRWytdRKgCU32AvQYmGogmQwX1mcfKhMyDPMsQK2cm LwNybSOixN1vA== Date: Wed, 10 Jun 2020 11:49:56 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux Next Mailing List , Linux Kernel Mailing List , Mike Rapoport , Andrew Morton , Will Deacon Subject: linux-next: manual merge of the tip tree with Linus' tree Message-ID: <20200610114956.0b41e116@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/DPYlI0_cVmDRVpYEDWyT+Sl"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/DPYlI0_cVmDRVpYEDWyT+Sl 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/sparc/include/asm/pgtable_32.h because commits 3408974d0533 ("sparc32: mm: Restructure sparc32 MMU page-table layout") c95be5b549d6 ("sparc32: mm: Change pgtable_t type to pte_t * instead of s= truct page *") from the tip tree also exist in Linus' tree as different commits followed by other changes. I fixed it up (I just used Linus' version) 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 --Sig_/DPYlI0_cVmDRVpYEDWyT+Sl Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7gPEQACgkQAVBC80lX 0GxVmQf9GlMYcfn4vfP4aZkeiG7V4H5Y7U9wH6paRhF5hB2N4pvq17HWsSBwDqNs EOmkl9Myf9Vi5Nwdw40C/vVdyPNm9Cv6eOxnj3YZPk9QtIkWkzZu9l/TG8MGnl2o N6+UBgbkrP8UT0wlPUvCVKBV9J1i6/FFefDlDaeq+IFe10jzfN6r1SlmZdsu39uL 9gustVHb56sd+VUZGjFoucgi/YlyW1kwx8gc+uk15BB3+ovRRZ24cTvum678tJxF Gh0gQeNEb+pHLawYbARYum4M/6fSW1LpVoAczXwllnaWqchTseWJztyCptfnnSZO Htq6InXiQVJyMA39+WKvqlsepwomhA== =uERo -----END PGP SIGNATURE----- --Sig_/DPYlI0_cVmDRVpYEDWyT+Sl--