Re: linux-next: manual merge of the pidfd tree with the integrity tree

Hi all, On Mon, 15 Feb 2021 08:07:17 +1100 Stephen Rothwell wrote: > > On Mon, 25 Jan 2021 17:18:18 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > > > security/integrity/ima/ima_api.c > > > > between commit: > > > > 2b4a2474a2

Re: linux-next: manual merge of the pidfd tree with the integrity tree

Hi all, On Mon, 25 Jan 2021 17:18:18 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the pidfd tree got a conflict in: > > security/integrity/ima/ima_api.c > > between commit: > > 2b4a2474a202 ("IMA: generalize keyring specific measurement constructs") > > from the integri

linux-next: manual merge of the pidfd tree with the integrity tree

Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the pidfd tree got a conflict in: security/integrity/ima/ima_main.c between commits: 2b4a2474a202 ("IMA: generalize keyring specific measurement constructs") 291af6

linux-next: manual merge of the pidfd tree with the integrity tree

Hi all, Today's linux-next merge of the pidfd tree got a conflict in: security/integrity/ima/ima_api.c between commit: 2b4a2474a202 ("IMA: generalize keyring specific measurement constructs") from the integrity tree and commit: a2d2329e30e2 ("ima: handle idmapped mounts") from the pidf