Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
* Conflict between char-misc and netdev
@ 2021-08-12 13:30 Manivannan Sadhasivam
  0 siblings, 0 replies; only message in thread
From: Manivannan Sadhasivam @ 2021-08-12 13:30 UTC (permalink / raw)
  Cc: netdev, richard.laing, linux-arm-msm

Hi Jakub, Dave,

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?

Thanks,
Mani

^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2021-08-12 13:30 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-12 13:30 Conflict between char-misc and netdev Manivannan Sadhasivam

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).