From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Cameron <Jonathan.Cameron@Huawei.com>, Greg KH <greg@kroah.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Tomasz Duszynski <tomasz.duszynski@octakon.com>
Subject: Re: linux-next: manual merge of the iio tree with the staging.current tree
Date: Wed, 12 May 2021 11:48:05 +1000 [thread overview]
Message-ID: <20210512114805.5bcef396@canb.auug.org.au> (raw)
In-Reply-To: <20210512114342.286dd7d6@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2023 bytes --]
Hi all,
On Wed, 12 May 2021 11:43:42 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-05-12 1:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 1:43 linux-next: manual merge of the iio tree with the staging.current tree Stephen Rothwell
2021-05-12 1:48 ` Stephen Rothwell [this message]
2021-05-12 8:50 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210512114805.5bcef396@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Jonathan.Cameron@Huawei.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tomasz.duszynski@octakon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.