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

2019-08-20 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the integrity tree got a conflict in: arch/s390/kernel/machine_kexec_file.c between commit: 99d5cadfde2b ("kexec_file: split KEXEC_VERIFY_SIG into KEXEC_SIG and KEXEC_SIG_FORCE") from the security tree and commit: c8424e776b09 ("MODSIGN: Export

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

2017-11-01 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the integrity tree got a conflict in: MAINTAINERS between commit: e28aa8aeab43 ("MAINTAINERS: remove David Safford as maintainer for encrypted+trusted keys") from the security tree and commit: 46d6c35e6882 ("MAINTAINERS: update the IMA, EVM,

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

2017-11-01 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the integrity tree got a conflict in: MAINTAINERS between commit: e28aa8aeab43 ("MAINTAINERS: remove David Safford as maintainer for encrypted+trusted keys") from the security tree and commit: 46d6c35e6882 ("MAINTAINERS: update the IMA, EVM,