Commit a7cd45ba authored by Ben Hutchings's avatar Ben Hutchings

Update to 5.0.1

* aufs: Update support patchset to aufs5.0 20190311
* lockdown: Update patchset to 2019-02-18 version
* Refresh/drop patches as appropriate
parent c2a8c6d1
linux (4.20.13-1~exp1) UNRELEASED; urgency=medium
linux (5.0.1-1~exp1) UNRELEASED; urgency=medium
* New upstream release: https://kernelnewbies.org/Linux_5.0
* New upstream stable update:
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.20.1
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.20.2
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.20.3
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.20.4
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.20.5
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.20.6
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.20.7
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.20.8
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.20.9
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.20.10
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.20.11
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.20.12
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.20.13
https://www.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.0.1
[ YunQiang Su ]
* [mipsel, mips64el] Enable DRM_AST and FB_SM750 for loongson-3
......@@ -49,6 +38,8 @@ linux (4.20.13-1~exp1) UNRELEASED; urgency=medium
QCOM_Q6V5_PIL
* [x86] drivers/gpu/drm/amd: Re-enable HSA_AMD (Closes: #920454)
* genpatch-aufs: Update to use aufs5-standalone
* aufs: Update support patchset to aufs5.0 20190311
* lockdown: Update patchset to 2019-02-18 version
-- YunQiang Su <syq@debian.org> Thu, 27 Dec 2018 02:37:47 +0800
......
From: Ben Hutchings <ben@decadent.org.uk>
Date: Fri, 23 Nov 2018 16:38:34 -0200
Subject: Documentation/media: uapi: Explicitly say there are no Invariant Sections
Bug-Debian: https://bugs.debian.org/698668
The GNU Free Documentation License allows for a work to specify
Invariant Sections that are not allowed to be modified. (Debian
considers that this makes such works non-free.)
The Linux Media Infrastructure userspace API documentation does not
specify any such sections, but it also doesn't say there are none (as
is recommended by the license text). Make it explicit that there are
none.
References: https://bugs.debian.org/698668
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Sylwester Nawrocki <snawrocki@kernel.org>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Ralph Metzler <rjkm@metzlerbros.de>
Signed-off-by: Marcus Metzler <mocm@metzlerbros.de>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Michael Ira Krufky <mkrufky@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
Documentation/media/media_uapi.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/Documentation/media/media_uapi.rst
+++ b/Documentation/media/media_uapi.rst
@@ -10,9 +10,9 @@ Linux Media Infrastructure userspace API
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation. A copy of
-the license is included in the chapter entitled "GNU Free Documentation
-License".
+any later version published by the Free Software Foundation, with no
+Invariant Sections. A copy of the license is included in the chapter
+entitled "GNU Free Documentation License".
.. only:: html
......@@ -25,7 +25,7 @@ upstream submission.
if (head->magic != 0x4e657458) {
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -755,10 +755,8 @@ static enum ucode_state request_microcod
@@ -903,10 +903,8 @@ static enum ucode_state request_microcod
if (c->x86 >= 0x15)
snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86);
......@@ -36,7 +36,7 @@ upstream submission.
- }
ret = UCODE_ERROR;
if (*(u32 *)fw->data != UCODE_MAGIC) {
if (!verify_container(fw->data, fw->size, false))
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -1929,10 +1929,8 @@ static int ucode_init(loader_block *lb,
......@@ -175,7 +175,7 @@ upstream submission.
fw->size, fw_name);
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1674,11 +1674,8 @@ static void sdma_load_firmware(const str
@@ -1694,11 +1694,8 @@ static void sdma_load_firmware(const str
const struct sdma_script_start_addrs *addr;
unsigned short *ram_code;
......@@ -472,7 +472,7 @@ upstream submission.
if (!state->microcode) {
--- a/drivers/media/dvb-frontends/drxk_hard.c
+++ b/drivers/media/dvb-frontends/drxk_hard.c
@@ -6281,10 +6281,6 @@ static void load_firmware_cb(const struc
@@ -6283,10 +6283,6 @@ static void load_firmware_cb(const struc
dprintk(1, ": %s\n", fw ? "firmware loaded" : "firmware not loaded");
if (!fw) {
......@@ -1125,7 +1125,7 @@ upstream submission.
if (bp->mips_firmware->size < sizeof(*mips_fw) ||
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -13525,11 +13525,8 @@ static int bnx2x_init_firmware(struct bn
@@ -13566,11 +13566,8 @@ static int bnx2x_init_firmware(struct bn
BNX2X_DEV_INFO("Loading %s\n", fw_file_name);
rc = request_firmware(&bp->firmware, fw_file_name, &bp->pdev->dev);
......@@ -1140,7 +1140,7 @@ upstream submission.
if (rc) {
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -11404,11 +11404,8 @@ static int tg3_request_firmware(struct t
@@ -11416,11 +11416,8 @@ static int tg3_request_firmware(struct t
{
const struct tg3_firmware_hdr *fw_hdr;
......@@ -1248,7 +1248,7 @@ upstream submission.
for (i = 0; i < fw->size; i++) {
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -818,11 +818,8 @@ static void cas_saturn_firmware_init(str
@@ -805,11 +805,8 @@ static void cas_saturn_firmware_init(str
return;
err = request_firmware(&fw, fw_name, &cp->pdev->dev);
......@@ -1433,7 +1433,7 @@ upstream submission.
}
--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
@@ -8410,12 +8410,8 @@ static int ipw2100_get_firmware(struct i
@@ -8406,12 +8406,8 @@ static int ipw2100_get_firmware(struct i
rc = request_firmware(&fw->fw_entry, fw_name, &priv->pci_dev->dev);
......@@ -1473,7 +1473,7 @@ upstream submission.
else
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -231,8 +231,6 @@ static int iwl_request_firmware(struct i
@@ -232,8 +232,6 @@ static int iwl_request_firmware(struct i
}
if (drv->fw_index < cfg->ucode_api_min) {
......@@ -1589,7 +1589,7 @@ upstream submission.
--- a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
@@ -1673,7 +1673,6 @@ static int ezusb_probe(struct usb_interf
@@ -1674,7 +1674,6 @@ static int ezusb_probe(struct usb_interf
if (ezusb_firmware_download(upriv, &firmware) < 0)
goto error;
} else {
......@@ -1799,7 +1799,7 @@ upstream submission.
}
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -384,8 +384,6 @@ static ssize_t asd_store_update_bios(str
@@ -383,8 +383,6 @@ static ssize_t asd_store_update_bios(str
filename_ptr,
&asd_ha->pcidev->dev);
if (err) {
......@@ -1825,7 +1825,7 @@ upstream submission.
if (err) {
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -1753,7 +1753,6 @@ bfad_read_firmware(struct pci_dev *pdev,
@@ -1757,7 +1757,6 @@ bfad_read_firmware(struct pci_dev *pdev,
const struct firmware *fw;
if (request_firmware(&fw, fw_name, &pdev->dev)) {
......@@ -1862,7 +1862,7 @@ upstream submission.
}
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -1552,8 +1552,6 @@ qla1280_request_firmware(struct scsi_qla
@@ -1542,8 +1542,6 @@ qla1280_request_firmware(struct scsi_qla
err = request_firmware(&fw, fwname, &ha->pdev->dev);
if (err) {
......@@ -1873,7 +1873,7 @@ upstream submission.
}
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -7553,8 +7553,6 @@ qla2x00_load_risc(scsi_qla_host_t *vha,
@@ -7551,8 +7551,6 @@ qla2x00_load_risc(scsi_qla_host_t *vha,
/* Load firmware blob. */
blob = qla2x00_request_firmware(vha);
if (!blob) {
......@@ -1882,7 +1882,7 @@ upstream submission.
ql_log(ql_log_info, vha, 0x0084,
"Firmware images can be retrieved from: "QLA_FW_URL ".\n");
return QLA_FUNCTION_FAILED;
@@ -7656,8 +7654,6 @@ qla24xx_load_risc_blob(scsi_qla_host_t *
@@ -7654,8 +7652,6 @@ qla24xx_load_risc_blob(scsi_qla_host_t *
/* Load firmware blob. */
blob = qla2x00_request_firmware(vha);
if (!blob) {
......@@ -1908,7 +1908,7 @@ upstream submission.
if (qla82xx_validate_firmware_blob(vha,
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -6639,8 +6639,6 @@ qla2x00_request_firmware(scsi_qla_host_t
@@ -6621,8 +6621,6 @@ qla2x00_request_firmware(scsi_qla_host_t
goto out;
if (request_firmware(&blob->fw, blob->name, &ha->pdev->dev)) {
......@@ -2454,7 +2454,7 @@ upstream submission.
snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1964,10 +1964,8 @@ static void azx_firmware_cb(const struct
@@ -1922,10 +1922,8 @@ static void azx_firmware_cb(const struct
struct azx *chip = card->private_data;
struct pci_dev *pci = chip->pci;
......@@ -2524,7 +2524,7 @@ upstream submission.
if (err) {
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -5132,11 +5132,8 @@ static int hdsp_request_fw_loader(struct
@@ -5134,11 +5134,8 @@ static int hdsp_request_fw_loader(struct
return -EINVAL;
}
......
......@@ -11,7 +11,7 @@ This is similar to the change made to tools/lib/lockdep/Makefile in
be227b45fb228adff4371b8de9e3989904209ff4.
Signed-off-by: Hilko Bengen <bengen@debian.org>
[bwh: Forward-ported to 5.0]
---
--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
......@@ -46,18 +46,19 @@ Signed-off-by: Hilko Bengen <bengen@debian.org>
# Set compile option CFLAGS
ifdef EXTRA_CFLAGS
CFLAGS := $(EXTRA_CFLAGS)
@@ -169,8 +161,8 @@ $(BPF_IN): force elfdep bpfdep
@@ -181,9 +173,9 @@ $(BPF_IN): force elfdep bpfdep
echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/if_link.h' differs from latest version at 'include/uapi/linux/if_link.h'" >&2 )) || true
$(Q)$(MAKE) $(build)=libbpf
-$(OUTPUT)libbpf.so: $(BPF_IN)
- $(QUIET_LINK)$(CC) --shared $^ -o $@
+$(OUTPUT)libbpf.so.$(LIBBPF_VERSION): $(BPF_IN)
+ $(QUIET_LINK)$(CC) --shared $^ -Wl,-soname,$(@F) -o $@
$(QUIET_LINK)$(CC) --shared -Wl,--version-script=$(VERSION_SCRIPT) \
- $^ -o $@
+ $^ -Wl,-soname,$(@F) -o $@
$(OUTPUT)libbpf.a: $(BPF_IN)
$(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^
@@ -185,6 +177,7 @@ endef
@@ -213,6 +205,7 @@ endef
install_lib: all_cmd
$(call QUIET_INSTALL, $(LIB_FILE)) \
$(call do_install,$(LIB_FILE),$(libdir_SQ))
......
......@@ -5,18 +5,16 @@ Subject: libbpf: link shared object with libelf
libbpf.so needs to be linked against libelf to avoid missing symbols.
Signed-off-by: Hilko Bengen <bengen@debian.org>
[bwh: Forward-ported to 5.0]
---
Index: linux/tools/lib/bpf/Makefile
===================================================================
--- linux.orig/tools/lib/bpf/Makefile
+++ linux/tools/lib/bpf/Makefile
@@ -161,7 +161,7 @@ $(BPF_IN): force elfdep bpfdep
$(Q)$(MAKE) $(build)=libbpf
--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@ -175,7 +175,7 @@ $(BPF_IN): force elfdep bpfdep
$(OUTPUT)libbpf.so.$(LIBBPF_VERSION): $(BPF_IN)
- $(QUIET_LINK)$(CC) --shared $^ -Wl,-soname,$(@F) -o $@
+ $(QUIET_LINK)$(CC) --shared $^ -lelf -Wl,-soname,$(@F) -o $@
$(QUIET_LINK)$(CC) --shared -Wl,--version-script=$(VERSION_SCRIPT) \
- $^ -Wl,-soname,$(@F) -o $@
+ $^ -lelf -Wl,-soname,$(@F) -o $@
$(OUTPUT)libbpf.a: $(BPF_IN)
$(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^
From: Ben Hutchings <ben@decadent.org.uk>
Date: Fri, 25 Sep 2015 21:26:48 +0100
Subject: tools/lib/traceevent: Use LDFLAGS
Forwarded: no
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -173,7 +173,7 @@ $(TE_IN): force
$(Q)$(MAKE) $(build)=libtraceevent
$(OUTPUT)libtraceevent.so.$(EVENT_PARSE_VERSION): $(TE_IN)
- $(QUIET_LINK)$(CC) --shared $^ -Wl,-soname,libtraceevent.so.$(EP_VERSION) -o $@
+ $(QUIET_LINK)$(CC) $(LDFLAGS) --shared $^ -Wl,-soname,libtraceevent.so.$(EP_VERSION) -o $@
@ln -sf $(@F) $(OUTPUT)libtraceevent.so
@ln -sf $(@F) $(OUTPUT)libtraceevent.so.$(EP_VERSION)
@@ -192,7 +192,7 @@ $(PLUGINS_IN): force
$(Q)$(MAKE) $(build)=$(plugin_obj)
$(OUTPUT)%.so: $(OUTPUT)%-in.o
- $(QUIET_LINK)$(CC) $(CFLAGS) -shared -nostartfiles -o $@ $^
+ $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -shared -nostartfiles -o $@ $^
define make_version.h
(echo '/* This file is automatically generated. Do not modify. */'; \
......@@ -24,15 +24,15 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
# Set default 32 bits cross compilers for vdso and boot wrapper
CROSS32_COMPILE ?=
@@ -148,6 +148,7 @@ CFLAGS-$(CONFIG_PPC64) += $(call cc-opti
CFLAGS-$(CONFIG_PPC32) := -ffixed-r2 $(MULTIPLEWORD)
@@ -166,6 +166,7 @@ CFLAGS-$(CONFIG_PPC32) += $(call cc-opti
CFLAGS-$(CONFIG_PPC32) += $(call cc-option,-mno-readonly-in-sdata)
+ifdef CONFIG_PPC64
ifdef CONFIG_PPC_BOOK3S_64
ifdef CONFIG_CPU_LITTLE_ENDIAN
CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8
@@ -159,6 +160,7 @@ endif
@@ -177,6 +178,7 @@ endif
else
CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
endif
......
......@@ -27,13 +27,15 @@ need them.
---help---
--- a/drivers/android/Makefile
+++ b/drivers/android/Makefile
@@ -1,4 +1,5 @@
@@ -1,5 +1,6 @@
ccflags-y += -I$(src) # needed for trace events
-obj-$(CONFIG_ANDROID_BINDERFS) += binderfs.o
-obj-$(CONFIG_ANDROID_BINDER_IPC) += binder.o binder_alloc.o
-obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
+obj-$(CONFIG_ANDROID_BINDER_IPC) += binder_linux.o
+binder_linux-y := binder.o binder_alloc.o
+binder_linux-$(CONFIG_ANDROID_BINDERFS) += binderfs.o
+binder_linux-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
......@@ -66,7 +68,7 @@ need them.
#include "ashmem.h"
#define ASHMEM_NAME_PREFIX "dev/ashmem/"
@@ -903,3 +904,5 @@ out:
@@ -924,3 +925,5 @@ out:
return ret;
}
device_initcall(ashmem_init);
......
......@@ -22,11 +22,9 @@ Export the currently un-exported symbols they depend on.
security/security.c | 4 ++++
9 files changed, 17 insertions(+)
diff --git a/fs/file.c b/fs/file.c
index 8d059d8973e9..15e74b355159 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -409,6 +409,7 @@ struct files_struct *get_files_struct(struct task_struct *task)
@@ -409,6 +409,7 @@ struct files_struct *get_files_struct(st
return files;
}
......@@ -34,7 +32,7 @@ index 8d059d8973e9..15e74b355159 100644
void put_files_struct(struct files_struct *files)
{
@@ -421,6 +422,7 @@ void put_files_struct(struct files_struct *files)
@@ -421,6 +422,7 @@ void put_files_struct(struct files_struc
kmem_cache_free(files_cachep, files);
}
}
......@@ -42,7 +40,7 @@ index 8d059d8973e9..15e74b355159 100644
void reset_files_struct(struct files_struct *files)
{
@@ -533,6 +535,7 @@ int __alloc_fd(struct files_struct *files,
@@ -533,6 +535,7 @@ out:
spin_unlock(&files->file_lock);
return error;
}
......@@ -50,7 +48,7 @@ index 8d059d8973e9..15e74b355159 100644
static int alloc_fd(unsigned start, unsigned flags)
{
@@ -606,6 +609,7 @@ void __fd_install(struct files_struct *files, unsigned int fd,
@@ -606,6 +609,7 @@ void __fd_install(struct files_struct *f
rcu_assign_pointer(fdt->fd[fd], file);
rcu_read_unlock_sched();
}
......@@ -58,7 +56,7 @@ index 8d059d8973e9..15e74b355159 100644
void fd_install(unsigned int fd, struct file *file)
{
@@ -668,6 +672,7 @@ int __close_fd_get_file(unsigned int fd, struct file **res)
@@ -668,6 +672,7 @@ out_unlock:
*res = NULL;
return -ENOENT;
}
......@@ -66,11 +64,9 @@ index 8d059d8973e9..15e74b355159 100644
void do_close_on_exec(struct files_struct *files)
{
diff --git a/kernel/fork.c b/kernel/fork.c
index 906cd0c13d15..05f8d660e1d1 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1089,6 +1089,7 @@ void mmput_async(struct mm_struct *mm)
@@ -1085,6 +1085,7 @@ void mmput_async(struct mm_struct *mm)
schedule_work(&mm->async_put_work);
}
}
......@@ -78,11 +74,9 @@ index 906cd0c13d15..05f8d660e1d1 100644
#endif
/**
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 6fedf3a98581..19ff88624638 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3930,6 +3930,7 @@ int can_nice(const struct task_struct *p, const int nice)
@@ -3943,6 +3943,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
......@@ -90,11 +84,9 @@ index 6fedf3a98581..19ff88624638 100644
#ifdef __ARCH_WANT_SYS_NICE
diff --git a/kernel/signal.c b/kernel/signal.c
index 9a32bc2088c9..ccb81f0c174e 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1312,6 +1312,7 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
@@ -1353,6 +1353,7 @@ struct sighand_struct *__lock_task_sigha
return sighand;
}
......@@ -102,11 +94,9 @@ index 9a32bc2088c9..ccb81f0c174e 100644
/*
* send signal info to all the members of a group
diff --git a/kernel/task_work.c b/kernel/task_work.c
index 0fef395662a6..9233b200c098 100644
--- a/kernel/task_work.c
+++ b/kernel/task_work.c
@@ -40,6 +40,7 @@ task_work_add(struct task_struct *task, struct callback_head *work, bool notify)
@@ -40,6 +40,7 @@ task_work_add(struct task_struct *task,
set_notify_resume(task);
return 0;
}
......@@ -114,23 +104,19 @@ index 0fef395662a6..9233b200c098 100644
/**
* task_work_cancel - cancel a pending work added by task_work_add()
diff --git a/mm/memory.c b/mm/memory.c
index 59c00ae6b928..43c4f2cfc4c6 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1364,6 +1364,7 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long start,
mmu_notifier_invalidate_range_end(mm, start, end);
tlb_finish_mmu(&tlb, start, end);
@@ -1364,6 +1364,7 @@ void zap_page_range(struct vm_area_struc
mmu_notifier_invalidate_range_end(&range);
tlb_finish_mmu(&tlb, start, range.end);
}
+EXPORT_SYMBOL_GPL(zap_page_range);
/**
* zap_page_range_single - remove user pages in a given range
diff --git a/mm/shmem.c b/mm/shmem.c
index 5d07e0b1352f..232aa3d3d461 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3986,6 +3986,7 @@ int shmem_zero_setup(struct vm_area_struct *vma)
@@ -3992,6 +3992,7 @@ int shmem_zero_setup(struct vm_area_stru
return 0;
}
......@@ -138,11 +124,9 @@ index 5d07e0b1352f..232aa3d3d461 100644
/**
* shmem_read_mapping_page_gfp - read into page cache, using specified page allocation flags.
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 97d4b25d0373..d5953177693f 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1295,6 +1295,7 @@ int map_kernel_range_noflush(unsigned long addr, unsigned long size,
@@ -1295,6 +1295,7 @@ int map_kernel_range_noflush(unsigned lo
{
return vmap_page_range_noflush(addr, addr + size, prot, pages);
}
......@@ -150,7 +134,7 @@ index 97d4b25d0373..d5953177693f 100644
/**
* unmap_kernel_range_noflush - unmap kernel VM area
@@ -1435,6 +1436,7 @@ struct vm_struct *get_vm_area(unsigned long size, unsigned long flags)
@@ -1435,6 +1436,7 @@ struct vm_struct *get_vm_area(unsigned l
NUMA_NO_NODE, GFP_KERNEL,
__builtin_return_address(0));
}
......@@ -158,11 +142,9 @@ index 97d4b25d0373..d5953177693f 100644
struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
const void *caller)
diff --git a/security/security.c b/security/security.c
index 04d173eb93f6..0e70868fda12 100644
--- a/security/security.c
+++ b/security/security.c
@@ -247,24 +247,28 @@ int security_binder_set_context_mgr(struct task_struct *mgr)
@@ -247,24 +247,28 @@ int security_binder_set_context_mgr(stru
{
return call_int_hook(binder_set_context_mgr, 0, mgr);
}
......@@ -191,6 +173,3 @@ index 04d173eb93f6..0e70868fda12 100644
int security_ptrace_access_check(struct task_struct *child, unsigned int mode)
{
--
2.20.1
......@@ -10,11 +10,9 @@ a pre-built objtool.
Makefile | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index a056dba5ede0..bbecdac8c463 100644
--- a/Makefile
+++ b/Makefile
@@ -956,17 +956,6 @@ mod_sign_cmd = true
@@ -945,17 +945,6 @@ mod_sign_cmd = true
endif
export mod_sign_cmd
......@@ -32,9 +30,9 @@ index a056dba5ede0..bbecdac8c463 100644
PHONY += prepare0
ifeq ($(KBUILD_EXTMOD),)
@@ -1116,6 +1105,17 @@ uapi-asm-generic:
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm
@@ -1105,6 +1094,17 @@ asm-generic: uapi-asm-generic
uapi-asm-generic:
$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/uapi/asm
+ifdef CONFIG_STACK_VALIDATION
+ has_libelf := $(call try-run,\
......
......@@ -9,7 +9,7 @@ are set.
--- a/Makefile
+++ b/Makefile
@@ -1096,7 +1096,8 @@ endif
@@ -1082,7 +1082,8 @@ endif
# that need to depend on updated CONFIG_* values can be checked here.
prepare2: prepare3 outputmakefile asm-generic
......@@ -18,9 +18,9 @@ are set.
+ include/generated/package.h
$(cmd_crmodverdir)
archprepare: archheaders archscripts prepare1 scripts_basic
@@ -1148,6 +1149,16 @@ define filechk_version.h
echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
archprepare: archheaders archscripts prepare1 scripts
@@ -1135,6 +1136,16 @@ define filechk_version.h
echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'
endef
+ifneq ($(DISTRIBUTION_OFFICIAL_BUILD),)
......@@ -36,7 +36,7 @@ are set.
$(version_h): FORCE
$(call filechk,version.h)
$(Q)rm -f $(old_version_h)
@@ -1155,6 +1166,9 @@ $(version_h): FORCE
@@ -1142,6 +1153,9 @@ $(version_h): FORCE
include/generated/utsrelease.h: include/config/kernel.release FORCE
$(call filechk,utsrelease.h)
......@@ -122,7 +122,7 @@ are set.
/*
* The number of tasks checked:
@@ -124,10 +125,11 @@ static void check_hung_task(struct task_
@@ -127,10 +128,11 @@ static void check_hung_task(struct task_
sysctl_hung_task_warnings--;
pr_err("INFO: task %s:%d blocked for more than %ld seconds.\n",
t->comm, t->pid, timeout);
......
From: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Dec 11 11:38:28 2018 +0900
Subject: aufs4.x-rcN base patch
Origin: https://github.com/sfjro/aufs4-standalone/tree/813901540145f6dcf45217f9710d4d4f9ba8a5b0
Date: Sun Mar 10 01:25:13 2019 +0900
Subject: aufs5.0 base patch
Origin: https://github.com/sfjro/aufs5-standalone/tree/06b60dd6e4ffa5e1cdf199a578ba1d3acac6821d
Bug-Debian: https://bugs.debian.org/541828
Patch headers added by debian/bin/genpatch-aufs
SPDX-License-Identifier: GPL-2.0
aufs4.x-rcN base patch
aufs5.0 base patch
diff --git a/MAINTAINERS b/MAINTAINERS
index 8119141..5e84420 100644
index dce5c099f43c..d10f05c88860 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2590,6 +2590,19 @@ F: include/linux/audit.h
@@ -2635,6 +2635,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*
+AUFS (advanced multi layered unification filesystem) FILESYSTEM
+M: "J. R. Okajima" <hooanon05g@gmail.com>
+L: linux-unionfs@vger.kernel.org
+L: aufs-users@lists.sourceforge.net (members only)
+L: linux-unionfs@vger.kernel.org
+W: http://aufs.sourceforge.net
+T: git://github.com/sfjro/aufs4-linux.git
+S: Supported
......@@ -34,7 +34,7 @@ index 8119141..5e84420 100644
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index cb0cc86..470dd02 100644
index cf5538942834..a271e17e4b10 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -738,6 +738,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
......@@ -63,10 +63,10 @@ index cb0cc86..470dd02 100644
static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c
index 2593153..6369b30 100644
index aac41adf4743..fc18967c2522 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1224,7 +1224,7 @@ enum d_walk_ret {
@@ -1247,7 +1247,7 @@ enum d_walk_ret {
*
* The @enter() callbacks are called with d_lock held.
*/
......@@ -76,7 +76,7 @@ index 2593153..6369b30 100644
{
struct dentry *this_parent;
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 0831851..78234ee 100644
index 083185174c6d..78234ee16784 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -32,7 +32,7 @@
......@@ -98,10 +98,10 @@ index 0831851..78234ee 100644
return error;
diff --git a/fs/inode.c b/fs/inode.c
index 35d2108..d2395eb 100644
index 73432e64f874..4a1756b8b4bd 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1660,7 +1660,7 @@ EXPORT_SYMBOL(generic_update_time);
@@ -1657,7 +1657,7 @@ EXPORT_SYMBOL(generic_update_time);
* This does the actual work of updating an inodes time or version. Must have
* had called mnt_want_write() before calling this.
*/
......@@ -111,10 +111,10 @@ index 35d2108..d2395eb 100644
int (*update_time)(struct inode *, struct timespec64 *, int);
diff --git a/fs/namespace.c b/fs/namespace.c
index a7f9126..46ed643 100644
index 678ef175d63a..9b6a3d0f87a1 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -770,6 +770,12 @@ static inline int check_mnt(struct mount *mnt)
@@ -768,6 +768,12 @@ static inline int check_mnt(struct mount *mnt)
return mnt->mnt_ns == current->nsproxy->mnt_ns;
}
......@@ -128,7 +128,7 @@ index a7f9126..46ed643 100644
* vfsmount lock must be held for write
*/
diff --git a/fs/read_write.c b/fs/read_write.c
index 58f3053..a2a55ea 100644
index ff3c5e6f87cf..5c18a9e51f37 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -489,6 +489,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
......@@ -161,7 +161,7 @@ index 58f3053..a2a55ea 100644
{
mm_segment_t old_fs;
diff --git a/fs/splice.c b/fs/splice.c
index de2ede0..5dcf77b 100644
index de2ede048473..5dcf77b8e1b2 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -837,8 +837,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
......@@ -189,7 +189,7 @@ index de2ede0..5dcf77b 100644
ssize_t (*splice_read)(struct file *, loff_t *,
struct pipe_inode_info *, size_t, unsigned int);
diff --git a/fs/sync.c b/fs/sync.c
index b54e054..2860782 100644
index b54e0541ad89..28607828e96f 100644
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -28,7 +28,7 @@
......@@ -202,10 +202,10 @@ index b54e054..2860782 100644
if (wait)
sync_inodes_sb(sb);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index c95c080..0e44705 100644
index 29d8e2cfed0e..5db265e7d35a 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1305,6 +1305,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -1310,6 +1310,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int);
......@@ -213,7 +213,7 @@ index c95c080..0e44705 100644
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
extern int f_setown(struct file *filp, unsigned long arg, int force);
extern void f_delown(st