Received-SPF: pass (google.com: domain of linux-kernel+bounces-49861-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <20240126095721.782782-1-lma@chromium.org> <20240201130605.GA1379817@google.com>
In-Reply-To: <20240201130605.GA1379817@google.com>
From: =?UTF-8?Q?=C5=81ukasz_Majczak?= <lma@chromium.org>
Date: Fri, 2 Feb 2024 13:47:26 +0100
Message-ID: <CAE5UKNqNR7869EqjNRdn_osnxLLtJma=eMmsYBE1fvzA0g_ybg@mail.gmail.com>
Subject: Re: [GIT PULL] Immutable branch between MFD, CROS and Watchdog due
 for the v6.9 merge window
To: Lee Jones <lee@kernel.org>
Cc: Gwendal Grignou <gwendal@chromium.org>, Tzung-Bi Shih <tzungbi@kernel.org>, 
	Radoslaw Biernacki <biernacki@google.com>, Wim Van Sebroeck <wim@linux-watchdog.org>, 
	Benson Leung <bleung@chromium.org>, Guenter Roeck <groeck@chromium.org>, 
	Krzysztof Kozlowski <krzk@kernel.org>, linux-watchdog@vger.kernel.org, 
	linux-kernel@vger.kernel.org, chrome-platform@lists.linux.dev
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Thu, Feb 1, 2024 at 2:06=E2=80=AFPM Lee Jones <lee@kernel.org> wrote:
>
> Good afternoon,
>
> The following changes since commit 6613476e225e090cc9aad49be7fa504e290dd3=
3d:
>
>   Linux 6.8-rc1 (2024-01-21 14:11:32 -0800)
>
> are available in the Git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-cros-w=
atchdog-v6.9
>
> for you to fetch changes up to 843dac4d3687f7628ba4f76e1481ee3838b27a35:
>
>   watchdog: Add ChromeOS EC-based watchdog driver (2024-02-01 11:49:30 +0=
000)
>
> ----------------------------------------------------------------
> Immutable branch between MFD, CROS and Watchdog due for the v6.9 merge wi=
ndow
>
> ----------------------------------------------------------------
> Lukasz Majczak (2):
>       platform/chrome: Update binary interface for EC-based watchdog
>       watchdog: Add ChromeOS EC-based watchdog driver
>
>  MAINTAINERS                                    |   6 +
>  drivers/watchdog/Kconfig                       |  11 ++
>  drivers/watchdog/Makefile                      |   1 +
>  drivers/watchdog/cros_ec_wdt.c                 | 204 +++++++++++++++++++=
++++++
>  include/linux/platform_data/cros_ec_commands.h |  78 +++++-----
>  5 files changed, 257 insertions(+), 43 deletions(-)
>  create mode 100644 drivers/watchdog/cros_ec_wdt.c
>
> --
> Lee Jones [=E6=9D=8E=E7=90=BC=E6=96=AF]

Hi Lee,

I'm about to sent V5 of patches:
* watchdog: Add ChromeOS EC-based watchdog driver
* platform/chrome: Update binary interface for EC-based watchdog
but I'm not sure how I should proceed - can I base those on the master
branch or shall I rebase on top of  ib-mfd-cros-watchdog-v6.9?

Best regards,
Lukasz