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

Commit 26440c83 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 371f1c7e 1099f860

Documentation/device-mapper/snapshot.txt

+7 −3
Original line number Diff line number Diff line
@@ -41,9 +41,13 @@ useless and be disabled, returning errors. So it is important to monitor 
the amount of free space and expand the <COW device> before it fills up.



<persistent?> is P (Persistent) or N (Not persistent - will not survive

after reboot).

The difference is that for transient snapshots less metadata must be

saved on disk - they can be kept in memory by the kernel.

after reboot).  O (Overflow) can be added as a persistent store option

to allow userspace to advertise its support for seeing "Overflow" in the

snapshot status.  So supported store types are "P", "PO" and "N".



The difference between persistent and transient is with transient

snapshots less metadata must be saved on disk - they can be kept in

memory by the kernel.





* snapshot-merge <origin> <COW device> <persistent> <chunksize>

Documentation/devicetree/bindings/input/cypress,cyapa.txt

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ Example: 
		/* Cypress Gen3 touchpad */

		touchpad@67 {

			compatible = "cypress,cyapa";

			reg = <0x24>;

			reg = <0x67>;

			interrupt-parent = <&gpio>;

			interrupts = <2 IRQ_TYPE_EDGE_FALLING>;	/* GPIO 2 */

			wakeup-source;

Documentation/devicetree/bindings/spi/sh-msiof.txt

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ Optional properties, deprecated for soctype-specific bindings: 
- renesas,tx-fifo-size : Overrides the default tx fifo size given in words

			 (default is 64)

- renesas,rx-fifo-size : Overrides the default rx fifo size given in words

			 (default is 64, or 256 on R-Car Gen2)

			 (default is 64)



Pinctrl properties might be needed, too.  See

Documentation/devicetree/bindings/pinctrl/renesas,*.

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
	- "renesas,usbhs-r8a7790"

	- "renesas,usbhs-r8a7791"

	- "renesas,usbhs-r8a7794"

	- "renesas,usbhs-r8a7795"

  - reg: Base address and length of the register for the USBHS

  - interrupts: Interrupt specifier for the USBHS

  - clocks: A list of phandle + clock specifier pairs

Documentation/input/multi-touch-protocol.txt

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ For win8 devices with both T and C coordinates, the position mapping is 
   ABS_MT_POSITION_X := T_X

   ABS_MT_POSITION_Y := T_Y

   ABS_MT_TOOL_X := C_X

   ABS_MT_TOOL_X := C_Y

   ABS_MT_TOOL_Y := C_Y



Unfortunately, there is not enough information to specify both the touching

ellipse and the tool ellipse, so one has to resort to approximations.  One