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

Merge tag 'v4.6-rc7' into patchwork 

Linux 4.6-rc7

* tag 'v4.6-rc7': (185 commits)
  Linux 4.6-rc7
  parisc: fix a bug when syscall number of tracee is __NR_Linux_syscalls
  x86/tsc: Read all ratio bits from MSR_PLATFORM_INFO
  mailmap: add John Paul Adrian Glaubitz
  byteswap: try to avoid __builtin_constant_p gcc bug
  lib/stackdepot: avoid to return 0 handle
  mm: fix kcompactd hang during memory offlining
  modpost: fix module autoloading for OF devices with generic compatible property
  proc: prevent accessing /proc/<PID>/environ until it's ready
  mm/zswap: provide unique zpool name
  mm: thp: kvm: fix memory corruption in KVM with THP enabled
  MAINTAINERS: fix Rajendra Nayak's address
  mm, cma: prevent nr_isolated_* counters from going negative
  mm: update min_free_kbytes from khugepaged after core initialization
  huge pagecache: mmap_sem is unlocked when truncation splits pmd
  rapidio/mport_cdev: fix uapi type definitions
  mm: memcontrol: let v2 cgroups follow changes in system swappiness
  mm: thp: correct split_huge_pages file permission
  maintainers: update rmk's email address(es)
  writeback: Fix performance regression in wb_over_bg_thresh()
  ...
parents f7369627 44549e8f

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ Jean Tourrilhes <jt@hpl.hp.com> 
Jeff Garzik <jgarzik@pretzel.yyz.us>

Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

<josh@joshtriplett.org> <josh@freedesktop.org>

<josh@joshtriplett.org> <josh@kernel.org>

Documentation/devicetree/bindings/ata/ahci-platform.txt

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ Optional properties: 
- target-supply     : regulator for SATA target power

- phys              : reference to the SATA PHY node

- phy-names         : must be "sata-phy"

- ports-implemented : Mask that indicates which ports that the HBA supports

		      are available for software to use. Useful if PORTS_IMPL

		      is not programmed by the BIOS, which is true with

		      some embedded SOC's.



Required properties when using sub-nodes:

- #address-cells    : number of cells to encode an address

Documentation/devicetree/bindings/net/cpsw.txt

+3 −3
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ Required properties: 
Optional properties:

- dual_emac_res_vlan	: Specifies VID to be used to segregate the ports

- mac-address		: See ethernet.txt file in the same directory

- phy_id		: Specifies slave phy id

- phy_id		: Specifies slave phy id (deprecated, use phy-handle)

- phy-handle		: See ethernet.txt file in the same directory



Slave sub-nodes:

- fixed-link		: See fixed-link.txt file in the same directory

			  Either the property phy_id, or the sub-node

			  fixed-link can be specified



Note: Exactly one of phy_id, phy-handle, or fixed-link must be specified.



Note: "ti,hwmods" field is used to fetch the base address and irq

resources from TI, omap hwmod data base during device registration.

Documentation/networking/altera_tse.txt

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ This is the driver for the Altera Triple-Speed Ethernet (TSE) controllers 
using the SGDMA and MSGDMA soft DMA IP components. The driver uses the

platform bus to obtain component resources. The designs used to test this

driver were built for a Cyclone(R) V SOC FPGA board, a Cyclone(R) V FPGA board,

and tested with ARM and NIOS processor hosts seperately. The anticipated use

and tested with ARM and NIOS processor hosts separately. The anticipated use

cases are simple communications between an embedded system and an external peer

for status and simple configuration of the embedded system.
@@ -65,14 +65,14 @@ Driver parameters can be also passed in command line by using: 
4.1) Transmit process

When the driver's transmit routine is called by the kernel, it sets up a

transmit descriptor by calling the underlying DMA transmit routine (SGDMA or

MSGDMA), and initites a transmit operation. Once the transmit is complete, an

MSGDMA), and initiates a transmit operation. Once the transmit is complete, an

interrupt is driven by the transmit DMA logic. The driver handles the transmit

completion in the context of the interrupt handling chain by recycling

resource required to send and track the requested transmit operation.



4.2) Receive process

The driver will post receive buffers to the receive DMA logic during driver

intialization. Receive buffers may or may not be queued depending upon the

initialization. Receive buffers may or may not be queued depending upon the

underlying DMA logic (MSGDMA is able queue receive buffers, SGDMA is not able

to queue receive buffers to the SGDMA receive logic). When a packet is

received, the DMA logic generates an interrupt. The driver handles a receive

Documentation/networking/ipvlan.txt

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Initial Release: 
	This is conceptually very similar to the macvlan driver with one major

exception of using L3 for mux-ing /demux-ing among slaves. This property makes

the master device share the L2 with it's slave devices. I have developed this

driver in conjuntion with network namespaces and not sure if there is use case

driver in conjunction with network namespaces and not sure if there is use case

outside of it.
@@ -56,7 +56,7 @@ situations defines your use case then you can choose to use ipvlan - 
	(a) The Linux host that is connected to the external switch / router has

policy configured that allows only one mac per port.

	(b) No of virtual devices created on a master exceed the mac capacity and

puts the NIC in promiscous mode and degraded performance is a concern.

puts the NIC in promiscuous mode and degraded performance is a concern.

	(c) If the slave device is to be put into the hostile / untrusted network

namespace where L2 on the slave could be changed / misused.

CRA Git | Maintained and supported by SUSTech CRA and CCSE