Re: Smack Updates for security-testing

[James Morris <jmorris@xxxxxxxxx>]

On Sun, 13 May 2012, Casey Schaufler wrote:

> On 5/13/2012 5:34 PM, James Morris wrote:
> > On Sun, 13 May 2012, Casey Schaufler wrote:
> >
> >> The next branch of security-testing has:
> > They're local changes in your tree.
> >
> > Try git-reset --hard
> 
> 
> Hmm. That had no effect. I just did:
> 
>     git clone -b next
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
> linux-security-next
> 
> and cd'ed into security-next. I saw the problem in both

Not linux-security-next?

> linux-security#next and smack-next, which is derived from it.
> 
> I am perfectly willing to believe that I've done something wrong, but
> this is a clean clone.

They are local changes in your tree.  That's all I know.  Perhaps run 
git-diff and then search for similar changes in an upstream patch.

Here's what I get:

$ git clone -b next 
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git x
Cloning into x...
remote: Counting objects: 2441355, done.
remote: Compressing objects: 100% (378368/378368), done.
Receiving objects: 100% (2441355/2441355), 490.02 MiB | 11.20 MiB/s, done.
remote: Total 2441355 (delta 2043638), reused 2436083 (delta 2038918)
Resolving deltas: 100% (2043638/2043638), done.

$ cd x

$ git status
# On branch next
nothing to commit (working directory clean)






> 
> 
> >
> >> $ git status
> >> # On branch next
> >> # Changes not staged for commit:
> >> #   (use "git add <file>..." to update what will be committed)
> >> #   (use "git checkout -- <file>..." to discard changes in working
> >> directory)
> >> #
> >> #       modified:   include/linux/netfilter/xt_CONNMARK.h
> >> #       modified:   include/linux/netfilter/xt_DSCP.h
> >> #       modified:   include/linux/netfilter/xt_MARK.h
> >> #       modified:   include/linux/netfilter/xt_RATEEST.h
> >> #       modified:   include/linux/netfilter/xt_TCPMSS.h
> >> #       modified:   include/linux/netfilter_ipv4/ipt_ECN.h
> >> #       modified:   include/linux/netfilter_ipv4/ipt_TTL.h
> >> #       modified:   include/linux/netfilter_ipv6/ip6t_HL.h
> >> #       modified:   net/netfilter/xt_DSCP.c
> >> #       modified:   net/netfilter/xt_HL.c
> >> #       modified:   net/netfilter/xt_RATEEST.c
> >> #       modified:   net/netfilter/xt_TCPMSS.c
> >> #
> >> no changes added to commit (use "git add" and/or "git commit -a")
> >>
> >> I think that this needs to get resolved before I can sync up
> >> the branch I want you to pull.
> >>
> >> Thank you
> >>
> 

-- 
James Morris
<jmorris@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html