Re: linux-next: manual merge of the qcom tree with the usb tree

[Mark Brown]

On Fri, Aug 06, 2021 at 01:08:26PM +0200, Greg Kroah-Hartman wrote:
> On Fri, Aug 06, 2021 at 11:21:38AM +0100, Mark Brown wrote:

> > diff --cc arch/arm64/boot/dts/qcom/msm8996.dtsi
> > index 78c55ca10ba9,31686950004e..000000000000
> > --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> 
> Love the fix, did something go wrong?  :)

The fix will be whatever was in HEAD.

Attachment: signature.asc
Description: PGP signature