Merge branch 'svn-trunk'

nightly/conf/nightly.conf

@@ -3,9 +3,9 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-5.0            \
-4.20.14-nc     \
-4.19.27-nc     \
+5.0.1          \
+4.20.15-nc     \
+4.19.28-nc     \
 4.18.18-nc     \
 4.17.18-nc     \
 4.16.18-nc     \

scripts/run-regression-tests

@@ -291,6 +291,7 @@ CONFIG_MAC80211_DRIVER_API_TRACER		\
 CONFIG_MMIOTRACE				\
 CONFIG_NET_DROP_MONITOR				\
 CONFIG_NOP_TRACER				\
+CONFIG_RETPOLINE				\
 CONFIG_SCHED_TRACER				\
 CONFIG_SECURITY_SELINUX				\
 CONFIG_STACK_TRACER				\
@@ -298,9 +299,11 @@ CONFIG_STACK_VALIDATION				\
 CONFIG_TRACEPOINTS				\
 CONFIG_TRACER_MAX_TRACE				\
 CONFIG_TRACING					\
+CONFIG_UNWINDER_ORC				\
 CONFIG_X86_32					\
 CONFIG_X86_X32					\
 "
+  local enable="CONFIG_UNWINDER_FRAME_POINTER"
 
   echo "Patching and configuring kernel ..."
   if [ "$ipv6" = "false" ]; then
@@ -319,6 +322,7 @@ CONFIG_X86_X32					\
     fi &&
     make -s allmodconfig &>"${outputdir}/make-config-output.txt" &&
     for c in $disable; do sed -i.tmp "s/^$c=[ym]\$/$c=n/" .config; done &&
+    for c in $enable; do sed -i.tmp "s/^\(# \)*$c\(=.*\| is not set\)\$/$c=y/" .config; done &&
     make -s oldconfig </dev/null &>/dev/null
   )
 }

scripts/specialize-patch

@@ -197,6 +197,8 @@ function evaluate(stmnt, pattern, arg, op, result) {
                    "(\\1) * 256 + (\\2)", "g", stmnt)
   }
 
+  gsub("defined\\(UEK_KABI_RENAME\\)", "0", stmnt)
+
   if (SCSI_EXEC_REQ_FIFO_DEFINED != "")
   {
     gsub("defined[[:blank:]]+SCSI_EXEC_REQ_FIFO_DEFINED",
@@ -388,6 +390,7 @@ function handle_if(evaluated)
       || $0 ~ "RHEL_MINOR"         \
       || $0 ~ "RHEL_RELEASE_CODE"  \
       || $0 ~ "SOCK_RECVMSG_HAS_FOUR_ARGS" \
+      || $0 ~ "UEK_KABI_RENAME"  \
       || $0 ~ "USE_PRE_440_WR_STRUCTURE" \
       || generating_upstream_patch_defined \
          && $0 ~ "GENERATING_UPSTREAM_PATCH" \

scst/README

@@ -462,7 +462,7 @@ following entries:
 
    Here is an example of the data produced by this infrastructure (edited for
    clarity):
-    
+
      $ echo 1 >/sys/kernel/scst_tgt/measure_latency
      $ sleep 10 # Wait until an initiator has submitted multiple I/O requests
      $ (cd /sys/kernel/scst_tgt/targets &&

scst/src/scst_lib.c

@@ -4298,7 +4298,7 @@ void scst_free_device(struct scst_device *dev)
 	percpu_ref_kill(&dev->refcnt);
 
 	wait_for_completion(&c);
-	
+
 	TRACE_EXIT();
 	return;
 }
@@ -4697,7 +4697,8 @@ int scst_acg_repl_lun(struct scst_acg *acg, struct kobject *parent,
 				 extra_tgt_dev_list_entry) {
 		scst_free_tgt_dev(tgt_dev);
 	}
-	scst_free_acg_dev(acg_dev);
+	if (acg_dev)
+		scst_free_acg_dev(acg_dev);
 
 out:
 	return res;

scst/src/scst_main.c

@@ -2677,7 +2677,7 @@ static void __exit exit_scst(void)
 	scst_event_exit();
 
 	rcu_barrier();
-	
+
 #define DEINIT_CACHEP(p) do {		\
 		kmem_cache_destroy(p);	\
 		p = NULL;		\