linux-next: manual merge of the sysctl tree with the mm-nonmm-unstable tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 2831 bytes --]

Hi all,

Today's linux-next merge of the sysctl tree got a conflict in:

  kernel/time/jiffies.c

between commit:

  842912dea6d51 ("sysctl: remove CONFIG_PROC_SYSCTL, it just mirrors CONFIG_SYSCTL")

from the mm-nonmm-unstable tree and commit:

  a3c70a5a9f944 ("sysctl: Generate do_proc_doulongvec_minmax with do_proc_dotypevec macro")

from the sysctl tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined kernel/time/jiffies.c
index 84c6bd8e742e9,af529d558fa92..0000000000000
--- a/kernel/time/jiffies.c
+++ b/kernel/time/jiffies.c
@@@ -98,7 -98,7 +98,7 @@@ void __init register_refined_jiffies(lo
  	__clocksource_register(&refined_jiffies);
  }
  
 -#ifdef CONFIG_PROC_SYSCTL
 +#ifdef CONFIG_SYSCTL
  static ulong mult_hz(const ulong val)
  {
  	return val * HZ;
@@@ -185,7 -185,25 +185,7 @@@ static int do_proc_int_conv_ms_jiffies_
  			     sysctl_u2k_int_conv_ms, sysctl_k2u_int_conv_ms);
  }
  
 -static int sysctl_u2k_ulong_conv_ms(const ulong *u_ptr, ulong *k_ptr)
 -{
 -	return proc_ulong_u2k_conv_uop(u_ptr, k_ptr, sysctl_msecs_to_jiffies);
 -}
 -
 -static int sysctl_k2u_ulong_conv_ms(ulong *u_ptr, const ulong *k_ptr)
 -{
 -	return proc_ulong_k2u_conv_kop(u_ptr, k_ptr, sysctl_jiffies_to_msecs);
 -}
 -
 -static int do_proc_ulong_conv_ms_jiffies(bool *negp, ulong *u_ptr, ulong *k_ptr,
 -					 int dir, const struct ctl_table *tbl)
 -{
 -	return proc_ulong_conv(u_ptr, k_ptr, dir, tbl, false,
 -			       sysctl_u2k_ulong_conv_ms, sysctl_k2u_ulong_conv_ms);
 -}
 -
 -
 -#else // CONFIG_PROC_SYSCTL
 +#else // CONFIG_SYSCTL
  static int do_proc_int_conv_jiffies(bool *negp, ulong *u_ptr, int *k_ptr,
  				    int dir, const struct ctl_table *tbl)
  {
@@@ -211,6 -229,12 +211,12 @@@ static int do_proc_int_conv_ms_jiffies_
  {
  	return -ENOSYS;
  }
+ 
+ static int do_proc_ulong_conv_ms_jiffies(bool *negp, ulong *u_ptr, ulong *k_ptr,
+ 					 int dir, const struct ctl_table *tbl)
+ {
+ 	return -ENOSYS;
+ }
  #endif
  
  /**
@@@ -309,8 -333,8 +315,8 @@@ int proc_dointvec_ms_jiffies_minmax(con
  int proc_doulongvec_ms_jiffies_minmax(const struct ctl_table *table, int dir,
  				      void *buffer, size_t *lenp, loff_t *ppos)
  {
- 	return proc_doulongvec_minmax_conv(table, dir, buffer, lenp, ppos,
- 					   HZ, 1000l);
+ 	return proc_doulongvec_conv(table, dir, buffer, lenp, ppos,
+ 				    do_proc_ulong_conv_ms_jiffies);
  }
  EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]