Messages in this thread | | | Date | Mon, 17 Mar 2014 10:36:02 +0100 | From | Peter Zijlstra <> | Subject | Re: linux-next: manual merge of the akpm-current tree with the tip tree |
| |
On Mon, Mar 17, 2014 at 08:31:24PM +1100, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in > kernel/locking/Makefile between commit fb0527bd5ea9 ("locking/mutexes: > Introduce cancelable MCS lock for adaptive spinning") from the tree and > commit 4dc0fe493027 ("lglock: map to spinlock when !CONFIG_SMP") from the > akpm-current tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
I'm a bit sad of not having seen that lglock patch at all.
| |