Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/gregkh/patches

9 files changed, 124 insertions, 1101 deletions

diff --git a/0001-Kbuild-provide-a-common-kernel-installation-script.patch b/0001-Kbuild-provide-a-common-kernel-installation-script.patch
deleted file mode 100644
index 6681fdf6857af4..00000000000000
--- a/0001-Kbuild-provide-a-common-kernel-installation-script.patch
+++ /dev/null
@@ -1,1085 +0,0 @@
-From b5f96fdf4fa53462a63219ac354b73b961b6df5f Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Sat, 3 Apr 2021 18:15:28 +0200
-Subject: [PATCH] Kbuild: provide a common kernel installation script
-
-All arches seem to do almost exactly the same thing, so unify them all
-into a single script that can be much easier to maintain.
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm/boot/Makefile             |    6 -
- arch/arm/boot/install.sh           |   66 --------------------
- arch/arm64/boot/Makefile           |    4 -
- arch/arm64/boot/install.sh         |   60 ------------------
- arch/ia64/Makefile                 |    2 
- arch/ia64/install.sh               |   40 ------------
- arch/m68k/Makefile                 |    2 
- arch/m68k/install.sh               |   52 ---------------
- arch/nds32/boot/Makefile           |    4 -
- arch/nios2/boot/Makefile           |    2 
- arch/nios2/boot/install.sh         |   52 ---------------
- arch/parisc/Makefile               |    4 -
- arch/parisc/boot/Makefile          |    2 
- arch/parisc/boot/install.sh        |   65 -------------------
- arch/parisc/install.sh             |   66 --------------------
- arch/powerpc/boot/Makefile         |    4 -
- arch/powerpc/boot/install.sh       |   55 ----------------
- arch/riscv/boot/Makefile           |    4 -
- arch/riscv/boot/install.sh         |   60 ------------------
- arch/s390/boot/Makefile            |    2 
- arch/s390/boot/install.sh          |   30 ---------
- arch/sh/boot/compressed/install.sh |   56 ----------------
- arch/sparc/boot/Makefile           |    2 
- arch/sparc/boot/install.sh         |   50 ---------------
- arch/x86/boot/Makefile             |    2 
- arch/x86/boot/install.sh           |   59 -----------------
- scripts/install.sh                 |  122 +++++++++++++++++++++++++++++++++++++
- 27 files changed, 142 insertions(+), 731 deletions(-)
- delete mode 100644 arch/arm/boot/install.sh
- delete mode 100644 arch/arm64/boot/install.sh
- delete mode 100644 arch/ia64/install.sh
- delete mode 100644 arch/m68k/install.sh
- delete mode 100644 arch/nios2/boot/install.sh
- delete mode 100644 arch/parisc/boot/install.sh
- delete mode 100644 arch/parisc/install.sh
- delete mode 100644 arch/powerpc/boot/install.sh
- delete mode 100644 arch/riscv/boot/install.sh
- delete mode 100644 arch/s390/boot/install.sh
- delete mode 100644 arch/sh/boot/compressed/install.sh
- delete mode 100644 arch/sparc/boot/install.sh
- delete mode 100644 arch/x86/boot/install.sh
- create mode 100755 scripts/install.sh
-
---- a/arch/arm/boot/Makefile
-+++ b/arch/arm/boot/Makefile
-@@ -104,15 +104,15 @@ initrd:
- 	(echo You must specify INITRD; exit -1)
- 
- install:
--	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
-+	$(CONFIG_SHELL) $(srctree)/scripts/install.sh "$(KERNELRELEASE)" \
- 	$(obj)/Image System.map "$(INSTALL_PATH)"
- 
- zinstall:
--	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
-+	$(CONFIG_SHELL) $(srctree)/scripts/install.sh "$(KERNELRELEASE)" \
- 	$(obj)/zImage System.map "$(INSTALL_PATH)"
- 
- uinstall:
--	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
-+	$(CONFIG_SHELL) $(srctree)/scripts/install.sh "$(KERNELRELEASE)" \
- 	$(obj)/uImage System.map "$(INSTALL_PATH)"
- 
- subdir-	    := bootp compressed dts
---- a/arch/arm/boot/install.sh
-+++ /dev/null
-@@ -1,66 +0,0 @@
--#!/bin/sh
--#
--# arch/arm/boot/install.sh
--#
--# This file is subject to the terms and conditions of the GNU General Public
--# License.  See the file "COPYING" in the main directory of this archive
--# for more details.
--#
--# Copyright (C) 1995 by Linus Torvalds
--#
--# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
--# Adapted from code in arch/i386/boot/install.sh by Russell King
--#
--# "make install" script for arm architecture
--#
--# Arguments:
--#   $1 - kernel version
--#   $2 - kernel image file
--#   $3 - kernel map file
--#   $4 - default install path (blank if root directory)
--#
--
--verify () {
--	if [ ! -f "$1" ]; then
--		echo ""                                                   1>&2
--		echo " *** Missing file: $1"                              1>&2
--		echo ' *** You need to run "make" before "make install".' 1>&2
--		echo ""                                                   1>&2
--		exit 1
--	fi
--}
--
--# Make sure the files actually exist
--verify "$2"
--verify "$3"
--
--# User may have a custom install script
--if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
--if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
--
--if [ "$(basename $2)" = "zImage" ]; then
--# Compressed install
--  echo "Installing compressed kernel"
--  base=vmlinuz
--else
--# Normal install
--  echo "Installing normal kernel"
--  base=vmlinux
--fi
--
--if [ -f $4/$base-$1 ]; then
--  mv $4/$base-$1 $4/$base-$1.old
--fi
--cat $2 > $4/$base-$1
--
--# Install system map file
--if [ -f $4/System.map-$1 ]; then
--  mv $4/System.map-$1 $4/System.map-$1.old
--fi
--cp $3 $4/System.map-$1
--
--if [ -x /sbin/loadmap ]; then
--  /sbin/loadmap
--else
--  echo "You have to install it yourself"
--fi
---- a/arch/arm64/boot/Makefile
-+++ b/arch/arm64/boot/Makefile
-@@ -37,9 +37,9 @@ $(obj)/Image.lzo: $(obj)/Image FORCE
- 	$(call if_changed,lzo)
- 
- install:
--	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
-+	$(CONFIG_SHELL) $(srctree)/scripts/install.sh $(KERNELRELEASE) \
- 	$(obj)/Image System.map "$(INSTALL_PATH)"
- 
- zinstall:
--	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
-+	$(CONFIG_SHELL) $(srctree)/scripts/install.sh $(KERNELRELEASE) \
- 	$(obj)/Image.gz System.map "$(INSTALL_PATH)"
---- a/arch/arm64/boot/install.sh
-+++ /dev/null
-@@ -1,60 +0,0 @@
--#!/bin/sh
--#
--# arch/arm64/boot/install.sh
--#
--# This file is subject to the terms and conditions of the GNU General Public
--# License.  See the file "COPYING" in the main directory of this archive
--# for more details.
--#
--# Copyright (C) 1995 by Linus Torvalds
--#
--# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
--# Adapted from code in arch/i386/boot/install.sh by Russell King
--#
--# "make install" script for the AArch64 Linux port
--#
--# Arguments:
--#   $1 - kernel version
--#   $2 - kernel image file
--#   $3 - kernel map file
--#   $4 - default install path (blank if root directory)
--#
--
--verify () {
--	if [ ! -f "$1" ]; then
--		echo ""                                                   1>&2
--		echo " *** Missing file: $1"                              1>&2
--		echo ' *** You need to run "make" before "make install".' 1>&2
--		echo ""                                                   1>&2
--		exit 1
--	fi
--}
--
--# Make sure the files actually exist
--verify "$2"
--verify "$3"
--
--# User may have a custom install script
--if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
--if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
--
--if [ "$(basename $2)" = "Image.gz" ]; then
--# Compressed install
--  echo "Installing compressed kernel"
--  base=vmlinuz
--else
--# Normal install
--  echo "Installing normal kernel"
--  base=vmlinux
--fi
--
--if [ -f $4/$base-$1 ]; then
--  mv $4/$base-$1 $4/$base-$1.old
--fi
--cat $2 > $4/$base-$1
--
--# Install system map file
--if [ -f $4/System.map-$1 ]; then
--  mv $4/System.map-$1 $4/System.map-$1.old
--fi
--cp $3 $4/System.map-$1
---- a/arch/ia64/Makefile
-+++ b/arch/ia64/Makefile
-@@ -77,7 +77,7 @@ archheaders:
- CLEAN_FILES += vmlinux.gz
- 
- install: vmlinux.gz
--	sh $(srctree)/arch/ia64/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
-+	sh $(srctree)/scripts/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
- 
- define archhelp
-   echo '* compressed	- Build compressed kernel image'
---- a/arch/ia64/install.sh
-+++ /dev/null
-@@ -1,40 +0,0 @@
--#!/bin/sh
--#
--# arch/ia64/install.sh
--#
--# This file is subject to the terms and conditions of the GNU General Public
--# License.  See the file "COPYING" in the main directory of this archive
--# for more details.
--#
--# Copyright (C) 1995 by Linus Torvalds
--#
--# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
--#
--# "make install" script for ia64 architecture
--#
--# Arguments:
--#   $1 - kernel version
--#   $2 - kernel image file
--#   $3 - kernel map file
--#   $4 - default install path (blank if root directory)
--#
--
--# User may have a custom install script
--
--if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
--if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
--
--# Default install - same as make zlilo
--
--if [ -f $4/vmlinuz ]; then
--	mv $4/vmlinuz $4/vmlinuz.old
--fi
--
--if [ -f $4/System.map ]; then
--	mv $4/System.map $4/System.old
--fi
--
--cat $2 > $4/vmlinuz
--cp $3 $4/System.map
--
--test -x /usr/sbin/elilo && /usr/sbin/elilo
---- a/arch/m68k/Makefile
-+++ b/arch/m68k/Makefile
-@@ -143,4 +143,4 @@ archheaders:
- 	$(Q)$(MAKE) $(build)=arch/m68k/kernel/syscalls all
- 
- install:
--	sh $(srctree)/arch/m68k/install.sh $(KERNELRELEASE) vmlinux.gz System.map "$(INSTALL_PATH)"
-+	sh $(srctree)/scripts/install.sh $(KERNELRELEASE) vmlinux.gz System.map "$(INSTALL_PATH)"
---- a/arch/m68k/install.sh
-+++ /dev/null
-@@ -1,52 +0,0 @@
--#!/bin/sh
--#
--# This file is subject to the terms and conditions of the GNU General Public
--# License.  See the file "COPYING" in the main directory of this archive
--# for more details.
--#
--# Copyright (C) 1995 by Linus Torvalds
--#
--# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
--#
--# "make install" script for m68k architecture
--#
--# Arguments:
--#   $1 - kernel version
--#   $2 - kernel image file
--#   $3 - kernel map file
--#   $4 - default install path (blank if root directory)
--#
--
--verify () {
--	if [ ! -f "$1" ]; then
--		echo ""                                                   1>&2
--		echo " *** Missing file: $1"                              1>&2
--		echo ' *** You need to run "make" before "make install".' 1>&2
--		echo ""                                                   1>&2
--		exit 1
--	fi
--}
--
--# Make sure the files actually exist
--verify "$2"
--verify "$3"
--
--# User may have a custom install script
--
--if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
--if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
--
--# Default install - same as make zlilo
--
--if [ -f $4/vmlinuz ]; then
--	mv $4/vmlinuz $4/vmlinuz.old
--fi
--
--if [ -f $4/System.map ]; then
--	mv $4/System.map $4/System.old
--fi
--
--cat $2 > $4/vmlinuz
--cp $3 $4/System.map
--
--sync
---- a/arch/nds32/boot/Makefile
-+++ b/arch/nds32/boot/Makefile
-@@ -8,9 +8,9 @@ $(obj)/Image.gz: $(obj)/Image FORCE
- 	$(call if_changed,gzip)
- 
- install: $(obj)/Image
--	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
-+	$(CONFIG_SHELL) $(srctree)/scripts/install.sh $(KERNELRELEASE) \
- 	$(obj)/Image System.map "$(INSTALL_PATH)"
- 
- zinstall: $(obj)/Image.gz
--	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
-+	$(CONFIG_SHELL) $(srctree)/scripts/install.sh $(KERNELRELEASE) \
- 	$(obj)/Image.gz System.map "$(INSTALL_PATH)"
---- a/arch/nios2/boot/Makefile
-+++ b/arch/nios2/boot/Makefile
-@@ -32,4 +32,4 @@ $(obj)/compressed/vmlinux: $(obj)/vmlinu
- 	$(Q)$(MAKE) $(build)=$(obj)/compressed $@
- 
- install:
--	sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
-+	sh $(srctree)/scripts/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
---- a/arch/nios2/boot/install.sh
-+++ /dev/null
-@@ -1,52 +0,0 @@
--#!/bin/sh
--#
--# This file is subject to the terms and conditions of the GNU General Public
--# License.  See the file "COPYING" in the main directory of this archive
--# for more details.
--#
--# Copyright (C) 1995 by Linus Torvalds
--#
--# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
--#
--# "make install" script for nios2 architecture
--#
--# Arguments:
--#   $1 - kernel version
--#   $2 - kernel image file
--#   $3 - kernel map file
--#   $4 - default install path (blank if root directory)
--#
--
--verify () {
--	if [ ! -f "$1" ]; then
--		echo ""                                                   1>&2
--		echo " *** Missing file: $1"                              1>&2
--		echo ' *** You need to run "make" before "make install".' 1>&2
--		echo ""                                                   1>&2
--		exit 1
--	fi
--}
--
--# Make sure the files actually exist
--verify "$2"
--verify "$3"
--
--# User may have a custom install script
--
--if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
--if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
--
--# Default install - same as make zlilo
--
--if [ -f $4/vmlinuz ]; then
--	mv $4/vmlinuz $4/vmlinuz.old
--fi
--
--if [ -f $4/System.map ]; then
--	mv $4/System.map $4/System.old
--fi
--
--cat $2 > $4/vmlinuz
--cp $3 $4/System.map
--
--sync
---- a/arch/parisc/Makefile
-+++ b/arch/parisc/Makefile
-@@ -164,10 +164,10 @@ vmlinuz: vmlinux
- endif
- 
- install:
--	$(CONFIG_SHELL) $(srctree)/arch/parisc/install.sh \
-+	$(CONFIG_SHELL) $(srctree)/scripts/install.sh \
- 			$(KERNELRELEASE) vmlinux System.map "$(INSTALL_PATH)"
- zinstall:
--	$(CONFIG_SHELL) $(srctree)/arch/parisc/install.sh \
-+	$(CONFIG_SHELL) $(srctree)/scripts/install.sh \
- 			$(KERNELRELEASE) vmlinuz System.map "$(INSTALL_PATH)"
- 
- CLEAN_FILES	+= lifimage
---- a/arch/parisc/boot/Makefile
-+++ b/arch/parisc/boot/Makefile
-@@ -17,5 +17,5 @@ $(obj)/compressed/vmlinux: FORCE
- 	$(Q)$(MAKE) $(build)=$(obj)/compressed $@
- 
- install: $(CONFIGURE) $(obj)/bzImage
--	sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \
-+	sh -x  $(srctree)/scripts/install.sh $(KERNELRELEASE) $(obj)/bzImage \
- 	      System.map "$(INSTALL_PATH)"
---- a/arch/parisc/boot/install.sh
-+++ /dev/null
-@@ -1,65 +0,0 @@
--#!/bin/sh
--#
--# arch/parisc/install.sh, derived from arch/i386/boot/install.sh
--#
--# This file is subject to the terms and conditions of the GNU General Public
--# License.  See the file "COPYING" in the main directory of this archive
--# for more details.
--#
--# Copyright (C) 1995 by Linus Torvalds
--#
--# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
--#
--# "make install" script for i386 architecture
--#
--# Arguments:
--#   $1 - kernel version
--#   $2 - kernel image file
--#   $3 - kernel map file
--#   $4 - default install path (blank if root directory)
--#
--
--verify () {
--	if [ ! -f "$1" ]; then
--		echo ""                                                   1>&2
--		echo " *** Missing file: $1"                              1>&2
--		echo ' *** You need to run "make" before "make install".' 1>&2
--		echo ""                                                   1>&2
--		exit 1
--	fi
--}
--
--# Make sure the files actually exist
--
--verify "$2"
--verify "$3"
--
--# User may have a custom install script
--
--if [ -n "${INSTALLKERNEL}" ]; then
--  if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
--  if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
--fi
--
--# Default install
--
--if [ "$(basename $2)" = "zImage" ]; then
--# Compressed install
--  echo "Installing compressed kernel"
--  base=vmlinuz
--else
--# Normal install
--  echo "Installing normal kernel"
--  base=vmlinux
--fi
--
--if [ -f $4/$base-$1 ]; then
--  mv $4/$base-$1 $4/$base-$1.old
--fi
--cat $2 > $4/$base-$1
--
--# Install system map file
--if [ -f $4/System.map-$1 ]; then
--  mv $4/System.map-$1 $4/System.map-$1.old
--fi
--cp $3 $4/System.map-$1
---- a/arch/parisc/install.sh
-+++ /dev/null
-@@ -1,66 +0,0 @@
--#!/bin/sh
--#
--# arch/parisc/install.sh, derived from arch/i386/boot/install.sh
--#
--# This file is subject to the terms and conditions of the GNU General Public
--# License.  See the file "COPYING" in the main directory of this archive
--# for more details.
--#
--# Copyright (C) 1995 by Linus Torvalds
--#
--# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
--#
--# "make install" script for i386 architecture
--#
--# Arguments:
--#   $1 - kernel version
--#   $2 - kernel image file
--#   $3 - kernel map file
--#   $4 - default install path (blank if root directory)
--#
--
--verify () {
--	if [ ! -f "$1" ]; then
--		echo ""                                                   1>&2
--		echo " *** Missing file: $1"                              1>&2
--		echo ' *** You need to run "make" before "make install".' 1>&2
--		echo ""                                                   1>&2
--		exit 1
--	fi
--}
--
--# Make sure the files actually exist
--
--verify "$2"
--verify "$3"
--
--# User may have a custom install script
--
--if [ -n "${INSTALLKERNEL}" ]; then
--  if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
--  if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
--fi
--
--# Default install
--
--if [ "$(basename $2)" = "vmlinuz" ]; then
--# Compressed install
--  echo "Installing compressed kernel"
--  base=vmlinuz
--else
--# Normal install
--  echo "Installing normal kernel"
--  base=vmlinux
--fi
--
--if [ -f $4/$base-$1 ]; then
--  mv $4/$base-$1 $4/$base-$1.old
--fi
--cat $2 > $4/$base-$1
--
--# Install system map file
--if [ -f $4/System.map-$1 ]; then
--  mv $4/System.map-$1 $4/System.map-$1.old
--fi
--cp $3 $4/System.map-$1
--
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -442,11 +442,11 @@ $(obj)/zImage.initrd:	$(addprefix $(obj)
- 
- # Only install the vmlinux
- install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
--	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)"
-+	sh -x $(srctree)/scripts/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)"
- 
- # Install the vmlinux and other built boot targets.
- zInstall: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
--	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $^
-+	sh -x $(srctree)/scripts/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $^
- 
- PHONY += install zInstall
- 
---- a/arch/powerpc/boot/install.sh
-+++ /dev/null
-@@ -1,55 +0,0 @@
--#!/bin/sh
--#
--# This file is subject to the terms and conditions of the GNU General Public
--# License.  See the file "COPYING" in the main directory of this archive
--# for more details.
--#
--# Copyright (C) 1995 by Linus Torvalds
--#
--# Blatantly stolen from in arch/i386/boot/install.sh by Dave Hansen 
--#
--# "make install" script for ppc64 architecture
--#
--# Arguments:
--#   $1 - kernel version
--#   $2 - kernel image file
--#   $3 - kernel map file
--#   $4 - default install path (blank if root directory)
--#   $5 and more - kernel boot files; zImage*, uImage, cuImage.*, etc.
--#
--
--# Bail with error code if anything goes wrong
--set -e
--
--# User may have a custom install script
--
--if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
--if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
--
--# Default install
--
--# this should work for both the pSeries zImage and the iSeries vmlinux.sm
--image_name=`basename $2`
--
--if [ -f $4/$image_name ]; then
--	mv $4/$image_name $4/$image_name.old
--fi
--
--if [ -f $4/System.map ]; then
--	mv $4/System.map $4/System.old
--fi
--
--cat $2 > $4/$image_name
--cp $3 $4/System.map
--
--# Copy all the bootable image files
--path=$4
--shift 4
--while [ $# -ne 0 ]; do
--	image_name=`basename $1`
--	if [ -f $path/$image_name ]; then
--		mv $path/$image_name $path/$image_name.old
--	fi
--	cat $1 > $path/$image_name
--	shift
--done;
---- a/arch/riscv/boot/Makefile
-+++ b/arch/riscv/boot/Makefile
-@@ -60,9 +60,9 @@ $(obj)/loader.bin: $(obj)/loader FORCE
- 	$(call if_changed,objcopy)
- 
- install:
--	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
-+	$(CONFIG_SHELL) $(srctree)/scripts/install.sh $(KERNELRELEASE) \
- 	$(obj)/Image System.map "$(INSTALL_PATH)"
- 
- zinstall:
--	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
-+	$(CONFIG_SHELL) $(srctree)/scripts/install.sh $(KERNELRELEASE) \
- 	$(obj)/Image.gz System.map "$(INSTALL_PATH)"
---- a/arch/riscv/boot/install.sh
-+++ /dev/null
-@@ -1,60 +0,0 @@
--#!/bin/sh
--#
--# arch/riscv/boot/install.sh
--#
--# This file is subject to the terms and conditions of the GNU General Public
--# License.  See the file "COPYING" in the main directory of this archive
--# for more details.
--#
--# Copyright (C) 1995 by Linus Torvalds
--#
--# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
--# Adapted from code in arch/i386/boot/install.sh by Russell King
--#
--# "make install" script for the RISC-V Linux port
--#
--# Arguments:
--#   $1 - kernel version
--#   $2 - kernel image file
--#   $3 - kernel map file
--#   $4 - default install path (blank if root directory)
--#
--
--verify () {
--	if [ ! -f "$1" ]; then
--		echo ""                                                   1>&2
--		echo " *** Missing file: $1"                              1>&2
--		echo ' *** You need to run "make" before "make install".' 1>&2
--		echo ""                                                   1>&2
--		exit 1
--	fi
--}
--
--# Make sure the files actually exist
--verify "$2"
--verify "$3"
--
--# User may have a custom install script
--if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
--if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
--
--if [ "$(basename $2)" = "Image.gz" ]; then
--# Compressed install
--  echo "Installing compressed kernel"
--  base=vmlinuz
--else
--# Normal install
--  echo "Installing normal kernel"
--  base=vmlinux
--fi
--
--if [ -f $4/$base-$1 ]; then
--  mv $4/$base-$1 $4/$base-$1.old
--fi
--cat $2 > $4/$base-$1
--
--# Install system map file
--if [ -f $4/System.map-$1 ]; then
--  mv $4/System.map-$1 $4/System.map-$1.old
--fi
--cp $3 $4/System.map-$1
---- a/arch/s390/boot/Makefile
-+++ b/arch/s390/boot/Makefile
-@@ -71,5 +71,5 @@ $(obj)/startup.a: $(OBJECTS) FORCE
- 	$(call if_changed,ar)
- 
- install:
--	sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \
-+	sh -x  $(srctree)/scripts/install.sh $(KERNELRELEASE) $(obj)/bzImage \
- 	      System.map "$(INSTALL_PATH)"
---- a/arch/s390/boot/install.sh
-+++ /dev/null
-@@ -1,30 +0,0 @@
--#!/bin/sh
--# SPDX-License-Identifier: GPL-2.0
--#
--# arch/s390x/boot/install.sh
--#
--# Copyright (C) 1995 by Linus Torvalds
--#
--# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
--#
--# "make install" script for s390 architecture
--#
--# Arguments:
--#   $1 - kernel version
--#   $2 - kernel image file
--#   $3 - kernel map file
--#   $4 - default install path (blank if root directory)
--#
--
--# User may have a custom install script
--
--if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
--if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
--
--echo "Warning: '${INSTALLKERNEL}' command not available - additional " \
--     "bootloader config required" >&2
--if [ -f $4/vmlinuz-$1 ]; then mv $4/vmlinuz-$1 $4/vmlinuz-$1.old; fi
--if [ -f $4/System.map-$1 ]; then mv $4/System.map-$1 $4/System.map-$1.old; fi
--
--cat $2 > $4/vmlinuz-$1
--cp $3 $4/System.map-$1
---- a/arch/sh/boot/compressed/install.sh
-+++ /dev/null
-@@ -1,56 +0,0 @@
--#!/bin/sh
--#
--# arch/sh/boot/install.sh
--#
--# This file is subject to the terms and conditions of the GNU General Public
--# License.  See the file "COPYING" in the main directory of this archive
--# for more details.
--#
--# Copyright (C) 1995 by Linus Torvalds
--#
--# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
--# Adapted from code in arch/i386/boot/install.sh by Russell King
--# Adapted from code in arch/arm/boot/install.sh by Stuart Menefy
--#
--# "make install" script for sh architecture
--#
--# Arguments:
--#   $1 - kernel version
--#   $2 - kernel image file
--#   $3 - kernel map file
--#   $4 - default install path (blank if root directory)
--#
--
--# User may have a custom install script
--
--if [ -x /sbin/${INSTALLKERNEL} ]; then
--  exec /sbin/${INSTALLKERNEL} "$@"
--fi
--
--if [ "$2" = "zImage" ]; then
--# Compressed install
--  echo "Installing compressed kernel"
--  if [ -f $4/vmlinuz-$1 ]; then
--    mv $4/vmlinuz-$1 $4/vmlinuz.old
--  fi
--
--  if [ -f $4/System.map-$1 ]; then
--    mv $4/System.map-$1 $4/System.old
--  fi
--
--  cat $2 > $4/vmlinuz-$1
--  cp $3 $4/System.map-$1
--else
--# Normal install
--  echo "Installing normal kernel"
--  if [ -f $4/vmlinux-$1 ]; then
--    mv $4/vmlinux-$1 $4/vmlinux.old
--  fi
--
--  if [ -f $4/System.map ]; then
--    mv $4/System.map $4/System.old
--  fi
--
--  cat $2 > $4/vmlinux-$1
--  cp $3 $4/System.map
--fi
---- a/arch/sparc/boot/Makefile
-+++ b/arch/sparc/boot/Makefile
-@@ -72,5 +72,5 @@ $(obj)/tftpboot.img: $(obj)/image $(obj)
- 	$(call if_changed,piggy)
- 
- install:
--	sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(obj)/zImage \
-+	sh $(srctree)/scripts/install.sh $(KERNELRELEASE) $(obj)/zImage \
- 		System.map "$(INSTALL_PATH)"
---- a/arch/sparc/boot/install.sh
-+++ /dev/null
-@@ -1,50 +0,0 @@
--#!/bin/sh
--#
--# This file is subject to the terms and conditions of the GNU General Public
--# License.  See the file "COPYING" in the main directory of this archive
--# for more details.
--#
--# Copyright (C) 1995 by Linus Torvalds
--#
--# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
--#
--# "make install" script for SPARC architecture
--#
--# Arguments:
--#   $1 - kernel version
--#   $2 - kernel image file
--#   $3 - kernel map file
--#   $4 - default install path (blank if root directory)
--#
--
--verify () {
--	if [ ! -f "$1" ]; then
--		echo ""                                                   1>&2
--		echo " *** Missing file: $1"                              1>&2
--		echo ' *** You need to run "make" before "make install".' 1>&2
--		echo ""                                                   1>&2
--		exit 1
--	fi
--}
--
--# Make sure the files actually exist
--verify "$2"
--verify "$3"
--
--# User may have a custom install script
--
--if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
--if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
--
--# Default install - same as make zlilo
--
--if [ -f $4/vmlinuz ]; then
--	mv $4/vmlinuz $4/vmlinuz.old
--fi
--
--if [ -f $4/System.map ]; then
--	mv $4/System.map $4/System.old
--fi
--
--cat $2 > $4/vmlinuz
--cp $3 $4/System.map
---- a/arch/x86/boot/Makefile
-+++ b/arch/x86/boot/Makefile
-@@ -157,5 +157,5 @@ bzlilo:
- 	if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi
- 
- install:
--	sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(obj)/bzImage \
-+	sh $(srctree)/scripts/install.sh $(KERNELRELEASE) $(obj)/bzImage \
- 		System.map "$(INSTALL_PATH)"
---- a/arch/x86/boot/install.sh
-+++ /dev/null
-@@ -1,59 +0,0 @@
--#!/bin/sh
--#
--# This file is subject to the terms and conditions of the GNU General Public
--# License.  See the file "COPYING" in the main directory of this archive
--# for more details.
--#
--# Copyright (C) 1995 by Linus Torvalds
--#
--# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
--#
--# "make install" script for i386 architecture
--#
--# Arguments:
--#   $1 - kernel version
--#   $2 - kernel image file
--#   $3 - kernel map file
--#   $4 - default install path (blank if root directory)
--#
--
--verify () {
--	if [ ! -f "$1" ]; then
--		echo ""                                                   1>&2
--		echo " *** Missing file: $1"                              1>&2
--		echo ' *** You need to run "make" before "make install".' 1>&2
--		echo ""                                                   1>&2
--		exit 1
-- 	fi
--}
--
--# Make sure the files actually exist
--verify "$2"
--verify "$3"
--
--# User may have a custom install script
--
--if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
--if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
--
--# Default install - same as make zlilo
--
--if [ -f $4/vmlinuz ]; then
--	mv $4/vmlinuz $4/vmlinuz.old
--fi
--
--if [ -f $4/System.map ]; then
--	mv $4/System.map $4/System.old
--fi
--
--cat $2 > $4/vmlinuz
--cp $3 $4/System.map
--
--if [ -x /sbin/lilo ]; then
--       /sbin/lilo
--elif [ -x /etc/lilo/install ]; then
--       /etc/lilo/install
--else
--       sync
--       echo "Cannot find LILO."
--fi
---- /dev/null
-+++ b/scripts/install.sh
-@@ -0,0 +1,122 @@
-+#!/bin/sh
-+# SPDX-License-Identifier: GPL-2.0
-+#
-+# Copyright (C) 1995 Linus Torvalds
-+# Copyright (C) 2021 Greg Kroah-Hartman
-+#
-+# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
-+# Adapted from code in arch/i386/boot/install.sh by Russell King
-+#
-+# "make install" script for the kernel
-+#
-+# Arguments:
-+#   $1 - kernel version
-+#   $2 - kernel image file
-+#   $3 - kernel map file
-+#   $4 - default install path (blank if root directory)
-+#
-+# Installs the built kernel image and map and symbol file in the specified
-+# install location.  If no install path is selected, the files will be placed
-+# in the root directory.
-+#
-+# The name of the kernel image will be "vmlinux-VERSION" for uncompressed
-+# kernels or "vmlinuz-VERSION' for compressed kernels.
-+#
-+# The kernel map file will be named "System.map-VERSION"
-+#
-+# If there is currently a kernel image or kernel map file present with the name
-+# of the file to be copied to the location, it will be renamed to contain a
-+# ".old" suffix.
-+#
-+# If ~/bin/${INSTALLKERNEL} or /sbin/${INSTALLKERNEL} is executable, execution
-+# will be passed to that program instead of this one to allow for distro or
-+# system specific installation scripts to be used.
-+
-+verify () {
-+	if [ ! -f "${1}" ]; then
-+		echo ""                                                   1>&2
-+		echo " *** Missing file: ${1}"                            1>&2
-+		echo ' *** You need to run "make" before "make install".' 1>&2
-+		echo ""                                                   1>&2
-+		exit 1
-+	fi
-+}
-+
-+install () {
-+	install_source=${1}
-+	install_target=${2}
-+
-+	echo "installing '${install_source}' to '${install_target}'"
-+
-+	# if the target is already present, move it to a .old filename
-+	if [ -f "${install_target}" ]; then
-+		mv "${install_target}" "${install_target}".old
-+	fi
-+	cat "${install_source}" > "${install_target}"
-+}
-+
-+# Make sure the files actually exist
-+verify "${2}"
-+verify "${3}"
-+
-+# User may have a custom install script, if so, call that instead.
-+if [ -x ~/bin/"${INSTALLKERNEL}" ]; then exec ~/bin/"${INSTALLKERNEL}" "$@"; fi
-+if [ -x /sbin/"${INSTALLKERNEL}" ]; then exec /sbin/"${INSTALLKERNEL}" "$@"; fi
-+
-+base=$(basename "${2}")
-+if [ "${base}" = "zImage" ] ||
-+   [ "${base}" = "Image.gz" ] ||
-+   [ "${base}" = "bzImage" ]; then
-+	# Compressed install
-+	echo "Installing compressed kernel"
-+	base=vmlinuz
-+else
-+	# Normal install
-+	echo "Installing normal kernel"
-+	base=vmlinux
-+fi
-+
-+# Install kernel image
-+install "${2}" "${4}"/"${base}"-"${1}"
-+
-+# Install system map file
-+install "${3}" "${4}"/System.map-"${1}"
-+
-+sync
-+
-+# Odd arch specific stuff here when needed:
-+case "${ARCH}" in
-+	arm)
-+		if [ -x /sbin/loadmap ]; then
-+			/sbin/loadmap
-+		else
-+			echo "You have to install it yourself"
-+		fi
-+		;;
-+	ia64)
-+		if [ -x /usr/sbin/elilo ]; then
-+			/usr/sbin/elilo
-+		fi
-+		;;
-+	powerpc)
-+		# powerpc installation can list other boot targets after the
-+		# install path that should be copied to the correct location
-+		path=$4
-+		shift 4
-+		while [ $# -ne 0 ]; do
-+			image_name=$(basename "${1}")
-+			install "${1}" "${path}"/"${image_name}"
-+			shift
-+		done;
-+		sync
-+		;;
-+	x86)
-+		if [ -x /sbin/lilo ]; then
-+			/sbin/lilo
-+		elif [ -x /etc/lilo/install ]; then
-+			/etc/lilo/install
-+		else
-+			echo "Cannot find LILO, ensure your bootloader knows of the new kernel image."
-+		fi
-+		;;
-+esac
diff --git a/0001-readfile-implement-readfile-syscall.patch b/0001-readfile-implement-readfile-syscall.patch
index 84effce170dcd7..2a9ab13b86f32e 100644
--- a/0001-readfile-implement-readfile-syscall.patch
+++ b/0001-readfile-implement-readfile-syscall.patch
@@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/fs/open.c
 +++ b/fs/open.c
-@@ -1525,3 +1525,53 @@ int stream_open(struct inode *inode, str
+@@ -1572,3 +1572,53 @@ int stream_open(struct inode *inode, str
  }
  
  EXPORT_SYMBOL(stream_open);
diff --git a/0001-vsmp-driver.patch b/0001-vsmp-driver.patch
index 88c94c386c7960..9194070356ce92 100644
--- a/0001-vsmp-driver.patch
+++ b/0001-vsmp-driver.patch
@@ -28,7 +28,7 @@ first cut to cleanup
 +Description:    Shows the full version of the vSMP hypervisor
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -22364,6 +22364,12 @@ F:	lib/test_printf.c
+@@ -22634,6 +22634,12 @@ F:	lib/test_printf.c
  F:	lib/test_scanf.c
  F:	lib/vsprintf.c
  
diff --git a/0003-selftests-add-readfile-2-selftests.patch b/0003-selftests-add-readfile-2-selftests.patch
index 382331f1d3eed3..68eecc16d4dff7 100644
--- a/0003-selftests-add-readfile-2-selftests.patch
+++ b/0003-selftests-add-readfile-2-selftests.patch
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/tools/testing/selftests/Makefile
 +++ b/tools/testing/selftests/Makefile
-@@ -65,6 +65,7 @@ TARGETS += resctrl
+@@ -68,6 +68,7 @@ TARGETS += riscv
  TARGETS += rlimits
  TARGETS += rseq
  TARGETS += rtc
diff --git a/documentation-embargoed-hardware-issues.rst-clean-out-empty-and-unused-entries.patch b/documentation-embargoed-hardware-issues.rst-clean-out-empty-and-unused-entries.patch
new file mode 100644
index 00000000000000..75851fe943d3ce
--- /dev/null
+++ b/documentation-embargoed-hardware-issues.rst-clean-out-empty-and-unused-entries.patch
@@ -0,0 +1,44 @@
+From foo@baz Fri Jun 16 10:09:56 AM CEST 2023
+Date: Fri, 16 Jun 2023 10:09:56 +0200
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: [PATCH] Documentation: embargoed-hardware-issues.rst: clean out empty and unused entries
+
+There are a few empty entries in the company/project list, which
+confuses people as to why they are there, so remove them entirely, and
+also remove an entry that doesn't wish to participate in this process.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/process/embargoed-hardware-issues.rst |    4 ----
+ 1 file changed, 4 deletions(-)
+
+--- a/Documentation/process/embargoed-hardware-issues.rst
++++ b/Documentation/process/embargoed-hardware-issues.rst
+@@ -244,7 +244,6 @@ disclosure of a particular issue, unless
+ an involved disclosed party. The current ambassadors list:
+ 
+   ============= ========================================================
+-  AMD		Tom Lendacky <thomas.lendacky@amd.com>
+   Ampere	Darren Hart <darren@os.amperecomputing.com>
+   ARM		Catalin Marinas <catalin.marinas@arm.com>
+   IBM Power	Anton Blanchard <anton@linux.ibm.com>
+@@ -254,7 +253,6 @@ an involved disclosed party. The current
+   Samsung	Javier González <javier.gonz@samsung.com>
+ 
+   Microsoft	James Morris <jamorris@linux.microsoft.com>
+-  VMware
+   Xen		Andrew Cooper <andrew.cooper3@citrix.com>
+ 
+   Canonical	John Johansen <john.johansen@canonical.com>
+@@ -263,10 +261,8 @@ an involved disclosed party. The current
+   Red Hat	Josh Poimboeuf <jpoimboe@redhat.com>
+   SUSE		Jiri Kosina <jkosina@suse.cz>
+ 
+-  Amazon
+   Google	Kees Cook <keescook@chromium.org>
+ 
+-  GCC
+   LLVM		Nick Desaulniers <ndesaulniers@google.com>
+   ============= ========================================================
+ 
diff --git a/pmu_attr_visible.patch b/pmu_attr_visible.patch
new file mode 100644
index 00000000000000..f5af16a1b22c59
--- /dev/null
+++ b/pmu_attr_visible.patch
@@ -0,0 +1,63 @@
+---
+ kernel/events/core.c |   40 ++++++++++++++++++++++++++++------------
+ 1 file changed, 28 insertions(+), 12 deletions(-)
+
+--- a/kernel/events/core.c
++++ b/kernel/events/core.c
+@@ -11351,9 +11351,32 @@ static DEVICE_ATTR_RW(perf_event_mux_int
+ static struct attribute *pmu_dev_attrs[] = {
+ 	&dev_attr_type.attr,
+ 	&dev_attr_perf_event_mux_interval_ms.attr,
++	&dev_attr_nr_addr_filters.attr,
++	NULL,
++};
++
++static umode_t pmu_dev_is_visible(struct kobject *kobj, struct attribute *a, int n)
++{
++	struct device *dev = kobj_to_dev(kobj);
++	struct pmu *pmu = dev_get_drvdata(dev);
++
++	if (!pmu->nr_addr_filters)
++		return 0;
++
++	return a->mode;
++
++	return 0;
++}
++
++static struct attribute_group pmu_dev_attr_group = {
++	.is_visible = pmu_dev_is_visible,
++	.attrs = pmu_dev_attrs,
++};
++
++const static struct attribute_group *pmu_dev_groups[] = {
++	&pmu_dev_attr_group,
+ 	NULL,
+ };
+-ATTRIBUTE_GROUPS(pmu_dev);
+ 
+ static int pmu_bus_running;
+ static struct bus_type pmu_bus = {
+@@ -11389,18 +11412,11 @@ static int pmu_dev_alloc(struct pmu *pmu
+ 	if (ret)
+ 		goto free_dev;
+ 
+-	/* For PMUs with address filters, throw in an extra attribute: */
+-	if (pmu->nr_addr_filters)
+-		ret = device_create_file(pmu->dev, &dev_attr_nr_addr_filters);
+-
+-	if (ret)
+-		goto del_dev;
+-
+-	if (pmu->attr_update)
++	if (pmu->attr_update) {
+ 		ret = sysfs_update_groups(&pmu->dev->kobj, pmu->attr_update);
+-
+-	if (ret)
+-		goto del_dev;
++		if (ret)
++			goto del_dev;
++	}
+ 
+ out:
+ 	return ret;
diff --git a/qlcnic_sysfs.patch b/qlcnic_sysfs.patch
index a3c5a94e529c1e..5eb02aeabc25ed 100644
--- a/qlcnic_sysfs.patch
+++ b/qlcnic_sysfs.patch
@@ -4,7 +4,7 @@
 
 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
-@@ -32,9 +32,9 @@ int qlcnicvf_config_led(struct qlcnic_ad
+@@ -31,9 +31,9 @@ int qlcnicvf_config_led(struct qlcnic_ad
  	return -EOPNOTSUPP;
  }
  
@@ -17,7 +17,7 @@
  {
  	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
  	unsigned long new;
-@@ -56,9 +56,8 @@ err_out:
+@@ -55,9 +55,8 @@ err_out:
  	return ret;
  }
  
@@ -29,7 +29,7 @@
  {
  	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
  	int bridged_mode = 0;
-@@ -68,10 +67,11 @@ static ssize_t qlcnic_show_bridged_mode(
+@@ -67,10 +66,11 @@ static ssize_t qlcnic_show_bridged_mode(
  
  	return sprintf(buf, "%d\n", bridged_mode);
  }
@@ -44,7 +44,7 @@
  {
  	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
  	unsigned long new;
-@@ -85,12 +85,13 @@ static ssize_t qlcnic_store_diag_mode(st
+@@ -84,12 +84,13 @@ static ssize_t qlcnic_store_diag_mode(st
  	return len;
  }
  
@@ -60,7 +60,7 @@
  
  static int qlcnic_validate_beacon(struct qlcnic_adapter *adapter, u16 beacon,
  				  u8 *state, u8 *rate)
-@@ -211,9 +212,8 @@ out:
+@@ -210,9 +211,8 @@ out:
  	return err;
  }
  
@@ -72,7 +72,7 @@
  {
  	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
  	int err = 0;
-@@ -234,8 +234,8 @@ static ssize_t qlcnic_store_beacon(struc
+@@ -233,8 +233,8 @@ static ssize_t qlcnic_store_beacon(struc
  	return err;
  }
  
@@ -83,7 +83,7 @@
  {
  	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
  
-@@ -263,6 +263,7 @@ static int qlcnic_sysfs_validate_crb(str
+@@ -262,6 +262,7 @@ static int qlcnic_sysfs_validate_crb(str
  
  	return 0;
  }
@@ -91,7 +91,7 @@
  
  static ssize_t qlcnic_sysfs_read_crb(struct file *filp, struct kobject *kobj,
  				     struct bin_attribute *attr, char *buf,
-@@ -1175,24 +1176,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w
+@@ -1174,24 +1175,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w
  	return size;
  }
  
@@ -116,7 +116,7 @@
  static const struct bin_attribute bin_attr_crb = {
  	.attr = { .name = "crb", .mode = 0644 },
  	.size = 0,
-@@ -1318,6 +1301,24 @@ void qlcnic_unregister_hwmon_dev(struct
+@@ -1317,6 +1300,24 @@ void qlcnic_unregister_hwmon_dev(struct
  }
  #endif
  
@@ -141,7 +141,7 @@
  void qlcnic_create_sysfs_entries(struct qlcnic_adapter *adapter)
  {
  	struct device *dev = &adapter->pdev->dev;
-@@ -1331,6 +1332,11 @@ void qlcnic_create_sysfs_entries(struct
+@@ -1330,6 +1331,11 @@ void qlcnic_create_sysfs_entries(struct
  void qlcnic_remove_sysfs_entries(struct qlcnic_adapter *adapter)
  {
  	struct device *dev = &adapter->pdev->dev;
diff --git a/series b/series
index 07d613df209db7..81b604e97fa7e3 100644
--- a/series
+++ b/series
@@ -1,4 +1,6 @@
 #
+pmu_attr_visible.patch
+documentation-embargoed-hardware-issues.rst-clean-out-empty-and-unused-entries.patch
 usb.patch
 0001-vsmp-driver.patch
 0001-driver-core-aux-test-code.patch
@@ -11,7 +13,6 @@ spdxcheck-print-out-files-without-any-spdx-lines.patch
 
 
 
-0001-Kbuild-provide-a-common-kernel-installation-script.patch
 
 
 ## broken patch!
diff --git a/usb.patch b/usb.patch
index 68f471ef2e2555..bfaed2e78bb9b1 100644
--- a/usb.patch
+++ b/usb.patch
@@ -4,9 +4,9 @@
 
 --- a/drivers/usb/storage/unusual_uas.h
 +++ b/drivers/usb/storage/unusual_uas.h
-@@ -111,6 +111,17 @@ UNUSUAL_DEV(0x152d, 0x0578, 0x0000, 0x99
+@@ -118,6 +118,17 @@ UNUSUAL_DEV(0x152d, 0x0583, 0x0000, 0x99
  		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
- 		US_FL_BROKEN_FUA),
+ 		US_FL_NO_REPORT_OPCODES),
  
 +/* Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> */
 +UNUSUAL_DEV(0x152d, 0x0583, 0x0000, 0x9999,