Hi all,
Just adding a couple of more Cc's
On Wed, 21 Aug 2019 13:01:06 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the security tree got conflicts in:
>
> arch/s390/configs/debug_defconfig
> arch/s390/configs/defconfig
>
> between commit:
>
> 3361f3193c74 ("s390: upd
Hi Mimi,
On Sun, 20 Jan 2013 22:10:23 -0500 Mimi Zohar wrote:
>
> Sorry Stephen, the merged result should look like what's contained in
> linux-integrity/next-upstreamed-patches:
>
> int ima_module_check(struct file *file)
> {
> if (!file) {
> if ((ima_appraise & IMA_APPR
On Mon, 2013-01-21 at 13:12 +1100, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next merge of the security tree got a conflict in
> security/integrity/ima/ima_main.c between commit a7f2a366f623 ("ima:
> fallback to MODULE_SIG_ENFORCE for existing kernel module syscall") from
> Linus' tree
Hi James,
On Wed, 17 Oct 2012 11:41:57 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the security tree got a conflict in
> net/dns_resolver/dns_key.c between commit c6089735e724 ("userns: net:
> Call key_alloc with GLOBAL_ROOT_UID, GLOBAL_ROOT_GID instead of 0, 0")
> from Linus'
4 matches
Mail list logo
