Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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



An ipvlan bug fix in 'net' conflicted with the abstraction away
of the IPV6 specific support in 'net-next'.

Similarly, a bug fix for mlx5 in 'net' conflicted with the flow
action conversion in 'net-next'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7499a288 27b4ad62

Documentation/ABI/stable/sysfs-driver-mlxreg-io

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/ 
							cpld3_version



Date:		November 2018

KernelVersion:	4.21

KernelVersion:	5.0

Contact:	Vadim Pasternak <vadimpmellanox.com>

Description:	These files show with which CPLD versions have been burned

		on LED board.
@@ -35,7 +35,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/ 
							jtag_enable



Date:		November 2018

KernelVersion:	4.21

KernelVersion:	5.0

Contact:	Vadim Pasternak <vadimpmellanox.com>

Description:	These files enable and disable the access to the JTAG domain.

		By default access to the JTAG domain is disabled.
@@ -105,7 +105,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/ 
						reset_voltmon_upgrade_fail



Date:		November 2018

KernelVersion:	4.21

KernelVersion:	5.0

Contact:	Vadim Pasternak <vadimpmellanox.com>

Description:	These files show the system reset cause, as following: ComEx

		power fail, reset from ComEx, system platform reset, reset

Documentation/devicetree/bindings/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -17,7 +17,11 @@ extra-y += $(DT_TMP_SCHEMA) 
quiet_cmd_mk_schema = SCHEMA  $@

      cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(filter-out FORCE, $^)



DT_DOCS = $(shell cd $(srctree)/$(src) && find * -name '*.yaml')

DT_DOCS = $(shell \

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

	find * \( -name '*.yaml' ! -name $(DT_TMP_SCHEMA) \) \

	)



DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))



extra-y += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))

Documentation/devicetree/bindings/serio/olpc,ap-sp.txt

+0 −4
Original line number Diff line number Diff line
@@ -4,14 +4,10 @@ Required properties: 
- compatible : "olpc,ap-sp"

- reg : base address and length of SoC's WTM registers

- interrupts : SP-AP interrupt

- clocks : phandle + clock-specifier for the clock that drives the WTM

- clock-names:  should be "sp"



Example:

	ap-sp@d4290000 {

		compatible = "olpc,ap-sp";

		reg = <0xd4290000 0x1000>;

		interrupts = <40>;

		clocks = <&soc_clocks MMP2_CLK_SP>;

		clock-names = "sp";

	}

Documentation/sysctl/fs.txt

+16 −10
Original line number Diff line number Diff line
@@ -56,26 +56,32 @@ of any kernel data structures. 


dentry-state:



From linux/fs/dentry.c:

From linux/include/linux/dcache.h:

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

struct {

struct dentry_stat_t dentry_stat {

        int nr_dentry;

        int nr_unused;

        int age_limit;         /* age in seconds */

        int want_pages;        /* pages requested by system */

        int dummy[2];

} dentry_stat = {0, 0, 45, 0,};

        int nr_negative;       /* # of unused negative dentries */

        int dummy;             /* Reserved for future use */

};

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



Dentries are dynamically allocated and deallocated, and

nr_dentry seems to be 0 all the time. Hence it's safe to

assume that only nr_unused, age_limit and want_pages are

used. Nr_unused seems to be exactly what its name says.

Dentries are dynamically allocated and deallocated.



nr_dentry shows the total number of dentries allocated (active

+ unused). nr_unused shows the number of dentries that are not

actively used, but are saved in the LRU list for future reuse.



Age_limit is the age in seconds after which dcache entries

can be reclaimed when memory is short and want_pages is

nonzero when shrink_dcache_pages() has been called and the

dcache isn't pruned yet.



nr_negative shows the number of unused dentries that are also

negative dentries which do not mapped to actual files.



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



dquot-max & dquot-nr:

Documentation/x86/resctrl_ui.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Fenghua Yu <fenghua.yu@intel.com> 
Tony Luck <tony.luck@intel.com>

Vikas Shivappa <vikas.shivappa@intel.com>



This feature is enabled by the CONFIG_X86_RESCTRL and the x86 /proc/cpuinfo

This feature is enabled by the CONFIG_X86_CPU_RESCTRL and the x86 /proc/cpuinfo

flag bits:

RDT (Resource Director Technology) Allocation - "rdt_a"

CAT (Cache Allocation Technology) - "cat_l3", "cat_l2"