Re: linux-next: manual merge of the phy-next tree with Linus' tree

2018-12-11 Thread Kishon Vijay Abraham I
Hi, On 12/12/18 10:42 AM, Stephen Rothwell wrote: > Hi Kishon, > > On Wed, 12 Dec 2018 10:37:37 +0530 Kishon Vijay Abraham I > wrote: >> >> I've rebased by 'next' branch on top of my 'fixes' branch to avoid this >> conflict. > > Why didn't you just merge them? Merging will create a new merge

Re: linux-next: manual merge of the phy-next tree with Linus' tree

2018-12-11 Thread Stephen Rothwell
Hi Kishon, On Wed, 12 Dec 2018 10:37:37 +0530 Kishon Vijay Abraham I wrote: > > I've rebased by 'next' branch on top of my 'fixes' branch to avoid this > conflict. Why didn't you just merge them? -- Cheers, Stephen Rothwell pgpz6d1Bd0Tqx.pgp Description: OpenPGP digital signature

Re: linux-next: manual merge of the phy-next tree with Linus' tree

2018-12-11 Thread Kishon Vijay Abraham I
Hi, On 12/12/18 9:46 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the phy-next tree got a conflict in: > > Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt > > between commit: > > 7243ec72b902 ("dt-bindings: phy-qcom-qmp: Fix several mistakes from prior > co