- up to 5.3.5

diff --git a/bz204119.patch b/bz204119.patch
deleted file mode 100644 (file)
index deccfca..0000000
--- a/bz204119.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From dccc96abfb21dc19d69e707c38c8ba439bba7160 Mon Sep 17 00:00:00 2001
-From: Bart Van Assche <bvanassche@acm.org>
-Date: Thu, 1 Aug 2019 15:38:14 -0700
-Subject: scsi: core: Reduce memory required for SCSI logging
-
-The data structure used for log messages is so large that it can cause a
-boot failure. Since allocations from that data structure can fail anyway,
-use kmalloc() / kfree() instead of that data structure.
-
-See also https://bugzilla.kernel.org/show_bug.cgi?id=204119.
-See also commit ded85c193a39 ("scsi: Implement per-cpu logging buffer") # v4.0.
-
-Reported-by: Jan Palus <jpalus@fastmail.com>
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Hannes Reinecke <hare@suse.com>
-Cc: Johannes Thumshirn <jthumshirn@suse.de>
-Cc: Ming Lei <ming.lei@redhat.com>
-Cc: Jan Palus <jpalus@fastmail.com>
-Signed-off-by: Bart Van Assche <bvanassche@acm.org>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
----
- drivers/scsi/scsi_logging.c | 48 +++------------------------------------------
- include/scsi/scsi_dbg.h     |  2 --
- 2 files changed, 3 insertions(+), 47 deletions(-)
-
-diff --git a/drivers/scsi/scsi_logging.c b/drivers/scsi/scsi_logging.c
-index 39b8cc4574b4..c6ed0b12e807 100644
---- a/drivers/scsi/scsi_logging.c
-+++ b/drivers/scsi/scsi_logging.c
-@@ -15,57 +15,15 @@
- #include <scsi/scsi_eh.h>
- #include <scsi/scsi_dbg.h>
- 
--#define SCSI_LOG_SPOOLSIZE 4096
--
--#if (SCSI_LOG_SPOOLSIZE / SCSI_LOG_BUFSIZE) > BITS_PER_LONG
--#warning SCSI logging bitmask too large
--#endif
--
--struct scsi_log_buf {
--      char buffer[SCSI_LOG_SPOOLSIZE];
--      unsigned long map;
--};
--
--static DEFINE_PER_CPU(struct scsi_log_buf, scsi_format_log);
--
- static char *scsi_log_reserve_buffer(size_t *len)
- {
--      struct scsi_log_buf *buf;
--      unsigned long map_bits = sizeof(buf->buffer) / SCSI_LOG_BUFSIZE;
--      unsigned long idx = 0;
--
--      preempt_disable();
--      buf = this_cpu_ptr(&scsi_format_log);
--      idx = find_first_zero_bit(&buf->map, map_bits);
--      if (likely(idx < map_bits)) {
--              while (test_and_set_bit(idx, &buf->map)) {
--                      idx = find_next_zero_bit(&buf->map, map_bits, idx);
--                      if (idx >= map_bits)
--                              break;
--              }
--      }
--      if (WARN_ON(idx >= map_bits)) {
--              preempt_enable();
--              return NULL;
--      }
--      *len = SCSI_LOG_BUFSIZE;
--      return buf->buffer + idx * SCSI_LOG_BUFSIZE;
-+      *len = 128;
-+      return kmalloc(*len, GFP_ATOMIC);
- }
- 
- static void scsi_log_release_buffer(char *bufptr)
- {
--      struct scsi_log_buf *buf;
--      unsigned long idx;
--      int ret;
--
--      buf = this_cpu_ptr(&scsi_format_log);
--      if (bufptr >= buf->buffer &&
--          bufptr < buf->buffer + SCSI_LOG_SPOOLSIZE) {
--              idx = (bufptr - buf->buffer) / SCSI_LOG_BUFSIZE;
--              ret = test_and_clear_bit(idx, &buf->map);
--              WARN_ON(!ret);
--      }
--      preempt_enable();
-+      kfree(bufptr);
- }
- 
- static inline const char *scmd_name(const struct scsi_cmnd *scmd)
-diff --git a/include/scsi/scsi_dbg.h b/include/scsi/scsi_dbg.h
-index e03bd9d41fa8..7b196d234626 100644
---- a/include/scsi/scsi_dbg.h
-+++ b/include/scsi/scsi_dbg.h
-@@ -6,8 +6,6 @@ struct scsi_cmnd;
- struct scsi_device;
- struct scsi_sense_hdr;
- 
--#define SCSI_LOG_BUFSIZE 128
--
- extern void scsi_print_command(struct scsi_cmnd *);
- extern size_t __scsi_format_command(char *, size_t,
-                                  const unsigned char *, size_t);
--- 
-cgit 1.2-0.3.lf.el7
-

diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index d352d1e852535b8b6904413f60b2f2a6085396df..b096fed5cdd4f9920829a8ac424f8dccdf57bf8c 100644 (file)
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -26,7 +26,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 9cbcf167bdd0..5a9cee826a8f 100644
+index a50e97a63bc8..bd7c76319a85 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -2822,6 +2822,19 @@ F:      include/linux/audit.h
@@ -469,7 +469,7 @@ index 6a7a1083b6fb..461db8843e32 100644
  
  #ifdef CONFIG_SWAP
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 2852d0e76ea3..7b7f676b6465 100644
+index 541fd805fb88..3208fcf3b3c9 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
 @@ -553,7 +553,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
@@ -38872,7 +38872,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +}
 diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
 --- /usr/share/empty/include/uapi/linux/aufs_type.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h       2019-09-16 09:38:43.216175640 +0200
++++ linux/include/uapi/linux/aufs_type.h       2019-10-08 20:39:02.730958260 +0200
 @@ -0,0 +1,452 @@
 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 +/*
@@ -38916,7 +38916,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
 +
 +#include <linux/limits.h>
 +
-+#define AUFS_VERSION  "5.x-rcN-20190909"
++#define AUFS_VERSION  "5.x-rcN-20190923"
 +
 +/* todo? move this to linux-2.6.19/include/magic.h */
 +#define AUFS_SUPER_MAGIC      ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')

diff --git a/kernel.spec b/kernel.spec
index 70971d52433f9e6fcef0384975d05b72461b02c2..a77853573b95724be9a45181dbeedfcdb795a97b 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@
 
 %define                rel             1
 %define                basever         5.3
-%define                postver         .4
+%define                postver         .5
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -123,7 +123,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5: c99feaade8047339528fb066ec5f8a49
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:  e9110e2b4d4f48e1142ff3c8e059b8ca
+# Patch0-md5:  3b36bc19ede1c0680bd0eb60db4ab0aa
 %endif
 Source1:       kernel.sysconfig
 
@@ -217,7 +217,6 @@ Patch2000:  kernel-small_fixes.patch
 Patch2001:     kernel-pwc-uncompress.patch
 Patch2003:     kernel-regressions.patch
 Patch2004:     xfs-reclaim-hack.patch
-Patch2005:     bz204119.patch
 
 # for rescuecd
 # based on ftp://ftp.leg.uct.ac.za/pub/linux/rip/tmpfs_root-2.6.30.diff.gz
@@ -694,7 +693,6 @@ rm -f localversion-rt
 %patch2001 -p1
 #%patch2003 -p1
 %patch2004 -p1
-%patch2005 -p1
 
 # Do not remove this, please!
 #%%patch50000 -p1