Re: linux-next: manual merge of the security-testing tree with the tree
From: Stephen Rothwell <hidden>
Date: 2011-06-30 09:30:42
Also in:
linux-next, lkml
Hi Uwe, On Thu, 30 Jun 2011 09:25:59 +0200 Uwe Kleine-König [off-list ref] 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 sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
Attachments
- (unnamed) [application/pgp-signature] 490 bytes