From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Dinghao Liu <dinghao.liu@zju•edu.cn>,
Jonathan Cameron <Jonathan.Cameron@huawei•com>,
Alexandru Ardelean <alexandru.ardelean@analog•com>
Subject: Re: linux-next: manual merge of the staging tree with Linus' tree
Date: Mon, 20 Jul 2020 09:37:19 +0200 [thread overview]
Message-ID: <20200720073719.GA458916@kroah.com> (raw)
In-Reply-To: <20200720152522.5ccfc3ef@canb.auug.org.au>
On Mon, Jul 20, 2020 at 03:25:22PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/iio/magnetometer/ak8974.c
>
> between commit:
>
> 0187294d227d ("iio: magnetometer: ak8974: Fix runtime PM imbalance on error")
>
> from Linus' tree and commit:
>
> d3be83244c7d ("iio: remove explicit IIO device parent assignment")
>
> from the staging 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/iio/magnetometer/ak8974.c
> index 91c39352fba2,c2260c84f7f1..000000000000
> --- a/drivers/iio/magnetometer/ak8974.c
> +++ b/drivers/iio/magnetometer/ak8974.c
> @@@ -890,10 -884,14 +890,9 @@@ static int ak8974_probe(struct i2c_clie
> ret = ak8974_reset(ak8974);
> if (ret) {
> dev_err(&i2c->dev, "AK8974 reset failed\n");
> - goto power_off;
> + goto disable_pm;
> }
>
> - indio_dev->dev.parent = &i2c->dev;
> - pm_runtime_set_autosuspend_delay(&i2c->dev,
> - AK8974_AUTOSUSPEND_DELAY);
> - pm_runtime_use_autosuspend(&i2c->dev);
> - pm_runtime_put(&i2c->dev);
> -
> switch (ak8974->variant) {
> case AK8974_WHOAMI_VALUE_AMI306:
> case AK8974_WHOAMI_VALUE_AMI305:
Looks good to me, thanks, I've now done this same thing to my tree as I
have merged with v5.8-rc6.
thanks,
greg k-h
next prev parent reply other threads:[~2020-07-20 7:37 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-20 5:25 linux-next: manual merge of the staging tree with Linus' tree Stephen Rothwell
2020-07-20 7:37 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-06-06 9:12 Stephen Rothwell
2018-06-06 9:47 ` Greg KH
2018-06-06 9:08 Stephen Rothwell
2018-06-06 9:10 ` Greg KH
2016-04-05 3:49 Stephen Rothwell
2016-04-11 16:57 ` Greg KH
2014-09-22 5:01 Stephen Rothwell
2014-09-22 14:31 ` Greg KH
2013-03-15 4:13 Stephen Rothwell
2013-03-15 15:01 ` Greg KH
2013-01-17 2:35 Stephen Rothwell
2013-01-18 0:42 ` Greg KH
2012-04-27 4:37 Stephen Rothwell
2012-04-27 17:05 ` Greg KH
2012-05-02 21:23 ` Greg KH
2012-02-10 4:48 Stephen Rothwell
2012-02-10 5:30 ` Greg KH
2012-02-14 21:31 ` Ramirez Luna, Omar
2012-02-14 22:37 ` Greg KH
2012-02-14 23:33 ` Ramirez Luna, Omar
2012-02-14 23:42 ` Greg KH
2012-02-10 19:01 ` Greg KH
2012-02-10 4:47 Stephen Rothwell
2012-02-10 5:30 ` Greg KH
2011-11-28 4:18 Stephen Rothwell
2011-11-28 5:13 ` Greg KH
2011-09-20 6:46 Stephen Rothwell
2011-09-20 12:53 ` Greg KH
2011-05-13 4:08 Stephen Rothwell
2011-05-13 23:12 ` Greg KH
2011-04-28 2:59 Stephen Rothwell
2011-04-28 3:06 ` Greg KH
2011-04-08 6:02 Stephen Rothwell
2011-04-08 6:00 Stephen Rothwell
2011-04-08 5:57 Stephen Rothwell
2011-04-08 5:54 Stephen Rothwell
2011-04-08 5:51 Stephen Rothwell
2011-04-08 5:47 Stephen Rothwell
2011-04-08 20:55 ` Greg KH
2011-04-13 19:18 ` Greg KH
2009-12-09 5:34 Stephen Rothwell
2009-12-09 20:30 ` Greg KH
2009-12-09 23:08 ` Stephen Rothwell
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=20200720073719.GA458916@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=Jonathan.Cameron@huawei$(echo .)com \
--cc=alexandru.ardelean@analog$(echo .)com \
--cc=dinghao.liu@zju$(echo .)edu.cn \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox