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=-10.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_2 autolearn=unavailable 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 7C312C433B4 for ; Wed, 12 May 2021 08:52:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 42027613C4 for ; Wed, 12 May 2021 08:52:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231127AbhELIxv (ORCPT ); Wed, 12 May 2021 04:53:51 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3064 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230145AbhELIxu (ORCPT ); Wed, 12 May 2021 04:53:50 -0400 Received: from fraeml734-chm.china.huawei.com (unknown [172.18.147.206]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4Fg7YY61mnz6tmwH; Wed, 12 May 2021 16:41:21 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml734-chm.china.huawei.com (10.206.15.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 12 May 2021 10:52:40 +0200 Received: from localhost (10.52.125.138) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 12 May 2021 09:52:39 +0100 Date: Wed, 12 May 2021 09:50:57 +0100 From: Jonathan Cameron To: Stephen Rothwell CC: Greg KH , Linux Kernel Mailing List , Linux Next Mailing List , Tomasz Duszynski Subject: Re: linux-next: manual merge of the iio tree with the staging.current tree Message-ID: <20210512095057.00000715@Huawei.com> In-Reply-To: <20210512114805.5bcef396@canb.auug.org.au> References: <20210512114342.286dd7d6@canb.auug.org.au> <20210512114805.5bcef396@canb.auug.org.au> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; i686-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.52.125.138] X-ClientProxiedBy: lhreml725-chm.china.huawei.com (10.201.108.76) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 12 May 2021 11:48:05 +1000 Stephen Rothwell wrote: > Hi all, > > On Wed, 12 May 2021 11:43:42 +1000 Stephen Rothwell wrote: > > > > Today's linux-next merge of the iio tree got a conflict in: > > > > drivers/iio/industrialio-core.c > > > > between commit: > > > > 901f84de0e16 ("iio: core: fix ioctl handlers removal") > > > > from the staging.current tree and commit: > > > > 919a6adf8107 ("iio: core: move @chrdev from struct iio_dev to struct iio_dev_opaque") > > > > from the iio 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. > > > > diff --cc drivers/iio/industrialio-core.c > > index 59efb36db2c7,efb4cf91c9e4..000000000000 > > --- a/drivers/iio/industrialio-core.c > > +++ b/drivers/iio/industrialio-core.c > > @@@ -1785,10 -1811,10 +1810,10 @@@ static long iio_ioctl(struct file *filp > > } > > > > if (ret == IIO_IOCTL_UNHANDLED) > > - ret = -EINVAL; > > + ret = -ENODEV; > > > > out_unlock: > > - mutex_unlock(&indio_dev->info_exist_lock); > > + mutex_unlock(&iio_dev_opaque->info_exist_lock); > > > > return ret; > > } > > @@@ -1925,9 -1951,12 +1950,9 @@@ EXPORT_SYMBOL(__iio_device_register) > > **/ > > void iio_device_unregister(struct iio_dev *indio_dev) > > { > > - cdev_device_del(&indio_dev->chrdev, &indio_dev->dev); > > - struct iio_dev_opaque *iio_dev_opaque = to_iio_dev_opaque(indio_dev); > > - struct iio_ioctl_handler *h, *t; > > - > > + cdev_device_del(&iio_dev_opaque->chrdev, &indio_dev->dev); > > > > - mutex_lock(&indio_dev->info_exist_lock); > > + mutex_lock(&iio_dev_opaque->info_exist_lock); > > > > iio_device_unregister_debugfs(indio_dev); > > > > Actually, I had to add back the iio_dev_opaque declaration line. > Makes sense. I'll deal with this in the IIO tree after rc2. thanks, Jonathan