Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752032AbbHQWu5 (ORCPT ); Mon, 17 Aug 2015 18:50:57 -0400 Received: from ozlabs.org ([103.22.144.67]:44586 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751336AbbHQWuy (ORCPT ); Mon, 17 Aug 2015 18:50:54 -0400 Date: Tue, 18 Aug 2015 08:50:50 +1000 From: Stephen Rothwell To: Inki Dae Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dave Airlie Subject: linux-next: rebase of the drm-exynos tree Message-ID: <20150818085050.7a38f4ef@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 853 Lines: 19 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@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/