Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754582AbcK1HWm (ORCPT ); Mon, 28 Nov 2016 02:22:42 -0500 Received: from terminus.zytor.com ([198.137.202.10]:33552 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754553AbcK1HW2 (ORCPT ); Mon, 28 Nov 2016 02:22:28 -0500 Date: Sun, 27 Nov 2016 23:21:57 -0800 From: tip-bot for Paul Bolle Message-ID: Cc: pebolle@tiscali.nl, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, peterz@infradead.org, mingo@kernel.org Reply-To: linux-kernel@vger.kernel.org, peterz@infradead.org, torvalds@linux-foundation.org, mingo@kernel.org, pebolle@tiscali.nl, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <1480077707-2837-1-git-send-email-pebolle@tiscali.nl> References: <1480077707-2837-1-git-send-email-pebolle@tiscali.nl> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/build] x86/build: Remove three unneeded genhdr-y entries Git-Commit-ID: 9190e21780dfeff524a67c6e7b806c8a9d496086 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 Content-Length: 2082 Lines: 60 Commit-ID: 9190e21780dfeff524a67c6e7b806c8a9d496086 Gitweb: http://git.kernel.org/tip/9190e21780dfeff524a67c6e7b806c8a9d496086 Author: Paul Bolle AuthorDate: Fri, 25 Nov 2016 13:41:47 +0100 Committer: Ingo Molnar CommitDate: Mon, 28 Nov 2016 07:49:17 +0100 x86/build: Remove three unneeded genhdr-y entries In x86's include/asm/Kbuild three entries are appended to the genhdr-y make variable: genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h The same entries are also appended to that variable in include/uapi/asm/Kbuild. So commit: 10b63956fce7 ("UAPI: Plumb the UAPI Kbuilds into the user header installation and checking") ... removed these three entries from include/asm/Kbuild. But, apparently, some merge conflict resolution re-added them. The net effect is, in short, that the genhdr-y make variable contains these file names twice and, as a consequence, that the corresponding headers get installed twice. And so the build prints: INSTALL usr/include/asm/ (65 files) ... while in reality only 62 files are installed in that directory. Nothing breaks because of all that, but it's a good idea to finally remove these unneeded entries nevertheless. Signed-off-by: Paul Bolle Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1480077707-2837-1-git-send-email-pebolle@tiscali.nl Signed-off-by: Ingo Molnar --- arch/x86/include/asm/Kbuild | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild index 2cfed17..2b892e2 100644 --- a/arch/x86/include/asm/Kbuild +++ b/arch/x86/include/asm/Kbuild @@ -6,10 +6,6 @@ generated-y += unistd_32_ia32.h generated-y += unistd_64_x32.h generated-y += xen-hypercalls.h -genhdr-y += unistd_32.h -genhdr-y += unistd_64.h -genhdr-y += unistd_x32.h - generic-y += clkdev.h generic-y += cputime.h generic-y += dma-contiguous.h