| Message ID | 7e40328b-6645-4343-3050-73dcfb2cefcb@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL] amlogic fixes for v5.17-rc | expand |
On Mon, Jan 03, 2022 at 04:13:44PM +0100, Neil Armstrong wrote: > Hi, > > Here's a couple of DT fixes for v5.17-rc1, they fix the UART compatibles of > the ARMv7 Amlogic SoCs and by the way keep earlycon working after [1] has been > applied by greg in the tty branch for 5.17. > > I know it's early for 5.17-rc1, but at least it's in the pipe. > > I based the changes on your dt-5.17 tag pushed to linus for 5.17-rc1, > if necessary I can rebase on v5.16-rcX. Hi Neil, It looks like this branch is based on our arm/dt branch? Please don't base your topics on our branches, it'll be awkward if we ever need to rebuild them (it's happened a few times, but we try very hard to avoid it). In this case, you should have based your contents on top of your latest dt branch (if it would have had conflicts), not ours. Mind rebuilding and send a new pull request? Thanks, -Olof
Hi, On 08/01/2022 22:26, Olof Johansson wrote: > On Mon, Jan 03, 2022 at 04:13:44PM +0100, Neil Armstrong wrote: >> Hi, >> >> Here's a couple of DT fixes for v5.17-rc1, they fix the UART compatibles of >> the ARMv7 Amlogic SoCs and by the way keep earlycon working after [1] has been >> applied by greg in the tty branch for 5.17. >> >> I know it's early for 5.17-rc1, but at least it's in the pipe. >> >> I based the changes on your dt-5.17 tag pushed to linus for 5.17-rc1, >> if necessary I can rebase on v5.16-rcX. > > Hi Neil, > > It looks like this branch is based on our arm/dt branch? Please don't base your > topics on our branches, it'll be awkward if we ever need to rebuild them (it's > happened a few times, but we try very hard to avoid it). Sure, no worries, I tried but I was wrong > > In this case, you should have based your contents on top of your latest dt > branch (if it would have had conflicts), not ours. Noted for next time > > Mind rebuilding and send a new pull request? Sure, rebasing right now on proper 5.17-rc DT tag > > Thanks, > > > -Olof > Thanks, Neil
Hi, Here's a couple of DT fixes for v5.17-rc1, they fix the UART compatibles of the ARMv7 Amlogic SoCs and by the way keep earlycon working after [1] has been applied by greg in the tty branch for 5.17. I know it's early for 5.17-rc1, but at least it's in the pipe. I based the changes on your dt-5.17 tag pushed to linus for 5.17-rc1, if necessary I can rebase on v5.16-rcX. Neil [1] https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git/commit/?h=tty-next&id=ad234e2bac274a43c9fa540bde8cd9f0c627b71f The following changes since commit 8b0c59c622dc4dab970ec63264fb5b152944ac80: Revert "ARM: dts: BCM5301X: define RTL8365MB switch on Asus RT-AC88U" (2021-12-23 00:18:45 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git tags/amlogic-fixes-v5.17-rc for you to fetch changes up to 7a31a29b35386b6d6aa622d68acd31739a3a8ac5: ARM: dts: meson8b: Fix the UART device-tree schema validation (2022-01-03 15:49:56 +0100) ---------------------------------------------------------------- Amlogic fixes for v5.17-rc - meson6/meson8/meson8b UART compatible fixup to fix earlycon ---------------------------------------------------------------- Martin Blumenstingl (3): ARM: dts: meson: Fix the UART compatible strings ARM: dts: meson8: Fix the UART device-tree schema validation ARM: dts: meson8b: Fix the UART device-tree schema validation arch/arm/boot/dts/meson.dtsi | 8 ++++---- arch/arm/boot/dts/meson8.dtsi | 24 ++++++++++++------------ arch/arm/boot/dts/meson8b.dtsi | 24 ++++++++++++------------ 3 files changed, 28 insertions(+), 28 deletions(-)