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=-3.9 required=3.0 tests=BAYES_00,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 DE6ACC2D0A3 for ; Mon, 9 Nov 2020 06:01:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AE2B120706 for ; Mon, 9 Nov 2020 06:01:06 +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="nRnJQy2d" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729192AbgKIGBF (ORCPT ); Mon, 9 Nov 2020 01:01:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728951AbgKIGBF (ORCPT ); Mon, 9 Nov 2020 01:01:05 -0500 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DD2FC0613CF; Sun, 8 Nov 2020 22:01:05 -0800 (PST) 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 4CV0j773Nrz9s0b; Mon, 9 Nov 2020 17:00:43 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1604901661; bh=Trpddkr5TEGyIElEB2ATZpjULhHxqrFRZrIQyzuu0QE=; h=Date:From:To:Cc:Subject:From; b=nRnJQy2dS/cTK37gIzaHUsBHZeHl5ejOX9scIjD/w9aDZVnq/wr2RWNyBc4TAVhpk +gVxjqmR79/nvG7cC5lq5YH5+D9iiYkGv/sIPp8FxuXK29l2Gpzb9hvsbhr1P3WbJz N/DYigeoxTgMzns8eqgUrw4tMuIm6wP1gtsz4jPikkGj+MYHRmtRR9R5YilLE2bX7w mFQUluepUPkrWm0YbISlOAdPzHg6MZMhyrldU2PrmmhEv7R8+uynkGzTHPyxpXvZZr I+NnlJ0x7L7jnvRjAAirVmeIEjPWgH8qtFqEsfzhTWnN9rXLmizWLyJduvJ5VpaO3R ce7R5snVKGQZA== Date: Mon, 9 Nov 2020 17:00:43 +1100 From: Stephen Rothwell To: Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux Kernel Mailing List , Linux Next Mailing List , Mike Rapoport , Mike Rapoport Subject: linux-next: manual merge of the akpm-current tree with the tip tree Message-ID: <20201109170043.58986880@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Sd.KtiMYOMj.cT.V_1CNbap"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/Sd.KtiMYOMj.cT.V_1CNbap Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/arc/Kconfig between commit: 39cac191ff37 ("arc/mm/highmem: Use generic kmap atomic implementation") from the tip tree and commit: b41c56d2a9e6 ("arc: use FLATMEM with freeing of unused memory map instead= of DISCONTIGMEM") from the akpm-current 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/arc/Kconfig index 1a1ee5c4c2e7,c874f8ab0341..000000000000 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@@ -505,8 -507,7 +506,8 @@@ config LINUX_RAM_BAS =20 config HIGHMEM bool "High Memory Support" - select ARCH_DISCONTIGMEM_ENABLE + select HAVE_ARCH_PFN_VALID + select KMAP_LOCAL help With ARC 2G:2G address split, only upper 2G is directly addressable by kernel. Enable this to potentially allow access to rest of 2G and PAE --Sig_/Sd.KtiMYOMj.cT.V_1CNbap Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl+o2wsACgkQAVBC80lX 0GxcuQgAjWeh1upCcTkPEQ4h6ONzTIUDWD4B7//udYjipr90FnD3vc6cv7Q03+sR zHsxJFCVhceIaQ/CM0BefvSQcTs3mmNqUuWm2fxLY16Qdqc/u5ULD+xM4MSxNubM LXS5UYNsjNdl01xdTAt+duxPVLKsD70DNiWKDxhIB72fmtPGJFBahqF3A25vrylN Ag2eTWSnNvOHk+WpOpTQ0LHWEdIDRbbKivpdAKSaEkRaGvXxFhL9kVL8/JrEH+oy 68FjXLdCwoNNO0QNxpN9irwlkqe4rWmHdn4nZrRXR0Y8jIlKimfwvocHlovNFTtj jDbBkQEXucD/VyLkhbzD8FdEcXp2gQ== =fZ0U -----END PGP SIGNATURE----- --Sig_/Sd.KtiMYOMj.cT.V_1CNbap--