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.