From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Guenter Roeck <linux@roeck-us•net>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Fabian Schindlatz <fabian.schindlatz@fau•de>,
Len Brown <len.brown@intel•com>
Subject: linux-next: manual merge of the tip tree with the hwmon-staging tree
Date: Mon, 1 Jul 2019 17:15:24 +1000 [thread overview]
Message-ID: <20190701171524.774dfc75@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 809 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/hwmon/coretemp.c
between commit:
601fdf7e6635 ("hwmon: Correct struct allocation style")
from the hwmon-staging tree and commit:
835896a59b95 ("hwmon/coretemp: Cosmetic: Rename internal variables to zones from packages")
from the tip tree.
I fixed it up (the comment fixed in the latter was also fixed in the
former) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-07-01 7:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-01 7:15 Stephen Rothwell [this message]
2019-07-09 0:17 ` linux-next: manual merge of the tip tree with the hwmon-staging tree Stephen Rothwell
2019-07-09 1:21 ` Guenter Roeck
-- strict thread matches above, loose matches on Subject: below --
2018-12-11 3:30 Stephen Rothwell
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=20190701171524.774dfc75@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=fabian.schindlatz@fau$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=len.brown@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@roeck-us$(echo .)net \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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