Linus Torvalds
181da3c34a
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ...
Pull x86 fixes from Peter Anvin:
"A somewhat unpleasantly large collection of small fixes. The big ones
are the __visible tree sweep and a fix for 'earlyprintk=efi,keep'. It
was using __init functions with predictably suboptimal results.
Another key fix is a build fix which would produce output that simply
would not decompress correctly in some configuration, due to the
existing Makefiles picking up an unfortunate local label and mistaking
it for the global symbol _end.
Additional fixes include the handling of 64-bit numbers when setting
the vdso data page (a latent bug which became manifest when i386
started exporting a vdso with time functions), a fix to the new MSR
manipulation accessors which would cause features to not get properly
unblocked, a build fix for 32-bit userland, and a few new platform
quirks"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, vdso, time: Cast tv_nsec to u64 for proper shifting in update_vsyscall()
x86: Fix typo in MSR_IA32_MISC_ENABLE_LIMIT_CPUID macro
x86: Fix typo preventing msr_set/clear_bit from having an effect
x86/intel: Add quirk to disable HPET for the Baytrail platform
x86/hpet: Make boot_hpet_disable extern
x86-64, build: Fix stack protector Makefile breakage with 32-bit userland
x86/reboot: Add reboot quirk for Certec BPC600
asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*
asmlinkage, x86: Add explicit __visible to arch/x86/*
asmlinkage: Revert "lto: Make asmlinkage __visible"
x86, build: Don't get confused by local symbols
x86/efi: earlyprintk=efi,keep fix
2014-05-09 12:24:20 -07:00
Merge branches 'acpi-ec' and 'acpi-processor'
2014-05-03 00:20:31 +02:00
ARM: SoC: driver changes
2014-04-05 15:37:40 -07:00
Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2014-04-24 09:57:02 -07:00
drivercore: deferral race condition fix
2014-04-29 15:44:05 +01:00
bcma: gpio: register 32 GPIOs on BCM5357
2014-03-27 14:20:04 -04:00
floppy: don't write kernel-only members to FDRAWCMD ioctl output
2014-05-05 07:46:56 -07:00
Bluetooth: Add support for Lite-on [04ca:3007]
2014-04-25 09:47:16 +03:00
ARM: SoC: driver changes
2014-04-05 15:37:40 -07:00
agp: info leak in agpioc_info_wrap()
2014-05-06 13:05:00 -07:00
vexpress: Initialise the sysregs before setting up the clocks
2014-05-04 11:35:29 +01:00
Merge branch 'clockevents/3.15-fixes' of git://git.linaro.org/people/daniel.lezcano/linux into timers/urgent
2014-04-29 19:26:58 +02:00
net: Use netlink_ns_capable to verify the permisions of netlink messages
2014-04-24 13:44:54 -04:00
cpufreq: ppc-corenet-cpufreq: Fix __udivdi3 modpost error
2014-04-29 01:28:17 +02:00
Merge branch 'pm-cpuidle'
2014-04-08 13:27:40 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2014-04-03 09:28:16 -07:00
dma: fix eDMA driver as a subsys_initcall
2014-04-16 12:03:47 +05:30
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2014-04-04 09:50:07 -07:00
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-04-11 11:58:33 -07:00
A few fixes for the GPIO tree:
2014-04-22 09:28:02 -07:00
Merge branch 'mullins' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes
2014-05-07 09:10:28 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2014-05-07 16:07:58 -07:00
Drivers: hv: vmbus: Negotiate version 3.0 when running on ws2012r2 hosts
2014-04-16 14:14:07 -07:00
Revert "hwmon: (coretemp) Refine TjMax detection"
2014-05-01 04:07:52 -07:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-04-09 08:45:40 -07:00
intel_idle: fix IVT idle state table setting
2014-04-21 23:36:07 +02:00
iio: adc: Nothing in ADC should be a bool CONFIG
2014-04-26 11:22:16 +01:00
RDMA/cxgb4: Update Kconfig to include Chelsio T5 adapter
2014-04-28 17:29:41 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-05-08 14:06:45 -07:00
Merge git://git.infradead.org/iommu-2.6 into iommu/fixes
2014-04-16 16:09:40 +02:00
mvebu irqchip ifxes for v3.15
2014-04-29 19:23:22 +02:00
hisax/icc: add missing semicolon after label
2014-04-22 21:22:47 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-04-10 09:06:10 -07:00
drivers/lguest/page_tables.c: rename do_set_pte()
2014-04-07 16:35:52 -07:00
drivers: mcb: fix memory leak in chameleon_parse_cells() error path
2014-04-16 12:28:47 -07:00
A few dm-thinp fixes for changes merged in 3.15-rc1.
2014-05-02 14:14:02 -07:00
platform: Fix timberdale dependencies
2014-04-16 11:57:27 +05:30
PCI changes for the v3.15 merge window:
2014-04-01 15:14:04 -07:00
mmc: rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"
2014-05-08 08:44:50 +01:00
misc: Grammar s/addition/additional/
2014-04-16 12:28:47 -07:00
mmc: rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"
2014-05-08 08:44:50 +01:00
MTD update for 3.15-rc5
2014-05-07 16:28:52 -07:00
net: macb: Fix race between HW and driver
2014-05-05 17:11:18 -04:00
ntb: Use pci_enable_msix_range() instead of pci_enable_msix()
2014-04-07 10:59:20 -07:00
of/irq: do irq resolution in platform_get_irq
2014-04-24 21:40:22 +01:00
PCI: tegra: Use new OF interrupt mapping when possible
2014-04-16 10:24:32 -06:00
PCI changes for the v3.15 merge window:
2014-04-01 15:14:04 -07:00
phy: fix kernel oops in phy_lookup()
2014-04-24 12:53:38 -07:00
sh-pfc: r8a7791: Fix definition of MOD_SEL3
2014-04-23 16:09:53 +02:00
alienware-wmi: cover some scenarios where memory allocations would fail
2014-04-10 12:11:56 -04:00
asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*
2014-05-05 16:07:46 -07:00
power/reset: vexpress: Fix restart/power off operation
2014-04-24 17:20:50 +01:00
CPU hotplug notifiers registration fixes for 3.15-rc1
2014-04-07 14:55:46 -07:00
net: ptp: move PTP classifier in its own file
2014-04-01 16:43:18 -04:00
Shiraz has moved
2014-04-18 16:40:08 -07:00
rapidio: rework device hierarchy and introduce mport class of devices
2014-04-07 16:36:07 -07:00
regulator: pbias: Convert to use regmap helper functions
2014-04-14 22:16:25 +01:00
Merge branch 'reset/for_v3.15' of git://git.pengutronix.de/git/pza/linux into next/drivers
2014-03-27 01:28:19 +01:00
drivers/rtc/rtc-pcf8523.c: fix month definition
2014-05-06 13:04:58 -07:00
s390/chsc: fix SEI usage on old FW levels
2014-04-17 12:46:28 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-05-05 15:59:46 -07:00
ARM: SoC: sh driver changes
2014-04-05 15:38:41 -07:00
Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/bfin5xx', 'spi/fix/hspi' and 'spi/fix/sirf' into spi-linus
2014-04-23 13:50:18 +01:00
Second set of fixes for IIO in the 3.15 cycle.
2014-04-30 14:19:23 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-04-12 17:31:22 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2014-04-10 09:15:46 -07:00
tty: Fix lockless tty buffer race
2014-05-03 18:14:28 -04:00
USB: Nokia 5300 should be treated as unusual dev
2014-05-03 19:41:07 -04:00
uwb: don't call spin_unlock_irq in a USB completion handler
2014-04-24 12:45:40 -07:00
VFIO updates for v3.15 include:
2014-04-03 14:05:02 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-04-12 16:51:08 -07:00
video: Kconfig: move drm and fb into separate menus
2014-04-17 08:10:20 +03:00
vme_tsi148: Utilize to_pci_dev() macro
2014-04-16 14:08:37 -07:00
w1: avoid recursive device_add
2014-04-16 14:07:51 -07:00
CPU hotplug notifiers registration fixes for 3.15-rc1
2014-04-07 14:55:46 -07:00
Xen regression and bug fixes for 3.15-rc1.
2014-04-17 10:54:07 -07:00
video: move fbdev to drivers/video/fbdev
2014-04-17 08:10:19 +03:00
181da3c34a