lkml.org 
[lkml]   [2010]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectVS: [PATCH] Smack: label for task objects (retry 2)
Date
Hi

I don't like to whine about unnecessary things but it would really nice to get into the author field :) The patch that I sent to list did have merge issues. I don't know what messed it.

Casey, I propose we take some steps back and fix the workflow so next time things will go smoother. I propose that I create my own tree from your tree and put patch there and you can then cherry pick or merge my patch to his tree. Then James can pick the patch from your tree.

BR, Jarkko
________________________________________
Lähettäjä: ext James Morris [jmorris@namei.org]
Lähetetty: 3. joulukuuta 2010 0:24
Vastaanottaja: Casey Schaufler
Kopio: Sakkinen Jarkko.2 (EXT-Tieto/Tampere); linux-kernel@vger.kernel.org; linux-security-module@vger.kernel.org
Aihe: Re: [PATCH] Smack: label for task objects (retry 2)

On Fri, 3 Dec 2010, James Morris wrote:

> On Thu, 2 Dec 2010, Casey Schaufler wrote:
>
> > After patch clean-up applied to:
> >
> > git://gitorious.org/smack-next/kernel.git
> >
> > James, would you be so kind as to pull for security-testing#next?
> > I think that I have the git tree set up properly, but I'm sure
> > you'll let me know if I've missed something.

Looks like you didn't sign-off the commit (git-commit -s).

Too late to fix it now.

--
James Morris
<jmorris@namei.org>
--
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/

\
 
 \ /
  Last update: 2010-12-03 07:31    [W:0.060 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site