| Message ID | 20250425-fix-nexus-4-v3-1-da4e39e86d41@oss.qualcomm.com |
|---|---|
| State | New |
| Headers | show |
| Series | ARM: qcom: fix APQ8064 schema warnings | expand |
On Fri, Apr 25, 2025 at 08:47:01PM GMT, Dmitry Baryshkov wrote: > For some reason Lee has mis-squashed two commits, picking up one chunk > from the first patch and one chunk from the second one. Rather than > trying to fix it, revert commit 2c8de7df7418 ("dt-bindings: mfd: syscon: > Add qcom,apq8064-mmss-sfpb"). I don't understand: that commit looks like direct, proper result for https://lore.kernel.org/all/20250318-fix-nexus-4-v2-5-bcedd1406790@oss.qualcomm.com/ so where is squashing two commits? The diff markers have offset by few lines, but it's still just few lines and they do not matter - there is no diff/patch mismatch from that point of view. Best regards, Krzysztof
On 28/04/2025 09:07, Krzysztof Kozlowski wrote: > On Fri, Apr 25, 2025 at 08:47:01PM GMT, Dmitry Baryshkov wrote: >> For some reason Lee has mis-squashed two commits, picking up one chunk >> from the first patch and one chunk from the second one. Rather than >> trying to fix it, revert commit 2c8de7df7418 ("dt-bindings: mfd: syscon: >> Add qcom,apq8064-mmss-sfpb"). > > I don't understand: that commit looks like direct, proper result for > https://lore.kernel.org/all/20250318-fix-nexus-4-v2-5-bcedd1406790@oss.qualcomm.com/ > so where is squashing two commits? The diff markers have offset by few > lines, but it's still just few lines and they do not matter - there is > no diff/patch mismatch from that point of view. Ah, difference in compatibles. I see the error. Anyway, I don't think revert is correct. Just add missing compatibles. Best regards, Krzysztof
On Mon, 28 Apr 2025 at 10:09, Krzysztof Kozlowski <krzk@kernel.org> wrote: > > On 28/04/2025 09:07, Krzysztof Kozlowski wrote: > > On Fri, Apr 25, 2025 at 08:47:01PM GMT, Dmitry Baryshkov wrote: > >> For some reason Lee has mis-squashed two commits, picking up one chunk > >> from the first patch and one chunk from the second one. Rather than > >> trying to fix it, revert commit 2c8de7df7418 ("dt-bindings: mfd: syscon: > >> Add qcom,apq8064-mmss-sfpb"). > > > > I don't understand: that commit looks like direct, proper result for > > https://lore.kernel.org/all/20250318-fix-nexus-4-v2-5-bcedd1406790@oss.qualcomm.com/ > > so where is squashing two commits? The diff markers have offset by few > > lines, but it's still just few lines and they do not matter - there is > > no diff/patch mismatch from that point of view. > > Ah, difference in compatibles. I see the error. Anyway, I don't think > revert is correct. Just add missing compatibles. Why? The commit that went in is invalid, didn't come from my patches and was produced in some weird way.
On 28/04/2025 12:49, Dmitry Baryshkov wrote: > On Mon, 28 Apr 2025 at 10:09, Krzysztof Kozlowski <krzk@kernel.org> wrote: >> >> On 28/04/2025 09:07, Krzysztof Kozlowski wrote: >>> On Fri, Apr 25, 2025 at 08:47:01PM GMT, Dmitry Baryshkov wrote: >>>> For some reason Lee has mis-squashed two commits, picking up one chunk >>>> from the first patch and one chunk from the second one. Rather than >>>> trying to fix it, revert commit 2c8de7df7418 ("dt-bindings: mfd: syscon: >>>> Add qcom,apq8064-mmss-sfpb"). >>> >>> I don't understand: that commit looks like direct, proper result for >>> https://lore.kernel.org/all/20250318-fix-nexus-4-v2-5-bcedd1406790@oss.qualcomm.com/ >>> so where is squashing two commits? The diff markers have offset by few >>> lines, but it's still just few lines and they do not matter - there is >>> no diff/patch mismatch from that point of view. >> >> Ah, difference in compatibles. I see the error. Anyway, I don't think >> revert is correct. Just add missing compatibles. > > Why? The commit that went in is invalid, didn't come from my patches > and was produced in some weird way. And revert is pointless if you immediately add the same changes. Just make the changes. When we see a bug, we do not revert the feature and then re-add that feature corrected. Instead we correct the feature. Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/mfd/syscon.yaml b/Documentation/devicetree/bindings/mfd/syscon.yaml index 71741f06d2fddd2d4fb6b69c1cfd2d449ce73f64..c6bbb19c3e3e2245b4a823df06e7f361da311000 100644 --- a/Documentation/devicetree/bindings/mfd/syscon.yaml +++ b/Documentation/devicetree/bindings/mfd/syscon.yaml @@ -98,7 +98,6 @@ select: - mstar,msc313-pmsleep - nuvoton,ma35d1-sys - nuvoton,wpcm450-shm - - qcom,apq8064-mmss-sfpb - rockchip,px30-qos - rockchip,rk3036-qos - rockchip,rk3066-qos @@ -202,7 +201,6 @@ properties: - mstar,msc313-pmsleep - nuvoton,ma35d1-sys - nuvoton,wpcm450-shm - - qcom,apq8064-sps-sic - rockchip,px30-qos - rockchip,rk3036-qos - rockchip,rk3066-qos
For some reason Lee has mis-squashed two commits, picking up one chunk from the first patch and one chunk from the second one. Rather than trying to fix it, revert commit 2c8de7df7418 ("dt-bindings: mfd: syscon: Add qcom,apq8064-mmss-sfpb"). Fixes: 2c8de7df7418 ("dt-bindings: mfd: syscon: Add qcom,apq8064-mmss-sfpb") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> --- Documentation/devicetree/bindings/mfd/syscon.yaml | 2 -- 1 file changed, 2 deletions(-)