# git rev-parse -q --verify 47ec5303d73ea344e84f46660fff693c57641386^{commit} 47ec5303d73ea344e84f46660fff693c57641386 already have revision, skipping fetch # git checkout -q -f -B kisskb 47ec5303d73ea344e84f46660fff693c57641386 # git clean -qxdf # < git log -1 # commit 47ec5303d73ea344e84f46660fff693c57641386 # Merge: 8186749621ed c1055b76ad00 # Author: Linus Torvalds # Date: Wed Aug 5 20:13:21 2020 -0700 # # Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next # # Pull networking updates from David Miller: # # 1) Support 6Ghz band in ath11k driver, from Rajkumar Manoharan. # # 2) Support UDP segmentation in code TSO code, from Eric Dumazet. # # 3) Allow flashing different flash images in cxgb4 driver, from Vishal # Kulkarni. # # 4) Add drop frames counter and flow status to tc flower offloading, # from Po Liu. # # 5) Support n-tuple filters in cxgb4, from Vishal Kulkarni. # # 6) Various new indirect call avoidance, from Eric Dumazet and Brian # Vazquez. # # 7) Fix BPF verifier failures on 32-bit pointer arithmetic, from # Yonghong Song. # # 8) Support querying and setting hardware address of a port function via # devlink, use this in mlx5, from Parav Pandit. # # 9) Support hw ipsec offload on bonding slaves, from Jarod Wilson. # # 10) Switch qca8k driver over to phylink, from Jonathan McDowell. # # 11) In bpftool, show list of processes holding BPF FD references to # maps, programs, links, and btf objects. From Andrii Nakryiko. # # 12) Several conversions over to generic power management, from Vaibhav # Gupta. # # 13) Add support for SO_KEEPALIVE et al. to bpf_setsockopt(), from Dmitry # Yakunin. # # 14) Various https url conversions, from Alexander A. Klimov. # # 15) Timestamping and PHC support for mscc PHY driver, from Antoine # Tenart. # # 16) Support bpf iterating over tcp and udp sockets, from Yonghong Song. # # 17) Support 5GBASE-T i40e NICs, from Aleksandr Loktionov. # # 18) Add kTLS RX HW offload support to mlx5e, from Tariq Toukan. # # 19) Fix the ->ndo_start_xmit() return type to be netdev_tx_t in several # drivers. From Luc Van Oostenryck. # # 20) XDP support for xen-netfront, from Denis Kirjanov. # # 21) Support receive buffer autotuning in MPTCP, from Florian Westphal. # # 22) Support EF100 chip in sfc driver, from Edward Cree. # # 23) Add XDP support to mvpp2 driver, from Matteo Croce. # # 24) Support MPTCP in sock_diag, from Paolo Abeni. # # 25) Commonize UDP tunnel offloading code by creating udp_tunnel_nic # infrastructure, from Jakub Kicinski. # # 26) Several pci_ --> dma_ API conversions, from Christophe JAILLET. # # 27) Add FLOW_ACTION_POLICE support to mlxsw, from Ido Schimmel. # # 28) Add SK_LOOKUP bpf program type, from Jakub Sitnicki. # # 29) Refactor a lot of networking socket option handling code in order to # avoid set_fs() calls, from Christoph Hellwig. # # 30) Add rfc4884 support to icmp code, from Willem de Bruijn. # # 31) Support TBF offload in dpaa2-eth driver, from Ioana Ciornei. # # 32) Support XDP_REDIRECT in qede driver, from Alexander Lobakin. # # 33) Support PCI relaxed ordering in mlx5 driver, from Aya Levin. # # 34) Support TCP syncookies in MPTCP, from Flowian Westphal. # # 35) Fix several tricky cases of PMTU handling wrt. briding, from Stefano # Brivio. # # * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (2056 commits) # net: thunderx: initialize VF's mailbox mutex before first usage # usb: hso: remove bogus check for EINPROGRESS # usb: hso: no complaint about kmalloc failure # hso: fix bailout in error case of probe # ip_tunnel_core: Fix build for archs without _HAVE_ARCH_IPV6_CSUM # selftests/net: relax cpu affinity requirement in msg_zerocopy test # mptcp: be careful on subflow creation # selftests: rtnetlink: make kci_test_encap() return sub-test result # selftests: rtnetlink: correct the final return value for the test # net: dsa: sja1105: use detected device id instead of DT one on mismatch # tipc: set ub->ifindex for local ipv6 address # ipv6: add ipv6_dev_find() # net: openvswitch: silence suspicious RCU usage warning # Revert "vxlan: fix tos value before xmit" # ptp: only allow phase values lower than 1 period # farsync: switch from 'pci_' to 'dma_' API # wan: wanxl: switch from 'pci_' to 'dma_' API # hv_netvsc: do not use VF device if link is down # dpaa2-eth: Fix passing zero to 'PTR_ERR' warning # net: macb: Properly handle phylink on at91sam9x # ... # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-ld --version # < git log --format=%s --max-count=1 47ec5303d73ea344e84f46660fff693c57641386 # < make -s -j 80 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # Added to kconfig # < make -s -j 80 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- help # make -s -j 80 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- olddefconfig .config:12409:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 80 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- In file included from /kisskb/src/arch/mips/include/asm/bug.h:42:0, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/thread_info.h:12, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/mips/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:15, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/include/linux/seqlock.h: In function 'write_seqcount_begin_nested': /kisskb/src/include/asm-generic/percpu.h:31:40: error: implicit declaration of function 'raw_smp_processor_id' [-Werror=implicit-function-declaration] #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^ /kisskb/src/include/asm-generic/bug.h:145:27: note: in definition of macro 'WARN_ON_ONCE' int __ret_warn_once = !!(condition); \ ^ /kisskb/src/include/linux/compiler_types.h:301:2: note: in expansion of macro '__compiletime_assert' __compiletime_assert(condition, msg, prefix, suffix) ^ /kisskb/src/include/linux/compiler_types.h:313:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^ /kisskb/src/include/asm-generic/percpu.h:119:10: note: in expansion of macro 'READ_ONCE' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^ /kisskb/src/include/linux/percpu-defs.h:231:2: note: in expansion of macro 'RELOC_HIDE' RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset)) ^ /kisskb/src/include/asm-generic/percpu.h:44:31: note: in expansion of macro 'SHIFT_PERCPU_PTR' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^ /kisskb/src/include/asm-generic/percpu.h:31:25: note: in expansion of macro 'per_cpu_offset' #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^ /kisskb/src/include/asm-generic/percpu.h:44:53: note: in expansion of macro '__my_cpu_offset' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^ /kisskb/src/include/linux/percpu-defs.h:242:2: note: in expansion of macro 'arch_raw_cpu_ptr' arch_raw_cpu_ptr(ptr); \ ^ /kisskb/src/include/asm-generic/percpu.h:119:21: note: in expansion of macro 'raw_cpu_ptr' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^ /kisskb/src/include/asm-generic/percpu.h:138:11: note: in expansion of macro '__this_cpu_generic_read_nopreempt' __ret = __this_cpu_generic_read_nopreempt(pcp); \ ^ /kisskb/src/include/asm-generic/percpu.h:320:31: note: in expansion of macro 'this_cpu_generic_read' #define this_cpu_read_1(pcp) this_cpu_generic_read(pcp) ^ /kisskb/src/include/linux/percpu-defs.h:321:23: note: in expansion of macro 'this_cpu_read_1' case 1: pscr_ret__ = stem##1(variable); break; \ ^ /kisskb/src/include/linux/percpu-defs.h:507:29: note: in expansion of macro '__pcpu_size_call_return' #define this_cpu_read(pcp) __pcpu_size_call_return(this_cpu_read_, pcp) ^ /kisskb/src/include/linux/lockdep.h:565:9: note: in expansion of macro 'this_cpu_read' this_cpu_read(hardirqs_enabled))); \ ^ /kisskb/src/include/linux/seqlock.h:285:2: note: in expansion of macro 'lockdep_assert_preemption_disabled' lockdep_assert_preemption_disabled(); ^ In file included from /kisskb/src/include/linux/smp.h:82:0, from /kisskb/src/arch/mips/include/asm/cpu-type.h:12, from /kisskb/src/arch/mips/include/asm/timex.h:19, from /kisskb/src/include/linux/timex.h:65, from /kisskb/src/include/linux/time32.h:13, from /kisskb/src/include/linux/time.h:74, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/arch/mips/include/asm/smp.h: At top level: /kisskb/src/arch/mips/include/asm/smp.h:28:19: error: static declaration of 'raw_smp_processor_id' follows non-static declaration static inline int raw_smp_processor_id(void) ^ In file included from /kisskb/src/arch/mips/include/asm/bug.h:42:0, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/thread_info.h:12, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/mips/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:15, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/include/asm-generic/percpu.h:31:40: note: previous implicit declaration of 'raw_smp_processor_id' was here #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^ /kisskb/src/include/asm-generic/bug.h:145:27: note: in definition of macro 'WARN_ON_ONCE' int __ret_warn_once = !!(condition); \ ^ /kisskb/src/include/linux/compiler_types.h:301:2: note: in expansion of macro '__compiletime_assert' __compiletime_assert(condition, msg, prefix, suffix) ^ /kisskb/src/include/linux/compiler_types.h:313:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^ /kisskb/src/include/asm-generic/percpu.h:119:10: note: in expansion of macro 'READ_ONCE' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^ /kisskb/src/include/linux/percpu-defs.h:231:2: note: in expansion of macro 'RELOC_HIDE' RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset)) ^ /kisskb/src/include/asm-generic/percpu.h:44:31: note: in expansion of macro 'SHIFT_PERCPU_PTR' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^ /kisskb/src/include/asm-generic/percpu.h:31:25: note: in expansion of macro 'per_cpu_offset' #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^ /kisskb/src/include/asm-generic/percpu.h:44:53: note: in expansion of macro '__my_cpu_offset' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^ /kisskb/src/include/linux/percpu-defs.h:242:2: note: in expansion of macro 'arch_raw_cpu_ptr' arch_raw_cpu_ptr(ptr); \ ^ /kisskb/src/include/asm-generic/percpu.h:119:21: note: in expansion of macro 'raw_cpu_ptr' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^ /kisskb/src/include/asm-generic/percpu.h:138:11: note: in expansion of macro '__this_cpu_generic_read_nopreempt' __ret = __this_cpu_generic_read_nopreempt(pcp); \ ^ /kisskb/src/include/asm-generic/percpu.h:320:31: note: in expansion of macro 'this_cpu_generic_read' #define this_cpu_read_1(pcp) this_cpu_generic_read(pcp) ^ /kisskb/src/include/linux/percpu-defs.h:321:23: note: in expansion of macro 'this_cpu_read_1' case 1: pscr_ret__ = stem##1(variable); break; \ ^ /kisskb/src/include/linux/percpu-defs.h:507:29: note: in expansion of macro '__pcpu_size_call_return' #define this_cpu_read(pcp) __pcpu_size_call_return(this_cpu_read_, pcp) ^ /kisskb/src/include/linux/lockdep.h:565:9: note: in expansion of macro 'this_cpu_read' this_cpu_read(hardirqs_enabled))); \ ^ /kisskb/src/include/linux/seqlock.h:285:2: note: in expansion of macro 'lockdep_assert_preemption_disabled' lockdep_assert_preemption_disabled(); ^ cc1: some warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:114: arch/mips/kernel/asm-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1195: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 80 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mipsel # Build took: 0:00:18.083934