Commit 8697a258 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

net/devlink/leftover.c / net/core/devlink.c:
  565b4824 ("devlink: change port event netdev notifier from per-net to global")
  f05bd8eb ("devlink: move code to a dedicated directory")
  687125b5 ("devlink: split out core code")
https://lore.kernel.org/all/20230208094657.379f2b1a@canb.auug.org.au/



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0b34d680 35674e78

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ Domen Puncer <domen@coderock.org> 
Douglas Gilbert <dougg@torque.net>

Ed L. Cashin <ecashin@coraid.com>

Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>

Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>

Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>

Felipe W Damasio <felipewd@terra.com.br>

Documentation/admin-guide/cgroup-v2.rst

+6 −9
Original line number Diff line number Diff line
@@ -1245,13 +1245,17 @@ PAGE_SIZE multiple when read back. 
	This is a simple interface to trigger memory reclaim in the

	target cgroup.



	This file accepts a string which contains the number of bytes to

	reclaim.

	This file accepts a single key, the number of bytes to reclaim.

	No nested keys are currently supported.



	Example::



	  echo "1G" > memory.reclaim



	The interface can be later extended with nested keys to

	configure the reclaim behavior. For example, specify the

	type of memory to reclaim from (anon, file, ..).



	Please note that the kernel can over or under reclaim from

	the target cgroup. If less bytes are reclaimed than the

	specified amount, -EAGAIN is returned.
@@ -1263,13 +1267,6 @@ PAGE_SIZE multiple when read back. 
	This means that the networking layer will not adapt based on

	reclaim induced by memory.reclaim.



	This file also allows the user to specify the nodes to reclaim from,

	via the 'nodes=' key, for example::



	  echo "1G nodes=0,1" > memory.reclaim



	The above instructs the kernel to reclaim memory from nodes 0,1.



  memory.peak

	A read-only single value file which exists on non-root

	cgroups.

Documentation/devicetree/bindings/.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -2,3 +2,8 @@ 
*.example.dts

/processed-schema*.yaml

/processed-schema*.json



#

# We don't want to ignore the following even if they are dot-files

#

!.yamllint

Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ properties: 


  msi-controller:

    description:

      Only present if the Message Based Interrupt functionnality is

      Only present if the Message Based Interrupt functionality is

      being exposed by the HW, and the mbi-ranges property present.



  mbi-ranges:

Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ properties: 
    description:

      Indicates that the setting of RTC time is allowed by the host CPU.



  wakeup-source: true



required:

  - compatible

  - reg