[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <YmjyPSliv+WncweU@google.com>
Date: Wed, 27 Apr 2022 08:35:25 +0100
From: Lee Jones <lee.jones@...aro.org>
To: Fabien Parent <fparent@...libre.com>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the input tree
On Wed, 27 Apr 2022, Fabien Parent wrote:
> Hi,
>
> On Wed, Apr 27, 2022 at 10:48:25AM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the input tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/input/keyboard/mtk-pmic-keys.c:93:36: error: 'MT6359_TOPSTATUS' undeclared here (not in a function); did you mean 'MT6358_TOPSTATUS'?
> > 93 | MTK_PMIC_KEYS_REGS(MT6359_TOPSTATUS,
> > | ^~~~~~~~~~~~~~~~
> > drivers/input/keyboard/mtk-pmic-keys.c:48:35: note: in definition of macro 'MTK_PMIC_KEYS_REGS'
> > 48 | .deb_reg = _deb_reg, \
> > | ^~~~~~~~
> > drivers/input/keyboard/mtk-pmic-keys.c:98:25: error: 'MT6359_TOP_RST_MISC' undeclared here (not in a function); did you mean 'MT6358_TOP_RST_MISC'?
> > 98 | .pmic_rst_reg = MT6359_TOP_RST_MISC,
> > | ^~~~~~~~~~~~~~~~~~~
> > | MT6358_TOP_RST_MISC
> >
> > Caused by commit
> >
> > 0f97adf64314 ("Input: mtk-pmic-keys - add support for MT6359")
> >
> > I have used the input tree from next-20220426 for today.
>
> The commit is depending on another commit from the same patch serie: [0]. That
> patch has been merged in the tree of the MFD maintainer: [1].
>
> [0] https://lore.kernel.org/all/20220426135313.245466-3-fparent@baylibre.com/
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/log/?h=for-mfd-next
Looks like you only sent me 2 of the 8 patches in the set.
In future, if there are dependencies between patches, you must send
all of the patches to everyone. That way, we can organise a merge
strategy that does not break -next, or worse Mainline during the
merge-window.
--
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
Powered by blists - more mailing lists