diff options
| author | Linus Torvalds <[email protected]> | 2023-06-23 23:21:59 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2023-06-23 23:21:59 +0000 |
| commit | 0f56e657488fe35e543fc17bc192fb7c7ac07ac6 (patch) | |
| tree | 515082c712dac4daaa93a1014edf7775465c1f44 /net/nsh/nsh.c | |
| parent | Merge tag 'for-6.4-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | Merge tag 'qcom-arm64-fixes-for-6.4-2' of https://git.kernel.org/pub/scm/linu... (diff) | |
| download | kernel-0f56e657488fe35e543fc17bc192fb7c7ac07ac6.tar.gz kernel-0f56e657488fe35e543fc17bc192fb7c7ac07ac6.zip | |
Merge tag 'arm-fixes-6.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann:
"The final bug fixes for Qualcomm and Rockchips came in, all of them
for devicetree files:
- Devices on Qualcomm SC7180/SC7280 that are cache coherent are now
marked so correctly to fix a regression after a change in kernel
behavior
- Rockchips has a few minor changes for correctness of regulator and
cache properties, as well as fixes for incorrect behavior of the
RK3568 PCI controller and reset pins on two boards"
* tag 'arm-fixes-6.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
arm64: dts: qcom: sc7280: Mark SCM as dma-coherent for chrome devices
arm64: dts: qcom: sc7180: Mark SCM as dma-coherent for trogdor
arm64: dts: qcom: sc7180: Mark SCM as dma-coherent for IDP
dt-bindings: firmware: qcom,scm: Document that SCM can be dma-coherent
arm64: dts: rockchip: Fix rk356x PCIe register and range mappings
arm64: dts: rockchip: fix button reset pin for nanopi r5c
arm64: dts: rockchip: fix nEXTRST on SOQuartz
arm64: dts: rockchip: add missing cache properties
arm64: dts: rockchip: fix USB regulator on ROCK64
Diffstat (limited to 'net/nsh/nsh.c')
0 files changed, 0 insertions, 0 deletions