# git rev-parse -q --verify a1d21081a60dfb7fddf4a38b66d9cef603b317a9^{commit} a1d21081a60dfb7fddf4a38b66d9cef603b317a9 already have revision, skipping fetch # git checkout -q -f -B kisskb a1d21081a60dfb7fddf4a38b66d9cef603b317a9 # git clean -qxdf # < git log -1 # commit a1d21081a60dfb7fddf4a38b66d9cef603b317a9 # Merge: e764a1e32337 1f3a090b9033 # Author: Linus Torvalds # Date: Thu Aug 13 20:03:11 2020 -0700 # # Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from David Miller: # "Some merge window fallout, some longer term fixes: # # 1) Handle headroom properly in lapbether and x25_asy drivers, from # Xie He. # # 2) Fetch MAC address from correct r8152 device node, from Thierry # Reding. # # 3) In the sw kTLS path we should allow MSG_CMSG_COMPAT in sendmsg, # from Rouven Czerwinski. # # 4) Correct fdputs in socket layer, from Miaohe Lin. # # 5) Revert troublesome sockptr_t optimization, from Christoph Hellwig. # # 6) Fix TCP TFO key reading on big endian, from Jason Baron. # # 7) Missing CAP_NET_RAW check in nfc, from Qingyu Li. # # 8) Fix inet fastreuse optimization with tproxy sockets, from Tim # Froidcoeur. # # 9) Fix 64-bit divide in new SFC driver, from Edward Cree. # # 10) Add a tracepoint for prandom_u32 so that we can more easily # perform usage analysis. From Eric Dumazet. # # 11) Fix rwlock imbalance in AF_PACKET, from John Ogness" # # * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (49 commits) # net: openvswitch: introduce common code for flushing flows # af_packet: TPACKET_V3: fix fill status rwlock imbalance # random32: add a tracepoint for prandom_u32() # Revert "ipv4: tunnel: fix compilation on ARCH=um" # net: accept an empty mask in /sys/class/net/*/queues/rx-*/rps_cpus # net: ethernet: stmmac: Disable hardware multicast filter # net: stmmac: dwmac1000: provide multicast filter fallback # ipv4: tunnel: fix compilation on ARCH=um # vsock: fix potential null pointer dereference in vsock_poll() # sfc: fix ef100 design-param checking # net: initialize fastreuse on inet_inherit_port # net: refactor bind_bucket fastreuse into helper # net: phy: marvell10g: fix null pointer dereference # net: Fix potential memory leak in proto_register() # net: qcom/emac: add missed clk_disable_unprepare in error path of emac_clks_phase1_init # ionic_lif: Use devm_kcalloc() in ionic_qcq_alloc() # net/nfc/rawsock.c: add CAP_NET_RAW check. # hinic: fix strncpy output truncated compile warnings # drivers/net/wan/x25_asy: Added needed_headroom and a skb->len check # net/tls: Fix kmap usage # ... # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 a1d21081a60dfb7fddf4a38b66d9cef603b317a9 # < make -s -j 8 ARCH=powerpc O=/kisskb/build/linus_ppc6xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc6xx_defconfig # < make -s -j 8 ARCH=powerpc O=/kisskb/build/linus_ppc6xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 8 ARCH=powerpc O=/kisskb/build/linus_ppc6xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 8 ARCH=powerpc O=/kisskb/build/linus_ppc6xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/kernel/rcu/update.c:591:0: /kisskb/src/kernel/rcu/tasks.h:593:13: warning: 'show_rcu_tasks_classic_gp_kthread' defined but not used [-Wunused-function] static void show_rcu_tasks_classic_gp_kthread(void) { } ^ /kisskb/src/block/genhd.c: In function 'diskstats_show': /kisskb/src/block/genhd.c:1667:1: warning: the frame size of 1160 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ In file included from /kisskb/src/include/linux/skbuff.h:31:0, from /kisskb/src/include/linux/if_ether.h:19, from /kisskb/src/include/uapi/linux/ethtool.h:19, from /kisskb/src/include/linux/ethtool.h:18, from /kisskb/src/include/linux/netdevice.h:37, from /kisskb/src/drivers/net/ethernet/sfc/net_driver.h:13, from /kisskb/src/drivers/net/ethernet/sfc/ef100.c:12: /kisskb/src/drivers/net/ethernet/sfc/ef100.c: In function 'ef100_pci_parse_continue_entry': /kisskb/src/include/linux/dma-mapping.h:139:25: warning: large integer implicitly truncated to unsigned type [-Woverflow] #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c:145:6: note: in expansion of macro 'DMA_BIT_MASK' DMA_BIT_MASK(ESF_GZ_TX_SEND_ADDR_WIDTH), ^ /kisskb/src/include/linux/dma-mapping.h:139:25: warning: large integer implicitly truncated to unsigned type [-Woverflow] #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c:163:6: note: in expansion of macro 'DMA_BIT_MASK' DMA_BIT_MASK(ESF_GZ_TX_SEND_ADDR_WIDTH), ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c: In function 'ef100_pci_parse_xilinx_cap': /kisskb/src/include/linux/dma-mapping.h:139:25: warning: large integer implicitly truncated to unsigned type [-Woverflow] #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c:337:5: note: in expansion of macro 'DMA_BIT_MASK' DMA_BIT_MASK(ESF_GZ_TX_SEND_ADDR_WIDTH), ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c: In function 'ef100_pci_probe': /kisskb/src/include/linux/dma-mapping.h:139:25: warning: large integer implicitly truncated to unsigned type [-Woverflow] #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c:498:5: note: in expansion of macro 'DMA_BIT_MASK' DMA_BIT_MASK(ESF_GZ_TX_SEND_ADDR_WIDTH), ^ INFO: Uncompressed kernel (size 0xb01e30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb01e30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb01e30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xaf1748) overlaps the address of the wrapper(0x400000) INFO: Uncompressed kernel (size 0xb01e30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb01e30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) Image Name: Linux-5.8.0+ Created: Fri Aug 14 17:56:42 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5329354 Bytes = 5204.45 KiB = 5.08 MiB Load Address: 00c00000 Entry Point: 00c00294 INFO: Uncompressed kernel (size 0xb01e30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb01e30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) Image Name: Linux-5.8.0+ Created: Fri Aug 14 17:56:42 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5329305 Bytes = 5204.40 KiB = 5.08 MiB Load Address: 00c00000 Entry Point: 00c00894 Image Name: Linux-5.8.0+ Created: Fri Aug 14 17:56:42 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5329373 Bytes = 5204.47 KiB = 5.08 MiB Load Address: 00c00000 Entry Point: 00c00894 Image Name: Linux-5.8.0+ Created: Fri Aug 14 17:56:42 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5296571 Bytes = 5172.43 KiB = 5.05 MiB Load Address: 00000000 Entry Point: 00000000 INFO: Uncompressed kernel (size 0xb01e30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb01e30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb01e30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xaf1748) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) Image Name: Linux-5.8.0+ Created: Fri Aug 14 17:56:44 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5328980 Bytes = 5204.08 KiB = 5.08 MiB Load Address: 00c00000 Entry Point: 00c00294 Image Name: Linux-5.8.0+ Created: Fri Aug 14 17:56:44 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5329335 Bytes = 5204.43 KiB = 5.08 MiB Load Address: 00c00000 Entry Point: 00c00294 Image Name: Linux-5.8.0+ Created: Fri Aug 14 17:56:45 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5327912 Bytes = 5203.04 KiB = 5.08 MiB Load Address: 00c00000 Entry Point: 00c00294 Image Name: Linux-5.8.0+ Created: Fri Aug 14 17:56:45 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5328664 Bytes = 5203.77 KiB = 5.08 MiB Load Address: 00c00000 Entry Point: 00c00294 Image Name: Linux-5.8.0+ Created: Fri Aug 14 17:56:45 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5329430 Bytes = 5204.52 KiB = 5.08 MiB Load Address: 00c00000 Entry Point: 00c00294 Completed OK # rm -rf /kisskb/build/linus_ppc6xx_defconfig_powerpc-gcc4.9 # Build took: 0:05:40.268338