Re: [GIT PULL] Immutable branch between MFD, CROS and Watchdog due for the v6.9 merge window
From: Lee Jones
Date: Fri Feb 02 2024 - 07:51:00 EST
On Fri, 02 Feb 2024, Łukasz Majczak wrote:
> On Thu, Feb 1, 2024 at 2:06 PM Lee Jones <lee@xxxxxxxxxx> 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 [李琼斯]