Re: [RESEND] Conflict between char-misc and netdev

On Thu, 12 Aug 2021 19:02:15 +0530 Manivannan Sadhasivam wrote:

Due to the below commit in netdev there is a conflict between char-misc
and netdev trees:

5c2c85315948 ("bus: mhi: pci-generic: configurable network interface MRU")

Jakub, I noticed that you fixed the conflict locally in netdev:

d2e11fd2b7fc ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net")

But the commit touches the MHI bus and it should've been merged into mhi
tree then it goes via char-misc. It was unfortunate that neither
linux-arm-msm nor me were CCed to the patch :/

Could you please revert the commit?

Apologies for missing the lacking CC list, the extra resolution work,
etc. etc. Let me try to sharpen the "were maintainers CCed" check in
patchwork to make this less likely in the future.

About the situation at hand - is the commit buggy? Or is there work
that's pending in char-misc that's going to conflict in a major way? 
Any chance you could just merge the same patch into mhi and git will 
do its magic?