Merge "Merge 4.19.280 into android-4.19-stable" into android-4.19-stable (a73cc414) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/networking/00-INDEX

+2 −2

Original line number	Diff line number	Diff line
		@@ -94,8 +94,8 @@ gianfar.txt
		- Gianfar Ethernet Driver.
		i40e.txt
		- README for the Intel Ethernet Controller XL710 Driver (i40e).
		i40evf.txt
		- Short note on the Driver for the Intel(R) XL710 X710 Virtual Function
		iavf.txt
		- README for the Intel Ethernet Adaptive Virtual Function Driver (iavf).
		ieee802154.txt
		- Linux IEEE 802.15.4 implementation, API and drivers
		igb.txt

Documentation/networking/i40evf.txt→Documentation/networking/iavf.txt

+9 −7

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ Linux* Base Driver for Intel(R) Network Connection
		==================================================

		Intel Ethernet Adaptive Virtual Function Linux driver.
		Copyright(c) 2013-2017 Intel Corporation.
		Copyright(c) 2013-2018 Intel Corporation.

		Contents
		========
		@@ -11,20 +11,21 @@ Contents
		- Known Issues/Troubleshooting
		- Support

		This file describes the i40evf Linux* Base Driver.
		This file describes the iavf Linux* Base Driver. This driver
		was formerly called i40evf.

		The i40evf driver supports the below mentioned virtual function
		The iavf driver supports the below mentioned virtual function
		devices and can only be activated on kernels running the i40e or
		newer Physical Function (PF) driver compiled with CONFIG_PCI_IOV.
		The i40evf driver requires CONFIG_PCI_MSI to be enabled.
		The iavf driver requires CONFIG_PCI_MSI to be enabled.

		The guest OS loading the i40evf driver must support MSI-X interrupts.
		The guest OS loading the iavf driver must support MSI-X interrupts.

		Supported Hardware
		==================
		Intel XL710 X710 Virtual Function
		Intel Ethernet Adaptive Virtual Function
		Intel X722 Virtual Function
		Intel Ethernet Adaptive Virtual Function

		Identifying Your Adapter
		========================
		@@ -32,7 +33,8 @@ Identifying Your Adapter
		For more information on how to identify your adapter, go to the
		Adapter & Driver ID Guide at:

		http://support.intel.com/support/go/network/adapter/idguide.htm
		https://www.intel.com/content/www/us/en/support/articles/000005584/network-and-i-o/ethernet-products.html


		Known Issues/Troubleshooting
		============================

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -7391,7 +7391,7 @@ F: Documentation/networking/ixgb.txt
		F: Documentation/networking/ixgbe.txt
		F: Documentation/networking/ixgbevf.txt
		F: Documentation/networking/i40e.txt
		F: Documentation/networking/i40evf.txt
		F: Documentation/networking/iavf.txt
		F: Documentation/networking/ice.txt
		F: drivers/net/ethernet/intel/
		F: drivers/net/ethernet/intel/*/

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 19
		SUBLEVEL = 279
		SUBLEVEL = 280
		EXTRAVERSION =
		NAME = "People's Front"

arch/m68k/kernel/traps.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		#include <linux/init.h>
		#include <linux/ptrace.h>
		#include <linux/kallsyms.h>
		#include <linux/extable.h>

		#include <asm/setup.h>
		#include <asm/fpu.h>
		@@ -550,7 +551,8 @@ static inline void bus_error030 (struct frame *fp)
		errorcode \|= 2;

		if (mmusr & (MMU_I \| MMU_WP)) {
		if (ssw & 4) {
		/* We might have an exception table for this PC */
		if (ssw & 4 && !search_exception_tables(fp->ptregs.pc)) {
		pr_err("Data %s fault at %#010lx in %s (pc=%#lx)\n",
		ssw & RW ? "read" : "write",
		fp->un.fmtb.daddr,