Re: linux-next: manual merge of the tip tree with the block tree

2020-11-09 Thread Jens Axboe
On 11/9/20 6:45 AM, Thomas Gleixner wrote: > On Mon, Nov 09 2020 at 14:14, Stephen Rothwell wrote: >> Today's linux-next merge of the tip tree got a conflict in: >> >> include/linux/sched/signal.h >> include/linux/tracehook.h >> kernel/signal.c >> kernel/task_work.c >> >> between commits: >

Re: linux-next: manual merge of the tip tree with the block tree

2020-11-09 Thread Thomas Gleixner
On Mon, Nov 09 2020 at 14:14, Stephen Rothwell wrote: > Today's linux-next merge of the tip tree got a conflict in: > > include/linux/sched/signal.h > include/linux/tracehook.h > kernel/signal.c > kernel/task_work.c > > between commits: > > fdb5f027ce66 ("task_work: use TIF_NOTIFY_SIGNAL

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

2020-11-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: include/linux/sched/signal.h include/linux/tracehook.h kernel/signal.c kernel/task_work.c between commits: fdb5f027ce66 ("task_work: use TIF_NOTIFY_SIGNAL if available") bf6996650675 ("task_work: remove legacy TWA_S

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

2019-02-12 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got conflicts in: arch/x86/entry/syscalls/syscall_32.tbl arch/x86/entry/syscalls/syscall_64.tbl include/uapi/asm-generic/unistd.h between commits: 1690d3ffa284 ("Add io_uring IO interface") 0e5d5b5a94c8 ("io_uring: add support for pre-m

Re: linux-next: manual merge of the tip tree with the block tree

2017-11-01 Thread Kees Cook
On Wed, Nov 1, 2017 at 7:25 AM, Jens Axboe wrote: > On 11/01/2017 12:10 AM, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the tip tree got a conflict in: >> >> drivers/block/amiflop.c >> >> between commit: >> >> f37ecbfc238b ("amifloppy: Convert timers to use timer_setup

Re: linux-next: manual merge of the tip tree with the block tree

2017-11-01 Thread Jens Axboe
On 11/01/2017 12:10 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > drivers/block/amiflop.c > > between commit: > > f37ecbfc238b ("amifloppy: Convert timers to use timer_setup()") > > from the block tree and commit: > > 3c557df67

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

2017-10-31 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/block/amiflop.c between commit: f37ecbfc238b ("amifloppy: Convert timers to use timer_setup()") from the block tree and commit: 3c557df67257 ("timer: Remove meaningless .data/.function assignments") from the ti

Re: linux-next: manual merge of the tip tree with the block tree

2017-07-02 Thread Stephen Rothwell
Hi all, On Mon, 3 Jul 2017 13:56:16 +1000 Stephen Rothwell wrote: > > +if (cpu < nr_queues) { > - map[cpu] = cpu_to_queue_index(nr_queues, cpu, > online_mask); > ++map[cpu] = cpu_to_queue_index(nr_queues, cpu) > +} else { > +

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

2017-07-02 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: block/blk-mq-cpumap.c between commit: fe631457ff3e ("blk-mq: map all HWQ also in hyperthreaded system") from the block tree and commit: 5f042e7cbd9e ("blk-mq: Include all present CPUs in the default queue mapping") fro

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

2014-05-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in drivers/block/mtip32xx/mtip32xx.c between commit b10fd728b985 ("mtip32xx: convert to use blk-mq") from the block tree and commit 4e857c58efeb ("arch: Mass conversion of smp_mb__*()") from the tip tree. I fixed it up (I used the bl