From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752907Ab1AIWtO (ORCPT ); Sun, 9 Jan 2011 17:49:14 -0500 Received: from tundra.namei.org ([65.99.196.166]:54298 "EHLO tundra.namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752439Ab1AIWtM (ORCPT ); Sun, 9 Jan 2011 17:49:12 -0500 Date: Mon, 10 Jan 2011 09:48:58 +1100 (EST) From: James Morris To: Casey Schaufler cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Miller , netdev@vger.kernel.org Subject: Re: linux-next: manual merge of the security-testing tree with the net tree In-Reply-To: <4D2666D0.9060802@schaufler-ca.com> Message-ID: References: <20110107114400.e4d1d33b.sfr@canb.auug.org.au> <4D2666D0.9060802@schaufler-ca.com> User-Agent: Alpine 2.00 (LRH 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 6 Jan 2011, Casey Schaufler wrote: > On 1/6/2011 4:44 PM, Stephen Rothwell wrote: > > Hi James, > > > > Today's linux-next merge of the security-testing tree got a conflict in > > security/smack/smack_lsm.c between commit > > 3610cda53f247e176bcbb7a7cca64bc53b12acdb ("af_unix: Avoid socket->sk NULL > > OOPS in stream connect security hooks") from the net tree and commit > > b4e0d5f0791bd6dd12a1c1edea0340969c7c1f90 ("Smack: UDS revision") from the > > security-testing tree. > > > > I fixed it up (I think - see below) and can carry the fix as necessary. > > The change looks like it addresses the change in interface. Thank you. Thanks, applied. -- James Morris