Skip to content

Commit

Permalink
[Mellanox] Upstream kernel patches with HW-MGMT 7.0030.1011 (sonic-ne…
Browse files Browse the repository at this point in the history
…t#327)

* Intgerate HW-MGMT 7.0030.1010 Changes

 ## Patch List
* 0002-i2c-mlxcpld-Decrease-polling-time-for-performance-im.patch : torvalds/linux@cb9744178f33
* 0003-i2c-mlxcpld-Add-support-for-I2C-bus-frequency-settin.patch : torvalds/linux@66b0c2846ba8
* 0005-i2c-mux-mlxcpld-Move-header-file-out-of-x86-realm.patch : torvalds/linux@98d29c410475
* 0006-i2c-mux-mlxcpld-Convert-driver-to-platform-driver.patch : torvalds/linux@84af1b168c50
* 0007-i2c-mux-mlxcpld-Prepare-mux-selection-infrastructure.patch : torvalds/linux@81566938083a
* 0008-i2c-mux-mlxcpld-Get-rid-of-adapter-numbers-enforceme.patch : torvalds/linux@cae5216387d1
* 0009-i2c-mux-mlxcpld-Extend-driver-to-support-word-addres.patch : torvalds/linux@c52a1c5f5db5
* 0011-i2c-mux-mlxcpld-Add-callback-to-notify-mux-creation-.patch : torvalds/linux@a39bd92e92b9
* 0012-hwmon-mlxreg-fan-Add-support-for-fan-drawers-capabil.patch : torvalds/linux@f7bf7eb2d734
* 0013-hwmon-pmbus-shrink-code-and-remove-pmbus_do_remove.patch : torvalds/linux@3bce071a301f
* 0015-mlxsw-core-Remove-critical-trip-points-from-thermal-.patch : torvalds/linux@d567fd6e82fa
* 0017-mlxsw-reg-Extend-MTMP-register-with-new-threshold-fi.patch : torvalds/linux@314dbb19f95b
* 0018-mlxsw-thermal-Add-function-for-reading-module-temper.patch : torvalds/linux@e57977b34ab5
* 0019-mlxsw-thermal-Read-module-temperature-thresholds-usi.patch : torvalds/linux@72a64c2fe9d8
* 0020-mlxsw-thermal-Fix-null-dereference-of-NULL-temperatu.patch : torvalds/linux@f3b5a8907543
* 0023-ethtool-Allow-network-drivers-to-dump-arbitrary-EEPR.patch : torvalds/linux@c781ff12a2f3
* 0024-net-ethtool-Export-helpers-for-getting-EEPROM-info.patch : torvalds/linux@95dfc7effd88
* 0025-ethtool-Add-fallback-to-get_module_eeprom-from-netli.patch : torvalds/linux@96d971e307cc
* 0026-mlxsw-core-Add-support-for-module-EEPROM-read-by-pag.patch : torvalds/linux@1e27b9e40803
* 0027-ethtool-Decrease-size-of-module-EEPROM-get-policy-ar.patch : torvalds/linux@f5fe211d13af
* 0028-ethtool-Use-kernel-data-types-for-internal-EEPROM-st.patch : torvalds/linux@b8c48be23c2d
* 0029-ethtool-Validate-module-EEPROM-length-as-part-of-pol.patch : torvalds/linux@0dc7dd02ba7a
* 0030-ethtool-Validate-module-EEPROM-offset-as-part-of-pol.patch : torvalds/linux@88f9a87afeee
* 0031-mlxsw-core_env-Read-module-temperature-thresholds-us.patch : torvalds/linux@befc2048088a
* 0035-hwmon-pmbus-Increase-maximum-number-of-phases-per-pa.patch : torvalds/linux@e4db7719d037
* 0036-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2888-c.patch : torvalds/linux@0c1acde1d3d0
* 0039-ethtool-Fix-NULL-pointer-dereference-during-module-E.patch : torvalds/linux@51c96a561f24
* 0040-phy-sfp-add-netlink-SFP-support-to-generic-SFP-code.patch : torvalds/linux@d740513f05a2
* 0046-i2c-mlxcpld-Reduce-polling-time-for-performance-impr.patch : torvalds/linux@669b2e4aa1a8
* 0047-i2c-mlxcpld-Allow-flexible-polling-time-setting-for-.patch : torvalds/linux@712d6617d0a2
* 0053-mlxsw-core-Avoid-creation-virtual-hwmon-objects-by-t.patch : torvalds/linux@f8a36880f474
* 0054-mlxsw-minimal-Simplify-method-of-modules-number-dete.patch :
* 0055-platform_data-mlxreg-Add-new-type-to-support-modular.patch : torvalds/linux@aafa1cafedca
* 0056-platform-x86-mlx-platform-Add-initial-support-for-ne.patch : torvalds/linux@a5d8f57edfb4
* 0057-platform-mellanox-mlxreg-hotplug-Extend-logic-for-ho.patch : torvalds/linux@bb1023b6da37
* 0058-platform-x86-mlx-platform-Configure-notifier-callbac.patch : torvalds/linux@67eb006cc1d1
* 0059-platform-mellanox-mlxreg-io-Extend-number-of-hwmon-a.patch : torvalds/linux@bbfd79c68170
* 0060-platform_data-mlxreg-Add-new-field-for-secured-acces.patch : torvalds/linux@9d93d7877c91
* 0061-platform-mellanox-mlxreg-lc-Add-initial-support-for-.patch : torvalds/linux@62f9529b8d5c
* 0062-Documentation-ABI-Add-new-attributes-for-mlxreg-io-s.patch : torvalds/linux@5b0a315c3db5
* 0063-Documentation-ABI-Add-new-line-card-attributes-for-m.patch : torvalds/linux@164e32717cbd
* 0064-hwmon-mlxreg-fan-Extend-the-maximum-number-of-tachom.patch : torvalds/linux@bc8de07e8812
* 0065-platform-x86-mlx-platform-Extend-FAN-and-LED-config-.patch : torvalds/linux@9045512ca6cd
* 0066-platform-x86-mlx-platform-Add-new-attributes-for-Cof.patch : torvalds/linux@4289fd4ad43a
* 0067-platform-mellanox-Add-dedicated-match-for-system-typ.patch :
* 0070-mlxsw-core_env-Defer-handling-of-module-temperature-.patch : torvalds/linux@163f3d2dd01c
* 0071-mlxsw-core_env-Convert-module_info_lock-to-a-mutex.patch : torvalds/linux@bd6e43f5953d
* 0076-ethtool-Add-ability-to-control-transceiver-modules-p.patch : torvalds/linux@353407d917b2
* 0077-mlxsw-reg-Add-Port-Module-Memory-Map-Properties-regi.patch : torvalds/linux@f10ba086f7e3
* 0078-mlxsw-reg-Add-Management-Cable-IO-and-Notifications-.patch : torvalds/linux@fc53f5fb8037
* 0079-mlxsw-Add-ability-to-control-transceiver-modules-pow.patch : torvalds/linux@0455dc50bcca
* 0081-platform-x86-mlx-platform-Add-support-for-multiply-c.patch : torvalds/linux@249606d37d20
* 0091-platform-x86-mlx-platform-Add-support-for-new-system.patch : torvalds/linux@4616e54795cc
* 0092-platform-mellanox-mlxreg-lc-fix-error-code-in-mlxreg.patch : torvalds/linux@287273a80be5
* 0093-hwmon-mlxreg-fan-Extend-driver-to-support-multiply-P.patch : torvalds/linux@150f1e0c6fa8
* 0094-hwmon-mlxreg-fan-Extend-driver-to-support-multiply-c.patch : torvalds/linux@d7efb2ebc7b3
* 0095-hwmon-mlxreg-fan-Fix-out-of-bounds-read-on-array-fan.patch : torvalds/linux@000cc5bc49aa
* 0096-hwmon-mlxreg-fan-Modify-PWM-connectivity-validation.patch : torvalds/linux@b1c24237341f
* 0097-hwmon-mlxreg-fan-Support-distinctive-names-per-diffe.patch : torvalds/linux@b2be2422c0c9
* 0097-1-mlxsw-Use-u16-for-local_port-field.patch :
* 0097-2-mlxsw-i2c-Fix-chunk-size-setting.patch :
* 0097-3-mlxsw-core_hwmon-Adjust-module-label-names.patch :
* 0152-mlxsw-i2c-Prevent-transaction-execution-for-spec.patch :
* 0160-platform-mellanox-Introduce-support-for-COMe-managem.patch : torvalds/linux@6995e711b69c
* 0163-platform-mellanox-Introduce-support-for-rack-manager.patch : torvalds/linux@f8dacbf7da2e
* 0166-DS-leds-leds-mlxreg-Send-udev-event-from-leds-mlxreg.patch :
* 0173-mlxsw-core-Add-support-for-OSFP-transceiver-modules.patch : torvalds/linux@f881c4ab37db
* 0176-platform-mellanox-fix-reset_pwr_converter_fail-attri.patch : torvalds/linux@488f0fca0db0
* 0177-Documentation-ABI-fix-description-of-fix-reset_pwr_c.patch : torvalds/linux@e7210563432a
* 0178-platform-mellanox-Introduce-support-for-next-generat.patch : torvalds/linux@fcf3790b9b63
* 0186-platform-mellanox-mlxreg-hotplug-Allow-more-flexible.patch : torvalds/linux@26e118ea98cf
* 0195-platform-x86-MLX_PLATFORM-select-REGMAP-instead-of-d.patch :
* 0201-i2c-mlxbf-incorrect-base-address-passed-during-io-wr.patch : torvalds/linux@2a5be6d1340c
* 0202-i2c-mlxbf-prevent-stack-overflow-in-mlxbf_i2c_smbus_.patch : torvalds/linux@de24aceb07d4
* 0204-i2c-mlxbf-Fix-frequency-calculation.patch : torvalds/linux@37f071ec327b
* 0205-i2c-mlxbf-support-lock-mechanism.patch : torvalds/linux@86067ccfa142
* 0265-hwmon-mlxreg-fan-Return-zero-speed-for-broken-fan.patch :
* 0285-platform-mellanox-nvsw-sn2201-change-fans-i2c-busses.patch :

* Update commit msg body of patch 0067

Signed-off-by: Kebo Liu <kebol@nvidia.com>

---------

Signed-off-by: Kebo Liu <kebol@nvidia.com>
Co-authored-by: Saikrishna Arcot <sarcot@microsoft.com>
  • Loading branch information
keboliu and saiarcot895 authored Sep 1, 2023
1 parent 1800d11 commit 7ee50c9
Show file tree
Hide file tree
Showing 121 changed files with 3,416 additions and 915 deletions.
5 changes: 3 additions & 2 deletions patch/0001-i2c-mlxcpld-Update-module-license.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
From ff35f857e936ddd68635b390c789b203c7cbbbc2 Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@nvidia.com>
Date: Thu, 10 Dec 2020 18:51:11 +0200
Subject: 0001 i2c: mlxcpld: Update module license
Subject: [PATCH backport 5.10 001/182] i2c: mlxcpld: Update module license

Update license to SPDX-License.

Expand Down Expand Up @@ -53,5 +54,5 @@ index 71d7bae2cbca..dbd185368c38 100644

#include <linux/delay.h>
--
2.17.1
2.20.1

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
From 12fe50acf879f7552616a539e7b4a580da809a7b Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@nvidia.com>
Date: Thu, 10 Dec 2020 18:51:12 +0200
Subject: 0002 i2c: mlxcpld: Decrease polling time for
Subject: [PATCH backport 5.10 002/182] i2c: mlxcpld: Decrease polling time for
performance improvement

Decrease polling time 'MLXCPLD_I2C_POLL_TIME' from 2000 usec to 400
Expand Down Expand Up @@ -29,5 +30,5 @@ index dbd185368c38..9e45214d1eb6 100644
/* LPC I2C registers */
#define MLXCPLD_LPCI2C_CPBLTY_REG 0x0
--
2.17.1
2.20.1

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From 70a2f64a3d7b680a509c519015e4a46b6bc15ca4 Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@nvidia.com>
Date: Wed, 6 Jan 2021 01:33:47 +0200
Subject: 0003 i2c: mlxcpld: Add support for I2C bus frequency
setting
Subject: [PATCH backport 5.10 003/182] i2c: mlxcpld: Add support for I2C bus
frequency setting

Add support for I2C bus frequency setting according to the specific
system capability. This capability is obtained from CPLD frequency
Expand Down Expand Up @@ -123,5 +124,5 @@ index 9e45214d1eb6..4e0b7c2882ce 100644
}

--
2.17.1
2.20.1

6 changes: 4 additions & 2 deletions patch/0004-i2c-mux-mlxcpld-Update-module-license.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
From 9f63205197ecd85ef2f7e0c54c4aac5f7aecc9b8 Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@nvidia.com>
Date: Fri, 22 Jan 2021 21:24:56 +0200
Subject: 0004 i2c: mux: mlxcpld: Update module license
Subject: [PATCH backport 5.10 004/182] i2c: mux: mlxcpld: Update module
license

Update license to SPDX-License.

Expand Down Expand Up @@ -55,5 +57,5 @@ index 5ed55ca4fe93..53bce81cf5c9 100644

#include <linux/device.h>
--
2.17.1
2.20.1

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From 0f351fad0a71a2b6ec4709af908e621a90649634 Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@nvidia.com>
Date: Fri, 22 Jan 2021 21:24:58 +0200
Subject: 0005 i2c: mux: mlxcpld: Move header file out of x86
realm
Subject: [PATCH backport 5.10 005/182] i2c: mux: mlxcpld: Move header file out
of x86 realm

Move out header file from include/linux/platform_data/x86/ to
include/linux/platform_data/, since it does not depend on x86
Expand Down Expand Up @@ -35,5 +36,5 @@ similarity index 100%
rename from include/linux/platform_data/x86/mlxcpld.h
rename to include/linux/platform_data/mlxcpld.h
--
2.17.1
2.20.1

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
From de8fd8e73df9249c260d174c5e55b7af6b3d11f5 Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@nvidia.com>
Date: Mon, 8 Feb 2021 22:16:01 +0200
Subject: 0006 i2c: mux: mlxcpld: Convert driver to platform
driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [PATCH backport 5.10 006/182] i2c: mux: mlxcpld: Convert driver to
platform driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Expand Down Expand Up @@ -181,5 +181,5 @@ index 3d894cfb19df..b53f1479272d 100644
MODULE_AUTHOR("Michael Shych (michaels@mellanox.com)");
MODULE_DESCRIPTION("Mellanox I2C-CPLD-MUX driver");
--
2.17.1
2.20.1

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From 36e27ec3550453192cdf3788a20f82d074122c58 Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@nvidia.com>
Date: Mon, 8 Feb 2021 22:16:02 +0200
Subject: 0007 i2c: mux: mlxcpld: Prepare mux selection
infrastructure for two-byte support
Subject: [PATCH backport 5.10 007/182] i2c: mux: mlxcpld: Prepare mux
selection infrastructure for two-byte support

Allow to program register value zero to the mux register, which is
required for word address mux register space support.
Expand Down Expand Up @@ -84,5 +85,5 @@ index b53f1479272d..113ad84cdd94 100644
/* Create an adapter for each channel. */
for (num = 0; num < CPLD_MUX_MAX_NCHANS; num++) {
--
2.17.1
2.20.1

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From a57efb1d682024397507e3d1f21455289ae2af67 Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@nvidia.com>
Date: Mon, 8 Feb 2021 22:16:03 +0200
Subject: 0008 i2c: mux: mlxcpld: Get rid of adapter numbers
enforcement
Subject: [PATCH backport 5.10 008/182] i2c: mux: mlxcpld: Get rid of adapter
numbers enforcement

Do not set the argument 'force_nr' of i2c_mux_add_adapter() routine,
instead provide argument 'chan_id'.
Expand Down Expand Up @@ -67,5 +68,5 @@ index b08dcb183fca..f3cb628bb779 100644
int sel_reg_addr;
};
--
2.17.1
2.20.1

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From 1436eab9059e8f2a137ca657cc133dd6aabfe7f0 Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@nvidia.com>
Date: Mon, 8 Feb 2021 22:16:04 +0200
Subject: 0009 i2c: mux: mlxcpld: Extend driver to support word
address space devices
Subject: [PATCH backport 5.10 009/182] i2c: mux: mlxcpld: Extend driver to
support word address space devices

Extend driver to allow I2C routing control through CPLD devices with
word address space. Till now only CPLD devices with byte address space
Expand Down Expand Up @@ -111,5 +112,5 @@ index f3cb628bb779..341c7796e36b 100644

#endif /* _LINUX_I2C_MLXCPLD_H */
--
2.17.1
2.20.1

6 changes: 4 additions & 2 deletions patch/0010-i2c-mux-mlxcpld-Extend-supported-mux-number.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
From 3b78386d062ab776009356916ff5d82bd423cd8e Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@nvidia.com>
Date: Mon, 8 Feb 2021 22:16:05 +0200
Subject: 0010 i2c: mux: mlxcpld: Extend supported mux number
Subject: [PATCH backport 5.10 010/182] i2c: mux: mlxcpld: Extend supported mux
number

Allow to extend mux number supported by driver.
Currently it is limited by eight, which is not enough for new coming
Expand Down Expand Up @@ -51,5 +53,5 @@ index 10767ad4adb4..5e0672f9979b 100644
if (err)
goto virt_reg_failed;
--
2.17.1
2.20.1

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From d07723d636eed0ac64b2903d2e5bc92af9abfe40 Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@nvidia.com>
Date: Mon, 8 Feb 2021 22:16:06 +0200
Subject: 0011 i2c: mux: mlxcpld: Add callback to notify mux
creation completion
Subject: [PATCH backport 5.10 011/182] i2c: mux: mlxcpld: Add callback to
notify mux creation completion

Add notification to inform caller that mux objects array has been
created. It allows to user, invoked platform device registration for
Expand Down Expand Up @@ -55,5 +56,5 @@ index 341c7796e36b..68f5c5a9b172 100644

#endif /* _LINUX_I2C_MLXCPLD_H */
--
2.17.1
2.20.1

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From 868be8beaf13aefd82d53a6aa9d5c9644652e5f4 Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@nvidia.com>
Date: Mon, 22 Mar 2021 19:22:37 +0200
Subject: 0012 hwmon: (mlxreg-fan) Add support for fan drawers
capability and present registers
Subject: [PATCH backport 5.10 012/182] hwmon: (mlxreg-fan) Add support for fan
drawers capability and present registers

Add support for fan drawer's capability and present registers in order
to set mapping between the fan drawers and tachometers. Some systems
Expand Down Expand Up @@ -130,5 +131,5 @@ index bd8f5a3aaad9..89fe7b9fe26b 100644
for (i = 0; i < MLXREG_FAN_SPEED_MIN_LEVEL; i++)
fan->cooling_levels[i] = MLXREG_FAN_SPEED_MIN_LEVEL;
--
2.17.1
2.20.1

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From ab269af4b9fc3631547a09d9050b266a7b2fd113 Mon Sep 17 00:00:00 2001
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Date: Mon, 26 Oct 2020 11:53:52 +0100
Subject: 0013 hwmon: (pmbus) shrink code and remove
pmbus_do_remove()
Subject: [PATCH 13/66] hwmon: (pmbus) shrink code and remove pmbus_do_remove()

The only action currently performed in pmbus_do_remove() is removing the
debugfs hierarchy. We can schedule a devm action at probe time and remove
Expand Down Expand Up @@ -150,10 +150,10 @@ index decbd07c6d6e..c7400d4f1bfa 100644
};

diff --git a/drivers/hwmon/pmbus/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c
index da261d32450d..830003fe7024 100644
index 2fb7540ee952..d6bbbb223871 100644
--- a/drivers/hwmon/pmbus/ibm-cffps.c
+++ b/drivers/hwmon/pmbus/ibm-cffps.c
@@ -623,7 +623,6 @@ static struct i2c_driver ibm_cffps_driver = {
@@ -617,7 +617,6 @@ static struct i2c_driver ibm_cffps_driver = {
.of_match_table = ibm_cffps_of_match,
},
.probe_new = ibm_cffps_probe,
Expand Down Expand Up @@ -342,7 +342,7 @@ index 4b2239a6afd3..329dc851fc59 100644
};

diff --git a/drivers/hwmon/pmbus/mp2975.c b/drivers/hwmon/pmbus/mp2975.c
index a41fe06e0ad4..74060bc477cf 100644
index 1c3e2a9453b1..60fbdb371332 100644
--- a/drivers/hwmon/pmbus/mp2975.c
+++ b/drivers/hwmon/pmbus/mp2975.c
@@ -758,7 +758,6 @@ static struct i2c_driver mp2975_driver = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From 2bea2ba313dd45240a0295de02762b2a2af2a18d Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@nvidia.com>
Date: Tue, 6 Apr 2021 15:27:33 +0300
Subject: 0015 mlxsw: core: Remove critical trip points from
thermal zones
Subject: [PATCH backport 5.10 015/182] mlxsw: core: Remove critical trip
points from thermal zones

Disable software thermal protection by removing critical trip points
from all thermal zones.
Expand Down Expand Up @@ -119,5 +120,5 @@ index ecd1856bef5e..5b37449d4b66 100644

tz->trips[trip].temp = temp;
--
2.17.1
2.20.1

32 changes: 17 additions & 15 deletions patch/0016-net-don-t-include-ethtool.h-from-netdevice.h.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
From e8c1cb7fb9d5ab0cfcf496efa208dae75d25a789 Mon Sep 17 00:00:00 2001
From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 20 Nov 2020 14:50:52 -0800
Subject: 0016 net: don't include ethtool.h from netdevice.h
Subject: [PATCH backport 5.10 016/182] net: don't include ethtool.h from
netdevice.h

linux/netdevice.h is included in very many places, touching any
of its dependecies causes large incremental builds.
Expand Down Expand Up @@ -99,7 +101,7 @@ index fd5c9cbe45b1..56d34be5e797 100644
#include <net/net_namespace.h>
#include <net/netns/generic.h>
diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
index 3f759fae81fe..76d6cee81981 100644
index a879200eaab0..5503eb028902 100644
--- a/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@ -9,6 +9,7 @@
Expand All @@ -123,7 +125,7 @@ index 3b2cd28f962d..6cdd9efe8df3 100644

#include "ena_netdev.h"
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
index 926cca9a0c83..1a7148041e3d 100644
index 6da3efa289a3..b7f7d6f66633 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
@@ -10,6 +10,8 @@
Expand All @@ -136,7 +138,7 @@ index 926cca9a0c83..1a7148041e3d 100644
#include "aq_rss.h"
#include "aq_hw.h"
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 92f9f7f5240b..91d45a83b67a 100644
index 34affd1de91d..b74884e6b8c6 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -20,6 +20,7 @@
Expand All @@ -148,7 +150,7 @@ index 92f9f7f5240b..91d45a83b67a 100644
#include <linux/rhashtable.h>
#include <linux/crash_dump.h>
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
index 23b80aa171dd..a217316228f4 100644
index 819f9df9425c..883905db21a3 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -8,6 +8,7 @@
Expand Down Expand Up @@ -208,7 +210,7 @@ index cd8f9a481d73..d546993bda09 100644

#include "t4vf_common.h"
diff --git a/drivers/net/ethernet/google/gve/gve_ethtool.c b/drivers/net/ethernet/google/gve/gve_ethtool.c
index 7b44769bd87c..2fb197fd3daf 100644
index c53a04313944..458e79b8d625 100644
--- a/drivers/net/ethernet/google/gve/gve_ethtool.c
+++ b/drivers/net/ethernet/google/gve/gve_ethtool.c
@@ -4,6 +4,7 @@
Expand Down Expand Up @@ -318,7 +320,7 @@ index 28bfe1ea9d94..131b2a53d261 100644
#include <linux/slab.h>
#include <linux/device.h>
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
index e95c09dc2c30..81b22520ba78 100644
index cb12d0171517..209ebe3f2569 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
@@ -1,6 +1,7 @@
Expand Down Expand Up @@ -354,7 +356,7 @@ index 2adcf24848a4..ab1e0fcccabb 100644
#include <net/pkt_sched.h>
#include "rmnet_config.h"
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 5ddb2dbb8572..e2e58493e115 100644
index 081939cb420b..c339cf5339da 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -7,6 +7,7 @@
Expand All @@ -366,7 +368,7 @@ index 5ddb2dbb8572..e2e58493e115 100644
#include <linux/module.h>
#include <linux/etherdevice.h>
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 261e6e55a907..d17bbc75f5e7 100644
index f2020be43cfe..2548a40dc5d2 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -10,6 +10,7 @@
Expand Down Expand Up @@ -413,7 +415,7 @@ index afb119f38325..5e19a6839dea 100644
#include <linux/kernel.h>
#include <linux/netdevice.h>
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 615f3776b4be..6d308183c25f 100644
index 7117d559a32e..af1977e6c307 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -4,6 +4,7 @@
Expand Down Expand Up @@ -497,7 +499,7 @@ index ace4a6d28562..ad55cd738847 100644

static struct {
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 861f2480c457..71fea53dacc9 100644
index ef75567efd27..c70027ea28a2 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -34,7 +34,6 @@
Expand Down Expand Up @@ -565,7 +567,7 @@ index ac6ffa561884..48c4503c16de 100644
#include <linux/device.h>
#include <linux/dma-mapping.h>
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index a31334b92be7..2a3ade22d34b 100644
index eaa030e2ad55..d8816ae47015 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -46,6 +46,7 @@
Expand All @@ -589,7 +591,7 @@ index 2eaac2ff380f..459cc240eda9 100644
#include <linux/types.h>
#include <linux/kernel.h>
diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index 806babdd838d..9d4d9e8ecfdd 100644
index 7f33b31c7b8b..360e24afd9b1 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -6,6 +6,7 @@
Expand All @@ -601,7 +603,7 @@ index 806babdd838d..9d4d9e8ecfdd 100644
#include <linux/slab.h>
#include <linux/kernel.h>
diff --git a/net/socket.c b/net/socket.c
index d52c265ad449..6415983cf5b6 100644
index 8657112a687a..eceffde4e0f1 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -52,6 +52,7 @@
Expand All @@ -613,5 +615,5 @@ index d52c265ad449..6415983cf5b6 100644
#include <linux/socket.h>
#include <linux/file.h>
--
2.17.1
2.20.1

Loading

0 comments on commit 7ee50c9

Please sign in to comment.