Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 9 Jul 2019 10:21:37 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jason Gunthorpe <jgg@mellanox.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Nikolay Borisov <nborisov@suse.com>
Subject: Re: linux-next: build failure after merge of the hmm tree
Message-ID: <20190709102137.421d1dd1@canb.auug.org.au>
In-Reply-To: <20190701210853.0c72240b@canb.auug.org.au>
References: <20190701210853.0c72240b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/94y5l8fndW+yjD7YmlNI+mO"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/94y5l8fndW+yjD7YmlNI+mO
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 1 Jul 2019 21:08:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> After merging the hmm tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>=20
> mm/hmm.c: In function 'hmm_get_or_create':
> mm/hmm.c:50:2: error: implicit declaration of function 'lockdep_assert_he=
ld_exclusive'; did you mean 'lockdep_assert_held_once'? [-Werror=3Dimplicit=
-function-declaration]
>   lockdep_assert_held_exclusive(&mm->mmap_sem);
>   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   lockdep_assert_held_once
>=20
> Caused by commit
>=20
>   8a9320b7ec5d ("mm/hmm: Simplify hmm_get_or_create and make it reliable")
>=20
> interacting with commit
>=20
>   9ffbe8ac05db ("locking/lockdep: Rename lockdep_assert_held_exclusive() =
-> lockdep_assert_held_write()")
>=20
> from the tip tree.
>=20
> I have added the following merge fix.
>=20
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 1 Jul 2019 21:05:59 +1000
> Subject: [PATCH] mm/hmm: fixup for "locking/lockdep: Rename
>  lockdep_assert_held_exclusive() -> lockdep_assert_held_write()"
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  mm/hmm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>=20
> diff --git a/mm/hmm.c b/mm/hmm.c
> index c1bdcef403ee..2ddbd589b207 100644
> --- a/mm/hmm.c
> +++ b/mm/hmm.c
> @@ -47,7 +47,7 @@ static struct hmm *hmm_get_or_create(struct mm_struct *=
mm)
>  {
>  	struct hmm *hmm;
> =20
> -	lockdep_assert_held_exclusive(&mm->mmap_sem);
> +	lockdep_assert_held_write(&mm->mmap_sem);
> =20
>  	/* Abuse the page_table_lock to also protect mm->hmm. */
>  	spin_lock(&mm->page_table_lock);
> @@ -248,7 +248,7 @@ static const struct mmu_notifier_ops hmm_mmu_notifier=
_ops =3D {
>   */
>  int hmm_mirror_register(struct hmm_mirror *mirror, struct mm_struct *mm)
>  {
> -	lockdep_assert_held_exclusive(&mm->mmap_sem);
> +	lockdep_assert_held_write(&mm->mmap_sem);
> =20
>  	/* Sanity check */
>  	if (!mm || !mirror || !mirror->ops)

I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.

--=20
Cheers,
Stephen Rothwell

--Sig_/94y5l8fndW+yjD7YmlNI+mO
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0j3hEACgkQAVBC80lX
0GxaywgAmENSm1MjVA5kG/Vfcjl6o2QoPYrf+yWfylPVSHBC8neY9OJebPQ0BIXW
M6L8KulNiV4rPHm1aDsv3/5APubVT3jXfHWptm41IvGCfHnsxNLcxXqN+OEw9RvI
YgXZaBrJbgO86LUiuXXhNMqb5UTvTbp8qoMoQbz1N3U7DdV2pLqLxqF8FRlh1Yom
n2+ZmXdExBCWGiwzB2oYvbPuEVvM305n36YDLAWaCXEsHR+hrkkBjXEQqyC2YB05
/uTTu3OpjkoUpfMMjkt8VdPVT3V8nJ1F/WzU9Y16T1szF9gDf9yDowFgQshojiYc
/oREqeQzYlzapW6X32Vox0YFsrFnCA==
=kCFW
-----END PGP SIGNATURE-----

--Sig_/94y5l8fndW+yjD7YmlNI+mO--