diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-30 18:27:10 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-30 18:27:10 +0300 |
| commit | f1bd4daead9a4df48d1bb2821cff3a40da543b5b (patch) | |
| tree | 7c45bae9e25e441c4858a9d05eadda48c558a4b8 /kernel/sysctl_binary.c | |
| parent | a3995460491d4570af8e99ad34ddf6d1948254d9 (diff) | |
| parent | 9ed9ea7084f34fcb1d962a4fbd012fe8a2942df8 (diff) | |
| download | linux-f1bd4daead9a4df48d1bb2821cff3a40da543b5b.tar.xz | |
Merge branch 'nfp-pci-core-hwmon-live-mac-addr-change'
Jakub Kicinski says:
====================
nfp: pci core, hwmon, live mac addr change
This series brings updates to core PCI code, SR-IOV, exposes
firmware's capability to change MAC address at runtime and HWMON
interfaces.
The PCI code updates include resiliency improvement in conditions
which are quite unusual, but still shouldn't make the driver oops.
We also handle very large device memory operation more gracefully.
A timeout is added to acquiring mutexes in device memory.
Pablo provides a patch to expose to the stack the ability to change
MAC addresses under traffic while David adds HWMON interface for
reading device temperature and power consumption.
Last three patches are minor improvements to the netdev code.
v2:
- add patch 1 - fix for devlink build;
- fix build issue with the hwmon patch.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/sysctl_binary.c')
0 files changed, 0 insertions, 0 deletions