Messages in this thread | | | Date | Thu, 11 Apr 2013 06:26:20 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the tip tree |
| |
On Thu, Apr 11, 2013 at 03:30:23PM +1000, Stephen Rothwell wrote: > 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).
Thanks for the heads up.
greg k-h
| |