Hi James, On Mon, 4 Feb 2013 13:56:32 +0000 James Hogan <james.hogan@xxxxxxxxxx> wrote: > > On 4 February 2013 07:39, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx
Attachment:
pgpoTU06jEQmm.pgp
Description: PGP signature
