Commit 6e9131cc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.5-rc2 into tty-next 



We want the tty/serial fixes in here as well to make merges easier.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents afc5ab09 36f90b0a

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com> 
Andrew Morton <akpm@linux-foundation.org>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andy Adamson <andros@citi.umich.edu>

Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>

Archit Taneja <archit@ti.com>

Arnaud Patard <arnaud.patard@rtp-net.org>

Arnd Bergmann <arnd@arndb.de>

Documentation/Intel-IOMMU.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Linux IOMMU Support 


The architecture spec can be obtained from the below location.



http://www.intel.com/technology/virtualization/

http://www.intel.com/content/dam/www/public/us/en/documents/product-specifications/vt-directed-io-spec.pdf



This guide gives a quick cheat sheet for some basic understanding.

Documentation/virtual/kvm/api.txt

+1 −1
Original line number Diff line number Diff line
@@ -3025,7 +3025,7 @@ len must be a multiple of sizeof(struct kvm_s390_irq). It must be > 0 
and it must not exceed (max_vcpus + 32) * sizeof(struct kvm_s390_irq),

which is the maximum number of possibly pending cpu-local interrupts.



4.90 KVM_SMI

4.96 KVM_SMI



Capability: KVM_CAP_X86_SMM

Architectures: x86

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 5

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Blurry Fish Butt



# *DOCUMENTATION*

arch/arm/boot/compressed/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -106,6 +106,15 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS) 
KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))

endif



# -fstack-protector-strong triggers protection checks in this code,

# but it is being used too early to link to meaningful stack_chk logic.

nossp_flags := $(call cc-option, -fno-stack-protector)

CFLAGS_atags_to_fdt.o := $(nossp_flags)

CFLAGS_fdt.o := $(nossp_flags)

CFLAGS_fdt_ro.o := $(nossp_flags)

CFLAGS_fdt_rw.o := $(nossp_flags)

CFLAGS_fdt_wip.o := $(nossp_flags)



ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj)

asflags-y := -DZIMAGE