Commit 833d22f2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Trivial conflict in CAN on file rename.

Conflicts:
	drivers/net/can/m_can/tcan4x5x-core.c

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 58334e75 6279d812

Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml

+4 −2
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ description: | 
properties:

  compatible:

    enum:

      - nxp,pf8x00

      - nxp,pf8100

      - nxp,pf8121a

      - nxp,pf8200



  reg:

    maxItems: 1
@@ -118,7 +120,7 @@ examples: 
        #size-cells = <0>;



        pmic@8 {

            compatible = "nxp,pf8x00";

            compatible = "nxp,pf8100";

            reg = <0x08>;



            regulators {

Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ First Level Nodes - PMIC 
	Definition: Must be one of below:

		    "qcom,pm8005-rpmh-regulators"

		    "qcom,pm8009-rpmh-regulators"

		    "qcom,pm8009-1-rpmh-regulators"

		    "qcom,pm8150-rpmh-regulators"

		    "qcom,pm8150l-rpmh-regulators"

		    "qcom,pm8350-rpmh-regulators"

Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst

+36 −26
Original line number Diff line number Diff line
@@ -164,20 +164,28 @@ Devlink health reporters 


NPA Reporters

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

The NPA reporters are responsible for reporting and recovering the following group of errors

The NPA reporters are responsible for reporting and recovering the following group of errors:



1. GENERAL events



   - Error due to operation of unmapped PF.

   - Error due to disabled alloc/free for other HW blocks (NIX, SSO, TIM, DPI and AURA).



2. ERROR events



   - Fault due to NPA_AQ_INST_S read or NPA_AQ_RES_S write.

   - AQ Doorbell Error.



3. RAS events



   - RAS Error Reporting for NPA_AQ_INST_S/NPA_AQ_RES_S.



4. RVU events



   - Error due to unmapped slot.



Sample Output

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

Sample Output::



	~# devlink health

	pci/0002:01:00.0:

	  reporter hw_npa_intr
@@ -190,11 +198,13 @@ pci/0002:01:00.0: 
	      state healthy error 0 recover 0 last_dump_date 2020-12-10 last_dump_time 09:32:40 grace_period 0 auto_recover true auto_dump true



Each reporter dumps the



 - Error Type

 - Error Register value

 - Reason in words



For eg:

For example::



	~# devlink health dump show  pci/0002:01:00.0 reporter hw_npa_gen

	 NPA_AF_GENERAL:

	         NPA General Interrupt Reg : 1

Documentation/networking/netdevices.rst

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ ndo_do_ioctl: 
	Context: process



ndo_get_stats:

	Synchronization: dev_base_lock rwlock.

	Context: nominally process, but don't sleep inside an rwlock

	Synchronization: rtnl_lock() semaphore, dev_base_lock rwlock, or RCU.

	Context: atomic (can't sleep under rwlock or RCU)



ndo_start_xmit:

	Synchronization: __netif_tx_lock spinlock.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10848,7 +10848,7 @@ F: drivers/media/radio/radio-maxiradio* 








MCAN MMIO DEVICE DRIVER









M:	Dan Murphy <dmurphy@ti.com>









M:	Sriram Dash <sriram.dash@samsung.com>









M:	Pankaj Sharma <pankj.sharma@samsung.com>









L:	linux-can@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/can/bosch,m_can.yaml