linux-next: manual merge of the bkl-config tree with Linus' tree

From: Stephen Rothwell
Date: Thu Nov 18 2010 - 21:06:12 EST

Next message: Greg KH: "Re: [PATCH] rbd: replace the rbd sysfs interface"
Previous message: Huang Ying: "[PATCH -v5 3/3] lib, Add lock-less NULL terminated single list"
In reply to: Stephen Rothwell: "linux-next: manual merge of the bkl-config tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Arnd,

Today's linux-next merge of the bkl-config tree got a conflict in
arch/powerpc/kernel/setup_64.c between commit
0f6b77ca12bea571e0a97b0588f62aa5f6012d61 ("powerpc: Update a BKL related
comment") from Linus' tree and commit
bb2d384ab8184eb7f7146897e47fa5b38583112c ("BKL: remove references to
lock_kernel from comments") from the bkl-config tree.

I just used the former version.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature

Next message: Greg KH: "Re: [PATCH] rbd: replace the rbd sysfs interface"
Previous message: Huang Ying: "[PATCH -v5 3/3] lib, Add lock-less NULL terminated single list"
In reply to: Stephen Rothwell: "linux-next: manual merge of the bkl-config tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]