diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2020-06-09 20:22:54 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-06-12 14:13:28 +1000 |
| commit | 8021e3499c329f45dab18f3b51830a367287f853 (patch) | |
| tree | 106c405cd6f65041152e7bbce2759240f80b2926 /include/uapi/asm-generic/unistd.h | |
| parent | b9fb6c6d01690a78e0e2c3f0e144d9ec72b5d25f (diff) | |
ipc-convert-ipcs_idr-to-xarray-update-fix
fix conflict resolution fix
Cc: Andreas Schwab <schwab@suse.de>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Manfred Spraul <manfred@colorfullife.com>
Cc: NeilBrown <neilb@suse.com>
Cc: Peter Oberparleiter <oberpar@linux.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Vasily Averin <vvs@virtuozzo.com>
Cc: Waiman Long <longman@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'include/uapi/asm-generic/unistd.h')
0 files changed, 0 insertions, 0 deletions