From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.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 tip tree
Date: Fri, 27 Nov 2020 13:54:11 +0200 [thread overview]
Message-ID: <20201127115411.GF4077@smile.fi.intel.com> (raw)
In-Reply-To: <20201127183924.36696fb0@canb.auug.org.au>
On Fri, Nov 27, 2020 at 06:39:24PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> include/linux/kernel.h
>
> between commit:
>
> 74d862b682f5 ("sched: Make migrate_disable/enable() independent of RT")
>
> from the tip tree and commit:
>
> 761ace49e56f ("kernel.h: Split out mathematical helpers")
>
> 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.
Thanks, from my perspective looks good, dunno if scheduler part is okay.
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc include/linux/kernel.h
> index dbf6018fc312,f97ab3283a8b..000000000000
> --- a/include/linux/kernel.h
> +++ b/include/linux/kernel.h
> @@@ -272,48 -145,13 +159,6 @@@ extern void __cant_migrate(const char *
>
> #define might_sleep_if(cond) do { if (cond) might_sleep(); } while (0)
>
> - /**
> - * abs - return absolute value of an argument
> - * @x: the value. If it is unsigned type, it is converted to signed type first.
> - * char is treated as if it was signed (regardless of whether it really is)
> - * but the macro's return type is preserved as char.
> - *
> - * Return: an absolute value of x.
> - */
> - #define abs(x) __abs_choose_expr(x, long long, \
> - __abs_choose_expr(x, long, \
> - __abs_choose_expr(x, int, \
> - __abs_choose_expr(x, short, \
> - __abs_choose_expr(x, char, \
> - __builtin_choose_expr( \
> - __builtin_types_compatible_p(typeof(x), char), \
> - (char)({ signed char __x = (x); __x<0?-__x:__x; }), \
> - ((void)0)))))))
> -
> - #define __abs_choose_expr(x, type, other) __builtin_choose_expr( \
> - __builtin_types_compatible_p(typeof(x), signed type) || \
> - __builtin_types_compatible_p(typeof(x), unsigned type), \
> - ({ signed type __x = (x); __x < 0 ? -__x : __x; }), other)
> -
> - /**
> - * reciprocal_scale - "scale" a value into range [0, ep_ro)
> - * @val: value
> - * @ep_ro: right open interval endpoint
> - *
> - * Perform a "reciprocal multiplication" in order to "scale" a value into
> - * range [0, @ep_ro), where the upper interval endpoint is right-open.
> - * This is useful, e.g. for accessing a index of an array containing
> - * @ep_ro elements, for example. Think of it as sort of modulus, only that
> - * the result isn't that of modulo. ;) Note that if initial input is a
> - * small value, then result will return 0.
> - *
> - * Return: a result based on @val in interval [0, @ep_ro).
> - */
> - static inline u32 reciprocal_scale(u32 val, u32 ep_ro)
> - {
> - return (u32)(((u64) val * ep_ro) >> 32);
> - }
> -#ifndef CONFIG_PREEMPT_RT
> -# define cant_migrate() cant_sleep()
> -#else
> - /* Placeholder for now */
> -# define cant_migrate() do { } while (0)
> -#endif
> --
> #if defined(CONFIG_MMU) && \
> (defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP))
> #define might_fault() __might_fault(__FILE__, __LINE__)
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2020-11-27 11:53 UTC|newest]
Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-27 7:39 linux-next: manual merge of the akpm-current tree with the tip tree Stephen Rothwell
2020-11-27 11:54 ` Andy Shevchenko [this message]
2020-11-30 9:27 ` Thomas Gleixner
-- strict thread matches above, loose matches on Subject: below --
2022-02-16 5:38 Stephen Rothwell
2021-10-07 6:27 Stephen Rothwell
2021-03-22 6:12 Stephen Rothwell
2020-12-11 8:56 Stephen Rothwell
2020-12-11 12:47 ` Jason Gunthorpe
2020-11-27 7:48 Stephen Rothwell
2020-11-23 8:05 Stephen Rothwell
2020-11-09 6:00 Stephen Rothwell
2020-10-13 6:59 Stephen Rothwell
2020-07-17 10:19 Stephen Rothwell
2020-05-29 11:05 Stephen Rothwell
2020-05-29 10:18 Stephen Rothwell
2020-05-29 10:05 Stephen Rothwell
2020-05-29 9:58 Stephen Rothwell
2020-05-25 11:04 Stephen Rothwell
2020-05-26 4:41 ` Singh, Balbir
2020-06-03 4:43 ` Stephen Rothwell
2020-05-19 16:18 Stephen Rothwell
2020-03-25 7:48 Stephen Rothwell
2020-03-19 6:42 Stephen Rothwell
2020-01-20 6:37 Stephen Rothwell
2020-01-20 6:30 Stephen Rothwell
2019-10-31 5:43 Stephen Rothwell
2019-06-24 10:24 Stephen Rothwell
2019-05-01 11:10 Stephen Rothwell
2019-01-31 4:31 Stephen Rothwell
2018-08-20 4:32 Stephen Rothwell
2018-08-20 19:52 ` Andrew Morton
2018-03-23 5:59 Stephen Rothwell
2017-12-18 5:04 Stephen Rothwell
2017-11-10 4:33 Stephen Rothwell
2017-11-02 7:19 Stephen Rothwell
2017-08-22 6:57 Stephen Rothwell
2017-08-23 6:39 ` Vlastimil Babka
2017-08-11 7:53 Stephen Rothwell
2017-08-11 9:34 ` Peter Zijlstra
2017-08-11 10:48 ` Peter Zijlstra
2017-08-11 11:45 ` Stephen Rothwell
2017-08-11 11:56 ` Ingo Molnar
2017-08-11 12:17 ` Peter Zijlstra
2017-08-11 12:44 ` Ingo Molnar
2017-08-11 13:49 ` Stephen Rothwell
2017-08-11 14:04 ` Peter Zijlstra
2017-08-13 6:06 ` Nadav Amit
2017-08-13 12:50 ` Peter Zijlstra
2017-08-14 3:16 ` Minchan Kim
2017-08-14 5:07 ` Nadav Amit
2017-08-14 5:23 ` Minchan Kim
2017-08-14 8:38 ` Minchan Kim
2017-08-14 19:57 ` Peter Zijlstra
2017-08-16 4:14 ` Minchan Kim
2017-08-14 19:38 ` Peter Zijlstra
2017-08-15 7:51 ` Nadav Amit
2017-08-14 3:09 ` Minchan Kim
2017-08-14 18:54 ` Peter Zijlstra
2017-04-12 6:46 Stephen Rothwell
2017-04-12 20:53 ` Vlastimil Babka
2017-04-20 2:17 ` NeilBrown
2017-03-24 5:25 Stephen Rothwell
2017-02-17 4:40 Stephen Rothwell
2016-11-14 6:08 Stephen Rothwell
2016-07-29 4:14 Stephen Rothwell
2016-06-15 5:23 Stephen Rothwell
2016-06-18 19:39 ` Manfred Spraul
2016-04-29 6:12 Stephen Rothwell
2016-04-29 6:26 ` Ingo Molnar
2016-03-02 5:40 Stephen Rothwell
2016-02-26 5:07 Stephen Rothwell
2016-02-26 21:35 ` Andrew Morton
2016-02-19 4:09 Stephen Rothwell
2016-02-19 15:26 ` Ard Biesheuvel
2015-12-07 8:06 Stephen Rothwell
2015-10-02 4:21 Stephen Rothwell
2015-07-28 6:00 Stephen Rothwell
2015-07-29 17:12 ` Andrea Arcangeli
2015-07-29 17:47 ` Andy Lutomirski
2015-07-29 18:46 ` Thomas Gleixner
2015-07-30 15:38 ` Andrea Arcangeli
2015-07-29 23:06 ` Stephen Rothwell
2015-07-29 23:07 ` Thomas Gleixner
2015-09-07 23:35 ` Stephen Rothwell
2015-09-08 18:11 ` Linus Torvalds
2015-09-08 22:56 ` Stephen Rothwell
2015-09-08 23:03 ` Linus Torvalds
2015-09-08 23:21 ` Andrew Morton
2015-09-16 6:58 ` Geert Uytterhoeven
2015-06-04 12:07 Stephen Rothwell
2015-04-08 8:28 Stephen Rothwell
2015-04-08 8:25 Stephen Rothwell
2014-03-17 9:31 Stephen Rothwell
2014-03-17 9:36 ` Peter Zijlstra
2014-03-19 23:27 ` Andrew Morton
2014-01-14 4:53 Stephen Rothwell
2014-01-14 5:04 ` Davidlohr Bueso
2014-01-14 12:51 ` Peter Zijlstra
2014-01-14 13:17 ` Geert Uytterhoeven
2014-01-14 13:33 ` Peter Zijlstra
2014-01-14 16:19 ` H. Peter Anvin
2014-01-14 15:15 ` H. Peter Anvin
2014-01-14 15:20 ` Geert Uytterhoeven
2014-01-14 15:41 ` Peter Zijlstra
2014-01-14 15:48 ` H. Peter Anvin
2014-01-07 6:00 Stephen Rothwell
2014-01-07 6:34 ` Tang Chen
2013-11-08 7:48 Stephen Rothwell
2013-11-08 18:58 ` Josh Triplett
2013-11-08 23:20 ` Stephen Rothwell
2013-11-09 0:19 ` Josh Triplett
2013-10-30 6:40 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=20201127115411.GF4077@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.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;
as well as URLs for NNTP newsgroup(s).