diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-06-19 15:18:48 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-06-19 15:18:48 +0200 |
| commit | 2ee692802b8f6c54bd6499addd3d07c2833d84d8 (patch) | |
| tree | 6aa9a7de774804de0d5a944436a380eb99a6ac68 /net/8021q/vlan.c | |
| parent | 0f5a5712ad1e3b8472b1c1459681dadad9277067 (diff) | |
| parent | 1dcff4ae65185e8c0300972f6d8d39d9a9db2bda (diff) | |
| download | talos-op-linux-2ee692802b8f6c54bd6499addd3d07c2833d84d8.tar.gz talos-op-linux-2ee692802b8f6c54bd6499addd3d07c2833d84d8.zip | |
Merge tag 'topic/remove-fbcon-notifiers-2019-06-14-1' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-next
topic/remove-fbcon-notifiers:
- remove fbdev notifier usage for fbcon, as prep work to clean up the fbcon locking
- assorted locking checks in vt/console code
- assorted notifier and cleanups in fbdev and backlight code
One trivial merge conflict fixed.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to 'net/8021q/vlan.c')
| -rw-r--r-- | net/8021q/vlan.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 1f99678751df..54728d2eda18 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * INET 802.1Q VLAN * Ethernet-type device handling. @@ -11,11 +12,6 @@ * Add HW acceleration hooks - David S. Miller <davem@redhat.com>; * Correct all the locking - David S. Miller <davem@redhat.com>; * Use hash table for VLAN groups - David S. Miller <davem@redhat.com> - * - * 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. */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
