linux-kernel - linux-next: rebase of the drm-exynos 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]

Message-ID: <20150818085050.7a38f4ef@canb.auug.org.au>
Date:	Tue, 18 Aug 2015 08:50:50 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Inki Dae <inki.dae@...sung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Dave Airlie <airlied@...ux.ie>
Subject: linux-next: rebase of the drm-exynos tree

Hi Inki,

I noticed today that your tree
(git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next)
has been merged by Dave into his drm tree.  Unfortunately, your tree
has also been rebased onto Linus's v4.2-rc7.  So now the commits
0cb600d9be30-f8f66412fa6c in your tree are duplicated of commits
d36b3004ca2c-2a8cb4894540 in Dave's.  Please tidy this up (i.e. your
exynos-drm/for-next branch should be commit 2a8cb4894540 or something
later in Dave's tree) and you should continue your work from there.

-- 
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/