Messages in this thread | | | Date | Thu, 11 Apr 2013 15:30:23 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the driver-core tree with the tip tree |
| |
Hi Greg,
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).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |