Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753049AbaA3EyH (ORCPT ); Wed, 29 Jan 2014 23:54:07 -0500 Received: from mail-ve0-f172.google.com ([209.85.128.172]:48344 "EHLO mail-ve0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750879AbaA3EyF (ORCPT ); Wed, 29 Jan 2014 23:54:05 -0500 MIME-Version: 1.0 In-Reply-To: References: Date: Wed, 29 Jan 2014 20:54:03 -0800 X-Google-Sender-Auth: DLDEd85IoTc1iwHfb_81PK19c9U Message-ID: Subject: Re: [git pull] drm next tree From: Linus Torvalds To: Dave Airlie Cc: DRI mailing list , Linux Kernel Mailing List Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 29, 2014 at 6:49 PM, Dave Airlie wrote: > > For some reason the request-pull and the merge into your tree look different, > since some of the changes in this have already gone in via the arm-soc tree > and dma stuff, all for tegra. Hopefully nobody rebased when they shouldn't. Looks more like it's just a few cross-merges, which then ends up meaning that there are multiple merge-bases and not just one common ancestor commit. In that case, a simple "git diff" can't do a great job, and the actual merge diff will usually end up different. Linus -- 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/