public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mimi Zohar <zohar@linux•vnet.ibm.com>,
	Dmitry Kasatkin <dmitry.kasatkin@gmail•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	James Morris <jmorris@namei•org>
Subject: linux-next: build failure after merge of the integrity tree
Date: Tue, 17 Jul 2018 14:40:38 +1000	[thread overview]
Message-ID: <20180717144038.50394022@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 977 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

next             reply	other threads:[~2018-07-17  4:40 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-17  4:40 Stephen Rothwell [this message]
2018-07-17 13:18 ` linux-next: build failure after merge of the integrity tree Mimi Zohar
2018-07-17 22:21   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2019-06-14  5:34 Stephen Rothwell
2019-06-14 14:09 ` Mimi Zohar
2019-08-06  2:15 Stephen Rothwell
2019-08-06  3:18 ` Thiago Jung Bauermann
2019-08-06  3:45   ` Stephen Rothwell
2019-08-06 19:02     ` Mimi Zohar
2023-02-07  0:51 Stephen Rothwell
2023-02-07 12:48 ` Roberto Sassu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180717144038.50394022@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=dmitry.kasatkin@gmail$(echo .)com \
    --cc=jmorris@namei$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=zohar@linux$(echo .)vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox