# git rev-parse -q --verify 96144c58abe7ff767e754b5b80995f7b8846d49b^{commit} 96144c58abe7ff767e754b5b80995f7b8846d49b already have revision, skipping fetch # git checkout -q -f -B kisskb 96144c58abe7ff767e754b5b80995f7b8846d49b # git clean -qxdf # < git log -1 # commit 96144c58abe7ff767e754b5b80995f7b8846d49b # Merge: f82e7b57b5fc bc139119a170 # Author: Linus Torvalds # Date: Sat Jun 13 16:27:13 2020 -0700 # # Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from David Miller: # # 1) Fix cfg80211 deadlock, from Johannes Berg. # # 2) RXRPC fails to send norigications, from David Howells. # # 3) MPTCP RM_ADDR parsing has an off by one pointer error, fix from # Geliang Tang. # # 4) Fix crash when using MSG_PEEK with sockmap, from Anny Hu. # # 5) The ucc_geth driver needs __netdev_watchdog_up exported, from # Valentin Longchamp. # # 6) Fix hashtable memory leak in dccp, from Wang Hai. # # 7) Fix how nexthops are marked as FDB nexthops, from David Ahern. # # 8) Fix mptcp races between shutdown and recvmsg, from Paolo Abeni. # # 9) Fix crashes in tipc_disc_rcv(), from Tuong Lien. # # 10) Fix link speed reporting in iavf driver, from Brett Creeley. # # 11) When a channel is used for XSK and then reused again later for XSK, # we forget to clear out the relevant data structures in mlx5 which # causes all kinds of problems. Fix from Maxim Mikityanskiy. # # 12) Fix memory leak in genetlink, from Cong Wang. # # 13) Disallow sockmap attachments to UDP sockets, it simply won't work. # From Lorenz Bauer. # # * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (83 commits) # net: ethernet: ti: ale: fix allmulti for nu type ale # net: ethernet: ti: am65-cpsw-nuss: fix ale parameters init # net: atm: Remove the error message according to the atomic context # bpf: Undo internal BPF_PROBE_MEM in BPF insns dump # libbpf: Support pre-initializing .bss global variables # tools/bpftool: Fix skeleton codegen # bpf: Fix memlock accounting for sock_hash # bpf: sockmap: Don't attach programs to UDP sockets # bpf: tcp: Recv() should return 0 when the peer socket is closed # ibmvnic: Flush existing work items before device removal # genetlink: clean up family attributes allocations # net: ipa: header pad field only valid for AP->modem endpoint # net: ipa: program upper nibbles of sequencer type # net: ipa: fix modem LAN RX endpoint id # net: ipa: program metadata mask differently # ionic: add pcie_print_link_status # rxrpc: Fix race between incoming ACK parser and retransmitter # net/mlx5: E-Switch, Fix some error pointer dereferences # net/mlx5: Don't fail driver on failure to create debugfs # net/mlx5e: CT: Fix ipv6 nat header rewrite actions # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux-ld --version # < git log --format=%s --max-count=1 96144c58abe7ff767e754b5b80995f7b8846d49b # < make -s -j 48 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- randconfig KCONFIG_SEED=0xFEFFB0BB # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # < make -s -j 48 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- help # make -s -j 48 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- olddefconfig .config:6434:warning: override: reassigning to symbol PREVENT_FIRMWARE_BUILD # make -s -j 48 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- /kisskb/src/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi:7.3-14: Warning (dma_ranges_format): /usb:dma-ranges: empty "dma-ranges" property but its #address-cells (1) differs from / (2) /kisskb/src/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi:7.3-14: Warning (dma_ranges_format): /usb:dma-ranges: empty "dma-ranges" property but its #size-cells (1) differs from / (2) /kisskb/src/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi:7.3-14: Warning (dma_ranges_format): /usb:dma-ranges: empty "dma-ranges" property but its #address-cells (1) differs from / (2) /kisskb/src/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi:7.3-14: Warning (dma_ranges_format): /usb:dma-ranges: empty "dma-ranges" property but its #size-cells (1) differs from / (2) /kisskb/src/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi:7.3-14: Warning (dma_ranges_format): /usb:dma-ranges: empty "dma-ranges" property but its #address-cells (1) differs from / (2) /kisskb/src/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi:7.3-14: Warning (dma_ranges_format): /usb:dma-ranges: empty "dma-ranges" property but its #size-cells (1) differs from / (2) /kisskb/src/arch/arm64/boot/dts/qcom/ipq6018.dtsi:127.3-14: Warning (dma_ranges_format): /soc:dma-ranges: empty "dma-ranges" property but its #address-cells (1) differs from / (2) /kisskb/src/arch/arm64/boot/dts/qcom/ipq6018.dtsi:127.3-14: Warning (dma_ranges_format): /soc:dma-ranges: empty "dma-ranges" property but its #size-cells (1) differs from / (2) In file included from /kisskb/src/include/linux/build_bug.h:5, from /kisskb/src/include/linux/bitfield.h:10, from /kisskb/src/drivers/phy/intel/phy-intel-combo.c:8: /kisskb/src/drivers/phy/intel/phy-intel-combo.c: In function 'combo_phy_w32_off_mask': /kisskb/src/include/linux/compiler.h:392:38: error: call to '__compiletime_assert_264' declared with attribute error: FIELD_PREP: mask is not constant _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ /kisskb/src/include/linux/compiler.h:373:4: note: in definition of macro '__compiletime_assert' prefix ## suffix(); \ ^~~~~~ /kisskb/src/include/linux/compiler.h:392:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/bitfield.h:46:3: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(!__builtin_constant_p(_mask), \ ^~~~~~~~~~~~~~~~ /kisskb/src/include/linux/bitfield.h:94:3: note: in expansion of macro '__BF_FIELD_CHECK' __BF_FIELD_CHECK(_mask, 0ULL, _val, "FIELD_PREP: "); \ ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/phy/intel/phy-intel-combo.c:137:13: note: in expansion of macro 'FIELD_PREP' reg_val |= FIELD_PREP(mask, val); ^~~~~~~~~~ /kisskb/src/include/linux/compiler.h:392:38: error: call to '__compiletime_assert_268' declared with attribute error: BUILD_BUG_ON failed: (((mask) + (1ULL << (__builtin_ffsll(mask) - 1))) & (((mask) + (1ULL << (__builtin_ffsll(mask) - 1))) - 1)) != 0 _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ /kisskb/src/include/linux/compiler.h:373:4: note: in definition of macro '__compiletime_assert' prefix ## suffix(); \ ^~~~~~ /kisskb/src/include/linux/compiler.h:392:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) ^~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:21:2: note: in expansion of macro 'BUILD_BUG_ON' BUILD_BUG_ON(((n) & ((n) - 1)) != 0) ^~~~~~~~~~~~ /kisskb/src/include/linux/bitfield.h:54:3: note: in expansion of macro '__BUILD_BUG_ON_NOT_POWER_OF_2' __BUILD_BUG_ON_NOT_POWER_OF_2((_mask) + \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/bitfield.h:94:3: note: in expansion of macro '__BF_FIELD_CHECK' __BF_FIELD_CHECK(_mask, 0ULL, _val, "FIELD_PREP: "); \ ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/phy/intel/phy-intel-combo.c:137:13: note: in expansion of macro 'FIELD_PREP' reg_val |= FIELD_PREP(mask, val); ^~~~~~~~~~ make[4]: *** [/kisskb/src/scripts/Makefile.build:281: drivers/phy/intel/phy-intel-combo.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:497: drivers/phy/intel] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:497: drivers/phy] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1764: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 48 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 # Build took: 0:01:19.777900