On Mon, 21 Feb 2022, Luca Weiss wrote: > Hi Lee, > > On Montag, 21. Februar 2022 09:48:01 CET Lee Jones wrote: > > On Sun, 20 Feb 2022, Luca Weiss wrote: > > > Document the compatible for tcsr found in msm8953. > > > > > > Signed-off-by: Luca Weiss <luca@xxxxxxxxx> > > > Acked-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxx> > > > Acked-by: Rob Herring <robh@xxxxxxxxxx> > > > --- > > > Changes in v2: > > > - no changes > > > > > > Documentation/devicetree/bindings/mfd/qcom,tcsr.txt | 1 + > > > 1 file changed, 1 insertion(+) > > > > This is already applied. > > Sorry, last week you wrote[0] > > [0] https://lore.kernel.org/linux-arm-msm/YgujkzAezfFBNRDP@xxxxxxxxxx/ Yes, that's strange. I don't remember fixing that merge conflict. Perhaps I did. Must have been in a good mood. :) > > Doesn't seem to apply. > > > > Could you please rebase. > > and it wasn't part of linux-next as of yesterday. Tree has been updated this morning. Should be in -next tomorrow. -- Lee Jones [李琼斯] Principal Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog