drop some applied patches

3 files changed, 0 insertions, 127 deletions

diff --git a/0001-x86-tools-relocs-add-__printf-attribute-to-die.patch b/0001-x86-tools-relocs-add-__printf-attribute-to-die.patch
deleted file mode 100644
index e698c44630fff0..00000000000000
--- a/0001-x86-tools-relocs-add-__printf-attribute-to-die.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 3e842cb1d912d5a6a268563fa9d687ca1d9b9ab9 Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Sat, 27 Feb 2021 10:51:09 +0100
-Subject: [PATCH 1/2] x86/tools/relocs: add __printf attribute to die()
-
-There are a number of printf "mismatches" in the use of die() in
-x86/tools/relocs.c.  Fix them up and add the printf attribute to the
-reloc.h header file to prevent them from ever coming back.
-
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Ingo Molnar <mingo@redhat.com>
-Cc: Borislav Petkov <bp@alien8.de>
-Cc: "H. Peter Anvin" <hpa@zytor.com>
-Cc: linux-kernel@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/tools/relocs.c |   21 +++++++++++----------
- arch/x86/tools/relocs.h |    1 +
- 2 files changed, 12 insertions(+), 10 deletions(-)
-
---- a/arch/x86/tools/relocs.c
-+++ b/arch/x86/tools/relocs.c
-@@ -389,7 +389,8 @@ static void read_ehdr(FILE *fp)
- 		Elf_Shdr shdr;
- 
- 		if (fseek(fp, ehdr.e_shoff, SEEK_SET) < 0)
--			die("Seek to %d failed: %s\n", ehdr.e_shoff, strerror(errno));
-+			die("Seek to %d failed: %s\n",
-+			    (int)ehdr.e_shoff, strerror(errno));
- 
- 		if (fread(&shdr, sizeof(shdr), 1, fp) != 1)
- 			die("Cannot read initial ELF section header: %s\n", strerror(errno));
-@@ -412,17 +413,17 @@ static void read_shdrs(FILE *fp)
- 
- 	secs = calloc(shnum, sizeof(struct section));
- 	if (!secs) {
--		die("Unable to allocate %d section headers\n",
-+		die("Unable to allocate %ld section headers\n",
- 		    shnum);
- 	}
- 	if (fseek(fp, ehdr.e_shoff, SEEK_SET) < 0) {
- 		die("Seek to %d failed: %s\n",
--			ehdr.e_shoff, strerror(errno));
-+			(int)ehdr.e_shoff, strerror(errno));
- 	}
- 	for (i = 0; i < shnum; i++) {
- 		struct section *sec = &secs[i];
- 		if (fread(&shdr, sizeof(shdr), 1, fp) != 1)
--			die("Cannot read ELF section headers %d/%d: %s\n",
-+			die("Cannot read ELF section headers %d/%ld: %s\n",
- 			    i, shnum, strerror(errno));
- 		sec->shdr.sh_name      = elf_word_to_cpu(shdr.sh_name);
- 		sec->shdr.sh_type      = elf_word_to_cpu(shdr.sh_type);
-@@ -451,11 +452,11 @@ static void read_strtabs(FILE *fp)
- 		sec->strtab = malloc(sec->shdr.sh_size);
- 		if (!sec->strtab) {
- 			die("malloc of %d bytes for strtab failed\n",
--				sec->shdr.sh_size);
-+				(int)sec->shdr.sh_size);
- 		}
- 		if (fseek(fp, sec->shdr.sh_offset, SEEK_SET) < 0) {
- 			die("Seek to %d failed: %s\n",
--				sec->shdr.sh_offset, strerror(errno));
-+				(int)sec->shdr.sh_offset, strerror(errno));
- 		}
- 		if (fread(sec->strtab, 1, sec->shdr.sh_size, fp)
- 		    != sec->shdr.sh_size) {
-@@ -476,11 +477,11 @@ static void read_symtabs(FILE *fp)
- 		sec->symtab = malloc(sec->shdr.sh_size);
- 		if (!sec->symtab) {
- 			die("malloc of %d bytes for symtab failed\n",
--				sec->shdr.sh_size);
-+				(int)sec->shdr.sh_size);
- 		}
- 		if (fseek(fp, sec->shdr.sh_offset, SEEK_SET) < 0) {
- 			die("Seek to %d failed: %s\n",
--				sec->shdr.sh_offset, strerror(errno));
-+				(int)sec->shdr.sh_offset, strerror(errno));
- 		}
- 		if (fread(sec->symtab, 1, sec->shdr.sh_size, fp)
- 		    != sec->shdr.sh_size) {
-@@ -509,11 +510,11 @@ static void read_relocs(FILE *fp)
- 		sec->reltab = malloc(sec->shdr.sh_size);
- 		if (!sec->reltab) {
- 			die("malloc of %d bytes for relocs failed\n",
--				sec->shdr.sh_size);
-+				(int)sec->shdr.sh_size);
- 		}
- 		if (fseek(fp, sec->shdr.sh_offset, SEEK_SET) < 0) {
- 			die("Seek to %d failed: %s\n",
--				sec->shdr.sh_offset, strerror(errno));
-+				(int)sec->shdr.sh_offset, strerror(errno));
- 		}
- 		if (fread(sec->reltab, 1, sec->shdr.sh_size, fp)
- 		    != sec->shdr.sh_size) {
---- a/arch/x86/tools/relocs.h
-+++ b/arch/x86/tools/relocs.h
-@@ -17,6 +17,7 @@
- #include <regex.h>
- #include <tools/le_byteshift.h>
- 
-+__attribute__((__format__(printf, 1, 2)))
- void die(char *fmt, ...) __attribute__((noreturn));
- 
- #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
diff --git a/nds32-bugfix.patch b/nds32-bugfix.patch
deleted file mode 100644
index 9e1d429f30fabe..00000000000000
--- a/nds32-bugfix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From foo@baz Fri Jun 25 02:01:11 PM CEST 2021
-Date: Fri, 25 Jun 2021 14:01:11 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: [PATCH] nds32: bugfix
-
-
-diff --git a/arch/nds32/mm/mmap.c b/arch/nds32/mm/mmap.c
-index c206b31ce07a..1bdf5e7d1b43 100644
---- a/arch/nds32/mm/mmap.c
-+++ b/arch/nds32/mm/mmap.c
-@@ -59,7 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
- 
- 		vma = find_vma(mm, addr);
- 		if (TASK_SIZE - len >= addr &&
--		    (!vma || addr + len <= vma->vm_start))
-+		    (!vma || addr + len <= vm_start_gap(vma)))
- 			return addr;
- 	}
- 
diff --git a/series b/series
index 55bc7d8ce8b798..cca98ed0fa51ba 100644
--- a/series
+++ b/series
@@ -1,6 +1,4 @@
 #
-0001-x86-tools-relocs-add-__printf-attribute-to-die.patch
-nds32-bugfix.patch
 0001-Kbuild-provide-a-common-kernel-installation-script.patch
 0001-driver-core-aux-test-code.patch
 copying.patch