Commit aaf675f5 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'v3.6' into staging/for_v3.7 

Linux 3.6

* tag 'v3.6': (562 commits)
  Linux 3.6
  vfs: dcache: fix deadlock in tree traversal
  mtdchar: fix offset overflow detection
  thp: avoid VM_BUG_ON page_count(page) false positives in __collapse_huge_page_copy
  iommu/amd: Fix wrong assumption in iommu-group specific code
  netdev: octeon: fix return value check in octeon_mgmt_init_phy()
  ALSA: snd-usb: fix next_packet_size calls for pause case
  inetpeer: fix token initialization
  qlcnic: Fix scheduling while atomic bug
  bnx2: Clean up remaining iounmap
  trivial select_parent documentation fix
  net: phy: smsc: Implement PHY config_init for LAN87xx
  smsc75xx: fix resume after device reset
  um: Preinclude include/linux/kern_levels.h
  um: Fix IPC on um
  netdev: pasemi: fix return value check in pasemi_mac_phy_init()
  team: fix return value check
  l2tp: fix return value check
  USB: Fix race condition when removing host controllers
  USB: ohci-at91: fix null pointer in ohci_hcd_at91_overcurrent_irq
  ...
parents 347c4e95 a0d271cb

Documentation/i2c/busses/i2c-i801

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Supported adapters: 
  * Intel DH89xxCC (PCH)

  * Intel Panther Point (PCH)

  * Intel Lynx Point (PCH)

  * Intel Lynx Point-LP (PCH)

   Datasheets: Publicly available at the Intel website



On Intel Patsburg and later chipsets, both the normal host SMBus controller

Documentation/vfio.txt

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ character devices for this group: 
$ lspci -n -s 0000:06:0d.0

06:0d.0 0401: 1102:0002 (rev 08)

# echo 0000:06:0d.0 > /sys/bus/pci/devices/0000:06:0d.0/driver/unbind

# echo 1102 0002 > /sys/bus/pci/drivers/vfio/new_id

# echo 1102 0002 > /sys/bus/pci/drivers/vfio-pci/new_id



Now we need to look at what other devices are in the group to free

it for use by VFIO:

MAINTAINERS

+10 −6
Original line number Diff line number Diff line
@@ -3388,7 +3388,7 @@ M: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de> 
L:	linux-i2c@vger.kernel.org

W:	http://i2c.wiki.kernel.org/

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

T:	git git://git.fluff.org/bjdooks/linux.git

T:	git git://git.pengutronix.de/git/wsa/linux.git

S:	Maintained

F:	Documentation/i2c/

F:	drivers/i2c/
@@ -3552,11 +3552,12 @@ K: \b(ABS|SYN)_MT_ 


INTEL C600 SERIES SAS CONTROLLER DRIVER

M:	Intel SCU Linux support <intel-linux-scu@intel.com>

M:	Lukasz Dorau <lukasz.dorau@intel.com>

M:	Maciej Patelczyk <maciej.patelczyk@intel.com>

M:	Dave Jiang <dave.jiang@intel.com>

M:	Ed Nadolski <edmund.nadolski@intel.com>

L:	linux-scsi@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git

S:	Maintained

T:	git git://git.code.sf.net/p/intel-sas/isci

S:	Supported

F:	drivers/scsi/isci/

F:	firmware/isci/
@@ -3666,11 +3667,12 @@ F: Documentation/networking/README.ipw2200 
F:	drivers/net/wireless/ipw2x00/



INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)

M:	Joseph Cihula <joseph.cihula@intel.com>

M:	Richard L Maliszewski <richard.l.maliszewski@intel.com>

M:	Gang Wei <gang.wei@intel.com>

M:	Shane Wang <shane.wang@intel.com>

L:	tboot-devel@lists.sourceforge.net

W:	http://tboot.sourceforge.net

T:	Mercurial http://www.bughost.org/repos.hg/tboot.hg

T:	hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot

S:	Supported

F:	Documentation/intel_txt.txt

F:	include/linux/tboot.h
@@ -5543,6 +5545,8 @@ F: Documentation/devicetree/bindings/pwm/ 
F:	include/linux/pwm.h

F:	include/linux/of_pwm.h

F:	drivers/pwm/

F:	drivers/video/backlight/pwm_bl.c

F:	include/linux/pwm_backlight.h



PXA2xx/PXA3xx SUPPORT

M:	Eric Miao <eric.y.miao@gmail.com>

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 0

EXTRAVERSION = -rc5

NAME = Saber-toothed Squirrel

EXTRAVERSION =

NAME = Terrified Chipmunk



# *DOCUMENTATION*

# To see a list of typical targets execute "make help"

arch/arm/Kconfig.debug

+3 −3
Original line number Diff line number Diff line
@@ -356,11 +356,11 @@ choice 
		  is nothing connected to read from the DCC.



	config DEBUG_SEMIHOSTING

		bool "Kernel low-level debug output via semihosting I"

		bool "Kernel low-level debug output via semihosting I/O"

		help

		  Semihosting enables code running on an ARM target to use

		  the I/O facilities on a host debugger/emulator through a

		  simple SVC calls. The host debugger or emulator must have

		  simple SVC call. The host debugger or emulator must have

		  semihosting enabled for the special svc call to be trapped

		  otherwise the kernel will crash.

CRA Git | Maintained and supported by SUSTech CRA and CCSE