Commit 3ab0a7a0 authored by David S. Miller's avatar David S. Miller
Browse files

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



Two minor conflicts:

1) net/ipv4/route.c, adding a new local variable while
   moving another local variable and removing it's
   initial assignment.

2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes.
   One pretty prints the port mode differently, whilst another
   changes the driver to try and obtain the port mode from
   the port node rather than the switch node.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 92ec804f 805c6d3c

.clang-format

+12 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ ForEachMacros: 
  - 'css_for_each_descendant_pre'

  - 'device_for_each_child_node'

  - 'dma_fence_chain_for_each'

  - 'do_for_each_ftrace_op'

  - 'drm_atomic_crtc_for_each_plane'

  - 'drm_atomic_crtc_state_for_each_plane'

  - 'drm_atomic_crtc_state_for_each_plane_state'
@@ -136,6 +137,7 @@ ForEachMacros: 
  - 'for_each_active_dev_scope'

  - 'for_each_active_drhd_unit'

  - 'for_each_active_iommu'

  - 'for_each_aggr_pgid'

  - 'for_each_available_child_of_node'

  - 'for_each_bio'

  - 'for_each_board_func_rsrc'
@@ -234,6 +236,7 @@ ForEachMacros: 
  - 'for_each_node_state'

  - 'for_each_node_with_cpus'

  - 'for_each_node_with_property'

  - 'for_each_nonreserved_multicast_dest_pgid'

  - 'for_each_of_allnodes'

  - 'for_each_of_allnodes_from'

  - 'for_each_of_cpu_node'
@@ -256,6 +259,7 @@ ForEachMacros: 
  - 'for_each_pci_dev'

  - 'for_each_pci_msi_entry'

  - 'for_each_pcm_streams'

  - 'for_each_physmem_range'

  - 'for_each_populated_zone'

  - 'for_each_possible_cpu'

  - 'for_each_present_cpu'
@@ -265,6 +269,8 @@ ForEachMacros: 
  - 'for_each_process_thread'

  - 'for_each_property_of_node'

  - 'for_each_registered_fb'

  - 'for_each_requested_gpio'

  - 'for_each_requested_gpio_in_range'

  - 'for_each_reserved_mem_region'

  - 'for_each_rtd_codec_dais'

  - 'for_each_rtd_codec_dais_rollback'
@@ -278,12 +284,17 @@ ForEachMacros: 
  - 'for_each_sg'

  - 'for_each_sg_dma_page'

  - 'for_each_sg_page'

  - 'for_each_sgtable_dma_page'

  - 'for_each_sgtable_dma_sg'

  - 'for_each_sgtable_page'

  - 'for_each_sgtable_sg'

  - 'for_each_sibling_event'

  - 'for_each_subelement'

  - 'for_each_subelement_extid'

  - 'for_each_subelement_id'

  - '__for_each_thread'

  - 'for_each_thread'

  - 'for_each_unicast_dest_pgid'

  - 'for_each_wakeup_source'

  - 'for_each_zone'

  - 'for_each_zone_zonelist'
@@ -464,6 +475,7 @@ ForEachMacros: 
  - 'v4l2_m2m_for_each_src_buf'

  - 'v4l2_m2m_for_each_src_buf_safe'

  - 'virtio_device_for_each_vq'

  - 'while_for_each_ftrace_op'

  - 'xa_for_each'

  - 'xa_for_each_marked'

  - 'xa_for_each_range'

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -169,6 +169,10 @@ Juha Yrjola <juha.yrjola@solidboot.com> 
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>

Kamil Konieczny <k.konieczny@samsung.com> <k.konieczny@partner.samsung.com>

Kay Sievers <kay.sievers@vrfy.org>

Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>

Kees Cook <keescook@chromium.org> <keescook@google.com>

Kees Cook <keescook@chromium.org> <kees@outflux.net>

Kees Cook <keescook@chromium.org> <kees@ubuntu.com>

Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
@@ -308,6 +312,7 @@ Tony Luck <tony.luck@intel.com> 
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Documentation/admin-guide/dynamic-debug-howto.rst

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ against. Possible keywords are::: 
  ``line-range`` cannot contain space, e.g.

  "1-30" is valid range but "1 - 30" is not.



  ``module=foo`` combined keyword=value form is interchangably accepted



The meanings of each keyword are:

Documentation/bpf/ringbuf.rst

+1 −4
Original line number Diff line number Diff line
@@ -182,9 +182,6 @@ in the order of reservations, but only after all previous records where 
already committed. It is thus possible for slow producers to temporarily hold

off submitted records, that were reserved later.



Reservation/commit/consumer protocol is verified by litmus tests in

Documentation/litmus_tests/bpf-rb/_.



One interesting implementation bit, that significantly simplifies (and thus

speeds up as well) implementation of both producers and consumers is how data

area is mapped twice contiguously back-to-back in the virtual memory. This
@@ -200,7 +197,7 @@ a self-pacing notifications of new data being availability. 
being available after commit only if consumer has already caught up right up to

the record being committed. If not, consumer still has to catch up and thus

will see new data anyways without needing an extra poll notification.

Benchmarks (see tools/testing/selftests/bpf/benchs/bench_ringbuf.c_) show that

Benchmarks (see tools/testing/selftests/bpf/benchs/bench_ringbufs.c) show that

this allows to achieve a very high throughput without having to resort to

tricks like "notify only every Nth sample", which are necessary with perf

buffer. For extreme cases, when BPF program wants more manual control of

Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt

+8 −8
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ Required properties: 


- compatible:

    Must be one of :

    "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-qspi" : MSPI+BSPI on BRCMSTB SoCs

    "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI

    "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi" : MSPI+BSPI on BRCMSTB SoCs

    "brcm,spi-brcmstb-mspi", "brcm,spi-bcm-qspi" : Second Instance of MSPI

						   BRCMSTB  SoCs

    "brcm,spi-bcm7425-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI

    			     			  			    BRCMSTB  SoCs
@@ -36,8 +36,8 @@ Required properties: 
    			     			  			    BRCMSTB  SoCs

    "brcm,spi-bcm7278-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI

    			     			  			    BRCMSTB  SoCs

    "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"     : MSPI+BSPI on Cygnus, NSP

    "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi"     : NS2 SoCs

    "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi"     : MSPI+BSPI on Cygnus, NSP

    "brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi"     : NS2 SoCs



- reg:

    Define the bases and ranges of the associated I/O address spaces.
@@ -86,7 +86,7 @@ BRCMSTB SoC Example: 
    spi@f03e3400 {

		#address-cells = <0x1>;

		#size-cells = <0x0>;

		compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-brcmstb-qspi";

		compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi";

		reg = <0xf03e0920 0x4 0xf03e3400 0x188 0xf03e3200 0x50>;

		reg-names = "cs_reg", "mspi", "bspi";

		interrupts = <0x6 0x5 0x4 0x3 0x2 0x1 0x0>;
@@ -149,7 +149,7 @@ BRCMSTB SoC Example: 
		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&upg_fixed>;

		compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-brcmstb-mspi";

		compatible = "brcm,spi-brcmstb-mspi", "brcm,spi-bcm-qspi";

		reg = <0xf0416000 0x180>;

		reg-names = "mspi";

		interrupts = <0x14>;
@@ -160,7 +160,7 @@ BRCMSTB SoC Example: 
iProc SoC Example:



    qspi: spi@18027200 {

	compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";

	compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi";

	reg = <0x18027200 0x184>,

	      <0x18027000 0x124>,

	      <0x1811c408 0x004>,
@@ -191,7 +191,7 @@ iProc SoC Example: 
 NS2 SoC Example:



	       qspi: spi@66470200 {

		       compatible = "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi";

		       compatible = "brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi";

		       reg = <0x66470200 0x184>,

			     <0x66470000 0x124>,

			     <0x67017408 0x004>,

CRA Git | Maintained and supported by SUSTech CRA and CCSE