# git rev-parse -q --verify 69119673bd50b176ded34032fadd41530fb5af21^{commit} 69119673bd50b176ded34032fadd41530fb5af21 already have revision, skipping fetch # git checkout -q -f -B kisskb 69119673bd50b176ded34032fadd41530fb5af21 # git clean -qxdf # < git log -1 # commit 69119673bd50b176ded34032fadd41530fb5af21 # Merge: 26c20ffcb5c8 c9f66b43ee27 # Author: Linus Torvalds # Date: Tue Jun 16 17:44:54 2020 -0700 # # Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from David Miller: # # 1) Don't get per-cpu pointer with preemption enabled in nft_set_pipapo, # fix from Stefano Brivio. # # 2) Fix memory leak in ctnetlink, from Pablo Neira Ayuso. # # 3) Multiple definitions of MPTCP_PM_MAX_ADDR, from Geliang Tang. # # 4) Accidently disabling NAPI in non-error paths of macb_open(), from # Charles Keepax. # # 5) Fix races between alx_stop and alx_remove, from Zekun Shen. # # 6) We forget to re-enable SRIOV during resume in bnxt_en driver, from # Michael Chan. # # 7) Fix memory leak in ipv6_mc_destroy_dev(), from Wang Hai. # # 8) rxtx stats use wrong index in mvpp2 driver, from Sven Auhagen. # # 9) Fix memory leak in mptcp_subflow_create_socket error path, from Wei # Yongjun. # # 10) We should not adjust the TCP window advertised when sending dup acks # in non-SACK mode, because it won't be counted as a dup by the sender # if the window size changes. From Eric Dumazet. # # 11) Destroy the right number of queues during remove in mvpp2 driver, # from Sven Auhagen. # # 12) Various WOL and PM fixes to e1000 driver, from Chen Yu, Vaibhav # Gupta, and Arnd Bergmann. # # * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (35 commits) # e1000e: fix unused-function warning # e1000: use generic power management # e1000e: Do not wake up the system via WOL if device wakeup is disabled # lan743x: add MODULE_DEVICE_TABLE for module loading alias # mlxsw: spectrum: Adjust headroom buffers for 8x ports # bareudp: Fixed configuration to avoid having garbage values # mvpp2: remove module bugfix # tcp: grow window for OOO packets only for SACK flows # mptcp: fix memory leak in mptcp_subflow_create_socket() # netfilter: flowtable: Make nf_flow_table_offload_add/del_cb inline # net/sched: act_ct: Make tcf_ct_flow_table_restore_skb inline # net: dsa: sja1105: fix PTP timestamping with large tc-taprio cycles # mvpp2: ethtool rxtx stats fix # MAINTAINERS: switch to my private email for Renesas Ethernet drivers # rocker: fix incorrect error handling in dma_rings_init # test_objagg: Fix potential memory leak in error handling # net: ethernet: mtk-star-emac: simplify interrupt handling # mld: fix memory leak in ipv6_mc_destroy_dev() # bnxt_en: Return from timer if interface is not in open state. # bnxt_en: Fix AER reset logic on 57500 chips. # ... # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 69119673bd50b176ded34032fadd41530fb5af21 # < make -s -j 10 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- se7619_defconfig # < make -s -j 10 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 10 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 10 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-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 /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 return ioread8(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, 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:21: note: expected 'void *' but argument is of type 'const void *' 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 return ioread16(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, 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:21: note: expected 'void *' but argument is of type 'const void *' 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 return ioread32(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, 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:21: note: expected 'void *' but argument is of type 'const void *' extern unsigned int ioread32(void __iomem *); ^ Completed OK # rm -rf /kisskb/build/linus_se7619_defconfig_sh4-gcc4.9 # Build took: 0:00:43.204877