Merge tag 'v5.2-rc6' into generic-dma-ops

Linux 5.2-rc6

1 files changed, 1 insertions, 5 deletions

diff --git a/include/linux/skb_array.h b/include/linux/skb_array.h
index 62d9b0a6329f..e2d45b7cb619 100644
--- a/include/linux/skb_array.h
+++ b/include/linux/skb_array.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  *      Definitions for the 'struct skb_array' datastructure.
  *
@@ -6,11 +7,6 @@
  *
  *      Copyright (C) 2016 Red Hat, Inc.
  *
- *      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.
- *
  *      Limited-size FIFO of skbs. Can be used more or less whenever
  *      sk_buff_head can be used, except you need to know the queue size in
  *      advance.