# Re: linux-next: manual merge of the security-testing tree with the net tree

- From: Casey Schaufler \<casey@schaufler-ca.com\>
- Date: 2011-01-07 01:05:23 
- List: netdev
- Page: https://ratatoskr.run/netdev/2011/01/3662876
- Thread: https://ratatoskr.run/linux-next/2011/01/3662860/t.md

```text
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.
```