From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@kernel.org>,
Guenter Roeck <linux@roeck-us.net>,
Cosmin Tanislav <cosmin.tanislav@analog.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the spi tree with the hwmon-staging tree
Date: Thu, 10 Feb 2022 21:36:32 +0100 [thread overview]
Message-ID: <20220210203632.e4faql2k5qxq4tmt@pengutronix.de> (raw)
In-Reply-To: <20220210132506.051144fb@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1114 bytes --]
Hello,
On Thu, Feb 10, 2022 at 01:25:06PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the spi tree got a conflict in:
>
> drivers/hwmon/adt7310.c
>
> between commits:
>
> 9c950b125f78 ("hwmon: (adt7x10) Remove empty driver removal callback")
>
> from the hwmon-staging tree and commit:
>
> a0386bba7093 ("spi: make remove callback a void function")
>
> from the spi tree.
>
> I fixed it up (I just used the former version) 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.
Just for the record: I agree this is the right resolution (i.e. take the
file from the hwmon tree).
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-02-10 20:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-10 2:25 Stephen Rothwell
2022-02-10 20:36 ` Uwe Kleine-König [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=20220210203632.e4faql2k5qxq4tmt@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=broonie@kernel.org \
--cc=cosmin.tanislav@analog.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@roeck-us.net \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®