Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751615AbcLELqz (ORCPT ); Mon, 5 Dec 2016 06:46:55 -0500 Received: from wolverine02.qualcomm.com ([199.106.114.251]:56137 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750855AbcLELpy (ORCPT ); Mon, 5 Dec 2016 06:45:54 -0500 X-IronPort-AV: E=Sophos;i="5.33,747,1477983600"; d="scan'208";a="340797106" X-IronPort-AV: E=McAfee;i="5700,7163,8369"; a="1322673109" X-Amp-Result: CLEAN From: "Valo, Kalle" To: David Miller CC: Bjorn Andersson , "k.eugene.e@gmail.com" , "wcn36xx@lists.infradead.org" , "linux-wireless@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-arm-msm@vger.kernel.org" , Andy Gross Subject: Re: [v5,1/5] soc: qcom: smem_state: Fix include for ERR_PTR() Thread-Topic: [v5,1/5] soc: qcom: smem_state: Fix include for ERR_PTR() Thread-Index: AQHSTu0d2iziUl0Wck6xPPPQ8AGrwg== Date: Mon, 5 Dec 2016 11:45:45 +0000 Message-ID: <877f7eoazc.fsf@kamboji.qca.qualcomm.com> References: <1479190014-11297-1-git-send-email-bjorn.andersson@linaro.org> <20161118183541.GI28340@tuxbot> <877f7vimyg.fsf@kamboji.qca.qualcomm.com> <878ts0u7z3.fsf@kamboji.qca.qualcomm.com> <874m2otenv.fsf@kamboji.qca.qualcomm.com> <87r35srm0c.fsf@kamboji.qca.qualcomm.com> In-Reply-To: (Andy Gross's message of "Thu, 1 Dec 2016 08:21:51 -0600") Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.251.52.12] Content-Type: text/plain; charset="us-ascii" Content-ID: MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id uB5BmZO3010738 Content-Length: 3724 Lines: 83 Hi Dave, Andy Gross writes: > On 1 December 2016 at 04:17, Valo, Kalle wrote: >> Kalle Valo writes: >> >>> It found the same problem. Interestingly I'm also building x86 with 32 >>> bit, maybe it's related? >>> >>> tree: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git pending >>> head: 1ea16a1c457939b4564643f7637d5cc639a8d3b7 >>> commit: 5eb09c672b01460804fd49b1c9cc7d1072a102f0 [96/99] wcn36xx: Transition driver to SMD client >>> config: i386-allmodconfig (attached as .config) >>> compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 >>> reproduce: >>> git checkout 5eb09c672b01460804fd49b1c9cc7d1072a102f0 >>> # save the attached .config to linux build tree >>> make ARCH=i386 >>> >>> All errors (new ones prefixed by >>): >>> >>>>> ERROR: "qcom_wcnss_open_channel" [drivers/net/wireless/ath/wcn36xx/wcn36xx.ko] undefined! >> >> Bjorn mentioned me on IRC that this is because of a missing commit in my >> tree: >> >> daa6e41ce2b5 soc: qcom: wcnss_ctrl: Stub wcnss_ctrl API >> >> When I pull the tag below (which contains the above commit) wcn36xx >> builds fine for me: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git tags/qcom-drivers-for-4.10 >> >> Andy, is it ok if I pull your tag also to my ath.git tree to solve the >> wcn36xx build problem? My trees go to Linus via net-next and I don't >> know when exactly Dave would send a pull request to Linus, before or >> after the arm trees, but as the tag seems to contain only few patches I >> hope it doesn't matter. > > The qcom-drivers-for-4.10 tag was already merged into arm-soc. But > having you pull it as well won't cause issues so long as you are using > the tag (which you are). I don't see any issues with this approach. Andy, thanks for the confirmation. Dave, how do you suggest to handle depency issues like this? I have pending important wcn36xx patches (converting the driver to use the recently introduced proper SMD subsystem) which have a build dependency on a commit which is in Andy's tag qcom-drivers-for-4.10. The commit in question is currently in arm-soc tree going to 4.10, but not in your net-next tree. I assume Linus will pull that during the next merge window. What I'm planning to do is to pull tag qcom-drivers-for-4.10 to my tree and then send the patches to you. This will mean that from my pull request you would get four new qcom-drivers commits which are not in your tree, yet. Or do you prefer that I wait the qcom-drivers commits trickle down from Linux until I send you wcn36xx patches? Or something else? $ git pull git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git tags/qcom-drivers-for-4.10 >From git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux * tag qcom-drivers-for-4.10 -> FETCH_HEAD Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 1 + drivers/firmware/qcom_scm.c | 4 +++- include/dt-bindings/pinctrl/qcom,pmic-gpio.h | 4 ++++ include/dt-bindings/pinctrl/qcom,pmic-mpp.h | 6 ++++++ include/linux/soc/qcom/wcnss_ctrl.h | 13 +++++++++++++ 5 files changed, 27 insertions(+), 1 deletion(-) $ git log --oneline ORIG_HEAD.. 6d0491261ecc Merge tag 'qcom-drivers-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into test bd4760ca0315 firmware: qcom: scm: Use devm_reset_controller_register() 4fb1a4207804 MAINTAINERS: add drivers/pinctrl/qcom to ARM/QUALCOMM SUPPORT 636959fc1232 pinctrl: pm8994: add pad voltage regulator defines daa6e41ce2b5 soc: qcom: wcnss_ctrl: Stub wcnss_ctrl API $ -- Kalle Valo