Commit e3db1289 authored by Brian Norris's avatar Brian Norris
Browse files

Merge MTD fixes into -next

parents c316cf67 05e97a9e

Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
Hi6220 SoC ION

===================================================================

Required properties:

- compatible : "hisilicon,hi6220-ion"

- list of the ION heaps

	- heap name : maybe heap_sys_user@0

	- heap id   : id should be unique in the system.

	- heap base : base ddr address of the heap,0 means that

	it is dynamic.

	- heap size : memory size and 0 means it is dynamic.

	- heap type : the heap type of the heap, please also

	see the define in ion.h(drivers/staging/android/uapi/ion.h)

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

Example:

	hi6220-ion {

		compatible = "hisilicon,hi6220-ion";

		heap_sys_user@0 {

			heap-name = "sys_user";

			heap-id   = <0x0>;

			heap-base = <0x0>;

			heap-size = <0x0>;

			heap-type = "ion_system";

		};

		heap_sys_contig@0 {

			heap-name = "sys_contig";

			heap-id   = <0x1>;

			heap-base = <0x0>;

			heap-size = <0x0>;

			heap-type = "ion_system_contig";

		};

	};

Documentation/usb/typec.rst

+2 −4
Original line number Diff line number Diff line
@@ -114,8 +114,7 @@ the details during registration. The class offers the following API for 
registering/unregistering cables and their plugs:



.. kernel-doc:: drivers/usb/typec/typec.c

   :functions: typec_register_cable typec_unregister_cable typec_register_plug

   typec_unregister_plug

   :functions: typec_register_cable typec_unregister_cable typec_register_plug typec_unregister_plug



The class will provide a handle to struct typec_cable and struct typec_plug if

the registration is successful, or NULL if it isn't.
@@ -137,8 +136,7 @@ during connection of a partner or cable, the port driver must use the following 
APIs to report it to the class:



.. kernel-doc:: drivers/usb/typec/typec.c

   :functions: typec_set_data_role typec_set_pwr_role typec_set_vconn_role

   typec_set_pwr_opmode

   :functions: typec_set_data_role typec_set_pwr_role typec_set_vconn_role typec_set_pwr_opmode



Alternate Modes

~~~~~~~~~~~~~~~

Documentation/watchdog/watchdog-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ nowayout: Watchdog cannot be stopped once started 
-------------------------------------------------

iTCO_wdt:

heartbeat: Watchdog heartbeat in seconds.

	(2<heartbeat<39 (TCO v1) or 613 (TCO v2), default=30)

	(5<=heartbeat<=74 (TCO v1) or 1226 (TCO v2), default=30)

nowayout: Watchdog cannot be stopped once started

	(default=kernel config parameter)

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

MAINTAINERS

+9 −6
Original line number Diff line number Diff line
@@ -846,7 +846,6 @@ M: Laura Abbott <labbott@redhat.com> 
M:	Sumit Semwal <sumit.semwal@linaro.org>

L:	devel@driverdev.osuosl.org

S:	Supported

F:	Documentation/devicetree/bindings/staging/ion/

F:	drivers/staging/android/ion

F:	drivers/staging/android/uapi/ion.h

F:	drivers/staging/android/uapi/ion_test.h
@@ -3116,6 +3115,14 @@ F: drivers/net/ieee802154/cc2520.c 
F:	include/linux/spi/cc2520.h

F:	Documentation/devicetree/bindings/net/ieee802154/cc2520.txt



CCREE ARM TRUSTZONE CRYPTOCELL 700 REE DRIVER

M:	Gilad Ben-Yossef <gilad@benyossef.com>

L:	linux-crypto@vger.kernel.org

L:	driverdev-devel@linuxdriverproject.org

S:	Supported

F:	drivers/staging/ccree/

W:	https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family



CEC FRAMEWORK

M:	Hans Verkuil <hans.verkuil@cisco.com>

L:	linux-media@vger.kernel.org
@@ -5695,7 +5702,7 @@ M: Alex Elder <elder@kernel.org> 
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

S:	Maintained

F:	drivers/staging/greybus/

L:	greybus-dev@lists.linaro.org

L:	greybus-dev@lists.linaro.org (moderated for non-subscribers)



GREYBUS AUDIO PROTOCOLS DRIVERS

M:	Vaibhav Agarwal <vaibhav.sr@gmail.com>
@@ -9553,10 +9560,6 @@ F: drivers/net/wireless/intersil/orinoco/ 


OSD LIBRARY and FILESYSTEM

M:	Boaz Harrosh <ooo@electrozaur.com>

M:	Benny Halevy <bhalevy@primarydata.com>

L:	osd-dev@open-osd.org

W:	http://open-osd.org

T:	git git://git.open-osd.org/open-osd.git

S:	Maintained

F:	drivers/scsi/osd/

F:	include/scsi/osd_*

Makefile

+2 −2
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 12

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Fearless Coyote



# *DOCUMENTATION*
@@ -1172,7 +1172,7 @@ headers_check_all: headers_install_all 
PHONY += headers_check

headers_check: headers_install

	$(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1

	$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/ $(hdr-dst) HDRCHECK=1

	$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) HDRCHECK=1



# ---------------------------------------------------------------------------

# Kernel selftest