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=-4.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 8E23CC433DF for ; Mon, 20 Jul 2020 05:25:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 48CBE20672 for ; Mon, 20 Jul 2020 05:25:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="ZE2Vn/zh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726109AbgGTFZ2 (ORCPT ); Mon, 20 Jul 2020 01:25:28 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:45383 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726015AbgGTFZ2 (ORCPT ); Mon, 20 Jul 2020 01:25:28 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4B99D43w2Pz9sR4; Mon, 20 Jul 2020 15:25:24 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1595222726; bh=+K7VCuGYsRZWKSbD8PshgftKU99x59RdfMOzQ/NIJes=; h=Date:From:To:Cc:Subject:From; b=ZE2Vn/zhmdI9E/nlZvj9KxSK4Jpm57FfjseaN/gVpR6b3sjtN9wr9wqjoZiiI086a Y33192xAMZOYFE2blf1U3xI7nQ30QE3q6RLbgdwNsYh2zTnnyuPIZPCvm0iQaiOvJG 8xKwzGCNR5jkb6Dd3erS4enOPgMfckKu5MYCestvUTZPGJPgpJfMk4keSviYC8E11n K0NiIW09YAnBLt+fJOZjd7rFEJB5MRuDg19GqsP+ExMUT0slLXA28QcCky6Jc+b+qv dG7Pe+CQvWUQArZvpw4s+bYFbW/OhEUWKk5NJmkf2PLA2AKppWXkJqpC47zo1IVsrn hGYUoZXYaeU2A== Date: Mon, 20 Jul 2020 15:25:22 +1000 From: Stephen Rothwell To: Greg KH Cc: Linux Next Mailing List , Linux Kernel Mailing List , Dinghao Liu , Jonathan Cameron , Alexandru Ardelean Subject: linux-next: manual merge of the staging tree with Linus' tree Message-ID: <20200720152522.5ccfc3ef@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/6WyNTDJWviTFSsq=09.p2Be"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/6WyNTDJWviTFSsq=09.p2Be Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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 err= or") 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. --=20 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 =3D ak8974_reset(ak8974); if (ret) { dev_err(&i2c->dev, "AK8974 reset failed\n"); - goto power_off; + goto disable_pm; } =20 - indio_dev->dev.parent =3D &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: --Sig_/6WyNTDJWviTFSsq=09.p2Be Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8VKsIACgkQAVBC80lX 0Gzn8Af9GyxpXJL/77yy4KsWLOb+eGixmOfiq8cRCmx7oh+aB8+QcXyRE8D4AF1r mBFE7RM6TOSSA3409k1jheSRkqJOhWuDY8IwD3p4wz+BdRT54GH3vRUCzsRKwrs+ IVDtr3vukxLGnRSF2YPhLoJaUY+MoNl8zX/5lJgXx2et4I8l69AL5AYUJ9tzt05C Rp9WDfJ8t2/DJAFbxxK0+MD41UIRjseZH0V5CwVF5gTAjPaEWrT55u/QdbFjpJaG FihhF1oW/wBlgqn070xrCRb72czGsDGmFKLRdLWZd5MiJQg7voP3xBVcbdCmcL2u VWhW0jXCgdcd8F+GuPDSQJNDUa0zPg== =oyJI -----END PGP SIGNATURE----- --Sig_/6WyNTDJWviTFSsq=09.p2Be--