Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 897332,
    "url": "http://patchwork.ozlabs.org/api/patches/897332/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180411182527.29395-1-jeffrey.t.kirsher@intel.com/",
    "project": {
        "id": 46,
        "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api",
        "name": "Intel Wired Ethernet development",
        "link_name": "intel-wired-lan",
        "list_id": "intel-wired-lan.osuosl.org",
        "list_email": "intel-wired-lan@osuosl.org",
        "web_url": "",
        "scm_url": "",
        "webscm_url": "",
        "list_archive_url": "",
        "list_archive_url_format": "",
        "commit_url_format": ""
    },
    "msgid": "<20180411182527.29395-1-jeffrey.t.kirsher@intel.com>",
    "list_archive_url": null,
    "date": "2018-04-11T18:25:27",
    "name": "[v2] intel: Cleanup the copyright/license headers",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": false,
    "hash": "2a7a5772093eb875483cca86ec67eb43484d49a3",
    "submitter": {
        "id": 473,
        "url": "http://patchwork.ozlabs.org/api/people/473/?format=api",
        "name": "Kirsher, Jeffrey T",
        "email": "jeffrey.t.kirsher@intel.com"
    },
    "delegate": {
        "id": 68,
        "url": "http://patchwork.ozlabs.org/api/users/68/?format=api",
        "username": "jtkirshe",
        "first_name": "Jeff",
        "last_name": "Kirsher",
        "email": "jeffrey.t.kirsher@intel.com"
    },
    "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180411182527.29395-1-jeffrey.t.kirsher@intel.com/mbox/",
    "series": [
        {
            "id": 38501,
            "url": "http://patchwork.ozlabs.org/api/series/38501/?format=api",
            "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=38501",
            "date": "2018-04-11T18:25:27",
            "name": "[v2] intel: Cleanup the copyright/license headers",
            "version": 2,
            "mbox": "http://patchwork.ozlabs.org/series/38501/mbox/"
        }
    ],
    "comments": "http://patchwork.ozlabs.org/api/patches/897332/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/897332/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<intel-wired-lan-bounces@osuosl.org>",
        "X-Original-To": [
            "incoming@patchwork.ozlabs.org",
            "intel-wired-lan@lists.osuosl.org"
        ],
        "Delivered-To": [
            "patchwork-incoming@bilbo.ozlabs.org",
            "intel-wired-lan@lists.osuosl.org"
        ],
        "Authentication-Results": [
            "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)",
            "ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=intel.com"
        ],
        "Received": [
            "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 40Lsvq437Sz9s3Z\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 12 Apr 2018 04:27:18 +1000 (AEST)",
            "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id F235787331;\n\tWed, 11 Apr 2018 18:27:16 +0000 (UTC)",
            "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id vvksAwF+Fnq8; Wed, 11 Apr 2018 18:26:56 +0000 (UTC)",
            "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id C286287E0B;\n\tWed, 11 Apr 2018 18:26:56 +0000 (UTC)",
            "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id B99AE1C2061\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 11 Apr 2018 18:24:59 +0000 (UTC)",
            "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id A912A876B0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 11 Apr 2018 18:24:59 +0000 (UTC)",
            "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 1biOo26F+OW9 for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 11 Apr 2018 18:24:44 +0000 (UTC)",
            "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 824BA87515\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 11 Apr 2018 18:24:44 +0000 (UTC)",
            "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t11 Apr 2018 11:24:43 -0700",
            "from jtkirshe-nuc.jf.intel.com ([134.134.177.59])\n\tby orsmga006.jf.intel.com with ESMTP; 11 Apr 2018 11:24:42 -0700"
        ],
        "X-Virus-Scanned": [
            "amavisd-new at osuosl.org",
            "amavisd-new at osuosl.org"
        ],
        "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6",
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.48,437,1517904000\"; d=\"scan'208\";a=\"33546734\"",
        "From": "Jeff Kirsher <jeffrey.t.kirsher@intel.com>",
        "To": "intel-wired-lan@lists.osuosl.org",
        "Date": "Wed, 11 Apr 2018 11:25:27 -0700",
        "Message-Id": "<20180411182527.29395-1-jeffrey.t.kirsher@intel.com>",
        "X-Mailer": "git-send-email 2.14.3",
        "X-Mailman-Approved-At": "Wed, 11 Apr 2018 18:26:53 +0000",
        "Subject": "[Intel-wired-lan] [PATCH v2] intel: Cleanup the copyright/license\n\theaders",
        "X-BeenThere": "intel-wired-lan@osuosl.org",
        "X-Mailman-Version": "2.1.24",
        "Precedence": "list",
        "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>",
        "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>",
        "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>",
        "List-Post": "<mailto:intel-wired-lan@osuosl.org>",
        "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>",
        "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>",
        "Cc": "richardcochran@gmail.com",
        "MIME-Version": "1.0",
        "Content-Type": "text/plain; charset=\"us-ascii\"",
        "Content-Transfer-Encoding": "7bit",
        "Errors-To": "intel-wired-lan-bounces@osuosl.org",
        "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>"
    },
    "content": "After many years of having a ~30 line copyright and license header to our\nsource files, we are finally able to reduce that to one line with the\nadvent of the SPDX identifier.\n\nAlso caught a few files missing the SPDX license identifier, so fixed\nthem up.\n\nSigned-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>\n---\nv2: updated the license & copyright headers for igb_ptp.c,\n    ixgbe_ipsec.c/h based on feedback/permission from the copyright\n    owners of those files.\n\n---\n drivers/net/ethernet/intel/e100.c                  | 28 +-------------------\n drivers/net/ethernet/intel/e1000/Makefile          | 26 -------------------\n drivers/net/ethernet/intel/e1000/e1000.h           | 29 +--------------------\n drivers/net/ethernet/intel/e1000/e1000_ethtool.c   | 23 +----------------\n drivers/net/ethernet/intel/e1000/e1000_hw.c        | 28 +-------------------\n drivers/net/ethernet/intel/e1000/e1000_hw.h        | 28 +-------------------\n drivers/net/ethernet/intel/e1000/e1000_main.c      | 28 +-------------------\n drivers/net/ethernet/intel/e1000/e1000_osdep.h     | 29 +--------------------\n drivers/net/ethernet/intel/e1000/e1000_param.c     | 28 +-------------------\n drivers/net/ethernet/intel/e1000e/80003es2lan.c    | 21 +--------------\n drivers/net/ethernet/intel/e1000e/80003es2lan.h    | 21 +--------------\n drivers/net/ethernet/intel/e1000e/82571.c          | 21 +--------------\n drivers/net/ethernet/intel/e1000e/82571.h          | 21 +--------------\n drivers/net/ethernet/intel/e1000e/Makefile         | 27 +------------------\n drivers/net/ethernet/intel/e1000e/defines.h        | 21 +--------------\n drivers/net/ethernet/intel/e1000e/e1000.h          | 21 +--------------\n drivers/net/ethernet/intel/e1000e/ethtool.c        | 21 +--------------\n drivers/net/ethernet/intel/e1000e/hw.h             | 21 +--------------\n drivers/net/ethernet/intel/e1000e/ich8lan.c        | 21 +--------------\n drivers/net/ethernet/intel/e1000e/ich8lan.h        | 21 +--------------\n drivers/net/ethernet/intel/e1000e/mac.c            | 21 +--------------\n drivers/net/ethernet/intel/e1000e/mac.h            | 21 +--------------\n drivers/net/ethernet/intel/e1000e/manage.c         | 21 +--------------\n drivers/net/ethernet/intel/e1000e/manage.h         | 21 +--------------\n drivers/net/ethernet/intel/e1000e/netdev.c         | 21 +--------------\n drivers/net/ethernet/intel/e1000e/nvm.c            | 21 +--------------\n drivers/net/ethernet/intel/e1000e/nvm.h            | 21 +--------------\n drivers/net/ethernet/intel/e1000e/param.c          | 21 +--------------\n drivers/net/ethernet/intel/e1000e/phy.c            | 21 +--------------\n drivers/net/ethernet/intel/e1000e/phy.h            | 21 +--------------\n drivers/net/ethernet/intel/e1000e/ptp.c            | 21 +--------------\n drivers/net/ethernet/intel/e1000e/regs.h           | 21 +--------------\n drivers/net/ethernet/intel/fm10k/Makefile          | 23 +----------------\n drivers/net/ethernet/intel/fm10k/fm10k.h           | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_common.c    | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_common.h    | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c     | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c   | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c   | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_iov.c       | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_main.c      | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_mbx.c       | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_mbx.h       | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_netdev.c    | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c       | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_pf.c        | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_pf.h        | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_tlv.c       | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_tlv.h       | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_type.h      | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_vf.c        | 20 +--------------\n drivers/net/ethernet/intel/fm10k/fm10k_vf.h        | 20 +--------------\n drivers/net/ethernet/intel/i40e/Makefile           | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e.h             | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_adminq.c      | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_adminq.h      | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h  | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_alloc.h       | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_client.c      | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_client.h      | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_common.c      | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_dcb.c         | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_dcb.h         | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c      | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_debugfs.c     | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_devids.h      | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_diag.c        | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_diag.h        | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c     | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_hmc.c         | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_hmc.h         | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c     | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h     | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_main.c        | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_nvm.c         | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_osdep.h       | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_prototype.h   | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_ptp.c         | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_register.h    | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_status.h      | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_trace.h       | 23 +----------------\n drivers/net/ethernet/intel/i40e/i40e_txrx.c        | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_txrx.h        | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_type.h        | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 26 +------------------\n drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 26 +------------------\n drivers/net/ethernet/intel/i40evf/Makefile         | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40e_adminq.c    | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40e_adminq.h    | 26 +------------------\n .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h    | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40e_alloc.h     | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40e_common.c    | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40e_devids.h    | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40e_hmc.h       | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h   | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40e_osdep.h     | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40e_register.h  | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40e_status.h    | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40e_trace.h     | 23 +----------------\n drivers/net/ethernet/intel/i40evf/i40e_txrx.c      | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40e_txrx.h      | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40e_type.h      | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40evf.h         | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40evf_client.c  |  2 ++\n drivers/net/ethernet/intel/i40evf/i40evf_client.h  |  2 ++\n drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 26 +------------------\n drivers/net/ethernet/intel/i40evf/i40evf_main.c    | 26 +------------------\n .../net/ethernet/intel/i40evf/i40evf_virtchnl.c    | 26 +------------------\n drivers/net/ethernet/intel/igb/Makefile            | 28 +-------------------\n drivers/net/ethernet/intel/igb/e1000_82575.c       | 23 +----------------\n drivers/net/ethernet/intel/igb/e1000_82575.h       | 23 +----------------\n drivers/net/ethernet/intel/igb/e1000_defines.h     | 23 +----------------\n drivers/net/ethernet/intel/igb/e1000_hw.h          | 22 +---------------\n drivers/net/ethernet/intel/igb/e1000_i210.c        | 23 +----------------\n drivers/net/ethernet/intel/igb/e1000_i210.h        | 23 +----------------\n drivers/net/ethernet/intel/igb/e1000_mac.c         | 23 +----------------\n drivers/net/ethernet/intel/igb/e1000_mac.h         | 23 +----------------\n drivers/net/ethernet/intel/igb/e1000_mbx.c         | 23 +----------------\n drivers/net/ethernet/intel/igb/e1000_mbx.h         | 23 +----------------\n drivers/net/ethernet/intel/igb/e1000_nvm.c         | 22 +---------------\n drivers/net/ethernet/intel/igb/e1000_nvm.h         | 23 +----------------\n drivers/net/ethernet/intel/igb/e1000_phy.c         | 23 +----------------\n drivers/net/ethernet/intel/igb/e1000_phy.h         | 23 +----------------\n drivers/net/ethernet/intel/igb/e1000_regs.h        | 23 +----------------\n drivers/net/ethernet/intel/igb/igb.h               | 23 +----------------\n drivers/net/ethernet/intel/igb/igb_ethtool.c       | 23 +----------------\n drivers/net/ethernet/intel/igb/igb_hwmon.c         | 23 +----------------\n drivers/net/ethernet/intel/igb/igb_main.c          | 23 +----------------\n drivers/net/ethernet/intel/igb/igb_ptp.c           | 19 ++------------\n drivers/net/ethernet/intel/igbvf/Makefile          | 28 +-------------------\n drivers/net/ethernet/intel/igbvf/defines.h         | 26 +------------------\n drivers/net/ethernet/intel/igbvf/ethtool.c         | 26 +------------------\n drivers/net/ethernet/intel/igbvf/igbvf.h           | 26 +------------------\n drivers/net/ethernet/intel/igbvf/mbx.c             | 26 +------------------\n drivers/net/ethernet/intel/igbvf/mbx.h             | 26 +------------------\n drivers/net/ethernet/intel/igbvf/netdev.c          | 26 +------------------\n drivers/net/ethernet/intel/igbvf/regs.h            | 26 +------------------\n drivers/net/ethernet/intel/igbvf/vf.c              | 26 +------------------\n drivers/net/ethernet/intel/igbvf/vf.h              | 26 +------------------\n drivers/net/ethernet/intel/ixgb/Makefile           | 27 -------------------\n drivers/net/ethernet/intel/ixgb/ixgb.h             | 28 +-------------------\n drivers/net/ethernet/intel/ixgb/ixgb_ee.c          | 29 ++-------------------\n drivers/net/ethernet/intel/ixgb/ixgb_ee.h          | 28 +-------------------\n drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c     | 29 ++-------------------\n drivers/net/ethernet/intel/ixgb/ixgb_hw.c          | 29 ++-------------------\n drivers/net/ethernet/intel/ixgb/ixgb_hw.h          | 28 +-------------------\n drivers/net/ethernet/intel/ixgb/ixgb_ids.h         | 28 +-------------------\n drivers/net/ethernet/intel/ixgb/ixgb_main.c        | 29 ++-------------------\n drivers/net/ethernet/intel/ixgb/ixgb_osdep.h       | 28 +-------------------\n drivers/net/ethernet/intel/ixgb/ixgb_param.c       | 29 ++-------------------\n drivers/net/ethernet/intel/ixgbe/Makefile          | 29 +--------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe.h           | 28 +-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c     | 28 +-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c     | 28 +-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_common.c    | 28 +-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_common.h    | 28 +-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c       | 30 ++--------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h       | 28 +-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c | 28 +-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h | 28 +-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c | 29 ++-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h | 28 +-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c    | 29 ++-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c   | 28 ++------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   | 29 ++-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c      | 29 ++-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h      | 28 +-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c     | 28 ++------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h     | 27 +------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c       | 29 ++-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      | 29 ++-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c       | 29 ++-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h       | 28 +-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_model.h     | 26 +------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c       | 29 ++-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h       | 28 +-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c       | 28 ++------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c     | 29 ++-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h     | 28 +-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c     | 29 ++-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_type.h      | 28 +-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c      | 29 ++-------------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_x540.h      | 24 +----------------\n drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c      | 26 +++----------------\n drivers/net/ethernet/intel/ixgbevf/Makefile        | 28 +-------------------\n drivers/net/ethernet/intel/ixgbevf/defines.h       | 26 +------------------\n drivers/net/ethernet/intel/ixgbevf/ethtool.c       | 27 ++-----------------\n drivers/net/ethernet/intel/ixgbevf/ixgbevf.h       | 26 +------------------\n drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  | 27 ++-----------------\n drivers/net/ethernet/intel/ixgbevf/mbx.c           | 27 ++-----------------\n drivers/net/ethernet/intel/ixgbevf/mbx.h           | 26 +------------------\n drivers/net/ethernet/intel/ixgbevf/regs.h          | 26 +------------------\n drivers/net/ethernet/intel/ixgbevf/vf.c            | 27 ++-----------------\n drivers/net/ethernet/intel/ixgbevf/vf.h            | 26 +------------------\n 195 files changed, 222 insertions(+), 4624 deletions(-)",
    "diff": "diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c\nindex 41ad56edfb96..27d5f27163d2 100644\n--- a/drivers/net/ethernet/intel/e100.c\n+++ b/drivers/net/ethernet/intel/e100.c\n@@ -1,31 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n-\n-  Intel PRO/100 Linux driver\n-  Copyright(c) 1999 - 2006 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2006 Intel Corporation. */\n \n /*\n  *\te100.c: Intel(R) PRO/100 ethernet driver\ndiff --git a/drivers/net/ethernet/intel/e1000/Makefile b/drivers/net/ethernet/intel/e1000/Makefile\nindex c7caadd3c8af..314c52d44b7c 100644\n--- a/drivers/net/ethernet/intel/e1000/Makefile\n+++ b/drivers/net/ethernet/intel/e1000/Makefile\n@@ -1,31 +1,5 @@\n # SPDX-License-Identifier: GPL-2.0\n-################################################################################\n-#\n-# Intel PRO/1000 Linux driver\n # Copyright(c) 1999 - 2006 Intel Corporation.\n-#\n-# This program is free software; you can redistribute it and/or modify it\n-# under the terms and conditions of the GNU General Public License,\n-# version 2, as published by the Free Software Foundation.\n-#\n-# This program is distributed in the hope it will be useful, but WITHOUT\n-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-# more details.\n-#\n-# You should have received a copy of the GNU General Public License along with\n-# this program; if not, write to the Free Software Foundation, Inc.,\n-# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-#\n-# The full GNU General Public License is included in this distribution in\n-# the file called \"COPYING\".\n-#\n-# Contact Information:\n-# Linux NICS <linux.nics@intel.com>\n-# e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-# Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-#\n-################################################################################\n \n #\n # Makefile for the Intel(R) PRO/1000 ethernet driver\ndiff --git a/drivers/net/ethernet/intel/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h\nindex 3a0feea2df54..c40729b2c184 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000.h\n+++ b/drivers/net/ethernet/intel/e1000/e1000.h\n@@ -1,32 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel PRO/1000 Linux driver\n-  Copyright(c) 1999 - 2006 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n-\n+/* Copyright(c) 1999 - 2006 Intel Corporation. */\n \n /* Linux PRO/1000 Ethernet Driver main header file */\n \ndiff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c\nindex 3e80ca170dd7..5d365a986bb0 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c\n+++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c\n@@ -1,26 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- * Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2006 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 1999 - 2006 Intel Corporation. */\n \n /* ethtool support for e1000 */\n \ndiff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c\nindex 6e7e923d57bf..48428d6a00be 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000_hw.c\n+++ b/drivers/net/ethernet/intel/e1000/e1000_hw.c\n@@ -1,31 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n-*\n-  Intel PRO/1000 Linux driver\n-  Copyright(c) 1999 - 2006 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n- */\n+/* Copyright(c) 1999 - 2006 Intel Corporation. */\n \n /* e1000_hw.c\n  * Shared functions for accessing and configuring the MAC\ndiff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.h b/drivers/net/ethernet/intel/e1000/e1000_hw.h\nindex f09c569ec19b..b57a04954ccf 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000_hw.h\n+++ b/drivers/net/ethernet/intel/e1000/e1000_hw.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel PRO/1000 Linux driver\n-  Copyright(c) 1999 - 2006 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2006 Intel Corporation. */\n \n /* e1000_hw.h\n  * Structures, enums, and macros for the MAC\ndiff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c\nindex d5eb19b86a0a..2110d5f2da19 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000_main.c\n+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c\n@@ -1,31 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n-\n-  Intel PRO/1000 Linux driver\n-  Copyright(c) 1999 - 2006 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2006 Intel Corporation. */\n \n #include \"e1000.h\"\n #include <net/ip6_checksum.h>\ndiff --git a/drivers/net/ethernet/intel/e1000/e1000_osdep.h b/drivers/net/ethernet/intel/e1000/e1000_osdep.h\nindex ae0559b8b011..e966bb290797 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000_osdep.h\n+++ b/drivers/net/ethernet/intel/e1000/e1000_osdep.h\n@@ -1,32 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel PRO/1000 Linux driver\n-  Copyright(c) 1999 - 2006 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n-\n+/* Copyright(c) 1999 - 2006 Intel Corporation. */\n \n /* glue for the OS independent part of e1000\n  * includes register access macros\ndiff --git a/drivers/net/ethernet/intel/e1000/e1000_param.c b/drivers/net/ethernet/intel/e1000/e1000_param.c\nindex 345f23927bcc..d3f29ffe1e47 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000_param.c\n+++ b/drivers/net/ethernet/intel/e1000/e1000_param.c\n@@ -1,31 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n-\n-  Intel PRO/1000 Linux driver\n-  Copyright(c) 1999 - 2006 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2006 Intel Corporation. */\n \n #include \"e1000.h\"\n \ndiff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c\nindex 953e99df420c..257bd59bc9c6 100644\n--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c\n+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c\n@@ -1,24 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n /* 80003ES2LAN Gigabit Ethernet Controller (Copper)\n  * 80003ES2LAN Gigabit Ethernet Controller (Serdes)\ndiff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.h b/drivers/net/ethernet/intel/e1000e/80003es2lan.h\nindex ee6d1256fda4..aa9d639c6cbb 100644\n--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.h\n+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.h\n@@ -1,24 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _E1000E_80003ES2LAN_H_\n #define _E1000E_80003ES2LAN_H_\ndiff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c\nindex 924f2c8dfa6c..b9309302c29e 100644\n--- a/drivers/net/ethernet/intel/e1000e/82571.c\n+++ b/drivers/net/ethernet/intel/e1000e/82571.c\n@@ -1,24 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n /* 82571EB Gigabit Ethernet Controller\n  * 82571EB Gigabit Ethernet Controller (Copper)\ndiff --git a/drivers/net/ethernet/intel/e1000e/82571.h b/drivers/net/ethernet/intel/e1000e/82571.h\nindex 9a24c645f726..834c238d02db 100644\n--- a/drivers/net/ethernet/intel/e1000e/82571.h\n+++ b/drivers/net/ethernet/intel/e1000e/82571.h\n@@ -1,24 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _E1000E_82571_H_\n #define _E1000E_82571_H_\ndiff --git a/drivers/net/ethernet/intel/e1000e/Makefile b/drivers/net/ethernet/intel/e1000e/Makefile\nindex 24e391a4ac68..44e58b6e7660 100644\n--- a/drivers/net/ethernet/intel/e1000e/Makefile\n+++ b/drivers/net/ethernet/intel/e1000e/Makefile\n@@ -1,30 +1,5 @@\n # SPDX-License-Identifier: GPL-2.0\n-################################################################################\n-#\n-# Intel PRO/1000 Linux driver\n-# Copyright(c) 1999 - 2014 Intel Corporation.\n-#\n-# This program is free software; you can redistribute it and/or modify it\n-# under the terms and conditions of the GNU General Public License,\n-# version 2, as published by the Free Software Foundation.\n-#\n-# This program is distributed in the hope it will be useful, but WITHOUT\n-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-# more details.\n-#\n-# You should have received a copy of the GNU General Public License\n-# along with this program; if not, see <http://www.gnu.org/licenses/>.\n-#\n-# The full GNU General Public License is included in this distribution in\n-# the file called \"COPYING\".\n-#\n-# Contact Information:\n-# Linux NICS <linux.nics@intel.com>\n-# e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-# Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-#\n-################################################################################\n+# Copyright(c) 1999 - 2018 Intel Corporation.\n \n #\n # Makefile for the Intel(R) PRO/1000 ethernet driver\ndiff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h\nindex 22883015a695..fd550dee4982 100644\n--- a/drivers/net/ethernet/intel/e1000e/defines.h\n+++ b/drivers/net/ethernet/intel/e1000e/defines.h\n@@ -1,24 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _E1000_DEFINES_H_\n #define _E1000_DEFINES_H_\ndiff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h\nindex da88555ba1fd..c760dc72c520 100644\n--- a/drivers/net/ethernet/intel/e1000e/e1000.h\n+++ b/drivers/net/ethernet/intel/e1000e/e1000.h\n@@ -1,24 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n /* Linux PRO/1000 Ethernet Driver main header file */\n \ndiff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c\nindex 64dc0c11147f..e084cb734eb1 100644\n--- a/drivers/net/ethernet/intel/e1000e/ethtool.c\n+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c\n@@ -1,24 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n /* ethtool support for e1000 */\n \ndiff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h\nindex 21802396bed6..eff75bd8a8f0 100644\n--- a/drivers/net/ethernet/intel/e1000e/hw.h\n+++ b/drivers/net/ethernet/intel/e1000e/hw.h\n@@ -1,24 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _E1000_HW_H_\n #define _E1000_HW_H_\ndiff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c\nindex 1551d6ce5341..cdae0efde8e6 100644\n--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c\n+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c\n@@ -1,24 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n /* 82562G 10/100 Network Connection\n  * 82562G-2 10/100 Network Connection\ndiff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.h b/drivers/net/ethernet/intel/e1000e/ich8lan.h\nindex 3c4f82c21084..eb09c755fa17 100644\n--- a/drivers/net/ethernet/intel/e1000e/ich8lan.h\n+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.h\n@@ -1,24 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _E1000E_ICH8LAN_H_\n #define _E1000E_ICH8LAN_H_\ndiff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c\nindex b293464a9f27..4abd55d646c5 100644\n--- a/drivers/net/ethernet/intel/e1000e/mac.c\n+++ b/drivers/net/ethernet/intel/e1000e/mac.c\n@@ -1,24 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include \"e1000.h\"\n \ndiff --git a/drivers/net/ethernet/intel/e1000e/mac.h b/drivers/net/ethernet/intel/e1000e/mac.h\nindex cb0abf6c76a5..6ab261119801 100644\n--- a/drivers/net/ethernet/intel/e1000e/mac.h\n+++ b/drivers/net/ethernet/intel/e1000e/mac.h\n@@ -1,24 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _E1000E_MAC_H_\n #define _E1000E_MAC_H_\ndiff --git a/drivers/net/ethernet/intel/e1000e/manage.c b/drivers/net/ethernet/intel/e1000e/manage.c\nindex e027660aeb92..c4c9b20bc51f 100644\n--- a/drivers/net/ethernet/intel/e1000e/manage.c\n+++ b/drivers/net/ethernet/intel/e1000e/manage.c\n@@ -1,24 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include \"e1000.h\"\n \ndiff --git a/drivers/net/ethernet/intel/e1000e/manage.h b/drivers/net/ethernet/intel/e1000e/manage.h\nindex 3268f2e58593..d868aad806d4 100644\n--- a/drivers/net/ethernet/intel/e1000e/manage.h\n+++ b/drivers/net/ethernet/intel/e1000e/manage.h\n@@ -1,24 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _E1000E_MANAGE_H_\n #define _E1000E_MANAGE_H_\ndiff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c\nindex ec4a9759a6f2..d3fef7fefea8 100644\n--- a/drivers/net/ethernet/intel/e1000e/netdev.c\n+++ b/drivers/net/ethernet/intel/e1000e/netdev.c\n@@ -1,24 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #define pr_fmt(fmt) KBUILD_MODNAME \": \" fmt\n \ndiff --git a/drivers/net/ethernet/intel/e1000e/nvm.c b/drivers/net/ethernet/intel/e1000e/nvm.c\nindex 68949bb41b7b..937f9af22d26 100644\n--- a/drivers/net/ethernet/intel/e1000e/nvm.c\n+++ b/drivers/net/ethernet/intel/e1000e/nvm.c\n@@ -1,24 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include \"e1000.h\"\n \ndiff --git a/drivers/net/ethernet/intel/e1000e/nvm.h b/drivers/net/ethernet/intel/e1000e/nvm.h\nindex 8e082028be7d..6a30dfea4117 100644\n--- a/drivers/net/ethernet/intel/e1000e/nvm.h\n+++ b/drivers/net/ethernet/intel/e1000e/nvm.h\n@@ -1,24 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _E1000E_NVM_H_\n #define _E1000E_NVM_H_\ndiff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c\nindex 2def33eba9e6..098369fd3e65 100644\n--- a/drivers/net/ethernet/intel/e1000e/param.c\n+++ b/drivers/net/ethernet/intel/e1000e/param.c\n@@ -1,24 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include <linux/netdevice.h>\n #include <linux/module.h>\ndiff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c\nindex b8226ed0e338..42233019255a 100644\n--- a/drivers/net/ethernet/intel/e1000e/phy.c\n+++ b/drivers/net/ethernet/intel/e1000e/phy.c\n@@ -1,24 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include \"e1000.h\"\n \ndiff --git a/drivers/net/ethernet/intel/e1000e/phy.h b/drivers/net/ethernet/intel/e1000e/phy.h\nindex d4180b5e9196..c48777d09523 100644\n--- a/drivers/net/ethernet/intel/e1000e/phy.h\n+++ b/drivers/net/ethernet/intel/e1000e/phy.h\n@@ -1,24 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _E1000E_PHY_H_\n #define _E1000E_PHY_H_\ndiff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c\nindex f941e5085f44..37c76945ad9b 100644\n--- a/drivers/net/ethernet/intel/e1000e/ptp.c\n+++ b/drivers/net/ethernet/intel/e1000e/ptp.c\n@@ -1,24 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n /* PTP 1588 Hardware Clock (PHC)\n  * Derived from PTP Hardware Clock driver for Intel 82576 and 82580 (igb)\ndiff --git a/drivers/net/ethernet/intel/e1000e/regs.h b/drivers/net/ethernet/intel/e1000e/regs.h\nindex 16afc3c2a986..47f5ca793970 100644\n--- a/drivers/net/ethernet/intel/e1000e/regs.h\n+++ b/drivers/net/ethernet/intel/e1000e/regs.h\n@@ -1,24 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel PRO/1000 Linux driver\n- * Copyright(c) 1999 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _E1000E_REGS_H_\n #define _E1000E_REGS_H_\ndiff --git a/drivers/net/ethernet/intel/fm10k/Makefile b/drivers/net/ethernet/intel/fm10k/Makefile\nindex 93277cb99cb7..26a9746ccb14 100644\n--- a/drivers/net/ethernet/intel/fm10k/Makefile\n+++ b/drivers/net/ethernet/intel/fm10k/Makefile\n@@ -1,26 +1,5 @@\n # SPDX-License-Identifier: GPL-2.0\n-################################################################################\n-#\n-# Intel(R) Ethernet Switch Host Interface Driver\n-# Copyright(c) 2013 - 2016 Intel Corporation.\n-#\n-# This program is free software; you can redistribute it and/or modify it\n-# under the terms and conditions of the GNU General Public License,\n-# version 2, as published by the Free Software Foundation.\n-#\n-# This program is distributed in the hope it will be useful, but WITHOUT\n-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-# more details.\n-#\n-# The full GNU General Public License is included in this distribution in\n-# the file called \"COPYING\".\n-#\n-# Contact Information:\n-# e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-# Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-#\n-################################################################################\n+# Copyright(c) 2013 - 2018 Intel Corporation.\n \n #\n # Makefile for the Intel(R) Ethernet Switch Host Interface Driver\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h\nindex a9cdf763c59d..a903a0ba45e1 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h\n@@ -1,23 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2017 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _FM10K_H_\n #define _FM10K_H_\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_common.c b/drivers/net/ethernet/intel/fm10k/fm10k_common.c\nindex e303d88720ef..f51a63fca513 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_common.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_common.c\n@@ -1,23 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2018 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"fm10k_common.h\"\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_common.h b/drivers/net/ethernet/intel/fm10k/fm10k_common.h\nindex 2bdb24d2ca9d..4c48fb73b3e7 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_common.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_common.h\n@@ -1,23 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _FM10K_COMMON_H_\n #define _FM10K_COMMON_H_\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c b/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c\nindex c4f733452ef2..20768ac7f17e 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c\n@@ -1,23 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"fm10k.h\"\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c b/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c\nindex 43e8d839831f..dca104121c05 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c\n@@ -1,23 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"fm10k.h\"\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\nindex 28b6b4e56487..eeac2b75a195 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n@@ -1,23 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2017 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include <linux/vmalloc.h>\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c\nindex 30395f5e5e87..e707d717012f 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c\n@@ -1,23 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2017 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"fm10k.h\"\n #include \"fm10k_vf.h\"\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\nindex c51d61f5f715..3f536541f45f 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n@@ -1,23 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2017 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include <linux/types.h>\n #include <linux/module.h>\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c b/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c\nindex c01bf30a0c9e..21021fe4f1c3 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c\n@@ -1,23 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2017 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"fm10k_common.h\"\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_mbx.h b/drivers/net/ethernet/intel/fm10k/fm10k_mbx.h\nindex 007e1dfa9b7a..56d1abff04e2 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_mbx.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_mbx.h\n@@ -1,23 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _FM10K_MBX_H_\n #define _FM10K_MBX_H_\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\nindex 26e749766337..c879af72bbf5 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n@@ -1,23 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2018 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"fm10k.h\"\n #include <linux/vmalloc.h>\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex cffcb187cb76..9d36e22440c8 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -1,23 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2018 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include <linux/module.h>\n #include <linux/interrupt.h>\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\nindex 7ba54c534f8c..8f0a99b6a537 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\n@@ -1,23 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2018 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"fm10k_pf.h\"\n #include \"fm10k_vf.h\"\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.h b/drivers/net/ethernet/intel/fm10k/fm10k_pf.h\nindex ae81f9a16602..8e814df709d2 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.h\n@@ -1,23 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2017 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _FM10K_PF_H_\n #define _FM10K_PF_H_\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c b/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c\nindex 725ecb7abccd..2a7a40bf2b1c 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c\n@@ -1,23 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2018 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"fm10k_tlv.h\"\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_tlv.h b/drivers/net/ethernet/intel/fm10k/fm10k_tlv.h\nindex 5d2ee759507e..160bc5b78f99 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_tlv.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_tlv.h\n@@ -1,23 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _FM10K_TLV_H_\n #define _FM10K_TLV_H_\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_type.h b/drivers/net/ethernet/intel/fm10k/fm10k_type.h\nindex dd23af11e2c1..3e608e493f9d 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_type.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_type.h\n@@ -1,23 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _FM10K_TYPE_H_\n #define _FM10K_TYPE_H_\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_vf.c b/drivers/net/ethernet/intel/fm10k/fm10k_vf.c\nindex f06913630b39..a8519c1f0406 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_vf.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_vf.c\n@@ -1,23 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"fm10k_vf.h\"\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_vf.h b/drivers/net/ethernet/intel/fm10k/fm10k_vf.h\nindex 66a66b73a2f1..787d0d570a28 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_vf.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_vf.h\n@@ -1,23 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _FM10K_VF_H_\n #define _FM10K_VF_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/Makefile b/drivers/net/ethernet/intel/i40e/Makefile\nindex 75437768a07c..14397e7e9925 100644\n--- a/drivers/net/ethernet/intel/i40e/Makefile\n+++ b/drivers/net/ethernet/intel/i40e/Makefile\n@@ -1,29 +1,5 @@\n # SPDX-License-Identifier: GPL-2.0\n-################################################################################\n-#\n-# Intel Ethernet Controller XL710 Family Linux Driver\n-# Copyright(c) 2013 - 2015 Intel Corporation.\n-#\n-# This program is free software; you can redistribute it and/or modify it\n-# under the terms and conditions of the GNU General Public License,\n-# version 2, as published by the Free Software Foundation.\n-#\n-# This program is distributed in the hope it will be useful, but WITHOUT\n-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-# more details.\n-#\n-# You should have received a copy of the GNU General Public License along\n-# with this program.  If not, see <http://www.gnu.org/licenses/>.\n-#\n-# The full GNU General Public License is included in this distribution in\n-# the file called \"COPYING\".\n-#\n-# Contact Information:\n-# e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-# Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-#\n-################################################################################\n+# Copyright(c) 2013 - 2018 Intel Corporation.\n \n #\n # Makefile for the Intel(R) Ethernet Connection XL710 (i40e.ko) driver\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex a44139c1de80..f573108faec3 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2017 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_H_\n #define _I40E_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c\nindex 843fc7781ef8..ddbea79d18e5 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"i40e_status.h\"\n #include \"i40e_type.h\"\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.h b/drivers/net/ethernet/intel/i40e/i40e_adminq.h\nindex 0a8749ee9fd3..edec3df78971 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_ADMINQ_H_\n #define _I40E_ADMINQ_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h\nindex 0244923edeb8..7d888e05f96f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2017 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_ADMINQ_CMD_H_\n #define _I40E_ADMINQ_CMD_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_alloc.h b/drivers/net/ethernet/intel/i40e/i40e_alloc.h\nindex abed0c52e782..cb8689222c8b 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_alloc.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_alloc.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_ALLOC_H_\n #define _I40E_ALLOC_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_client.c b/drivers/net/ethernet/intel/i40e/i40e_client.c\nindex d8ce4999864f..2041757f948c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_client.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_client.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2017 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include <linux/list.h>\n #include <linux/errno.h>\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_client.h b/drivers/net/ethernet/intel/i40e/i40e_client.h\nindex 9d464d40bc17..72994baf4941 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_client.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_client.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_CLIENT_H_\n #define _I40E_CLIENT_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c\nindex c0a3dae8a2db..6f8fd70d606a 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_common.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"i40e_type.h\"\n #include \"i40e_adminq.h\"\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.c b/drivers/net/ethernet/intel/i40e/i40e_dcb.c\nindex 9fec728dc4b9..69e7d4967b1c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_dcb.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2017 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"i40e_adminq.h\"\n #include \"i40e_prototype.h\"\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.h b/drivers/net/ethernet/intel/i40e/i40e_dcb.h\nindex 4f806386cb22..2b748a60a843 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_dcb.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_DCB_H_\n #define _I40E_DCB_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c b/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c\nindex 502818e3da78..a09d723d5ca0 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifdef CONFIG_I40E_DCB\n #include \"i40e.h\"\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\nindex d494dcaf18d0..94774a2a511f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifdef CONFIG_DEBUG_FS\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_devids.h b/drivers/net/ethernet/intel/i40e/i40e_devids.h\nindex ad6a66ccb576..334b05ff685a 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_devids.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_devids.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_DEVIDS_H_\n #define _I40E_DEVIDS_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_diag.c b/drivers/net/ethernet/intel/i40e/i40e_diag.c\nindex df3e60470f8b..ef4d3762bf37 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_diag.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_diag.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"i40e_diag.h\"\n #include \"i40e_prototype.h\"\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_diag.h b/drivers/net/ethernet/intel/i40e/i40e_diag.h\nindex be8341763475..c3340f320a18 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_diag.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_diag.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_DIAG_H_\n #define _I40E_DIAG_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex b974482ff630..94dbe2c419ca 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n /* ethtool support for i40e */\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_hmc.c b/drivers/net/ethernet/intel/i40e/i40e_hmc.c\nindex 6d4b590f851b..e40f3b59e42b 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_hmc.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_hmc.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"i40e_osdep.h\"\n #include \"i40e_register.h\"\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_hmc.h b/drivers/net/ethernet/intel/i40e/i40e_hmc.h\nindex 7b5fd33d70ae..1c78de838857 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_hmc.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_hmc.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_HMC_H_\n #define _I40E_HMC_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c\nindex cd40dc487b38..994011c38fb4 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"i40e_osdep.h\"\n #include \"i40e_register.h\"\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h\nindex 79e1396735d9..c46a2c449e60 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_LAN_HMC_H_\n #define _I40E_LAN_HMC_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 16229998fb1e..41bad112a907 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2017 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include <linux/etherdevice.h>\n #include <linux/of_net.h>\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\nindex ba9687c03795..51554df9cb9a 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"i40e_prototype.h\"\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_osdep.h b/drivers/net/ethernet/intel/i40e/i40e_osdep.h\nindex 9c3c3b0d3ac4..a07574bff550 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_osdep.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_osdep.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_OSDEP_H_\n #define _I40E_OSDEP_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h\nindex 2ec24188d6e2..3170655cdeb9 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_PROTOTYPE_H_\n #define _I40E_PROTOTYPE_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c\nindex 5b47dd1f75a5..47d10ad39c18 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"i40e.h\"\n #include <linux/ptp_classify.h>\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_register.h b/drivers/net/ethernet/intel/i40e/i40e_register.h\nindex b3e206e49cc2..52e3680c57f8 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_register.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_register.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_REGISTER_H_\n #define _I40E_REGISTER_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_status.h b/drivers/net/ethernet/intel/i40e/i40e_status.h\nindex 10c86f63dc52..77be0702d07c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_status.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_status.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_STATUS_H_\n #define _I40E_STATUS_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_trace.h b/drivers/net/ethernet/intel/i40e/i40e_trace.h\nindex 410ba13bcf21..424f02077e2e 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_trace.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_trace.h\n@@ -1,26 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel(R) 40-10 Gigabit Ethernet Connection Network Driver\n- * Copyright(c) 2013 - 2017 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n /* Modeled on trace-events-sample.h */\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex f174c72480ab..d2766eab24d2 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include <linux/prefetch.h>\n #include <net/busy_poll.h>\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h\nindex 3043483ec426..b884b816684d 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_TXRX_H_\n #define _I40E_TXRX_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h\nindex bfb80092b352..40968a4216a7 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_TYPE_H_\n #define _I40E_TYPE_H_\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\nindex 35173cbe80f7..3e7ab9fbeb0c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"i40e.h\"\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\nindex 57f727bb9e36..bf67d62e2b5f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Driver\n- * Copyright(c) 2013 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_VIRTCHNL_PF_H_\n #define _I40E_VIRTCHNL_PF_H_\ndiff --git a/drivers/net/ethernet/intel/i40evf/Makefile b/drivers/net/ethernet/intel/i40evf/Makefile\nindex 1e89c5487676..3c5c6e962280 100644\n--- a/drivers/net/ethernet/intel/i40evf/Makefile\n+++ b/drivers/net/ethernet/intel/i40evf/Makefile\n@@ -1,29 +1,5 @@\n # SPDX-License-Identifier: GPL-2.0\n-################################################################################\n-#\n-# Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n-# Copyright(c) 2013 - 2014 Intel Corporation.\n-#\n-# This program is free software; you can redistribute it and/or modify it\n-# under the terms and conditions of the GNU General Public License,\n-# version 2, as published by the Free Software Foundation.\n-#\n-# This program is distributed in the hope it will be useful, but WITHOUT\n-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-# more details.\n-#\n-# You should have received a copy of the GNU General Public License along\n-# with this program.  If not, see <http://www.gnu.org/licenses/>.\n-#\n-# The full GNU General Public License is included in this distribution in\n-# the file called \"COPYING\".\n-#\n-# Contact Information:\n-# e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-# Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-#\n-################################################################################\n+# Copyright(c) 2013 - 2018 Intel Corporation.\n \n #\n ## Makefile for the Intel(R) 40GbE VF driver\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_adminq.c b/drivers/net/ethernet/intel/i40evf/i40e_adminq.c\nindex 6fd677efa9da..c355120dfdfd 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_adminq.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_adminq.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"i40e_status.h\"\n #include \"i40e_type.h\"\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_adminq.h b/drivers/net/ethernet/intel/i40evf/i40e_adminq.h\nindex a7137c165256..1f264b9b6805 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_adminq.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_adminq.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_ADMINQ_H_\n #define _I40E_ADMINQ_H_\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h\nindex 439e71882049..aa81e87cd471 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2017 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_ADMINQ_CMD_H_\n #define _I40E_ADMINQ_CMD_H_\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_alloc.h b/drivers/net/ethernet/intel/i40evf/i40e_alloc.h\nindex 7e0fddd8af36..cb8689222c8b 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_alloc.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_alloc.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_ALLOC_H_\n #define _I40E_ALLOC_H_\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_common.c b/drivers/net/ethernet/intel/i40evf/i40e_common.c\nindex 67140cdbcd7a..0841b2d1ca6d 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_common.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_common.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"i40e_type.h\"\n #include \"i40e_adminq.h\"\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_devids.h b/drivers/net/ethernet/intel/i40evf/i40e_devids.h\nindex 352dd3f3eb6a..f300bf271824 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_devids.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_devids.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_DEVIDS_H_\n #define _I40E_DEVIDS_H_\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_hmc.h b/drivers/net/ethernet/intel/i40evf/i40e_hmc.h\nindex 7432596164f4..1c78de838857 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_hmc.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_hmc.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_HMC_H_\n #define _I40E_HMC_H_\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h b/drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h\nindex ddac0e4908d3..82b00f70a632 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_LAN_HMC_H_\n #define _I40E_LAN_HMC_H_\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_osdep.h b/drivers/net/ethernet/intel/i40evf/i40e_osdep.h\nindex 8668ad6c1a65..3ddddb46455b 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_osdep.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_osdep.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_OSDEP_H_\n #define _I40E_OSDEP_H_\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_prototype.h b/drivers/net/ethernet/intel/i40evf/i40e_prototype.h\nindex 72501bd0f1a9..a358f4b9d5aa 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_prototype.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_prototype.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_PROTOTYPE_H_\n #define _I40E_PROTOTYPE_H_\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_register.h b/drivers/net/ethernet/intel/i40evf/i40e_register.h\nindex c9c935659758..49e1f57d99cc 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_register.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_register.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_REGISTER_H_\n #define _I40E_REGISTER_H_\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_status.h b/drivers/net/ethernet/intel/i40evf/i40e_status.h\nindex 0d7993ecb99a..77be0702d07c 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_status.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_status.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_STATUS_H_\n #define _I40E_STATUS_H_\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_trace.h b/drivers/net/ethernet/intel/i40evf/i40e_trace.h\nindex ece01dd12a3c..d7a4e68820a8 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_trace.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_trace.h\n@@ -1,26 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel(R) 40-10 Gigabit Ethernet Virtual Function Driver\n- * Copyright(c) 2013 - 2017 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n /* Modeled on trace-events-sample.h */\n \ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\nindex 12bd937861e7..87101f565be1 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include <linux/prefetch.h>\n #include <net/busy_poll.h>\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\nindex 5790897eae2e..3b5a63b3236e 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_TXRX_H_\n #define _I40E_TXRX_H_\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h\nindex 449de4b0058e..c77cb9f672d8 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40E_TYPE_H_\n #define _I40E_TYPE_H_\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf.h b/drivers/net/ethernet/intel/i40evf/i40evf.h\nindex 3a7a1e77bf39..98b834932dd3 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #ifndef _I40EVF_H_\n #define _I40EVF_H_\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_client.c b/drivers/net/ethernet/intel/i40evf/i40evf_client.c\nindex da60ce12b33d..a30d093a52d6 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_client.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_client.c\n@@ -1,4 +1,6 @@\n // SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n+\n #include <linux/list.h>\n #include <linux/errno.h>\n \ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_client.h b/drivers/net/ethernet/intel/i40evf/i40evf_client.h\nindex 15a10da5bd4a..fc6592c3de9c 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_client.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_client.h\n@@ -1,4 +1,6 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n+\n #ifndef _I40E_CLIENT_H_\n #define _I40E_CLIENT_H_\n \ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\nindex dc4cde274fb8..404595efea78 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n /* ethtool support for i40evf */\n #include \"i40evf.h\"\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\nindex 2f43b6f3f325..8f775a82e2fa 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"i40evf.h\"\n #include \"i40e_prototype.h\"\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c\nindex 26a59890532f..8bcefb7f7ac0 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n- *\n- * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include \"i40evf.h\"\n #include \"i40e_prototype.h\"\ndiff --git a/drivers/net/ethernet/intel/igb/Makefile b/drivers/net/ethernet/intel/igb/Makefile\nindex c48583e98ac1..394c1e0656b9 100644\n--- a/drivers/net/ethernet/intel/igb/Makefile\n+++ b/drivers/net/ethernet/intel/igb/Makefile\n@@ -1,31 +1,5 @@\n # SPDX-License-Identifier: GPL-2.0\n-################################################################################\n-#\n-# Intel 82575 PCI-Express Ethernet Linux driver\n-# Copyright(c) 1999 - 2014 Intel Corporation.\n-#\n-# This program is free software; you can redistribute it and/or modify it\n-# under the terms and conditions of the GNU General Public License,\n-# version 2, as published by the Free Software Foundation.\n-#\n-# This program is distributed in the hope it will be useful, but WITHOUT\n-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-# more details.\n-#\n-# You should have received a copy of the GNU General Public License along with\n-# this program; if not, see <http://www.gnu.org/licenses/>.\n-#\n-# The full GNU General Public License is included in this distribution in\n-# the file called \"COPYING\".\n-#\n-# Contact Information:\n-# Linux NICS <linux.nics@intel.com>\n-# e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-# Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-#\n-################################################################################\n-\n+# Copyright(c) 1999 - 2018 Intel Corporation.\n #\n # Makefile for the Intel(R) 82575 PCI-Express ethernet driver\n #\ndiff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c\nindex dd9b6cac220d..b13b42e5a1d9 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_82575.c\n+++ b/drivers/net/ethernet/intel/igb/e1000_82575.c\n@@ -1,26 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n /* e1000_82575\n  * e1000_82576\ndiff --git a/drivers/net/ethernet/intel/igb/e1000_82575.h b/drivers/net/ethernet/intel/igb/e1000_82575.h\nindex e53ebe97d709..6ad775b1a4c5 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_82575.h\n+++ b/drivers/net/ethernet/intel/igb/e1000_82575.h\n@@ -1,26 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #ifndef _E1000_82575_H_\n #define _E1000_82575_H_\ndiff --git a/drivers/net/ethernet/intel/igb/e1000_defines.h b/drivers/net/ethernet/intel/igb/e1000_defines.h\nindex d3d1d868e7ba..252440a418dc 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_defines.h\n+++ b/drivers/net/ethernet/intel/igb/e1000_defines.h\n@@ -1,26 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #ifndef _E1000_DEFINES_H_\n #define _E1000_DEFINES_H_\ndiff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h\nindex ff835e1e853d..5d87957b2627 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_hw.h\n+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h\n@@ -1,25 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #ifndef _E1000_HW_H_\n #define _E1000_HW_H_\ndiff --git a/drivers/net/ethernet/intel/igb/e1000_i210.c b/drivers/net/ethernet/intel/igb/e1000_i210.c\nindex 6f548247e6d8..c54ebedca6da 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_i210.c\n+++ b/drivers/net/ethernet/intel/igb/e1000_i210.c\n@@ -1,26 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n /* e1000_i210\n  * e1000_i211\ndiff --git a/drivers/net/ethernet/intel/igb/e1000_i210.h b/drivers/net/ethernet/intel/igb/e1000_i210.h\nindex 56f015ccb206..5c437fdc49ee 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_i210.h\n+++ b/drivers/net/ethernet/intel/igb/e1000_i210.h\n@@ -1,26 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #ifndef _E1000_I210_H_\n #define _E1000_I210_H_\ndiff --git a/drivers/net/ethernet/intel/igb/e1000_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c\nindex 298afa0d9159..79ee0a747260 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_mac.c\n+++ b/drivers/net/ethernet/intel/igb/e1000_mac.c\n@@ -1,26 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #include <linux/if_ether.h>\n #include <linux/delay.h>\ndiff --git a/drivers/net/ethernet/intel/igb/e1000_mac.h b/drivers/net/ethernet/intel/igb/e1000_mac.h\nindex 04d80c765aee..6e110f28f922 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_mac.h\n+++ b/drivers/net/ethernet/intel/igb/e1000_mac.h\n@@ -1,26 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #ifndef _E1000_MAC_H_\n #define _E1000_MAC_H_\ndiff --git a/drivers/net/ethernet/intel/igb/e1000_mbx.c b/drivers/net/ethernet/intel/igb/e1000_mbx.c\nindex ef42f1689b3b..46debd991bfe 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_mbx.c\n+++ b/drivers/net/ethernet/intel/igb/e1000_mbx.c\n@@ -1,26 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #include \"e1000_mbx.h\"\n \ndiff --git a/drivers/net/ethernet/intel/igb/e1000_mbx.h b/drivers/net/ethernet/intel/igb/e1000_mbx.h\nindex 4f0ecd28354d..178e60ec71d4 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_mbx.h\n+++ b/drivers/net/ethernet/intel/igb/e1000_mbx.h\n@@ -1,26 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #ifndef _E1000_MBX_H_\n #define _E1000_MBX_H_\ndiff --git a/drivers/net/ethernet/intel/igb/e1000_nvm.c b/drivers/net/ethernet/intel/igb/e1000_nvm.c\nindex e4596f151cd4..09f4dcb09632 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_nvm.c\n+++ b/drivers/net/ethernet/intel/igb/e1000_nvm.c\n@@ -1,25 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #include <linux/if_ether.h>\n #include <linux/delay.h>\ndiff --git a/drivers/net/ethernet/intel/igb/e1000_nvm.h b/drivers/net/ethernet/intel/igb/e1000_nvm.h\nindex dde68cd54a53..091cddf4ada8 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_nvm.h\n+++ b/drivers/net/ethernet/intel/igb/e1000_nvm.h\n@@ -1,26 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #ifndef _E1000_NVM_H_\n #define _E1000_NVM_H_\ndiff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c\nindex 4ec61243da82..2be0e762ec69 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_phy.c\n+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c\n@@ -1,26 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2015 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #include <linux/if_ether.h>\n #include <linux/delay.h>\ndiff --git a/drivers/net/ethernet/intel/igb/e1000_phy.h b/drivers/net/ethernet/intel/igb/e1000_phy.h\nindex 856d2cda0643..5894e4b1d0a8 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_phy.h\n+++ b/drivers/net/ethernet/intel/igb/e1000_phy.h\n@@ -1,26 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #ifndef _E1000_PHY_H_\n #define _E1000_PHY_H_\ndiff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h\nindex e8fa8c6530e0..0ad737d2f289 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_regs.h\n+++ b/drivers/net/ethernet/intel/igb/e1000_regs.h\n@@ -1,26 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #ifndef _E1000_REGS_H_\n #define _E1000_REGS_H_\ndiff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h\nindex a413284fada6..e0833d6c08a1 100644\n--- a/drivers/net/ethernet/intel/igb/igb.h\n+++ b/drivers/net/ethernet/intel/igb/igb.h\n@@ -1,26 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n /* Linux PRO/1000 Ethernet Driver main header file */\n \ndiff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c\nindex 6697c273ab59..2d798499d35e 100644\n--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c\n+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c\n@@ -1,26 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n /* ethtool support for igb */\n \ndiff --git a/drivers/net/ethernet/intel/igb/igb_hwmon.c b/drivers/net/ethernet/intel/igb/igb_hwmon.c\nindex bebe43b3a836..3b83747b2700 100644\n--- a/drivers/net/ethernet/intel/igb/igb_hwmon.c\n+++ b/drivers/net/ethernet/intel/igb/igb_hwmon.c\n@@ -1,26 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #include \"igb.h\"\n #include \"e1000_82575.h\"\ndiff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c\nindex cb73fbe3c642..823f42374503 100644\n--- a/drivers/net/ethernet/intel/igb/igb_main.c\n+++ b/drivers/net/ethernet/intel/igb/igb_main.c\n@@ -1,26 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/* Intel(R) Gigabit Ethernet Linux driver\n- * Copyright(c) 2007-2014 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- */\n+/* Copyright(c) 2007 - 2018 Intel Corporation. */\n \n #define pr_fmt(fmt) KBUILD_MODNAME \": \" fmt\n \ndiff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c\nindex 7454b9895a65..9f4d700e09df 100644\n--- a/drivers/net/ethernet/intel/igb/igb_ptp.c\n+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c\n@@ -1,21 +1,6 @@\n // SPDX-License-Identifier: GPL-2.0+\n-/* PTP Hardware Clock (PHC) driver for the Intel 82576 and 82580\n- *\n- * Copyright (C) 2011 Richard Cochran <richardcochran@gmail.com>\n- *\n- * This program is free software; you can redistribute it and/or modify\n- * it under the terms of the GNU General Public License as published by\n- * the Free Software Foundation; either version 2 of the License, or\n- * (at your option) any later version.\n- *\n- * This program is distributed in the hope that it will be useful,\n- * but WITHOUT ANY WARRANTY; without even the implied warranty of\n- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n- * GNU General Public License for more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program; if not, see <http://www.gnu.org/licenses/>.\n- */\n+/* Copyright (C) 2011 Richard Cochran <richardcochran@gmail.com> */\n+\n #include <linux/module.h>\n #include <linux/device.h>\n #include <linux/pci.h>\ndiff --git a/drivers/net/ethernet/intel/igbvf/Makefile b/drivers/net/ethernet/intel/igbvf/Makefile\nindex efe29dae384a..afd3e36eae75 100644\n--- a/drivers/net/ethernet/intel/igbvf/Makefile\n+++ b/drivers/net/ethernet/intel/igbvf/Makefile\n@@ -1,31 +1,5 @@\n # SPDX-License-Identifier: GPL-2.0\n-################################################################################\n-#\n-# Intel(R) 82576 Virtual Function Linux driver\n-# Copyright(c) 2009 - 2012 Intel Corporation.\n-#\n-# This program is free software; you can redistribute it and/or modify it\n-# under the terms and conditions of the GNU General Public License,\n-# version 2, as published by the Free Software Foundation.\n-#\n-# This program is distributed in the hope it will be useful, but WITHOUT\n-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-# more details.\n-#\n-# You should have received a copy of the GNU General Public License along with\n-# this program; if not, write to the Free Software Foundation, Inc.,\n-# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-#\n-# The full GNU General Public License is included in this distribution in\n-# the file called \"COPYING\".\n-#\n-# Contact Information:\n-# e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-# Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-#\n-################################################################################\n-\n+# Copyright(c) 2009 - 2018 Intel Corporation.\n #\n # Makefile for the Intel(R) 82576 VF ethernet driver\n #\ndiff --git a/drivers/net/ethernet/intel/igbvf/defines.h b/drivers/net/ethernet/intel/igbvf/defines.h\nindex 04bcfec0641b..4437f832412d 100644\n--- a/drivers/net/ethernet/intel/igbvf/defines.h\n+++ b/drivers/net/ethernet/intel/igbvf/defines.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel(R) 82576 Virtual Function Linux driver\n-  Copyright(c) 1999 - 2012 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _E1000_DEFINES_H_\n #define _E1000_DEFINES_H_\ndiff --git a/drivers/net/ethernet/intel/igbvf/ethtool.c b/drivers/net/ethernet/intel/igbvf/ethtool.c\nindex ca39e3cccaeb..3ae358b35227 100644\n--- a/drivers/net/ethernet/intel/igbvf/ethtool.c\n+++ b/drivers/net/ethernet/intel/igbvf/ethtool.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n-\n-  Intel(R) 82576 Virtual Function Linux driver\n-  Copyright(c) 2009 - 2012 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 2009 - 2018 Intel Corporation. */\n \n /* ethtool support for igbvf */\n \ndiff --git a/drivers/net/ethernet/intel/igbvf/igbvf.h b/drivers/net/ethernet/intel/igbvf/igbvf.h\nindex f5bf248e22eb..eee26a3be90b 100644\n--- a/drivers/net/ethernet/intel/igbvf/igbvf.h\n+++ b/drivers/net/ethernet/intel/igbvf/igbvf.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel(R) 82576 Virtual Function Linux driver\n-  Copyright(c) 2009 - 2012 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 2009 - 2018 Intel Corporation. */\n \n /* Linux PRO/1000 Ethernet Driver main header file */\n \ndiff --git a/drivers/net/ethernet/intel/igbvf/mbx.c b/drivers/net/ethernet/intel/igbvf/mbx.c\nindex 9195884096f8..163e5838f7c2 100644\n--- a/drivers/net/ethernet/intel/igbvf/mbx.c\n+++ b/drivers/net/ethernet/intel/igbvf/mbx.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n-\n-  Intel(R) 82576 Virtual Function Linux driver\n-  Copyright(c) 2009 - 2012 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 2009 - 2018 Intel Corporation. */\n \n #include \"mbx.h\"\n \ndiff --git a/drivers/net/ethernet/intel/igbvf/mbx.h b/drivers/net/ethernet/intel/igbvf/mbx.h\nindex 479b062fe9ee..e5b31818d565 100644\n--- a/drivers/net/ethernet/intel/igbvf/mbx.h\n+++ b/drivers/net/ethernet/intel/igbvf/mbx.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel(R) 82576 Virtual Function Linux driver\n-  Copyright(c) 1999 - 2012 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _E1000_MBX_H_\n #define _E1000_MBX_H_\ndiff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c\nindex e2b7502f1953..f818f060e5a7 100644\n--- a/drivers/net/ethernet/intel/igbvf/netdev.c\n+++ b/drivers/net/ethernet/intel/igbvf/netdev.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n-\n-  Intel(R) 82576 Virtual Function Linux driver\n-  Copyright(c) 2009 - 2012 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 2009 - 2018 Intel Corporation. */\n \n #define pr_fmt(fmt) KBUILD_MODNAME \": \" fmt\n \ndiff --git a/drivers/net/ethernet/intel/igbvf/regs.h b/drivers/net/ethernet/intel/igbvf/regs.h\nindex 614e52409f11..625a309a3355 100644\n--- a/drivers/net/ethernet/intel/igbvf/regs.h\n+++ b/drivers/net/ethernet/intel/igbvf/regs.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel(R) 82576 Virtual Function Linux driver\n-  Copyright(c) 2009 - 2012 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 2009 - 2018 Intel Corporation. */\n \n #ifndef _E1000_REGS_H_\n #define _E1000_REGS_H_\ndiff --git a/drivers/net/ethernet/intel/igbvf/vf.c b/drivers/net/ethernet/intel/igbvf/vf.c\nindex bfe8d8297b2e..b8ba3f94c363 100644\n--- a/drivers/net/ethernet/intel/igbvf/vf.c\n+++ b/drivers/net/ethernet/intel/igbvf/vf.c\n@@ -1,29 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n-\n-  Intel(R) 82576 Virtual Function Linux driver\n-  Copyright(c) 2009 - 2012 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 2009 - 2018 Intel Corporation. */\n \n #include \"vf.h\"\n \ndiff --git a/drivers/net/ethernet/intel/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h\nindex 193b50026246..c71b0d7dbcee 100644\n--- a/drivers/net/ethernet/intel/igbvf/vf.h\n+++ b/drivers/net/ethernet/intel/igbvf/vf.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel(R) 82576 Virtual Function Linux driver\n-  Copyright(c) 2009 - 2012 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 2009 - 2018 Intel Corporation. */\n \n #ifndef _E1000_VF_H_\n #define _E1000_VF_H_\ndiff --git a/drivers/net/ethernet/intel/ixgb/Makefile b/drivers/net/ethernet/intel/ixgb/Makefile\nindex 1b42dd554dd2..2433e9300a33 100644\n--- a/drivers/net/ethernet/intel/ixgb/Makefile\n+++ b/drivers/net/ethernet/intel/ixgb/Makefile\n@@ -1,32 +1,5 @@\n # SPDX-License-Identifier: GPL-2.0\n-################################################################################\n-#\n-# Intel PRO/10GbE Linux driver\n # Copyright(c) 1999 - 2008 Intel Corporation.\n-#\n-# This program is free software; you can redistribute it and/or modify it\n-# under the terms and conditions of the GNU General Public License,\n-# version 2, as published by the Free Software Foundation.\n-#\n-# This program is distributed in the hope it will be useful, but WITHOUT\n-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-# more details.\n-#\n-# You should have received a copy of the GNU General Public License along with\n-# this program; if not, write to the Free Software Foundation, Inc.,\n-# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-#\n-# The full GNU General Public License is included in this distribution in\n-# the file called \"COPYING\".\n-#\n-# Contact Information:\n-# Linux NICS <linux.nics@intel.com>\n-# e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-# Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-#\n-################################################################################\n-\n #\n # Makefile for the Intel(R) PRO/10GbE ethernet driver\n #\ndiff --git a/drivers/net/ethernet/intel/ixgb/ixgb.h b/drivers/net/ethernet/intel/ixgb/ixgb.h\nindex 92022841755f..e85271b68410 100644\n--- a/drivers/net/ethernet/intel/ixgb/ixgb.h\n+++ b/drivers/net/ethernet/intel/ixgb/ixgb.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel PRO/10GbE Linux driver\n-  Copyright(c) 1999 - 2008 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2008 Intel Corporation. */\n \n #ifndef _IXGB_H_\n #define _IXGB_H_\ndiff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ee.c b/drivers/net/ethernet/intel/ixgb/ixgb_ee.c\nindex eca216b9b859..129286fc1634 100644\n--- a/drivers/net/ethernet/intel/ixgb/ixgb_ee.c\n+++ b/drivers/net/ethernet/intel/ixgb/ixgb_ee.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel PRO/10GbE Linux driver\n-  Copyright(c) 1999 - 2008 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2008 Intel Corporation. */\n \n #define pr_fmt(fmt) KBUILD_MODNAME \": \" fmt\n \ndiff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ee.h b/drivers/net/ethernet/intel/ixgb/ixgb_ee.h\nindex 475297a810fe..3ee0a09e5d0a 100644\n--- a/drivers/net/ethernet/intel/ixgb/ixgb_ee.h\n+++ b/drivers/net/ethernet/intel/ixgb/ixgb_ee.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel PRO/10GbE Linux driver\n-  Copyright(c) 1999 - 2008 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2008 Intel Corporation. */\n \n #ifndef _IXGB_EE_H_\n #define _IXGB_EE_H_\ndiff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c\nindex d10a0d242dda..43744bf0fc1c 100644\n--- a/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c\n+++ b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel PRO/10GbE Linux driver\n-  Copyright(c) 1999 - 2008 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2008 Intel Corporation. */\n \n /* ethtool support for ixgb */\n \ndiff --git a/drivers/net/ethernet/intel/ixgb/ixgb_hw.c b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c\nindex bf9a220f71fb..cbaa933ef30d 100644\n--- a/drivers/net/ethernet/intel/ixgb/ixgb_hw.c\n+++ b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel PRO/10GbE Linux driver\n-  Copyright(c) 1999 - 2008 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2008 Intel Corporation. */\n \n /* ixgb_hw.c\n  * Shared functions for accessing and configuring the adapter\ndiff --git a/drivers/net/ethernet/intel/ixgb/ixgb_hw.h b/drivers/net/ethernet/intel/ixgb/ixgb_hw.h\nindex 19f36d87ef61..6064583095da 100644\n--- a/drivers/net/ethernet/intel/ixgb/ixgb_hw.h\n+++ b/drivers/net/ethernet/intel/ixgb/ixgb_hw.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel PRO/10GbE Linux driver\n-  Copyright(c) 1999 - 2008 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2008 Intel Corporation. */\n \n #ifndef _IXGB_HW_H_\n #define _IXGB_HW_H_\ndiff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ids.h b/drivers/net/ethernet/intel/ixgb/ixgb_ids.h\nindex 24e849902d60..9695b8215f01 100644\n--- a/drivers/net/ethernet/intel/ixgb/ixgb_ids.h\n+++ b/drivers/net/ethernet/intel/ixgb/ixgb_ids.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel PRO/10GbE Linux driver\n-  Copyright(c) 1999 - 2008 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2008 Intel Corporation. */\n \n #ifndef _IXGB_IDS_H_\n #define _IXGB_IDS_H_\ndiff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c\nindex 2353c383f0a7..62f2173bc20e 100644\n--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c\n+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel PRO/10GbE Linux driver\n-  Copyright(c) 1999 - 2008 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2008 Intel Corporation. */\n \n #define pr_fmt(fmt) KBUILD_MODNAME \": \" fmt\n \ndiff --git a/drivers/net/ethernet/intel/ixgb/ixgb_osdep.h b/drivers/net/ethernet/intel/ixgb/ixgb_osdep.h\nindex b1710379192e..7bd54efa698d 100644\n--- a/drivers/net/ethernet/intel/ixgb/ixgb_osdep.h\n+++ b/drivers/net/ethernet/intel/ixgb/ixgb_osdep.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel PRO/10GbE Linux driver\n-  Copyright(c) 1999 - 2008 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2008 Intel Corporation. */\n \n /* glue for the OS independent part of ixgb\n  * includes register access macros\ndiff --git a/drivers/net/ethernet/intel/ixgb/ixgb_param.c b/drivers/net/ethernet/intel/ixgb/ixgb_param.c\nindex 04a60640ddda..f0cadd532c53 100644\n--- a/drivers/net/ethernet/intel/ixgb/ixgb_param.c\n+++ b/drivers/net/ethernet/intel/ixgb/ixgb_param.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel PRO/10GbE Linux driver\n-  Copyright(c) 1999 - 2008 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2008 Intel Corporation. */\n \n #define pr_fmt(fmt) KBUILD_MODNAME \": \" fmt\n \ndiff --git a/drivers/net/ethernet/intel/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile\nindex 4cd96c88cb5d..5414685189ce 100644\n--- a/drivers/net/ethernet/intel/ixgbe/Makefile\n+++ b/drivers/net/ethernet/intel/ixgbe/Makefile\n@@ -1,32 +1,5 @@\n # SPDX-License-Identifier: GPL-2.0\n-################################################################################\n-#\n-# Intel 10 Gigabit PCI Express Linux driver\n-# Copyright(c) 1999 - 2013 Intel Corporation.\n-#\n-# This program is free software; you can redistribute it and/or modify it\n-# under the terms and conditions of the GNU General Public License,\n-# version 2, as published by the Free Software Foundation.\n-#\n-# This program is distributed in the hope it will be useful, but WITHOUT\n-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-# more details.\n-#\n-# You should have received a copy of the GNU General Public License along with\n-# this program; if not, write to the Free Software Foundation, Inc.,\n-# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-#\n-# The full GNU General Public License is included in this distribution in\n-# the file called \"COPYING\".\n-#\n-# Contact Information:\n-# Linux NICS <linux.nics@intel.com>\n-# e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-# Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-#\n-################################################################################\n-\n+# Copyright(c) 1999 - 2018 Intel Corporation.\n #\n # Makefile for the Intel(R) 10GbE PCI Express ethernet driver\n #\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h\nindex 238137c381d0..76b16ae6a9fe 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _IXGBE_H_\n #define _IXGBE_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c\nindex cb0fe5fedb33..eee277c1bedf 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c\n@@ -1,31 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include <linux/pci.h>\n #include <linux/delay.h>\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c\nindex 66a74f4651e8..42f63b943ea0 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c\n@@ -1,31 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include <linux/pci.h>\n #include <linux/delay.h>\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c\nindex 633be93f3dbb..8d038837f72b 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c\n@@ -1,31 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include <linux/pci.h>\n #include <linux/delay.h>\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h\nindex 2b311382167a..4b531e8ae38a 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _IXGBE_COMMON_H_\n #define _IXGBE_COMMON_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c\nindex aaea8282bfd2..d26cea5b43bd 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c\n@@ -1,31 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n-\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include \"ixgbe.h\"\n #include \"ixgbe_type.h\"\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h\nindex 73b6362d4327..60cd5863bf5e 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2013 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _DCB_CONFIG_H_\n #define _DCB_CONFIG_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c\nindex 085130626330..379ae747cdce 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c\n@@ -1,31 +1,5 @@\n // SPDX-License-Identifier: GPL-2.0\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2013 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include \"ixgbe.h\"\n #include \"ixgbe_type.h\"\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h\nindex 7edce607f901..fdca41abb44c 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2013 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _DCB_82598_CONFIG_H_\n #define _DCB_82598_CONFIG_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c\nindex 1eed6811e914..7948849840a5 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2013 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include \"ixgbe.h\"\n #include \"ixgbe_type.h\"\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h\nindex fa030f0abc18..c6f084883cab 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2013 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _DCB_82599_CONFIG_H_\n #define _DCB_82599_CONFIG_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c\nindex b33f3f87e4b1..c00332d2e02a 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2014 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include \"ixgbe.h\"\n #include <linux/dcbnl.h>\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c\nindex ad54080488ee..55fe8114fe99 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c\n@@ -1,30 +1,6 @@\n-/*******************************************************************************\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2013 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n #include <linux/debugfs.h>\n #include <linux/module.h>\n \ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c\nindex c0e6ab42e0e1..bdd179c29ea4 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n /* ethtool support for ixgbe */\n \ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c\nindex 7a09a40e4472..b5219e024f70 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2014 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include \"ixgbe.h\"\n #include <linux/if_ether.h>\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h\nindex cf1919901514..724f5382329f 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2013 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _IXGBE_FCOE_H\n #define _IXGBE_FCOE_H\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c\nindex 68af127987bc..41af2b81e960 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c\n@@ -1,29 +1,5 @@\n-/*******************************************************************************\n- *\n- * Intel 10 Gigabit PCI Express Linux driver\n- * Copyright(c) 2017 Oracle and/or its affiliates. All rights reserved.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along with\n- * this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * Linux NICS <linux.nics@intel.com>\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 2017 Oracle and/or its affiliates. All rights reserved. */\n \n #include \"ixgbe.h\"\n #include <net/xfrm.h>\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h\nindex 4f099f516645..9ef7faadda69 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h\n@@ -1,30 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 2017 Oracle and/or its affiliates. All rights reserved.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program.  If not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 2017 Oracle and/or its affiliates. All rights reserved. */\n \n #ifndef _IXGBE_IPSEC_H_\n #define _IXGBE_IPSEC_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c\nindex ed4cbe94c355..893a9206e718 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include \"ixgbe.h\"\n #include \"ixgbe_sriov.h\"\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 01c95bfbc304..ee04367f7481 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include <linux/types.h>\n #include <linux/module.h>\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c\nindex a0cb84381cd0..5679293e53f7 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include <linux/pci.h>\n #include <linux/delay.h>\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h\nindex c4628b663590..e085b6520dac 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _IXGBE_MBX_H_\n #define _IXGBE_MBX_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h\nindex 72446644f9fa..fcae520647ce 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel 10 Gigabit PCI Express Linux drive\n- * Copyright(c) 2016 Intel Corporation.\n- *\n- * This program is free software; you can redistribute it and/or modify it\n- * under the terms and conditions of the GNU General Public License,\n- * version 2, as published by the Free Software Foundation.\n- *\n- * This program is distributed in the hope it will be useful, but WITHOUT\n- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- * more details.\n- *\n- * You should have received a copy of the GNU General Public License along\n- * with this program.  If not, see <http://www.gnu.org/licenses/>.\n- *\n- * The full GNU General Public License is included in this distribution in\n- * the file called \"COPYING\".\n- *\n- * Contact Information:\n- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _IXGBE_MODEL_H_\n #define _IXGBE_MODEL_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c\nindex 91bde90f9265..919a7af84b42 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2014 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include <linux/pci.h>\n #include <linux/delay.h>\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h\nindex d6a7e77348c5..64e44e01c973 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _IXGBE_PHY_H_\n #define _IXGBE_PHY_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c\nindex f6cc9166082a..b3e0d8bb5cbd 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c\n@@ -1,30 +1,6 @@\n-/*******************************************************************************\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n #include \"ixgbe.h\"\n #include <linux/ptp_classify.h>\n #include <linux/clocksource.h>\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c\nindex bfc4171cd3f9..2649c06d877b 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2015 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include <linux/types.h>\n #include <linux/module.h>\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h\nindex e30d1f07e891..3ec21923c89c 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2013 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _IXGBE_SRIOV_H_\n #define _IXGBE_SRIOV_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c\nindex 24766e125592..204844288c16 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2013 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include \"ixgbe.h\"\n #include \"ixgbe_common.h\"\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\nindex 2daa81e6e9b2..e8ed37749ab1 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n@@ -1,31 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _IXGBE_TYPE_H_\n #define _IXGBE_TYPE_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c\nindex b8c5fd2a2115..de563cfd294d 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c\n@@ -1,30 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 10 Gigabit PCI Express Linux driver\n-  Copyright(c) 1999 - 2016 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, write to the Free Software Foundation, Inc.,\n-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  Linux NICS <linux.nics@intel.com>\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include <linux/pci.h>\n #include <linux/delay.h>\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.h\nindex 182d640e9f7a..e246c0d2a427 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.h\n@@ -1,27 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n- *\n- * Intel 10 Gigabit PCI Express Linux driver\n- *  Copyright(c) 1999 - 2014 Intel Corporation.\n- *\n- *  This program is free software; you can redistribute it and/or modify it\n- *  under the terms and conditions of the GNU General Public License,\n- *  version 2, as published by the Free Software Foundation.\n- *\n- *  This program is distributed in the hope it will be useful, but WITHOUT\n- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- *  more details.\n- *\n- *  The full GNU General Public License is included in this distribution in\n- *  the file called \"COPYING\".\n- *\n- *  Contact Information:\n- *  Linux NICS <linux.nics@intel.com>\n- *  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- *  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- *****************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include \"ixgbe_type.h\"\n \ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\nindex 3123267dfba9..959a37599a6b 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n@@ -1,26 +1,6 @@\n-/*******************************************************************************\n- *\n- *  Intel 10 Gigabit PCI Express Linux driver\n- *  Copyright(c) 1999 - 2016 Intel Corporation.\n- *\n- *  This program is free software; you can redistribute it and/or modify it\n- *  under the terms and conditions of the GNU General Public License,\n- *  version 2, as published by the Free Software Foundation.\n- *\n- *  This program is distributed in the hope it will be useful, but WITHOUT\n- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n- *  more details.\n- *\n- *  The full GNU General Public License is included in this distribution in\n- *  the file called \"COPYING\".\n- *\n- *  Contact Information:\n- *  Linux NICS <linux.nics@intel.com>\n- *  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n- *  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n- *\n- ******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n+\n #include \"ixgbe_x540.h\"\n #include \"ixgbe_type.h\"\n #include \"ixgbe_common.h\"\ndiff --git a/drivers/net/ethernet/intel/ixgbevf/Makefile b/drivers/net/ethernet/intel/ixgbevf/Makefile\nindex bb47814cfa90..aba1e6a37a6a 100644\n--- a/drivers/net/ethernet/intel/ixgbevf/Makefile\n+++ b/drivers/net/ethernet/intel/ixgbevf/Makefile\n@@ -1,31 +1,5 @@\n # SPDX-License-Identifier: GPL-2.0\n-################################################################################\n-#\n-# Intel 82599 Virtual Function driver\n-# Copyright(c) 1999 - 2012 Intel Corporation.\n-#\n-# This program is free software; you can redistribute it and/or modify it\n-# under the terms and conditions of the GNU General Public License,\n-# version 2, as published by the Free Software Foundation.\n-#\n-# This program is distributed in the hope it will be useful, but WITHOUT\n-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-# more details.\n-#\n-# You should have received a copy of the GNU General Public License along with\n-# this program; if not, write to the Free Software Foundation, Inc.,\n-# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.\n-#\n-# The full GNU General Public License is included in this distribution in\n-# the file called \"COPYING\".\n-#\n-# Contact Information:\n-# e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-# Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-#\n-################################################################################\n-\n+# Copyright(c) 1999 - 2018 Intel Corporation.\n #\n # Makefile for the Intel(R) 82599 VF ethernet driver\n #\ndiff --git a/drivers/net/ethernet/intel/ixgbevf/defines.h b/drivers/net/ethernet/intel/ixgbevf/defines.h\nindex 71c828842b11..700d8eb2f6f8 100644\n--- a/drivers/net/ethernet/intel/ixgbevf/defines.h\n+++ b/drivers/net/ethernet/intel/ixgbevf/defines.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 82599 Virtual Function driver\n-  Copyright(c) 1999 - 2015 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _IXGBEVF_DEFINES_H_\n #define _IXGBEVF_DEFINES_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c\nindex 8e7d6c6f5c92..e7813d76527c 100644\n--- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c\n+++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c\n@@ -1,28 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 82599 Virtual Function driver\n-  Copyright(c) 1999 - 2018 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n /* ethtool support for ixgbevf */\n \ndiff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h\nindex 447ce1d5e0e3..70c75681495f 100644\n--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h\n+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 82599 Virtual Function driver\n-  Copyright(c) 1999 - 2018 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _IXGBEVF_H_\n #define _IXGBEVF_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c\nindex e3d04f226d57..e91c3d1a43ce 100644\n--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c\n+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c\n@@ -1,28 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 82599 Virtual Function driver\n-  Copyright(c) 1999 - 2018 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n /******************************************************************************\n  Copyright (c)2006 - 2007 Myricom, Inc. for some LRO specific code\ndiff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.c b/drivers/net/ethernet/intel/ixgbevf/mbx.c\nindex 2819abc454c7..6bc1953263b9 100644\n--- a/drivers/net/ethernet/intel/ixgbevf/mbx.c\n+++ b/drivers/net/ethernet/intel/ixgbevf/mbx.c\n@@ -1,28 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 82599 Virtual Function driver\n-  Copyright(c) 1999 - 2015 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include \"mbx.h\"\n #include \"ixgbevf.h\"\ndiff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.h b/drivers/net/ethernet/intel/ixgbevf/mbx.h\nindex 5ec947fe3d09..bfd9ae150808 100644\n--- a/drivers/net/ethernet/intel/ixgbevf/mbx.h\n+++ b/drivers/net/ethernet/intel/ixgbevf/mbx.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 82599 Virtual Function driver\n-  Copyright(c) 1999 - 2015 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _IXGBE_MBX_H_\n #define _IXGBE_MBX_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbevf/regs.h b/drivers/net/ethernet/intel/ixgbevf/regs.h\nindex 278f73980501..68d16ae5b65a 100644\n--- a/drivers/net/ethernet/intel/ixgbevf/regs.h\n+++ b/drivers/net/ethernet/intel/ixgbevf/regs.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 82599 Virtual Function driver\n-  Copyright(c) 1999 - 2015 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef _IXGBEVF_REGS_H_\n #define _IXGBEVF_REGS_H_\ndiff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c\nindex 38d3a327c1bc..bf0577e819e1 100644\n--- a/drivers/net/ethernet/intel/ixgbevf/vf.c\n+++ b/drivers/net/ethernet/intel/ixgbevf/vf.c\n@@ -1,28 +1,5 @@\n-/*******************************************************************************\n-\n-  Intel 82599 Virtual Function driver\n-  Copyright(c) 1999 - 2015 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #include \"vf.h\"\n #include \"ixgbevf.h\"\ndiff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h\nindex 194fbdaa4519..d1e9e306653b 100644\n--- a/drivers/net/ethernet/intel/ixgbevf/vf.h\n+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h\n@@ -1,29 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/*******************************************************************************\n-\n-  Intel 82599 Virtual Function driver\n-  Copyright(c) 1999 - 2015 Intel Corporation.\n-\n-  This program is free software; you can redistribute it and/or modify it\n-  under the terms and conditions of the GNU General Public License,\n-  version 2, as published by the Free Software Foundation.\n-\n-  This program is distributed in the hope it will be useful, but WITHOUT\n-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\n-  more details.\n-\n-  You should have received a copy of the GNU General Public License along with\n-  this program; if not, see <http://www.gnu.org/licenses/>.\n-\n-  The full GNU General Public License is included in this distribution in\n-  the file called \"COPYING\".\n-\n-  Contact Information:\n-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>\n-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n-\n-*******************************************************************************/\n+/* Copyright(c) 1999 - 2018 Intel Corporation. */\n \n #ifndef __IXGBE_VF_H__\n #define __IXGBE_VF_H__\n",
    "prefixes": [
        "v2"
    ]
}