Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753111Ab3FFWNW (ORCPT ); Thu, 6 Jun 2013 18:13:22 -0400 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:37904 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751490Ab3FFWNV (ORCPT ); Thu, 6 Jun 2013 18:13:21 -0400 Date: Thu, 6 Jun 2013 23:12:34 +0100 From: Russell King - ARM Linux To: Kim Phillips , Arnd Bergmann , Stephen Rothwell Cc: "Woodhouse, David" , Nicolas Pitre , Rusty Russell , "linux-kernel@vger.kernel.org" , Daniel Santos , Borislav Petkov , David Rientjes , Andrew Morton , "linux-arm-kernel@lists.infradead.org" Subject: Re: [PATCH v7] arm: use built-in byte swap function Message-ID: <20130606221234.GQ18614@n2100.arm.linux.org.uk> References: <20130220214943.9b28a5b208da9f081387c55e@freescale.com> <20130221005221.15279b1372501af12c1e4f32@freescale.com> <20130221203327.6558f89277468f7ffffa6506@freescale.com> <20130222194032.f7b44aefa5e2723d16767a1b@freescale.com> <1361661654.18110.102.camel@shinybook.infradead.org> <20130523114654.1f273241725205c6703b2226@freescale.com> <20130523231336.GS18614@n2100.arm.linux.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130523231336.GS18614@n2100.arm.linux.org.uk> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2874 Lines: 60 On Fri, May 24, 2013 at 12:13:36AM +0100, Russell King - ARM Linux wrote: > On Thu, May 23, 2013 at 11:46:54AM -0500, Kim Phillips wrote: > > Enable the compiler intrinsic for byte swapping on arch ARM. This > > allows the compiler to detect and be able to optimize out byte > > swappings, and has a very modest benefit on vmlinux size (Linaro gcc > > 4.8): > > > > text data bss dec hex filename > > 2840310 123932 61960 3026202 2e2d1a vmlinux-lart #orig > > 2840152 123932 61960 3026044 2e2c7c vmlinux-lart #builtin-bswap > > > > 6473120 314840 5616016 12403976 bd4508 vmlinux-mxs #orig > > 6472586 314848 5616016 12403450 bd42fa vmlinux-mxs #builtin-bswap > > > > 7419872 318372 379556 8117800 7bde28 vmlinux-imx_v6_v7 #orig > > 7419170 318364 379556 8117090 7bdb62 vmlinux-imx_v6_v7 #builtin-bswap > > > > Signed-off-by: Kim Phillips > > Reviewed-by: Nicolas Pitre > > Acked-by: David Woodhouse > > --- > > resending as v6 appears to have fallen though the cracks. Russell? > > Please put it in the patch system (otherwise I do drop patches.) (Added Arnd/SFR in case they have comments.) So, we have a problem here - the kind which appears when people stuff things into the -next tree which aren't destined for the next merge window. This is the relevant context from your patch, which is against linux-next: - lib1funcs.o lib1funcs.S ashldi3.o ashldi3.S \ - font.o font.c head.o misc.o $(OBJS) + lib1funcs.o lib1funcs.S ashldi3.o ashldi3.S bswapsdi2.o \ + bswapsdi2.S font.o font.c head.o misc.o $(OBJS) # Make sure files are removed during clean extra-y += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern piggy.lz4 \ ^^^^^^^^^ - lib1funcs.S ashldi3.S $(libfdt) $(libfdt_hdrs) + lib1funcs.S ashldi3.S bswapsdi2.S $(libfdt) $(libfdt_hdrs) the underlined bit - piggy.lz4 for those who read mail with proportional fonts. That is not in any kernel I have, and if it _is_ something that is destined for the next merge window, it should be in my tree as it's a core ARM feature, not in some random other tree. Short of hand-editing and manually applying the patch, a solution would be to rebase it on a mainline kernel version, like -rc4, and resubmit that version instead. That will ultimately then give sfr a conflict which should be trivial to resolve - and hopefully we'll find out who's carrying the LZ4 patch and putting it into linux-next. -- 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/