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=-5.8 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 43304C433C1 for ; Mon, 22 Mar 2021 06:13:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 03AC461973 for ; Mon, 22 Mar 2021 06:13:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229771AbhCVGM6 (ORCPT ); Mon, 22 Mar 2021 02:12:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229613AbhCVGMt (ORCPT ); Mon, 22 Mar 2021 02:12:49 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83705C061574; Sun, 21 Mar 2021 23:12:49 -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 4F3kgd5tlWz9sVS; Mon, 22 Mar 2021 17:12:45 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1616393567; bh=REYkJNPpHqpteGYqPaFEfJgeie46JBbxa/DAKsGquyE=; h=Date:From:To:Cc:Subject:From; b=dtaxoGoaB1QB/LHSxPzd22Dre8W3tLHw0V0EY5m5zqge+3hHmaC3Q5JzWEVNc398x xkhXPGn4I3H7XA3lzwgsKNgdJPdIPbb2d/LGlFyDXm3lMEpUIc2fjKl5c70PsikQAe OrG8CHRYk4O4D2wVpta/wQdLpH9FQ7UjCLF8PdRDQ1q4UTFGhYo0/omzBbA3WYHqBY n/ERtT1w7xCk0ITt3kYeb0AlbUUtqM7XFoDhyrkHxB3e9t8hvmZGBAEnDpIJHyOZ71 e2J2Q0sftBFQEm0zye3G2Z4j8rwuSQ7wfXAj2qbf3D8ECfkMETmDYkSJ2o4dzM0rXJ Nuk1AFz8hObOA== Date: Mon, 22 Mar 2021 17:12:45 +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 , Oscar Salvador Subject: linux-next: manual merge of the akpm-current tree with the tip tree Message-ID: <20210322171245.2441ab01@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/W4YoKWSNc_Kta9xqphzp2vy"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/W4YoKWSNc_Kta9xqphzp2vy 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/x86/mm/init_64.c between commit: d9f6e12fb0b7 ("x86: Fix various typos in comments") from the tip tree and commit: 68f7bf6e7e98 ("x86/vmemmap: drop handling of 4K unaligned vmemmap range") from the akpm-current tree. I fixed it up (the latter removed the comments fixed up by the former) 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_/W4YoKWSNc_Kta9xqphzp2vy Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmBYNV0ACgkQAVBC80lX 0Gz4VQf/QkPoAg8Ux0q4L5rT3m6NrtwhVhMEk5LnyNDfmpOE3CSsPkG5doN0fNGB 9tYx0NQ+N/89j6gEvHgjTX6ozbUX2+ZOkrKaQBKho9VbY87C4QdvuMTl6pWT68IQ 85yKcnYu41Ylkh8Pzb+Djd39P0rgFXDCB4ZPMGlWNCjxd0LJy2H+FWA1BvXL5BWw lrHYmB72MKhcptUAWyJIfgYl7mIx8IGaAdSqgvB8PPOzb5CAlh3YukPz4LZjoXuQ g3jkfXLi3aY1T8A/6h8e0StMSeH2Y2n13J4yj6YWGE1iQb/Y4n6YZotyoCDq//68 Br6lJauy7kVJEJZzEh6UC2J0wrO/xQ== =D/NM -----END PGP SIGNATURE----- --Sig_/W4YoKWSNc_Kta9xqphzp2vy--