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;
From:   Jason Gunthorpe <jgg@mellanox.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
CC:     Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        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
Thread-Topic: linux-next: build failure after merge of the hmm tree
Thread-Index: AQHVL/1llyAK+KM7wk6DgNO5k5IMqqbBeI+AgADMTQA=
Date:   Tue, 9 Jul 2019 12:32:54 +0000
Message-ID: <20190709123250.GF3436@mellanox.com>
References: <20190701210853.0c72240b@canb.auug.org.au>
 <20190709102137.421d1dd1@canb.auug.org.au>
In-Reply-To: <20190709102137.421d1dd1@canb.auug.org.au>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-originating-ip: [156.34.55.100]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: ff82d768-028f-425f-6c16-08d704699092
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020);SRVR:VI1PR05MB5984;
x-ms-traffictypediagnostic: VI1PR05MB5984:
x-microsoft-antispam-prvs: <VI1PR05MB5984C5B2C4827EC85BA1EDAECFF10@VI1PR05MB5984.eurprd05.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:530;
x-forefront-prvs: 0093C80C01
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(366004)(39860400002)(376002)(346002)(396003)(136003)(43544003)(53434003)(189003)(199004)(53754006)(486006)(81166006)(6436002)(11346002)(2616005)(81156014)(7736002)(6116002)(3846002)(446003)(229853002)(33656002)(6916009)(8676002)(6486002)(478600001)(14444005)(256004)(6246003)(316002)(36756003)(25786009)(476003)(54906003)(86362001)(6512007)(8936002)(53936002)(76176011)(99286004)(71190400001)(5660300002)(52116002)(1076003)(73956011)(66476007)(26005)(66446008)(64756008)(66946007)(4326008)(102836004)(305945005)(386003)(186003)(66066001)(68736007)(6506007)(66556008)(53546011)(14454004)(71200400001)(2906002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR05MB5984;H:VI1PR05MB4141.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1;
received-spf: None (protection.outlook.com: mellanox.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: e/7VdZV5vB/6lr9eKDa/9R9CZ1KYS/BJN4jZZGBZCNc8T8Nf3jHmLq7OlvDuWguuU1UtKaMnV1Wr6gUXi4gK7hjJNjtWNbEboto5i6kXMmBs1j74MnlnovUvJddvfpDm9AwvC41aEDUiznO1Vebbm6Nwb2lAHO4NRARXnfEIcYBebRY4+WK4XdV+DESitcVkPkiTjl/QXlXV0gKFZvoit7EOW9c+cwPBKE17sz2KRzAXc1Cc8BL3GhhQBMkdeGNYF+OPd0LLfMNFdHKX7jROMBhtlo5Vu9yY+/mtwiCxaTLP9O5MJwDgXe1HNmEIn34ZqOONrx4TGnGlwCHxeXTNWYGMAse5AvkrD98qpVTD+5d0bUHfzmlptyPVjhTpeoor3I+r1CylUyg5ekbS1gSqwWIBRUtaN16vlPNj+DtoETk=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <282AF135E21D614296B5EABDB7547021@eurprd05.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: Mellanox.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ff82d768-028f-425f-6c16-08d704699092
X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jul 2019 12:32:54.1935
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: jgg@mellanox.com
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5984
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Jul 09, 2019 at 10:21:37AM +1000, Stephen Rothwell wrote:
> Hi all,
>=20
> On Mon, 1 Jul 2019 21:08:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au>=
 wrote:
> >
> > After merging the hmm tree, today's linux-next build (x86_64 allmodconf=
ig)
> > 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_=
held_exclusive'; did you mean 'lockdep_assert_held_once'? [-Werror=3Dimplic=
it-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 reliabl=
e")
> >=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
> > +++ 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_notifi=
er_ops =3D {
> >   */
> >  int hmm_mirror_register(struct hmm_mirror *mirror, struct mm_struct *m=
m)
> >  {
> > -	lockdep_assert_held_exclusive(&mm->mmap_sem);
> > +	lockdep_assert_held_write(&mm->mmap_sem);
> > =20
> >  	/* Sanity check */
> >  	if (!mm || !mirror || !mirror->ops)
>=20
> I am still getting this conflict (the commit ids may have changed).
> Just a reminder in case you think Linus may need to know.

Ingo already sent the PR to Linus with the function rename, so I will
take care of it.

Thanks,
Jason