linux-kernel - 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-next>] [day] [month] [year] [list]

Date:	Fri, 18 Dec 2015 09:17:29 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thierry Reding <thierry.reding@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Dave Airlie <airlied@...ux.ie>
Subject: linux-next: rebase of the drm-panel tree

Hi Thierry,

I noticed that you have rebased the drm-panel tree today.  Unfortunately,
Dave merged the previous version of your tree :-(

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.

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

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/