From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Govind Singh <govinds@codeaurora.org>,
Loic Poulain <loic.poulain@linaro.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
ath11k@lists.infradead.org
Subject: Re: linux-next: build failure after merge of the mhi tree
Date: Mon, 28 Sep 2020 15:17:04 +0530 [thread overview]
Message-ID: <20200928094704.GB11515@linux> (raw)
In-Reply-To: <87eemmfdn3.fsf@codeaurora.org>
On Mon, Sep 28, 2020 at 12:34:40PM +0300, Kalle Valo wrote:
> Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> writes:
>
> > On Mon, Sep 28, 2020 at 06:42:30PM +1000, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> After merging the mhi tree, today's linux-next build (x86_64 allmodconfig)
> >> failed like this:
> >>
> >> drivers/net/wireless/ath/ath11k/mhi.c:27:4: error: 'struct
> >> mhi_channel_config' has no member named 'auto_start'
> >> 27 | .auto_start = false,
> >> | ^~~~~~~~~~
> >> drivers/net/wireless/ath/ath11k/mhi.c:42:4: error: 'struct
> >> mhi_channel_config' has no member named 'auto_start'
> >> 42 | .auto_start = false,
> >> | ^~~~~~~~~~
> >> drivers/net/wireless/ath/ath11k/mhi.c:57:4: error: 'struct
> >> mhi_channel_config' has no member named 'auto_start'
> >> 57 | .auto_start = true,
> >> | ^~~~~~~~~~
> >> drivers/net/wireless/ath/ath11k/mhi.c:72:4: error: 'struct
> >> mhi_channel_config' has no member named 'auto_start'
> >> 72 | .auto_start = true,
> >> | ^~~~~~~~~~
> >>
> >> Caused by commit
> >>
> >> ed39d7816885 ("bus: mhi: Remove auto-start option")
> >>
> >> interacting with commit
> >>
> >> 1399fb87ea3e ("ath11k: register MHI controller device for QCA6390")
> >>
> >> from the net-next tree.
> >>
> >> I applied the following merge fix patch, but maybe more is required.
> >> Even if so, this could be fixed now in the net-next tree.
> >>
> >> From: Stephen Rothwell <sfr@canb.auug.org.au>
> >> Date: Mon, 28 Sep 2020 18:39:41 +1000
> >> Subject: [PATCH] fix up for "ath11k: register MHI controller device for QCA6390"
> >>
> >> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >
> > Sorry, I forgot to submit a patch against net-next for fixing this while merging
> > the MHI change.
>
> Try to notify the ath11k list (CCed) whenever changing MHI API so that
> we (ath11k folks) can be prepared for any major changes.
>
Okay sure, will do!
> > But your change looks good and I can just modify the subject/description and
> > resubmit. Or if Dave prefers to fix the original commit itself in net-next,
> > I'm fine!
>
> Actually I prefer to apply the fix to my ath.git tree, less conflicts
> that way (I have still quite a lot of ath11k patches pending for -next).
> I'll then send a pull request to Dave end of this week.
>
> So please submit the patch like a normal ath11k patch documented here:
>
Okay.
Thanks,
Mani
> https://wireless.wiki.kernel.org/en/users/drivers/ath11k/submittingpatches
>
> --
> https://patchwork.kernel.org/project/linux-wireless/list/
>
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2020-09-28 9:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 8:42 linux-next: build failure after merge of the mhi tree Stephen Rothwell
2020-09-28 9:10 ` Manivannan Sadhasivam
2020-09-28 9:28 ` Stephen Rothwell
2020-09-28 9:34 ` Kalle Valo
2020-09-28 9:47 ` Manivannan Sadhasivam [this message]
2020-09-28 16:45 ` Kalle Valo
2020-09-28 17:04 ` Manivannan Sadhasivam
2020-09-29 6:18 ` Kalle Valo
2020-09-29 15:35 ` Manivannan Sadhasivam
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=20200928094704.GB11515@linux \
--to=manivannan.sadhasivam@linaro.org \
--cc=ath11k@lists.infradead.org \
--cc=davem@davemloft.net \
--cc=govinds@codeaurora.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=loic.poulain@linaro.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).