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 103F4C433EF for ; Mon, 11 Apr 2022 03:35:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234926AbiDKDiD (ORCPT ); Sun, 10 Apr 2022 23:38:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244654AbiDKDiB (ORCPT ); Sun, 10 Apr 2022 23:38:01 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C90D2AEC; Sun, 10 Apr 2022 20:35:45 -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 4KcDyl4Xrvz4xNl; Mon, 11 Apr 2022 13:35:43 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1649648143; bh=FITXLJ2XB3AefAccJrSzrvZrDIBGXAT3i4LUXuXtc2U=; h=Date:From:To:Cc:Subject:From; b=Wcnn5jLP+iJfSEDKqI2FBz/hzrxBAZfAzKzuvTWwjCruilaw26XT7BbxwxSCDZCkl rF31DDPd/cQmw6gmbOOLZf5n8kkGbat/G2MZEHzZGmqjoTMZqcNGZjGJAeaVZOrKRG 914v8GSh7O8r5daK3hEusfZ9jLvh8OnYhU1x336QiXSmWPa1HJwI15c3ulrhM/QrLK 0qUknbYm4DNRXmVelPMiiGeJhcKO9auBdurLW/Inb45Oat+KrLKGNS99T6mHx65GtA c/oP3cCp7OHZ6De0phZ6CfkCh4T5+Ip2+2sT/nbO+ZlDFOsVMCnPgejnYosdoIClE0 DwKsd8iWIpycQ== Date: Mon, 11 Apr 2022 13:35:42 +1000 From: Stephen Rothwell To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , Linux Kernel Mailing List , Linux Next Mailing List , Miaohe Lin Subject: linux-next: manual merge of the akpm-current tree with Linus' tree Message-ID: <20220411133542.29debc54@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/7hB/jbvO41o8D+qU4HGQHSm"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/7hB/jbvO41o8D+qU4HGQHSm 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: mm/migrate.c between commits: ffe06786b540 ("mm/migrate: Use a folio in alloc_migration_target()") c185e494ae0c ("mm/migrate: Use a folio in migrate_misplaced_transhuge_pag= e()") from Linus' tree and commits: 4ea144548e29 ("mm/migration: remove unneeded out label") fc5f5507f33b ("mm/migration: fix the confusing PageTransHuge check") from the akpm-current tree. I fixed it up (I used the former 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_/7hB/jbvO41o8D+qU4HGQHSm Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmJTog4ACgkQAVBC80lX 0Gzhbgf/XKWwYDPZwS4FsGGhvPMMsgIHFc8+nx56MVg2deRfWvnClKKJZYII+oif BedumazkSdOL4t1Zo72hWjtwXdKaYKRqX8GvzChBpcRsmfIWsfkYOexEq3lkVAhI /vNe352BuJcH1n0V0zb7qHrCgqbTVg8Q8DZxnO2EPV91FHJYLlbYagdBhnPNJ760 S5XwNgthHAB9If+g8ivhwBspR7kkrE57qNV2qWrXSmfGMqf4WsLJNoV3tL9W4wro 1l524hBzjEcpKrBkZRtXok8kEYT3hVyabc2AiK4w30MAR4LFUcDnGnF+7RY/EASv NCF2Vp2HVFF5UQb0poKsOlyimEzYUQ== =o9TM -----END PGP SIGNATURE----- --Sig_/7hB/jbvO41o8D+qU4HGQHSm--