Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2be09de7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.

Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 44a7b3b6 1d51b4b1

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -2541,6 +2541,10 @@ S: Ormond 
S: Victoria 3163

S: Australia



N: Eric Miao

E: eric.y.miao@gmail.com

D: MMP support



N: Pauline Middelink

E: middelin@polyware.nl

D: General low-level bug fixes, /proc fixes, identd support
@@ -4115,6 +4119,10 @@ S: 1507 145th Place SE #B5 
S: Bellevue, Washington 98007

S: USA



N: Haojian Zhuang

E: haojian.zhuang@gmail.com

D: MMP support



N: Richard Zidlicky

E: rz@linux-m68k.org, rdzidlic@geocities.com

W: http://www.geocities.com/rdzidlic

Documentation/core-api/xarray.rst

+4 −1
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ Takes xa_lock internally: 
 * :c:func:`xa_erase_bh`

 * :c:func:`xa_erase_irq`

 * :c:func:`xa_cmpxchg`

 * :c:func:`xa_cmpxchg_bh`

 * :c:func:`xa_cmpxchg_irq`

 * :c:func:`xa_store_range`

 * :c:func:`xa_alloc`

 * :c:func:`xa_alloc_bh`
@@ -263,7 +265,8 @@ using :c:func:`xa_lock_irqsave` in both the interrupt handler and process 
context, or :c:func:`xa_lock_irq` in process context and :c:func:`xa_lock`

in the interrupt handler.  Some of the more common patterns have helper

functions such as :c:func:`xa_store_bh`, :c:func:`xa_store_irq`,

:c:func:`xa_erase_bh` and :c:func:`xa_erase_irq`.

:c:func:`xa_erase_bh`, :c:func:`xa_erase_irq`, :c:func:`xa_cmpxchg_bh`

and :c:func:`xa_cmpxchg_irq`.



Sometimes you need to protect access to the XArray with a mutex because

that lock sits above another mutex in the locking hierarchy.  That does

Documentation/media/uapi/v4l/extended-controls.rst

+10 −0
Original line number Diff line number Diff line
@@ -1505,6 +1505,11 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - 
    configuring a stateless hardware decoding pipeline for MPEG-2.

    The bitstream parameters are defined according to :ref:`mpeg2part2`.



    .. note::



       This compound control is not yet part of the public kernel API and

       it is expected to change.



.. c:type:: v4l2_ctrl_mpeg2_slice_params



.. cssclass:: longtable
@@ -1625,6 +1630,11 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - 
    Specifies quantization matrices (as extracted from the bitstream) for the

    associated MPEG-2 slice data.



    .. note::



       This compound control is not yet part of the public kernel API and

       it is expected to change.



.. c:type:: v4l2_ctrl_mpeg2_quantization



.. cssclass:: longtable

MAINTAINERS

+19 −8
Original line number Diff line number Diff line
@@ -1739,13 +1739,17 @@ ARM/Mediatek SoC support 
M:	Matthias Brugger <matthias.bgg@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)

W:	https://mtk.bcnfs.org/

C:	irc://chat.freenode.net/linux-mediatek

S:	Maintained

F:	arch/arm/boot/dts/mt6*

F:	arch/arm/boot/dts/mt7*

F:	arch/arm/boot/dts/mt8*

F:	arch/arm/mach-mediatek/

F:	arch/arm64/boot/dts/mediatek/

F:	drivers/soc/mediatek/

N:	mtk

N:	mt[678]

K:	mediatek



ARM/Mediatek USB3 PHY DRIVER
@@ -4843,6 +4847,7 @@ F: include/uapi/drm/vmwgfx_drm.h 


DRM DRIVERS

M:	David Airlie <airlied@linux.ie>

M:	Daniel Vetter <daniel@ffwll.ch>

L:	dri-devel@lists.freedesktop.org

T:	git git://anongit.freedesktop.org/drm/drm

B:	https://bugs.freedesktop.org/
@@ -6902,8 +6907,10 @@ Hyper-V CORE AND DRIVERS 
M:	"K. Y. Srinivasan" <kys@microsoft.com>

M:	Haiyang Zhang <haiyangz@microsoft.com>

M:	Stephen Hemminger <sthemmin@microsoft.com>

M:	Sasha Levin <sashal@kernel.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git

L:	devel@linuxdriverproject.org

S:	Maintained

S:	Supported

F:	Documentation/networking/device_drivers/microsoft/netvsc.txt

F:	arch/x86/include/asm/mshyperv.h

F:	arch/x86/include/asm/trace/hyperv.h
@@ -8932,7 +8939,7 @@ F: arch/mips/boot/dts/img/pistachio_marduk.dts 


MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER

M:	Andrew Lunn <andrew@lunn.ch>

M:	Vivien Didelot <vivien.didelot@savoirfairelinux.com>

M:	Vivien Didelot <vivien.didelot@gmail.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/dsa/mv88e6xxx/
@@ -9437,6 +9444,13 @@ F: drivers/media/platform/mtk-vpu/ 
F:	Documentation/devicetree/bindings/media/mediatek-vcodec.txt

F:	Documentation/devicetree/bindings/media/mediatek-vpu.txt



MEDIATEK MT76 WIRELESS LAN DRIVER

M:	Felix Fietkau <nbd@nbd.name>

M:	Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>

L:	linux-wireless@vger.kernel.org

S:	Maintained

F:	drivers/net/wireless/mediatek/mt76/



MEDIATEK MT7601U WIRELESS LAN DRIVER

M:	Jakub Kicinski <kubakici@wp.pl>

L:	linux-wireless@vger.kernel.org
@@ -10000,12 +10014,9 @@ S: Odd Fixes 
F:	drivers/media/radio/radio-miropcm20*



MMP SUPPORT

M:	Eric Miao <eric.y.miao@gmail.com>

M:	Haojian Zhuang <haojian.zhuang@gmail.com>

R:	Lubomir Rintel <lkundrak@v3.sk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://github.com/hzhuang1/linux.git

T:	git git://git.linaro.org/people/ycmiao/pxa-linux.git

S:	Maintained

S:	Odd Fixes

F:	arch/arm/boot/dts/mmp*

F:	arch/arm/mach-mmp/
@@ -10411,7 +10422,7 @@ F: drivers/net/wireless/ 


NETWORKING [DSA]

M:	Andrew Lunn <andrew@lunn.ch>

M:	Vivien Didelot <vivien.didelot@savoirfairelinux.com>

M:	Vivien Didelot <vivien.didelot@gmail.com>

M:	Florian Fainelli <f.fainelli@gmail.com>

S:	Maintained

F:	Documentation/devicetree/bindings/net/dsa/

Makefile

+9 −6
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 4

PATCHLEVEL = 20

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Shy Crocodile



# *DOCUMENTATION*
@@ -962,11 +962,6 @@ ifdef CONFIG_STACK_VALIDATION 
  ifeq ($(has_libelf),1)

    objtool_target := tools/objtool FORCE

  else

    ifdef CONFIG_UNWINDER_ORC

      $(error "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")

    else

      $(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")

    endif

    SKIP_STACK_VALIDATION := 1

    export SKIP_STACK_VALIDATION

  endif
@@ -1125,6 +1120,14 @@ uapi-asm-generic: 


PHONY += prepare-objtool

prepare-objtool: $(objtool_target)

ifeq ($(SKIP_STACK_VALIDATION),1)

ifdef CONFIG_UNWINDER_ORC

	@echo "error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2

	@false

else

	@echo "warning: Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2

endif

endif



# Generate some files

# ---------------------------------------------------------------------------