Commit 820d1563 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'socfpga_dts_fix_for_v5.6_v2' of... 

Merge tag 'socfpga_dts_fix_for_v5.6_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes

arm64: dts: agilex: fix gmac compatible
- The compatible for Agilex GMAC should be "altr,socfpga-stmmac-a10-s10"

* tag 'socfpga_dts_fix_for_v5.6_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: (578 commits)
  arm64: dts: socfpga: agilex: Fix gmac compatible
  Linux 5.6-rc4
  KVM: VMX: check descriptor table exits on instruction emulation
  ext4: potential crash on allocation error in ext4_alloc_flex_bg_array()
  macintosh: therm_windtunnel: fix regression when instantiating devices
  jbd2: fix data races at struct journal_head
  kvm: x86: Limit the number of "kvm: disabled by bios" messages
  KVM: x86: avoid useless copy of cpufreq policy
  KVM: allow disabling -Werror
  KVM: x86: allow compiling as non-module with W=1
  KVM: Pre-allocate 1 cpumask variable per cpu for both pv tlb and pv ipis
  KVM: Introduce pv check helpers
  KVM: let declaration of kvm_get_running_vcpus match implementation
  KVM: SVM: allocate AVIC data structures based on kvm_amd module parameter
  MAINTAINERS: Correct Cadence PCI driver path
  io_uring: fix 32-bit compatability with sendmsg/recvmsg
  net: dsa: mv88e6xxx: Fix masking of egress port
  mlxsw: pci: Wait longer before accessing the device after reset
  sfc: fix timestamp reconstruction at 16-bit rollover points
  vsock: fix potential deadlock in transport->release()
  ...

Link: https://lore.kernel.org/r/20200303153509.28248-1-dinguyen@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0b86b258 8c867387

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -100,6 +100,10 @@ modules.order 
/include/ksym/

/arch/*/include/generated/



# Generated lkdtm tests

/tools/testing/selftests/lkdtm/*.sh

!/tools/testing/selftests/lkdtm/run.sh



# stgit generated dirs

patches-*

COPYING

+2 −0
Original line number Diff line number Diff line
@@ -16,3 +16,5 @@ In addition, other licenses may also apply. Please see: 
	Documentation/process/license-rules.rst



for more details.



All contributions to the Linux Kernel are subject to this COPYING file.

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -567,6 +567,11 @@ D: Original author of Amiga FFS filesystem 
S: Orlando, Florida

S: USA



N: Paul Burton

E: paulburton@kernel.org

W: https://pburton.com

D: MIPS maintainer 2018-2020



N: Lennert Buytenhek

E: kernel@wantstofly.org

D: Original (2.4) rewrite of the ethernet bridging code

Documentation/admin-guide/bootconfig.rst

+31 −3
Original line number Diff line number Diff line
@@ -62,6 +62,30 @@ Or more shorter, written as following:: 
In both styles, same key words are automatically merged when parsing it

at boot time. So you can append similar trees or key-values.



Same-key Values

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



It is prohibited that two or more values or arrays share a same-key.

For example,::



 foo = bar, baz

 foo = qux  # !ERROR! we can not re-define same key



If you want to append the value to existing key as an array member,

you can use ``+=`` operator. For example::



 foo = bar, baz

 foo += qux



In this case, the key ``foo`` has ``bar``, ``baz`` and ``qux``.



However, a sub-key and a value can not co-exist under a parent key.

For example, following config is NOT allowed.::



 foo = value1

 foo.bar = value2 # !ERROR! subkey "bar" and value "value1" can NOT co-exist





Comments

--------
@@ -102,9 +126,13 @@ Boot Kernel With a Boot Config 
==============================



Since the boot configuration file is loaded with initrd, it will be added

to the end of the initrd (initramfs) image file. The Linux kernel decodes

the last part of the initrd image in memory to get the boot configuration

data.

to the end of the initrd (initramfs) image file with size, checksum and

12-byte magic word as below.



[initrd][bootconfig][size(u32)][checksum(u32)][#BOOTCONFIG\n]



The Linux kernel decodes the last part of the initrd image in memory to

get the boot configuration data.

Because of this "piggyback" method, there is no need to change or

update the boot loader and the kernel image itself.

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -136,6 +136,10 @@ 
			dynamic table installation which will install SSDT

			tables to /sys/firmware/acpi/tables/dynamic.



	acpi_no_watchdog	[HW,ACPI,WDT]

			Ignore the ACPI-based watchdog interface (WDAT) and let

			a native driver control the watchdog device instead.



	acpi_rsdp=	[ACPI,EFI,KEXEC]

			Pass the RSDP address to the kernel, mostly used

			on machines running EFI runtime service to boot the

CRA Git | Maintained and supported by SUSTech CRA and CCSE