# 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-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 4a21185cda0fbb860580eeeb4f1a70a9cda332a4 # < make -s -j 24 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 24 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 24 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 24 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/arch/m68k/include/asm/atomic.h:7, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/linux/spinlock.h:460, from /kisskb/src/include/linux/mmzone.h:8, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/mm.h:10, from /kisskb/src/kernel/acct.c:47: /kisskb/src/kernel/acct.c: In function 'acct_pin_kill': /kisskb/src/arch/m68k/include/asm/cmpxchg.h:137:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\ ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (unsigned long)(n), sizeof(*(ptr)))) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/cmpxchg.h:106:28: note: in expansion of macro 'cmpxchg_local' #define cmpxchg(ptr, o, n) cmpxchg_local((ptr), (o), (n)) ^~~~~~~~~~~~~ /kisskb/src/kernel/acct.c:177:2: note: in expansion of macro 'cmpxchg' cmpxchg(&acct->ns->bacct, pin, NULL); ^~~~~~~ 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/spinlock.h:460, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/module.h:13, from /kisskb/src/net/core/filter.c:20: /kisskb/src/net/core/filter.c: In function 'bpf_clear_redirect_map': /kisskb/src/arch/m68k/include/asm/cmpxchg.h:137:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\ ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (unsigned long)(n), sizeof(*(ptr)))) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/cmpxchg.h:106:28: note: in expansion of macro 'cmpxchg_local' #define cmpxchg(ptr, o, n) cmpxchg_local((ptr), (o), (n)) ^~~~~~~~~~~~~ /kisskb/src/net/core/filter.c:3569:4: note: in expansion of macro 'cmpxchg' cmpxchg(&ri->map, map, NULL); ^~~~~~~ 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/spinlock.h:460, from /kisskb/src/include/linux/mmzone.h:8, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/slab.h:15, from /kisskb/src/fs/posix_acl.c:15: /kisskb/src/fs/posix_acl.c: In function 'get_acl': /kisskb/src/arch/m68k/include/asm/cmpxchg.h:137:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\ ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (unsigned long)(n), sizeof(*(ptr)))) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/cmpxchg.h:106:28: note: in expansion of macro 'cmpxchg_local' #define cmpxchg(ptr, o, n) cmpxchg_local((ptr), (o), (n)) ^~~~~~~~~~~~~ /kisskb/src/fs/posix_acl.c:148:3: note: in expansion of macro 'cmpxchg' cmpxchg(p, sentinel, ACL_NOT_CACHED); ^~~~~~~ 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/spinlock.h:460, 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:40.502344