diff options
| author | Mike Zeller <mike@mikezeller.net> | 2020-05-14 21:18:31 -0400 |
|---|---|---|
| committer | Mike Zeller <mike@mikezeller.net> | 2020-05-14 21:18:31 -0400 |
| commit | edc4cf1e38c0a846a79dbcf0a489581d57dd70c8 (patch) | |
| tree | c3011bcd9da668bbfe5c9e2e685bb15f335f6479 | |
| parent | 079d21092bf08f7d2b630a79d10a6e5b7e8230ca (diff) | |
| download | illumos-joyent-12675.tar.gz | |
12675 want kthread worker interface [fix mismerge]12675
| -rw-r--r-- | usr/src/uts/common/fs/proc/prsubr.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/usr/src/uts/common/fs/proc/prsubr.c b/usr/src/uts/common/fs/proc/prsubr.c index 44ed9c4de3..08aee63610 100644 --- a/usr/src/uts/common/fs/proc/prsubr.c +++ b/usr/src/uts/common/fs/proc/prsubr.c @@ -21,11 +21,7 @@ /* * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. -<<<<<<< HEAD * Copyright 2019 Joyent, Inc. -======= - * Copyright 2017, Joyent, Inc. ->>>>>>> 91a7ed35601b9dac7c03b16025b401dc9f7a6bbd * Copyright 2020 OmniOS Community Edition (OmniOSce) Association. */ |