xserver: Branch 'master'

[Alan Coopersmith]

On 01/ 5/16 10:35 PM, Michel Dänzer wrote:
> On 06.01.2016 04:51, Adam Jackson wrote:
>>
>> commit edcb6426f20c3be5dd5f50b76a686754aef2f64e
>> Author: Alan Coopersmith <alan.coopersmith at oracle.com>
>> Date:   Fri Jan 1 18:11:14 2016 -0800
>>
>>      Use unique logfile names when starting server with -displayfd
>
> This change broke make check for me, specifically the signal-logging
> test:
>
> (EE)
> Fatal server error:
> (EE) Cannot remove old log file "/tmp/Xorg-logging-test.log": No such file or directory

Sorry - I forgot to run make check when testing this.

Thanks to ajax for the quick fix.

-- 
	-Alan Coopersmith-              alan.coopersmith at oracle.com
	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc