From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17217C43381 for ; Wed, 20 Feb 2019 09:11:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC0A5208E4 for ; Wed, 20 Feb 2019 09:11:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726821AbfBTJL2 (ORCPT ); Wed, 20 Feb 2019 04:11:28 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:3704 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725813AbfBTJL1 (ORCPT ); Wed, 20 Feb 2019 04:11:27 -0500 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 221D4B543D1DCBC7F114; Wed, 20 Feb 2019 17:11:25 +0800 (CST) Received: from [127.0.0.1] (10.74.221.148) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.408.0; Wed, 20 Feb 2019 17:11:15 +0800 Subject: Re: linux-next: Tree for Feb 20 To: Stephen Rothwell , Linux Next Mailing List , Roberto Sassu , Jarkko Sakkinen References: <20190220184341.73bd2084@canb.auug.org.au> CC: Linux Kernel Mailing List From: Zhangshaokun Message-ID: <1114b964-8ff8-5632-64d4-e94a9160b998@hisilicon.com> Date: Wed, 20 Feb 2019 17:11:15 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: <20190220184341.73bd2084@canb.auug.org.au> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.74.221.148] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is a compiler failure on arm64 platform, as follow: AS arch/arm64/kvm/hyp.o CC kernel/trace/ring_buffer.o In file included from security/integrity/ima/ima_fs.c:30:0: security/integrity/ima/ima.h:176:7: error: redeclaration of enumerator ‘NONE’ hook(NONE) \ ^ security/integrity/ima/ima.h:188:34: note: in definition of macro ‘__ima_hook_enumify’ #define __ima_hook_enumify(ENUM) ENUM, ^ security/integrity/ima/ima.h:191:2: note: in expansion of macro ‘__ima_hooks’ __ima_hooks(__ima_hook_enumify) ^ In file included from ./arch/arm64/include/asm/acpi.h:15:0, from ./include/acpi/acpi_io.h:7, from ./include/linux/acpi.h:47, from ./include/linux/tpm.h:26, from security/integrity/ima/ima.h:25, from security/integrity/ima/ima_fs.c:30: ./include/linux/efi.h:1716:2: note: previous definition of ‘NONE’ was here NONE, ^ scripts/Makefile.build:276: recipe for target 'security/integrity/ima/ima_fs.o' failed make[3]: *** [security/integrity/ima/ima_fs.o] Error 1 I dug it and it is the commit 901615cb916d ("tpm: move tpm_chip definition to include/linux/tpm.h") Thanks, Shaokun On 2019/2/20 15:43, Stephen Rothwell wrote: > Hi all, > > Changes since 20190219: > > The asm-generic tree lost its build failure. > > The v4l-dvb tree lost its build failure. > > The net-next tree gained a conflict against the bpf tree. > > The kvm tree still had its build failure so I used a supplied patch. > > The akpm-current tree gained a build failure due to an interaction with > the drm tree for which I applied a merge fix patch. > > Non-merge commits (relative to Linus' tree): 8846 > 9249 files changed, 416125 insertions(+), 220692 deletions(-) > > ---------------------------------------------------------------------------- > > I have created today's linux-next tree at > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git > (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you > are tracking the linux-next tree using git, you should not use "git pull" > to do so as that will try to merge the new linux-next release with the > old one. You should use "git fetch" and checkout or reset to the new > master. > > You can see which trees have been included by looking in the Next/Trees > file in the source. There are also quilt-import.log and merge.log > files in the Next directory. Between each merge, the tree was built > with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a > multi_v7_defconfig for arm and a native build of tools/perf. After > the final fixups (if any), I do an x86_64 modules_install followed by > builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), > ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc > and sparc64 defconfig. And finally, a simple boot test of the powerpc > pseries_le_defconfig kernel in qemu (with and without kvm enabled). > > Below is a summary of the state of the merge. > > I am currently merging 296 trees (counting Linus' and 69 trees of bug > fix patches pending for the current merge release). > > Stats about the size of the tree over time can be seen at > http://neuling.org/linux-next-size.html . > > Status of my local build tests will be at > http://kisskb.ellerman.id.au/linux-next . If maintainers want to give > advice about cross compilers/configs that work, we are always open to add > more builds. > > Thanks to Randy Dunlap for doing many randconfig builds. And to Paul > Gortmaker for triage and bug fixes. >