lkml.org 
[lkml]   [2013]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: Tree for Feb 4
Hi James,

On Mon, 4 Feb 2013 13:56:32 +0000 James Hogan <james.hogan@imgtec.com> wrote:
>
> On 4 February 2013 07:39, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Merging signal/for-next (9005965 x86: convert to ksignal)
> > CONFLICT (content): Merge conflict in arch/x86/Kconfig
>
> I think this conflict has been resolved incorrectly.
>
> Al's commit 1820f96 "burying unused conditionals" removed
> GENERIC_SIGALTSTACK from config X86, but the merge
> (c5395e2affed5c42200cb6e21e3380995ef22ae3) left GENERIC_SIGALTSTACK
> in:

Thanks, I will fix that today.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-02-04 22:22    [W:0.048 / U:5.520 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site