Conflict between char-misc and netdev
Subsystems (3)
PATCH RESEND 1/1 Conflict between char-misc and netdev
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
Jakub Kicinski
maintainerQuoted 7 lines · 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:
Quoted 7 lines
d2e11fd2b7fc("Mergegit://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?
Quoted 14 lines · Jakub Kicinski
Quoted 13 lines · 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("Mergegit://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 :/
Quoted 6 lines
Quoted 1 line
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.
No worries. I know how loaded the netdev list is :)
Quoted 4 lines
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?
I'm not happy with the MHI change and I do have a comment about the variable "mru_default". So it'd be good if we revert the commit entirely!
Also I do have few more patches coming for the same driver touched by 5c2c85315948.
Thanks,
Mani
Jakub Kicinski
maintainerQuoted 8 lines · On Thu, 12 Aug 2021 19:35:18 +0530 Manivannan Sadhasivam wrote:
Quoted 4 lines
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?
I'm not happy with the MHI change and I do have a comment about the variable "
mru_default". So it'd be good if we revert the commit entirely!
Would you mind rendering that comment you're referring to as a commit message and sending a fix-up or a revert patch against net-next? I wouldn't be able to do it justice.
Quoted 3 lines · Jakub Kicinski
Would you mind rendering that comment you're referring to as a commit message and sending a fix-up or a revert patch against net-next? I wouldn't be able to do it justice.
I would also be interested in the comment.
I would be happy if the patch is reverted from net-next, I have been looking at a more flexible alternative allowing the size to be specified per channel rather than as a global value.