Subject: Re: linux-next: manual merge of the security-testing tree with the tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 30 Jun 2011 19:30:23 +1000

Hi Uwe,

On Thu, 30 Jun 2011 09:25:59 +0200 Uwe Kleine-König <[email-masked]> wrote:
>
> Long history short: James probably used -s ours or similar and it's fine
> not to merge that commit into next :-)

Ah ha!  Thanks for the explanation.  My mind was clearly not up to it
today. :-)

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/