Re: linux-next: manual merge of the net-next tree with Linus' tree

[David Miller]

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
> 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@xxxxxxxxxxxxxxxx>

I took care of this during the net --> net-next merge, thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/