public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
From: Casey Schaufler <casey@schaufler-ca.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Morris <jmorris@namei.org>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Casey Schaufler <casey@schaufler-ca.com>
Subject: Re: linux-next: unusual update of the security tree
Date: Tue, 27 Nov 2012 15:45:17 -0800	[thread overview]
Message-ID: <50B5508D.7050409@schaufler-ca.com> (raw)
In-Reply-To: <20121128101635.d5e864dffc4252ef9d5e1664@canb.auug.org.au>

On 11/27/2012 3:16 PM, Stephen Rothwell wrote:

> Hi James,
>
> 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.


>
> Just for your consideration.
>

  parent reply	other threads:[~2012-11-27 23:45 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-27 23:16 linux-next: unusual update of the security tree Stephen Rothwell
2012-11-27 23:28 ` Stephen Rothwell
2012-11-27 23:30   ` Linus Torvalds
2012-11-27 23:57     ` Stephen Rothwell
2012-11-27 23:45 ` Casey Schaufler [this message]
2012-11-28  0:01   ` Stephen Rothwell
     [not found]     ` <CA+55aFwdk9FiW4u_f-Dq6+jtuD9kY-zBqPpMVc2OHJFnzaAbzA@mail.gmail.com>
2012-12-03 15:26       ` James Morris
2012-12-06 13:25     ` James Morris
2012-12-06 16:25       ` Linus Torvalds
2012-12-06 21:27         ` Stephen Rothwell
2012-12-06 23:21         ` James Morris
2012-12-06 23:56           ` Casey Schaufler
2012-12-13  2:24           ` Stephen Rothwell
2012-12-14  3:11             ` James Morris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=50B5508D.7050409@schaufler-ca.com \
    --to=casey@schaufler-ca.com \
    --cc=jmorris@namei.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox