linux-next: duplicate patch in the gpio-brgl tree
Hi all,
The following commit is also in the mfd tree as A different commit (but the same patch):
4a7b0850fc7a ("dt-bindings: cros-ec: Add properties for GPIO controller")
This is commit
7b79740d42e7 ("dt-bindings: mfd: cros-ec: Add properties for GPIO controller")
in the mfd tree.
Signature · 2 lines
Cheers, Stephen Rothwell
Quoted 10 lines · Stephen Rothwell
Hi all,
The following commit is also in the mfd tree as A different commit (but the same patch):
4a7b0850fc7a("dt-bindings: cros-ec: Add properties for GPIO controller")This is commit
Quoted 7 lines
7b79740d42e7("dt-bindings: mfd: cros-ec: Add properties for GPIO controller")in the mfd tree.
--
Cheers,
Stephen Rothwell
Hi Stephen, Lee!
I picked it up because I was already queuing the patch adding the GPIO driver. Unless there are conflicts with the MFD branch (doesn't seem like it?), I think it should go through the GPIO branch together with the driver.
Bart
Quoted 19 lines · Bartosz Golaszewski
Quoted 10 lines · Stephen Rothwell
Hi all,
The following commit is also in the mfd tree as A different commit (but the same patch):
4a7b0850fc7a("dt-bindings: cros-ec: Add properties for GPIO controller")This is commit
Quoted 7 lines
7b79740d42e7("dt-bindings: mfd: cros-ec: Add properties for GPIO controller")in the mfd tree.
--
Cheers,
Stephen Rothwell
Quoted 6 lines
Hi Stephen, Lee!
I picked it up because I was already queuing the patch adding the GPIO driver. Unless there are conflicts with the MFD branch (doesn't seem like it?), I think it should go through the GPIO branch together with the driver.
This is the first I've heard of it. There was no reply from you, even after I specifically asked you for an explanation.
There is no convincing reason for this to follow the C change. It's more important to avoid Linus from facing merge-conflicts during the merge-window. Please remove the patch from your tree.
Signature · 1 line
Lee Jones [李琼斯]
Quoted 24 lines · Lee Jones
Quoted 21 lines · Bartosz Golaszewski
Quoted 10 lines · Stephen Rothwell
Hi all,
The following commit is also in the mfd tree as A different commit (but the same patch):
4a7b0850fc7a("dt-bindings: cros-ec: Add properties for GPIO controller")This is commit
Quoted 7 lines
7b79740d42e7("dt-bindings: mfd: cros-ec: Add properties for GPIO controller")in the mfd tree.
--
Cheers,
Stephen RothwellHi Stephen, Lee!
Quoted 8 lines
Quoted 4 lines
I picked it up because I was already queuing the patch adding the GPIO driver. Unless there are conflicts with the MFD branch (doesn't seem like it?), I think it should go through the GPIO branch together with the driver.
This is the first I've heard of it. There was no reply from you, even after I specifically asked you for an explanation.
Huh, I now see your email in lore[1] but I don't have it in my inbox, not even in spam. I would have answered otherwise.
Quoted 4 lines
There is no convincing reason for this to follow the C change. It's more important to avoid Linus from facing merge-conflicts during the merge-window. Please remove the patch from your tree.
This is why I'm asking if this caused a conflict. Whatever, I'll drop it alright.
Bartosz
Quoted 2 lines
--
Lee Jones [李琼斯]
Quoted 37 lines · Bartosz Golaszewski
Quoted 24 lines · Lee Jones
Quoted 21 lines · Bartosz Golaszewski
Quoted 10 lines · Stephen Rothwell
Hi all,
The following commit is also in the mfd tree as A different commit (but the same patch):
4a7b0850fc7a("dt-bindings: cros-ec: Add properties for GPIO controller")This is commit
Quoted 7 lines
7b79740d42e7("dt-bindings: mfd: cros-ec: Add properties for GPIO controller")in the mfd tree.
--
Cheers,
Stephen RothwellHi Stephen, Lee!
Quoted 8 lines
Quoted 4 lines
I picked it up because I was already queuing the patch adding the GPIO driver. Unless there are conflicts with the MFD branch (doesn't seem like it?), I think it should go through the GPIO branch together with the driver.
This is the first I've heard of it. There was no reply from you, even after I specifically asked you for an explanation.
Huh, I now see your email in lore[1] but I don't have it in my inbox, not even in spam. I would have answered otherwise.
Quoted 7 lines
Quoted 4 lines
There is no convincing reason for this to follow the C change. It's more important to avoid Linus from facing merge-conflicts during the merge-window. Please remove the patch from your tree.
This is why I'm asking if this caused a conflict. Whatever, I'll drop it alright.
Maybe there aren't any conflicts yet, but we are still early in the cycle and prevention is better than cure. Thanks for dropping it.
Signature · 1 line
Lee Jones [李琼斯]