# git rev-parse -q --verify 4e33d7d47943aaa84a5904472cf2f9c6d6b0a6ca^{commit} 4e33d7d47943aaa84a5904472cf2f9c6d6b0a6ca already have revision, skipping fetch # git checkout -q -f -B kisskb 4e33d7d47943aaa84a5904472cf2f9c6d6b0a6ca # git clean -qxdf # < git log -1 # commit 4e33d7d47943aaa84a5904472cf2f9c6d6b0a6ca # Merge: 021c917 e48e097 # Author: Linus Torvalds # Date: Mon Jul 2 11:18:28 2018 -0700 # # Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net # # Pull networking fixes from David Miller: # # 1) Verify netlink attributes properly in nf_queue, from Eric Dumazet. # # 2) Need to bump memory lock rlimit for test_sockmap bpf test, from # Yonghong Song. # # 3) Fix VLAN handling in lan78xx driver, from Dave Stevenson. # # 4) Fix uninitialized read in nf_log, from Jann Horn. # # 5) Fix raw command length parsing in mlx5, from Alex Vesker. # # 6) Cleanup loopback RDS connections upon netns deletion, from Sowmini # Varadhan. # # 7) Fix regressions in FIB rule matching during create, from Jason A. # Donenfeld and Roopa Prabhu. # # 8) Fix mpls ether type detection in nfp, from Pieter Jansen van Vuuren. # # 9) More bpfilter build fixes/adjustments from Masahiro Yamada. # # 10) Fix XDP_{TX,REDIRECT} flushing in various drivers, from Jesper # Dangaard Brouer. # # 11) fib_tests.sh file permissions were broken, from Shuah Khan. # # 12) Make sure BH/preemption is disabled in data path of mac80211, from # Denis Kenzior. # # 13) Don't ignore nla_parse_nested() return values in nl80211, from # Johannes berg. # # 14) Properly account sock objects ot kmemcg, from Shakeel Butt. # # 15) Adjustments to setting bpf program permissions to read-only, from # Daniel Borkmann. # # 16) TCP Fast Open key endianness was broken, it always took on the host # endiannness. Whoops. Explicitly make it little endian. From Yuching # Cheng. # # 17) Fix prefix route setting for link local addresses in ipv6, from # David Ahern. # # 18) Potential Spectre v1 in zatm driver, from Gustavo A. R. Silva. # # 19) Various bpf sockmap fixes, from John Fastabend. # # 20) Use after free for GRO with ESP, from Sabrina Dubroca. # # 21) Passing bogus flags to crypto_alloc_shash() in ipv6 SR code, from # Eric Biggers. # # * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (87 commits) # qede: Adverstise software timestamp caps when PHC is not available. # qed: Fix use of incorrect size in memcpy call. # qed: Fix setting of incorrect eswitch mode. # qed: Limit msix vectors in kdump kernel to the minimum required count. # ipvlan: call dev_change_flags when ipvlan mode is reset # ipv6: sr: fix passing wrong flags to crypto_alloc_shash() # net: fix use-after-free in GRO with ESP # tcp: prevent bogus FRTO undos with non-SACK flows # bpf: sockhash, add release routine # bpf: sockhash fix omitted bucket lock in sock_close # bpf: sockmap, fix smap_list_map_remove when psock is in many maps # bpf: sockmap, fix crash when ipv6 sock is added # net: fib_rules: bring back rule_exists to match rule during add # hv_netvsc: split sub-channel setup into async and sync # net: use dev_change_tx_queue_len() for SIOCSIFTXQLEN # atm: zatm: Fix potential Spectre v1 # s390/qeth: consistently re-enable device features # s390/qeth: don't clobber buffer on async TX completion # s390/qeth: avoid using is_multicast_ether_addr_64bits on (u8 *)[6] # s390/qeth: fix race when setting MAC address # ... # < /opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux-gcc --version # < git log --format=%s --max-count=1 4e33d7d47943aaa84a5904472cf2f9c6d6b0a6ca # < make -s -j 48 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- allmodconfig # Added to kconfig CONFIG_64BIT=n # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_HAVE_FTRACE_MCOUNT_RECORD=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MODULE_SIG=n # yes \n | make -s -j 48 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- oldconfig yes: standard output: Broken pipe yes: write error # make -s -j 48 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- :1332:2: warning: #warning syscall io_pgetevents not implemented [-Wcpp] :1335:2: warning: #warning syscall rseq not implemented [-Wcpp] In file included from /kisskb/src/arch/sparc/include/asm/cacheflush.h:11:0, from /kisskb/src/drivers/android/binder.c:54: /kisskb/src/arch/sparc/include/asm/cacheflush_32.h:40:37: warning: 'struct page' declared inside parameter list void sparc_flush_page_to_ram(struct page *page); ^ /kisskb/src/arch/sparc/include/asm/cacheflush_32.h:40:37: warning: its scope is only this definition or declaration, which is probably not what you want In file included from /kisskb/src/arch/sparc/include/asm/cacheflush.h:11:0, from /kisskb/src/drivers/android/binder_alloc.c:20: /kisskb/src/arch/sparc/include/asm/cacheflush_32.h:40:37: warning: 'struct page' declared inside parameter list void sparc_flush_page_to_ram(struct page *page); ^ /kisskb/src/arch/sparc/include/asm/cacheflush_32.h:40:37: warning: its scope is only this definition or declaration, which is probably not what you want /kisskb/src/drivers/char/tpm/tpm2-cmd.c: In function 'tpm2_unseal_trusted': /kisskb/src/drivers/char/tpm/tpm2-cmd.c:730:2: warning: 'blob_handle' may be used uninitialized in this function [-Wmaybe-uninitialized] tpm2_flush_context_cmd(chip, blob_handle, TPM_TRANSMIT_UNLOCKED); ^ In file included from /kisskb/src/arch/sparc/include/asm/cmpxchg.h:7:0, from /kisskb/src/arch/sparc/include/asm/atomic_32.h:17, from /kisskb/src/arch/sparc/include/asm/atomic.h:7, from /kisskb/src/include/linux/atomic.h:5, from /kisskb/src/arch/sparc/include/asm/smp_32.h:25, from /kisskb/src/arch/sparc/include/asm/smp.h:7, from /kisskb/src/arch/sparc/include/asm/switch_to_32.h:5, from /kisskb/src/arch/sparc/include/asm/switch_to.h:7, from /kisskb/src/arch/sparc/include/asm/ptrace.h:120, from /kisskb/src/arch/sparc/include/asm/thread_info_32.h:19, from /kisskb/src/arch/sparc/include/asm/thread_info.h:7, from /kisskb/src/include/linux/thread_info.h:38, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/sparc/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:81, from /kisskb/src/include/linux/spinlock.h:51, 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:27: /kisskb/src/fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': /kisskb/src/arch/sparc/include/asm/cmpxchg_32.h:28: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:2386:3: note: in expansion of macro 'xchg' xchg(&iocb->ki_complete, saved_ki_complete); ^ /kisskb/src/drivers/input/joystick/analog.c:176:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ In file included from /kisskb/src/include/linux/printk.h:7:0, from /kisskb/src/include/linux/kernel.h:14, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/rculist.h:10, from /kisskb/src/include/linux/sched/signal.h:5, from /kisskb/src/drivers/net/usb/hso.c:55: /kisskb/src/drivers/net/usb/hso.c: In function 'hso_serial_set_termios': /kisskb/src/include/linux/kern_levels.h:5:18: warning: format '%d' expects argument of type 'int', but argument 4 has type 'tcflag_t {aka long unsigned int}' [-Wformat=] #define KERN_SOH "\001" /* ASCII Start Of Header */ ^ /kisskb/src/include/linux/kern_levels.h:14:19: note: in expansion of macro 'KERN_SOH' #define KERN_INFO KERN_SOH "6" /* informational */ ^ /kisskb/src/include/linux/printk.h:311:9: note: in expansion of macro 'KERN_INFO' printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) ^ /kisskb/src/drivers/net/usb/hso.c:115:3: note: in expansion of macro 'pr_info' pr_info("[%d:%s] " fmt, \ ^ /kisskb/src/drivers/net/usb/hso.c:1404:3: note: in expansion of macro 'hso_dbg' hso_dbg(0x16, "Termios called with: cflags new[%d] - old[%d]\n", ^ /kisskb/src/include/linux/kern_levels.h:5:18: warning: format '%d' expects argument of type 'int', but argument 5 has type 'tcflag_t {aka long unsigned int}' [-Wformat=] #define KERN_SOH "\001" /* ASCII Start Of Header */ ^ /kisskb/src/include/linux/kern_levels.h:14:19: note: in expansion of macro 'KERN_SOH' #define KERN_INFO KERN_SOH "6" /* informational */ ^ /kisskb/src/include/linux/printk.h:311:9: note: in expansion of macro 'KERN_INFO' printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) ^ /kisskb/src/drivers/net/usb/hso.c:115:3: note: in expansion of macro 'pr_info' pr_info("[%d:%s] " fmt, \ ^ /kisskb/src/drivers/net/usb/hso.c:1404:3: note: in expansion of macro 'hso_dbg' hso_dbg(0x16, "Termios called with: cflags new[%d] - old[%d]\n", ^ /kisskb/src/drivers/tty/serial/sunzilog.c:1132:13: warning: 'sunzilog_putchar' defined but not used [-Wunused-function] static void sunzilog_putchar(struct uart_port *port, int ch) ^ In file included from /kisskb/src/arch/sparc/include/asm/cacheflush.h:11:0, from /kisskb/src/drivers/staging/media/omap4iss/iss_video.c:14: /kisskb/src/arch/sparc/include/asm/cacheflush_32.h:40:37: warning: 'struct page' declared inside parameter list void sparc_flush_page_to_ram(struct page *page); ^ /kisskb/src/arch/sparc/include/asm/cacheflush_32.h:40:37: warning: its scope is only this definition or declaration, which is probably not what you want In file included from /kisskb/src/arch/sparc/include/asm/page.h:10:0, from /kisskb/src/arch/sparc/include/asm/string_32.h:13, from /kisskb/src/arch/sparc/include/asm/string.h:7, from /kisskb/src/include/linux/string.h:20, from /kisskb/src/include/linux/bitmap.h:9, from /kisskb/src/include/linux/cpumask.h:12, from /kisskb/src/arch/sparc/include/asm/smp_32.h:15, from /kisskb/src/arch/sparc/include/asm/smp.h:7, from /kisskb/src/arch/sparc/include/asm/switch_to_32.h:5, from /kisskb/src/arch/sparc/include/asm/switch_to.h:7, from /kisskb/src/arch/sparc/include/asm/ptrace.h:120, from /kisskb/src/arch/sparc/include/asm/thread_info_32.h:19, from /kisskb/src/arch/sparc/include/asm/thread_info.h:7, from /kisskb/src/include/linux/thread_info.h:38, from /kisskb/src/arch/sparc/include/asm/current.h:15, from /kisskb/src/include/linux/mutex.h:14, from /kisskb/src/include/linux/notifier.h:14, from /kisskb/src/include/linux/clk.h:17, from /kisskb/src/drivers/staging/media/omap4iss/iss_video.c:15: /kisskb/src/include/linux/highmem.h: In function 'clear_user_highpage': /kisskb/src/include/linux/highmem.h:137:31: error: passing argument 1 of 'sparc_flush_page_to_ram' from incompatible pointer type [-Werror=incompatible-pointer-types] clear_user_page(addr, vaddr, page); ^ /kisskb/src/arch/sparc/include/asm/page_32.h:24:27: note: in definition of macro 'clear_user_page' sparc_flush_page_to_ram(page); \ ^ In file included from /kisskb/src/arch/sparc/include/asm/cacheflush.h:11:0, from /kisskb/src/drivers/staging/media/omap4iss/iss_video.c:14: /kisskb/src/arch/sparc/include/asm/cacheflush_32.h:40:6: note: expected 'struct page *' but argument is of type 'struct page *' void sparc_flush_page_to_ram(struct page *page); ^ /kisskb/src/include/linux/highmem.h: In function 'zero_user_segments': /kisskb/src/include/linux/highmem.h:209:20: error: passing argument 1 of 'sparc_flush_page_to_ram' from incompatible pointer type [-Werror=incompatible-pointer-types] flush_dcache_page(page); ^ /kisskb/src/arch/sparc/include/asm/cacheflush_32.h:43:59: note: in definition of macro 'flush_dcache_page' #define flush_dcache_page(page) sparc_flush_page_to_ram(page) ^ /kisskb/src/arch/sparc/include/asm/cacheflush_32.h:40:6: note: expected 'struct page *' but argument is of type 'struct page *' void sparc_flush_page_to_ram(struct page *page); ^ In file included from /kisskb/src/arch/sparc/include/asm/page.h:10:0, from /kisskb/src/arch/sparc/include/asm/string_32.h:13, from /kisskb/src/arch/sparc/include/asm/string.h:7, from /kisskb/src/include/linux/string.h:20, from /kisskb/src/include/linux/bitmap.h:9, from /kisskb/src/include/linux/cpumask.h:12, from /kisskb/src/arch/sparc/include/asm/smp_32.h:15, from /kisskb/src/arch/sparc/include/asm/smp.h:7, from /kisskb/src/arch/sparc/include/asm/switch_to_32.h:5, from /kisskb/src/arch/sparc/include/asm/switch_to.h:7, from /kisskb/src/arch/sparc/include/asm/ptrace.h:120, from /kisskb/src/arch/sparc/include/asm/thread_info_32.h:19, from /kisskb/src/arch/sparc/include/asm/thread_info.h:7, from /kisskb/src/include/linux/thread_info.h:38, from /kisskb/src/arch/sparc/include/asm/current.h:15, from /kisskb/src/include/linux/mutex.h:14, from /kisskb/src/include/linux/notifier.h:14, from /kisskb/src/include/linux/clk.h:17, from /kisskb/src/drivers/staging/media/omap4iss/iss_video.c:15: /kisskb/src/include/linux/highmem.h: In function 'copy_user_highpage': /kisskb/src/include/linux/highmem.h:233:36: error: passing argument 1 of 'sparc_flush_page_to_ram' from incompatible pointer type [-Werror=incompatible-pointer-types] copy_user_page(vto, vfrom, vaddr, to); ^ /kisskb/src/arch/sparc/include/asm/page_32.h:28:27: note: in definition of macro 'copy_user_page' sparc_flush_page_to_ram(page); \ ^ In file included from /kisskb/src/arch/sparc/include/asm/cacheflush.h:11:0, from /kisskb/src/drivers/staging/media/omap4iss/iss_video.c:14: /kisskb/src/arch/sparc/include/asm/cacheflush_32.h:40:6: note: expected 'struct page *' but argument is of type 'struct page *' void sparc_flush_page_to_ram(struct page *page); ^ cc1: some warnings being treated as errors /kisskb/src/scripts/Makefile.build:317: recipe for target 'drivers/staging/media/omap4iss/iss_video.o' failed make[5]: *** [drivers/staging/media/omap4iss/iss_video.o] Error 1 make[5]: *** Waiting for unfinished jobs.... /kisskb/src/scripts/Makefile.build:558: recipe for target 'drivers/staging/media/omap4iss' failed make[4]: *** [drivers/staging/media/omap4iss] Error 2 /kisskb/src/scripts/Makefile.build:558: recipe for target 'drivers/staging/media' failed make[3]: *** [drivers/staging/media] Error 2 make[3]: *** Waiting for unfinished jobs.... /kisskb/src/scripts/Makefile.build:558: recipe for target 'drivers/staging' failed make[2]: *** [drivers/staging] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/sparc/include/asm/cmpxchg.h:7:0, from /kisskb/src/arch/sparc/include/asm/atomic_32.h:17, from /kisskb/src/arch/sparc/include/asm/atomic.h:7, from /kisskb/src/include/linux/atomic.h:5, from /kisskb/src/arch/sparc/include/asm/smp_32.h:25, from /kisskb/src/arch/sparc/include/asm/smp.h:7, from /kisskb/src/arch/sparc/include/asm/switch_to_32.h:5, from /kisskb/src/arch/sparc/include/asm/switch_to.h:7, from /kisskb/src/arch/sparc/include/asm/ptrace.h:120, from /kisskb/src/arch/sparc/include/asm/thread_info_32.h:19, from /kisskb/src/arch/sparc/include/asm/thread_info.h:7, from /kisskb/src/include/linux/thread_info.h:38, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/sparc/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:81, from /kisskb/src/include/linux/spinlock.h:51, 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:10, from /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c:12: /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c: In function 'ixgbevf_xdp_setup': /kisskb/src/arch/sparc/include/asm/cmpxchg_32.h:28:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c:4448:4: note: in expansion of macro 'xchg' xchg(&adapter->rx_ring[i]->xdp_prog, adapter->xdp_prog); ^ /kisskb/src/Makefile:1029: recipe for target 'drivers' failed make[1]: *** [drivers] Error 2 Makefile:146: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Command 'make -s -j 48 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sparc-allmodconfig_sparc64 # Build took: 0:08:24.742888