From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Arnd Bergmann <arnd@arndb•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mauro Carvalho Chehab <mchehab+huawei@kernel•org>,
Sebastian Reichel <sebastian.reichel@collabora•com>
Subject: Re: linux-next: manual merge of the staging tree with the char-misc tree
Date: Mon, 9 Aug 2021 09:41:36 +0200 [thread overview]
Message-ID: <YRDcMERBir/y4RwL@kroah.com> (raw)
In-Reply-To: <20210809173503.07581f5c@canb.auug.org.au>
On Mon, Aug 09, 2021 at 05:35:03PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/misc/Kconfig
>
> between commit:
>
> 0f920277dc22 ("misc: gehc-achc: new driver")
>
> from the char-misc tree and commit:
>
> bb3b6552a5b0 ("staging: hikey9xx: split hi6421v600 irq into a separate driver")
>
> from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/misc/Kconfig
> index a420b59917db,29294c52d5af..000000000000
> --- a/drivers/misc/Kconfig
> +++ b/drivers/misc/Kconfig
> @@@ -208,18 -208,16 +208,28 @@@ config CS5535_CLOCK_EVENT_SR
> MFGPTs have a better resolution and max interval than the
> generic PIT, and are suitable for use as high-res timers.
>
> +config GEHC_ACHC
> + tristate "GEHC ACHC support"
> + depends on SPI && SYSFS
> + depends on SOC_IMX53 || COMPILE_TEST
> + select FW_LOADER
> + help
> + Support for GE ACHC microcontroller, that is part of the GE
> + PPD device.
> +
> + To compile this driver as a module, choose M here: the
> + module will be called gehc-achc.
> +
> + config HI6421V600_IRQ
> + tristate "HiSilicon Hi6421v600 IRQ and powerkey"
> + depends on OF
> + depends on SPMI
> + select MFD_CORE
> + select REGMAP_SPMI
> + help
> + This driver provides IRQ handling for Hi6421v600, used on
> + some Kirin chipsets, like the one at Hikey 970.
> +
> config HP_ILO
> tristate "Channel interface driver for the HP iLO processor"
> depends on PCI
Looks good, thanks!
prev parent reply other threads:[~2021-08-09 7:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-09 7:35 linux-next: manual merge of the staging tree with the char-misc tree Stephen Rothwell
2021-08-09 7:41 ` Greg KH [this message]
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=YRDcMERBir/y4RwL@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab+huawei@kernel$(echo .)org \
--cc=sebastian.reichel@collabora$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox