Merge tag 'v4.9.230' into khadas-vims-4.9.y
authorNick Xie <nick@khadas.com>
Thu, 13 Aug 2020 03:34:07 +0000 (11:34 +0800)
committerNick Xie <nick@khadas.com>
Thu, 13 Aug 2020 03:34:07 +0000 (11:34 +0800)
This is the 4.9.230 stable release

1  2 
Makefile
fs/cifs/connect.c
include/linux/sched/sysctl.h
kernel/sched/core.c
kernel/sched/rt.c
kernel/sysctl.c
mm/slub.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
index 5b4c9b49551a02536900a5a229b4bb931a8f07a0,5034c41a5313070635f61a9601cceece3a18ca3e..e73b9d7ffff68dae186d3a17eba6ec27fcc9807f
@@@ -8,9 -8,8 +8,10 @@@
  #include <linux/slab.h>
  #include <linux/irq_work.h>
  
 +#include "walt.h"
 +
  int sched_rr_timeslice = RR_TIMESLICE;
+ int sysctl_sched_rr_timeslice = (MSEC_PER_SEC / HZ) * RR_TIMESLICE;
  
  static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun);
  
diff --cc kernel/sysctl.c
Simple merge
diff --cc mm/slub.c
Simple merge