diff options
| author | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 | 
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 | 
| commit | ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5 (patch) | |
| tree | e19c18292231202e9cd8d484ee43f46b2c9c9ad1 /net/unix/af_unix.c | |
| parent | 1b961423158caaae49d3900b7c9c37477bbfa9b3 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge tag 'v5.2-rc6' into generic-dma-ops
Linux 5.2-rc6
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 7 | 
1 files changed, 1 insertions, 6 deletions
| diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index e68d7454f2e3..67e87db5877f 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1,13 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later  /*   * NET4:	Implementation of BSD Unix domain sockets.   *   * Authors:	Alan Cox, <alan@lxorguk.ukuu.org.uk>   * - *		This program is free software; you can redistribute it and/or - *		modify it under the terms of the GNU General Public License - *		as published by the Free Software Foundation; either version - *		2 of the License, or (at your option) any later version. - *   * Fixes:   *		Linus Torvalds	:	Assorted bug cures.   *		Niibe Yutaka	:	async I/O support. @@ -49,7 +45,6 @@   *	     				the core infrastructure is doing that   *	     				for all net proto families now (2.5.69+)   * - *   * Known differences from reference BSD that was tested:   *   *	[TO FIX] | 
