# git rev-parse -q --verify 4a21185cda0fbb860580eeeb4f1a70a9cda332a4^{commit} 4a21185cda0fbb860580eeeb4f1a70a9cda332a4 already have revision, skipping fetch # git checkout -q -f -B kisskb 4a21185cda0fbb860580eeeb4f1a70a9cda332a4 # git clean -qxdf # < git log -1 # commit 4a21185cda0fbb860580eeeb4f1a70a9cda332a4 # Merge: 42e9c85f5c72 4c342f778fe2 # Author: Linus Torvalds # Date: Thu Jun 25 18:27:40 2020 -0700 # # Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from David Miller: # # 1) Don't insert ESP trailer twice in IPSEC code, from Huy Nguyen. # # 2) The default crypto algorithm selection in Kconfig for IPSEC is out # of touch with modern reality, fix this up. From Eric Biggers. # # 3) bpftool is missing an entry for BPF_MAP_TYPE_RINGBUF, from Andrii # Nakryiko. # # 4) Missing init of ->frame_sz in xdp_convert_zc_to_xdp_frame(), from # Hangbin Liu. # # 5) Adjust packet alignment handling in ax88179_178a driver to match # what the hardware actually does. From Jeremy Kerr. # # 6) register_netdevice can leak in the case one of the notifiers fail, # from Yang Yingliang. # # 7) Use after free in ip_tunnel_lookup(), from Taehee Yoo. # # 8) VLAN checks in sja1105 DSA driver need adjustments, from Vladimir # Oltean. # # 9) tg3 driver can sleep forever when we get enough EEH errors, fix from # David Christensen. # # 10) Missing {READ,WRITE}_ONCE() annotations in various Intel ethernet # drivers, from Ciara Loftus. # # 11) Fix scanning loop break condition in of_mdiobus_register(), from # Florian Fainelli. # # 12) MTU limit is incorrect in ibmveth driver, from Thomas Falcon. # # 13) Endianness fix in mlxsw, from Ido Schimmel. # # 14) Use after free in smsc95xx usbnet driver, from Tuomas Tynkkynen. # # 15) Missing bridge mrp configuration validation, from Horatiu Vultur. # # 16) Fix circular netns references in wireguard, from Jason A. Donenfeld. # # 17) PTP initialization on recovery is not done properly in qed driver, # from Alexander Lobakin. # # 18) Endian conversion of L4 ports in filters of cxgb4 driver is wrong, # from Rahul Lakkireddy. # # 19) Don't clear bound device TX queue of socket prematurely otherwise we # get problems with ktls hw offloading, from Tariq Toukan. # # 20) ipset can do atomics on unaligned memory, fix from Russell King. # # 21) Align ethernet addresses properly in bridging code, from Thomas # Martitz. # # 22) Don't advertise ipv4 addresses on SCTP sockets having ipv6only set, # from Marcelo Ricardo Leitner. # # * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (149 commits) # rds: transport module should be auto loaded when transport is set # sch_cake: fix a few style nits # sch_cake: don't call diffserv parsing code when it is not needed # sch_cake: don't try to reallocate or unshare skb unconditionally # ethtool: fix error handling in linkstate_prepare_data() # wil6210: account for napi_gro_receive never returning GRO_DROP # hns: do not cast return value of napi_gro_receive to null # socionext: account for napi_gro_receive never returning GRO_DROP # wireguard: receive: account for napi_gro_receive never returning GRO_DROP # vxlan: fix last fdb index during dump of fdb with nhid # sctp: Don't advertise IPv4 addresses if ipv6only is set on the socket # tc-testing: avoid action cookies with odd length. # bpf: tcp: bpf_cubic: fix spurious HYSTART_DELAY exit upon drop in min RTT # tcp_cubic: fix spurious HYSTART_DELAY exit upon drop in min RTT # net: dsa: sja1105: fix tc-gate schedule with single element # net: dsa: sja1105: recalculate gating subschedule after deleting tc-gate rules # net: dsa: sja1105: unconditionally free old gating config # net: dsa: sja1105: move sja1105_compose_gating_subschedule at the top # net: macb: free resources on failure path of at91ether_open() # net: macb: call pm_runtime_put_sync on failure path # ... # < /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 4a21185cda0fbb860580eeeb4f1a70a9cda332a4 # < make -s -j 48 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- se7619_defconfig # < make -s -j 48 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 48 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 48 ARCH=sh O=/kisskb/build/linus_se7619_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/sh2/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:385: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../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/include/asm/hw_irq.h:6, from /kisskb/src/include/linux/irq.h:563, from /kisskb/src/arch/sh/include/asm/hardirq.h:6, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/serial_core.h:14, from /kisskb/src/include/linux/serial_sci.h:6, from /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:11: /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/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", 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/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", 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/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", 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/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, 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 *); | ^~~~~~~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_se7619_defconfig_sh4-gcc10 # Build took: 0:00:27.084189