Commit 909b27f7 authored by David S. Miller's avatar David S. Miller
Browse files

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



The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next'
because we no longer have a per-netns conntrack hash.

The ip_gre.c conflict as well as the iwlwifi ones were cases of
overlapping changes.

Conflicts:
	drivers/net/wireless/intel/iwlwifi/mvm/tx.c
	net/ipv4/ip_gre.c
	net/netfilter/nf_conntrack_core.c

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8fbb89c6 272911b8

Documentation/devicetree/bindings/regmap/regmap.txt

+19 −40
Original line number Diff line number Diff line 
Device-Tree binding for regmap



The endianness mode of CPU & Device scenarios:

Index     Device     Endianness properties

---------------------------------------------------

1         BE         'big-endian'

2         LE         'little-endian'

3	  Native     'native-endian'



For one device driver, which will run in different scenarios above

on different SoCs using the devicetree, we need one way to simplify

this.

Devicetree binding for regmap



Optional properties:

- {big,little,native}-endian: these are boolean properties, if absent

  then the implementation will choose a default based on the device

  being controlled.  These properties are for register values and all

  the buffers only.  Native endian means that the CPU and device have

  the same endianness.



Examples:

Scenario 1 : CPU in LE mode & device in LE mode.

dev: dev@40031000 {

	      compatible = "name";

	      reg = <0x40031000 0x1000>;

	      ...

};

   little-endian,

   big-endian,

   native-endian:	See common-properties.txt for a definition



Scenario 2 : CPU in LE mode & device in BE mode.

dev: dev@40031000 {

	      compatible = "name";

	      reg = <0x40031000 0x1000>;

	      ...

	      big-endian;

};

Note:

Regmap defaults to little-endian register access on MMIO based

devices, this is by far the most common setting. On CPU

architectures that typically run big-endian operating systems

(e.g. PowerPC), registers can be defined as big-endian and must

be marked that way in the devicetree.



Scenario 3 : CPU in BE mode & device in BE mode.

dev: dev@40031000 {

	      compatible = "name";

	      reg = <0x40031000 0x1000>;

	      ...

};

On SoCs that can be operated in both big-endian and little-endian

modes, with a single hardware switch controlling both the endianess

of the CPU and a byteswap for MMIO registers (e.g. many Broadcom MIPS

chips), "native-endian" is used to allow using the same device tree

blob in both cases.



Scenario 4 : CPU in BE mode & device in LE mode.

Examples:

Scenario 1 : a register set in big-endian mode.

dev: dev@40031000 {

	      compatible = "name";

	      compatible = "syscon";

	      reg = <0x40031000 0x1000>;

	      big-endian;

	      ...

	      little-endian;

};

Documentation/sysctl/kernel.txt

+1 −1
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ allowed to execute. 
perf_event_paranoid:



Controls use of the performance events system by unprivileged

users (without CAP_SYS_ADMIN).  The default value is 1.

users (without CAP_SYS_ADMIN).  The default value is 2.



 -1: Allow use of (almost) all events by all users

>=0: Disallow raw tracepoint access by users without CAP_IOC_LOCK

MAINTAINERS

+14 −0
Original line number Diff line number Diff line
@@ -11315,6 +11315,20 @@ F: include/trace/ 
F:	kernel/trace/

F:	tools/testing/selftests/ftrace/



TRACING MMIO ACCESSES (MMIOTRACE)

M:	Steven Rostedt <rostedt@goodmis.org>

M:	Ingo Molnar <mingo@kernel.org>

R:	Karol Herbst <karolherbst@gmail.com>

R:	Pekka Paalanen <ppaalanen@gmail.com>

S:	Maintained

L:	linux-kernel@vger.kernel.org

L:	nouveau@lists.freedesktop.org

F:	kernel/trace/trace_mmiotrace.c

F:	include/linux/mmiotrace.h

F:	arch/x86/mm/kmmio.c

F:	arch/x86/mm/mmio-mod.c

F:	arch/x86/mm/testmmiotrace.c



TRIVIAL PATCHES

M:	Jiri Kosina <trivial@kernel.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git

arch/arm/boot/dts/at91sam9x5.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 


			pmc: pmc@fffffc00 {

				compatible = "atmel,at91sam9x5-pmc", "syscon";

				reg = <0xfffffc00 0x100>;

				reg = <0xfffffc00 0x200>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				interrupt-controller;

				#address-cells = <1>;

arch/arm/boot/dts/sama5d2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ 
			status = "disabled";



			nfc@c0000000 {

				compatible = "atmel,sama5d4-nfc";

				compatible = "atmel,sama5d3-nfc";

				#address-cells = <1>;

				#size-cells = <1>;

				reg = < /* NFC Command Registers */

CRA Git | Maintained and supported by SUSTech CRA and CCSE