Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752550AbcCGLCz (ORCPT ); Mon, 7 Mar 2016 06:02:55 -0500 Received: from mail-wm0-f43.google.com ([74.125.82.43]:35910 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752108AbcCGLCq (ORCPT ); Mon, 7 Mar 2016 06:02:46 -0500 Date: Mon, 7 Mar 2016 11:02:43 +0000 From: Matt Fleming To: Ard Biesheuvel Cc: Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" , "linux-kernel@vger.kernel.org" , "linux-efi@vger.kernel.org" , Jeremy Linton , Mark Rutland , Suzuki K Poulose Subject: Re: [PATCH 09/13] efi/arm64: Check for h/w support before booting a >4 KB granule kernel Message-ID: <20160307110243.GB27675@codeblueprint.co.uk> References: <1455712566-16727-1-git-send-email-matt@codeblueprint.co.uk> <1455712566-16727-10-git-send-email-matt@codeblueprint.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24+41 (02bc14ed1569) (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 755 Lines: 18 On Sun, 06 Mar, at 04:35:32AM, Ard Biesheuvel wrote: > > Hi Matt, > > This patch turned up in -next with 'granule' replaced with 'granular', > both in the commit log and in the patch itself. The term 'granule' is > part of the idiom used by the ARM Architecture Reference Manual, and > so changing it silently to 'granular' is not entirely appropriate here > (although harmless in practice, obviously). In general, I would > appreciate it if in the future, such changes were not made silently > somewhere in the merge pipeline. Sorry about this Ard. I'll make sure this doesn't happen again in future. Ingo, is there any chance we can fixup this patch in-place and revert back to the original wording before it gets to Linus' during the merge window?