# git rev-parse -q --verify c46a024ea5eb0165114dbbc8c82c29b7bcf66e71^{commit} c46a024ea5eb0165114dbbc8c82c29b7bcf66e71 already have revision, skipping fetch # git checkout -q -f -B kisskb c46a024ea5eb0165114dbbc8c82c29b7bcf66e71 # git clean -qxdf # git log -1 commit c46a024ea5eb0165114dbbc8c82c29b7bcf66e71 Merge: 2459c60 e453581 Author: Linus Torvalds Date: Mon Jun 1 20:51:18 2015 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Pull networking fixes from David Miller: 1) Various VTI tunnel (mark handling, PMTU) bug fixes from Alexander Duyck and Steffen Klassert. 2) Revert ethtool PHY query change, it wasn't correct. The PHY address selected by the driver running the PHY to MAC connection decides what PHY address GET ethtool operations return information from. 3) Fix handling of sequence number bits for encryption IV generation in ESP driver, from Herbert Xu. 4) UDP can return -EAGAIN when we hit a bad checksum on receive, even when there are other packets in the receive queue which is wrong. Just respect the error returned from the generic socket recv datagram helper. From Eric Dumazet. 5) Fix BNA driver firmware loading on big-endian systems, from Ivan Vecera. 6) Fix regression in that we were inheriting the congestion control of the listening socket for new connections, the intended behavior always was to use the default in this case. From Neal Cardwell. 7) Fix NULL deref in brcmfmac driver, from Arend van Spriel. 8) OTP parsing fix in iwlwifi from Liad Kaufman. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits) vti6: Add pmtu handling to vti6_xmit. Revert "net: core: 'ethtool' issue with querying phy settings" bnx2x: Move statistics implementation into semaphores xen: netback: read hotplug script once at start of day. xen: netback: fix printf format string warning Revert "netfilter: ensure number of counters is >0 in do_replace()" net: dsa: Properly propagate errors from dsa_switch_setup_one tcp: fix child sockets to use system default congestion control if not set udp: fix behavior of wrong checksums sfc: free multiple Rx buffers when required bna: fix soft lock-up during firmware initialization failure bna: remove unreasonable iocpf timer start bna: fix firmware loading on big-endian machines bridge: fix br_multicast_query_expired() bug via-rhine: Resigning as maintainer brcmfmac: avoid null pointer access when brcmf_msgbuf_get_pktid() fails mac80211: Fix mac80211.h docbook comments iwlwifi: nvm: fix otp parsing in 8000 hw family iwlwifi: pcie: fix tracking of cmd_in_flight ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call ... # < /opt/cross/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < git log --format=%s --max-count=1 c46a024ea5eb0165114dbbc8c82c29b7bcf66e71 # < make -j 1 ARCH=sh O=/home/kisskb/slave/build/linus_sh-randconfig_sh4 CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- randconfig KCONFIG_SEED=0x776FC37E warning: (USB_OTG_FSM && FSL_USB2_OTG && USB_MV_OTG) selects USB_OTG which has unmet direct dependencies (USB_SUPPORT && USB && PM) # Added to kconfig CONFIG_STANDALONE=y # yes \n | make -j 1 ARCH=sh O=/home/kisskb/slave/build/linus_sh-randconfig_sh4 CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- oldconfig yes: standard output: Broken pipe yes: write error # make -j 1 ARCH=sh O=/home/kisskb/slave/build/linus_sh-randconfig_sh4 CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- make[1]: Entering directory '/home/kisskb/slave/build/linus_sh-randconfig_sh4' GEN ./Makefile scripts/kconfig/conf --silentoldconfig Kconfig /home/kisskb/slave/src/Makefile:664: Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: -fstack-protector-strong not supported by compiler CHK include/config/kernel.release UPD include/config/kernel.release Using /home/kisskb/slave/src as source for kernel GEN ./Makefile WRAP arch/sh/include/generated/asm/bitsperlong.h WRAP arch/sh/include/generated/asm/cputime.h WRAP arch/sh/include/generated/asm/current.h WRAP arch/sh/include/generated/asm/delay.h WRAP arch/sh/include/generated/asm/div64.h WRAP arch/sh/include/generated/asm/emergency-restart.h WRAP arch/sh/include/generated/asm/errno.h WRAP arch/sh/include/generated/asm/exec.h WRAP arch/sh/include/generated/asm/fcntl.h WRAP arch/sh/include/generated/asm/ioctl.h WRAP arch/sh/include/generated/asm/ipcbuf.h WRAP arch/sh/include/generated/asm/irq_regs.h WRAP arch/sh/include/generated/asm/irq_work.h WRAP arch/sh/include/generated/asm/kvm_para.h WRAP arch/sh/include/generated/asm/local.h WRAP arch/sh/include/generated/asm/local64.h WRAP arch/sh/include/generated/asm/mcs_spinlock.h WRAP arch/sh/include/generated/asm/mman.h WRAP arch/sh/include/generated/asm/msgbuf.h WRAP arch/sh/include/generated/asm/param.h WRAP arch/sh/include/generated/asm/parport.h WRAP arch/sh/include/generated/asm/percpu.h WRAP arch/sh/include/generated/asm/poll.h WRAP arch/sh/include/generated/asm/preempt.h WRAP arch/sh/include/generated/asm/resource.h WRAP arch/sh/include/generated/asm/scatterlist.h WRAP arch/sh/include/generated/asm/sembuf.h WRAP arch/sh/include/generated/asm/serial.h WRAP arch/sh/include/generated/asm/shmbuf.h WRAP arch/sh/include/generated/asm/siginfo.h WRAP arch/sh/include/generated/asm/sizes.h WRAP arch/sh/include/generated/asm/socket.h WRAP arch/sh/include/generated/asm/statfs.h WRAP arch/sh/include/generated/asm/termbits.h WRAP arch/sh/include/generated/asm/termios.h WRAP arch/sh/include/generated/asm/trace_clock.h WRAP arch/sh/include/generated/asm/ucontext.h WRAP arch/sh/include/generated/asm/xor.h CHK include/generated/uapi/linux/version.h UPD include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h HOSTCC scripts/basic/bin2c Generating include/generated/machtypes.h CC kernel/bounds.s cc1: error: unrecognized command line option '-fstack-protector-strong' /home/kisskb/slave/src/./Kbuild:43: recipe for target 'kernel/bounds.s' failed make[2]: *** [kernel/bounds.s] Error 1 /home/kisskb/slave/src/Makefile:989: recipe for target 'prepare0' failed make[1]: *** [prepare0] Error 2 make[1]: Leaving directory '/home/kisskb/slave/build/linus_sh-randconfig_sh4' Makefile:146: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Command 'make -j 1 ARCH=sh O=/home/kisskb/slave/build/linus_sh-randconfig_sh4 CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /home/kisskb/slave/build/linus_sh-randconfig_sh4 # Build took: 0:00:13.430498