Commit 285019fd authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'v3.6' into fixes 

Linux 3.6

* tag 'v3.6': (91 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 deb09dda a0d271cb

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

+6 −3
Original line number Diff line number Diff line
@@ -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/
@@ -5544,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

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

PATCHLEVEL = 6

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION =

NAME = Terrified Chipmunk



# *DOCUMENTATION*

arch/arm/mach-mxs/mach-mxs.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static void __init apx4devkit_init(void) 
	enable_clk_enet_out();



	if (IS_BUILTIN(CONFIG_PHYLIB))

		phy_register_fixup_for_uid(PHY_ID_KS8051, MICREL_PHY_ID_MASK,

		phy_register_fixup_for_uid(PHY_ID_KSZ8051, MICREL_PHY_ID_MASK,

					   apx4devkit_phy_fixup);



	mxsfb_pdata.mode_list = apx4devkit_video_modes;

arch/arm/mach-orion5x/common.c

+7 −0
Original line number Diff line number Diff line
@@ -204,6 +204,13 @@ void __init orion5x_wdt_init(void) 
void __init orion5x_init_early(void)

{

	orion_time_set_base(TIMER_VIRT_BASE);



	/*

	 * Some Orion5x devices allocate their coherent buffers from atomic

	 * context. Increase size of atomic coherent pool to make sure such

	 * the allocations won't fail.

	 */

	init_dma_coherent_pool_size(SZ_1M);

}



int orion5x_tclk;

CRA Git | Maintained and supported by SUSTech CRA and CCSE