# 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-4.9.4-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 4a21185cda0fbb860580eeeb4f1a70a9cda332a4 # < make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- defconfig # < make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- help # make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- olddefconfig # make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- FIT description: Linux 5.8.0-rc2-32167-g4a21185cda0f Created: Sat Jun 27 03:02:24 2020 Image 0 (kernel@0) Description: Linux 5.8.0-rc2-32167-g4a21185cda0f Created: Sat Jun 27 03:02:24 2020 Type: Kernel Image Compression: gzip compressed Data Size: 5001303 Bytes = 4884.08 KiB = 4.77 MiB Architecture: MIPS OS: Linux Load Address: 0x80100000 Entry Point: 0x8092c5c0 Hash algo: sha1 Hash value: 48d8719ddd10a05b2edca5f57fbdf2eb751a5bec Image 1 (fdt@boston) Description: img,boston Device Tree Created: Sat Jun 27 03:02:24 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Sat Jun 27 03:02:24 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Sat Jun 27 03:02:24 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 4639 Bytes = 4.53 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: be2724f58b66c316a61da7c11ced633f4e7e86c7 Image 4 (fdt@ocelot_pcb120) Description: MSCC Ocelot PCB120 Device Tree Created: Sat Jun 27 03:02:24 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 5198 Bytes = 5.08 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 7556b1594bd7ab9e3b3fa939d8e3e03ae58fa180 Image 5 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Sat Jun 27 03:02:24 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@ocelot_pcb123) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb123 Configuration 4 (conf@ocelot_pcb120) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb120 Configuration 5 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/linus_mips-defconfig_mips-gcc4.9 # Build took: 0:01:36.543567