Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccb1f55e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'amd_ucode_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/urgent 



Pull AMD microcode fixes from Borislav Petkov:

 " Those are basically two fixes which correct the AMD early ucode loader
   from accessing cpu_data too early, i.e. before smp_store_cpu_info()
   has copied the boot_cpu_data ontop and overwritten an already empty
   structure (which we shouldn't access that early in the first place
   anyway).

   The second patch is kinda largish for that late in the game but it
   shouldn't be problematic because we're simply switching from using
   cpu_data to use the CPU family number directly and thus again, not use
   uninitialized cpu_data structure. "

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

Documentation/DocBook/media_api.tmpl

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [

<!ENTITY % media-entities SYSTEM "./media-entities.tmpl"> %media-entities;

<!ENTITY media-indices SYSTEM "./media-indices.tmpl">

Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
Required properties :



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

 - compatible      : Should be "marvell,mv64xxx-i2c"

 - compatible      : Should be "marvell,mv64xxx-i2c" or "allwinner,sun4i-i2c"

 - interrupts      : The interrupt number



Optional properties :

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -8669,6 +8669,11 @@ T: git git://git.alsa-project.org/alsa-kernel.git 
S:	Maintained

F:	sound/usb/midi.*



USB NETWORKING DRIVERS

L:	linux-usb@vger.kernel.org

S:	Odd Fixes

F:	drivers/net/usb/



USB OHCI DRIVER

M:	Alan Stern <stern@rowland.harvard.edu>

L:	linux-usb@vger.kernel.org

Makefile

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

PATCHLEVEL = 11

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Linux for Workgroups



# *DOCUMENTATION*

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ config SCHED_SMT 
config PPC_DENORMALISATION

	bool "PowerPC denormalisation exception handling"

	depends on PPC_BOOK3S_64

	default "n"

	default "y" if PPC_POWERNV

	---help---

	  Add support for handling denormalisation of single precision

	  values.  Useful for bare metal only.  If unsure say Y here.