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

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

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

parents a20625e4 7428b2e5

Documentation/admin-guide/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -3523,6 +3523,12 @@ 
	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes

			See Documentation/blockdev/ramdisk.txt.



	random.trust_cpu={on,off}

			[KNL] Enable or disable trusting the use of the

			CPU's random number generator (if available) to

			fully seed the kernel's CRNG. Default is controlled

			by CONFIG_RANDOM_TRUST_CPU.



	ras=option[,option,...]	[KNL] RAS-specific options



		cec_disable	[X86]

Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt

+1 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
Required properties:

- compatible :

  - "fsl,imx7ulp-lpi2c" for LPI2C compatible with the one integrated on i.MX7ULP soc

  - "fsl,imx8dv-lpi2c" for LPI2C compatible with the one integrated on i.MX8DV soc

- reg : address and length of the lpi2c master registers

- interrupts : lpi2c interrupt

- clocks : lpi2c clock specifier
@@ -11,7 +10,7 @@ Required properties: 
Examples:



lpi2c7: lpi2c7@40a50000 {

	compatible = "fsl,imx8dv-lpi2c";

	compatible = "fsl,imx7ulp-lpi2c";

	reg = <0x40A50000 0x10000>;

	interrupt-parent = <&intc>;

	interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

Documentation/process/changes.rst

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ pkg-config 


The build system, as of 4.18, requires pkg-config to check for installed

kconfig tools and to determine flags settings for use in

'make {menu,n,g,x}config'.  Previously pkg-config was being used but not

'make {g,x}config'.  Previously pkg-config was being used but not

verified or documented.



Flex

Documentation/scsi/scsi-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -97,6 +97,11 @@ parameters may be changed at runtime by the command 
			allowing boot to proceed.  none ignores them, expecting

			user space to do the scan.



	scsi_mod.use_blk_mq=

			[SCSI] use blk-mq I/O path by default

			See SCSI_MQ_DEFAULT in drivers/scsi/Kconfig.

			Format: <y/n>



	sim710=		[SCSI,HW]

			See header of drivers/scsi/sim710.c.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2311,6 +2311,7 @@ F: drivers/clocksource/cadence_ttc_timer.c 
F:	drivers/i2c/busses/i2c-cadence.c

F:	drivers/mmc/host/sdhci-of-arasan.c

F:	drivers/edac/synopsys_edac.c

F:	drivers/i2c/busses/i2c-xiic.c



ARM64 PORT (AARCH64 ARCHITECTURE)

M:	Catalin Marinas <catalin.marinas@arm.com>