On Tue, Jan 29, 2019 at 02:30:08PM -0600, Andy Gross wrote:
> On Tue, 29 Jan 2019 at 05:46, Georgi Djakov <georgi.djakov@xxxxxxxxxx> wrote:
> >
> > Hi Stephen,
> >
> > On 1/29/19 05:08, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the char-misc tree got a conflict in:
> > >
> > > arch/arm64/boot/dts/qcom/sdm845.dtsi
> > >
> > > between commits:
> > >
> > > 05556681948b ("arm64: dts: sdm845: Add videocc node")
> > > 5b6f186f0abb ("arm64: dts: sdm845: Add rpmh powercontroller node")
> > >
> > > from the qcom tree and commit:
> > >
> > > ae0037dbfc5e ("arm64: dts: sdm845: Add interconnect provider DT nodes")
> > >
> > > from the char-misc tree.
> > >
> > > I fixed it up (see below) and can carry the fix as necessary. This
> > > is now fixed as far as linux-next is concerned, but any non trivial
> > > conflicts should be mentioned to your upstream maintainer when your tree
> > > is submitted for merging. You may also want to consider cooperating
> > > with the maintainer of the conflicting tree to minimise any particularly
> > > complex conflicts.
>
> Greg,
> I'd prefer in this instance that this patch get dropped from
> char-misc. I have too much stuff in flight with some additional
> patches coming in to mess with this right now. And we don't have
> clients rdy anyway for this so let's wait till next cycle on this one.
Now reverted.
thanks,
greg k-h
