Commit 3793faad authored by David S. Miller's avatar David S. Miller
Browse files

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



Conflicts were all overlapping changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ae1804de a811c1fa

Documentation/admin-guide/device-mapper/dm-integrity.rst

+9 −6
Original line number Diff line number Diff line
@@ -182,12 +182,15 @@ fix_padding 
	space-efficient. If this option is not present, large padding is

	used - that is for compatibility with older kernels.





The journal mode (D/J), buffer_sectors, journal_watermark, commit_time can

be changed when reloading the target (load an inactive table and swap the

tables with suspend and resume). The other arguments should not be changed

when reloading the target because the layout of disk data depend on them

and the reloaded target would be non-functional.

allow_discards

	Allow block discard requests (a.k.a. TRIM) for the integrity device.

	Discards are only allowed to devices using internal hash.



The journal mode (D/J), buffer_sectors, journal_watermark, commit_time and

allow_discards can be changed when reloading the target (load an inactive

table and swap the tables with suspend and resume). The other arguments

should not be changed when reloading the target because the layout of disk

data depend on them and the reloaded target would be non-functional.





The layout of the formatted block device:

Documentation/admin-guide/kernel-parameters.txt

+1 −2
Original line number Diff line number Diff line
@@ -5187,8 +5187,7 @@ 


	usbcore.old_scheme_first=

			[USB] Start with the old device initialization

			scheme,  applies only to low and full-speed devices

			 (default 0 = off).

			scheme (default 0 = off).



	usbcore.usbfs_memory_mb=

			[USB] Memory limit (in MB) for buffers allocated by

Documentation/devicetree/bindings/Makefile

+12 −9
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
DT_DOC_CHECKER ?= dt-doc-validate

DT_EXTRACT_EX ?= dt-extract-example

DT_MK_SCHEMA ?= dt-mk-schema

DT_MK_SCHEMA_USERONLY_FLAG := $(if $(DT_SCHEMA_FILES), -u)



quiet_cmd_chk_binding = CHKDT   $(patsubst $(srctree)/%,%,$<)

      cmd_chk_binding = $(DT_DOC_CHECKER) -u $(srctree)/$(src) $< ; \
@@ -13,16 +14,18 @@ $(obj)/%.example.dts: $(src)/%.yaml FORCE 
# Use full schemas when checking %.example.dts

DT_TMP_SCHEMA := $(obj)/processed-schema-examples.yaml



find_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \

		-name 'processed-schema*' ! \

		-name '*.example.dt.yaml' \)



quiet_cmd_mk_schema = SCHEMA  $@

      cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(real-prereqs)

      cmd_mk_schema = rm -f $@ ; \

                      $(if $(DT_MK_SCHEMA_FLAGS), \

                           echo $(real-prereqs), \

                           $(find_cmd)) | \

                      xargs $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) >> $@



DT_DOCS = $(addprefix $(src)/, \

	$(shell \

	cd $(srctree)/$(src) && \

	find * \( -name '*.yaml' ! \

		-name 'processed-schema*' ! \

		-name '*.example.dt.yaml' \) \

	))

DT_DOCS = $(shell $(find_cmd) | sed -e 's|^$(srctree)/||')



DT_SCHEMA_FILES ?= $(DT_DOCS)
@@ -37,7 +40,7 @@ override DTC_FLAGS := \ 
$(obj)/processed-schema-examples.yaml: $(DT_DOCS) FORCE

	$(call if_changed,mk_schema)



$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := -u

$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := $(DT_MK_SCHEMA_USERONLY_FLAG)

$(obj)/processed-schema.yaml: $(DT_SCHEMA_FILES) FORCE

	$(call if_changed,mk_schema)

Documentation/devicetree/bindings/dma/socionext,uniphier-xdmac.yaml

+3 −4
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ properties: 
    const: socionext,uniphier-xdmac



  reg:

    items:

      - description: XDMAC base register region (offset and length)

      - description: XDMAC extension register region (offset and length)

    maxItems: 1



  interrupts:

    maxItems: 1
@@ -49,12 +47,13 @@ required: 
  - reg

  - interrupts

  - "#dma-cells"

  - dma-channels



examples:

  - |

    xdmac: dma-controller@5fc10000 {

        compatible = "socionext,uniphier-xdmac";

        reg = <0x5fc10000 0x1000>, <0x5fc20000 0x800>;

        reg = <0x5fc10000 0x5300>;

        interrupts = <0 188 4>;

        #dma-cells = <2>;

        dma-channels = <16>;

Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: "http://devicetree.org/schemas/bindings/iio/adc/st,stm32-adc.yaml#"

$id: "http://devicetree.org/schemas/iio/adc/st,stm32-adc.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"



title: STMicroelectronics STM32 ADC bindings