[CRIU] [PATCH 2/2] zdtm: timerfd requires new kernels to pass

[Pavel Emelyanov]

On 08/06/2014 09:07 PM, Cyrill Gorcunov wrote:
> On Wed, Aug 06, 2014 at 08:59:56PM +0400, Pavel Emelyanov wrote:
>> On 08/06/2014 08:31 PM, Cyrill Gorcunov wrote:
>>> Reported-by: Jenkins
>>> Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
>>> ---
>>>  test/zdtm.sh | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/test/zdtm.sh b/test/zdtm.sh
>>> index 8da6e763f265..b75a8d2ff5c6 100755
>>> --- a/test/zdtm.sh
>>> +++ b/test/zdtm.sh
>>> @@ -41,7 +41,6 @@ static/file_shared
>>>  static/file_append
>>>  static/timers
>>>  static/posix_timers
>>> -static/timerfd
>>>  static/futex
>>>  static/futex-rl
>>>  static/xids00
>>> @@ -182,6 +181,7 @@ ns/static/mntns_link_ghost
>>>  
>>>  TEST_CR_KERNEL="
>>>  ns/static/tun
>>
>> Tun stuff is already upstream. Maybe it's time to move this
>> line somewhere else?
> 
> Well, not sure, I believe better to keep it here for a while.
> Which version tun get merged in?

3.12