mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 18:41:58 +09:00
1ce4377b68
* commit 'ce5da098c4cd46deb075845111383d9fd34afa7a': (27 commits)
drm/rockchip: vop2: update rk3568 max height limit
drm/rockchip: lvds: update MEDIA_BUS_FMT_RGB666_1X7X3_SPWG description
mmc: sdhci-of-dwcmshc: support HS400ES for RK3568
Revert "arm64: rockchip_defconfig: enable CONFIG_ROCKCHIP_DRM_CUBIC_LUT"
Revert "FROMLIST: drm: Extend color correction to support 3D-CLU"
drm/rockchip: vop2: move cubic lut to rockchip drm driver
media: i2c: add ar0822 driver
media: i2c: max96722: version 1.00.00
video: rockchip: rga3: add mm_flag 'RGA_MEM_FORCE_FLUSH_CACHE'
arm64: dts: rockchip: rk3528 boards: btsco enable 16k pcm support
arm64: dts: rockchip: rk356x boards: btsco enable 16k pcm support
arm64: dts: rockchip: rk3588 boards: btsco enable 16k pcm support
arm64: dts: rockchip: rk3562-evb: enable logo display for rgb board
nvme-pci: add NVME_QUIRK_LIMIT_IOQD32 to fix Phison E15 NVMe controller
video: rockchip: mpp: fix crash issue when no iommu
soc: rockchip: mtd_vendor_storage: force config spi nor erase size to 64KB
PCI: rockchip: dw_ep: Delaying the link training after hot reset
video: rockchip: rga3: adapt to kernel-6.1/5.10/4.19
ARM: dts: rockchip: rmii_phy use increment 0 for rv1106-evb
arm64: dts: rockchip: rk3588: Add opp-info support
...
Conflicts:
drivers/gpu/drm/drm_atomic_helper.c
drivers/media/i2c/Kconfig
drivers/media/i2c/Makefile
drivers/media/i2c/max96722.c
drivers/nvme/host/pci.c
drivers/pci/controller/dwc/pcie-dw-rockchip.c
Ignore:
commit 49520417ba ("PCIe: dw: rockchip: Disabled BAR0 and BAR1").
Change-Id: I41d947eda90f8b547ef2af30c3b093f556521803
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
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.