Commit 56794e53 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

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



Cross-merge networking fixes after downstream PR.

Adjacent changes:

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
  23c93c3b ("bnxt_en: do not map packet buffers twice")
  6d1add95 ("bnxt_en: Modify TX ring indexing logic.")

tools/testing/selftests/net/Makefile
  2258b666 ("selftests: add vlan hw filter tests")
  a0bc96c0 ("selftests: net: verify fq per-band packet limit")

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 5a78a812 7c5e046b

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -191,6 +191,10 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com> 
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>

Geliang Tang <geliang.tang@linux.dev> <geliang.tang@suse.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@xiaomi.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@gmail.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@163.com>

Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>

Documentation/devicetree/bindings/display/panel/panel-simple-dsi.yaml

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ properties: 
      - lg,acx467akm-7

        # LG Corporation 7" WXGA TFT LCD panel

      - lg,ld070wx3-sl01

        # LG Corporation 5" HD TFT LCD panel

      - lg,lh500wx1-sd03

        # One Stop Displays OSD101T2587-53TS 10.1" 1920x1200 panel

      - osddisplays,osd101t2587-53ts

        # Panasonic 10" WUXGA TFT LCD panel

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

+0 −2
Original line number Diff line number Diff line
@@ -208,8 +208,6 @@ properties: 
      - lemaker,bl035-rgb-002

        # LG 7" (800x480 pixels) TFT LCD panel

      - lg,lb070wv8

        # LG Corporation 5" HD TFT LCD panel

      - lg,lh500wx1-sd03

        # LG LP079QX1-SP0V 7.9" (1536x2048 pixels) TFT LCD panel

      - lg,lp079qx1-sp0v

        # LG 9.7" (2048x1536 pixels) TFT LCD panel

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -6050,10 +6050,8 @@ M: Mikulas Patocka <mpatocka@redhat.com> 
M:	dm-devel@lists.linux.dev

L:	dm-devel@lists.linux.dev

S:	Maintained

W:	http://sources.redhat.com/dm

Q:	http://patchwork.kernel.org/project/dm-devel/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git

T:	quilt http://people.redhat.com/agk/patches/linux/editing/

F:	Documentation/admin-guide/device-mapper/

F:	drivers/md/Kconfig

F:	drivers/md/Makefile
@@ -9534,6 +9532,7 @@ F: drivers/bus/hisi_lpc.c 
HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)

M:	Yisen Zhuang <yisen.zhuang@huawei.com>

M:	Salil Mehta <salil.mehta@huawei.com>

M:	Jijie Shao <shaojijie@huawei.com>

L:	netdev@vger.kernel.org

S:	Maintained

W:	http://www.hisilicon.com
@@ -12201,6 +12200,8 @@ LINUX FOR POWERPC (32-BIT AND 64-BIT) 
M:	Michael Ellerman <mpe@ellerman.id.au>

R:	Nicholas Piggin <npiggin@gmail.com>

R:	Christophe Leroy <christophe.leroy@csgroup.eu>

R:	Aneesh Kumar K.V <aneesh.kumar@kernel.org>

R:	Naveen N. Rao <naveen.n.rao@linux.ibm.com>

L:	linuxppc-dev@lists.ozlabs.org

S:	Supported

W:	https://github.com/linuxppc/wiki/wiki

Makefile

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

PATCHLEVEL = 7

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Hurr durr I'ma ninja sloth



# *DOCUMENTATION*