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=-5.8 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,URIBL_BLOCKED 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 57229C432BE for ; Sat, 28 Aug 2021 09:51:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E10A608FB for ; Sat, 28 Aug 2021 09:51:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233818AbhH1Jwo (ORCPT ); Sat, 28 Aug 2021 05:52:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233748AbhH1Jwc (ORCPT ); Sat, 28 Aug 2021 05:52:32 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6983C061756 for ; Sat, 28 Aug 2021 02:51:41 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id m26so7974199pff.3 for ; Sat, 28 Aug 2021 02:51:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:user-agent:in-reply-to:references :message-id:mime-version:content-transfer-encoding; bh=5LWjEJp7/vS3ArwbdFhnzFhxW1R+PX4BBA5dsIBBrU0=; b=TK4XyIxsfgng6T8+ES0iGLiNteEUHmNy6IlHfeWtS6Bwy8f2+B4T5+1/jG0IQTU968 KuN9W5oeS33dgHuEhmnfsYYy5E9jYNmqNRzRgY3dCBh0+bIgiWkC+t/Mjk4dqi8zVdtM Tz9xdr0RO60cXD2rQuduE2aOEmHYSmTKkA/s6mUcjA7Ioxyl6mc1yhYzN8hnd6ZU7kpf kVUcMkM6Zdpkgwci4rtQTlTPldkTJRT/ycPW32ptxnqxaKCzg+d3yqRf9JKhmgVWfio7 m+yVTHKhQ1F8uxacIT6cPd9goW6fmMQtD2XW2OXKebnTkLLoe43zVqRaGV7ZLg4ol3xb rfBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:user-agent:in-reply-to :references:message-id:mime-version:content-transfer-encoding; bh=5LWjEJp7/vS3ArwbdFhnzFhxW1R+PX4BBA5dsIBBrU0=; b=L0xEJSLiP/dx/KmKt0YyIcRNlwpgQWIZelxw+p7sQNbqOln1XO5u1gUaqycWUXOooH UFVYRrPPateROtCsAERvqaowD/D9i2WWB+DbTf4NeamqV/JKRLDpV0gylWVlsSfxAKL5 x34hYkPIb9g6yJp5MJE31vgUj1ruU7BKlalaJylkGsabsV8nnM2iFzkoKsnpS3JSFVTF NTltoVTY9AN86Z3CwaDoB498dynrDHysD7ugD0hbHdLVziB+cAs8PtMgmqbqQJwXf1gR AYnOXj0tBrVQSSXZsZ2JrAFkzvnYiBRBlO20llbmgtAJKbMkOh0TyPtnhgoeUHwXTeO/ QHuw== X-Gm-Message-State: AOAM530MI1Pp/dxHrZU2/86YUQkiSQ9Ip/8uluFidyZ43K5pEQE1Pgua I/8U4KxRRgw9zMig/zkmUz+z X-Google-Smtp-Source: ABdhPJyPFp5JdvUCFQV/mxF6licR7NpKPwvfvB9buJ7zzUDNABwRaHKTUmQcqiuTBC8UomVIyr8NXA== X-Received: by 2002:a63:ee03:: with SMTP id e3mr11765869pgi.386.1630144301165; Sat, 28 Aug 2021 02:51:41 -0700 (PDT) Received: from ?IPv6:::1? ([2409:4072:6e0c:3a4a:44e3:35e5:d295:5b8a]) by smtp.gmail.com with ESMTPSA id u12sm9679804pgi.21.2021.08.28.02.51.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Aug 2021 02:51:40 -0700 (PDT) Date: Sat, 28 Aug 2021 15:21:34 +0530 From: Manivannan Sadhasivam To: Kalle Valo , Greg KH CC: Stephen Rothwell , Arnd Bergmann , Jakub Kicinski , Linux Kernel Mailing List , Linux Next Mailing List , Loic Poulain Subject: Re: linux-next: manual merge of the char-misc tree with Linus' tree User-Agent: K-9 Mail for Android In-Reply-To: <877dg658rk.fsf@codeaurora.org> References: <20210827164904.6b1d1f0e@canb.auug.org.au> <20210827175852.GB15018@thinkpad> <877dg658rk.fsf@codeaurora.org> Message-ID: <1B4CED49-0223-41C6-A0CF-92F1C9C86EF1@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Kalle,=20 On 28 August 2021 12:57:27 PM IST, Kalle Valo wro= te: >Greg KH writes: > >> On Fri, Aug 27, 2021 at 11:28:52PM +0530, Manivannan Sadhasivam wrote: >>> Hi Greg, >>>=20 >>> On Fri, Aug 27, 2021 at 03:12:02PM +0200, Greg KH wrote: >>> > On Fri, Aug 27, 2021 at 04:49:04PM +1000, Stephen Rothwell wrote: >>> > > Hi all, >>> > >=20 >>> > > Today's linux-next merge of the char-misc tree got conflicts in: >>> > >=20 >>> > > drivers/bus/mhi/core/main=2Ec >>> > > net/qrtr/mhi=2Ec >>> > >=20 >>> > > between commit: >>> > >=20 >>> > > 9ebc2758d0bb ("Revert "net: really fix the build=2E=2E=2E"") >>> > >=20 >>> > > from the origin tree and commit: >>> > >=20 >>> > > 0092a1e3f763 ("bus: mhi: Add inbound buffers allocation flag") >>> > >=20 >>> > > from the char-misc tree=2E >>> > >=20 >>> > > I fixed it up (the commit in Linus' tree is basically a revert of = the >>> > > char-misc tree, so I effectively reverted the latter) and can carr= y the >>> > > fix as necessary=2E This is now fixed as far as linux-next is conc= erned, >>> > > but any non trivial conflicts should be mentioned to your upstream >>> > > maintainer when your tree is submitted for merging=2E You may als= o want >>> > > to consider cooperating with the maintainer of the conflicting tre= e to >>> > > minimise any particularly complex conflicts=2E >>> >=20 >>> > Hm, what should I do in my tree here? >>> >=20 >>> > Kalle, what commit should I make in the char-misc tree now to handle >>> > this issue, and make the merge with Linus's tree "simple"? Or any o= ther >>> > ideas? >>> >=20 >>>=20 >>> For making the merge simpler, I'd suggest we revert below commit in ch= ar-misc: >>>=20 >>> 0092a1e3f763 ("bus: mhi: Add inbound buffers allocation flag") >> >> Reverting that works for me, I've done that in my tree and that allows >> it to be merged cleanly with Linus's tree=2E > >Unfortunately this now breaks the build in char-misc-next (commit >0dc3ad3f859d): > You need to revert ce78ffa3ef16 and that's already done in net-next=2E So = once current net-next and char-misc-next reaches linus tree everything shou= ld be fine=2E=20 I forgot to mention that the testing should be done with both char-misc-ne= xt and net-next or in linux-next=2E=20 Is it mandatory to make it work with char-misc alone? In usual case I know= it is mandatory but I thought with current situation it should be fine=2E= =20 Thanks,=20 Mani >net/qrtr/mhi=2Ec: In function 'qcom_mhi_qrtr_probe': >net/qrtr/mhi=2Ec:105:48: error: 'MHI_CH_INBOUND_ALLOC_BUFS' undeclared (f= irst use in this function) > 105 | rc =3D mhi_prepare_for_transfer(mhi_dev, MHI_CH_INBOUND_A= LLOC_BUFS); > | ^~~~~~~~~~~~~~~~~~= ~~~~~~~ >net/qrtr/mhi=2Ec:105:48: note: each undeclared identifier is reported onl= y once for each function it appears in >net/qrtr/mhi=2Ec:105:14: error: too many arguments to function 'mhi_prepa= re_for_transfer' > 105 | rc =3D mhi_prepare_for_transfer(mhi_dev, MHI_CH_INBOUND_A= LLOC_BUFS); > | ^~~~~~~~~~~~~~~~~~~~~~~~ >In file included from net/qrtr/mhi=2Ec:6: >=2E/include/linux/mhi=2Eh:725:5: note: declared here > 725 | int mhi_prepare_for_transfer(struct mhi_device *mhi_dev); > | ^~~~~~~~~~~~~~~~~~~~~~~~ > >To see this error make sure CONFIG_QRTR and CONFIG_QRTR_MHI are enabled= =2E > --=20 Sent from my Android device with K-9 Mail=2E Please excuse my brevity=2E