Commit 3152657f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/fpu 



Resolve semantic conflict in arch/x86/kvm/cpuid.c with:

  c447e76b ("kvm/fpu: Enable eager restore kvm FPU for MPX")

By removing the FPU internal include files.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b8c1b8ea ba155e2d

Documentation/devicetree/bindings/clock/silabs,si5351.txt

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ Required properties: 
- #clock-cells: from common clock binding; shall be set to 1.

- clocks: from common clock binding; list of parent clock

  handles, shall be xtal reference clock or xtal and clkin for

  si5351c only.

  si5351c only. Corresponding clock input names are "xtal" and

  "clkin" respectively.

- #address-cells: shall be set to 1.

- #size-cells: shall be set to 0.
@@ -71,6 +72,7 @@ i2c-master-node { 


		/* connect xtal input to 25MHz reference */

		clocks = <&ref25>;

		clock-names = "xtal";



		/* connect xtal input as source of pll0 and pll1 */

		silabs,pll-source = <0 0>, <1 0>;

Documentation/devicetree/bindings/net/cdns-emac.txt

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
Required properties:

- compatible: Should be "cdns,[<chip>-]{emac}"

  Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC.

  or the generic form: "cdns,emac".

  Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.

  Or the generic form: "cdns,emac".

- reg: Address and length of the register set for the device

- interrupts: Should contain macb interrupt

- phy-mode: see ethernet.txt file in the same directory.

Documentation/virtual/kvm/mmu.txt

+14 −4
Original line number Diff line number Diff line
@@ -169,6 +169,10 @@ Shadow pages contain the following information: 
    Contains the value of cr4.smep && !cr0.wp for which the page is valid

    (pages for which this is true are different from other pages; see the

    treatment of cr0.wp=0 below).

  role.smap_andnot_wp:

    Contains the value of cr4.smap && !cr0.wp for which the page is valid

    (pages for which this is true are different from other pages; see the

    treatment of cr0.wp=0 below).

  gfn:

    Either the guest page table containing the translations shadowed by this

    page, or the base page frame for linear translations.  See role.direct.
@@ -344,10 +348,16 @@ on fault type: 


(user write faults generate a #PF)



In the first case there is an additional complication if CR4.SMEP is

enabled: since we've turned the page into a kernel page, the kernel may now

execute it.  We handle this by also setting spte.nx.  If we get a user

fetch or read fault, we'll change spte.u=1 and spte.nx=gpte.nx back.

In the first case there are two additional complications:

- if CR4.SMEP is enabled: since we've turned the page into a kernel page,

  the kernel may now execute it.  We handle this by also setting spte.nx.

  If we get a user fetch or read fault, we'll change spte.u=1 and

  spte.nx=gpte.nx back.

- if CR4.SMAP is disabled: since the page has been changed to a kernel

  page, it can not be reused when CR4.SMAP is enabled. We set

  CR4.SMAP && !CR0.WP into shadow page's role to avoid this case. Note,

  here we do not care the case that CR4.SMAP is enabled since KVM will

  directly inject #PF to guest due to failed permission check.



To prevent an spte that was converted into a kernel page with cr0.wp=0

from being written by the kernel after cr0.wp has changed to 1, we make

MAINTAINERS

+9 −6
Original line number Diff line number Diff line
@@ -3825,10 +3825,11 @@ M: David Woodhouse <dwmw2@infradead.org> 
L:	linux-embedded@vger.kernel.org

S:	Maintained



EMULEX LPFC FC SCSI DRIVER

M:	James Smart <james.smart@emulex.com>

EMULEX/AVAGO LPFC FC/FCOE SCSI DRIVER

M:	James Smart <james.smart@avagotech.com>

M:	Dick Kennedy <dick.kennedy@avagotech.com>

L:	linux-scsi@vger.kernel.org

W:	http://sourceforge.net/projects/lpfcxxxx

W:	http://www.avagotech.com

S:	Supported

F:	drivers/scsi/lpfc/
@@ -4536,7 +4537,7 @@ M: Jean Delvare <jdelvare@suse.de> 
M:	Guenter Roeck <linux@roeck-us.net>

L:	lm-sensors@lm-sensors.org

W:	http://www.lm-sensors.org/

T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/

T:	quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git

S:	Maintained

F:	Documentation/hwmon/
@@ -8829,9 +8830,11 @@ F: drivers/misc/phantom.c 
F:	include/uapi/linux/phantom.h



SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER

M:	Jayamohan Kallickal <jayamohan.kallickal@emulex.com>

M:	Jayamohan Kallickal <jayamohan.kallickal@avagotech.com>

M:	Minh Tran <minh.tran@avagotech.com>

M:	John Soni Jose <sony.john-n@avagotech.com>

L:	linux-scsi@vger.kernel.org

W:	http://www.emulex.com

W:	http://www.avagotech.com

S:	Supported

F:	drivers/scsi/be2iscsi/

Makefile

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

PATCHLEVEL = 1

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*

CRA Git | Maintained and supported by SUSTech CRA and CCSE