From: Greg KH <gregkh@linuxfoundation.org>
To: Manivannan Sadhasivam <mani@kernel.org>
Cc: mhi@lists.linux.dev
Subject: Re: [GIT PULL] MHI changes for v6.20
Date: Tue, 20 Jan 2026 16:41:43 +0100 [thread overview]
Message-ID: <2026012022-lion-muck-c337@gregkh> (raw)
In-Reply-To: <5u37cbaldizhvdgnjq2opjvvrfkmehuvwh3ktgjqbmymqur6gz@ddnzo2sruqa4>
On Tue, Jan 20, 2026 at 02:48:34PM +0530, Manivannan Sadhasivam wrote:
> The following changes since commit 8f0b4cce4481fb22653697cced8d0d04027cb1e8:
>
> Linux 6.19-rc1 (2025-12-14 16:05:07 +1200)
>
> are available in the Git repository at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git tags/mhi-for-v6.20
>
> for you to fetch changes up to 91a0b0dce350766675961892ba4431363c4e29f7:
>
> bus: mhi: ep: Use bus callbacks for .probe() and .remove() (2025-12-31 16:27:13 +0530)
>
> There is a minor conflict between mhi and ath trees in
> drivers/net/wireless/ath/ath12k/mhi.c file:
>
> between commits:
>
> 7f54938fc525 ("wifi: ath12k: Move Wi-Fi 7 MHI configuration to dedicated file")
> a72027045263 ("wifi: ath12k: Modularize driver into common and Wi-Fi 7 specific components")
> bce3b73d1ca7 ("wifi: ath12k: Rename ath12k_* symbols to ath12k_wifi7_* for clarity")
>
> from the ath tree and commit:
>
> 51731792a25c ("net: qrtr: Drop the MHI auto_queue feature for IPCR DL channels")
>
> from the mhi tree.
>
> I've pushed the resolution here for reference:
> https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git/commit/?h=mhi-ath-resolution&id=a1cf17be3ba3718f1a8c70e614f4c0ee026a90fd
>
> Please let Linus know about this conflict incase the ath tree gets merged first.
> I believe ath maintainer will let the netdev maintainers know about this
> conflict for the case of mhi getting merged first.
I'll try to remember, that's many weeks in the future :)
Now pulled and pushed out, thanks.
greg k-h
prev parent reply other threads:[~2026-01-20 15:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-20 9:18 [GIT PULL] MHI changes for v6.20 Manivannan Sadhasivam
2026-01-20 15:41 ` Greg KH [this message]
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=2026012022-lion-muck-c337@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=mani@kernel.org \
--cc=mhi@lists.linux.dev \
/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