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=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS 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 8CBF0ECDFB1 for ; Tue, 17 Jul 2018 13:18:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 493BA204EC for ; Tue, 17 Jul 2018 13:18:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 493BA204EC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731663AbeGQNvD (ORCPT ); Tue, 17 Jul 2018 09:51:03 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:45936 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731583AbeGQNvD (ORCPT ); Tue, 17 Jul 2018 09:51:03 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w6HDFZxd005239 for ; Tue, 17 Jul 2018 09:18:24 -0400 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2k9f44nw7u-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 17 Jul 2018 09:18:23 -0400 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 17 Jul 2018 14:18:21 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 17 Jul 2018 14:18:19 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w6HDIIgN24641700 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 17 Jul 2018 13:18:18 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2D793AE053; Tue, 17 Jul 2018 16:18:35 +0100 (BST) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2D180AE056; Tue, 17 Jul 2018 16:18:34 +0100 (BST) Received: from localhost.localdomain (unknown [9.80.98.225]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 17 Jul 2018 16:18:34 +0100 (BST) Subject: Re: linux-next: build failure after merge of the integrity tree From: Mimi Zohar To: Stephen Rothwell , Mimi Zohar , Dmitry Kasatkin Cc: Linux-Next Mailing List , Linux Kernel Mailing List , James Morris Date: Tue, 17 Jul 2018 09:18:06 -0400 In-Reply-To: <20180717144038.50394022@canb.auug.org.au> References: <20180717144038.50394022@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 18071713-0028-0000-0000-000002DC97CE X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18071713-0029-0000-0000-000023945BA8 Message-Id: <1531833486.3380.18.camel@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-07-17_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807170139 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2018-07-17 at 14:40 +1000, Stephen Rothwell wrote: > Hi all, > > After merging the integrity tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > security/integrity/ima/ima_main.c:549:5: error: redefinition of 'ima_load_data' > int ima_load_data(enum kernel_load_data_id id) > ^~~~~~~~~~~~~ > security/integrity/ima/ima_main.c:506:5: note: previous definition of 'ima_load_data' was here > int ima_load_data(enum kernel_load_data_id id) > ^~~~~~~~~~~~~ > > Caused by commit > > 4995c7ac4490 ("ima: based on policy require signed kexec kernel images") > > interacting with commit > > 16c267aac86b ("ima: based on policy require signed kexec kernel images") > > from the sceurity tree. > > Basically the same set of patches are in the security tree and the > integrity tree as different commits. The merge managed to add this > function twice. I have added a patche to remove one copy of the function. > > Please clean up the integrity tree relative to the security tree. Done