From: Lee Jones <lee.jones@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
Alistair Francis <alistair@alistair23.me>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Robert Marko <robert.marko@sartura.hr>
Subject: Re: linux-next: manual merge of the char-misc tree with the mfd tree
Date: Mon, 28 Feb 2022 09:01:49 +0000 [thread overview]
Message-ID: <YhyPfcjJtIKNQtF8@google.com> (raw)
In-Reply-To: <20220228193928.3ec6ee98@canb.auug.org.au>
On Mon, 28 Feb 2022, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
I did ask for this *not* to be merged when it was in -testing.
I'll follow-up with Greg.
> drivers/mfd/simple-mfd-i2c.c
>
> between commit:
>
> 5913eb45d036 ("mfd: simple-mfd-i2c: Enable support for the silergy,sy7636a")
>
> from the mfd tree and commit:
>
> d0cac2434c8e ("mfd: simple-mfd-i2c: Add Delta TN48M CPLD support")
>
> from the char-misc 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.
>
--
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2022-02-28 9:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-28 8:39 linux-next: manual merge of the char-misc tree with the mfd tree Stephen Rothwell
2022-02-28 9:01 ` Lee Jones [this message]
2022-02-28 10:46 ` Greg KH
2022-02-28 12:46 ` Lee Jones
2022-02-28 21:26 ` Greg KH
2022-03-01 9:37 ` Lee Jones
2022-03-01 10:35 ` Greg KH
2022-03-01 10:54 ` Lee Jones
2022-03-01 21:19 ` Greg KH
2022-03-02 8:00 ` Lee Jones
2022-03-02 8:49 ` Lee Jones
2022-03-02 10:13 ` Robert Marko
2022-03-01 23:09 ` Robert Marko
2022-03-02 8:37 ` Lee Jones
-- strict thread matches above, loose matches on Subject: below --
2013-02-04 5:12 Stephen Rothwell
2013-02-04 18:27 ` Greg KH
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=YhyPfcjJtIKNQtF8@google.com \
--to=lee.jones@linaro.org \
--cc=alistair@alistair23.me \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robert.marko@sartura.hr \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.