Commit 68af062b authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'v4.6-rc6' into patchwork 

Linux 4.6-rc6

* tag 'v4.6-rc6': (762 commits)
  Linux 4.6-rc6
  EDAC: i7core, sb_edac: Don't return NOTIFY_BAD from mce_decoder callback
  Documentation/sysctl/vm.txt: update numa_zonelist_order description
  lib/stackdepot.c: allow the stack trace hash to be zero
  rapidio: fix potential NULL pointer dereference
  mm/memory-failure: fix race with compound page split/merge
  ocfs2/dlm: return zero if deref_done message is successfully handled
  Ananth has moved
  kcov: don't profile branches in kcov
  kcov: don't trace the code coverage code
  mm: wake kcompactd before kswapd's short sleep
  .mailmap: add Frank Rowand
  mm/hwpoison: fix wrong num_poisoned_pages accounting
  mm: call swap_slot_free_notify() with page lock held
  mm: vmscan: reclaim highmem zone if buffer_heads is over limit
  numa: fix /proc/<pid>/numa_maps for THP
  mm/huge_memory: replace VM_NO_THP VM_BUG_ON with actual VMA check
  mailmap: fix Krzysztof Kozlowski's misspelled name
  thp: keep huge zero page pinned until tlb flush
  mm: exclude HugeTLB pages from THP page_mapped() logic
  ...
parents 1e166c77 04974df8

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ Felix Kuhling <fxkuehl@gmx.de> 
Felix Moeller <felix@derklecks.de>

Filipe Lautert <filipe@icewall.org>

Franck Bui-Huu <vagabon.xyz@gmail.com>

Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>

Frank Zago <fzago@systemfabricworks.com>

Greg Kroah-Hartman <greg@echidna.(none)>

Greg Kroah-Hartman <gregkh@suse.de>
@@ -79,6 +82,7 @@ Kay Sievers <kay.sievers@vrfy.org> 
Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Linas Vepstas <linas@austin.ibm.com>

Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl

+12 −17
Original line number Diff line number Diff line 
What:		/sys/devices/platform/<i2c-demux-name>/cur_master

What:		/sys/devices/platform/<i2c-demux-name>/available_masters

Date:		January 2016

KernelVersion:	4.6

Contact:	Wolfram Sang <wsa@the-dreams.de>

Description:

		Reading the file will give you a list of masters which can be

		selected for a demultiplexed bus. The format is

		"<index>:<name>". Example from a Renesas Lager board:



This file selects the active I2C master for a demultiplexed bus.

		0:/i2c@e6500000 1:/i2c@e6508000



Write 0 there for the first master, 1 for the second etc. Reading the file will

give you a list with the active master marked. Example from a Renesas Lager

board:



root@Lager:~# cat /sys/devices/platform/i2c@8/cur_master

* 0 - /i2c@9

  1 - /i2c@e6520000

  2 - /i2c@e6530000



root@Lager:~# echo 2 > /sys/devices/platform/i2c@8/cur_master



root@Lager:~# cat /sys/devices/platform/i2c@8/cur_master

  0 - /i2c@9

  1 - /i2c@e6520000

* 2 - /i2c@e6530000
 
What:		/sys/devices/platform/<i2c-demux-name>/current_master

Date:		January 2016

KernelVersion:	4.6

Contact:	Wolfram Sang <wsa@the-dreams.de>

Description:

		This file selects/shows the active I2C master for a demultiplexed

		bus. It uses the <index> value from the file 'available_masters'.

Documentation/devicetree/bindings/arm/cpus.txt

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ nodes to be present and contain the properties described below. 
			  can be one of:

			    "allwinner,sun6i-a31"

			    "allwinner,sun8i-a23"

			    "arm,psci"

			    "arm,realview-smp"

			    "brcm,bcm-nsp-smp"

			    "brcm,brahma-b15"

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

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ RK3xxx SoCs. 
Required properties :



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

 - compatible : should be "rockchip,rk3066-i2c", "rockchip,rk3188-i2c" or

		"rockchip,rk3288-i2c".

 - compatible : should be "rockchip,rk3066-i2c", "rockchip,rk3188-i2c",

		"rockchip,rk3228-i2c" or "rockchip,rk3288-i2c".

 - interrupts : interrupt number

 - clocks : parent clock

Documentation/devicetree/bindings/net/mediatek-net.txt

+5 −2
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ have dual GMAC each represented by a child node.. 
Required properties:

- compatible: Should be "mediatek,mt7623-eth"

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

- interrupts: Should contain the frame engines interrupt

- interrupts: Should contain the three frame engines interrupts in numeric

	order. These are fe_int0, fe_int1 and fe_int2.

- clocks: the clock used by the core

- clock-names: the names of the clock listed in the clocks property. These are

	"ethif", "esw", "gp2", "gp1"
@@ -42,7 +43,9 @@ eth: ethernet@1b100000 { 
		 <&ethsys CLK_ETHSYS_GP2>,

		 <&ethsys CLK_ETHSYS_GP1>;

	clock-names = "ethif", "esw", "gp2", "gp1";

	interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_LOW>;

	interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_LOW

		      GIC_SPI 199 IRQ_TYPE_LEVEL_LOW

		      GIC_SPI 198 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT2701_POWER_DOMAIN_ETH>;

	resets = <&ethsys MT2701_ETHSYS_ETH_RST>;

	reset-names = "eth";

CRA Git | Maintained and supported by SUSTech CRA and CCSE