# git rev-parse -q --verify a1d21081a60dfb7fddf4a38b66d9cef603b317a9^{commit} a1d21081a60dfb7fddf4a38b66d9cef603b317a9 already have revision, skipping fetch # git checkout -q -f -B kisskb a1d21081a60dfb7fddf4a38b66d9cef603b317a9 # git clean -qxdf # < git log -1 # commit a1d21081a60dfb7fddf4a38b66d9cef603b317a9 # Merge: e764a1e32337 1f3a090b9033 # Author: Linus Torvalds # Date: Thu Aug 13 20:03:11 2020 -0700 # # Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from David Miller: # "Some merge window fallout, some longer term fixes: # # 1) Handle headroom properly in lapbether and x25_asy drivers, from # Xie He. # # 2) Fetch MAC address from correct r8152 device node, from Thierry # Reding. # # 3) In the sw kTLS path we should allow MSG_CMSG_COMPAT in sendmsg, # from Rouven Czerwinski. # # 4) Correct fdputs in socket layer, from Miaohe Lin. # # 5) Revert troublesome sockptr_t optimization, from Christoph Hellwig. # # 6) Fix TCP TFO key reading on big endian, from Jason Baron. # # 7) Missing CAP_NET_RAW check in nfc, from Qingyu Li. # # 8) Fix inet fastreuse optimization with tproxy sockets, from Tim # Froidcoeur. # # 9) Fix 64-bit divide in new SFC driver, from Edward Cree. # # 10) Add a tracepoint for prandom_u32 so that we can more easily # perform usage analysis. From Eric Dumazet. # # 11) Fix rwlock imbalance in AF_PACKET, from John Ogness" # # * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (49 commits) # net: openvswitch: introduce common code for flushing flows # af_packet: TPACKET_V3: fix fill status rwlock imbalance # random32: add a tracepoint for prandom_u32() # Revert "ipv4: tunnel: fix compilation on ARCH=um" # net: accept an empty mask in /sys/class/net/*/queues/rx-*/rps_cpus # net: ethernet: stmmac: Disable hardware multicast filter # net: stmmac: dwmac1000: provide multicast filter fallback # ipv4: tunnel: fix compilation on ARCH=um # vsock: fix potential null pointer dereference in vsock_poll() # sfc: fix ef100 design-param checking # net: initialize fastreuse on inet_inherit_port # net: refactor bind_bucket fastreuse into helper # net: phy: marvell10g: fix null pointer dereference # net: Fix potential memory leak in proto_register() # net: qcom/emac: add missed clk_disable_unprepare in error path of emac_clks_phase1_init # ionic_lif: Use devm_kcalloc() in ionic_qcq_alloc() # net/nfc/rawsock.c: add CAP_NET_RAW check. # hinic: fix strncpy output truncated compile warnings # drivers/net/wan/x25_asy: Added needed_headroom and a skb->len check # net/tls: Fix kmap usage # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 a1d21081a60dfb7fddf4a38b66d9cef603b317a9 # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- defconfig # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- /kisskb/src/arch/m68k/mvme147/config.c: In function 'mvme147_hwclk': /kisskb/src/arch/m68k/mvme147/config.c:174:2: warning: #warning check me! [-Wcpp] #warning check me! ^~~~~~~ /kisskb/src/arch/m68k/mvme16x/config.c: In function 'mvme16x_hwclk': /kisskb/src/arch/m68k/mvme16x/config.c:439:2: warning: #warning check me! [-Wcpp] #warning check me! ^~~~~~~ In file included from /kisskb/src/drivers/net/ethernet/8390/xsurf100.c:48: /kisskb/src/drivers/net/ethernet/8390/lib8390.c:988:27: warning: '____alloc_ei_netdev' defined but not used [-Wunused-function] static struct net_device *____alloc_ei_netdev(int size) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:950:13: warning: '__ei_set_multicast_list' defined but not used [-Wunused-function] static void __ei_set_multicast_list(struct net_device *dev) ^~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:850:33: warning: '__ei_get_stats' defined but not used [-Wunused-function] static struct net_device_stats *__ei_get_stats(struct net_device *dev) ^~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:509:13: warning: '__ei_poll' defined but not used [-Wunused-function] static void __ei_poll(struct net_device *dev) ^~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:300:20: warning: '__ei_start_xmit' defined but not used [-Wunused-function] static netdev_tx_t __ei_start_xmit(struct sk_buff *skb, ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:254:13: warning: '__ei_tx_timeout' defined but not used [-Wunused-function] static void __ei_tx_timeout(struct net_device *dev, unsigned int txqueue) ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:230:12: warning: '__ei_close' defined but not used [-Wunused-function] static int __ei_close(struct net_device *dev) ^~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:201:12: warning: '__ei_open' defined but not used [-Wunused-function] static int __ei_open(struct net_device *dev) ^~~~~~~~~ In file included from /kisskb/src/arch/m68k/include/asm/atomic.h:7, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/linux/cpumask.h:13, from /kisskb/src/include/linux/smp.h:13, from /kisskb/src/include/linux/lockdep.h:14, from /kisskb/src/include/linux/spinlock.h:59, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/fs/ocfs2/file.c:13: /kisskb/src/fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': /kisskb/src/arch/m68k/include/asm/cmpxchg.h:79:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/fs/ocfs2/file.c:2419:3: note: in expansion of macro 'xchg' xchg(&iocb->ki_complete, saved_ki_complete); ^~~~ Completed OK # rm -rf /kisskb/build/linus_m68k-defconfig_m68k-gcc8 # Build took: 0:02:22.589625