linux-next: manual merge of the driver-core tree with the tip tree
From: Stephen Rothwell
Date: Thu Apr 11 2013 - 01:30:48 EST
Today's linux-next merge of the driver-core tree got a conflict in
kernel/rtmutex-tester.c between commit 8184004ed7a0
("locking/rtmutex/tester: Set correct permissions on sysfs files") from
the tip tree and commit 928c0c1571b0 ("rtmutex-tester: fix mode of sysfs
files") from the driver-core tree.
Both patches do the same thing - I used the tip version and can carry the
fix as necessary (no action is required).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature