linux-next: manual merge of the tip tree with the limits tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
kernel/signal.c between commit 65193106e8d5ae20156909c6f050aae272035e07
("core: use helpers for rlimits") from the limits tree and commit
f84d49b218b7d4c6cba2e0b41f24bd4045403962 ("signal: Print warning message
when dropping signals") from the tip tree.

Just some context changes.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc kernel/signal.c
index 74dfa5f,6b982f2..0000000
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@@ -207,10 -225,15 +225,15 @@@ __sigqueue_alloc(int sig, struct task_s
  	 */
  	user = get_uid(__task_cred(t)->user);
  	atomic_inc(&user->sigpending);
+ 
  	if (override_rlimit ||
  	    atomic_read(&user->sigpending) <=
- 			task_rlimit(t, RLIMIT_SIGPENDING))
 -			t->signal->rlim[RLIMIT_SIGPENDING].rlim_cur) {
++			task_rlimit(t, RLIMIT_SIGPENDING)) {
  		q = kmem_cache_alloc(sigqueue_cachep, flags);
+ 	} else {
+ 		print_dropped_signal(sig);
+ 	}
+ 
  	if (unlikely(q == NULL)) {
  		atomic_dec(&user->sigpending);
  		free_uid(user);
--
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/