Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

S390 bpf_jit.S is removed in net-next and had changes in 'net',
since that code isn't used any more take the removal.

TLS data structures split the TX and RX components in 'net-next',
put the new struct members from the bug fix in 'net' into the RX
part.

The 'net-next' tree had some reworking of how the ERSPAN code works in
the GRE tunneling code, overlapping with a one-line headroom
calculation fix in 'net'.

Overlapping changes in __sock_map_ctx_update_elem(), keep the bits
that read the prog members via READ_ONCE() into local variables
before using them.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 8 insertions, 1 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 480a4f2713d9..1fecd5b7bad8 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -738,7 +738,7 @@ config CFS_BANDWIDTH
           tasks running within the fair group scheduler.  Groups with no limit
           set are considered to be unconstrained and will run with no
           restriction.
-          See tip/Documentation/scheduler/sched-bwc.txt for more information.
+          See Documentation/scheduler/sched-bwc.txt for more information.
 
 config RT_GROUP_SCHED
         bool "Group scheduling for SCHED_RR/FIFO"
diff --git a/init/main.c b/init/main.c
index a404936d85d8..fd37315835b4 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1034,6 +1034,13 @@ __setup("rodata=", set_debug_rodata);
 static void mark_readonly(void)
 {
         if (rodata_enabled) {
+                /*
+                 * load_module() results in W+X mappings, which are cleaned up
+                 * with call_rcu_sched().  Let's make sure that queued work is
+                 * flushed so that we don't hit false positives looking for
+                 * insecure pages which are W+X.
+                 */
+                rcu_barrier_sched();
                 mark_rodata_ro();
                 rodata_test();
         } else