From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752224AbdIMKKt (ORCPT ); Wed, 13 Sep 2017 06:10:49 -0400 Received: from terminus.zytor.com ([65.50.211.136]:58675 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751543AbdIMKKr (ORCPT ); Wed, 13 Sep 2017 06:10:47 -0400 Date: Wed, 13 Sep 2017 03:07:14 -0700 From: tip-bot for Vitaly Kuznetsov Message-ID: Cc: linux-kernel@vger.kernel.org, vkuznets@redhat.com, haiyangz@microsoft.com, torvalds@linux-foundation.org, kys@microsoft.com, sthemmin@microsoft.com, hpa@zytor.com, peterz@infradead.org, tglx@linutronix.de, mingo@kernel.org Reply-To: sthemmin@microsoft.com, hpa@zytor.com, kys@microsoft.com, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, vkuznets@redhat.com, torvalds@linux-foundation.org, haiyangz@microsoft.com In-Reply-To: <20170911150620.3998-1-vkuznets@redhat.com> References: <20170911150620.3998-1-vkuznets@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/hyper-v: Remove duplicated HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition Git-Commit-ID: 1278f58cdee63cfbb04e5624474a291c81a7a13b 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: 1278f58cdee63cfbb04e5624474a291c81a7a13b Gitweb: http://git.kernel.org/tip/1278f58cdee63cfbb04e5624474a291c81a7a13b Author: Vitaly Kuznetsov AuthorDate: Mon, 11 Sep 2017 17:06:20 +0200 Committer: Ingo Molnar CommitDate: Wed, 13 Sep 2017 11:29:46 +0200 x86/hyper-v: Remove duplicated HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition Commits: 7dcf90e9e032 ("PCI: hv: Use vPCI protocol version 1.2") 628f54cc6451 ("x86/hyper-v: Support extended CPU ranges for TLB flush hypercalls") added the same definition and they came in through different trees. Fix the duplication. Signed-off-by: Vitaly Kuznetsov Cc: Haiyang Zhang Cc: K. Y. Srinivasan Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephen Hemminger Cc: Thomas Gleixner Cc: devel@linuxdriverproject.org Link: http://lkml.kernel.org/r/20170911150620.3998-1-vkuznets@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/include/uapi/asm/hyperv.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h index 7032f4d..f65d125 100644 --- a/arch/x86/include/uapi/asm/hyperv.h +++ b/arch/x86/include/uapi/asm/hyperv.h @@ -153,12 +153,6 @@ #define HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED (1 << 11) /* - * HV_VP_SET available - */ -#define HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED (1 << 11) - - -/* * Crash notification flag. */ #define HV_CRASH_CTL_CRASH_NOTIFY (1ULL << 63)