diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2018-01-29 15:26:40 -0500 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2018-01-30 11:30:00 -0500 |
| commit | e7996a9a77fc669387da43ff4823b91cc4872bd0 (patch) | |
| tree | 617f0a128e222539d67e8cccc359f1bc4b984900 /kernel/locking/rtmutex_common.h | |
| parent | b5fa635aab8f0d39a824c01991266a6d06f007fb (diff) | |
| parent | d8a5b80568a9cb66810e75b182018e9edb68e8ff (diff) | |
Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
To resolve conflicts in:
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/qp.c
From patches merged into the -rc cycle. The conflict resolution matches
what linux-next has been carrying.
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'kernel/locking/rtmutex_common.h')
| -rw-r--r-- | kernel/locking/rtmutex_common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h index 124e98ca0b17..68686b3ec3c1 100644 --- a/kernel/locking/rtmutex_common.h +++ b/kernel/locking/rtmutex_common.h | |||
| @@ -148,6 +148,7 @@ extern bool rt_mutex_cleanup_proxy_lock(struct rt_mutex *lock, | |||
| 148 | struct rt_mutex_waiter *waiter); | 148 | struct rt_mutex_waiter *waiter); |
| 149 | 149 | ||
| 150 | extern int rt_mutex_futex_trylock(struct rt_mutex *l); | 150 | extern int rt_mutex_futex_trylock(struct rt_mutex *l); |
| 151 | extern int __rt_mutex_futex_trylock(struct rt_mutex *l); | ||
| 151 | 152 | ||
| 152 | extern void rt_mutex_futex_unlock(struct rt_mutex *lock); | 153 | extern void rt_mutex_futex_unlock(struct rt_mutex *lock); |
| 153 | extern bool __rt_mutex_futex_unlock(struct rt_mutex *lock, | 154 | extern bool __rt_mutex_futex_unlock(struct rt_mutex *lock, |