Messages in this thread | | | Date | Tue, 21 Sep 2021 15:16:27 +0200 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the usb tree with the qcom tree |
| |
On Tue, Sep 21, 2021 at 06:12:06AM -0700, Bjorn Andersson wrote: > On Mon 20 Sep 19:30 PDT 2021, Stephen Rothwell wrote: > > > Hi all, > > > > Today's linux-next merge of the usb tree got a conflict in: > > > > arch/arm64/boot/dts/qcom/ipq6018.dtsi > > > > between commit: > > > > 261e8a95d9aa ("arm64: dts: qcom: ipq6018: add usb3 DT description") > > > > from the qcom tree and commit: > > > > 9da2c3f76164 ("arm64: qcom: ipq6018: add usb3 DT description") > > > > Greg, this is not a USB patch, can you please drop it from your tree.
It was sent to me and says "add usb3 DT description", so how am I supposed to know to reject it?
I'll go revert it from my tree. {sigh}
greg k-h
| |