linux-next: manual merge of the paulmck tree with the tip tree

[Mark Brown]

Hi all,

Today's linux-next merge of the paulmck tree got a conflict in:

  include/linux/hrtimer.h

between commits:

  d3dc7fabd4c4a ("hrtimer: Move hrtimer_callback_running() to hrtimer_bases.h")
  a116c7582d7f7 ("hrtimer: Move hrtimer_update_function() to hrtimer.c")

from the tip tree and commit:

  07abbb755f8e3 ("hrtimer: Apply READ_ONCE() to lockless base->running loads")

from the paulmck 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 only resolves the conflict, the READ_ONCE() got dropped.

diff --cc include/linux/hrtimer.h
index 29072d89e5cb3,b8636e81ca005..0000000000000
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h

Attachment: signature.asc
Description: PGP signature