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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20151218064431.GA8769@ulmo>
Date:	Fri, 18 Dec 2015 07:44:31 +0100
From:	Thierry Reding <thierry.reding@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Dave Airlie <airlied@...ux.ie>
Subject: Re: linux-next: rebase of the drm-panel tree

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

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)