linux-kernel - Re: [GIT] Security subsystem changes for 3.1

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110727.202354.869957455531006377.davem@davemloft.net>
Date:	Wed, 27 Jul 2011 20:23:54 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	jmorris@...ei.org
Cc:	torvalds@...ux-foundation.org,
	linux-security-module@...r.kernel.org,
	linux-kernel@...r.kernel.org, viro@....linux.org.uk
Subject: Re: [GIT] Security subsystem changes for 3.1

From: James Morris <jmorris@...ei.org>
Date: Thu, 28 Jul 2011 13:20:35 +1000 (EST)

> Ok.  So what should have happened here (fb408e6ccc) is that Al should have 
> emailed the patch to me to apply to my tree, instead of pushing it 
> directly?

I think Linus is trying to say that you should have not done the merge
to resolve the conflict and simply let him take care of it when he
pulled your tree.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/