Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751534AbaJOWgc (ORCPT ); Wed, 15 Oct 2014 18:36:32 -0400 Received: from gw-1.arm.linux.org.uk ([78.32.30.217]:35188 "EHLO pandora.arm.linux.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750809AbaJOWgb (ORCPT ); Wed, 15 Oct 2014 18:36:31 -0400 Date: Wed, 15 Oct 2014 23:36:17 +0100 From: Russell King - ARM Linux To: Kees Cook Cc: Paolo Pisati , Jason Baron , David Miller , Laura Abbott , "linux-arm-kernel@lists.infradead.org" , LKML Subject: Re: arm: JUMP_LABEL and DEBUG_SET_MODULE_RONX should be mutually exclusive? Message-ID: <20141015223617.GM27405@n2100.arm.linux.org.uk> References: <20141015122102.GB4427@stinkpad> <20141015220943.GK27405@n2100.arm.linux.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Oct 15, 2014 at 05:21:29PM -0500, Kees Cook wrote: > On Wed, Oct 15, 2014 at 5:09 PM, Russell King - ARM Linux > wrote: > > On Wed, Oct 15, 2014 at 08:34:17AM -0700, Kees Cook wrote: > >> On Wed, Oct 15, 2014 at 5:21 AM, Paolo Pisati wrote: > >> > Hi, > >> > > >> > i keep hitting this with BRIDGE=m, JUMP_LABEL=y and DEBUG_SET_MODULE_RONX=y: > >> > >> I think my RO/NX patch series solves this. I sent a pull request, but > >> I haven't seen any movement on it. :( > > > > Sorry Kees. > > > > However, even if I had looked at it, I would /not/ have been able to > > pull it. It does the absolutely fatal thing for any pull request: > > > > The following changes since commit cc31d8f887953e9824c4d9333b15c335ee7d1b65: > > > > Merge branches 'fiq' (early part), 'fixes' and 'misc' into for-next (2014-09-2+6 14:40:19 +0100) > > > > That commit is on my "for-next" branch. The clue is in the name. :) > > Just like trying to base commits onto the linux-next tree, trying to > > base commits on an aggregate branch intended for linux-next usage > > doesn't work for all the same reasons. > > Ah! My mistake; I was trying to figure out which branch would be best > for you to pull from. What do you prefer I use as the base for the > pull request? I much prefer branches against one of Linus' release points than some point in someone elses tree - unless, of course, there are dependencies that need to be solved (which means there should be something in the pull request explaining that.) If it conflicts with something I have in my tree, then that's generally not a problem unless the conflict is horrid, at which point it can be discussed. -- FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up according to speedtest.net. -- 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/