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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 821 bytes --]

Hi all,

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

  drivers/clocksource/hyperv_timer.c

between commit:

  e39acc37db34 ("clocksource: hyper-v: Provide noinstr sched_clock()")

from the tip tree and commit:

  f23dab716a66 ("clocksource/drivers/hyper-v: Rework clocksource and sched clock setup")

from the clockevents tree.

I fixed it up (the latter removed a function changed by 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 --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 881 bytes --]

Hi all,

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

  kernel/time/posix-timers.c

between commits:

  ec8f954a40da ("posix-timers: Use a callback for cancel synchronization on PREEMPT_RT")
  0bee3b601b77 ("hrtimer: Improve comments on handling priority inversion against softirq kthread")

from the tip tree and commit:

  08a3c192c93f ("posix-timers: Prepare for PREEMPT_RT")

from the clockevents tree.

I fixed it up (I just used the tip tree 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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

Hi Daniel,

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

  drivers/clocksource/h8300_timer16.c

between commit:

  d33f250af4e6 ("clocksource/drivers/h8300: Use ioread / iowrite")

from the tip tree and commit:

  1ddca16cc5b3 ("clocksource/drivers/h8300: Use ioread / iowrite")

from the clockevents tree.

The former is just a fixed version of the latter, so I used that.

It looks like the clockevents tree needs to be cleaned up.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au