From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752740AbaIGSAD (ORCPT ); Sun, 7 Sep 2014 14:00:03 -0400 Received: from casper.infradead.org ([85.118.1.10]:35372 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751981AbaIGSAB (ORCPT ); Sun, 7 Sep 2014 14:00:01 -0400 Message-ID: <540C9D19.5080201@infradead.org> Date: Sun, 07 Sep 2014 10:59:53 -0700 From: Randy Dunlap User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.7.0 MIME-Version: 1.0 To: Mark Brown CC: Peter Foley , LKML , linux-doc@vger.kernel.org, Sam Ravnborg , Stephen Rothwell Subject: Re: [PATCH 1/4] Documentation: use subdir-y to avoid unnecessary built-in.o files References: <1397743910-18391-1-git-send-email-pefoley2@pefoley.com> <53FB9DA0.7000301@infradead.org> <540651B3.8030400@infradead.org> <20140902232906.GG29327@sirena.org.uk> <20140903232149.GG29327@sirena.org.uk> <5407A68F.5090805@infradead.org> <20140904104201.GI29327@sirena.org.uk> <540A503D.20807@infradead.org> In-Reply-To: <540A503D.20807@infradead.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/05/14 17:07, Randy Dunlap wrote: > On 09/04/14 03:42, Mark Brown wrote: >> On Wed, Sep 03, 2014 at 04:38:55PM -0700, Randy Dunlap wrote: >> >>> Hm, it could be a problem with the Index line. I'll disable that option >>> in quilt and see if that helps for the next time. >> >> Still seems to be happening today I'm afraid. >> > > I tested using git-am. Yes, that fails. These patch files are not emails > but git-am expects emails and fails when it cannot find email headers (AFAICT). > > Using git-apply instead of git-am does apply these patches. > Hi Mark, The quilt-import.log from 20140829 says: $ git am --patch-format=mbox ../quilt/rd-docs/001-docum-use-subdiry-avoid-builtin.patch and in the 20140905 git tree it says: $ git am ../quilt/rd-docs/001-docum-use-subdiry-avoid-builtin.patch Patch format detection failed. Are you using Stephen's scripts? Why would his tree apply patches with --patch-format=mbox while the later trees did not use that git-am option? Thanks. -- ~Randy