[kernel] r22909 - in dists/trunk/linux/debian: . patches patches/bugfix/all patches/bugfix/mips patches/bugfix/s390 patches/bugfix/x86 patches/debian patches/features/all/aufs4 patches/features/mips patches/features/x86
Ben Hutchings
benh at moszumanska.debian.org
Tue Aug 4 01:30:23 UTC 2015
Author: benh
Date: Tue Aug 4 01:30:23 2015
New Revision: 22909
Log:
Update to 4.2-rc5
Refresh/drop patches as needed.
Deleted:
dists/trunk/linux/debian/patches/bugfix/all/keys-ensure-we-free-the-assoc-array-edit-if-edit-is-valid.patch
dists/trunk/linux/debian/patches/bugfix/s390/s390-cachinfo-add-missing-facility-check-to-init_cache_level.patch
dists/trunk/linux/debian/patches/bugfix/x86/0003-x86-asm-entry-64-Remove-pointless-jump-to-irq_return.patch
dists/trunk/linux/debian/patches/bugfix/x86/0004-x86-nmi-Enable-nested-do_nmi-handling-for-64-bit-ker.patch
dists/trunk/linux/debian/patches/bugfix/x86/0005-x86-nmi-64-Remove-asm-code-that-saves-cr2.patch
dists/trunk/linux/debian/patches/bugfix/x86/0006-x86-nmi-64-Switch-stacks-on-userspace-NMI-entry.patch
dists/trunk/linux/debian/patches/bugfix/x86/0007-x86-nmi-64-Improve-nested-NMI-comments.patch
dists/trunk/linux/debian/patches/bugfix/x86/0008-x86-nmi-64-Reorder-nested-NMI-checks.patch
dists/trunk/linux/debian/patches/bugfix/x86/0009-x86-nmi-64-Use-DF-to-avoid-userspace-RSP-confusing-n.patch
dists/trunk/linux/debian/patches/bugfix/x86/kvm-x86-fix-kvm_apic_has_events-to-check-for-null-po.patch
Modified:
dists/trunk/linux/debian/changelog
dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
dists/trunk/linux/debian/patches/bugfix/all/firmware_class-return-specific-errors-from-file-read.patch
dists/trunk/linux/debian/patches/bugfix/all/md-use-kzalloc-when-bitmap-is-disabled.patch
dists/trunk/linux/debian/patches/bugfix/mips/disable-advansys.patch
dists/trunk/linux/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch
dists/trunk/linux/debian/patches/debian/yama-disable-by-default.patch
dists/trunk/linux/debian/patches/features/all/aufs4/aufs4-mmap.patch
dists/trunk/linux/debian/patches/features/all/aufs4/aufs4-standalone.patch
dists/trunk/linux/debian/patches/features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch
dists/trunk/linux/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch
dists/trunk/linux/debian/patches/series
Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog Tue Aug 4 00:47:08 2015 (r22908)
+++ dists/trunk/linux/debian/changelog Tue Aug 4 01:30:23 2015 (r22909)
@@ -1,3 +1,9 @@
+linux (4.2~rc5-1~exp1) UNRELEASED; urgency=medium
+
+ * New upstream release candidate
+
+ -- Ben Hutchings <ben at decadent.org.uk> Tue, 04 Aug 2015 01:47:47 +0100
+
linux (4.1.3-1) unstable; urgency=medium
* New upstream stable update:
Modified: dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch Tue Aug 4 00:47:08 2015 (r22908)
+++ dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch Tue Aug 4 01:30:23 2015 (r22909)
@@ -96,7 +96,7 @@
fw_size = firmware->size / sizeof(u32);
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
-@@ -398,10 +398,8 @@ static int ath3k_load_patch(struct usb_d
+@@ -404,10 +404,8 @@ static int ath3k_load_patch(struct usb_d
le32_to_cpu(fw_version.rom_version));
ret = request_firmware(&firmware, filename, &udev->dev);
@@ -108,7 +108,7 @@
pt_rom_version = get_unaligned_le32(firmware->data +
firmware->size - 8);
-@@ -461,10 +459,8 @@ static int ath3k_load_syscfg(struct usb_
+@@ -467,10 +465,8 @@ static int ath3k_load_syscfg(struct usb_
le32_to_cpu(fw_version.rom_version), clk_value, ".dfu");
ret = request_firmware(&firmware, filename, &udev->dev);
@@ -154,7 +154,7 @@
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
-@@ -568,10 +568,8 @@ static int bt3c_open(struct bt3c_info *i
+@@ -567,10 +567,8 @@ static int bt3c_open(struct bt3c_info *i
/* Load firmware */
err = request_firmware(&firmware, "BT3CPCC.bin", &info->p_dev->dev);
@@ -233,7 +233,7 @@
where = 0;
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
-@@ -1521,10 +1521,8 @@ gf100_gr_ctor_fw(struct gf100_gr_priv *p
+@@ -1558,10 +1558,8 @@ gf100_gr_ctor_fw(struct gf100_gr_priv *p
if (ret) {
snprintf(f, sizeof(f), "nouveau/%s", fwname);
ret = request_firmware(&fw, f, nv_device_base(device));
@@ -262,7 +262,7 @@
printk(KERN_ERR
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
-@@ -812,10 +812,6 @@ int ni_init_microcode(struct radeon_devi
+@@ -837,10 +837,6 @@ int ni_init_microcode(struct radeon_devi
out:
if (err) {
@@ -289,7 +289,7 @@
rdev->me_fw->size, fw_name);
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
-@@ -2545,10 +2545,6 @@ int r600_init_microcode(struct radeon_de
+@@ -2592,10 +2592,6 @@ int r600_init_microcode(struct radeon_de
out:
if (err) {
@@ -457,7 +457,7 @@
if (!buf) {
--- a/drivers/media/usb/dvb-usb/opera1.c
+++ b/drivers/media/usb/dvb-usb/opera1.c
-@@ -452,9 +452,6 @@ static int opera1_xilinx_load_firmware(s
+@@ -453,9 +453,6 @@ static int opera1_xilinx_load_firmware(s
info("start downloading fpga firmware %s",filename);
if ((ret = request_firmware(&fw, filename, &dev->dev)) != 0) {
@@ -469,7 +469,7 @@
p = kmalloc(fw->size, GFP_KERNEL);
--- a/drivers/media/dvb-frontends/af9013.c
+++ b/drivers/media/dvb-frontends/af9013.c
-@@ -1372,16 +1372,8 @@ static int af9013_download_firmware(stru
+@@ -1376,16 +1376,8 @@ static int af9013_download_firmware(stru
/* request the firmware, this will block and timeout */
ret = request_firmware(&fw, fw_file, state->i2c->dev.parent);
@@ -504,7 +504,7 @@
b = fw->data;
--- a/drivers/media/dvb-frontends/cx24116.c
+++ b/drivers/media/dvb-frontends/cx24116.c
-@@ -493,13 +493,8 @@ static int cx24116_firmware_ondemand(str
+@@ -495,13 +495,8 @@ static int cx24116_firmware_ondemand(str
__func__, CX24116_DEFAULT_FIRMWARE);
ret = request_firmware(&fw, CX24116_DEFAULT_FIRMWARE,
state->i2c->dev.parent);
@@ -535,7 +535,7 @@
if (state->microcode == NULL) {
--- a/drivers/media/dvb-frontends/drxk_hard.c
+++ b/drivers/media/dvb-frontends/drxk_hard.c
-@@ -6283,10 +6283,6 @@ static void load_firmware_cb(const struc
+@@ -6284,10 +6284,6 @@ static void load_firmware_cb(const struc
dprintk(1, ": %s\n", fw ? "firmware loaded" : "firmware not loaded");
if (!fw) {
@@ -1216,7 +1216,7 @@
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
-@@ -12981,11 +12981,8 @@ static int bnx2x_init_firmware(struct bn
+@@ -13003,11 +13003,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);
@@ -1251,7 +1251,7 @@
u32 n;
- if (request_firmware(&fw, fw_name, &pdev->dev)) {
-- pr_alert("Can't locate firmware %s\n", fw_name);
+- dev_alert(&pdev->dev, "can't load firmware %s\n", fw_name);
+ if (request_firmware(&fw, fw_name, &pdev->dev))
goto error;
- }
@@ -1261,13 +1261,13 @@
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -1034,12 +1034,8 @@ int t3_get_edc_fw(struct cphy *phy, int
- snprintf(buf, sizeof(buf), get_edc_fw_name(edc_idx));
-
- ret = request_firmware(&fw, buf, &adapter->pdev->dev);
+ fw_name = get_edc_fw_name(edc_idx);
+ if (fw_name)
+ ret = request_firmware(&fw, fw_name, &adapter->pdev->dev);
- if (ret < 0) {
- dev_err(&adapter->pdev->dev,
- "could not upgrade firmware: unable to load %s\n",
-- buf);
+- fw_name);
+ if (ret)
return ret;
- }
@@ -1440,7 +1440,7 @@
&hif_dev->udev->dev);
--- a/drivers/net/wireless/ath/carl9170/usb.c
+++ b/drivers/net/wireless/ath/carl9170/usb.c
-@@ -1032,7 +1032,6 @@ static void carl9170_usb_firmware_step2(
+@@ -1033,7 +1033,6 @@ static void carl9170_usb_firmware_step2(
return;
}
@@ -1504,7 +1504,7 @@
hdr = (struct b43legacy_fw_header *)((*fw)->data);
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
-@@ -379,19 +379,13 @@ static int brcms_request_fw(struct brcms
+@@ -378,19 +378,13 @@ static int brcms_request_fw(struct brcms
sprintf(fw_name, "%s-%d.fw", brcms_firmwares[i],
UCODE_LOADER_API_VER);
status = request_firmware(&wl->fw.fw_bin[i], fw_name, device);
@@ -1568,7 +1568,7 @@
else
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
-@@ -1119,13 +1119,8 @@ static void iwl_req_fw_callback(const st
+@@ -1131,13 +1131,8 @@ static void iwl_req_fw_callback(const st
if (!pieces)
return;
@@ -1586,23 +1586,23 @@
--- a/drivers/net/wireless/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
@@ -824,8 +824,6 @@ static int if_usb_prog_firmware(struct i
- kparam_block_sysfs_write(fw_name);
+ kernel_param_lock(THIS_MODULE);
ret = request_firmware(&cardp->fw, lbtf_fw_name, &cardp->udev->dev);
if (ret < 0) {
- pr_err("request_firmware() failed with %#x\n", ret);
- pr_err("firmware %s not found\n", lbtf_fw_name);
- kparam_unblock_sysfs_write(fw_name);
+ kernel_param_unlock(THIS_MODULE);
goto done;
}
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
-@@ -454,11 +454,8 @@ static void mwifiex_fw_dpc(const struct
+@@ -459,11 +459,8 @@ static void mwifiex_fw_dpc(const struct
bool init_failed = false;
struct wireless_dev *wdev;
- if (!firmware) {
-- dev_err(adapter->dev,
-- "Failed to get firmware %s\n", adapter->fw_name);
+- mwifiex_dbg(adapter, ERROR,
+- "Failed to get firmware %s\n", adapter->fw_name);
+ if (!firmware)
goto err_dnld_fw;
- }
@@ -1856,7 +1856,7 @@
static inline u16 get_bcdDevice(const struct usb_device *udev)
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
-@@ -4280,8 +4280,6 @@ static ushort AscInitAsc1000Driver(ASC_D
+@@ -4107,8 +4107,6 @@ static int AscInitAsc1000Driver(ASC_DVC_
err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev);
if (err) {
@@ -1865,7 +1865,7 @@
asc_dvc->err_code |= ASC_IERR_MCODE_CHKSUM;
return err;
}
-@@ -4613,8 +4611,6 @@ static int AdvInitAsc3550Driver(ADV_DVC_
+@@ -4473,8 +4471,6 @@ static int AdvInitAsc3550Driver(ADV_DVC_
err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev);
if (err) {
@@ -1874,7 +1874,7 @@
asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM;
return err;
}
-@@ -5129,8 +5125,6 @@ static int AdvInitAsc38C0800Driver(ADV_D
+@@ -4973,8 +4969,6 @@ static int AdvInitAsc38C0800Driver(ADV_D
err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev);
if (err) {
@@ -1883,7 +1883,7 @@
asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM;
return err;
}
-@@ -5631,8 +5625,6 @@ static int AdvInitAsc38C1600Driver(ADV_D
+@@ -5461,8 +5455,6 @@ static int AdvInitAsc38C1600Driver(ADV_D
err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev);
if (err) {
@@ -1894,7 +1894,7 @@
}
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
-@@ -390,8 +390,6 @@ static ssize_t asd_store_update_bios(str
+@@ -389,8 +389,6 @@ static ssize_t asd_store_update_bios(str
filename_ptr,
&asd_ha->pcidev->dev);
if (err) {
@@ -1930,7 +1930,7 @@
}
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
-@@ -4004,10 +4004,8 @@ static ssize_t ipr_store_update_fw(struc
+@@ -4010,10 +4010,8 @@ static ssize_t ipr_store_update_fw(struc
len = snprintf(fname, 99, "%s", buf);
fname[len-1] = '\0';
@@ -1968,7 +1968,7 @@
}
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
-@@ -5414,8 +5414,6 @@ qla2x00_load_risc(scsi_qla_host_t *vha,
+@@ -5524,8 +5524,6 @@ qla2x00_load_risc(scsi_qla_host_t *vha,
/* Load firmware blob. */
blob = qla2x00_request_firmware(vha);
if (!blob) {
@@ -1977,7 +1977,7 @@
ql_log(ql_log_info, vha, 0x0084,
"Firmware images can be retrieved from: "QLA_FW_URL ".\n");
return QLA_FUNCTION_FAILED;
-@@ -5517,8 +5515,6 @@ qla24xx_load_risc_blob(scsi_qla_host_t *
+@@ -5627,8 +5625,6 @@ qla24xx_load_risc_blob(scsi_qla_host_t *
/* Load firmware blob. */
blob = qla2x00_request_firmware(vha);
if (!blob) {
@@ -2003,7 +2003,7 @@
if (qla82xx_validate_firmware_blob(vha,
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
-@@ -5356,8 +5356,6 @@ qla2x00_request_firmware(scsi_qla_host_t
+@@ -5369,8 +5369,6 @@ qla2x00_request_firmware(scsi_qla_host_t
goto out;
if (request_firmware(&blob->fw, blob->name, &ha->pdev->dev)) {
@@ -2052,7 +2052,7 @@
ft1000_enable_interrupts(dev);
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
-@@ -135,10 +135,8 @@ static int ft1000_probe(struct usb_inter
+@@ -133,10 +133,8 @@ static int ft1000_probe(struct usb_inter
ft1000dev->bulk_out_endpointAddr);
ret = request_firmware(&dsp_fw, "ft3000.img", &dev->dev);
@@ -2161,7 +2161,7 @@
MODULE_FIRMWARE("rtlwifi/rtl8712u.bin");
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
-@@ -391,11 +391,8 @@ static int slic_card_download_gbrcv(stru
+@@ -388,11 +388,8 @@ static int slic_card_download_gbrcv(stru
}
ret = request_firmware(&fw, file, &adapter->pcidev->dev);
@@ -2174,7 +2174,7 @@
rcvucodelen = *(u32 *)(fw->data + index);
index += 4;
-@@ -469,11 +466,8 @@ static int slic_card_download(struct ada
+@@ -466,11 +463,8 @@ static int slic_card_download(struct ada
return -ENOENT;
}
ret = request_firmware(&fw, file, &adapter->pcidev->dev);
@@ -2205,7 +2205,7 @@
if (!buffer)
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
-@@ -3522,10 +3522,8 @@ static int cyz_load_fw(struct pci_dev *p
+@@ -3518,10 +3518,8 @@ static int cyz_load_fw(struct pci_dev *p
int retval;
retval = request_firmware(&fw, "cyzfirm.bin", &pdev->dev);
@@ -2610,7 +2610,7 @@
filename, emu->firmware->size);
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
-@@ -1619,10 +1619,8 @@ static void azx_firmware_cb(const struct
+@@ -1734,10 +1734,8 @@ static void azx_firmware_cb(const struct
struct azx *chip = card->private_data;
struct pci_dev *pci = chip->pci;
Modified: dists/trunk/linux/debian/patches/bugfix/all/firmware_class-return-specific-errors-from-file-read.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/all/firmware_class-return-specific-errors-from-file-read.patch Tue Aug 4 00:47:08 2015 (r22908)
+++ dists/trunk/linux/debian/patches/bugfix/all/firmware_class-return-specific-errors-from-file-read.patch Tue Aug 4 01:30:23 2015 (r22909)
@@ -18,7 +18,7 @@
---
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
-@@ -293,7 +293,7 @@ static int fw_read_file_contents(struct
+@@ -298,7 +298,7 @@ static int fw_read_file_contents(struct
int rc;
if (!S_ISREG(file_inode(file)->i_mode))
@@ -27,7 +27,7 @@
size = i_size_read(file_inode(file));
if (size <= 0)
return -EINVAL;
-@@ -302,7 +302,7 @@ static int fw_read_file_contents(struct
+@@ -307,7 +307,7 @@ static int fw_read_file_contents(struct
return -ENOMEM;
rc = kernel_read(file, 0, buf, size);
if (rc != size) {
@@ -36,8 +36,8 @@
rc = -EIO;
goto fail;
}
-@@ -334,8 +334,10 @@ static int fw_get_filesystem_firmware(st
- snprintf(path, PATH_MAX, "%s/%s", fw_path[i], buf->fw_id);
+@@ -348,8 +348,10 @@ static int fw_get_filesystem_firmware(st
+ }
file = filp_open(path, O_RDONLY, 0);
- if (IS_ERR(file))
@@ -48,7 +48,7 @@
rc = fw_read_file_contents(file, buf);
fput(file);
if (rc)
-@@ -974,13 +976,6 @@ static void kill_requests_without_uevent
+@@ -994,13 +996,6 @@ static void kill_requests_without_uevent
#endif
#else /* CONFIG_FW_LOADER_USER_HELPER */
@@ -62,7 +62,7 @@
/* No abort during direct loading */
#define is_fw_load_aborted(buf) false
-@@ -1129,6 +1124,7 @@ _request_firmware(const struct firmware
+@@ -1152,6 +1147,7 @@ _request_firmware(const struct firmware
}
ret = fw_get_filesystem_firmware(device, fw->priv);
@@ -70,7 +70,7 @@
if (ret) {
if (!(opt_flags & FW_OPT_NO_WARN))
dev_warn(device,
-@@ -1140,6 +1136,7 @@ _request_firmware(const struct firmware
+@@ -1163,6 +1159,7 @@ _request_firmware(const struct firmware
opt_flags, timeout);
}
}
Modified: dists/trunk/linux/debian/patches/bugfix/all/md-use-kzalloc-when-bitmap-is-disabled.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/all/md-use-kzalloc-when-bitmap-is-disabled.patch Tue Aug 4 00:47:08 2015 (r22908)
+++ dists/trunk/linux/debian/patches/bugfix/all/md-use-kzalloc-when-bitmap-is-disabled.patch Tue Aug 4 01:30:23 2015 (r22909)
@@ -26,14 +26,13 @@
Signed-off-by: Benjamin Randazzo <benjamin at randazzo.fr>
Signed-off-by: NeilBrown <neilb at suse.com>
-[bwh: Backported to 4.1: using d_path() instead of file_path()]
---
drivers/md/md.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
-@@ -5735,22 +5735,22 @@ static int get_bitmap_file(struct mddev
+@@ -5759,22 +5759,22 @@ static int get_bitmap_file(struct mddev
char *ptr;
int err;
@@ -47,7 +46,7 @@
- /* bitmap disabled, zero the first byte and copy out */
- if (!mddev->bitmap_info.file)
- file->pathname[0] = '\0';
-- else if ((ptr = d_path(&mddev->bitmap_info.file->f_path,
+- else if ((ptr = file_path(mddev->bitmap_info.file,
- file->pathname, sizeof(file->pathname))),
- IS_ERR(ptr))
- err = PTR_ERR(ptr);
@@ -56,8 +55,8 @@
- sizeof(file->pathname)-(ptr-file->pathname));
+ /* bitmap enabled */
+ if (mddev->bitmap_info.file) {
-+ ptr = d_path(&mddev->bitmap_info.file->f_path, file->pathname,
-+ sizeof(file->pathname));
++ ptr = file_path(mddev->bitmap_info.file, file->pathname,
++ sizeof(file->pathname));
+ if (IS_ERR(ptr))
+ err = PTR_ERR(ptr);
+ else
Modified: dists/trunk/linux/debian/patches/bugfix/mips/disable-advansys.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/mips/disable-advansys.patch Tue Aug 4 00:47:08 2015 (r22908)
+++ dists/trunk/linux/debian/patches/bugfix/mips/disable-advansys.patch Tue Aug 4 01:30:23 2015 (r22909)
@@ -1,6 +1,6 @@
From: Martin Michlmayr <tbm at cyrius.com>
Date: Sat, 19 Jan 2008 18:25:02 +0000
-Subject: [arm, mips] Disable Advansys
+Subject: [mips] Disable Advansys
Forwarded: http://thread.gmane.org/gmane.linux.scsi/57291
Florian Lohoff <flo at rfc822.org> reports the following build failure on IP32:
@@ -12,14 +12,11 @@
But report:
http://www.mail-archive.com/linux-scsi@vger.kernel.org/msg12773.html
-[bwh: Upstream finally accepted this was broken on ARM! But MIPS has
- the same problem still.]
-
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
-@@ -495,6 +495,7 @@ config SCSI_ADVANSYS
+@@ -505,6 +505,7 @@ config SCSI_ADVANSYS
tristate "AdvanSys SCSI support"
- depends on SCSI && VIRT_TO_BUS && !ARM
+ depends on SCSI
depends on ISA || EISA || PCI
+ depends on !MIPS || BROKEN
help
Modified: dists/trunk/linux/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch Tue Aug 4 00:47:08 2015 (r22908)
+++ dists/trunk/linux/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch Tue Aug 4 01:30:23 2015 (r22909)
@@ -9,8 +9,8 @@
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -651,8 +651,8 @@ static inline void put_link(struct namei
- path_put(link);
+@@ -847,8 +847,8 @@ static inline void put_link(struct namei
+ path_put(&last->link);
}
-int sysctl_protected_symlinks __read_mostly = 0;
Modified: dists/trunk/linux/debian/patches/debian/yama-disable-by-default.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/yama-disable-by-default.patch Tue Aug 4 00:47:08 2015 (r22908)
+++ dists/trunk/linux/debian/patches/debian/yama-disable-by-default.patch Tue Aug 4 01:30:23 2015 (r22909)
@@ -15,12 +15,12 @@
/* describe a ptrace relationship for potential exception */
struct ptrace_relation {
-@@ -425,7 +425,7 @@ static __init int yama_init(void)
+@@ -407,7 +407,7 @@ static __init int yama_init(void)
+ if (!security_module_enable("yama"))
return 0;
#endif
+- pr_info("Yama: becoming mindful.\n");
++ pr_info("Yama: disabled by default; enable with sysctl kernel.yama.*\n");
-- printk(KERN_INFO "Yama: becoming mindful.\n");
-+ printk(KERN_INFO "Yama: disabled by default; enable with sysctl kernel.yama.*\n");
-
- #ifndef CONFIG_SECURITY_YAMA_STACKED
- if (register_security(&yama_ops))
+ #ifdef CONFIG_SYSCTL
+ if (!register_sysctl_paths(yama_sysctl_path, yama_sysctl_table))
Modified: dists/trunk/linux/debian/patches/features/all/aufs4/aufs4-mmap.patch
==============================================================================
--- dists/trunk/linux/debian/patches/features/all/aufs4/aufs4-mmap.patch Tue Aug 4 00:47:08 2015 (r22908)
+++ dists/trunk/linux/debian/patches/features/all/aufs4/aufs4-mmap.patch Tue Aug 4 01:30:23 2015 (r22909)
@@ -8,11 +8,11 @@
aufs4.x-rcN mmap patch
-diff --git a/fs/buffer.c b/fs/buffer.c
-index c7a5602..8c50a22 100644
+[bwh: Adjusted context for 4.2]
+
--- a/fs/buffer.c
+++ b/fs/buffer.c
-@@ -2450,7 +2450,7 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
+@@ -2473,7 +2473,7 @@ int block_page_mkwrite(struct vm_area_st
* Update file times before taking page lock. We may end up failing the
* fault so this update may be superfluous but who really cares...
*/
@@ -21,11 +21,9 @@
ret = __block_page_mkwrite(vma, vmf, get_block);
sb_end_pagefault(sb);
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 093ca14..fc1ac03 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
-@@ -1744,7 +1744,7 @@ static int proc_map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -1939,7 +1939,7 @@ static int proc_map_files_get_link(struc
down_read(&mm->mmap_sem);
vma = find_exact_vma(mm, vm_start, vm_end);
if (vma && vma->vm_file) {
@@ -34,11 +32,9 @@
path_get(path);
rc = 0;
}
-diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
-index d4a3574..1397181 100644
--- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c
-@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
+@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_
file = region->vm_file;
if (file) {
@@ -50,11 +46,9 @@
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
}
-diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 6dee68d..9afa35d 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
-@@ -279,7 +279,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -279,7 +279,10 @@ show_map_vma(struct seq_file *m, struct
const char *name = NULL;
if (file) {
@@ -66,7 +60,7 @@
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1479,7 +1482,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -1479,7 +1482,7 @@ static int show_numa_map(struct seq_file
struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md;
@@ -75,11 +69,9 @@
struct mm_struct *mm = vma->vm_mm;
struct mm_walk walk = {
.hugetlb_entry = gather_hugetlb_stats,
-diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index 599ec2e..de6cd6e 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
-@@ -160,7 +160,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
+@@ -160,7 +160,10 @@ static int nommu_vma_show(struct seq_fil
file = vma->vm_file;
if (file) {
@@ -91,11 +83,9 @@
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
-diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 0755b9f..073d61e 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -1172,6 +1172,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
+@@ -1173,6 +1173,28 @@ static inline int fixup_user_fault(struc
}
#endif
@@ -124,11 +114,9 @@
extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
void *buf, int len, int write);
-diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 8d37e26..ce89d4c 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
-@@ -241,6 +241,7 @@ struct vm_region {
+@@ -259,6 +259,7 @@ struct vm_region {
unsigned long vm_top; /* region allocated to here */
unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
struct file *vm_file; /* the backing file or NULL */
@@ -136,7 +124,7 @@
int vm_usage; /* region usage count (access under nommu_region_sem) */
bool vm_icache_flushed : 1; /* true if the icache has been flushed for
-@@ -305,6 +306,7 @@ struct vm_area_struct {
+@@ -323,6 +324,7 @@ struct vm_area_struct {
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
units, *not* PAGE_CACHE_SIZE */
struct file * vm_file; /* File we map to (can be NULL). */
@@ -144,11 +132,9 @@
void * vm_private_data; /* was vm_pte (shared mem) */
#ifndef CONFIG_MMU
-diff --git a/kernel/fork.c b/kernel/fork.c
-index 03c1eaa..7e215ba 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
-@@ -456,7 +456,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -461,7 +461,7 @@ static int dup_mmap(struct mm_struct *mm
struct inode *inode = file_inode(file);
struct address_space *mapping = file->f_mapping;
@@ -157,11 +143,9 @@
if (tmp->vm_flags & VM_DENYWRITE)
atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping);
-diff --git a/mm/Makefile b/mm/Makefile
-index 98c4eae..3f0c9b9 100644
--- a/mm/Makefile
+++ b/mm/Makefile
-@@ -21,7 +21,7 @@ obj-y := filemap.o mempool.o oom_kill.o \
+@@ -21,7 +21,7 @@ obj-y := filemap.o mempool.o oom_kill.
mm_init.o mmu_context.o percpu.o slab_common.o \
compaction.o vmacache.o \
interval_tree.o list_lru.o workingset.o \
@@ -170,11 +154,9 @@
obj-y += init-mm.o
-diff --git a/mm/filemap.c b/mm/filemap.c
-index 6bf5e42..a863d0f 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -2062,7 +2062,7 @@ int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
+@@ -2089,7 +2089,7 @@ int filemap_page_mkwrite(struct vm_area_
int ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb);
@@ -183,11 +165,9 @@
lock_page(page);
if (page->mapping != inode->i_mapping) {
unlock_page(page);
-diff --git a/mm/madvise.c b/mm/madvise.c
-index d551475..1ebf71b 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
-@@ -320,12 +320,12 @@ static long madvise_remove(struct vm_area_struct *vma,
+@@ -321,12 +321,12 @@ static long madvise_remove(struct vm_are
* vma's reference to the file) can go away as soon as we drop
* mmap_sem.
*/
@@ -202,11 +182,9 @@
down_read(¤t->mm->mmap_sem);
return error;
}
-diff --git a/mm/memory.c b/mm/memory.c
-index 22e037e..62096a2 100644
--- a/mm/memory.c
+++ b/mm/memory.c
-@@ -2034,7 +2034,7 @@ static inline int wp_page_reuse(struct mm_struct *mm,
+@@ -2034,7 +2034,7 @@ static inline int wp_page_reuse(struct m
}
if (!page_mkwrite)
@@ -215,11 +193,9 @@
}
return VM_FAULT_WRITE;
-diff --git a/mm/mmap.c b/mm/mmap.c
-index bb50cac..1ab5e596 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
-@@ -274,7 +274,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
+@@ -274,7 +274,7 @@ static struct vm_area_struct *remove_vma
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
@@ -228,7 +204,7 @@
mpol_put(vma_policy(vma));
kmem_cache_free(vm_area_cachep, vma);
return next;
-@@ -886,7 +886,7 @@ again: remove_next = 1 + (end > next->vm_end);
+@@ -886,7 +886,7 @@ again: remove_next = 1 + (end > next->
if (remove_next) {
if (file) {
uprobe_munmap(next, next->vm_start, next->vm_end);
@@ -247,7 +223,7 @@
/* Undo any partial mapping done by a device driver. */
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
-@@ -2473,7 +2473,7 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2473,7 +2473,7 @@ static int __split_vma(struct mm_struct
goto out_free_mpol;
if (new->vm_file)
@@ -256,7 +232,7 @@
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
-@@ -2492,7 +2492,7 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2492,7 +2492,7 @@ static int __split_vma(struct mm_struct
if (new->vm_ops && new->vm_ops->close)
new->vm_ops->close(new);
if (new->vm_file)
@@ -265,7 +241,7 @@
unlink_anon_vmas(new);
out_free_mpol:
mpol_put(vma_policy(new));
-@@ -2635,7 +2635,6 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2635,7 +2635,6 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
struct vm_area_struct *vma;
unsigned long populate = 0;
unsigned long ret = -EINVAL;
@@ -273,7 +249,7 @@
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. "
"See Documentation/vm/remap_file_pages.txt.\n",
-@@ -2679,10 +2678,10 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2679,10 +2678,10 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
munlock_vma_pages_range(vma, start, start + size);
}
@@ -286,7 +262,7 @@
out:
up_write(&mm->mmap_sem);
if (populate)
-@@ -2949,7 +2948,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -2949,7 +2948,7 @@ struct vm_area_struct *copy_vma(struct v
if (anon_vma_clone(new_vma, vma))
goto out_free_mempol;
if (new_vma->vm_file)
@@ -295,11 +271,9 @@
if (new_vma->vm_ops && new_vma->vm_ops->open)
new_vma->vm_ops->open(new_vma);
vma_link(mm, new_vma, prev, rb_link, rb_parent);
-diff --git a/mm/msync.c b/mm/msync.c
-index bb04d53..5c24c54 100644
--- a/mm/msync.c
+++ b/mm/msync.c
-@@ -84,10 +84,10 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags)
+@@ -84,10 +84,10 @@ SYSCALL_DEFINE3(msync, unsigned long, st
start = vma->vm_end;
if ((flags & MS_SYNC) && file &&
(vma->vm_flags & VM_SHARED)) {
@@ -312,11 +286,9 @@
if (error || start >= end)
goto out;
down_read(&mm->mmap_sem);
-diff --git a/mm/nommu.c b/mm/nommu.c
-index e544508..dd6f74a 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
-@@ -693,7 +693,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -671,7 +671,7 @@ static void __put_nommu_region(struct vm
up_write(&nommu_region_sem);
if (region->vm_file)
@@ -325,7 +297,7 @@
/* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */
-@@ -858,7 +858,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -829,7 +829,7 @@ static void delete_vma(struct mm_struct
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
@@ -334,7 +306,7 @@
put_nommu_region(vma->vm_region);
kmem_cache_free(vm_area_cachep, vma);
}
-@@ -1398,7 +1398,7 @@ unsigned long do_mmap_pgoff(struct file *file,
+@@ -1354,7 +1354,7 @@ unsigned long do_mmap_pgoff(struct file
goto error_just_free;
}
}
@@ -343,7 +315,7 @@
kmem_cache_free(vm_region_jar, region);
region = pregion;
result = start;
-@@ -1474,10 +1474,10 @@ error_just_free:
+@@ -1429,10 +1429,10 @@ error_just_free:
up_write(&nommu_region_sem);
error:
if (region->vm_file)
@@ -354,11 +326,8 @@
- fput(vma->vm_file);
+ vma_fput(vma);
kmem_cache_free(vm_area_cachep, vma);
- kleave(" = %d", ret);
return ret;
-diff --git a/mm/prfile.c b/mm/prfile.c
-new file mode 100644
-index 0000000..6c145eb
+
--- /dev/null
+++ b/mm/prfile.c
@@ -0,0 +1,86 @@
Modified: dists/trunk/linux/debian/patches/features/all/aufs4/aufs4-standalone.patch
==============================================================================
--- dists/trunk/linux/debian/patches/features/all/aufs4/aufs4-standalone.patch Tue Aug 4 00:47:08 2015 (r22908)
+++ dists/trunk/linux/debian/patches/features/all/aufs4/aufs4-standalone.patch Tue Aug 4 01:30:23 2015 (r22909)
@@ -8,11 +8,11 @@
aufs4.x-rcN standalone patch
-diff --git a/fs/dcache.c b/fs/dcache.c
-index bc261e2..8d7951d 100644
+[bwh: Adjusted context for 4.2]
+
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -1269,6 +1269,7 @@ rename_retry:
+@@ -1272,6 +1272,7 @@ rename_retry:
seq = 1;
goto again;
}
@@ -20,11 +20,9 @@
/*
* Search for at least 1 mount point in the dentry's subdirs.
-diff --git a/fs/file_table.c b/fs/file_table.c
-index 294174d..3cea027 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
-@@ -147,6 +147,7 @@ over:
+@@ -146,6 +146,7 @@ over:
}
return ERR_PTR(-ENFILE);
}
@@ -32,7 +30,7 @@
/**
* alloc_file - allocate and initialize a 'struct file'
-@@ -308,6 +309,7 @@ void put_filp(struct file *file)
+@@ -307,6 +308,7 @@ void put_filp(struct file *file)
file_free(file);
}
}
@@ -40,11 +38,9 @@
void __init files_init(unsigned long mempages)
{
-diff --git a/fs/inode.c b/fs/inode.c
-index ea37cd1..58f5f58 100644
--- a/fs/inode.c
+++ b/fs/inode.c
-@@ -58,6 +58,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
+@@ -58,6 +58,7 @@ static struct hlist_head *inode_hashtabl
static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);
__cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
@@ -52,11 +48,9 @@
/*
* Empty aops. Can be used for the cases where the user does not
-diff --git a/fs/namespace.c b/fs/namespace.c
-index 1b9e111..d45b81b 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -463,6 +463,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
+@@ -463,6 +463,7 @@ void __mnt_drop_write(struct vfsmount *m
mnt_dec_writers(real_mount(mnt));
preempt_enable();
}
@@ -64,7 +58,7 @@
/**
* mnt_drop_write - give up write access to a mount
-@@ -1768,6 +1769,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1803,6 +1804,7 @@ int iterate_mounts(int (*f)(struct vfsmo
}
return 0;
}
@@ -72,8 +66,6 @@
static void cleanup_group_ids(struct mount *mnt, struct mount *end)
{
-diff --git a/fs/notify/group.c b/fs/notify/group.c
-index d16b62c..06ca6bc 100644
--- a/fs/notify/group.c
+++ b/fs/notify/group.c
@@ -22,6 +22,7 @@
@@ -84,7 +76,7 @@
#include <linux/fsnotify_backend.h>
#include "fsnotify.h"
-@@ -72,6 +73,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
+@@ -72,6 +73,7 @@ void fsnotify_get_group(struct fsnotify_
{
atomic_inc(&group->refcnt);
}
@@ -92,7 +84,7 @@
/*
* Drop a reference to a group. Free it if it's through.
-@@ -81,6 +83,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
+@@ -81,6 +83,7 @@ void fsnotify_put_group(struct fsnotify_
if (atomic_dec_and_test(&group->refcnt))
fsnotify_final_destroy_group(group);
}
@@ -100,7 +92,7 @@
/*
* Create a new fsnotify_group and hold a reference for the group returned.
-@@ -109,6 +112,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
+@@ -109,6 +112,7 @@ struct fsnotify_group *fsnotify_alloc_gr
return group;
}
@@ -108,11 +100,9 @@
int fsnotify_fasync(int fd, struct file *file, int on)
{
-diff --git a/fs/notify/mark.c b/fs/notify/mark.c
-index 92e48c7..d2c4b68 100644
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
-@@ -109,6 +109,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
+@@ -109,6 +109,7 @@ void fsnotify_put_mark(struct fsnotify_m
mark->free_mark(mark);
}
}
@@ -120,7 +110,7 @@
/* Calculate mask of events for a list of marks */
u32 fsnotify_recalc_mask(struct hlist_head *head)
-@@ -202,6 +203,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
+@@ -202,6 +203,7 @@ void fsnotify_destroy_mark(struct fsnoti
fsnotify_destroy_mark_locked(mark, group);
mutex_unlock(&group->mark_mutex);
}
@@ -136,7 +126,7 @@
int fsnotify_add_mark(struct fsnotify_mark *mark, struct fsnotify_group *group,
struct inode *inode, struct vfsmount *mnt, int allow_dups)
-@@ -455,6 +458,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
+@@ -455,6 +458,7 @@ void fsnotify_init_mark(struct fsnotify_
atomic_set(&mark->refcnt, 1);
mark->free_mark = free_mark;
}
@@ -144,11 +134,9 @@
static int fsnotify_mark_destroy(void *ignored)
{
-diff --git a/fs/open.c b/fs/open.c
-index 98e5a52..a94e2e7 100644
--- a/fs/open.c
+++ b/fs/open.c
-@@ -62,6 +62,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
+@@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, l
mutex_unlock(&dentry->d_inode->i_mutex);
return ret;
}
@@ -156,16 +144,14 @@
long vfs_truncate(struct path *path, loff_t length)
{
-@@ -676,6 +677,7 @@ int open_check_o_direct(struct file *f)
+@@ -678,6 +679,7 @@ int open_check_o_direct(struct file *f)
}
return 0;
}
+EXPORT_SYMBOL_GPL(open_check_o_direct);
static int do_dentry_open(struct file *f,
- int (*open)(struct inode *, struct file *),
-diff --git a/fs/read_write.c b/fs/read_write.c
-index fd0414e..8ace6ec 100644
+ struct inode *inode,
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -504,6 +504,7 @@ vfs_readf_t vfs_readf(struct file *file)
@@ -176,7 +162,7 @@
vfs_writef_t vfs_writef(struct file *file)
{
-@@ -515,6 +516,7 @@ vfs_writef_t vfs_writef(struct file *file)
+@@ -515,6 +516,7 @@ vfs_writef_t vfs_writef(struct file *fil
return new_sync_write;
return ERR_PTR(-ENOSYS);
}
@@ -184,11 +170,9 @@
ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t *pos)
{
-diff --git a/fs/splice.c b/fs/splice.c
-index fa5eee5..bfb3324 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -1114,6 +1114,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1115,6 +1115,7 @@ long do_splice_from(struct pipe_inode_in
return splice_write(pipe, out, ppos, len, flags);
}
@@ -196,7 +180,7 @@
/*
* Attempt to initiate a splice from a file to a pipe.
-@@ -1140,6 +1141,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -1141,6 +1142,7 @@ long do_splice_to(struct file *in, loff_
return splice_read(in, ppos, pipe, len, flags);
}
@@ -204,11 +188,9 @@
/**
* splice_direct_to_actor - splices data directly between two non-pipes
-diff --git a/fs/xattr.c b/fs/xattr.c
-index 4ef6985..6bb6303 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
-@@ -207,6 +207,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
+@@ -207,6 +207,7 @@ vfs_getxattr_alloc(struct dentry *dentry
*xattr_value = value;
return error;
}
@@ -216,11 +198,9 @@
/* Compare an extended attribute value with the given value */
int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
-diff --git a/security/commoncap.c b/security/commoncap.c
-index f2875cd..ebf06ec 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
-@@ -975,9 +975,11 @@ int cap_mmap_addr(unsigned long addr)
+@@ -970,12 +970,14 @@ int cap_mmap_addr(unsigned long addr)
}
return ret;
}
@@ -232,8 +212,9 @@
return 0;
}
+EXPORT_SYMBOL_GPL(cap_mmap_file);
-diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index 188c1d2..426d9af 100644
+
+ #ifdef CONFIG_SECURITY
+
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -7,6 +7,7 @@
@@ -244,7 +225,7 @@
#include <linux/list.h>
#include <linux/uaccess.h>
#include <linux/seq_file.h>
-@@ -849,6 +850,7 @@ int __devcgroup_inode_permission(struct inode *inode, int mask)
+@@ -849,6 +850,7 @@ int __devcgroup_inode_permission(struct
return __devcgroup_check_permission(type, imajor(inode), iminor(inode),
access);
}
@@ -252,75 +233,73 @@
int devcgroup_inode_mknod(int mode, dev_t dev)
{
-diff --git a/security/security.c b/security/security.c
-index 8e9b1f4..c1c7cd1 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -430,6 +430,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+@@ -438,6 +438,7 @@ int security_path_rmdir(struct path *dir
return 0;
- return security_ops->path_rmdir(dir, dentry);
+ return call_int_hook(path_rmdir, 0, dir, dentry);
}
+EXPORT_SYMBOL_GPL(security_path_rmdir);
int security_path_unlink(struct path *dir, struct dentry *dentry)
{
-@@ -446,6 +447,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
+@@ -454,6 +455,7 @@ int security_path_symlink(struct path *d
return 0;
- return security_ops->path_symlink(dir, dentry, old_name);
+ return call_int_hook(path_symlink, 0, dir, dentry, old_name);
}
+EXPORT_SYMBOL_GPL(security_path_symlink);
int security_path_link(struct dentry *old_dentry, struct path *new_dir,
struct dentry *new_dentry)
-@@ -454,6 +456,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+@@ -462,6 +464,7 @@ int security_path_link(struct dentry *ol
return 0;
- return security_ops->path_link(old_dentry, new_dir, new_dentry);
+ return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
}
+EXPORT_SYMBOL_GPL(security_path_link);
int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
struct path *new_dir, struct dentry *new_dentry,
-@@ -481,6 +484,7 @@ int security_path_truncate(struct path *path)
+@@ -489,6 +492,7 @@ int security_path_truncate(struct path *
return 0;
- return security_ops->path_truncate(path);
+ return call_int_hook(path_truncate, 0, path);
}
+EXPORT_SYMBOL_GPL(security_path_truncate);
int security_path_chmod(struct path *path, umode_t mode)
{
-@@ -488,6 +492,7 @@ int security_path_chmod(struct path *path, umode_t mode)
+@@ -496,6 +500,7 @@ int security_path_chmod(struct path *pat
return 0;
- return security_ops->path_chmod(path, mode);
+ return call_int_hook(path_chmod, 0, path, mode);
}
+EXPORT_SYMBOL_GPL(security_path_chmod);
int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
{
-@@ -495,6 +500,7 @@ int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
+@@ -503,6 +508,7 @@ int security_path_chown(struct path *pat
return 0;
- return security_ops->path_chown(path, uid, gid);
+ return call_int_hook(path_chown, 0, path, uid, gid);
}
+EXPORT_SYMBOL_GPL(security_path_chown);
int security_path_chroot(struct path *path)
{
-@@ -580,6 +586,7 @@ int security_inode_readlink(struct dentry *dentry)
+@@ -588,6 +594,7 @@ int security_inode_readlink(struct dentr
return 0;
- return security_ops->inode_readlink(dentry);
+ return call_int_hook(inode_readlink, 0, dentry);
}
+EXPORT_SYMBOL_GPL(security_inode_readlink);
- int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
- {
-@@ -594,6 +601,7 @@ int security_inode_permission(struct inode *inode, int mask)
+ int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
+ bool rcu)
+@@ -603,6 +610,7 @@ int security_inode_permission(struct ino
return 0;
- return security_ops->inode_permission(inode, mask);
+ return call_int_hook(inode_permission, 0, inode, mask);
}
+EXPORT_SYMBOL_GPL(security_inode_permission);
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
-@@ -716,6 +724,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -741,6 +749,7 @@ int security_file_permission(struct file
return fsnotify_perm(file, mask);
}
@@ -328,7 +307,7 @@
int security_file_alloc(struct file *file)
{
-@@ -775,6 +784,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
+@@ -800,6 +809,7 @@ int security_mmap_file(struct file *file
return ret;
return ima_file_mmap(file, prot);
}
Modified: dists/trunk/linux/debian/patches/features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch
==============================================================================
--- dists/trunk/linux/debian/patches/features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch Tue Aug 4 00:47:08 2015 (r22908)
+++ dists/trunk/linux/debian/patches/features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch Tue Aug 4 01:30:23 2015 (r22909)
@@ -7,12 +7,12 @@
from other Loongson 3 based machines by the UART base clock speed.
Signed-off-by: Aurelien Jarno <aurelien at aurel32.net>
-[bwh: Forward-ported to 3.19]
+[bwh: Forward-ported to 4.2]
---
- arch/mips/include/asm/bootinfo.h | 1 +
- arch/mips/loongson/common/machtype.c | 1 +
- arch/mips/loongson/common/serial.c | 1 +
- arch/mips/loongson/common/uart_base.c | 1 +
+ arch/mips/include/asm/bootinfo.h | 1 +
+ arch/mips/loongson64/common/machtype.c | 1 +
+ arch/mips/loongson64/common/serial.c | 1 +
+ arch/mips/loongson64/common/uart_base.c | 1 +
4 files changed, 4 insertions(+)
--- a/arch/mips/include/asm/bootinfo.h
@@ -25,8 +25,8 @@
MACH_LOONGSON_END
};
---- a/arch/mips/loongson/common/machtype.c
-+++ b/arch/mips/loongson/common/machtype.c
+--- a/arch/mips/loongson64/common/machtype.c
++++ b/arch/mips/loongson64/common/machtype.c
@@ -28,6 +28,7 @@ static const char *system_types[] = {
[MACH_LEMOTE_NAS] = "lemote-nas-2f",
[MACH_LEMOTE_LL2F] = "lemote-lynloong-2f",
@@ -35,8 +35,8 @@
[MACH_LOONGSON_END] = NULL,
};
---- a/arch/mips/loongson/common/serial.c
-+++ b/arch/mips/loongson/common/serial.c
+--- a/arch/mips/loongson64/common/serial.c
++++ b/arch/mips/loongson64/common/serial.c
@@ -48,6 +48,7 @@ static struct plat_serial8250_port uart8
[MACH_LEMOTE_NAS] = {PORT_M(3, 3686400), {} },
[MACH_LEMOTE_LL2F] = {PORT(3, 1843200), {} },
@@ -45,8 +45,8 @@
[MACH_LOONGSON_END] = {},
};
---- a/arch/mips/loongson/common/uart_base.c
-+++ b/arch/mips/loongson/common/uart_base.c
+--- a/arch/mips/loongson64/common/uart_base.c
++++ b/arch/mips/loongson64/common/uart_base.c
@@ -25,6 +25,7 @@ void prom_init_loongson_uart_base(void)
{
switch (mips_machtype) {
Modified: dists/trunk/linux/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch
==============================================================================
--- dists/trunk/linux/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch Tue Aug 4 00:47:08 2015 (r22908)
+++ dists/trunk/linux/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch Tue Aug 4 01:30:23 2015 (r22909)
@@ -22,13 +22,13 @@
Documentation/kernel-parameters.txt | 4 ++++
arch/x86/Kconfig | 8 +++++++
arch/x86/include/asm/elf.h | 8 ++++++-
- arch/x86/kernel/entry_64.S | 36 ++++++++++++++++++++++---------
- arch/x86/kernel/syscall_64.c | 43 +++++++++++++++++++++++++++++++++++++
+ arch/x86/entry/entry_64.S | 36 ++++++++++++++++++++++---------
+ arch/x86/entry/syscall_64.c | 43 +++++++++++++++++++++++++++++++++++++
5 files changed, 88 insertions(+), 11 deletions(-)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -3516,6 +3516,10 @@ bytes respectively. Such letter suffixes
+@@ -3580,6 +3580,10 @@ bytes respectively. Such letter suffixes
switches= [HW,M68k]
@@ -41,7 +41,7 @@
on older distributions. When this option is enabled
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -2540,6 +2540,14 @@ config X86_X32
+@@ -2547,6 +2547,14 @@ config X86_X32
elf32_x86_64 support enabled to compile a kernel with this
option set.
@@ -80,57 +80,57 @@
#if __USER32_DS != __USER_DS
# error "The following code assumes __USER32_DS == __USER_DS"
---- a/arch/x86/kernel/entry_64.S
-+++ b/arch/x86/kernel/entry_64.S
-@@ -252,8 +252,12 @@ system_call_fastpath:
+--- a/arch/x86/entry/entry_64.S
++++ b/arch/x86/entry/entry_64.S
+@@ -178,8 +178,12 @@ entry_SYSCALL_64_fastpath:
#if __SYSCALL_MASK == ~0
- cmpq $__NR_syscall_max,%rax
+ cmpq $__NR_syscall_max, %rax
#else
-- andl $__SYSCALL_MASK,%eax
-- cmpl $__NR_syscall_max,%eax
-+ .globl system_call_fast_compare
-+ .globl system_call_fast_compare_end
+- andl $__SYSCALL_MASK, %eax
+- cmpl $__NR_syscall_max, %eax
++.global system_call_fast_compare
++.global system_call_fast_compare_end
+system_call_fast_compare:
-+ cmpq $511,%rax /* x32 syscalls start at 512 */
-+ .byte P6_NOP4
++ cmpq $511, %rax /* x32 syscalls start at 512 */
++ .byte P6_NOP4
+system_call_fast_compare_end:
#endif
- ja 1f /* return -ENOSYS (already in pt_regs->ax) */
- movq %r10,%rcx
-@@ -337,8 +341,12 @@ tracesys_phase2:
+ ja 1f /* return -ENOSYS (already in pt_regs->ax) */
+ movq %r10, %rcx
+@@ -257,8 +261,12 @@ tracesys_phase2:
#if __SYSCALL_MASK == ~0
- cmpq $__NR_syscall_max,%rax
+ cmpq $__NR_syscall_max, %rax
#else
-- andl $__SYSCALL_MASK,%eax
-- cmpl $__NR_syscall_max,%eax
-+ .globl system_call_trace_compare
-+ .globl system_call_trace_compare_end
+- andl $__SYSCALL_MASK, %eax
+- cmpl $__NR_syscall_max, %eax
++.global system_call_trace_compare
++.global system_call_trace_compare_end
+system_call_trace_compare:
-+ cmpq $511,%rax /* x32 syscalls start at 512 */
-+ .byte P6_NOP4
++ cmpq $511, %rax /* x32 syscalls start at 512 */
++ .byte P6_NOP4
+system_call_trace_compare_end:
#endif
- ja 1f /* return -ENOSYS (already in pt_regs->ax) */
- movq %r10,%rcx /* fixup for C */
-@@ -488,6 +496,16 @@ opportunistic_sysret_failed:
- END(system_call)
+ ja 1f /* return -ENOSYS (already in pt_regs->ax) */
+ movq %r10, %rcx /* fixup for C */
+@@ -410,6 +418,16 @@ opportunistic_sysret_failed:
+ END(entry_SYSCALL_64)
+#if __SYSCALL_MASK != ~0
+ /* This replaces the usual comparisons if syscall.x32 is set */
-+ .globl system_call_mask_compare
-+ .globl system_call_mask_compare_end
++.global system_call_mask_compare
++.global system_call_mask_compare_end
+system_call_mask_compare:
-+ andl $__SYSCALL_MASK,%eax
-+ cmpl $__NR_syscall_max,%eax
++ andl $__SYSCALL_MASK, %eax
++ cmpl $__NR_syscall_max, %eax
+system_call_mask_compare_end:
+#endif
+
.macro FORK_LIKE func
ENTRY(stub_\func)
- CFI_STARTPROC
---- a/arch/x86/kernel/syscall_64.c
-+++ b/arch/x86/kernel/syscall_64.c
+ SAVE_EXTRA_REGS 8
+--- a/arch/x86/entry/syscall_64.c
++++ b/arch/x86/entry/syscall_64.c
@@ -3,8 +3,14 @@
#include <linux/linkage.h>
#include <linux/sys.h>
Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series Tue Aug 4 00:47:08 2015 (r22908)
+++ dists/trunk/linux/debian/patches/series Tue Aug 4 01:30:23 2015 (r22909)
@@ -79,16 +79,6 @@
# Miscellaneous features
features/all/efi-autoload-efi-pstore.patch
-bugfix/x86/kvm-x86-fix-kvm_apic_has_events-to-check-for-null-po.patch
-bugfix/x86/0003-x86-asm-entry-64-Remove-pointless-jump-to-irq_return.patch
-bugfix/x86/0004-x86-nmi-Enable-nested-do_nmi-handling-for-64-bit-ker.patch
-bugfix/x86/0005-x86-nmi-64-Remove-asm-code-that-saves-cr2.patch
-bugfix/x86/0006-x86-nmi-64-Switch-stacks-on-userspace-NMI-entry.patch
-bugfix/x86/0007-x86-nmi-64-Improve-nested-NMI-comments.patch
-bugfix/x86/0008-x86-nmi-64-Reorder-nested-NMI-checks.patch
-bugfix/x86/0009-x86-nmi-64-Use-DF-to-avoid-userspace-RSP-confusing-n.patch
-bugfix/all/keys-ensure-we-free-the-assoc-array-edit-if-edit-is-valid.patch
-bugfix/s390/s390-cachinfo-add-missing-facility-check-to-init_cache_level.patch
bugfix/all/md-use-kzalloc-when-bitmap-is-disabled.patch
# Hardening from grsecurity
More information about the Kernel-svn-changes
mailing list