Update to 5.5-rc5

Drop patches that were applied upstream.

7 files changed, 1 insertions, 301 deletions

diff --git a/debian/changelog b/debian/changelog
index c7445811df7b..a736fc74e4bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-linux (5.5~rc4-1~exp1) UNRELEASED; urgency=medium
+linux (5.5~rc5-1~exp1) UNRELEASED; urgency=medium
 
   * New upstream release candidate
 
diff --git a/debian/patches/bugfix/all/0001-libtraceevent-Fix-header-installation.patch b/debian/patches/bugfix/all/0001-libtraceevent-Fix-header-installation.patch
deleted file mode 100644
index cfed7f0b2a76..000000000000
--- a/debian/patches/bugfix/all/0001-libtraceevent-Fix-header-installation.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-Date: Thu, 14 Nov 2019 13:37:19 +0000
-Subject: [PATCH 1/5] libtraceevent: Fix header installation
-Origin: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=68401a1799fa14cb72c2a129bbefdacd44279772
-
-When we passed some location in DESTDIR, install_headers called
-do_install with DESTDIR as part of the second argument.
-
-But do_install is again using '$(DESTDIR_SQ)$2', so as a result the
-headers were installed in a location $DESTDIR/$DESTDIR.
-
-In my testing I passed DESTDIR=/home/sudip/test and the headers were
-installed in: /home/sudip/test/home/sudip/test/usr/include/traceevent.
-
-Lets remove DESTDIR from the second argument of do_install so that the
-headers are installed in the correct location.
-
-Signed-off-by: Sudipm Mukherjee <sudipm.mukherjee@gmail.com>
-Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-Cc: Sudipm Mukherjee <sudipm.mukherjee@gmail.com>
-Cc: linux-trace-devel@vger.kernel.org
-Link: http://lore.kernel.org/lkml/20191114133719.309-1-sudipm.mukherjee@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
----
- tools/lib/traceevent/Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
-index 5315f3787f8d..cbb429f55062 100644
---- a/tools/lib/traceevent/Makefile
-+++ b/tools/lib/traceevent/Makefile
-@@ -232,10 +232,10 @@ install_pkgconfig:
- 
- install_headers:
- 	$(call QUIET_INSTALL, headers) \
--		$(call do_install,event-parse.h,$(DESTDIR)$(includedir_SQ),644); \
--		$(call do_install,event-utils.h,$(DESTDIR)$(includedir_SQ),644); \
--		$(call do_install,trace-seq.h,$(DESTDIR)$(includedir_SQ),644); \
--		$(call do_install,kbuffer.h,$(DESTDIR)$(includedir_SQ),644)
-+		$(call do_install,event-parse.h,$(includedir_SQ),644); \
-+		$(call do_install,event-utils.h,$(includedir_SQ),644); \
-+		$(call do_install,trace-seq.h,$(includedir_SQ),644); \
-+		$(call do_install,kbuffer.h,$(includedir_SQ),644)
- 
- install: install_lib
- 
--- 
-2.11.0
-
diff --git a/debian/patches/bugfix/all/0002-libtraceevent-Fix-lib-installation-with-O.patch b/debian/patches/bugfix/all/0002-libtraceevent-Fix-lib-installation-with-O.patch
deleted file mode 100644
index 28eede20e8f3..000000000000
--- a/debian/patches/bugfix/all/0002-libtraceevent-Fix-lib-installation-with-O.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-Date: Fri, 15 Nov 2019 11:36:09 +0000
-Subject: [PATCH 2/5] libtraceevent: Fix lib installation with O=
-Origin: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=587db8ebdac2c5eb3a8851e16b26f2e2711ab797
-
-When we use 'O=' with make to build libtraceevent in a separate folder
-it fails to install libtraceevent.a and libtraceevent.so.1.1.0 with the
-error:
-
-  INSTALL  /home/sudip/linux/obj-trace/libtraceevent.a
-  INSTALL  /home/sudip/linux/obj-trace/libtraceevent.so.1.1.0
-
-  cp: cannot stat 'libtraceevent.a': No such file or directory
-  Makefile:225: recipe for target 'install_lib' failed
-  make: *** [install_lib] Error 1
-
-I used the command:
-
-  make O=../../../obj-trace DESTDIR=~/test prefix==/usr  install
-
-It turns out libtraceevent Makefile, even though it builds in a separate
-folder, searches for libtraceevent.a and libtraceevent.so.1.1.0 in its
-source folder.
-
-So, add the 'OUTPUT' prefix to the source path so that 'make' looks for
-the files in the correct place.
-
-Signed-off-by: Sudipm Mukherjee <sudipm.mukherjee@gmail.com>
-Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-Cc: linux-trace-devel@vger.kernel.org
-Link: http://lore.kernel.org/lkml/20191115113610.21493-1-sudipm.mukherjee@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
----
- tools/lib/traceevent/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
-index cbb429f55062..83446fe2cf01 100644
---- a/tools/lib/traceevent/Makefile
-+++ b/tools/lib/traceevent/Makefile
-@@ -97,6 +97,7 @@ EVENT_PARSE_VERSION = $(EP_VERSION).$(EP_PATCHLEVEL).$(EP_EXTRAVERSION)
- 
- LIB_TARGET  = libtraceevent.a libtraceevent.so.$(EVENT_PARSE_VERSION)
- LIB_INSTALL = libtraceevent.a libtraceevent.so*
-+LIB_INSTALL := $(addprefix $(OUTPUT),$(LIB_INSTALL))
- 
- INCLUDES = -I. -I $(srctree)/tools/include $(CONFIG_INCLUDES)
- 
--- 
-2.11.0
-
diff --git a/debian/patches/bugfix/all/0003-libtraceevent-Copy-pkg-config-file-to-output-folder-.patch b/debian/patches/bugfix/all/0003-libtraceevent-Copy-pkg-config-file-to-output-folder-.patch
deleted file mode 100644
index 98cef470dc2a..000000000000
--- a/debian/patches/bugfix/all/0003-libtraceevent-Copy-pkg-config-file-to-output-folder-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-Date: Fri, 15 Nov 2019 11:36:10 +0000
-Subject: [PATCH 3/5] libtraceevent: Copy pkg-config file to output folder when using O=
-Origin: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=15b3904f8e884e0d34d5f09906cf6526d0b889a2
-
-When we use 'O=' with make to build libtraceevent in a separate folder
-it still copies 'libtraceevent.pc' to its source folder. Modify the
-Makefile so that it uses the output folder to copy the pkg-config file
-and install from there.
-
-Signed-off-by: Sudipm Mukherjee <sudipm.mukherjee@gmail.com>
-Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-Cc: linux-trace-devel@vger.kernel.org
-Link: http://lore.kernel.org/lkml/20191115113610.21493-2-sudipm.mukherjee@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
----
- tools/lib/traceevent/Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
-index 83446fe2cf01..c5a03356a999 100644
---- a/tools/lib/traceevent/Makefile
-+++ b/tools/lib/traceevent/Makefile
-@@ -208,10 +208,11 @@ define do_install
- 	$(INSTALL) $(if $3,-m $3,) $1 '$(DESTDIR_SQ)$2'
- endef
- 
--PKG_CONFIG_FILE = libtraceevent.pc
-+PKG_CONFIG_SOURCE_FILE = libtraceevent.pc
-+PKG_CONFIG_FILE := $(addprefix $(OUTPUT),$(PKG_CONFIG_SOURCE_FILE))
- define do_install_pkgconfig_file
- 	if [ -n "${pkgconfig_dir}" ]; then 					\
--		cp -f ${PKG_CONFIG_FILE}.template ${PKG_CONFIG_FILE}; 		\
-+		cp -f ${PKG_CONFIG_SOURCE_FILE}.template ${PKG_CONFIG_FILE};	\
- 		sed -i "s|INSTALL_PREFIX|${1}|g" ${PKG_CONFIG_FILE}; 		\
- 		sed -i "s|LIB_VERSION|${EVENT_PARSE_VERSION}|g" ${PKG_CONFIG_FILE}; \
- 		sed -i "s|LIB_DIR|${libdir}|g" ${PKG_CONFIG_FILE}; \
--- 
-2.11.0
-
diff --git a/debian/patches/bugfix/all/0004-libtraceevent-allow-custom-libdir-path.patch b/debian/patches/bugfix/all/0004-libtraceevent-allow-custom-libdir-path.patch
deleted file mode 100644
index cb72df3e2268..000000000000
--- a/debian/patches/bugfix/all/0004-libtraceevent-allow-custom-libdir-path.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-Date: Sat, 7 Dec 2019 11:14:40 +0000
-Subject: [PATCH 4/5] libtraceevent: Allow custom libdir path
-Origin: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c09982f8e2bae80a66232630ec4ba50afacea486
-
-When I use prefix=/usr and try to install libtraceevent in my laptop it
-tries to install in /usr/lib64. I am not having any folder as /usr/lib64
-and also the debian policy doesnot allow installing in /usr/lib64. It
-should be in /usr/lib/x86_64-linux-gnu/.
-
-Quote: No package for a 64 bit architecture may install files in
-	/usr/lib64/ or in a subdirectory of it.
-
-ref: https://www.debian.org/doc/debian-policy/ch-opersys.html
-
-Make it more flexible by allowing to mention libdir_relative while
-installing so that distros can mention the path according to their
-policy or use the default one.
-
-Signed-off-by: Sudipm Mukherjee <sudipm.mukherjee@gmail.com>
-Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-Cc: Sudipm Mukherjee <sudipm.mukherjee@gmail.com>
-Cc: linux-trace-devel@vger.kernel.org
-Link: http://lore.kernel.org/lkml/20191207111440.6574-1-sudipm.mukherjee@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
----
- tools/lib/traceevent/Makefile         | 5 +++--
- tools/lib/traceevent/plugins/Makefile | 5 +++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
-index c5a03356a999..c874c017c636 100644
---- a/tools/lib/traceevent/Makefile
-+++ b/tools/lib/traceevent/Makefile
-@@ -39,11 +39,12 @@ DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))'
- 
- LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)
- ifeq ($(LP64), 1)
--  libdir_relative = lib64
-+  libdir_relative_temp = lib64
- else
--  libdir_relative = lib
-+  libdir_relative_temp = lib
- endif
- 
-+libdir_relative ?= $(libdir_relative_temp)
- prefix ?= /usr/local
- libdir = $(prefix)/$(libdir_relative)
- man_dir = $(prefix)/share/man
-diff --git a/tools/lib/traceevent/plugins/Makefile b/tools/lib/traceevent/plugins/Makefile
-index f440989fa55e..349bb81482ab 100644
---- a/tools/lib/traceevent/plugins/Makefile
-+++ b/tools/lib/traceevent/plugins/Makefile
-@@ -32,11 +32,12 @@ DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))'
- 
- LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)
- ifeq ($(LP64), 1)
--  libdir_relative = lib64
-+  libdir_relative_tmp = lib64
- else
--  libdir_relative = lib
-+  libdir_relative_tmp = lib
- endif
- 
-+libdir_relative ?= $(libdir_relative_tmp)
- prefix ?= /usr/local
- libdir = $(prefix)/$(libdir_relative)
- 
--- 
-2.11.0
-
diff --git a/debian/patches/features/all/lockdown/tracing-Do-not-create-directories-if-lockdown-is-in-.patch b/debian/patches/features/all/lockdown/tracing-Do-not-create-directories-if-lockdown-is-in-.patch
deleted file mode 100644
index ea827bdde6cd..000000000000
--- a/debian/patches/features/all/lockdown/tracing-Do-not-create-directories-if-lockdown-is-in-.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
-Date: Mon, 2 Dec 2019 16:25:27 -0500
-Subject: tracing: Do not create directories if lockdown is in affect
-Origin: https://git.kernel.org/linus/a356646a56857c2e5ad875beec734d7145ecd49a
-
-If lockdown is disabling tracing on boot up, it prevents the tracing files
-from even bering created. But when that happens, there's several places that
-will give a warning that the files were not created as that is usually a
-sign of a bug.
-
-Add in strategic locations where a check is made to see if tracing is
-disabled by lockdown, and if it is, do not go further, and fail silently
-(but print that tracing is disabled by lockdown, without doing a WARN_ON()).
-
-Cc: Matthew Garrett <mjg59@google.com>
-Fixes: 17911ff38aa5 ("tracing: Add locked_down checks to the open calls of files created for tracefs")
-Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
----
- kernel/trace/ring_buffer.c |  6 ++++++
- kernel/trace/trace.c       | 17 +++++++++++++++++
- 2 files changed, 23 insertions(+)
-
---- a/kernel/trace/ring_buffer.c
-+++ b/kernel/trace/ring_buffer.c
-@@ -11,6 +11,7 @@
- #include <linux/trace_seq.h>
- #include <linux/spinlock.h>
- #include <linux/irq_work.h>
-+#include <linux/security.h>
- #include <linux/uaccess.h>
- #include <linux/hardirq.h>
- #include <linux/kthread.h>	/* for self test */
-@@ -5068,6 +5069,11 @@ static __init int test_ringbuffer(void)
- 	int cpu;
- 	int ret = 0;
- 
-+	if (security_locked_down(LOCKDOWN_TRACEFS)) {
-+		pr_warning("Lockdown is enabled, skipping ring buffer tests\n");
-+		return 0;
-+	}
-+
- 	pr_info("Running ring buffer tests...\n");
- 
- 	buffer = ring_buffer_alloc(RB_TEST_BUFFER_SIZE, RB_FL_OVERWRITE);
---- a/kernel/trace/trace.c
-+++ b/kernel/trace/trace.c
-@@ -1804,6 +1804,12 @@ int __init register_tracer(struct tracer
- 		return -1;
- 	}
- 
-+	if (security_locked_down(LOCKDOWN_TRACEFS)) {
-+		pr_warning("Can not register tracer %s due to lockdown\n",
-+			   type->name);
-+		return -EPERM;
-+	}
-+
- 	mutex_lock(&trace_types_lock);
- 
- 	tracing_selftest_running = true;
-@@ -8639,6 +8645,11 @@ struct dentry *tracing_init_dentry(void)
- {
- 	struct trace_array *tr = &global_trace;
- 
-+	if (security_locked_down(LOCKDOWN_TRACEFS)) {
-+		pr_warning("Tracing disabled due to lockdown\n");
-+		return ERR_PTR(-EPERM);
-+	}
-+
- 	/* The top level trace array uses  NULL as parent */
- 	if (tr->dir)
- 		return NULL;
-@@ -9081,6 +9092,12 @@ __init static int tracer_alloc_buffers(v
- 	int ring_buf_size;
- 	int ret = -ENOMEM;
- 
-+
-+	if (security_locked_down(LOCKDOWN_TRACEFS)) {
-+		pr_warning("Tracing disabled due to lockdown\n");
-+		return -EPERM;
-+	}
-+
- 	/*
- 	 * Make sure we don't accidently add more trace options
- 	 * than we have bits for.
diff --git a/debian/patches/series b/debian/patches/series
index 68bbc4b6667d..1beb751b6708 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -86,7 +86,6 @@ bugfix/all/partially-revert-net-socket-implement-64-bit-timestamps.patch
 # Miscellaneous features
 
 # Lockdown missing pieces
-features/all/lockdown/tracing-Do-not-create-directories-if-lockdown-is-in-.patch
 features/all/lockdown/efi-add-an-efi_secure_boot-flag-to-indicate-secure-b.patch
 features/all/lockdown/efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch
 features/all/lockdown/add-a-sysrq-option-to-lift-kernel-lockdown.patch
@@ -126,10 +125,6 @@ bugfix/all/tools-lib-api-fs-fs.c-fix-misuse-of-strncpy.patch
 bugfix/all/usbip-fix-misuse-of-strncpy.patch
 bugfix/all/usbip-network-fix-unaligned-member-access.patch
 bugfix/all/tools-perf-pmu-events-fix-reproducibility.patch
-bugfix/all/0001-libtraceevent-Fix-header-installation.patch
-bugfix/all/0002-libtraceevent-Fix-lib-installation-with-O.patch
-bugfix/all/0003-libtraceevent-Copy-pkg-config-file-to-output-folder-.patch
-bugfix/all/0004-libtraceevent-allow-custom-libdir-path.patch
 bugfix/all/0005-libtraceevent-Add-dependency-on-libdl.patch
 
 # wireless: Disable regulatory.db direct loading (until we sort out signing)