On Thu, 08 Sep 2022, Krzysztof Kozlowski wrote: > On 08/09/2022 10:15, Krzysztof Kozlowski wrote: > > On 08/09/2022 09:50, Lee Jones wrote: > >> On Wed, 17 Aug 2022, Krzysztof Kozlowski wrote: > >> > >>> Document new QCS404 TCSR compatible. > >>> > >>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> > >>> --- > >>> Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + > >>> 1 file changed, 1 insertion(+) > >> > >> Merge conflict. Please rebase. > > > > I will rebase. Can you check if you pushed your tree? I see updates 3 > > weeks ago here: > > https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/ > > It seems latest next also has your old tree from Aug 15, so on what > exactly I should rebase? That was my last day. Only updates since Monday needed pushing - now complete. -- Lee Jones [李琼斯]
