diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-03-14 09:42:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-14 09:46:02 +1000 |
| commit | 9b61c0fcdf0cfd20a85d9856d46142e7f297de0a (patch) | |
| tree | d4abe6aa3f4e1e088f9da1d0597e078b1fe58912 /net/unix/diag.c | |
| parent | Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into... (diff) | |
| parent | Merge tag 'drm-intel-fixes-2016-03-11' of git://anongit.freedesktop.org/drm-i... (diff) | |
| download | linux-9b61c0fcdf0cfd20a85d9856d46142e7f297de0a.tar.gz linux-9b61c0fcdf0cfd20a85d9856d46142e7f297de0a.zip | |
Merge drm-fixes into drm-next.
Nouveau wanted this to avoid some worse conflicts when I merge that.
Diffstat (limited to 'net/unix/diag.c')
| -rw-r--r-- | net/unix/diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/diag.c b/net/unix/diag.c index c512f64d5287..4d9679701a6d 100644 --- a/net/unix/diag.c +++ b/net/unix/diag.c @@ -220,7 +220,7 @@ done: return skb->len; } -static struct sock *unix_lookup_by_ino(int ino) +static struct sock *unix_lookup_by_ino(unsigned int ino) { int i; struct sock *sk; |