Tao Huang f17a90bc8b Merge commit '7921dda22e1730a2ee3cf48d8dd5bdd2befee70f'
* commit '7921dda22e1730a2ee3cf48d8dd5bdd2befee70f':
  arm64: configs: rockchip_linux_defconfig: enable rockchip edac
  arm64: configs: rockchip_defconfig: enable rockchip edac
  arm64: dts: rockchip: rk3568: add edac device

Conflicts:
	arch/arm64/boot/dts/rockchip/rk3568.dtsi
	arch/arm64/configs/rockchip_linux_defconfig

Ignore:
commit fbd623f51a ("arm64: dts: rockchip: rk3568: add edac device")
commit 7921dda22e ("arm64: configs: rockchip_linux_defconfig: enable rockchip edac")

Change-Id: Iad480060d2465b9743fb50801e1d0a29eddaca67
2023-09-11 11:30:32 +08:00

Linux kernel
============

There are several guides for kernel developers and users. These guides can
be rendered in a number of formats, like HTML and PDF. Please read
Documentation/admin-guide/README.rst first.

In order to build the documentation, use ``make htmldocs`` or
``make pdfdocs``.  The formatted documentation can also be read online at:

    https://www.kernel.org/doc/html/latest/

There are various text files in the Documentation/ subdirectory,
several of them using the Restructured Text markup notation.

Please read the Documentation/process/changes.rst file, as it contains the
requirements for building and running the kernel, and information about
the problems which may result by upgrading your kernel.
Description
No description provided
Readme 7.9 GiB
Languages
C 97.7%
Assembly 1.6%
Makefile 0.3%
Perl 0.1%