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

Hi all,

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

  kernel/time/jiffies.c

between commit:

  9e10208005eb3 ("sysctl: remove CONFIG_PROC_SYSCTL, it just mirrors CONFIG_SYSCTL")

from the mm-nonmm-stable tree and commits:

  a3c70a5a9f944 ("sysctl: Generate do_proc_doulongvec_minmax with do_proc_dotypevec macro")
  38f8bf3859a02 ("sysctl: Rename proc_doulongvec_minmax_conv to proc_doulongvec_conv")
  9eea1b9eb9661 ("sysctl: remove CONFIG_PROC_SYSCTL, it just mirrors CONFIG_SYSCTL")

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,213ae1d6a0147..0000000000000
--- a/kernel/time/jiffies.c
+++ b/kernel/time/jiffies.c
@@@ -185,6 -185,23 +185,23 @@@ 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_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 -228,12 +228,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 -332,8 +332,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);

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmpzWo0ACgkQJNaLcl1U
h9Bb4Af/WxFzLlpFY9trO9qvD5P79HhjDViczHsTf2DGEc0qGsKayZal4e2QLn6K
9hQSEprH0mC0e1rTMH3qr3SLFC4kM3oSpZr+W1Cupi5bggYVR9Ax5YFAlPB+4Csh
tEdj97Cy3NkjtbgmamtPk9vAz0zPn3ay04vVYIx5MQFDXswC/A9hGa8lESTwGPDJ
beEDAyXe1GEorlkYv30dmV+O6x5QuKzzSes5kpsde+e7RItEIVNVE5yVpahgkD3f
HXMl7osDU8HKW1XCfv2YCCcog2jCLipKbvhYxqzlcWl422ysEWArAoO+01/u7Pa8
B4ZVUrdockQfPu8Yl5DdhqXt64ajjg==
=iFo6
-----END PGP SIGNATURE-----