Commit d0ddf506 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Documentation/bpf/bpf_devel_QA.rst
  b7abcd9c ("bpf, doc: Link to submitting-patches.rst for general patch submission info")
  d56b0c46 ("bpf, docs: Fix link to netdev-FAQ target")
https://lore.kernel.org/all/20230307095812.236eb1be@canb.auug.org.au/



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents db47fa2e 44889ba5

.clang-format

+0 −1
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ ForEachMacros: 
  - 'for_each_console_srcu'

  - 'for_each_cpu'

  - 'for_each_cpu_and'

  - 'for_each_cpu_not'

  - 'for_each_cpu_wrap'

  - 'for_each_dapm_widgets'

  - 'for_each_dedup_cand'

.mailmap

+9 −1
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com> 
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>

<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>

Dikshita Agarwal <dikshita@qti.qualcomm.com> <dikshita@codeaurora.org>

Dmitry Baryshkov <dbaryshkov@gmail.com>

Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>

Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
@@ -150,6 +151,7 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com> 
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>

Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
@@ -304,6 +306,8 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com> 
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>

Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>

Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>

Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>

Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>

Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>

Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>

Mayuresh Janorkar <mayur@ti.com>
@@ -409,7 +413,10 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com> 
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>

Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>

Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>

Stephen Hemminger <stephen@networkplumber.org> <sthemmin@microsoft.com>

Stephen Hemminger <stephen@networkplumber.org> <sthemmin@vyatta.com>

Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>

Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>

Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
@@ -441,6 +448,7 @@ Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org> 
Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>

Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>

Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>

Vikash Garodia <quic_vgarodia@quicinc.com> <vgarodia@codeaurora.org>

Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>

Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>

Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

Documentation/ABI/testing/sysfs-class-power

+2 −1
Original line number Diff line number Diff line
@@ -437,7 +437,8 @@ What: /sys/class/power_supply/<supply_name>/present 
Date:		May 2007

Contact:	linux-pm@vger.kernel.org

Description:

		Reports whether a battery is present or not in the system.

		Reports whether a battery is present or not in the system. If the

		property does not exist, the battery is considered to be present.



		Access: Read

Documentation/ABI/testing/sysfs-class-watchdog

+13 −0
Original line number Diff line number Diff line
@@ -6,6 +6,19 @@ Description: 
		device at boot. It is equivalent to WDIOC_GETBOOTSTATUS of

		ioctl interface.



What:		/sys/class/watchdog/watchdogn/options

Date:		April 2023

Contact:	Thomas Weißschuh

Description:

		It is a read only file. It contains options of watchdog device.



What:		/sys/class/watchdog/watchdogn/fw_version

Date:		April 2023

Contact:	Thomas Weißschuh

Description:

		It is a read only file. It contains firmware version of

		watchdog device.



What:		/sys/class/watchdog/watchdogn/identity

Date:		August 2015

Contact:	Wim Van Sebroeck <wim@iguana.be>

Documentation/ABI/testing/sysfs-fs-f2fs

+70 −10
Original line number Diff line number Diff line
@@ -49,16 +49,23 @@ Contact: "Jaegeuk Kim" <jaegeuk.kim@samsung.com> 
Description:	Controls the in-place-update policy.

		updates in f2fs. User can set:



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

		0x01  F2FS_IPU_FORCE

		0x02  F2FS_IPU_SSR

		0x04  F2FS_IPU_UTIL

		0x08  F2FS_IPU_SSR_UTIL

		0x10  F2FS_IPU_FSYNC

		0x20  F2FS_IPU_ASYNC

		0x40  F2FS_IPU_NOCACHE

		0x80  F2FS_IPU_HONOR_OPU_WRITE

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

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

		value policy          description

		0x00  DISABLE         disable IPU(=default option in LFS mode)

		0x01  FORCE           all the time

		0x02  SSR             if SSR mode is activated

		0x04  UTIL            if FS utilization is over threashold

		0x08  SSR_UTIL        if SSR mode is activated and FS utilization is over

		                      threashold

		0x10  FSYNC           activated in fsync path only for high performance

		                      flash storages. IPU will be triggered only if the

		                      # of dirty pages over min_fsync_blocks.

		                      (=default option)

		0x20  ASYNC           do IPU given by asynchronous write requests

		0x40  NOCACHE         disable IPU bio cache

		0x80  HONOR_OPU_WRITE use OPU write prior to IPU write if inode has

		                      FI_OPU_WRITE flag

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



		Refer segment.h for details.
@@ -669,3 +676,56 @@ Contact: "Ping Xiong" <xiongping1@xiaomi.com> 
Description:	When DATA SEPARATION is on, it controls the age threshold to indicate

		the data blocks as warm. By default it was initialized as 2621440 blocks

		(equals to 10GB).



What:		/sys/fs/f2fs/<disk>/fault_rate

Date:		May 2016

Contact:	"Sheng Yong" <shengyong@oppo.com>

Contact:	"Chao Yu" <chao@kernel.org>

Description:	Enable fault injection in all supported types with

		specified injection rate.



What:		/sys/fs/f2fs/<disk>/fault_type

Date:		May 2016

Contact:	"Sheng Yong" <shengyong@oppo.com>

Contact:	"Chao Yu" <chao@kernel.org>

Description:	Support configuring fault injection type, should be

		enabled with fault_injection option, fault type value

		is shown below, it supports single or combined type.



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

		Type_Name                Type_Value

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

		FAULT_KMALLOC            0x000000001

		FAULT_KVMALLOC           0x000000002

		FAULT_PAGE_ALLOC         0x000000004

		FAULT_PAGE_GET           0x000000008

		FAULT_ALLOC_BIO          0x000000010 (obsolete)

		FAULT_ALLOC_NID          0x000000020

		FAULT_ORPHAN             0x000000040

		FAULT_BLOCK              0x000000080

		FAULT_DIR_DEPTH          0x000000100

		FAULT_EVICT_INODE        0x000000200

		FAULT_TRUNCATE           0x000000400

		FAULT_READ_IO            0x000000800

		FAULT_CHECKPOINT         0x000001000

		FAULT_DISCARD            0x000002000

		FAULT_WRITE_IO           0x000004000

		FAULT_SLAB_ALLOC         0x000008000

		FAULT_DQUOT_INIT         0x000010000

		FAULT_LOCK_OP            0x000020000

		FAULT_BLKADDR            0x000040000

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



What:		/sys/fs/f2fs/<disk>/discard_io_aware_gran

Date:		January 2023

Contact:	"Yangtao Li" <frank.li@vivo.com>

Description:	Controls background discard granularity of inner discard thread

		when is not in idle. Inner thread will not issue discards with size that

		is smaller than granularity. The unit size is one block(4KB), now only

		support configuring in range of [0, 512].

		Default: 512



What:		/sys/fs/f2fs/<disk>/last_age_weight

Date:		January 2023

Contact:	"Ping Xiong" <xiongping1@xiaomi.com>

Description:	When DATA SEPARATION is on, it controls the weight of last data block age.