Merge branch 'master' into ltp-broom

Checkpoint work.

Conflicts:
	doc/man3/tst_res.3
	lib/tst_res.c
	testcases/commands/ade/size/test.c
	testcases/kernel/containers/pidns/pidns04.c
	testcases/kernel/device-drivers/agp/kernel_space/tagp.c
	testcases/kernel/device-drivers/base/tbase/tbase.c
	testcases/kernel/device-drivers/dev_sim_framework/kernel_space/tmod.c
	testcases/kernel/device-drivers/pci/tpci/tpci.c
	testcases/kernel/device-drivers/tbio/kernel_space/tbio.c
	testcases/kernel/device-drivers/usb/tusb/tusb.c
	testcases/kernel/device-drivers/usb/user_usb/user_tusb.c
	testcases/kernel/fs/acls/acl_file_test.c
	testcases/kernel/fs/acls/acl_link_test.c
	testcases/kernel/fs/doio/doio.c
	testcases/kernel/fs/doio/growfiles.c
	testcases/kernel/fs/doio/iogen.c
	testcases/kernel/fs/inode/inode02.c
	testcases/kernel/fs/mongo/mongo_compare.c
	testcases/kernel/fs/stream/stream01.c
	testcases/kernel/fs/stream/stream02.c
	testcases/kernel/fs/stream/stream04.c
	testcases/kernel/fs/stream/stream05.c
	testcases/kernel/hotplug/memory_hotplug/commands.c
	testcases/kernel/io/direct_io/diotest_routines.c
	testcases/kernel/io/disktest/parse.c
	testcases/kernel/io/ltp-aiodio/aio-stress.c
	testcases/kernel/io/ltp-aiodio/aiodio_append.c
	testcases/kernel/io/writetest/writetest.c
	testcases/kernel/ipc/pipeio/pipeio.c
	testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c
	testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c
	testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c
	testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c
	testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c
	testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
	testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c
	testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c
	testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
	testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
	testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
	testcases/kernel/mem/mtest01/mtest01.c
	testcases/kernel/mem/vmtests/data_space.c
	testcases/kernel/module/create_module/create_module01.c
	testcases/kernel/module/create_module/create_module02.c
	testcases/kernel/module/delete_module/delete_module02.c
	testcases/kernel/module/delete_module/delete_module03.c
	testcases/kernel/module/query_module/query_module01.c
	testcases/kernel/module/query_module/query_module03.c
	testcases/kernel/numa/support_numa.c
	testcases/kernel/sched/process_stress/process.c
	testcases/kernel/security/selinux-testsuite/tests/capable_file/selinux_lease.c
	testcases/kernel/security/selinux-testsuite/tests/capable_sys/selinux_chroot.c
	testcases/kernel/security/selinux-testsuite/tests/capable_sys/selinux_hostname.c
	testcases/kernel/security/selinux-testsuite/tests/capable_sys/selinux_nice.c
	testcases/kernel/security/selinux-testsuite/tests/capable_sys/selinux_rawio.c
	testcases/kernel/security/selinux-testsuite/tests/file/selinux_fcntl.c
	testcases/kernel/security/selinux-testsuite/tests/file/selinux_lock.c
	testcases/kernel/security/selinux-testsuite/tests/file/selinux_mmap.c
	testcases/kernel/security/selinux-testsuite/tests/file/selinux_mprotect.c
	testcases/kernel/security/selinux-testsuite/tests/file/selinux_nofcntl.c
	testcases/kernel/security/selinux-testsuite/tests/file/selinux_seek.c
	testcases/kernel/security/selinux-testsuite/tests/file/selinux_sigiotask.c
	testcases/kernel/security/selinux-testsuite/tests/ioctl/selinux_ioctl.c
	testcases/kernel/security/selinux-testsuite/tests/ioctl/selinux_noioctl.c
	testcases/kernel/syscalls/abort/abort01.c
	testcases/kernel/syscalls/accept/accept01.c
	testcases/kernel/syscalls/access/access01.c
	testcases/kernel/syscalls/access/access02.c
	testcases/kernel/syscalls/access/access03.c
	testcases/kernel/syscalls/access/access04.c
	testcases/kernel/syscalls/access/access05.c
	testcases/kernel/syscalls/add_key/add_key01.c
	testcases/kernel/syscalls/add_key/add_key02.c
	testcases/kernel/syscalls/adjtimex/adjtimex01.c
	testcases/kernel/syscalls/adjtimex/adjtimex02.c
	testcases/kernel/syscalls/alarm/alarm01.c
	testcases/kernel/syscalls/alarm/alarm02.c
	testcases/kernel/syscalls/alarm/alarm03.c
	testcases/kernel/syscalls/alarm/alarm05.c
	testcases/kernel/syscalls/alarm/alarm06.c
	testcases/kernel/syscalls/alarm/alarm07.c
	testcases/kernel/syscalls/asyncio/asyncio02.c
	testcases/kernel/syscalls/bdflush/bdflush01.c
	testcases/kernel/syscalls/bind/bind01.c
	testcases/kernel/syscalls/cacheflush/cacheflush01.c
	testcases/kernel/syscalls/capget/capget01.c
	testcases/kernel/syscalls/capget/capget02.c
	testcases/kernel/syscalls/capset/capset01.c
	testcases/kernel/syscalls/capset/capset02.c
	testcases/kernel/syscalls/chdir/chdir01.c
	testcases/kernel/syscalls/chdir/chdir02.c
	testcases/kernel/syscalls/chdir/chdir03.c
	testcases/kernel/syscalls/chdir/chdir04.c
	testcases/kernel/syscalls/chmod/chmod01.c
	testcases/kernel/syscalls/chmod/chmod03.c
	testcases/kernel/syscalls/chmod/chmod04.c
	testcases/kernel/syscalls/chmod/chmod05.c
	testcases/kernel/syscalls/chmod/chmod06.c
	testcases/kernel/syscalls/chmod/chmod07.c
	testcases/kernel/syscalls/chown/chown01.c
	testcases/kernel/syscalls/chown/chown02.c
	testcases/kernel/syscalls/chown/chown03.c
	testcases/kernel/syscalls/chown/chown04.c
	testcases/kernel/syscalls/chown/chown05.c
	testcases/kernel/syscalls/chroot/chroot01.c
	testcases/kernel/syscalls/chroot/chroot02.c
	testcases/kernel/syscalls/chroot/chroot03.c
	testcases/kernel/syscalls/chroot/chroot04.c
	testcases/kernel/syscalls/clock_getres/clock_getres01.c
	testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
	testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c
	testcases/kernel/syscalls/clone/clone01.c
	testcases/kernel/syscalls/clone/clone02.c
	testcases/kernel/syscalls/clone/clone03.c
	testcases/kernel/syscalls/clone/clone04.c
	testcases/kernel/syscalls/clone/clone05.c
	testcases/kernel/syscalls/clone/clone06.c
	testcases/kernel/syscalls/clone/clone07.c
	testcases/kernel/syscalls/close/close01.c
	testcases/kernel/syscalls/close/close02.c
	testcases/kernel/syscalls/close/close08.c
	testcases/kernel/syscalls/connect/connect01.c
	testcases/kernel/syscalls/creat/creat01.c
	testcases/kernel/syscalls/creat/creat03.c
	testcases/kernel/syscalls/creat/creat04.c
	testcases/kernel/syscalls/creat/creat05.c
	testcases/kernel/syscalls/creat/creat06.c
	testcases/kernel/syscalls/creat/creat07.c
	testcases/kernel/syscalls/creat/creat09.c
	testcases/kernel/syscalls/dup2/dup201.c
	testcases/kernel/syscalls/dup2/dup203.c
	testcases/kernel/syscalls/dup2/dup204.c
	testcases/kernel/syscalls/dup3/dup3_01.c
	testcases/kernel/syscalls/epoll_create1/epoll_create1_01.c
	testcases/kernel/syscalls/eventfd2/eventfd2_01.c
	testcases/kernel/syscalls/eventfd2/eventfd2_02.c
	testcases/kernel/syscalls/execl/execl01.c
	testcases/kernel/syscalls/execle/execle01.c
	testcases/kernel/syscalls/execlp/execlp01.c
	testcases/kernel/syscalls/execv/execv01.c
	testcases/kernel/syscalls/execve/execve01.c
	testcases/kernel/syscalls/execve/execve02.c
	testcases/kernel/syscalls/execve/execve03.c
	testcases/kernel/syscalls/execve/execve04.c
	testcases/kernel/syscalls/execve/execve05.c
	testcases/kernel/syscalls/execvp/execvp01.c
	testcases/kernel/syscalls/exit/exit02.c
	testcases/kernel/syscalls/exit_group/exit_group01.c
	testcases/kernel/syscalls/faccessat/faccessat01.c
	testcases/kernel/syscalls/fadvise/posix_fadvise01.c
	testcases/kernel/syscalls/fadvise/posix_fadvise02.c
	testcases/kernel/syscalls/fadvise/posix_fadvise03.c
	testcases/kernel/syscalls/fadvise/posix_fadvise04.c
	testcases/kernel/syscalls/fallocate/fallocate01.c
	testcases/kernel/syscalls/fallocate/fallocate02.c
	testcases/kernel/syscalls/fallocate/fallocate03.c
	testcases/kernel/syscalls/fchdir/fchdir01.c
	testcases/kernel/syscalls/fchdir/fchdir02.c
	testcases/kernel/syscalls/fchdir/fchdir03.c
	testcases/kernel/syscalls/fchmod/fchmod01.c
	testcases/kernel/syscalls/fchmod/fchmod02.c
	testcases/kernel/syscalls/fchmod/fchmod03.c
	testcases/kernel/syscalls/fchmod/fchmod04.c
	testcases/kernel/syscalls/fchmod/fchmod05.c
	testcases/kernel/syscalls/fchmod/fchmod06.c
	testcases/kernel/syscalls/fchmod/fchmod07.c
	testcases/kernel/syscalls/fchmodat/fchmodat01.c
	testcases/kernel/syscalls/fchown/fchown01.c
	testcases/kernel/syscalls/fchown/fchown02.c
	testcases/kernel/syscalls/fchown/fchown03.c
	testcases/kernel/syscalls/fchown/fchown04.c
	testcases/kernel/syscalls/fchown/fchown05.c
	testcases/kernel/syscalls/fchownat/fchownat01.c
	testcases/kernel/syscalls/fcntl/fcntl01.c
	testcases/kernel/syscalls/fcntl/fcntl02.c
	testcases/kernel/syscalls/fcntl/fcntl03.c
	testcases/kernel/syscalls/fcntl/fcntl04.c
	testcases/kernel/syscalls/fcntl/fcntl05.c
	testcases/kernel/syscalls/fcntl/fcntl06.c
	testcases/kernel/syscalls/fcntl/fcntl09.c
	testcases/kernel/syscalls/fcntl/fcntl10.c
	testcases/kernel/syscalls/fcntl/fcntl11.c
	testcases/kernel/syscalls/fcntl/fcntl12.c
	testcases/kernel/syscalls/fcntl/fcntl13.c
	testcases/kernel/syscalls/fcntl/fcntl14.c
	testcases/kernel/syscalls/fcntl/fcntl15.c
	testcases/kernel/syscalls/fcntl/fcntl16.c
	testcases/kernel/syscalls/fcntl/fcntl17.c
	testcases/kernel/syscalls/fcntl/fcntl18.c
	testcases/kernel/syscalls/fcntl/fcntl19.c
	testcases/kernel/syscalls/fcntl/fcntl20.c
	testcases/kernel/syscalls/fcntl/fcntl21.c
	testcases/kernel/syscalls/fcntl/fcntl22.c
	testcases/kernel/syscalls/fcntl/fcntl23.c
	testcases/kernel/syscalls/fcntl/fcntl24.c
	testcases/kernel/syscalls/fcntl/fcntl25.c
	testcases/kernel/syscalls/fcntl/fcntl26.c
	testcases/kernel/syscalls/fcntl/fcntl27.c
	testcases/kernel/syscalls/fcntl/fcntl28.c
	testcases/kernel/syscalls/fork/fork01.c
	testcases/kernel/syscalls/fork/fork02.c
	testcases/kernel/syscalls/fork/fork03.c
	testcases/kernel/syscalls/fork/fork06.c
	testcases/kernel/syscalls/fork/fork07.c
	testcases/kernel/syscalls/fork/fork08.c
	testcases/kernel/syscalls/fork/fork09.c
	testcases/kernel/syscalls/fork/fork10.c
	testcases/kernel/syscalls/fork/fork11.c
	testcases/kernel/syscalls/fork/fork12.c
	testcases/kernel/syscalls/fstat/fstat01.c
	testcases/kernel/syscalls/fstat/fstat02.c
	testcases/kernel/syscalls/fstat/fstat03.c
	testcases/kernel/syscalls/fstat/fstat04.c
	testcases/kernel/syscalls/fstat/fstat05.c
	testcases/kernel/syscalls/fstatat/fstatat01.c
	testcases/kernel/syscalls/fstatfs/fstatfs01.c
	testcases/kernel/syscalls/fstatfs/fstatfs02.c
	testcases/kernel/syscalls/fsync/fsync01.c
	testcases/kernel/syscalls/fsync/fsync02.c
	testcases/kernel/syscalls/fsync/fsync03.c
	testcases/kernel/syscalls/ftruncate/ftruncate01.c
	testcases/kernel/syscalls/ftruncate/ftruncate02.c
	testcases/kernel/syscalls/futimesat/futimesat01.c
	testcases/kernel/syscalls/get_mempolicy/get_mempolicy01.c
	testcases/kernel/syscalls/get_robust_list/get_robust_list01.c
	testcases/kernel/syscalls/getcontext/getcontext01.c
	testcases/kernel/syscalls/getcpu/getcpu01.c
	testcases/kernel/syscalls/getcwd/getcwd01.c
	testcases/kernel/syscalls/getcwd/getcwd02.c
	testcases/kernel/syscalls/getcwd/getcwd03.c
	testcases/kernel/syscalls/getdents/getdents01.c
	testcases/kernel/syscalls/getdents/getdents02.c
	testcases/kernel/syscalls/getdents/getdents03.c
	testcases/kernel/syscalls/getdents/getdents04.c
	testcases/kernel/syscalls/getdomainname/getdomainname01.c
	testcases/kernel/syscalls/getegid/getegid01.c
	testcases/kernel/syscalls/getegid/getegid02.c
	testcases/kernel/syscalls/geteuid/geteuid01.c
	testcases/kernel/syscalls/getgid/getgid01.c
	testcases/kernel/syscalls/getgid/getgid03.c
	testcases/kernel/syscalls/getgroups/getgroups02.c
	testcases/kernel/syscalls/getgroups/getgroups03.c
	testcases/kernel/syscalls/getgroups/getgroups04.c
	testcases/kernel/syscalls/gethostid/gethostid01.c
	testcases/kernel/syscalls/gethostname/gethostname01.c
	testcases/kernel/syscalls/getitimer/getitimer01.c
	testcases/kernel/syscalls/getitimer/getitimer02.c
	testcases/kernel/syscalls/getitimer/getitimer03.c
	testcases/kernel/syscalls/getpagesize/getpagesize01.c
	testcases/kernel/syscalls/getpeername/getpeername01.c
	testcases/kernel/syscalls/getpgid/getpgid01.c
	testcases/kernel/syscalls/getpgid/getpgid02.c
	testcases/kernel/syscalls/getpgrp/getpgrp01.c
	testcases/kernel/syscalls/getpid/getpid01.c
	testcases/kernel/syscalls/getpid/getpid02.c
	testcases/kernel/syscalls/getppid/getppid01.c
	testcases/kernel/syscalls/getppid/getppid02.c
	testcases/kernel/syscalls/getpriority/getpriority01.c
	testcases/kernel/syscalls/getpriority/getpriority02.c
	testcases/kernel/syscalls/getresgid/getresgid01.c
	testcases/kernel/syscalls/getresgid/getresgid02.c
	testcases/kernel/syscalls/getresgid/getresgid03.c
	testcases/kernel/syscalls/getresuid/getresuid01.c
	testcases/kernel/syscalls/getresuid/getresuid02.c
	testcases/kernel/syscalls/getresuid/getresuid03.c
	testcases/kernel/syscalls/getrusage/getrusage01.c
	testcases/kernel/syscalls/getrusage/getrusage02.c
	testcases/kernel/syscalls/getsid/getsid01.c
	testcases/kernel/syscalls/getsid/getsid02.c
	testcases/kernel/syscalls/getsockname/getsockname01.c
	testcases/kernel/syscalls/getsockopt/getsockopt01.c
	testcases/kernel/syscalls/gettid/gettid01.c
	testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
	testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
	testcases/kernel/syscalls/getuid/getuid01.c
	testcases/kernel/syscalls/getuid/getuid02.c
	testcases/kernel/syscalls/inotify/inotify01.c
	testcases/kernel/syscalls/inotify/inotify02.c
	testcases/kernel/syscalls/inotify/inotify03.c
	testcases/kernel/syscalls/inotify_init/inotify_init1_01.c
	testcases/kernel/syscalls/inotify_init/inotify_init1_02.c
	testcases/kernel/syscalls/io_cancel/io_cancel01.c
	testcases/kernel/syscalls/io_destroy/io_destroy01.c
	testcases/kernel/syscalls/io_getevents/io_getevents01.c
	testcases/kernel/syscalls/io_setup/io_setup01.c
	testcases/kernel/syscalls/io_submit/io_submit01.c
	testcases/kernel/syscalls/ioctl/ioctl01.c
	testcases/kernel/syscalls/ioctl/ioctl02.c
	testcases/kernel/syscalls/ioperm/ioperm01.c
	testcases/kernel/syscalls/ioperm/ioperm02.c
	testcases/kernel/syscalls/iopl/iopl01.c
	testcases/kernel/syscalls/iopl/iopl02.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl01.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl02.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl03.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl04.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl05.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl08.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl09.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl10.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl11.c
	testcases/kernel/syscalls/ipc/msgget/msgget01.c
	testcases/kernel/syscalls/ipc/msgget/msgget02.c
	testcases/kernel/syscalls/ipc/msgget/msgget03.c
	testcases/kernel/syscalls/ipc/msgget/msgget04.c
	testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c
	testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
	testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c
	testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c
	testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c
	testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c
	testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c
	testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c
	testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c
	testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c
	testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c
	testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c
	testcases/kernel/syscalls/ipc/semctl/semctl01.c
	testcases/kernel/syscalls/ipc/semctl/semctl02.c
	testcases/kernel/syscalls/ipc/semctl/semctl03.c
	testcases/kernel/syscalls/ipc/semctl/semctl04.c
	testcases/kernel/syscalls/ipc/semctl/semctl05.c
	testcases/kernel/syscalls/ipc/semctl/semctl06.c
	testcases/kernel/syscalls/ipc/semget/semget01.c
	testcases/kernel/syscalls/ipc/semget/semget02.c
	testcases/kernel/syscalls/ipc/semget/semget03.c
	testcases/kernel/syscalls/ipc/semget/semget05.c
	testcases/kernel/syscalls/ipc/semget/semget06.c
	testcases/kernel/syscalls/ipc/semop/semop01.c
	testcases/kernel/syscalls/ipc/semop/semop02.c
	testcases/kernel/syscalls/ipc/semop/semop03.c
	testcases/kernel/syscalls/ipc/semop/semop04.c
	testcases/kernel/syscalls/ipc/semop/semop05.c
	testcases/kernel/syscalls/ipc/shmat/shmat01.c
	testcases/kernel/syscalls/ipc/shmat/shmat02.c
	testcases/kernel/syscalls/ipc/shmat/shmat03.c
	testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
	testcases/kernel/syscalls/ipc/shmctl/shmctl02.c
	testcases/kernel/syscalls/ipc/shmctl/shmctl03.c
	testcases/kernel/syscalls/ipc/shmctl/shmctl04.c
	testcases/kernel/syscalls/ipc/shmdt/shmdt01.c
	testcases/kernel/syscalls/ipc/shmdt/shmdt02.c
	testcases/kernel/syscalls/ipc/shmget/shmget01.c
	testcases/kernel/syscalls/ipc/shmget/shmget02.c
	testcases/kernel/syscalls/ipc/shmget/shmget03.c
	testcases/kernel/syscalls/ipc/shmget/shmget04.c
	testcases/kernel/syscalls/ipc/shmget/shmget05.c
	testcases/kernel/syscalls/keyctl/keyctl01.c
	testcases/kernel/syscalls/kill/kill01.c
	testcases/kernel/syscalls/kill/kill03.c
	testcases/kernel/syscalls/kill/kill04.c
	testcases/kernel/syscalls/kill/kill05.c
	testcases/kernel/syscalls/kill/kill06.c
	testcases/kernel/syscalls/kill/kill07.c
	testcases/kernel/syscalls/kill/kill08.c
	testcases/kernel/syscalls/kill/kill11.c
	testcases/kernel/syscalls/lchown/lchown01.c
	testcases/kernel/syscalls/lchown/lchown02.c
	testcases/kernel/syscalls/linkat/linkat01.c
	testcases/kernel/syscalls/listen/listen01.c
	testcases/kernel/syscalls/llseek/llseek01.c
	testcases/kernel/syscalls/llseek/llseek02.c
	testcases/kernel/syscalls/lseek/lseek06.c
	testcases/kernel/syscalls/lseek/lseek07.c
	testcases/kernel/syscalls/lseek/lseek08.c
	testcases/kernel/syscalls/lseek/lseek09.c
	testcases/kernel/syscalls/lseek/lseek10.c
	testcases/kernel/syscalls/lstat/lstat01.c
	testcases/kernel/syscalls/lstat/lstat02.c
	testcases/kernel/syscalls/lstat/lstat03.c
	testcases/kernel/syscalls/mbind/mbind01.c
	testcases/kernel/syscalls/mkdir/mkdir01.c
	testcases/kernel/syscalls/mkdir/mkdir02.c
	testcases/kernel/syscalls/mkdir/mkdir03.c
	testcases/kernel/syscalls/mkdir/mkdir04.c
	testcases/kernel/syscalls/mkdir/mkdir05.c
	testcases/kernel/syscalls/mkdir/mkdir08.c
	testcases/kernel/syscalls/mkdirat/mkdirat01.c
	testcases/kernel/syscalls/mknod/mknod02.c
	testcases/kernel/syscalls/mknod/mknod03.c
	testcases/kernel/syscalls/mknod/mknod04.c
	testcases/kernel/syscalls/mknod/mknod05.c
	testcases/kernel/syscalls/mknod/mknod06.c
	testcases/kernel/syscalls/mknod/mknod07.c
	testcases/kernel/syscalls/mknod/mknod08.c
	testcases/kernel/syscalls/mknod/mknod09.c
	testcases/kernel/syscalls/mknodat/mknodat01.c
	testcases/kernel/syscalls/mmap/mmap001.c
	testcases/kernel/syscalls/mmap/mmap01.c
	testcases/kernel/syscalls/mmap/mmap02.c
	testcases/kernel/syscalls/mmap/mmap03.c
	testcases/kernel/syscalls/mmap/mmap04.c
	testcases/kernel/syscalls/mmap/mmap05.c
	testcases/kernel/syscalls/mmap/mmap06.c
	testcases/kernel/syscalls/mmap/mmap07.c
	testcases/kernel/syscalls/mmap/mmap08.c
	testcases/kernel/syscalls/mmap/mmap09.c
	testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
	testcases/kernel/syscalls/modify_ldt/modify_ldt02.c
	testcases/kernel/syscalls/mount/mount01.c
	testcases/kernel/syscalls/mount/mount02.c
	testcases/kernel/syscalls/mount/mount03.c
	testcases/kernel/syscalls/mprotect/mprotect01.c
	testcases/kernel/syscalls/mprotect/mprotect02.c
	testcases/kernel/syscalls/mprotect/mprotect03.c
	testcases/kernel/syscalls/mq_notify/mq_notify01.c
	testcases/kernel/syscalls/mq_open/mq_open01.c
	testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c
	testcases/kernel/syscalls/mq_timedsend/mq_timedsend01.c
	testcases/kernel/syscalls/mq_unlink/mq_unlink01.c
	testcases/kernel/syscalls/mremap/mremap01.c
	testcases/kernel/syscalls/mremap/mremap02.c
	testcases/kernel/syscalls/mremap/mremap03.c
	testcases/kernel/syscalls/mremap/mremap04.c
	testcases/kernel/syscalls/msync/msync01.c
	testcases/kernel/syscalls/msync/msync02.c
	testcases/kernel/syscalls/msync/msync03.c
	testcases/kernel/syscalls/msync/msync04.c
	testcases/kernel/syscalls/msync/msync05.c
	testcases/kernel/syscalls/munmap/munmap01.c
	testcases/kernel/syscalls/munmap/munmap02.c
	testcases/kernel/syscalls/munmap/munmap03.c
	testcases/kernel/syscalls/nanosleep/nanosleep01.c
	testcases/kernel/syscalls/nanosleep/nanosleep02.c
	testcases/kernel/syscalls/nanosleep/nanosleep03.c
	testcases/kernel/syscalls/nanosleep/nanosleep04.c
	testcases/kernel/syscalls/newuname/newuname01.c
	testcases/kernel/syscalls/nice/nice01.c
	testcases/kernel/syscalls/nice/nice02.c
	testcases/kernel/syscalls/nice/nice03.c
	testcases/kernel/syscalls/nice/nice04.c
	testcases/kernel/syscalls/open/open01.c
	testcases/kernel/syscalls/open/open02.c
	testcases/kernel/syscalls/open/open03.c
	testcases/kernel/syscalls/open/open04.c
	testcases/kernel/syscalls/open/open05.c
	testcases/kernel/syscalls/open/open06.c
	testcases/kernel/syscalls/open/open07.c
	testcases/kernel/syscalls/open/open08.c
	testcases/kernel/syscalls/open/open10.c
	testcases/kernel/syscalls/openat/openat01.c
	testcases/kernel/syscalls/pathconf/pathconf01.c
	testcases/kernel/syscalls/pause/pause01.c
	testcases/kernel/syscalls/pause/pause02.c
	testcases/kernel/syscalls/pause/pause03.c
	testcases/kernel/syscalls/personality/personality01.c
	testcases/kernel/syscalls/personality/personality02.c
	testcases/kernel/syscalls/pipe/pipe01.c
	testcases/kernel/syscalls/pipe/pipe02.c
	testcases/kernel/syscalls/pipe/pipe03.c
	testcases/kernel/syscalls/pipe/pipe04.c
	testcases/kernel/syscalls/pipe/pipe05.c
	testcases/kernel/syscalls/pipe/pipe06.c
	testcases/kernel/syscalls/pipe/pipe07.c
	testcases/kernel/syscalls/pipe/pipe08.c
	testcases/kernel/syscalls/pipe/pipe09.c
	testcases/kernel/syscalls/pipe/pipe10.c
	testcases/kernel/syscalls/pipe/pipe11.c
	testcases/kernel/syscalls/pipe2/pipe2_01.c
	testcases/kernel/syscalls/pipe2/pipe2_02.c
	testcases/kernel/syscalls/poll/poll01.c
	testcases/kernel/syscalls/prctl/prctl01.c
	testcases/kernel/syscalls/prctl/prctl02.c
	testcases/kernel/syscalls/pread/pread01.c
	testcases/kernel/syscalls/pread/pread02.c
	testcases/kernel/syscalls/pread/pread03.c
	testcases/kernel/syscalls/ptrace/ptrace01.c
	testcases/kernel/syscalls/ptrace/ptrace02.c
	testcases/kernel/syscalls/ptrace/ptrace03.c
	testcases/kernel/syscalls/pwrite/pwrite01.c
	testcases/kernel/syscalls/pwrite/pwrite02.c
	testcases/kernel/syscalls/pwrite/pwrite03.c
	testcases/kernel/syscalls/read/read01.c
	testcases/kernel/syscalls/read/read02.c
	testcases/kernel/syscalls/read/read03.c
	testcases/kernel/syscalls/read/read04.c
	testcases/kernel/syscalls/readdir/readdir02.c
	testcases/kernel/syscalls/readlink/readlink01.c
	testcases/kernel/syscalls/readlink/readlink02.c
	testcases/kernel/syscalls/readlink/readlink03.c
	testcases/kernel/syscalls/readlink/readlink04.c
	testcases/kernel/syscalls/readlinkat/readlinkat01.c
	testcases/kernel/syscalls/readv/readv01.c
	testcases/kernel/syscalls/readv/readv02.c
	testcases/kernel/syscalls/readv/readv03.c
	testcases/kernel/syscalls/reboot/reboot01.c
	testcases/kernel/syscalls/reboot/reboot02.c
	testcases/kernel/syscalls/recv/recv01.c
	testcases/kernel/syscalls/recvfrom/recvfrom01.c
	testcases/kernel/syscalls/recvmsg/recvmsg01.c
	testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c
	testcases/kernel/syscalls/remap_file_pages/remap_file_pages02.c
	testcases/kernel/syscalls/rename/rename01.c
	testcases/kernel/syscalls/rename/rename02.c
	testcases/kernel/syscalls/rename/rename03.c
	testcases/kernel/syscalls/rename/rename04.c
	testcases/kernel/syscalls/rename/rename05.c
	testcases/kernel/syscalls/rename/rename06.c
	testcases/kernel/syscalls/rename/rename07.c
	testcases/kernel/syscalls/rename/rename08.c
	testcases/kernel/syscalls/rename/rename09.c
	testcases/kernel/syscalls/rename/rename10.c
	testcases/kernel/syscalls/rename/rename12.c
	testcases/kernel/syscalls/rename/rename13.c
	testcases/kernel/syscalls/rename/rename14.c
	testcases/kernel/syscalls/renameat/renameat01.c
	testcases/kernel/syscalls/rmdir/rmdir01.c
	testcases/kernel/syscalls/rmdir/rmdir02.c
	testcases/kernel/syscalls/rmdir/rmdir03.c
	testcases/kernel/syscalls/rmdir/rmdir04.c
	testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
	testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
	testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
	testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c
	testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c
	testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c
	testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c
	testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c
	testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min01.c
	testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min02.c
	testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c
	testcases/kernel/syscalls/sched_getparam/sched_getparam01.c
	testcases/kernel/syscalls/sched_getparam/sched_getparam02.c
	testcases/kernel/syscalls/sched_getparam/sched_getparam03.c
	testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c
	testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c
	testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c
	testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c
	testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c
	testcases/kernel/syscalls/sched_setparam/sched_setparam01.c
	testcases/kernel/syscalls/sched_setparam/sched_setparam02.c
	testcases/kernel/syscalls/sched_setparam/sched_setparam03.c
	testcases/kernel/syscalls/sched_setparam/sched_setparam04.c
	testcases/kernel/syscalls/sched_setparam/sched_setparam05.c
	testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c
	testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c
	testcases/kernel/syscalls/sched_yield/sched_yield01.c
	testcases/kernel/syscalls/send/send01.c
	testcases/kernel/syscalls/sendfile/sendfile02.c
	testcases/kernel/syscalls/sendfile/sendfile03.c
	testcases/kernel/syscalls/sendfile/sendfile04.c
	testcases/kernel/syscalls/sendfile/sendfile05.c
	testcases/kernel/syscalls/sendfile/sendfile06.c
	testcases/kernel/syscalls/sendfile/sendfile07.c
	testcases/kernel/syscalls/sendmsg/sendmsg01.c
	testcases/kernel/syscalls/sendto/sendto01.c
	testcases/kernel/syscalls/set_robust_list/set_robust_list01.c
	testcases/kernel/syscalls/set_thread_area/set_thread_area01.c
	testcases/kernel/syscalls/set_thread_area/set_thread_area02.c
	testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
	testcases/kernel/syscalls/setdomainname/setdomainname02.c
	testcases/kernel/syscalls/setdomainname/setdomainname03.c
	testcases/kernel/syscalls/setfsgid/setfsgid01.c
	testcases/kernel/syscalls/setfsgid/setfsgid02.c
	testcases/kernel/syscalls/setfsgid/setfsgid03.c
	testcases/kernel/syscalls/setfsuid/setfsuid01.c
	testcases/kernel/syscalls/setfsuid/setfsuid02.c
	testcases/kernel/syscalls/setfsuid/setfsuid03.c
	testcases/kernel/syscalls/setfsuid/setfsuid04.c
	testcases/kernel/syscalls/setgid/setgid01.c
	testcases/kernel/syscalls/setgid/setgid02.c
	testcases/kernel/syscalls/setgid/setgid03.c
	testcases/kernel/syscalls/setgroups/setgroups02.c
	testcases/kernel/syscalls/setgroups/setgroups03.c
	testcases/kernel/syscalls/setgroups/setgroups04.c
	testcases/kernel/syscalls/setitimer/setitimer01.c
	testcases/kernel/syscalls/setitimer/setitimer02.c
	testcases/kernel/syscalls/setitimer/setitimer03.c
	testcases/kernel/syscalls/setpgid/setpgid01.c
	testcases/kernel/syscalls/setpgid/setpgid02.c
	testcases/kernel/syscalls/setpgid/setpgid03.c
	testcases/kernel/syscalls/setpgrp/setpgrp02.c
	testcases/kernel/syscalls/setpriority/setpriority01.c
	testcases/kernel/syscalls/setpriority/setpriority02.c
	testcases/kernel/syscalls/setpriority/setpriority03.c
	testcases/kernel/syscalls/setpriority/setpriority04.c
	testcases/kernel/syscalls/setpriority/setpriority05.c
	testcases/kernel/syscalls/setregid/setregid01.c
	testcases/kernel/syscalls/setregid/setregid02.c
	testcases/kernel/syscalls/setregid/setregid03.c
	testcases/kernel/syscalls/setregid/setregid04.c
	testcases/kernel/syscalls/setresuid/setresuid04.c
	testcases/kernel/syscalls/setreuid/setreuid01.c
	testcases/kernel/syscalls/setreuid/setreuid07.c
	testcases/kernel/syscalls/setrlimit/setrlimit01.c
	testcases/kernel/syscalls/setrlimit/setrlimit02.c
	testcases/kernel/syscalls/setrlimit/setrlimit03.c
	testcases/kernel/syscalls/setsid/setsid01.c
	testcases/kernel/syscalls/setsockopt/setsockopt01.c
	testcases/kernel/syscalls/setuid/setuid02.c
	testcases/kernel/syscalls/setuid/setuid03.c
	testcases/kernel/syscalls/setuid/setuid04.c
	testcases/kernel/syscalls/sgetmask/sgetmask01.c
	testcases/kernel/syscalls/sigaction/sigaction01.c
	testcases/kernel/syscalls/sigaction/sigaction02.c
	testcases/kernel/syscalls/sigaltstack/sigaltstack01.c
	testcases/kernel/syscalls/sigaltstack/sigaltstack02.c
	testcases/kernel/syscalls/signal/signal02.c
	testcases/kernel/syscalls/signal/signal03.c
	testcases/kernel/syscalls/signal/signal04.c
	testcases/kernel/syscalls/signal/signal05.c
	testcases/kernel/syscalls/signalfd4/signalfd4_01.c
	testcases/kernel/syscalls/signalfd4/signalfd4_02.c
	testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
	testcases/kernel/syscalls/sigsuspend/sigsuspend01.c
	testcases/kernel/syscalls/socket/socket01.c
	testcases/kernel/syscalls/socket/socket02.c
	testcases/kernel/syscalls/socket/socket03.c
	testcases/kernel/syscalls/socketpair/socketpair01.c
	testcases/kernel/syscalls/socketpair/socketpair02.c
	testcases/kernel/syscalls/sockioctl/sockioctl01.c
	testcases/kernel/syscalls/splice/splice02.c
	testcases/kernel/syscalls/ssetmask/ssetmask01.c
	testcases/kernel/syscalls/stat/stat01.c
	testcases/kernel/syscalls/stat/stat02.c
	testcases/kernel/syscalls/stat/stat03.c
	testcases/kernel/syscalls/stat/stat05.c
	testcases/kernel/syscalls/statfs/statfs01.c
	testcases/kernel/syscalls/statfs/statfs02.c
	testcases/kernel/syscalls/statfs/statfs03.c
	testcases/kernel/syscalls/statvfs/statvfs01.c
	testcases/kernel/syscalls/stime/stime01.c
	testcases/kernel/syscalls/stime/stime02.c
	testcases/kernel/syscalls/swapoff/swapoff01.c
	testcases/kernel/syscalls/swapoff/swapoff02.c
	testcases/kernel/syscalls/swapon/swapon01.c
	testcases/kernel/syscalls/swapon/swapon02.c
	testcases/kernel/syscalls/swapon/swapon03.c
	testcases/kernel/syscalls/symlink/symlink02.c
	testcases/kernel/syscalls/symlink/symlink03.c
	testcases/kernel/syscalls/symlink/symlink04.c
	testcases/kernel/syscalls/symlink/symlink05.c
	testcases/kernel/syscalls/symlinkat/symlinkat01.c
	testcases/kernel/syscalls/sync/sync01.c
	testcases/kernel/syscalls/sync/sync02.c
	testcases/kernel/syscalls/sync_file_range/sync_file_range01.c
	testcases/kernel/syscalls/sysctl/sysctl01.c
	testcases/kernel/syscalls/sysctl/sysctl04.c
	testcases/kernel/syscalls/sysctl/sysctl05.c
	testcases/kernel/syscalls/sysinfo/sysinfo01.c
	testcases/kernel/syscalls/sysinfo/sysinfo02.c
	testcases/kernel/syscalls/tee/tee01.c
	testcases/kernel/syscalls/time/time01.c
	testcases/kernel/syscalls/time/time02.c
	testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
	testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
	testcases/kernel/syscalls/timerfd/timerfd02.c
	testcases/kernel/syscalls/timerfd/timerfd03.c
	testcases/kernel/syscalls/times/times01.c
	testcases/kernel/syscalls/tkill/tkill01.c
	testcases/kernel/syscalls/tkill/tkill02.c
	testcases/kernel/syscalls/truncate/truncate01.c
	testcases/kernel/syscalls/truncate/truncate02.c
	testcases/kernel/syscalls/truncate/truncate03.c
	testcases/kernel/syscalls/truncate/truncate04.c
	testcases/kernel/syscalls/umask/umask01.c
	testcases/kernel/syscalls/umask/umask03.c
	testcases/kernel/syscalls/uname/uname01.c
	testcases/kernel/syscalls/uname/uname02.c
	testcases/kernel/syscalls/uname/uname03.c
	testcases/kernel/syscalls/unlink/unlink05.c
	testcases/kernel/syscalls/unlinkat/unlinkat01.c
	testcases/kernel/syscalls/unshare/unshare01.c
	testcases/kernel/syscalls/unshare/unshare02.c
	testcases/kernel/syscalls/ustat/ustat01.c
	testcases/kernel/syscalls/ustat/ustat02.c
	testcases/kernel/syscalls/utime/utime01.c
	testcases/kernel/syscalls/utime/utime02.c
	testcases/kernel/syscalls/utime/utime03.c
	testcases/kernel/syscalls/utime/utime04.c
	testcases/kernel/syscalls/utime/utime05.c
	testcases/kernel/syscalls/utime/utime06.c
	testcases/kernel/syscalls/utimes/utimes01.c
	testcases/kernel/syscalls/vfork/vfork01.c
	testcases/kernel/syscalls/vfork/vfork02.c
	testcases/kernel/syscalls/vmsplice/vmsplice01.c
	testcases/kernel/syscalls/wait/wait02.c
	testcases/kernel/syscalls/wait4/wait401.c
	testcases/kernel/syscalls/wait4/wait402.c
	testcases/kernel/syscalls/waitid/waitid01.c
	testcases/kernel/syscalls/waitid/waitid02.c
	testcases/kernel/timers/clock_gettime/clock_gettime03.c
	testcases/kernel/timers/clock_settime/clock_settime03.c
	testcases/kernel/timers/timer_create/timer_create04.c
	testcases/misc/math/float/exp_log/genmodf.c
	testcases/misc/math/float/main.c
	testcases/network/sockets/ltpServer.c
	testcases/network/tcp_cmds/perf_lan/pingpong6.c
	testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-1.c
	testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-2.c
	testcases/open_posix_testsuite/conformance/interfaces/fork/2-1.c
	testcases/open_posix_testsuite/conformance/interfaces/munlockall/5-1.c
	testcases/open_posix_testsuite/conformance/interfaces/nanosleep/2-1.c
	testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c
	testcases/open_posix_testsuite/conformance/interfaces/pthread_sigmask/18-1.c
	testcases/open_posix_testsuite/conformance/interfaces/raise/2-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/4-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/5-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_rr_get_interval/3-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/2-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/2-2.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-5.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/9-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/1-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sem_close/3-2.c
	testcases/open_posix_testsuite/conformance/interfaces/sem_init/3-2.c
	testcases/open_posix_testsuite/conformance/interfaces/sigpending/1-3.c
	testcases/open_posix_testsuite/conformance/interfaces/sigwait/8-1.c
	testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-1.c
	testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-2.c
	testcases/open_posix_testsuite/stress/threads/fork/s-c1.c
	testcases/open_posix_testsuite/stress/threads/pthread_kill/stress.c
	testcases/open_posix_testsuite/stress/threads/sem_getvalue/stress.c

2 files changed, 8 insertions, 0 deletions

diff --git a/testcases/misc/math/float/exp_log/genmodf.c b/testcases/misc/math/float/exp_log/genmodf.c
index 034b271ea..9baac4068 100644
--- a/testcases/misc/math/float/exp_log/genmodf.c
+++ b/testcases/misc/math/float/exp_log/genmodf.c
@@ -63,7 +63,11 @@ int create_Result_file()
 		TestInputValue = ((Inc*i) + Inc);
 		tabR[i] = modf(TestInputValue, &tabRI[i]);
 		// tabR[i] = modf( ((Inc*i) + Inc), &tabRI[i]);
+<<<<<<< HEAD
 		if ((TestChkSum = tabR[i] + tabRI[i]) != TestInputValue)
+=======
+		if ( (TestChkSum = tabR[i] + tabRI[i]) != TestInputValue)
+>>>>>>> master
 		  {
 		    return -1;
 		  }
diff --git a/testcases/misc/math/float/main.c b/testcases/misc/math/float/main.c
index 0d0fd70a9..6f423d12b 100644
--- a/testcases/misc/math/float/main.c
+++ b/testcases/misc/math/float/main.c
@@ -286,7 +286,11 @@ finished:
 
 		/* test the result in TH_DATA : communication buffer */
 		pcom = * tabcour++; 
+<<<<<<< HEAD
 		if (pcom->th_result !=0) {
+=======
+		if (pcom->th_result !=0 ) {
+>>>>>>> master
 	           error++;
                    tst_resm(TFAIL, "thread %d (%s) terminated unsuccessfully %d errors/%d loops", th_num,pcom->th_func.fident,pcom->th_nerror,pcom->th_nloop);
                    tst_resm(TFAIL, "%s", pcom->detail_data);