All of lore.kernel.org
 help / color / mirror / Atom feed
From: Olof Johansson <olof@lixom.net>
To: Neil Armstrong <narmstrong@baylibre.com>
Cc: soc@kernel.org, arm@kernel.org,
	linux-amlogic@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] amlogic fixes for v5.17-rc
Date: Sat, 8 Jan 2022 13:26:21 -0800	[thread overview]
Message-ID: <YdoBffKeAvtOeRSe@lx2k> (raw)
In-Reply-To: <7e40328b-6645-4343-3050-73dcfb2cefcb@baylibre.com>

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


WARNING: multiple messages have this Message-ID (diff)
From: Olof Johansson <olof@lixom.net>
To: Neil Armstrong <narmstrong@baylibre.com>
Cc: soc@kernel.org, arm@kernel.org,
	linux-amlogic@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] amlogic fixes for v5.17-rc
Date: Sat, 8 Jan 2022 13:26:21 -0800	[thread overview]
Message-ID: <YdoBffKeAvtOeRSe@lx2k> (raw)
In-Reply-To: <7e40328b-6645-4343-3050-73dcfb2cefcb@baylibre.com>

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


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

WARNING: multiple messages have this Message-ID (diff)
From: Olof Johansson <olof@lixom.net>
To: Neil Armstrong <narmstrong@baylibre.com>
Cc: soc@kernel.org, arm@kernel.org,
	linux-amlogic@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] amlogic fixes for v5.17-rc
Date: Sat, 8 Jan 2022 13:26:21 -0800	[thread overview]
Message-ID: <YdoBffKeAvtOeRSe@lx2k> (raw)
In-Reply-To: <7e40328b-6645-4343-3050-73dcfb2cefcb@baylibre.com>

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


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2022-01-08 21:58 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-03 15:13 [GIT PULL] amlogic fixes for v5.17-rc Neil Armstrong
2022-01-03 15:13 ` Neil Armstrong
2022-01-03 15:13 ` Neil Armstrong
2022-01-08 21:26 ` Olof Johansson [this message]
2022-01-08 21:26   ` Olof Johansson
2022-01-08 21:26   ` Olof Johansson
2022-01-10  9:23   ` Neil Armstrong
2022-01-10  9:23     ` Neil Armstrong
2022-01-10  9:23     ` Neil Armstrong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YdoBffKeAvtOeRSe@lx2k \
    --to=olof@lixom.net \
    --cc=arm@kernel.org \
    --cc=linux-amlogic@lists.infradead.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=narmstrong@baylibre.com \
    --cc=soc@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.