From patchwork Wed Aug 15 17:55:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10566729 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BF7FD913 for ; Wed, 15 Aug 2018 17:56:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A49692A80F for ; Wed, 15 Aug 2018 17:56:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 983872AAB4; Wed, 15 Aug 2018 17:56:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91A4A2A80F for ; Wed, 15 Aug 2018 17:56:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729586AbeHOUtM (ORCPT ); Wed, 15 Aug 2018 16:49:12 -0400 Received: from conssluserg-04.nifty.com ([210.131.2.83]:56955 "EHLO conssluserg-04.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729377AbeHOUtM (ORCPT ); Wed, 15 Aug 2018 16:49:12 -0400 Received: from mail-vk0-f44.google.com (mail-vk0-f44.google.com [209.85.213.44]) (authenticated) by conssluserg-04.nifty.com with ESMTP id w7FHtvdZ019579; Thu, 16 Aug 2018 02:55:57 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-04.nifty.com w7FHtvdZ019579 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1534355758; bh=gZuo4tNAiLLvjiCro5iwM/d1SzOKs1lDPW/a9RmIz6s=; h=From:Date:Subject:To:Cc:From; b=imn4bCPiivob2CwUROJyYyh7uTa9FQ8ktsP/EEaC/+N2vzK6QCiNWL29IASUKIYnp dWJ/lB/yKkJK852kJeyA76HERHaFaWZC+wUbEHkDOtyHCdXaHcncWghgbDvx9zsrDZ spU4yvoz93op9X6Z83OcCeny8IR84FYnfOFRppykm6zWKWPjKJ+fl08GicYjc/+RKq JVMaeziOOALoCv0SS1vpx4oxtn6lLsh8h6h57lZJjLSHYHCMOwqPGBoMrKQAlmxG3w epD1Pedl10uKUOF1tem4WEAqWZJKJ1BEYWyPIVgodZN4IQ2qNLkGTSHOPLfU51ApTp UvVSGdFMOQHUA== X-Nifty-SrcIP: [209.85.213.44] Received: by mail-vk0-f44.google.com with SMTP id y70-v6so69535vkc.0; Wed, 15 Aug 2018 10:55:57 -0700 (PDT) X-Gm-Message-State: AOUpUlHaxBZh8W3CWO/4ETFAmJSa9GSkHpN9LDkT0pv29bkPzxHQYEh9 QaX8bs9N/OZZTYbNxGDbRm8Jvw1DFqyIefWXG/0= X-Google-Smtp-Source: AA+uWPwlOJbeX19UXxm8RJcSst6B0TREp1F34+9iN8o3AEb/NIsVb2AYc5sWiGGTE5qUnHWYDsVeMraQELJSC3ICdQo= X-Received: by 2002:a1f:2cce:: with SMTP id s197-v6mr16628175vks.106.1534355756362; Wed, 15 Aug 2018 10:55:56 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:ab0:2642:0:0:0:0:0 with HTTP; Wed, 15 Aug 2018 10:55:15 -0700 (PDT) From: Masahiro Yamada Date: Thu, 16 Aug 2018 02:55:15 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: [GIT PULL 1/3] Kbuild updates for v4.19 To: Linus Torvalds Cc: Linux Kbuild mailing list , Linux Kernel Mailing List , masahiroy@kernel.org Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Linus, Please pull Kbuild updates for v4.19 You can pull this cleanly for now, but please remember that you will have to change samples/statx/Makefile when you pull the following commit: commit 90b413cb970a25109deb292c99120cf65e5b03ce Author: David Howells Date: Fri Aug 3 15:34:49 2018 +0100 vfs: syscall: Add fsinfo() to query filesystem information Kbuild consolidated host compiler flag variables, but the vfs tree added one more occurrence. Please fix-up the Makefile as follows: --------------------------------------------------------- ----------------------------------------------------------- The following changes since commit 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe: Linux 4.18-rc5 (2018-07-15 12:49:31 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git tags/kbuild-v4.19 for you to fetch changes up to 512ddf7d7db056edfed3159ea7cb4e4a5eefddd4: coccicheck: return proper error code on fail (2018-08-14 08:58:56 +0900) ---------------------------------------------------------------- Kbuild updates for v4.19 - verify depmod is installed before modules_install - support build salt in case build ids must be unique between builds - allow users to specify additional host compiler flags via HOST*FLAGS, and rename internal variables to KBUILD_HOST*FLAGS - update buildtar script to drop vax support, add arm64 support - update builddeb script for better debarch support - document the pit-fall of if_changed usage - fix parallel build of UML with O= option - make 'samples' target depend on headers_install to fix build errors - remove deprecated host-progs variable - add a new coccinelle script for refcount_t vs atomic_t check - improve double-test coccinelle script - misc cleanups and fixes ---------------------------------------------------------------- Ben Hutchings (12): builddeb: Skip architecture detection when KBUILD_DEBARCH is set builddeb: Change architecture detection fallback to use dpkg-architecture builddeb: Drop check for 32-bit s390 builddeb: Introduce functions to simplify kconfig tests in set_debarch builddeb: Add automatic support for ppc64 and powerpcspe architectures builddeb: Add automatic support for mips64el architecture builddeb: Add automatic support for mips{,64}r6{,el} architectures builddeb: Add automatic support for sparc64 architecture builddeb: Add automatic support for or1k architecture builddeb: Add automatic support for m68k architecture builddeb: Add automatic support for riscv* architectures builddeb: Add automatic support for sh{3,4}{,eb} architectures Denis Efremov (1): coccicheck: return proper error code on fail Dirk Gouders (1): kbuild: if_changed: document single use per target limitation Elena Reshetova (1): Coccinelle: add atomic_as_refcounter script Jeremy Cline (1): scripts: Add Python 3 support to tracing/draw_functrace.py Julia Lawall (1): Coccinelle: doubletest: reduce side effect false positives Laura Abbott (9): kbuild: Add build salt to the kernel and modules x86: Add build salt to the vDSO powerpc: Add build salt to the vDSO arm64: Add build salt to the vDSO kbuild: Rename HOSTCFLAGS to KBUILD_HOSTCFLAGS kbuild: Rename HOSTCXXFLAGS to KBUILD_HOSTCXXFLAGS kbuild: Rename HOSTLDFLAGS to KBUILD_HOSTLDFLAGS kbuild: Rename HOST_LOADLIBES to KBUILD_HOSTLDLIBS kbuild: Use HOST*FLAGS options from the command line Masahiro Yamada (12): kbuild: move bin2c back to scripts/ from scripts/basic/ um: remove redundant 'export LDFLAGS' in arch/x86/Makefile.um kbuild: remove redundant LDFLAGS clearing in arch/*/Makefile kbuild: replace $(LDFLAGS) $(ldflags-y) with $(ld_flags) kbuild: change ld_flags to contain LDFLAGS_$(@F) ARM: at91: remove unused duplicated filechk_offsets kbuild: do not redirect the first prerequisite for filechk um: fix parallel building with O= option kbuild: add %asm-generic to no-dot-config-targets um: clean up archheaders recipe kbuild: make samples really depend on headers_install kbuild: remove deprecated host-progs variable Olof Johansson (2): kbuild: buildtar: remove crufty vax pieces kbuild: buildtar: add arm64 support Randy Dunlap (1): kbuild: verify that $DEPMOD is installed Documentation/kbuild/kbuild.txt | 16 +++ Documentation/kbuild/makefiles.txt | 8 +- Documentation/process/changes.rst | 19 ++-- Makefile | 24 +++-- arch/alpha/boot/Makefile | 2 +- arch/arm/Makefile | 3 - arch/arm/mach-at91/Makefile | 25 ----- arch/arm64/kernel/vdso/note.S | 3 + arch/openrisc/Makefile | 1 - arch/powerpc/kernel/vdso32/note.S | 3 + arch/powerpc/purgatory/Makefile | 3 +- arch/riscv/Makefile | 1 - arch/s390/kernel/syscalls/Makefile | 6 +- arch/s390/purgatory/Makefile | 3 +- arch/um/Makefile | 11 +- arch/um/drivers/Makefile | 4 +- arch/x86/Makefile.um | 2 - arch/x86/entry/vdso/vdso-note.S | 3 + arch/x86/entry/vdso/vdso32/note.S | 3 + arch/x86/purgatory/Makefile | 3 +- arch/xtensa/boot/Makefile | 3 +- include/linux/build-salt.h | 20 ++++ init/Kconfig | 9 ++ init/version.c | 3 + kernel/Makefile | 2 +- net/bpfilter/Makefile | 4 +- samples/bpf/Makefile | 22 ++-- samples/seccomp/Makefile | 6 +- scripts/.gitignore | 1 + scripts/Kbuild.include | 4 +- scripts/Makefile | 5 +- scripts/Makefile.build | 7 -- scripts/Makefile.clean | 1 - scripts/Makefile.host | 24 ++--- scripts/Makefile.lib | 7 +- scripts/basic/.gitignore | 1 - scripts/basic/Makefile | 1 - scripts/{basic => }/bin2c.c | 0 scripts/coccicheck | 5 +- scripts/coccinelle/api/atomic_as_refcounter.cocci | 129 ++++++++++++++++++++++++ scripts/coccinelle/tests/doubletest.cocci | 34 +++++-- scripts/depmod.sh | 8 +- scripts/kconfig/Makefile | 8 +- scripts/mod/modpost.c | 3 + scripts/package/buildtar | 12 ++- scripts/package/mkdebian | 68 +++++++++---- scripts/tracing/draw_functrace.py | 2 +- security/tomoyo/Makefile | 2 +- tools/build/Build.include | 2 +- tools/build/Makefile | 2 +- tools/objtool/Makefile | 4 +- 51 files changed, 373 insertions(+), 169 deletions(-) create mode 100644 include/linux/build-salt.h rename scripts/{basic => }/bin2c.c (100%) create mode 100644 scripts/coccinelle/api/atomic_as_refcounter.cocci diff --git a/samples/statx/Makefile b/samples/statx/Makefile index 05b4d30cdd3c..6a862bbc0627 100644 --- a/samples/statx/Makefile +++ b/samples/statx/Makefile @@ -7,6 +7,6 @@ always := $(hostprogs-y) HOSTCFLAGS_test-statx.o += -I$(objtree)/usr/include HOSTCFLAGS_test-fsinfo.o += -I$(objtree)/usr/include -HOSTLOADLIBES_test-fsinfo += -lm +HOSTLDLIBS_test-fsinfo += -lm HOSTCFLAGS_test-fs-query.o += -I$(objtree)/usr/include From patchwork Wed Aug 15 17:57:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10566731 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 964B0913 for ; Wed, 15 Aug 2018 17:58:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 186FA29E66 for ; Wed, 15 Aug 2018 17:58:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 087A629E7D; Wed, 15 Aug 2018 17:58:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DFB929E66 for ; Wed, 15 Aug 2018 17:58:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729537AbeHOUvL (ORCPT ); Wed, 15 Aug 2018 16:51:11 -0400 Received: from conssluserg-04.nifty.com ([210.131.2.83]:58347 "EHLO conssluserg-04.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729424AbeHOUvL (ORCPT ); Wed, 15 Aug 2018 16:51:11 -0400 Received: from mail-ua1-f53.google.com (mail-ua1-f53.google.com [209.85.222.53]) (authenticated) by conssluserg-04.nifty.com with ESMTP id w7FHvvt3020161; Thu, 16 Aug 2018 02:57:57 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-04.nifty.com w7FHvvt3020161 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1534355878; bh=IWKF3o+R1CNaCp7rzIhNIc7OREDSEJv4y2V4318Jwd0=; h=From:Date:Subject:To:Cc:From; b=MA5EZ5y9cMF4nfa4yyKSgHdYtKwcyDMKZ60GKqfXewSAjO/kePnWUL1wvSskw+TfF 0TrIOa8aIYkI3mo2CCsAiz5ipbQfPRfwoSG9crKN5f3REP2kpNXIEzrtO13pK5dzH/ tuqz+XvUDrqFThscFdlyzJFcuNY6tV3mcEi94+6QiLG2WKN8b9tqt7V9l5+5iORa6C go9ga+oSOepxKgs+pMB5ZITOTeHu9iROHdnxtV7KfNZWeqSbGcWhRSTn2hFsAx6qCH k8tfP0feKApHSCoClpxwIlRk6Jvgn05t3Y8taixU3hQoBIpSy6qCk1sZ2yxQ69N8BB Dw+zwkFjRqXVA== X-Nifty-SrcIP: [209.85.222.53] Received: by mail-ua1-f53.google.com with SMTP id o11-v6so2092654uak.5; Wed, 15 Aug 2018 10:57:57 -0700 (PDT) X-Gm-Message-State: AOUpUlETU1zTw8earLCwFff1+V1OlcDOVzyc8NSeCJ0VROhn74YjAdka cHyj2dix9Qw0mqa7Pe5YtZpBExozgfOY2WfUM7g= X-Google-Smtp-Source: AA+uWPzXF4NcSiVrp49uS4GMqgWQGcnkQYQ0bfYomPGVBIOAjyAQKPLXq1+N6rKinZNuxJOf5g30A3eXN+d3drXdwRs= X-Received: by 2002:a9f:3d6e:: with SMTP id m46-v6mr17719215uai.17.1534355876503; Wed, 15 Aug 2018 10:57:56 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:ab0:2642:0:0:0:0:0 with HTTP; Wed, 15 Aug 2018 10:57:16 -0700 (PDT) From: Masahiro Yamada Date: Thu, 16 Aug 2018 02:57:16 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: [GIT PULL 2/3] Kconfig updates for v4.19 To: Linus Torvalds Cc: Linux Kbuild mailing list , Linux Kernel Mailing List , masahiroy@kernel.org Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Linus, Please pull Kconfig updates for v4.19 You will see a conflict in the top-level Makefile. Please fix it like follows. (it is also available in linux-next) --------------------------------------------------------------- diff --cc Makefile index cc4875d,f17dd99..a0650bf --- a/Makefile +++ b/Makefile @@@ -224,11 -224,14 +224,14 @@@ clean-targets := %clean mrproper cleand no-dot-config-targets := $(clean-targets) \ cscope gtags TAGS tags help% %docs check% coccicheck \ $(version_h) headers_% archheaders archscripts \ - kernelversion %src-pkg + %asm-generic kernelversion %src-pkg + no-sync-config-targets := $(no-dot-config-targets) install %install \ + kernelrelease - config-targets := 0 - mixed-targets := 0 - dot-config := 1 + config-targets := 0 + mixed-targets := 0 + dot-config := 1 + may-sync-config := 1 ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),) ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),) ---------------------------------------------------------- The following changes since commit 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe: Linux 4.18-rc5 (2018-07-15 12:49:31 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git tags/kconfig-v4.19 for you to fetch changes up to 1880861226c13ddd42c34ddd30c3b502b650fe29: kconfig: remove P_ENV property type (2018-08-14 09:01:47 +0900) ---------------------------------------------------------------- Kconfig updates for v4.19 - show clearer error messages where pkg-config is needed, but not installed - rename SYMBOL_AUTO to SYMBOL_NO_WRITE to reflect its semantics - create all necessary directories by Kconfig tool itself instead of Makefile - update the .config unconditionally when syncconfig is invoked - use 'include' directive instead of '-include' where include/config/{auto,tristate}.conf is mandatory - do not try to update the .config when running install targets - add .DELETE_ON_ERROR to delete partially updated files - misc cleanups and fixes ---------------------------------------------------------------- Dirk Gouders (2): kconfig: rename SYMBOL_AUTO to SYMBOL_NO_WRITE Kbuild: Makefile.modbuiltin: include auto.conf and tristate.conf mandatory Masahiro Yamada (15): kconfig: handle format string before calling conf_message_callback() kconfig: rename file_write_dep and move it to confdata.c kconfig: split out useful helpers in confdata.c kconfig: remove unneeded directory generation from local*config kconfig: create directories needed for syncconfig by itself kconfig: make syncconfig update .config regardless of sym_change_count kconfig: allow all config targets to write auto.conf if missing kbuild: use 'include' directive to load auto.conf from top Makefile kbuild: add .DELETE_ON_ERROR special target kbuild: do not update config when running install targets kbuild: do not update config for 'make kernelrelease' kbuild: remove auto.conf from prerequisite of phony targets kconfig: fix the rule of mainmenu_stmt symbol kconfig: remove unused sym_get_env_prop() function kconfig: remove P_ENV property type Randy Dunlap (2): kconfig: check for pkg-config on make {menu,n,g,x}config kconfig: fix typos in description of "choice" in kconfig-language.txt Rob Landley (1): init/Kconfig: Use short unix-style option instead of --longname Documentation/kbuild/kconfig-language.txt | 4 +- Documentation/process/changes.rst | 8 +++ Makefile | 44 +++++++----- init/Kconfig | 4 +- scripts/Kbuild.include | 3 + scripts/Makefile.modbuiltin | 4 +- scripts/kconfig/Makefile | 17 ++--- scripts/kconfig/check-pkgconfig.sh | 8 +++ scripts/kconfig/conf.c | 39 +++++----- scripts/kconfig/confdata.c | 156 ++++++++++++++++++++++++++++++++-------- scripts/kconfig/expr.h | 3 +- scripts/kconfig/gconf.c | 5 +- scripts/kconfig/lkc.h | 2 - scripts/kconfig/lkc_proto.h | 4 +- scripts/kconfig/mconf.c | 10 ++- scripts/kconfig/menu.c | 2 +- scripts/kconfig/nconf.c | 8 +-- scripts/kconfig/qconf.cc | 3 +- scripts/kconfig/symbol.c | 13 +--- scripts/kconfig/util.c | 30 -------- scripts/kconfig/zconf.y | 6 +- 21 files changed, 227 insertions(+), 146 deletions(-) create mode 100644 scripts/kconfig/check-pkgconfig.sh From patchwork Wed Aug 15 18:03:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10566737 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7BE4F1390 for ; Wed, 15 Aug 2018 18:04:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 617402ACA9 for ; Wed, 15 Aug 2018 18:04:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5509D2AD07; Wed, 15 Aug 2018 18:04:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC30F2ACA9 for ; Wed, 15 Aug 2018 18:04:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727865AbeHOU5l (ORCPT ); Wed, 15 Aug 2018 16:57:41 -0400 Received: from conssluserg-02.nifty.com ([210.131.2.81]:35590 "EHLO conssluserg-02.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725867AbeHOU5l (ORCPT ); Wed, 15 Aug 2018 16:57:41 -0400 Received: from mail-vk0-f50.google.com (mail-vk0-f50.google.com [209.85.213.50]) (authenticated) by conssluserg-02.nifty.com with ESMTP id w7FI4Kgg007601; Thu, 16 Aug 2018 03:04:20 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-02.nifty.com w7FI4Kgg007601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1534356261; bh=h0KLP2wIVHREDmVF9lTIgabyvVjJ+yjGdcZWkOiv3gs=; h=From:Date:Subject:To:Cc:From; b=RRoBmdML3/F8EmL9nLRdGMKKF/o4L0BtnJ9JuGfPP7aKJ6UExIWCm0soBdWb+Et+0 tzjxCDHs7jXKlYBRh65NYO5WZQgRf+ab9tyv/PiP8gywmsXVu/7IUC0+Nf3i+93WnT iAB1q7r/7YoToicbDYkArUDVWNhcpr/aKjtcQzCfkveOdk9FCetTGfBUu63cvuXbL4 9YWQou8KjKcZb12kuXmZVo4cdHCQ/SMcQC4mGS3nyrFyfGb5R5/dtg6LK8DZ8ikR4S Jl2TGYT4IxugmB0MugKLVAqwW8DmJrdCjpPoFOES9eGpAAsGxC93U5Yt/k56PSzGAM krZk6VbY5pfnQ== X-Nifty-SrcIP: [209.85.213.50] Received: by mail-vk0-f50.google.com with SMTP id y70-v6so82847vkc.0; Wed, 15 Aug 2018 11:04:20 -0700 (PDT) X-Gm-Message-State: AOUpUlE1R3Ve9EZc/qqFFJjqBQ2pRpLEMIyqWNWMxO/+NMMCEjxwBaj8 oli7w3uN6jxA8Wofb9Bel8HMWKJGKLoa7clN2n8= X-Google-Smtp-Source: AA+uWPz+Ao09Q9JtObQW8EGBbPYw6ibb10FQcadEepnfmBo9UBfT2N0GselaBZ6vemWc0Y9Zqgf1eqCJFD96z1uf52U= X-Received: by 2002:a1f:4049:: with SMTP id n70-v6mr17235602vka.140.1534356259605; Wed, 15 Aug 2018 11:04:19 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:ab0:2642:0:0:0:0:0 with HTTP; Wed, 15 Aug 2018 11:03:39 -0700 (PDT) From: Masahiro Yamada Date: Thu, 16 Aug 2018 03:03:39 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: [GIT PULL 3/3] consolidate arch Kconfig files for v4.19 To: Linus Torvalds Cc: Linux Kbuild mailing list , Linux Kernel Mailing List , masahiroy@kernel.org Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Linus, Please pull this patch series to consolidate arch Kconfig files. Sorry for many conflicts. Equivalent fixes are available in linux-next, but I sorted the 'select' lines alphabetically in arch/nios2/Kconfig. (of course, this is not important, though.) ------------------------- diff --cc arch/arm64/Kconfig index 260ff5d,daf59d3..d0a53cc --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@@ -279,10 -264,9 +279,6 @@@ config ARCH_SUPPORTS_UPROBE config ARCH_PROC_KCORE_TEXT def_bool y - source "init/Kconfig" - - source "kernel/Kconfig.freezer" -config MULTI_IRQ_HANDLER - def_bool y --- source "arch/arm64/Kconfig.platforms" menu "Bus support" diff --cc arch/mips/Kconfig index 642a56e,06a633e..2af13b1 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@@ -2988,13 -2990,6 +2984,9 @@@ config PGTABLE_LEVEL default 3 if 64BIT && !PAGE_SIZE_64KB default 2 +config MIPS_AUTO_PFN_OFFSET + bool + - source "init/Kconfig" - - source "kernel/Kconfig.freezer" - menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)" config HW_HAS_EISA diff --cc arch/nios2/Kconfig index 9203504,cbe1844..f4ad113 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@@ -1,9 -1,7 +1,10 @@@ # SPDX-License-Identifier: GPL-2.0 config NIOS2 def_bool y + select ARCH_HAS_SYNC_DMA_FOR_CPU + select ARCH_HAS_SYNC_DMA_FOR_DEVICE + select ARCH_NO_SWAP + select DMA_NONCOHERENT_OPS select TIMER_OF select GENERIC_ATOMIC64 select GENERIC_CLOCKEVENTS diff --cc arch/openrisc/Kconfig index dfb6a79,42e3a0f..ed5f32d --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@@ -69,10 -69,9 +69,6 @@@ config STACKTRACE_SUPPOR config LOCKDEP_SUPPORT def_bool y - source "init/Kconfig" - - source "kernel/Kconfig.freezer" -config MULTI_IRQ_HANDLER - def_bool y -- menu "Processor type and features" choice ---------------------------------------------------------------- The following changes since commit 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe: Linux 4.18-rc5 (2018-07-15 12:49:31 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git tags/kconfig-v4.19-2 for you to fetch changes up to 59e0b520c75c8b4588395aea6170e551c4189fd8: kconfig: add a Memory Management options" menu (2018-08-02 08:06:55 +0900) ---------------------------------------------------------------- Consolidation of Kconfig files by Christoph Hellwig. Move the source statements of arch-independent Kconfig files instead of duplicating the includes in every arch/$(SRCARCH)/Kconfig. ---------------------------------------------------------------- Christoph Hellwig (9): um: stop abusing KBUILD_KCONFIG um: cleanup Kconfig files um: create a proper drivers Kconfig kconfig: remove duplicate SWAP symbol defintions kconfig: include common Kconfig files from top-level Kconfig Kconfig: consolidate the "Kernel hacking" menu kconfig: include kernel/Kconfig.preempt from init/Kconfig kconfig: move the "Executable file formats" menu to fs/Kconfig.binfmt kconfig: add a Memory Management options" menu Randy Dunlap (1): kconfig: use a menu in arch/Kconfig to reduce clutter Kconfig | 22 ++++- arch/Kconfig | 13 +++ arch/alpha/Kconfig | 23 +---- arch/alpha/Kconfig.debug | 5 -- arch/arc/Kconfig | 19 ----- arch/arc/Kconfig.debug | 5 -- arch/arm/Kconfig | 27 ------ arch/arm/Kconfig.debug | 5 -- arch/arm64/Kconfig | 26 ------ arch/arm64/Kconfig.debug | 5 -- arch/c6x/Kconfig | 41 --------- arch/c6x/Kconfig.debug | 10 +++ arch/h8300/Kconfig | 36 -------- arch/h8300/Kconfig.debug | 1 + arch/hexagon/Kconfig | 21 +---- arch/hexagon/Kconfig.debug | 1 + arch/ia64/Kconfig | 24 ------ arch/ia64/Kconfig.debug | 5 -- arch/m68k/Kconfig | 31 +------ arch/m68k/Kconfig.debug | 5 -- arch/microblaze/Kconfig | 32 +------ arch/microblaze/Kconfig.debug | 6 -- arch/mips/Kconfig | 28 ------- arch/mips/Kconfig.debug | 5 -- arch/nds32/Kconfig | 21 ----- arch/nds32/Kconfig.debug | 1 + arch/nios2/Kconfig | 32 +------ arch/nios2/Kconfig.debug | 5 -- arch/openrisc/Kconfig | 30 ------- arch/openrisc/Kconfig.debug | 1 + arch/parisc/Kconfig | 27 ------ arch/parisc/Kconfig.debug | 5 -- arch/powerpc/Kconfig | 22 ----- arch/powerpc/Kconfig.debug | 5 -- arch/riscv/Kconfig | 71 ---------------- arch/riscv/Kconfig.debug | 37 ++++++++ arch/s390/Kconfig | 28 ------- arch/s390/Kconfig.debug | 5 -- arch/sh/Kconfig | 26 ------ arch/sh/Kconfig.debug | 5 -- arch/sh/mm/Kconfig | 2 - arch/sparc/Kconfig | 28 ------- arch/sparc/Kconfig.debug | 5 -- arch/um/{Kconfig.um => Kconfig} | 74 +++++++++++++++- arch/um/Kconfig.char | 124 --------------------------- arch/um/Kconfig.common | 60 ------------- arch/um/Kconfig.debug | 5 -- arch/um/Kconfig.rest | 22 ----- arch/um/Makefile | 4 +- arch/um/{Kconfig.net => drivers/Kconfig} | 125 +++++++++++++++++++++++++++- arch/unicore32/Kconfig | 28 ------- arch/unicore32/Kconfig.debug | 5 -- arch/x86/Kconfig | 26 +----- arch/x86/Kconfig.debug | 5 -- arch/x86/um/Kconfig | 15 ---- arch/xtensa/Kconfig | 29 ------- arch/xtensa/Kconfig.debug | 5 -- fs/Kconfig.binfmt | 5 ++ init/Kconfig | 14 +++- kernel/Kconfig.preempt | 2 + lib/Kconfig.debug | 7 ++ mm/Kconfig | 5 ++ 62 files changed, 316 insertions(+), 996 deletions(-) create mode 100644 arch/c6x/Kconfig.debug create mode 100644 arch/h8300/Kconfig.debug create mode 100644 arch/hexagon/Kconfig.debug create mode 100644 arch/nds32/Kconfig.debug create mode 100644 arch/openrisc/Kconfig.debug create mode 100644 arch/riscv/Kconfig.debug rename arch/um/{Kconfig.um => Kconfig} (82%) delete mode 100644 arch/um/Kconfig.char delete mode 100644 arch/um/Kconfig.common delete mode 100644 arch/um/Kconfig.rest rename arch/um/{Kconfig.net => drivers/Kconfig} (66%)