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

2019-05-05 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/s390/kernel/stacktrace.c between commit: 78c98f907413 ("s390/unwind: introduce stack unwind API") from the s390 tree and commit: 6a28b4c2d93b ("s390/stacktrace: Remove the pointless ULONG_MAX marker") from the tip

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

2017-11-12 Thread Stephen Rothwell
Hi all, On Wed, 11 Oct 2017 16:51:45 +0100 Mark Brown wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/s390/include/asm/rwsem.h > > between commit: > >91a1fad759ffd ("s390: use generic rwsem implementation") > > from the s390 tree and commit: > >a61ba

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

2017-10-31 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/s390/lib/spinlock.c between commit: eb3b7b848fb3 ("s390/rwlock: introduce rwlock wait queueing") (at least) from the s390 tree and commit: 6aa7de059173 ("locking/atomics: COCCINELLE/treewide: Convert trivial ACCES

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

2017-10-11 Thread Mark Brown
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/s390/include/asm/rwsem.h between commit: 91a1fad759ffd ("s390: use generic rwsem implementation") from the s390 tree and commit: a61ba2c8a48f1 ("locking/arch, s390: Add __down_read_killable()") from the tip tree

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

2015-08-19 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/s390/lib/uaccess.c between commit: cabc4abe8e36 ("s390/uaccess: remove uaccess_primary kernel parameter") from the s390 tree and commit: ed79e946732e ("s390/uaccess, locking/static_keys: employ static_branch_likel

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

2013-02-06 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in arch/s390/Kconfig between commit ad2c429560fc ("s390/Kconfig: sort list of arch selected config options") from the s390 tree and commit 6147a9d8070e ("irq_work: Remove CONFIG_HAVE_IRQ_WORK") from the tip tree. I fixed it up (see b