lkml.org 
[lkml]   [2012]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: unusual update of the security tree
Any suggestions on how to fix this?  That branch is public, and what 
people use to develop against, so I can't rebase it.



On Wed, 28 Nov 2012, Stephen Rothwell wrote:

> Hi Casey,
>
> On Tue, 27 Nov 2012 15:45:17 -0800 Casey Schaufler <casey@schaufler-ca.com> wrote:
> >
> > On 11/27/2012 3:16 PM, Stephen Rothwell wrote:
> >
> > > The security tree
> > > (git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next)
> > > looks a bit strange today ... It appears to have been created by Casey
> > > Schaufler (cc'd) and contains some quite old commits and back merges of
> > > your tree. I *guess* you have merged in Casey's tree after he merged in
> > > your tree from yesterday.
> >
> > I *thought* that I had used the same procedures that worked before.
> > In fact, I still do think that, but if it's a problem I can purge my
> > smack-next tree and start over.
> >
> > James, the two changes that came from smack-next are pretty minor. I
> > don't think you should hesitate to back them out if that helps.
>
> This is the shortlog for the changes in the security tree between
> yesterday and today;
>
> Casey Schaufler (32):
> Commit 272cd7a8c67dd40a31ecff76a503bbb84707f757 introduced a change to the way rule lists are handled and reported in the smackfs filesystem. One of the issues addressed had to do with the termination of read requests on /smack/load. This change introduced a error in /smack/cipso, which shares some of the same list processing code.
> Revert "Commit 272cd7a8c67dd40a31ecff76a503bbb84707f757 introduced"
> Smack: smackfs cipso seq read repair
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Smack: recursive tramsmute
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Smack: allow for significantly longer Smack labels v4
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Smack: fix smack_new_inode bogosities
> Smack: Maintainer Record
> Smack: onlycap limits on CAP_MAC_ADMIN
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Smack: user access check bounds
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Smack: remove task_wait() hook.
> Smack: setprocattr memory leak fix
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Merge branch 'for-1209'
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security
> Merge branch 'next' of git://git.kernel.org/.../jmorris/linux-security into for-1211
> Smack: use select not depends in Kconfig
> Smack: create a sysfs mount point for smackfs
>
> Rafal Krypa (2):
> Smack: don't show empty rules when /smack/load or /smack/load2 is read
> Smack: implement revoking all rules for a subject label
>
> Tetsuo Handa (1):
> gfp flags for security_inode_alloc()?
>
> It's a bit of a mess :-(
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>

--
James Morris
<jmorris@namei.org>


\
 
 \ /
  Last update: 2012-12-07 06:21    [W:0.176 / U:0.244 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site