lkml.org 
[lkml]   [2013]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the net-next tree with Linus' tree
From
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 Apr 2013 13:09:39 +1000

> Today's linux-next merge of the net-next tree got a conflict in
> include/net/scm.h between commit 83f1b4ba917d ("net: fix incorrect
> credentials passing") from Linus' tree and commit 6b0ee8c036ec ("scm:
> Stop passing struct cred") from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required). I also applied the following merge fix patch (I am not
> sure if this is correct, but it seems to be consistent):
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 22 Apr 2013 13:06:10 +1000
> Subject: [PATCH] net: af_unix fix for incorrect credentials passing
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

I took care of this during the net --> net-next merge, thanks!


\
 
 \ /
  Last update: 2013-04-23 03:01    [W:0.035 / U:0.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site