From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934079AbbLQWRc (ORCPT ); Thu, 17 Dec 2015 17:17:32 -0500 Received: from ozlabs.org ([103.22.144.67]:42442 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933145AbbLQWRb (ORCPT ); Thu, 17 Dec 2015 17:17:31 -0500 Date: Fri, 18 Dec 2015 09:17:29 +1100 From: Stephen Rothwell To: Thierry Reding Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dave Airlie Subject: linux-next: rebase of the drm-panel tree Message-ID: <20151218091729.1e923834@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.29; 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 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@canb.auug.org.au