Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
include/linux/percpu-rwsem.h between commit 4b05a1c74d1c ("percpu-rwsem:
use synchronize_sched_expedited") from Linus' tree and commit
"percpu_rw_semaphore: reimplement to not block the readers unnecessarily"
from the akpm tree.I fixed it up (using the version from the akpm tree) and can carry the fix as necessary (more action may be required). -- Cheers, Stephen Rothwell [email protected]
pgpdyuaEURnEI.pgp
Description: PGP signature
