Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (1d681013) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/core-api/xarray.rst

+9 −6

Original line number	Diff line number	Diff line
		@@ -108,12 +108,13 @@ some, but not all of the other indices changing.

		Sometimes you need to ensure that a subsequent call to :c:func:`xa_store`
		will not need to allocate memory. The :c:func:`xa_reserve` function
		will store a reserved entry at the indicated index. Users of the normal
		API will see this entry as containing ``NULL``. If you do not need to
		use the reserved entry, you can call :c:func:`xa_release` to remove the
		unused entry. If another user has stored to the entry in the meantime,
		:c:func:`xa_release` will do nothing; if instead you want the entry to
		become ``NULL``, you should use :c:func:`xa_erase`.
		will store a reserved entry at the indicated index. Users of the
		normal API will see this entry as containing ``NULL``. If you do
		not need to use the reserved entry, you can call :c:func:`xa_release`
		to remove the unused entry. If another user has stored to the entry
		in the meantime, :c:func:`xa_release` will do nothing; if instead you
		want the entry to become ``NULL``, you should use :c:func:`xa_erase`.
		Using :c:func:`xa_insert` on a reserved entry will fail.

		If all entries in the array are ``NULL``, the :c:func:`xa_empty` function
		will return ``true``.
		@@ -183,6 +184,8 @@ Takes xa_lock internally:
		* :c:func:`xa_store_bh`
		* :c:func:`xa_store_irq`
		* :c:func:`xa_insert`
		* :c:func:`xa_insert_bh`
		* :c:func:`xa_insert_irq`
		* :c:func:`xa_erase`
		* :c:func:`xa_erase_bh`
		* :c:func:`xa_erase_irq`

Documentation/devicetree/bindings/display/msm/gpu.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ Example:
		reg = <0x04300000 0x20000>;
		reg-names = "kgsl_3d0_reg_memory";
		interrupts = <GIC_SPI 80 0>;
		interrupt-names = "kgsl_3d0_irq";
		clock-names =
		"core",
		"iface",

MAINTAINERS

+24 −21

Original line number	Diff line number	Diff line
		@@ -3052,8 +3052,8 @@ F: include/linux/bcm963xx_nvram.h
		F: include/linux/bcm963xx_tag.h

		BROADCOM BNX2 GIGABIT ETHERNET DRIVER
		M: Rasesh Mody <rasesh.mody@cavium.com>
		M: Dept-GELinuxNICDev@cavium.com
		M: Rasesh Mody <rmody@marvell.com>
		M: GR-Linux-NIC-Dev@marvell.com
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/ethernet/broadcom/bnx2.*
		@@ -3072,9 +3072,9 @@ S: Supported
		F: drivers/scsi/bnx2i/

		BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
		M: Ariel Elior <ariel.elior@cavium.com>
		M: Sudarsana Kalluru <sudarsana.kalluru@cavium.com>
		M: everest-linux-l2@cavium.com
		M: Ariel Elior <aelior@marvell.com>
		M: Sudarsana Kalluru <skalluru@marvell.com>
		M: GR-everest-linux-l2@marvell.com
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/ethernet/broadcom/bnx2x/
		@@ -3249,9 +3249,9 @@ S: Supported
		F: drivers/scsi/bfa/

		BROCADE BNA 10 GIGABIT ETHERNET DRIVER
		M: Rasesh Mody <rasesh.mody@cavium.com>
		M: Sudarsana Kalluru <sudarsana.kalluru@cavium.com>
		M: Dept-GELinuxNICDev@cavium.com
		M: Rasesh Mody <rmody@marvell.com>
		M: Sudarsana Kalluru <skalluru@marvell.com>
		M: GR-Linux-NIC-Dev@marvell.com
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/ethernet/brocade/bna/
		@@ -3978,6 +3978,7 @@ F: drivers/cpufreq/arm_big_little.c
		CPU POWER MONITORING SUBSYSTEM
		M: Thomas Renninger <trenn@suse.com>
		M: Shuah Khan <shuah@kernel.org>
		M: Shuah Khan <skhan@linuxfoundation.org>
		L: linux-pm@vger.kernel.org
		S: Maintained
		F: tools/power/cpupower/
		@@ -8265,6 +8266,7 @@ F: include/uapi/linux/sunrpc/

		KERNEL SELFTEST FRAMEWORK
		M: Shuah Khan <shuah@kernel.org>
		M: Shuah Khan <skhan@linuxfoundation.org>
		L: linux-kselftest@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
		Q: https://patchwork.kernel.org/project/linux-kselftest/list/
		@@ -10696,9 +10698,9 @@ S: Maintained
		F: drivers/net/netdevsim/*

		NETXEN (1/10) GbE SUPPORT
		M: Manish Chopra <manish.chopra@cavium.com>
		M: Rahul Verma <rahul.verma@cavium.com>
		M: Dept-GELinuxNICDev@cavium.com
		M: Manish Chopra <manishc@marvell.com>
		M: Rahul Verma <rahulv@marvell.com>
		M: GR-Linux-NIC-Dev@marvell.com
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/ethernet/qlogic/netxen/
		@@ -12482,8 +12484,8 @@ S: Supported
		F: drivers/scsi/qedi/

		QLOGIC QL4xxx ETHERNET DRIVER
		M: Ariel Elior <Ariel.Elior@cavium.com>
		M: everest-linux-l2@cavium.com
		M: Ariel Elior <aelior@marvell.com>
		M: GR-everest-linux-l2@marvell.com
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/ethernet/qlogic/qed/
		@@ -12491,8 +12493,8 @@ F: include/linux/qed/
		F: drivers/net/ethernet/qlogic/qede/

		QLOGIC QL4xxx RDMA DRIVER
		M: Michal Kalderon <Michal.Kalderon@cavium.com>
		M: Ariel Elior <Ariel.Elior@cavium.com>
		M: Michal Kalderon <mkalderon@marvell.com>
		M: Ariel Elior <aelior@marvell.com>
		L: linux-rdma@vger.kernel.org
		S: Supported
		F: drivers/infiniband/hw/qedr/
		@@ -12512,7 +12514,7 @@ F: Documentation/scsi/LICENSE.qla2xxx
		F: drivers/scsi/qla2xxx/

		QLOGIC QLA3XXX NETWORK DRIVER
		M: Dept-GELinuxNICDev@cavium.com
		M: GR-Linux-NIC-Dev@marvell.com
		L: netdev@vger.kernel.org
		S: Supported
		F: Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx
		@@ -12526,16 +12528,16 @@ F: Documentation/scsi/LICENSE.qla4xxx
		F: drivers/scsi/qla4xxx/

		QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
		M: Shahed Shaikh <Shahed.Shaikh@cavium.com>
		M: Manish Chopra <manish.chopra@cavium.com>
		M: Dept-GELinuxNICDev@cavium.com
		M: Shahed Shaikh <shshaikh@marvell.com>
		M: Manish Chopra <manishc@marvell.com>
		M: GR-Linux-NIC-Dev@marvell.com
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/ethernet/qlogic/qlcnic/

		QLOGIC QLGE 10Gb ETHERNET DRIVER
		M: Manish Chopra <manish.chopra@cavium.com>
		M: Dept-GELinuxNICDev@cavium.com
		M: Manish Chopra <manishc@marvell.com>
		M: GR-Linux-NIC-Dev@marvell.com
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/ethernet/qlogic/qlge/
		@@ -15857,6 +15859,7 @@ F: drivers/usb/common/usb-otg-fsm.c
		USB OVER IP DRIVER
		M: Valentina Manea <valentina.manea.m@gmail.com>
		M: Shuah Khan <shuah@kernel.org>
		M: Shuah Khan <skhan@linuxfoundation.org>
		L: linux-usb@vger.kernel.org
		S: Maintained
		F: Documentation/usb/usbip_protocol.txt

arch/arc/include/asm/Kbuild

+0 −4

Original line number	Diff line number	Diff line
		@@ -3,23 +3,19 @@ generic-y += bugs.h
		generic-y += compat.h
		generic-y += device.h
		generic-y += div64.h
		generic-y += dma-mapping.h
		generic-y += emergency-restart.h
		generic-y += extable.h
		generic-y += fb.h
		generic-y += ftrace.h
		generic-y += hardirq.h
		generic-y += hw_irq.h
		generic-y += irq_regs.h
		generic-y += irq_work.h
		generic-y += kmap_types.h
		generic-y += local.h
		generic-y += local64.h
		generic-y += mcs_spinlock.h
		generic-y += mm-arch-hooks.h
		generic-y += msi.h
		generic-y += parport.h
		generic-y += pci.h
		generic-y += percpu.h
		generic-y += preempt.h
		generic-y += topology.h

arch/arc/include/asm/arcregs.h

+10 −2

Original line number	Diff line number	Diff line
		@@ -216,6 +216,14 @@ struct bcr_fp_arcv2 {
		#endif
		};

		struct bcr_actionpoint {
		#ifdef CONFIG_CPU_BIG_ENDIAN
		unsigned int pad:21, min:1, num:2, ver:8;
		#else
		unsigned int ver:8, num:2, min:1, pad:21;
		#endif
		};

		#include <soc/arc/timers.h>

		struct bcr_bpu_arcompact {
		@@ -283,7 +291,7 @@ struct cpuinfo_arc_cache {
		};

		struct cpuinfo_arc_bpu {
		unsigned int ver, full, num_cache, num_pred;
		unsigned int ver, full, num_cache, num_pred, ret_stk;
		};

		struct cpuinfo_arc_ccm {
		@@ -302,7 +310,7 @@ struct cpuinfo_arc {
		struct {
		unsigned int swap:1, norm:1, minmax:1, barrel:1, crc:1, swape:1, pad1:2,
		fpu_sp:1, fpu_dp:1, dual:1, dual_enb:1, pad2:4,
		debug:1, ap:1, smart:1, rtt:1, pad3:4,
		ap_num:4, ap_full:1, smart:1, rtt:1, pad3:1,
		timer0:1, timer1:1, rtc:1, gfrc:1, pad4:4;
		} extn;
		struct bcr_mpy extn_mpy;