From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964942Ab2CBBRr (ORCPT ); Thu, 1 Mar 2012 20:17:47 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:52460 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932100Ab2CBBRp (ORCPT ); Thu, 1 Mar 2012 20:17:45 -0500 Date: Thu, 1 Mar 2012 17:19:14 -0800 From: Andrew Morton To: Kees Cook Cc: Stephen Rothwell , Will Drewry , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, kernel-hardening@lists.openwall.com, netdev@vger.kernel.org, x86@kernel.org, arnd@arndb.de, davem@davemloft.net, hpa@zytor.com, mingo@redhat.com, oleg@redhat.com, peterz@infradead.org, rdunlap@xenotime.net, mcgrathr@chromium.org, tglx@linutronix.de, luto@mit.edu, eparis@redhat.com, serge.hallyn@canonical.com, djm@mindrot.org, scarybeasts@gmail.com, indan@nul.nu, pmoore@redhat.com, corbet@lwn.net, eric.dumazet@gmail.com, markus@chromium.org, coreyb@linux.vnet.ibm.com Subject: Re: [PATCH v12 01/13] sk_run_filter: add support for custom load_pointer Message-Id: <20120301171914.7c64f095.akpm@linux-foundation.org> In-Reply-To: References: <1330559620-23543-1-git-send-email-wad@chromium.org> <20120301233712.GS3990@outflux.net> <20120302114705.0a9542e138927897f16282ca@canb.auug.org.au> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 1 Mar 2012 16:57:49 -0800 Kees Cook wrote: > On Thu, Mar 1, 2012 at 4:47 PM, Stephen Rothwell wrote: > > Hi Kees, > > > > On Thu, 1 Mar 2012 15:37:12 -0800 Kees Cook wrote: > >> > >> Is it time to pull this into -next so more people can feel it? I brought > >> Andy Lutomirski's patches forward (needed to bump the prctl values), and > >> updated my git tree. If we're ready, here it is in all its request-pull > >> format glory: > >> > >> The following changes since commit 2422c8368337196594265d52cad7316c9404bfcf: > >> __ Stephen Rothwell (1): > >> __ __ __ __ Add linux-next specific files for 20120301 > > > > OK, not commenting on anything else, but I cannot merge that into > > linux-next because it is based on yesterday's linux-next release and > > linux-next (effectively) rebases every day ... > > > > Does this work depend on anything in linux-next? __Or could it be just > > based off Linus' tree. __If it depends on other tree(s) merged into > > linux-next, then you should base your tree on those tree(s) as long as > > they never get rebased ... > > Unfortunately, yes, it does -- there were both ptrace changes and prctl changes. > > And at least the ptrace changes are, IIRC, in -mm, which has no tree. > :P Given that, what's the best thing for me to do for this to be easy > for you to pull? Base the tree on mainline and wreck the -mm patches I guess. I'm good at unwrecking patches. That assumes that we're going to merge this stuff into 3.4 - if we don't, unwrecker gets rewrecked and grumpy. I don't know if we're going to merge it into 3.4? I haven't been paying a lot of attention and haven't looked at the patches in a while.