Merge branch 'linus' into tracing/core

Merge reason: merge latest tracing fixes to avoid conflicts in
              kernel/trace/trace_events_filter.c with upcoming change

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index 12f436951bff..77f79d26b264 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -318,8 +318,9 @@ static int do_drive_set_taskfiles(ide_drive_t *drive,
 
                 /* convert GTF to taskfile */
                 memset(&cmd, 0, sizeof(cmd));
-                memcpy(&cmd.tf_array[7], gtf, REGS_PER_GTF);
-                cmd.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
+                memcpy(&cmd.tf.feature, gtf, REGS_PER_GTF);
+                cmd.valid.out.tf = IDE_VALID_OUT_TF | IDE_VALID_DEVICE;
+                cmd.valid.in.tf  = IDE_VALID_IN_TF  | IDE_VALID_DEVICE;
 
                 err = ide_no_data_taskfile(drive, &cmd);
                 if (err) {