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 0EE42C433E7 for ; Mon, 12 Oct 2020 08:48:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 100E6208FE for ; Mon, 12 Oct 2020 08:48:26 +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="idDJClWn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727158AbgJLIsZ (ORCPT ); Mon, 12 Oct 2020 04:48:25 -0400 Received: from ozlabs.org ([203.11.71.1]:49475 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726104AbgJLIsY (ORCPT ); Mon, 12 Oct 2020 04:48:24 -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 4C8slV0YsDz9sSG; Mon, 12 Oct 2020 19:48:22 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1602492502; bh=H4vsbFQ4YopxQ5AsbArAUhsvvaJoJSd4wrTnXiDX+Dg=; h=Date:From:To:Cc:Subject:From; b=idDJClWniaUMPHw5AnhT7ektZyNKqkFQ25ytkDHwk80+kyixNeC/kDCglrDI18a0Y 7fLfKHhmAG2X54fdzhgkqjqJgeo+0a4zSkh6SpFKX2REE6eK4zklTxFfEEaja6iTCZ BrN5nMhJUxf6Wm1CQiP28/+VMYyJHtnE1Ywt6eP2+HWu6nrZl/E3sacGSBtRMIsVvi A5Bm8GPQ2KnDcCZ0BxMOiKCoAGb4+rDQ9IbvsFtIPx0W9DsQCl1aCMcYiTehGCNcxX fDHkEO4FIqU7Ff+ylI5gVFVRehkNF1KUWqpU/w+wtcnF+889RisUat+i0eU7TzD9qd TfHAEiGUPJfDA== Date: Mon, 12 Oct 2020 19:48:21 +1100 From: Stephen Rothwell To: Andrew Morton , Shuah Khan Cc: Linux Kernel Mailing List , Linux Next Mailing List , "Matthew Wilcox (Oracle)" Subject: linux-next: manual merge of the akpm-current tree with the counters tree Message-ID: <20201012194821.4eeaffab@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/iC91Bsy9=Gzl=cvGn4n4xPL"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/iC91Bsy9=Gzl=cvGn4n4xPL 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: lib/Makefile between commit: 37a0dbf631f6 ("counters: Introduce counter_atomic* counters") from the counters tree and commit: ed7f5253e189 ("mm/page_alloc.c: fix freeing non-compound pages") 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 lib/Makefile index 95b357bb5f3c,1c7577b2e86a..000000000000 --- a/lib/Makefile +++ b/lib/Makefile @@@ -99,7 -101,7 +101,8 @@@ obj-$(CONFIG_TEST_BLACKHOLE_DEV) +=3D tes obj-$(CONFIG_TEST_MEMINIT) +=3D test_meminit.o obj-$(CONFIG_TEST_LOCKUP) +=3D test_lockup.o obj-$(CONFIG_TEST_HMM) +=3D test_hmm.o +obj-$(CONFIG_TEST_COUNTERS) +=3D test_counters.o + obj-$(CONFIG_TEST_FREE_PAGES) +=3D test_free_pages.o =20 # # CFLAGS for compiling floating point code inside the kernel. x86/Makefil= e turns --Sig_/iC91Bsy9=Gzl=cvGn4n4xPL Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl+EGFUACgkQAVBC80lX 0Gwt8Af/WjLVWjWjtWIcwDqatfmMEEktFsFnycAftFOI8JW681tHJlRHZ7XGVGDG sUV9yKCzwr8E6pLD/3lug15jkjUhPCuskpw7zhliwERqJBDa6YfgLefs9nPcW4ED Vmb8Epq2uniEbcaOVNib5z/M587i/zdeDMUJmICYb9B81mCbOTD9QosFTtE6KnMG wh3J/yPzFnqtDhVHWgmfs3wEbxkliq8Ok2tUAYinLC/SH2jRSjyb7tirChiUVgEj d7LGeCD3Wwogr5YkhDwryjyIJ8AzpwZJq6xM+6CCw7nWNY91mvrcDM+SGsucO1es np9gIX5MfXKIgscCi/MtniVmgOZ3cQ== =UmWN -----END PGP SIGNATURE----- --Sig_/iC91Bsy9=Gzl=cvGn4n4xPL--