From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Wolfram Sang <wsa@the-dreams.de>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
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 akpm-current tree with the i2c tree
Date: Wed, 18 Aug 2021 12:18:14 +0300 [thread overview]
Message-ID: <YRzQVpCLwRDcKEN2@smile.fi.intel.com> (raw)
In-Reply-To: <20210818165439.1fc613e2@canb.auug.org.au>
On Wed, Aug 18, 2021 at 04:54:39PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> include/linux/units.h
>
> between commit:
>
> 26471d4a6cf8 ("units: Add SI metric prefix definitions")
>
> from the i2c tree and commits:
>
> d874da9a830f ("units: change from 'L' to 'UL'")
> 390618bdc78a ("units: add the HZ macros")
>
> from the akpm-current 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.
This is correct fix, thank you, Stephen!
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc include/linux/units.h
> index 4a25e0cc8fb3,8b8dc8a84d93..000000000000
> --- a/include/linux/units.h
> +++ b/include/linux/units.h
> @@@ -4,25 -4,13 +4,29 @@@
>
> #include <linux/math.h>
>
> +/* Metric prefixes in accordance with Système international (d'unités) */
> +#define PETA 1000000000000000ULL
> +#define TERA 1000000000000ULL
> +#define GIGA 1000000000UL
> +#define MEGA 1000000UL
> +#define KILO 1000UL
> +#define HECTO 100UL
> +#define DECA 10UL
> +#define DECI 10UL
> +#define CENTI 100UL
> +#define MILLI 1000UL
> +#define MICRO 1000000UL
> +#define NANO 1000000000UL
> +#define PICO 1000000000000ULL
> +#define FEMTO 1000000000000000ULL
> +
> - #define MILLIWATT_PER_WATT 1000L
> - #define MICROWATT_PER_MILLIWATT 1000L
> - #define MICROWATT_PER_WATT 1000000L
> + #define HZ_PER_KHZ 1000UL
> + #define KHZ_PER_MHZ 1000UL
> + #define HZ_PER_MHZ 1000000UL
> +
> + #define MILLIWATT_PER_WATT 1000UL
> + #define MICROWATT_PER_MILLIWATT 1000UL
> + #define MICROWATT_PER_WATT 1000000UL
>
> #define ABSOLUTE_ZERO_MILLICELSIUS -273150
>
--
With Best Regards,
Andy Shevchenko
prev parent reply other threads:[~2021-08-18 9:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-18 6:54 linux-next: manual merge of the akpm-current tree with the i2c tree Stephen Rothwell
2021-08-18 9:18 ` Andy Shevchenko [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=YRzQVpCLwRDcKEN2@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=wsa@the-dreams.de \
/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