# git rev-parse -q --verify c4f4d2f917729e9b7b8bb452bf4971be93e7a15f^{commit} c4f4d2f917729e9b7b8bb452bf4971be93e7a15f already have revision, skipping fetch # git checkout -q -f -B kisskb c4f4d2f917729e9b7b8bb452bf4971be93e7a15f # git clean -qxdf # < git log -1 # commit c4f4d2f917729e9b7b8bb452bf4971be93e7a15f # Merge: 9ce2078 5dcd840 # Author: Linus Torvalds # Date: Thu Mar 22 14:10:29 2018 -0700 # # Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net # # Pull networking fixes from David Miller: # # 1) Always validate XFRM esn replay attribute, from Florian Westphal. # # 2) Fix RCU read lock imbalance in xfrm_get_tos(), from Xin Long. # # 3) Don't try to get firmware dump if not loaded in iwlwifi, from Shaul # Triebitz. # # 4) Fix BPF helpers to deal with SCTP GSO SKBs properly, from Daniel # Axtens. # # 5) Fix some interrupt handling issues in e1000e driver, from Benjamin # Poitier. # # 6) Use strlcpy() in several ethtool get_strings methods, from Florian # Fainelli. # # 7) Fix rhlist dup insertion, from Paul Blakey. # # 8) Fix SKB leak in netem packet scheduler, from Alexey Kodanev. # # 9) Fix driver unload crash when link is up in smsc911x, from Jeremy # Linton. # # 10) Purge out invalid socket types in l2tp_tunnel_create(), from Eric # Dumazet. # # 11) Need to purge the write queue when TCP connections are aborted, # otherwise userspace using MSG_ZEROCOPY can't close the fd. From # Soheil Hassas Yeganeh. # # 12) Fix double free in error path of team driver, from Arkadi # Sharshevsky. # # 13) Filter fixes for hv_netvsc driver, from Stephen Hemminger. # # 14) Fix non-linear packet access in ipv6 ndisc code, from Lorenzo # Bianconi. # # 15) Properly filter out unsupported feature flags in macvlan driver, # from Shannon Nelson. # # 16) Don't request loading the diag module for a protocol if the protocol # itself is not even registered. From Xin Long. # # 17) If datagram connect fails in ipv6, make sure the socket state is # consistent afterwards. From Paolo Abeni. # # 18) Use after free in qed driver, from Dan Carpenter. # # 19) If received ipv4 PMTU is less than the min pmtu, lock the mtu in the # entry. From Sabrina Dubroca. # # 20) Fix sleep in atomic in tg3 driver, from Jonathan Toppins. # # 21) Fix vlan in vlan untagging in some situations, from Toshiaki Makita. # # 22) Fix double SKB free in genlmsg_mcast(). From Nicolas Dichtel. # # 23) Fix NULL derefs in error paths of tcf_*_init(), from Davide Caratti. # # 24) Unbalanced PM runtime calls in FEC driver, from Florian Fainelli. # # 25) Memory leak in gemini driver, from Igor Pylypiv. # # 26) IDR leaks in error paths of tcf_*_init() functions, from Davide # Caratti. # # 27) Need to use GFP_ATOMIC in seg6_build_state(), from David Lebrun. # # 28) Missing dev_put() in error path of macsec_newlink(), from Dan # Carpenter. # # * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (201 commits) # macsec: missing dev_put() on error in macsec_newlink() # net: dsa: Fix functional dsa-loop dependency on FIXED_PHY # hv_netvsc: common detach logic # hv_netvsc: change GPAD teardown order on older versions # hv_netvsc: use RCU to fix concurrent rx and queue changes # hv_netvsc: disable NAPI before channel close # net/ipv6: Handle onlink flag with multipath routes # ppp: avoid loop in xmit recursion detection code # ipv6: sr: fix NULL pointer dereference when setting encap source address # ipv6: sr: fix scheduling in RCU when creating seg6 lwtunnel state # net: aquantia: driver version bump # net: aquantia: Implement pci shutdown callback # net: aquantia: Allow live mac address changes # net: aquantia: Add tx clean budget and valid budget handling logic # net: aquantia: Change inefficient wait loop on fw data reads # net: aquantia: Fix a regression with reset on old firmware # net: aquantia: Fix hardware reset when SPI may rarely hangup # s390/qeth: on channel error, reject further cmd requests # s390/qeth: lock read device while queueing next buffer # s390/qeth: when thread completes, wake up all waiters # ... # < /opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux-gcc --version # < git log --format=%s --max-count=1 c4f4d2f917729e9b7b8bb452bf4971be93e7a15f # < make -s -j 8 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # yes \n | make -s -j 8 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- oldconfig yes: standard output: Broken pipe yes: write error # make -s -j 8 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- CONFIG_CC_STACKPROTECTOR_AUTO: Compiler does not support any known stack-protector In file included from /kisskb/src/include/linux/interrupt.h:6:0, from /kisskb/src/mm/kasan/kasan.c:20: /kisskb/src/mm/kasan/kasan.c: In function 'kasan_cache_create': /kisskb/src/include/linux/kernel.h:793:16: warning: comparison of distinct pointer types lacks a cast (void) (&min1 == &min2); \ ^ /kisskb/src/include/linux/kernel.h:802:2: note: in expansion of macro '__min' __min(typeof(x), typeof(y), \ ^ /kisskb/src/mm/kasan/kasan.c:361:10: note: in expansion of macro 'min' *size = min(KMALLOC_MAX_SIZE, max(*size, cache->object_size + ^ /kisskb/src/drivers/char/tpm/tpm2-cmd.c: In function 'tpm2_unseal_trusted': /kisskb/src/drivers/char/tpm/tpm2-cmd.c:733:2: warning: 'blob_handle' may be used uninitialized in this function [-Wmaybe-uninitialized] tpm2_flush_context_cmd(chip, blob_handle, TPM_TRANSMIT_UNLOCKED); ^ /kisskb/src/lib/test_kasan.c: In function 'use_after_scope_test': /kisskb/src/lib/test_kasan.c:504:1: warning: the frame size of 1040 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ In file included from /kisskb/src/arch/xtensa/include/asm/atomic.h:21:0, from /kisskb/src/include/linux/atomic.h:5, from /kisskb/src/include/linux/debug_locks.h:6, from /kisskb/src/include/linux/lockdep.h:28, from /kisskb/src/include/linux/spinlock_types.h:18, from /kisskb/src/include/linux/spinlock.h:82, 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/xtensa/include/asm/cmpxchg.h:139:3: warning: value computed is not used [-Wunused-value] ((__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. ^ /kisskb/src/drivers/net/usb/rtl8150.c:30:0: warning: "RSR" redefined #define RSR 0x0133 ^ In file included from /kisskb/src/arch/xtensa/include/asm/bitops.h:22:0, from /kisskb/src/include/linux/bitops.h:38, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/asm-generic/bug.h:18, from ./arch/xtensa/include/generated/asm/bug.h:1, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/signal.h:5, from /kisskb/src/drivers/net/usb/rtl8150.c:9: /kisskb/src/arch/xtensa/include/asm/processor.h:221:0: note: this is the location of the previous definition #define RSR(v,sr) __asm__ __volatile__ ("rsr %0,"__stringify(sr) : "=a"(v)); ^ In file included from /kisskb/src/arch/xtensa/include/asm/atomic.h:21:0, from /kisskb/src/include/linux/atomic.h:5, from /kisskb/src/include/linux/debug_locks.h:6, from /kisskb/src/include/linux/lockdep.h:28, from /kisskb/src/include/linux/spinlock_types.h:18, from /kisskb/src/include/linux/spinlock.h:82, 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/ixgbe/ixgbe_main.c:30: /kisskb/src/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c: In function 'ixgbe_xdp_setup': /kisskb/src/arch/xtensa/include/asm/cmpxchg.h:139:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c:9957:4: note: in expansion of macro 'xchg' xchg(&adapter->rx_ring[i]->xdp_prog, adapter->xdp_prog); ^ In file included from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:64:0, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_fw.c:40: /kisskb/src/drivers/scsi/sym53c8xx_2/sym_defs.h:109:0: warning: "WSR" redefined #define WSR 0x01 /* sta: wide scsi received [W]*/ ^ In file included from /kisskb/src/arch/xtensa/include/asm/bitops.h:22:0, from /kisskb/src/include/linux/bitops.h:38, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/wait.h:7, from /kisskb/src/include/linux/completion.h:12, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:43, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_fw.c:40: /kisskb/src/arch/xtensa/include/asm/processor.h:220:0: note: this is the location of the previous definition #define WSR(v,sr) __asm__ __volatile__ ("wsr %0,"__stringify(sr) :: "a"(v)); ^ In file included from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:64:0, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.c:50: /kisskb/src/drivers/scsi/sym53c8xx_2/sym_defs.h:109:0: warning: "WSR" redefined #define WSR 0x01 /* sta: wide scsi received [W]*/ ^ In file included from /kisskb/src/arch/xtensa/include/asm/bitops.h:22:0, from /kisskb/src/include/linux/bitops.h:38, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:9, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.c:42: /kisskb/src/arch/xtensa/include/asm/processor.h:220:0: note: this is the location of the previous definition #define WSR(v,sr) __asm__ __volatile__ ("wsr %0,"__stringify(sr) :: "a"(v)); ^ In file included from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:64:0, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_hipd.c:44: /kisskb/src/drivers/scsi/sym53c8xx_2/sym_defs.h:109:0: warning: "WSR" redefined #define WSR 0x01 /* sta: wide scsi received [W]*/ ^ In file included from /kisskb/src/arch/xtensa/include/asm/bitops.h:22:0, from /kisskb/src/include/linux/bitops.h:38, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/asm-generic/bug.h:18, from ./arch/xtensa/include/generated/asm/bug.h:1, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/mmdebug.h:5, from /kisskb/src/include/linux/gfp.h:5, from /kisskb/src/include/linux/slab.h:15, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_hipd.c:41: /kisskb/src/arch/xtensa/include/asm/processor.h:220:0: note: this is the location of the previous definition #define WSR(v,sr) __asm__ __volatile__ ("wsr %0,"__stringify(sr) :: "a"(v)); ^ In file included from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:64:0, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_malloc.c:40: /kisskb/src/drivers/scsi/sym53c8xx_2/sym_defs.h:109:0: warning: "WSR" redefined #define WSR 0x01 /* sta: wide scsi received [W]*/ ^ In file included from /kisskb/src/arch/xtensa/include/asm/bitops.h:22:0, from /kisskb/src/include/linux/bitops.h:38, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/wait.h:7, from /kisskb/src/include/linux/completion.h:12, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:43, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_malloc.c:40: /kisskb/src/arch/xtensa/include/asm/processor.h:220:0: note: this is the location of the previous definition #define WSR(v,sr) __asm__ __volatile__ ("wsr %0,"__stringify(sr) :: "a"(v)); ^ In file included from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:64:0, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_nvram.c:40: /kisskb/src/drivers/scsi/sym53c8xx_2/sym_defs.h:109:0: warning: "WSR" redefined #define WSR 0x01 /* sta: wide scsi received [W]*/ ^ In file included from /kisskb/src/arch/xtensa/include/asm/bitops.h:22:0, from /kisskb/src/include/linux/bitops.h:38, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/wait.h:7, from /kisskb/src/include/linux/completion.h:12, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:43, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_nvram.c:40: /kisskb/src/arch/xtensa/include/asm/processor.h:220:0: note: this is the location of the previous definition #define WSR(v,sr) __asm__ __volatile__ ("wsr %0,"__stringify(sr) :: "a"(v)); ^ ./usr/include/asm/setup.h:17: userspace cannot reference function or variable defined in the kernel Completed OK # rm -rf /kisskb/build/linus_xtensa-allmodconfig_xtensa # Build took: 0:16:49.787875