Re: [PATCH] x86: fix unconditionalarch/x86/kernel/pcspeaker.c?compiling

From: Ralf Baechle
Date: Fri Jan 25 2008 - 11:10:07 EST


On Thu, Jan 24, 2008 at 11:12:12PM +0300, Dmitri Vorobiev wrote:

> > running "make allnoconfig". To get it, you have to explicitely add support
> > to CONFIG_INPUT_PCSPKR (m or y). I hope this is fine.
> >
> > I'm copying the MIPS maintainer as this patch touches his tree too.
>
> This patch does not apply cleanly to linux-mips Git tree:
>
> ----> snip
> patching file arch/x86/kernel/Makefile
> Hunk #1 FAILED at 69.
> 1 out of 1 hunk FAILED -- saving rejects to file arch/x86/kernel/Makefile.rej
> ----> snip
>
> I believe this is because the linux-mips tree and the -mm tree are not in sync.

The main linux-mips git tree is derived of Linus' kernel.org tree and
I usually update it daily. Patch scheduled for the next kernel release or
later go into a special tree from which akpm pulls. For significant
patch submissions that means patches should be generated either against
the linux-queue tree from linux-mips.org (which only contains the MIPS
specific stuff) or possibly akpm's -mm tree.

Ralf
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/