xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

Browse Source 
The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2018-08-02 10:55:32 -07:00
parent ffd7ce3cd9 e30cb13c5a
commit 89b1698c93
239 changed files with 2011 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ipc/sem.c
View File

@@ -2119,7 +2119,7 @@ static long do_semtimedop(int semid, struct sembuf __user *tsops,
}
do {
queue.status = -EINTR;
WRITE_ONCE(queue.status, -EINTR);
queue.sleeper = current;
__set_current_state(TASK_INTERRUPTIBLE);