Received-SPF: pass (google.com: domain of linux-kernel+bounces-49864-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Fri, 2 Feb 2024 12:50:30 +0000
From: Lee Jones <lee@kernel.org>
To: =?utf-8?Q?=C5=81ukasz?= Majczak <lma@chromium.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
Subject: Re: [GIT PULL] Immutable branch between MFD, CROS and Watchdog due
 for the v6.9 merge window
Message-ID: <20240202125030.GF1379817@google.com>
References: <20240126095721.782782-1-lma@chromium.org>
 <20240201130605.GA1379817@google.com>
 <CAE5UKNqNR7869EqjNRdn_osnxLLtJma=eMmsYBE1fvzA0g_ybg@mail.gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAE5UKNqNR7869EqjNRdn_osnxLLtJma=eMmsYBE1fvzA0g_ybg@mail.gmail.com>

On Fri, 02 Feb 2024, Łukasz Majczak wrote:

> On Thu, Feb 1, 2024 at 2:06 PM Lee Jones <lee@kernel.org> wrote:
> >
> > Good afternoon,
> >
> > The following changes since commit 6613476e225e090cc9aad49be7fa504e290dd33d:
> >
> >   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-watchdog-v6.9
> >
> > for you to fetch changes up to 843dac4d3687f7628ba4f76e1481ee3838b27a35:
> >
> >   watchdog: Add ChromeOS EC-based watchdog driver (2024-02-01 11:49:30 +0000)
> >
> > ----------------------------------------------------------------
> > Immutable branch between MFD, CROS and Watchdog due for the v6.9 merge window
> >
> > ----------------------------------------------------------------
> > 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 [李琼斯]
> 
> 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

These patches are applied, you cannot resend them.

If you need to make adjustments, please submit incremental changes.

> 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?

Unless it causes issues, I tend to work on Linux next.

-- 
Lee Jones [李琼斯]