From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755292AbYA1WFD (ORCPT ); Mon, 28 Jan 2008 17:05:03 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752611AbYA1WEy (ORCPT ); Mon, 28 Jan 2008 17:04:54 -0500 Received: from smtp2.linux-foundation.org ([207.189.120.14]:33069 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752552AbYA1WEx (ORCPT ); Mon, 28 Jan 2008 17:04:53 -0500 Date: Tue, 29 Jan 2008 09:04:38 +1100 (EST) From: Linus Torvalds X-X-Sender: torvalds@www.l.google.com To: Sam Ravnborg cc: Andrew Morton , LKML , linux-kbuild , Paul Mundt Subject: Re: [GIT PATCH] kbuild updates In-Reply-To: <20080128212624.GA3842@uranus.ravnborg.org> Message-ID: References: <20080128212624.GA3842@uranus.ravnborg.org> User-Agent: Alpine 1.00 (LFD 882 2007-12-20) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 28 Jan 2008, Sam Ravnborg wrote: > > Please pull following patches for kbuild/kconfig and a few other areas. > > Pull from: > ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild.git This conflicts with the SH updates (sh is also integrating 32/64-bit into one tree now). Since I don't know the SH tree or your changes, the probably fairly trivial manual merge isn't an option (especially as I'm not at home and doing this on a laptop with a less than ideal keyboard and smaller screen than I'm used to). So I hope you and Paul can resolve the conflicts and re-send. Linus