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
include/linux/sched.h between commit
8c2b7235b952281905e001ad04da365279f4c8ec ("resource: add helpers for
fetching rlimits") from the limits tree and commit
733421516b42c44b9e21f1793c430cc801ef8324 ("sched: Move
TASK_STATE_TO_CHAR_STR near the TASK_state bits") from the tip tree.

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

diff --cc include/linux/sched.h
index fe12211,f2f842d..0000000
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -2594,30 -2601,6 +2601,28 @@@ static inline void mm_init_owner(struc
  }
  #endif /* CONFIG_MM_OWNER */
  
 +static inline unsigned long task_rlimit(const struct task_struct *tsk,
 +		unsigned int limit)
 +{
 +	return ACCESS_ONCE(tsk->signal->rlim[limit].rlim_cur);
 +}
 +
 +static inline unsigned long task_rlimit_max(const struct task_struct *tsk,
 +		unsigned int limit)
 +{
 +	return ACCESS_ONCE(tsk->signal->rlim[limit].rlim_max);
 +}
 +
 +static inline unsigned long rlimit(unsigned int limit)
 +{
 +	return task_rlimit(current, limit);
 +}
 +
 +static inline unsigned long rlimit_max(unsigned int limit)
 +{
 +	return task_rlimit_max(current, limit);
 +}
 +
- #define TASK_STATE_TO_CHAR_STR "RSDTtZX"
- 
  #endif /* __KERNEL__ */
  
  #endif
--
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/