Commit 12420a67 authored by Ben Hutchings's avatar Ben Hutchings

Merge tag 'debian/4.15.11-1' into stretch-backports

Release linux (4.15.11-1).

- Change ABI number to 0.bpo.2
parents 5113e55e 8c71b9a7
This diff is collapsed.
...@@ -2,6 +2,3 @@ ...@@ -2,6 +2,3 @@
flavours: flavours:
amd64 amd64
cloud-amd64 cloud-amd64
[amd64_description]
parts: xen
...@@ -731,6 +731,12 @@ CONFIG_PINCTRL_QCOM_SSBI_PMIC=y ...@@ -731,6 +731,12 @@ CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
CONFIG_CHROME_PLATFORMS=y CONFIG_CHROME_PLATFORMS=y
CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROS_KBD_LED_BACKLIGHT=m
##
## file: drivers/power/avs/Kconfig
##
CONFIG_POWER_AVS=y
CONFIG_ROCKCHIP_IODOMAIN=m
## ##
## file: drivers/power/reset/Kconfig ## file: drivers/power/reset/Kconfig
## ##
...@@ -769,6 +775,7 @@ CONFIG_REGULATOR_QCOM_RPM=m ...@@ -769,6 +775,7 @@ CONFIG_REGULATOR_QCOM_RPM=m
CONFIG_REGULATOR_QCOM_SMD_RPM=m CONFIG_REGULATOR_QCOM_SMD_RPM=m
CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_QCOM_SPMI=m
CONFIG_REGULATOR_RK808=m CONFIG_REGULATOR_RK808=m
CONFIG_REGULATOR_FAN53555=m
## ##
## file: drivers/remoteproc/Kconfig ## file: drivers/remoteproc/Kconfig
......
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
flavours: flavours:
#marvell #marvell
kernel-arch: arm kernel-arch: arm
featuresets:
# empty; not building images right now
# cf.: https://lists.debian.org/debian-release/2018/02/msg00239.html
# none
[build] [build]
image-file: arch/arm/boot/zImage image-file: arch/arm/boot/zImage
......
...@@ -6746,6 +6746,7 @@ CONFIG_NFT_FIB_INET=m ...@@ -6746,6 +6746,7 @@ CONFIG_NFT_FIB_INET=m
CONFIG_NF_DUP_NETDEV=m CONFIG_NF_DUP_NETDEV=m
CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FWD_NETDEV=m
CONFIG_NFT_FIB_NETDEV=m
CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XTABLES=m
CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_SET=m
CONFIG_NETFILTER_XT_TARGET_AUDIT=m CONFIG_NETFILTER_XT_TARGET_AUDIT=m
......
[abi] [abi]
abiname: 0.bpo.1 abiname: 0.bpo.2
ignore-changes: ignore-changes:
__cpuhp_* __cpuhp_*
__xive_vm_h_* __xive_vm_h_*
...@@ -117,8 +117,6 @@ enabled: false ...@@ -117,8 +117,6 @@ enabled: false
[description] [description]
part-long-up: This kernel is not suitable for SMP (multi-processor, part-long-up: This kernel is not suitable for SMP (multi-processor,
multi-core or hyper-threaded) systems. multi-core or hyper-threaded) systems.
part-long-xen: This kernel also runs on a Xen hypervisor.
It supports both privileged (dom0) and unprivileged (domU) operation.
[image] [image]
initramfs-generators: initramfs-tools initramfs-fallback initramfs-generators: initramfs-tools initramfs-fallback
......
...@@ -2,6 +2,3 @@ ...@@ -2,6 +2,3 @@
flavours: flavours:
686 686
686-pae 686-pae
[686-pae_description]
parts: xen
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
## file: arch/powerpc/Kconfig ## file: arch/powerpc/Kconfig
## ##
CONFIG_PPC_TRANSACTIONAL_MEM=y CONFIG_PPC_TRANSACTIONAL_MEM=y
# CONFIG_CRASH_DUMP is not set CONFIG_CRASH_DUMP=y
CONFIG_IRQ_ALL_CPUS=y CONFIG_IRQ_ALL_CPUS=y
CONFIG_NUMA=y CONFIG_NUMA=y
## choice: Page size ## choice: Page size
......
...@@ -2004,14 +2004,21 @@ CONFIG_SND_SOC=m ...@@ -2004,14 +2004,21 @@ CONFIG_SND_SOC=m
## ##
CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_ACP=m
##
## file: sound/soc/intel/Kconfig
##
CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=m
CONFIG_SND_SOC_INTEL_HASWELL=m
CONFIG_SND_SOC_INTEL_BAYTRAIL=m
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
CONFIG_SND_SOC_INTEL_SKYLAKE=m
## ##
## file: sound/soc/intel/boards/Kconfig ## file: sound/soc/intel/boards/Kconfig
## ##
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
# CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH is not set
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
......
#include <scsi-modules> #include <scsi-modules>
# To support nvme
vmd
...@@ -17,4 +17,5 @@ whci-hcd - ...@@ -17,4 +17,5 @@ whci-hcd -
# Include USB PHY drivers by default # Include USB PHY drivers by default
drivers/phy/phy-*-usb* ? drivers/phy/phy-*-usb* ?
drivers/phy/*/phy-*-usb* ?
drivers/usb/phy/* ? drivers/usb/phy/* ?
From: Pierre <pinaraf@pinaraf.info>
Date: Sun, 12 Nov 2017 15:24:32 +0100
Subject: crypto: ecc - Fix NULL pointer deref. on no default_rng
Origin: https://git.kernel.org/linus/4c0e22c90510308433272d7ba281b1eb4eda8209
Bug-Debian: https://bugs.debian.org/886556
If crypto_get_default_rng returns an error, the
function ecc_gen_privkey should return an error.
Instead, it currently tries to use the default_rng
nevertheless, thus creating a kernel panic with a
NULL pointer dereference.
Returning the error directly, as was supposedly
intended when looking at the code, fixes this.
Signed-off-by: Pierre Ducroquet <pinaraf@pinaraf.info>
Reviewed-by: PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
crypto/ecc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/ecc.c b/crypto/ecc.c
index 633a9bcdc574..18f32f2a5e1c 100644
--- a/crypto/ecc.c
+++ b/crypto/ecc.c
@@ -964,7 +964,7 @@ int ecc_gen_privkey(unsigned int curve_id, unsigned int ndigits, u64 *privkey)
* DRBG with a security strength of 256.
*/
if (crypto_get_default_rng())
- err = -EFAULT;
+ return -EFAULT;
err = crypto_rng_get_bytes(crypto_default_rng, (u8 *)priv, nbytes);
crypto_put_default_rng();
--
2.11.0
From: "weiyongjun (A)" <weiyongjun1@huawei.com>
Date: Thu, 18 Jan 2018 02:23:34 +0000
Subject: mac80211_hwsim: fix possible memory leak in hwsim_new_radio_nl()
Origin: https://git.kernel.org/linus/0ddcff49b672239dda94d70d0fcf50317a9f4b51
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-8087
'hwname' is malloced in hwsim_new_radio_nl() and should be freed
before leaving from the error handling cases, otherwise it will cause
memory leak.
Fixes: ff4dd73dd2b4 ("mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
drivers/net/wireless/mac80211_hwsim.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 6bf063adcbde..66c2ac0397da 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -3197,8 +3197,10 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info)
if (info->attrs[HWSIM_ATTR_REG_CUSTOM_REG]) {
u32 idx = nla_get_u32(info->attrs[HWSIM_ATTR_REG_CUSTOM_REG]);
- if (idx >= ARRAY_SIZE(hwsim_world_regdom_custom))
+ if (idx >= ARRAY_SIZE(hwsim_world_regdom_custom)) {
+ kfree(hwname);
return -EINVAL;
+ }
param.regd = hwsim_world_regdom_custom[idx];
}
--
2.16.2
From: Ben Hutchings <ben@decadent.org.uk> From: Ben Hutchings <ben@decadent.org.uk>
Subject: radeon: Firmware is required for DRM and KMS on R600 onward Subject: radeon, amdgpu: Firmware is required for DRM and KMS on R600 onward
Date: Tue, 08 Jan 2013 03:25:52 +0000 Date: Tue, 08 Jan 2013 03:25:52 +0000
Bug-Debian: https://bugs.debian.org/607194 Bug-Debian: https://bugs.debian.org/607194
Bug-Debian: https://bugs.debian.org/607471 Bug-Debian: https://bugs.debian.org/607471
...@@ -20,8 +20,8 @@ the firmware is not available, but becomes unstable - the framebuffer ...@@ -20,8 +20,8 @@ the firmware is not available, but becomes unstable - the framebuffer
and/or system memory may be corrupted, or the display may stay black. and/or system memory may be corrupted, or the display may stay black.
Therefore, perform a basic check for the existence of Therefore, perform a basic check for the existence of
/lib/firmware/radeon when a device is probed, and abort if it is /lib/firmware/{radeon,amdgpu} when a device is probed, and abort if it
missing, except for the pre-R600 case. is missing, except for the pre-R600 case.
--- ---
--- a/drivers/gpu/drm/radeon/radeon_drv.c --- a/drivers/gpu/drm/radeon/radeon_drv.c
...@@ -35,14 +35,13 @@ missing, except for the pre-R600 case. ...@@ -35,14 +35,13 @@ missing, except for the pre-R600 case.
/* /*
* KMS wrapper. * KMS wrapper.
@@ -311,6 +313,29 @@ static struct drm_driver kms_driver; @@ -311,6 +313,28 @@ static struct drm_driver kms_driver;
bool radeon_device_is_virtual(void); bool radeon_device_is_virtual(void);
+/* Test that /lib/firmware/radeon is a directory (or symlink to a +/* Test that /lib/firmware/radeon is a directory (or symlink to a
+ * directory). We could try to match the udev search path, but let's + * directory). We could try to match the udev search path, but let's
+ * assume people take the easy route and install + * keep it simple.
+ * firmware-linux-nonfree.
+ */ + */
+static bool radeon_firmware_installed(void) +static bool radeon_firmware_installed(void)
+{ +{
...@@ -65,16 +64,68 @@ missing, except for the pre-R600 case. ...@@ -65,16 +64,68 @@ missing, except for the pre-R600 case.
static int radeon_kick_out_firmware_fb(struct pci_dev *pdev) static int radeon_kick_out_firmware_fb(struct pci_dev *pdev)
{ {
struct apertures_struct *ap; struct apertures_struct *ap;
@@ -340,6 +365,12 @@ static int radeon_pci_probe(struct pci_d @@ -340,6 +364,12 @@ static int radeon_pci_probe(struct pci_d
if (vga_switcheroo_client_probe_defer(pdev)) if (vga_switcheroo_client_probe_defer(pdev))
return -EPROBE_DEFER; return -EPROBE_DEFER;
+ if ((ent->driver_data & RADEON_FAMILY_MASK) >= CHIP_R600 && + if ((ent->driver_data & RADEON_FAMILY_MASK) >= CHIP_R600 &&
+ !radeon_firmware_installed()) { + !radeon_firmware_installed()) {
+ DRM_ERROR("radeon kernel modesetting for R600 or later requires firmware-amd-graphics.\n"); + DRM_ERROR("radeon kernel modesetting for R600 or later requires firmware installed\n");
+ return -ENODEV; + return -ENODEV;
+ } + }
+ +
/* Get rid of things like offb */ /* Get rid of things like offb */
ret = radeon_kick_out_firmware_fb(pdev); ret = radeon_kick_out_firmware_fb(pdev);
if (ret) if (ret)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -40,6 +40,8 @@
#include <linux/pm_runtime.h>
#include <linux/vga_switcheroo.h>
#include <drm/drm_crtc_helper.h>
+#include <linux/namei.h>
+#include <linux/path.h>
#include "amdgpu.h"
#include "amdgpu_irq.h"
@@ -545,6 +547,28 @@ MODULE_DEVICE_TABLE(pci, pciidlist);
static struct drm_driver kms_driver;
+/* Test that /lib/firmware/amdgpu is a directory (or symlink to a
+ * directory). We could try to match the udev search path, but let's
+ * keep it simple.
+ */
+static bool amdgpu_firmware_installed(void)
+{
+#if IS_BUILTIN(CONFIG_DRM_AMDGPU)
+ /* It may be too early to tell. Assume it's there. */
+ return true;
+#else
+ struct path path;
+
+ if (kern_path("/lib/firmware/amdgpu", LOOKUP_DIRECTORY | LOOKUP_FOLLOW,
+ &path) == 0) {
+ path_put(&path);
+ return true;
+ }
+
+ return false;
+#endif
+}
+
static int amdgpu_kick_out_firmware_fb(struct pci_dev *pdev)
{
struct apertures_struct *ap;
@@ -579,6 +603,11 @@ static int amdgpu_pci_probe(struct pci_d
return -ENODEV;
}
+ if (!amdgpu_firmware_installed()) {
+ DRM_ERROR("amdgpu requires firmware installed\n");
+ return -ENODEV;
+ }
+
/*
* Initialize amdkfd before starting radeon. If it was not loaded yet,
* defer radeon probing
Origin: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts?h=next-20180309&id=c04ffa71ff491220cac28f55237c9aad379a8656
From c04ffa71ff491220cac28f55237c9aad379a8656 Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Fri, 2 Mar 2018 14:44:36 +0100
Subject: [PATCH] ARM64: dts: meson: reduce odroid-c2 eMMC maximum rate
Different modules maybe installed by the user on the eMMC connector
of the odroid-c2. While the red modules are working without an issue,
it seems some black modules (apparently Samsung based) are having
issue at 200MHz
While the tuning algorithm introduced in v4.14 enables high speed modes
on every other tested designs, it seems a problem remains for this
particular combination of board and eMMC module.
Lowering the maximum frequency of the eMMC on this board until we can
figure out a better solution.
Fixes: d341ca88eead ("mmc: meson-gx: rework tuning function")
Suggested-by: Ellie Reeves <ellierevves@gmail.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Cc: stable@vger.kernel.org
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
---
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index 0bc0f65e4f37..54954b314a45 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -274,7 +274,7 @@
pinctrl-names = "default", "clk-gate";
bus-width = <8>;
- max-frequency = <200000000>;
+ max-frequency = <100000000>;
non-removable;
disable-wp;
cap-mmc-highspeed;
--
2.11.0
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 12 Mar 2018 01:14:03 +0000
Subject: firmware_class: Refer to Debian wiki page when logging missing firmware
Bug-Debian: https://bugs.debian.org/888405
Forwarded: not-needed
If firmware loading fails due to a missing file, log a second error
message referring to our wiki page about firmware. This will explain
why some firmware is in non-free, or can't be packaged at all. Only
do this once per boot.
Do something similar in the radeon and amdgpu drivers, where we have
an early check to avoid failing at a point where we cannot display
anything.
---
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -430,9 +430,12 @@ fw_get_filesystem_firmware(struct device
}
__putname(path);
- if (rc)
+ if (rc) {
dev_err(device, "firmware: failed to load %s (%d)\n",
buf->fw_id, rc);
+ if (rc == -ENOENT)
+ pr_err_once("See https://wiki.debian.org/Firmware for information about missing firmware\n");
+ }
return rc;
}
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -367,6 +367,7 @@ static int radeon_pci_probe(struct pci_d
if ((ent->driver_data & RADEON_FAMILY_MASK) >= CHIP_R600 &&
!radeon_firmware_installed()) {
DRM_ERROR("radeon kernel modesetting for R600 or later requires firmware installed\n");
+ pr_err_once("See https://wiki.debian.org/Firmware for information about missing firmware\n");
return -ENODEV;
}
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -605,6 +605,7 @@ static int amdgpu_pci_probe(struct pci_d
if (!amdgpu_firmware_installed()) {
DRM_ERROR("amdgpu requires firmware installed\n");
+ pr_err_once("See https://wiki.debian.org/Firmware for information about missing firmware\n");
return -ENODEV;
}
From: J. R. Okajima <hooanon05@yahoo.co.jp> From: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sat Dec 16 15:29:33 2017 +0900 Date: Sun Feb 18 15:24:12 2018 +0900
Subject: SPDX-License-Identifier: GPL-2.0 Subject: aufs4.15 base patch
Origin: https://github.com/sfjro/aufs4-standalone/tree/8b9c1be851f351af1104f55952e211ae541695ee Origin: https://github.com/sfjro/aufs4-standalone/tree/caea84a33dce187ad77f9ee524d7ec46acc69c63
Bug-Debian: https://bugs.debian.org/541828 Bug-Debian: https://bugs.debian.org/541828
Patch headers added by debian/patches/features/all/aufs4/gen-patch Patch headers added by debian/patches/features/all/aufs4/gen-patch
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs4.x-rcN base patch aufs4.15 base patch
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index 82ad0ea..7d8b461 100644 index 845fc25..7dc2813 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -2478,6 +2478,19 @@ F: include/linux/audit.h @@ -2486,6 +2486,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h F: include/uapi/linux/audit.h
F: kernel/audit* F: kernel/audit*
...@@ -34,7 +34,7 @@ index 82ad0ea..7d8b461 100644 ...@@ -34,7 +34,7 @@ index 82ad0ea..7d8b461 100644
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com> M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
W: http://miguelojeda.es/auxdisplay.htm W: http://miguelojeda.es/auxdisplay.htm
diff --git a/drivers/block/loop.c b/drivers/block/loop.c diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index bc8e615..e51a59d 100644 index d5fe720..c292afa 100644
--- a/drivers/block/loop.c --- a/drivers/block/loop.c
+++ b/drivers/block/loop.c +++ b/drivers/block/loop.c
@@ -691,6 +691,24 @@ static inline int is_loop_device(struct file *file) @@ -691,6 +691,24 @@ static inline int is_loop_device(struct file *file)
...@@ -111,7 +111,7 @@ index 03102d6..517883c 100644 ...@@ -111,7 +111,7 @@ index 03102d6..517883c 100644
int (*update_time)(struct inode *, struct timespec *, int); int (*update_time)(struct inode *, struct timespec *, int);
diff --git a/fs/namespace.c b/fs/namespace.c diff --git a/fs/namespace.c b/fs/namespace.c
index e158ec6..312bdbd8 100644 index 9d1374a..26ef600 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -846,6 +846,12 @@ static inline int check_mnt(struct mount *mnt) @@ -846,6 +846,12 @@ static inline int check_mnt(struct mount *mnt)
...@@ -263,10 +263,10 @@ index 511fbaa..96e05b3 100644 ...@@ -263,10 +263,10 @@ index 511fbaa..96e05b3 100644
extern const struct file_operations def_blk_fops; extern const struct file_operations def_blk_fops;
extern const struct file_operations def_chr_fops; extern const struct file_operations def_chr_fops;
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index a842551..453e941 100644 index 3251d9c..0360952 100644
--- a/include/linux/lockdep.h --- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h +++ b/include/linux/lockdep.h
@@ -406,6 +406,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock, @@ -313,6 +313,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
return lock->key == key; return lock->key == key;
} }
...@@ -275,7 +275,7 @@ index a842551..453e941 100644 ...@@ -275,7 +275,7 @@ index a842551..453e941 100644
/* /*
* Acquire a lock. * Acquire a lock.
* *
@@ -535,6 +537,7 @@ struct lockdep_map { }; @@ -442,6 +444,7 @@ struct lockdep_map { };
#define lockdep_depth(tsk) (0) #define lockdep_depth(tsk) (0)
...@@ -318,10 +318,10 @@ index 74b4911..19789fb 100644 ...@@ -318,10 +318,10 @@ index 74b4911..19789fb 100644
+ unsigned int flags); + unsigned int flags);
#endif #endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 670d8d7..2cd0282 100644 index 5216590..8b5f44d 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
@@ -156,7 +156,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES]; @@ -140,7 +140,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];
unsigned long nr_lock_classes; unsigned long nr_lock_classes;
static struct lock_class lock_classes[MAX_LOCKDEP_KEYS]; static struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
...@@ -330,7 +330,7 @@ index 670d8d7..2cd0282 100644 ...@@ -330,7 +330,7 @@ index 670d8d7..2cd0282 100644
{ {
if (!hlock->class_idx) { if (!hlock->class_idx) {
/* /*
@@ -167,6 +167,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock) @@ -151,6 +151,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
} }
return lock_classes + hlock->class_idx - 1; return lock_classes + hlock->class_idx - 1;
} }
......
From: J. R. Okajima <hooanon05@yahoo.co.jp> From: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sat Dec 16 15:29:33 2017 +0900 Date: Sun Feb 18 15:24:12 2018 +0900
Subject: SPDX-License-Identifier: GPL-2.0 Subject: aufs4.15 mmap patch
Origin: https://github.com/sfjro/aufs4-standalone/tree/8b9c1be851f351af1104f55952e211ae541695ee Origin: https://github.com/sfjro/aufs4-standalone/tree/caea84a33dce187ad77f9ee524d7ec46acc69c63
Bug-Debian: https://bugs.debian.org/541828 Bug-Debian: https://bugs.debian.org/541828
Patch headers added by debian/patches/features/all/aufs4/gen-patch Patch headers added by debian/patches/features/all/aufs4/gen-patch
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs4.x-rcN mmap patch aufs4.15 mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c diff --git a/fs/proc/base.c b/fs/proc/base.c
index 60316b5..ce5314e 100644 index 60316b5..ce5314e 100644
...@@ -133,7 +133,7 @@ index cfd0ac4..135e11c 100644 ...@@ -133,7 +133,7 @@ index cfd0ac4..135e11c 100644
atomic_long_t swap_readahead_info; atomic_long_t swap_readahead_info;
diff --git a/kernel/fork.c b/kernel/fork.c diff --git a/kernel/fork.c b/kernel/fork.c
index 432eadf..8b2ba5b 100644 index 2295fc6..80e1fee 100644
--- a/kernel/fork.c --- a/kernel/fork.c
+++ b/kernel/fork.c +++ b/kernel/fork.c
@@ -676,7 +676,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, @@ -676,7 +676,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
...@@ -172,7 +172,7 @@ index ee83baa..7677d13 100644 ...@@ -172,7 +172,7 @@ index ee83baa..7677d13 100644
if (page->mapping != inode->i_mapping) { if (page->mapping != inode->i_mapping) {
unlock_page(page); unlock_page(page);
diff --git a/mm/mmap.c b/mm/mmap.c diff --git a/mm/mmap.c b/mm/mmap.c
index a4d5468..cb06cbd 100644 index 9efdc021..d77f01f 100644
--- a/mm/mmap.c --- a/mm/mmap.c
+++ b/mm/mmap.c +++ b/mm/mmap.c
@@ -171,7 +171,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) @@ -171,7 +171,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
......
From: J. R. Okajima <hooanon05@yahoo.co.jp> From: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sat Dec 16 15:29:33 2017 +0900 Date: Sun Feb 18 15:24:12 2018 +0900
Subject: SPDX-License-Identifier: GPL-2.0 Subject: aufs4.15 standalone patch
Origin: https://github.com/sfjro/aufs4-standalone/tree/8b9c1be851f351af1104f55952e211ae541695ee Origin: https://github.com/sfjro/aufs4-standalone/tree/caea84a33dce187ad77f9ee524d7ec46acc69c63
Bug-Debian: https://bugs.debian.org/541828 Bug-Debian: https://bugs.debian.org/541828
Patch headers added by debian/patches/features/all/aufs4/gen-patch Patch headers added by debian/patches/features/all/aufs4/gen-patch
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs4.x-rcN standalone patch aufs4.15 standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c diff --git a/fs/dcache.c b/fs/dcache.c
index 019f14b..10c1a6d 100644 index 019f14b..10c1a6d 100644
...@@ -30,7 +30,7 @@ index 019f14b..10c1a6d 100644 ...@@ -30,7 +30,7 @@ index 019f14b..10c1a6d 100644
/** /**
* d_ancestor - search for an ancestor * d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c diff --git a/fs/exec.c b/fs/exec.c
index 6be2aa0..1e003f9 100644 index 7eb8d21..56d7985 100644
--- a/fs/exec.c --- a/fs/exec.c
+++ b/fs/exec.c +++ b/fs/exec.c
@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path) @@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
...@@ -102,7 +102,7 @@ index 517883c..5cece5e 100644 ...@@ -102,7 +102,7 @@ index 517883c..5cece5e 100644
/** /**
* touch_atime - update the access time * touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c diff --git a/fs/namespace.c b/fs/namespace.c
index 312bdbd8..a5baeb5 100644 index 26ef600..a4b9707 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -517,6 +517,7 @@ void __mnt_drop_write(struct vfsmount *mnt) @@ -517,6 +517,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
...@@ -302,10 +302,10 @@ index 61cd28b..35570cd 100644 ...@@ -302,10 +302,10 @@ index 61cd28b..35570cd 100644
ssize_t ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name, __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 2cd0282..af59768 100644 index 8b5f44d..979db63 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
@@ -167,6 +167,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock) @@ -151,6 +151,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
} }
return lock_classes + hlock->class_idx - 1; return lock_classes + hlock->class_idx - 1;
} }
...@@ -323,10 +323,10 @@ index 0fef395..83fb1ec 100644 ...@@ -323,10 +323,10 @@ index 0fef395..83fb1ec 100644
} }
+EXPORT_SYMBOL_GPL(task_work_run); +EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/commoncap.c b/security/commoncap.c diff --git a/security/commoncap.c b/security/commoncap.c
index 4f8e093..f1e0544 100644 index 48620c9..4981104 100644
--- a/security/commoncap.c --- a/security/commoncap.c
+++ b/security/commoncap.c +++ b/security/commoncap.c
@@ -1333,12 +1333,14 @@ int cap_mmap_addr(unsigned long addr) @@ -1330,12 +1330,14 @@ int cap_mmap_addr(unsigned long addr)
} }
return ret; return ret;
} }
......