From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941833AbcJYQeW (ORCPT ); Tue, 25 Oct 2016 12:34:22 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40076 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941099AbcJYQeU (ORCPT ); Tue, 25 Oct 2016 12:34:20 -0400 Date: Tue, 25 Oct 2016 09:33:12 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: bp@alien8.de, peterz@infradead.org, hpa@zytor.com, torvalds@linux-foundation.org, luto@kernel.org, dvlasenk@redhat.com, bp@suse.de, mingo@kernel.org, jpoimboe@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, brgerst@gmail.com Reply-To: torvalds@linux-foundation.org, bp@alien8.de, peterz@infradead.org, hpa@zytor.com, luto@kernel.org, dvlasenk@redhat.com, bp@suse.de, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, jpoimboe@redhat.com, brgerst@gmail.com In-Reply-To: <20161025095522.11964-13-bp@alien8.de> References: <20161025095522.11964-13-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/microcode] x86/microcode: Bump driver version, update copyrights Git-Commit-ID: 14cfbe55c75ada9abd2d9cad97dafb4206c5f9e2 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 14cfbe55c75ada9abd2d9cad97dafb4206c5f9e2 Gitweb: http://git.kernel.org/tip/14cfbe55c75ada9abd2d9cad97dafb4206c5f9e2 Author: Borislav Petkov AuthorDate: Tue, 25 Oct 2016 11:55:22 +0200 Committer: Ingo Molnar CommitDate: Tue, 25 Oct 2016 12:28:59 +0200 x86/microcode: Bump driver version, update copyrights Let's increment that number finally: it is long overdue. Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20161025095522.11964-13-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/microcode/amd.c | 1 + arch/x86/kernel/cpu/microcode/core.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index 0dd8db1..6f353bd 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -5,6 +5,7 @@ * CPUs and later. * * Copyright (C) 2008-2011 Advanced Micro Devices Inc. + * 2013-2016 Borislav Petkov * * Author: Peter Oruba * diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index dd3d64f..6996413 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -3,7 +3,7 @@ * * Copyright (C) 2000-2006 Tigran Aivazian * 2006 Shaohua Li - * 2013-2015 Borislav Petkov + * 2013-2016 Borislav Petkov * * X86 CPU microcode early update for Linux: * @@ -41,7 +41,7 @@ #include #include -#define MICROCODE_VERSION "2.01" +#define DRIVER_VERSION "2.2" static struct microcode_ops *microcode_ops; static bool dis_ucode_ldr; @@ -703,7 +703,7 @@ int __init microcode_init(void) cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/microcode:online", mc_cpu_online, mc_cpu_down_prep); - pr_info("Microcode Update Driver: v%s.", MICROCODE_VERSION); + pr_info("Microcode Update Driver: v%s.", DRIVER_VERSION); return 0;