From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 9 Oct 2012 02:57:30 +0000 (+1100)
Subject: Merge remote-tracking branch 'userns/for-next'
X-Git-Tag: next-20121009~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2e196ca6cfdbbd0218ba7b413ce256e8c1275bcc;p=karo-tx-linux.git

Merge remote-tracking branch 'userns/for-next'
---

2e196ca6cfdbbd0218ba7b413ce256e8c1275bcc
diff --cc net/bluetooth/af_bluetooth.c
index a9ad589f3e72,ba033f09196e..5355df63d39b
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@@ -589,10 -591,10 +589,10 @@@ static int bt_seq_show(struct seq_file 
  			   atomic_read(&sk->sk_refcnt),
  			   sk_rmem_alloc_get(sk),
  			   sk_wmem_alloc_get(sk),
- 			   sock_i_uid(sk),
+ 			   from_kuid(seq_user_ns(seq), sock_i_uid(sk)),
  			   sock_i_ino(sk),
 -			   &src_baswapped,
 -			   &dst_baswapped,
 +			   &bt->src,
 +			   &bt->dst,
  			   bt->parent? sock_i_ino(bt->parent): 0LU);
  
  		if (l->custom_seq_show) {