Linux v4.1-rc2-79-g0e1dc4274828
This commit is contained in:
parent
45a0b49689
commit
5f94435ddd
@ -25,6 +25,3 @@ index c68e72414a67..4277938af700 100644
|
||||
if (!(*ppos)) {
|
||||
/* parse the table header to get the table length */
|
||||
if (count <= sizeof(struct acpi_table_header))
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -26,6 +26,3 @@ index 3b7151687776..4b19e7e5bc01 100644
|
||||
/* Lock the device, then check to see if we were
|
||||
* disconnected while waiting for the lock to succeed. */
|
||||
usb_lock_device(hdev);
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -51,6 +51,3 @@ index aa4ee20ec8bb..958d1d9a5af8 100644
|
||||
/*
|
||||
* All runtime access to EFI goes through this structure:
|
||||
*/
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -173,6 +173,3 @@ index 958d1d9a5af8..3dd6f4a51b9b 100644
|
||||
/**
|
||||
* efi_range_is_wc - check the WC bit on an address range
|
||||
* @start: starting kvirt address
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -54,7 +54,7 @@ index 226d5696e1d1..6a8f880e213f 100644
|
||||
def_bool y
|
||||
prompt "Enable seccomp to safely compute untrusted bytecode"
|
||||
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
|
||||
index ef17683484e9..105e7360d747 100644
|
||||
index 48304b89b601..2ff19014117a 100644
|
||||
--- a/arch/x86/boot/compressed/eboot.c
|
||||
+++ b/arch/x86/boot/compressed/eboot.c
|
||||
@@ -12,6 +12,7 @@
|
||||
@ -103,7 +103,7 @@ index ef17683484e9..105e7360d747 100644
|
||||
/*
|
||||
* See if we have Graphics Output Protocol
|
||||
*/
|
||||
@@ -1406,6 +1438,10 @@ struct boot_params *efi_main(struct efi_config *c,
|
||||
@@ -1408,6 +1440,10 @@ struct boot_params *efi_main(struct efi_config *c,
|
||||
else
|
||||
setup_boot_services32(efi_early);
|
||||
|
||||
@ -180,6 +180,3 @@ index f43cbdd52546..feb6736fec91 100644
|
||||
bool secure_modules(void)
|
||||
{
|
||||
#ifdef CONFIG_MODULE_SIG
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -58,6 +58,3 @@ index 42a1d2afb217..f43cbdd52546 100644
|
||||
+#endif
|
||||
+}
|
||||
+EXPORT_SYMBOL(secure_modules);
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -243,6 +243,3 @@ index feb6736fec91..5ea645737f23 100644
|
||||
|
||||
static int param_set_bool_enable_only(const char *val,
|
||||
const struct kernel_param *kp)
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -45,6 +45,3 @@ index 630af73e98c4..c69b308beb3f 100644
|
||||
input_mt_drop_unused(dev);
|
||||
|
||||
/* Don't use active slot count to generate BTN_TOOL events. */
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -106,6 +106,3 @@ index 875f64e8935b..c15e93f5a418 100644
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -59,7 +59,7 @@ index 2da553fd7fc3..32f118807d2a 100644
|
||||
ifdef CONFIG_DEBUG_INFO
|
||||
ifdef CONFIG_DEBUG_INFO_SPLIT
|
||||
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
|
||||
index 17670573dda8..d23b7c975eb5 100644
|
||||
index ba2b0c87e65b..390e4089c086 100644
|
||||
--- a/lib/Kconfig.debug
|
||||
+++ b/lib/Kconfig.debug
|
||||
@@ -165,7 +165,23 @@ config DEBUG_INFO_DWARF4
|
||||
@ -87,6 +87,3 @@ index 17670573dda8..d23b7c975eb5 100644
|
||||
|
||||
config GDB_SCRIPTS
|
||||
bool "Provide GDB scripts for kernel debugging"
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -180,6 +180,3 @@ index 000000000000..94b0eb38a284
|
||||
+ return rc;
|
||||
+}
|
||||
+late_initcall(load_uefi_certs);
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -78,6 +78,3 @@ index 94b0eb38a284..ae28b974d49a 100644
|
||||
}
|
||||
|
||||
mok = get_cert_list(L"MokListRT", &mok_var, &moksize);
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -111,6 +111,3 @@ index b91c4da68365..98f5637304d1 100644
|
||||
return -EPERM;
|
||||
|
||||
dev = pci_get_bus_and_slot(bus, dfn);
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -36,6 +36,3 @@ index 53fe675f9bd7..b52c88860532 100644
|
||||
if (p < (unsigned long) high_memory) {
|
||||
unsigned long to_write = min_t(unsigned long, count,
|
||||
(unsigned long)high_memory - p);
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -40,6 +40,3 @@ index cc79d3fedfb2..d9bf8ba7d848 100644
|
||||
module_param(brightness_switch_enabled, bool, 0644);
|
||||
|
||||
/*
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -33,6 +33,3 @@ index 39748bb3a543..72edfeedb326 100644
|
||||
return acpi_rsdp;
|
||||
#endif
|
||||
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -10409,6 +10409,3 @@ index 000000000000..04c00d236c49
|
||||
+#endif
|
||||
+
|
||||
+#endif
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -1841,6 +1841,3 @@ index 000000000000..c352d5c2989b
|
||||
+ { }
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(mdio, amd_xgbe_phy_a0_ids);
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -40,6 +40,3 @@ index 9688dda39e7a..8e3e77f3121f 100644
|
||||
clkout2_pin: pinmux_clkout2_pin {
|
||||
pinctrl-single,pins = <
|
||||
0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -64,6 +64,3 @@ index c3255e0c90aa..1fd496fe1a68 100644
|
||||
};
|
||||
|
||||
/include/ "tps65217.dtsi"
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -267,6 +267,3 @@ index 1fd496fe1a68..9688dda39e7a 100644
|
||||
+ };
|
||||
+ };
|
||||
};
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -36,6 +36,3 @@ index 0fd89c38cf02..20660917a06f 100644
|
||||
hdmi {
|
||||
compatible = "ti,tilcdc,slave";
|
||||
i2c = <&i2c0>;
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -34,6 +34,3 @@ index 5c42d259fa68..0fd89c38cf02 100644
|
||||
};
|
||||
};
|
||||
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -55,6 +55,3 @@ index 231fba0d03e5..0de5a6ddd5eb 100644
|
||||
.init_irq = highbank_init_irq,
|
||||
.init_machine = highbank_init,
|
||||
.dt_compat = highbank_match,
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -60,6 +60,3 @@ index 99b46f8030ad..8b6ddd16dcc5 100644
|
||||
+ pinctrl-0 = <&pinctrl_usdhc3>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -40,6 +40,3 @@ index 74753132c3ac..3cc99d7c2361 100644
|
||||
+ return 0;
|
||||
+}
|
||||
+early_initcall(arm64_console_setup);
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -48,6 +48,3 @@ index 7543a56e0f45..93b5a6998371 100644
|
||||
status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
|
||||
1, asus->debug.method_id,
|
||||
&input, &output);
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -36,6 +36,3 @@ index bba85d1a6cd1..ebbee8f17130 100644
|
||||
ath_err(common,
|
||||
"DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n",
|
||||
AH_RX_STOP_DMA_TIMEOUT / 1000,
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -504,6 +504,3 @@ index 000000000000..25ab9869d566
|
||||
+#endif /* __KERNEL__ */
|
||||
+
|
||||
+#endif /* __CRASH_H__ */
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -30,6 +30,3 @@ index 1c9c8e500a48..6d00970e220e 100644
|
||||
depends on MULTIUSER
|
||||
default !EXPERT
|
||||
help
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -27,6 +27,3 @@ index a08cda955285..e320e1e679cf 100644
|
||||
|
||||
#else
|
||||
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -56,6 +56,3 @@ index 4022b75eaad7..1aaf06aa7b0f 100644
|
||||
err = i8042_platform_init();
|
||||
if (err)
|
||||
return err;
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -26,6 +26,3 @@ index d547d9c8dda2..f523ee679987 100644
|
||||
intel_dump_pipe_config(crtc, &pipe_config,
|
||||
"[hw state]");
|
||||
intel_dump_pipe_config(crtc, crtc->config,
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -37,6 +37,3 @@ index af5be0368dec..aa4ee20ec8bb 100644
|
||||
|
||||
#ifdef CONFIG_EFI
|
||||
/*
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -778,6 +778,3 @@ index 9cc069579351..fa3546989ab0 100644
|
||||
|
||||
extern int efi_reboot_quirk_mode;
|
||||
extern bool efi_poweroff_required(void);
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -14,7 +14,7 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
|
||||
1 file changed, 19 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
|
||||
index 105e7360d747..83fc4e9888ee 100644
|
||||
index 2ff19014117a..35268abaca99 100644
|
||||
--- a/arch/x86/boot/compressed/eboot.c
|
||||
+++ b/arch/x86/boot/compressed/eboot.c
|
||||
@@ -830,8 +830,9 @@ out:
|
||||
@ -52,6 +52,3 @@ index 105e7360d747..83fc4e9888ee 100644
|
||||
return 1;
|
||||
}
|
||||
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -24,6 +24,3 @@ index 6a8f880e213f..d3c21e9d267c 100644
|
||||
prompt "Force module signing when UEFI Secure Boot is enabled"
|
||||
---help---
|
||||
UEFI Secure Boot provides a mechanism for ensuring that the
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -33,6 +33,3 @@ index 2329daae5255..48a8e82c7e2e 100644
|
||||
}
|
||||
|
||||
/**
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -28,6 +28,3 @@ index ec876b5b1382..9d5216e23a09 100644
|
||||
goto out;
|
||||
case ATKBD_RET_ERR:
|
||||
atkbd->err_count++;
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -60,6 +60,3 @@ index 32d710eaf1fc..af4a20b86ee7 100644
|
||||
|
||||
cp = can_get_proto(protocol);
|
||||
}
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -120,6 +120,3 @@ index 86a4fe75f453..161637ed5611 100755
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -67,7 +67,7 @@ Summary: The Linux kernel
|
||||
# The rc snapshot level
|
||||
%define rcrev 2
|
||||
# The git snapshot level
|
||||
%define gitrev 2
|
||||
%define gitrev 3
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 4.%{upstream_sublevel}.0
|
||||
%endif
|
||||
@ -2201,6 +2201,9 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Thu May 07 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc2.git3.1
|
||||
- Linux v4.1-rc2-79-g0e1dc4274828
|
||||
|
||||
* Wed May 06 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc2.git2.1
|
||||
- Linux v4.1-rc2-37-g5198b44374ad
|
||||
|
||||
|
@ -38,6 +38,3 @@ index 7a36fdcca5bf..22d30d7a12b8 100644
|
||||
* Verify we have a legal set of flags
|
||||
* This leaves us room for future extensions.
|
||||
*/
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -32,6 +32,3 @@ index 601965a948e8..028213cf0e4d 100644
|
||||
help
|
||||
Use dynamic allocation for cpumask_var_t, instead of putting
|
||||
them on the stack. This is a bit more expensive, but avoids
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -34,6 +34,3 @@ index f6cb1f1b30b7..4476fb590733 100644
|
||||
ATA_HORKAGE_ZERO_AFTER_TRIM, },
|
||||
|
||||
/*
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -73,6 +73,3 @@ index 4739689d23ad..d713074200f3 100644
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -20,6 +20,3 @@ index 72b1fc3ab910..86907eaa4883 100644
|
||||
|
||||
static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
|
||||
{
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -32,6 +32,3 @@ index 13b45f297727..f84ce0135c38 100644
|
||||
|
||||
MODULE_AUTHOR("Tony Lindgren <tony@atomide.com>");
|
||||
MODULE_DESCRIPTION("One-register-per-pin type device tree based pinctrl driver");
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -32,6 +32,3 @@ index 79beebf53302..eca0b7e0944f 100644
|
||||
/*
|
||||
* If the device is offline, don't try and read capacity or any
|
||||
* of the other niceties.
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -50,6 +50,3 @@ index b97210671a81..2d12ad82fe75 100644
|
||||
fs_initcall(fb_console_init);
|
||||
|
||||
#ifdef MODULE
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
2
sources
2
sources
@ -1,4 +1,4 @@
|
||||
a86916bd12798220da9eb4a1eec3616d linux-4.0.tar.xz
|
||||
d125eecce68ab6fb5f1f23523c2c04b8 perf-man-4.0.tar.gz
|
||||
1af1ca2f20db7ebc2a94a786fb6f8e86 patch-4.1-rc2.xz
|
||||
4a3c022b0d1df600e9d4a31ebe0d0828 patch-4.1-rc2-git2.xz
|
||||
433b3ba53461a9116cf77b23a8877986 patch-4.1-rc2-git3.xz
|
||||
|
@ -38,6 +38,3 @@ index 783e819139a7..4f93ef6942d8 100644
|
||||
|
||||
hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
|
||||
if (!hcd)
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -73,6 +73,3 @@ index 2316f50b07a4..da39c565a03e 100644
|
||||
set_sample_period();
|
||||
|
||||
if (watchdog_enabled)
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -65,6 +65,3 @@ index 6b1721f978c2..53fe675f9bd7 100644
|
||||
if (!access_ok(VERIFY_READ, buf, count))
|
||||
return -EFAULT;
|
||||
while (count-- > 0 && i < 65536) {
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -37,6 +37,3 @@ index 113e70784854..26c2f83fc470 100644
|
||||
if (copy_from_user(®s, uregs, sizeof regs)) {
|
||||
err = -EFAULT;
|
||||
break;
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
@ -46,6 +46,3 @@ index c4a0666de6f5..26e651336787 100644
|
||||
dev->is_busmaster = 0;
|
||||
} else {
|
||||
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
||||
--
|
||||
2.3.6
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user