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 817D7C433DF for ; Mon, 20 Jul 2020 07:37:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B99920773 for ; Mon, 20 Jul 2020 07:37:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="Ox4wlVml"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="c9+b5BrW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726521AbgGTHhK (ORCPT ); Mon, 20 Jul 2020 03:37:10 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:60071 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725845AbgGTHhK (ORCPT ); Mon, 20 Jul 2020 03:37:10 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 405805C0183; Mon, 20 Jul 2020 03:37:09 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 20 Jul 2020 03:37:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm1; bh=MKLvLDGLNUpV5OtsE1mVDonVjan muQAZ3rrXEtGWN0w=; b=Ox4wlVmlsodmv0Fy2PnA7a1mv8AxSC6j0JE8RlGphc6 gfjwM2b0ZXU1nsh4kfT6mwd+deO/es+GpIdDJAUQBkjPth8TfbYzmaba0lquNtIV diQJXBbEoZstJs7yNmJ4Xd88yeK6iwl26wB5x6pNDLjUkEGpM01tUCmmCEr7bMBY 2msvd0BKm3gAFDCTxktNF3kGkVBwYYwm8m+NcMWT2iEUh1BAw7BxFnc4DJa3kWrA m9OcKwiWCf/hlPP+3dqJEhxrLLffEKk1im1t1HliKhi2XPp4ulnX/fSp29lx8cDl frUFM0EgDJcp28gIQ5zKTh7lJMctuolh1ARvXk0s57w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=MKLvLD GLNUpV5OtsE1mVDonVjanmuQAZ3rrXEtGWN0w=; b=c9+b5BrW15xLc83Yrd/9N9 JVm+N0X6CbglpFtZ/hFFu3gvqsERe2ml9xKXqFTytFhxGEhn4ffH85r+lCkL/R8a 547NeDLhgG1c90mntyYpcYXtsmTDvTxLSUeCjewRbaBlq0Qmf/Lr6ydu2z3f3Nq/ X8mNHnd6NCr7i81AIQvq3IQloCZIcq8LnfVNTfxhYpcqtQevvraTq81DjRnrJLGS LrruyiKWf7LHG1YdsShAFltWqDMzCIcSMd/T+AcmvhpIsjt7I1lU3UyPnUQE20Gi pDvh6qo2lHIW4IC+YW0Yhd5lKVKiEmh6liGLUJQJuxnsyQcKPDqU8J4pC1569quQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrgedvgdduudefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgvghcu mffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeevueehje fgfffgiedvudekvdektdelleelgefhleejieeugeegveeuuddukedvteenucfkphepkeef rdekiedrkeelrddutdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepghhrvghgsehkrhhorghhrdgtohhm X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 972DD328005D; Mon, 20 Jul 2020 03:37:07 -0400 (EDT) Date: Mon, 20 Jul 2020 09:37:19 +0200 From: Greg KH To: Stephen Rothwell Cc: Linux Next Mailing List , Linux Kernel Mailing List , Dinghao Liu , Jonathan Cameron , Alexandru Ardelean Subject: Re: linux-next: manual merge of the staging tree with Linus' tree Message-ID: <20200720073719.GA458916@kroah.com> References: <20200720152522.5ccfc3ef@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200720152522.5ccfc3ef@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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