Fix upstream branch

[mirror_smartmontools-debian.git] / os_linux.cpp

diff --git a/os_linux.cpp b/os_linux.cpp
index 3440d4a0474178113447eda0e7a7b5ce540ccc0f..629792f52b272b52aed4940ff9cbbd97151d61d8 100644 (file)
--- a/os_linux.cpp
+++ b/os_linux.cpp
@@ -5,11 +5,7 @@
  *
  * Copyright (C) 2003-11 Bruce Allen
  * Copyright (C) 2003-11 Doug Gilbert <dgilbert@interlog.com>
-<<<<<<< HEAD
  * Copyright (C) 2008-16 Christian Franke
-=======
- * Copyright (C) 2008-15 Christian Franke <smartmontools-support@lists.sourceforge.net>
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
  *
  * Original AACRaid code:
  *  Copyright (C) 2014    Raghava Aditya <raghava.aditya@pmcs.com>
@@ -106,11 +102,7 @@
 
 #define ARGUSED(x) ((void)(x))
 
-<<<<<<< HEAD
 const char * os_linux_cpp_cvsid = "$Id: os_linux.cpp 4295 2016-04-15 20:01:32Z chrfranke $"
-=======
-const char * os_linux_cpp_cvsid = "$Id: os_linux.cpp 4047 2015-03-22 16:16:24Z chrfranke $"
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
   OS_LINUX_H_CVSID;
 extern unsigned char failuretest_permissive;
 
@@ -387,15 +379,9 @@ int linux_ata_device::ata_command_interface(smart_command_set command, int selec
     // copy user data into the task request structure
     memcpy(task+sizeof(ide_task_request_t), data, 512);
 
-<<<<<<< HEAD
     if (ioctl(get_fd(), HDIO_DRIVE_TASKFILE, task)) {
       if (errno==EINVAL)
         pout("Kernel lacks HDIO_DRIVE_TASKFILE support; compile kernel with CONFIG_IDE_TASK_IOCTL set\n");
-=======
-    if ((retval=ioctl(get_fd(), HDIO_DRIVE_TASKFILE, task))) {
-      if (errno==-EINVAL)
-        pout("Kernel lacks HDIO_DRIVE_TASKFILE support; compile kernel with CONFIG_IDE_TASKFILE_IO set\n");
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
       return -1;
     }
     return 0;
@@ -419,13 +405,8 @@ int linux_ata_device::ata_command_interface(smart_command_set command, int selec
     buff[4]=normal_lo;
     buff[5]=normal_hi;
 
-<<<<<<< HEAD
     if (ioctl(get_fd(), HDIO_DRIVE_TASK, buff)) {
       if (errno==EINVAL) {
-=======
-    if ((retval=ioctl(get_fd(), HDIO_DRIVE_TASK, buff))) {
-      if (errno==-EINVAL) {
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
         pout("Error SMART Status command via HDIO_DRIVE_TASK failed");
         pout("Rebuild older linux 2.2 kernels with HDIO_DRIVE_TASK support added\n");
       }