Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1294459

Re: linux-next: rebase of the drm-panel tree

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

On Fri, Dec 18, 2015 at 09:17:29AM +1100, Stephen Rothwell wrote:
> Hi Thierry,
> 
> I noticed that you have rebased the drm-panel tree today.  Unfortunately,
> Dave merged the previous version of your tree :-(

And I had hoped to have been fast enough. Sorry for the mess.

> So, now in linux-next today, we are going to have 2 copies of all theose
> patches, plus at least 2 of the patches have beenm changed in you new
> version so there will probably be conflicts.

Yes, there were two changes (in two patches) which moved device tree
bindings from a deprecated location to the new one.

> Please either go back to the old version, or just rebase what you have
> now on top of Dave's drm tree.

I'll revert to the old version and apply the changes as a separate patch
on top.

Again, sorry for the inconvenience.

Thierry

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: rebase of the drm-panel tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-17 23:20 +0100
  Re: linux-next: rebase of the drm-panel tree Thierry Reding <thierry.reding@gmail.com> - 2015-12-18 07:50 +0100

csiph-web