Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in ipc/sem.c between commit 321310ced2d6 ("ipc: move sem_obtain_lock() rcu locking into the only caller") from Linus' tree and commit "ipc/sem.c: alternatives to preempt_disable()" from the akpm tree.
I just dropped the akpm tree commit for now. -- Cheers, Stephen Rothwell s...@canb.auug.org.au
pgpHzWZfqr_Nc.pgp
Description: PGP signature