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 2F291C35242 for ; Fri, 24 Jan 2020 02:57:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 01F0B2064C for ; Fri, 24 Jan 2020 02:57:32 +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="cvtN5YcH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730583AbgAXC5b (ORCPT ); Thu, 23 Jan 2020 21:57:31 -0500 Received: from ozlabs.org ([203.11.71.1]:46361 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729841AbgAXC5b (ORCPT ); Thu, 23 Jan 2020 21:57:31 -0500 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 483kMW2mW6z9sRK; Fri, 24 Jan 2020 13:57:27 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1579834648; bh=q8ffQqdirptsDf8OczDeNcXp3ch/G5iyXyRmUhpQ7xA=; h=Date:From:To:Cc:Subject:From; b=cvtN5YcHGJtpouxbY2undLOtEunTEaJ3Z9Jkztl/HmNzAQuRUJakQHM8Kc/NPU1Tf MPGh3HHHbrCFRQg9DfW/d1XY2xaogzv4EP/xFWIZX/snz7TDo9FpbibHMgEIZK+moK FSLCVu+F+82aSlStdqFuI8DpVyvxOB2/PZswHoqhMRPI+foiyuse6tT6ZkrSdqx3wY K7yyEN1AwoLZsaxGA17+p+C8no4XExo/qt4K/i2qJZcF01EQ0GJcxwUTKF41uS6oS9 hkq0Gej50KzTS/sLjATFQI4gFIyETcWgK6I+pbhbzlfyKLG+uFocuaT639LfZCDKGt WI6bjTSyD0OGQ== Date: Fri, 24 Jan 2020 13:57:26 +1100 From: Stephen Rothwell To: Paolo Bonzini , Radim =?UTF-8?B?S3LEjW3DocWZ?= , KVM Cc: Linux Next Mailing List , Linux Kernel Mailing List , "Kirill A. Shutemov" , Linus Torvalds , Sean Christopherson , Andrew Morton Subject: linux-next: manual merge of the kvm tree with Linus' tree Message-ID: <20200124135726.5fa8d146@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/N3xuIRKvN6fQ3AKvGXUMZTr"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/N3xuIRKvN6fQ3AKvGXUMZTr Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the kvm tree got a conflict in: mm/huge_memory.c between commit: 97d3d0f9a1cf ("mm/huge_memory.c: thp: fix conflict of above-47bit hint ad= dress and PMD alignment") from Linus' tree and commit: 0638468d2282 ("mm: thp: KVM: Explicitly check for THP when populating sec= ondary MMU") from the kvm 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 mm/huge_memory.c index a88093213674,9b3ee79d0edf..000000000000 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@@ -527,13 -527,24 +527,24 @@@ void prep_transhuge_page(struct page *p set_compound_page_dtor(page, TRANSHUGE_PAGE_DTOR); } =20 + bool is_transparent_hugepage(struct page *page) + { + if (!PageCompound(page)) + return 0; +=20 + page =3D compound_head(page); + return is_huge_zero_page(page) || + page[1].compound_dtor =3D=3D TRANSHUGE_PAGE_DTOR; + } + EXPORT_SYMBOL_GPL(is_transparent_hugepage); +=20 -static unsigned long __thp_get_unmapped_area(struct file *filp, unsigned = long len, +static unsigned long __thp_get_unmapped_area(struct file *filp, + unsigned long addr, unsigned long len, loff_t off, unsigned long flags, unsigned long size) { - unsigned long addr; loff_t off_end =3D off + len; loff_t off_align =3D round_up(off, size); - unsigned long len_pad; + unsigned long len_pad, ret; =20 if (off_end <=3D off_align || (off_end - off_align) < size) return 0; --Sig_/N3xuIRKvN6fQ3AKvGXUMZTr Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl4qXRYACgkQAVBC80lX 0Gy/rAf8DIQ0Sxyoae7h9n1by/1APETPO+A4WLctDdKktOmSlrC4zueiznCmZ/IK 1vjeZ5Cz2Q9MFzqCcMV34n7ZQkip92I0rUmwd6xkXi/tnRphvSX1fAbpw5pXBZkd Pi4cySxGIGBsyJbTxrUWgdG2qlmLkoDPUX45Bq4yCLeLKcZPvSv9i8QhIuzeKuNM GNdidhTZmh/RDxs+/Pigl3hYg4daGUQqCsYjGjrvlfSgzP5KPTfoNDGKzRIcYofU RsDZy8NsqauaKhBX/IO2U3Ijqv3vwHtcCja5dQO6I8jElWfP+rSnwGetuRjsClh6 I8RXs7oMIn+OgbjJK754Xagm9ecaOw== =eQO+ -----END PGP SIGNATURE----- --Sig_/N3xuIRKvN6fQ3AKvGXUMZTr--