# git rev-parse -q --verify cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2^{commit} cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2 already have revision, skipping fetch # git checkout -q -f -B kisskb cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2 # git clean -qxdf # < git log -1 # commit cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2 # Merge: 2e63f6ce7ed2 065fcfd49763 # Author: Linus Torvalds # Date: Wed Jun 3 16:27:18 2020 -0700 # # Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next # # Pull networking updates from David Miller: # # 1) Allow setting bluetooth L2CAP modes via socket option, from Luiz # Augusto von Dentz. # # 2) Add GSO partial support to igc, from Sasha Neftin. # # 3) Several cleanups and improvements to r8169 from Heiner Kallweit. # # 4) Add IF_OPER_TESTING link state and use it when ethtool triggers a # device self-test. From Andrew Lunn. # # 5) Start moving away from custom driver versions, use the globally # defined kernel version instead, from Leon Romanovsky. # # 6) Support GRO vis gro_cells in DSA layer, from Alexander Lobakin. # # 7) Allow hard IRQ deferral during NAPI, from Eric Dumazet. # # 8) Add sriov and vf support to hinic, from Luo bin. # # 9) Support Media Redundancy Protocol (MRP) in the bridging code, from # Horatiu Vultur. # # 10) Support netmap in the nft_nat code, from Pablo Neira Ayuso. # # 11) Allow UDPv6 encapsulation of ESP in the ipsec code, from Sabrina # Dubroca. Also add ipv6 support for espintcp. # # 12) Lots of ReST conversions of the networking documentation, from Mauro # Carvalho Chehab. # # 13) Support configuration of ethtool rxnfc flows in bcmgenet driver, # from Doug Berger. # # 14) Allow to dump cgroup id and filter by it in inet_diag code, from # Dmitry Yakunin. # # 15) Add infrastructure to export netlink attribute policies to # userspace, from Johannes Berg. # # 16) Several optimizations to sch_fq scheduler, from Eric Dumazet. # # 17) Fallback to the default qdisc if qdisc init fails because otherwise # a packet scheduler init failure will make a device inoperative. From # Jesper Dangaard Brouer. # # 18) Several RISCV bpf jit optimizations, from Luke Nelson. # # 19) Correct the return type of the ->ndo_start_xmit() method in several # drivers, it's netdev_tx_t but many drivers were using # 'int'. From Yunjian Wang. # # 20) Add an ethtool interface for PHY master/slave config, from Oleksij # Rempel. # # 21) Add BPF iterators, from Yonghang Song. # # 22) Add cable test infrastructure, including ethool interfaces, from # Andrew Lunn. Marvell PHY driver is the first to support this # facility. # # 23) Remove zero-length arrays all over, from Gustavo A. R. Silva. # # 24) Calculate and maintain an explicit frame size in XDP, from Jesper # Dangaard Brouer. # # 25) Add CAP_BPF, from Alexei Starovoitov. # # 26) Support terse dumps in the packet scheduler, from Vlad Buslov. # # 27) Support XDP_TX bulking in dpaa2 driver, from Ioana Ciornei. # # 28) Add devm_register_netdev(), from Bartosz Golaszewski. # # 29) Minimize qdisc resets, from Cong Wang. # # 30) Get rid of kernel_getsockopt and kernel_setsockopt in order to # eliminate set_fs/get_fs calls. From Christoph Hellwig. # # * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (2517 commits) # selftests: net: ip_defrag: ignore EPERM # net_failover: fixed rollback in net_failover_open() # Revert "tipc: Fix potential tipc_aead refcnt leak in tipc_crypto_rcv" # Revert "tipc: Fix potential tipc_node refcnt leak in tipc_rcv" # vmxnet3: allow rx flow hash ops only when rss is enabled # hinic: add set_channels ethtool_ops support # selftests/bpf: Add a default $(CXX) value # tools/bpf: Don't use $(COMPILE.c) # bpf, selftests: Use bpf_probe_read_kernel # s390/bpf: Use bcr 0,%0 as tail call nop filler # s390/bpf: Maintain 8-byte stack alignment # selftests/bpf: Fix verifier test # selftests/bpf: Fix sample_cnt shared between two threads # bpf, selftests: Adapt cls_redirect to call csum_level helper # bpf: Add csum_level helper for fixing up csum levels # bpf: Fix up bpf_skb_adjust_room helper's skb csum setting # sfc: add missing annotation for efx_ef10_try_update_nic_stats_vf() # crypto/chtls: IPv6 support for inline TLS # Crypto/chcr: Fixes a coccinile check error # Crypto/chcr: Fixes compilations warnings # ... # < /opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2 # < make -s -j 8 ARCH=sh O=/kisskb/build/linus_se7750_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- se7750_defconfig # < make -s -j 8 ARCH=sh O=/kisskb/build/linus_se7750_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 8 ARCH=sh O=/kisskb/build/linus_se7750_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 8 ARCH=sh O=/kisskb/build/linus_se7750_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh4/../sh3/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh4/../sh3/../../entry-common.S:385: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh4/../sh3/../../entry-common.S:388: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence In file included from /kisskb/src/arch/sh/kernel/cpu/sh4/setup-sh7750.c:13: /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:105:24: note: in expansion of macro '_INTC_ARRAY' 105 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/setup-sh7750.c:215:8: note: in expansion of macro 'DECLARE_INTC_DESC' 215 | static DECLARE_INTC_DESC(intc_desc, "sh7750", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:106:2: note: in expansion of macro '_INTC_ARRAY' 106 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/setup-sh7750.c:215:8: note: in expansion of macro 'DECLARE_INTC_DESC' 215 | static DECLARE_INTC_DESC(intc_desc, "sh7750", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:2: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/setup-sh7750.c:215:8: note: in expansion of macro 'DECLARE_INTC_DESC' 215 | static DECLARE_INTC_DESC(intc_desc, "sh7750", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:27: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/setup-sh7750.c:215:8: note: in expansion of macro 'DECLARE_INTC_DESC' 215 | static DECLARE_INTC_DESC(intc_desc, "sh7750", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:105:24: note: in expansion of macro '_INTC_ARRAY' 105 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/setup-sh7750.c:229:8: note: in expansion of macro 'DECLARE_INTC_DESC' 229 | static DECLARE_INTC_DESC(intc_desc_dma4, "sh7750_dma4", | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:106:2: note: in expansion of macro '_INTC_ARRAY' 106 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/setup-sh7750.c:229:8: note: in expansion of macro 'DECLARE_INTC_DESC' 229 | static DECLARE_INTC_DESC(intc_desc_dma4, "sh7750_dma4", | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:2: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/setup-sh7750.c:229:8: note: in expansion of macro 'DECLARE_INTC_DESC' 229 | static DECLARE_INTC_DESC(intc_desc_dma4, "sh7750_dma4", | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:27: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/setup-sh7750.c:229:8: note: in expansion of macro 'DECLARE_INTC_DESC' 229 | static DECLARE_INTC_DESC(intc_desc_dma4, "sh7750_dma4", | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:105:24: note: in expansion of macro '_INTC_ARRAY' 105 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/setup-sh7750.c:277:8: note: in expansion of macro 'DECLARE_INTC_DESC' 277 | static DECLARE_INTC_DESC(intc_desc_irlm, "sh7750_irlm", vectors_irlm, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:106:2: note: in expansion of macro '_INTC_ARRAY' 106 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/setup-sh7750.c:277:8: note: in expansion of macro 'DECLARE_INTC_DESC' 277 | static DECLARE_INTC_DESC(intc_desc_irlm, "sh7750_irlm", vectors_irlm, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:2: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/setup-sh7750.c:277:8: note: in expansion of macro 'DECLARE_INTC_DESC' 277 | static DECLARE_INTC_DESC(intc_desc_irlm, "sh7750_irlm", vectors_irlm, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:27: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/setup-sh7750.c:277:8: note: in expansion of macro 'DECLARE_INTC_DESC' 277 | static DECLARE_INTC_DESC(intc_desc_irlm, "sh7750_irlm", vectors_irlm, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/drivers/sh/clk/cpg.c: In function 'r8': /kisskb/src/drivers/sh/clk/cpg.c:41:17: warning: passing argument 1 of 'ioread8' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] 41 | return ioread8(addr); | ^~~~ In file included from /kisskb/src/arch/sh/include/asm/io.h:21, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:29:29: note: expected 'void *' but argument is of type 'const void *' 29 | extern unsigned int ioread8(void __iomem *); | ^~~~~~~~~~~~~~ /kisskb/src/drivers/sh/clk/cpg.c: In function 'r16': /kisskb/src/drivers/sh/clk/cpg.c:46:18: warning: passing argument 1 of 'ioread16' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] 46 | return ioread16(addr); | ^~~~ In file included from /kisskb/src/arch/sh/include/asm/io.h:21, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:30:30: note: expected 'void *' but argument is of type 'const void *' 30 | extern unsigned int ioread16(void __iomem *); | ^~~~~~~~~~~~~~ /kisskb/src/drivers/sh/clk/cpg.c: In function 'r32': /kisskb/src/drivers/sh/clk/cpg.c:51:18: warning: passing argument 1 of 'ioread32' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] 51 | return ioread32(addr); | ^~~~ In file included from /kisskb/src/arch/sh/include/asm/io.h:21, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:32:30: note: expected 'void *' but argument is of type 'const void *' 32 | extern unsigned int ioread32(void __iomem *); | ^~~~~~~~~~~~~~ Kernel: arch/sh/boot/zImage is ready Completed OK # rm -rf /kisskb/build/linus_se7750_defconfig_sh4-gcc10 # Build took: 0:01:39.485322