# git rev-parse -q --verify 7d900724913cb293620a05c5a3134710db95d0d9^{commit} 7d900724913cb293620a05c5a3134710db95d0d9 already have revision, skipping fetch # git checkout -q -f -B kisskb 7d900724913cb293620a05c5a3134710db95d0d9 # git clean -qxdf # < git log -1 # commit 7d900724913cb293620a05c5a3134710db95d0d9 # Merge: add6b92660b3 53b74fa990bf # Author: Linus Torvalds # Date: Sun Apr 11 11:53:36 2021 -0700 # # Merge tag 'for-5.12-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux # # Pull btrfs fix from David Sterba: # "One more patch that we'd like to get to 5.12 before release. # # It's changing where and how the superblock is stored in the zoned # mode. It is an on-disk format change but so far there are no # implications for users as the proper mkfs support hasn't been merged # and is waiting for the kernel side to settle. # # Until now, the superblocks were derived from the zone index, but zone # size can differ per device. This is changed to be based on fixed # offset values, to make it independent of the device zone size. # # The work on that got a bit delayed, we discussed the exact locations # to support potential device sizes and usecases. (Partially delayed # also due to my vacation.) Having that in the same release where the # zoned mode is declared usable is highly desired, there are userspace # projects that need to be updated to recognize the feature. Pushing # that to the next release would make things harder to test" # # * tag 'for-5.12-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: # btrfs: zoned: move superblock logging zone location # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux-ld --version # < git log --format=%s --max-count=1 7d900724913cb293620a05c5a3134710db95d0d9 # < make -s -j 24 ARCH=parisc O=/kisskb/build/linus_parisc-allmodconfig_parisc-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 24 ARCH=parisc O=/kisskb/build/linus_parisc-allmodconfig_parisc-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux- help # make -s -j 24 ARCH=parisc O=/kisskb/build/linus_parisc-allmodconfig_parisc-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux- olddefconfig # make -s -j 24 ARCH=parisc O=/kisskb/build/linus_parisc-allmodconfig_parisc-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux- /kisskb/src/lib/zstd/compress.c: In function 'ZSTD_compressBlock_lazy2_extDict': /kisskb/src/lib/zstd/compress.c:2262:1: warning: the frame size of 1348 bytes is larger than 1280 bytes [-Wframe-larger-than=] } ^ /kisskb/src/drivers/parisc/dino.c:160:12: warning: 'pci_dev_is_behind_card_dino' defined but not used [-Wunused-function] static int pci_dev_is_behind_card_dino(struct pci_dev *dev) ^~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/xxhash.c: In function 'xxh64': /kisskb/src/lib/xxhash.c:236:1: warning: the frame size of 1624 bytes is larger than 1280 bytes [-Wframe-larger-than=] } ^ /kisskb/src/drivers/gpu/drm/rockchip/cdn-dp-core.c:1124:12: warning: 'cdn_dp_resume' defined but not used [-Wunused-function] static int cdn_dp_resume(struct device *dev) ^~~~~~~~~~~~~ In file included from /kisskb/src/drivers/net/phy/dp83640.c:23: /kisskb/src/drivers/net/phy/dp83640_reg.h:8: warning: "PAGE0" redefined #define PAGE0 0x0000 In file included from /kisskb/src/include/linux/mm_types_task.h:16, from /kisskb/src/include/linux/mm_types.h:5, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/xarray.h:14, from /kisskb/src/include/linux/radix-tree.h:19, from /kisskb/src/include/linux/fs.h:15, from /kisskb/src/include/linux/compat.h:17, from /kisskb/src/include/linux/ethtool.h:17, from /kisskb/src/drivers/net/phy/dp83640.c:11: /kisskb/src/arch/parisc/include/asm/page.h:187: note: this is the location of the previous definition #define PAGE0 ((struct zeropage *)__PAGE_OFFSET) /kisskb/src/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c: In function 'nvkm_control_mthd_pstate_info': /kisskb/src/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c:60:21: warning: overflow in conversion from 'int' to '__s8' {aka 'signed char'} changes value from '-251' to '5' [-Woverflow] args->v0.pwrsrc = -ENOSYS; ^ In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.c:60: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2098: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.c:20: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.c:60: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2106: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.c:20: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:19: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2098: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, 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/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:11: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:19: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2106: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, 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/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:11: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c:23: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2098: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, 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/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c:13: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c:23: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2106: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, 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/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c:13: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) /kisskb/src/drivers/input/joystick/analog.c:160: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/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:20: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2098: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, from /kisskb/src/include/net/net_namespace.h:39, from /kisskb/src/include/linux/netdevice.h:37, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:11: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:20: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2106: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, from /kisskb/src/include/net/net_namespace.h:39, from /kisskb/src/include/linux/netdevice.h:37, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:11: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c:24: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2098: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c:14: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c:24: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2106: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c:14: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c:20: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2098: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c:11: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c:20: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2106: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c:11: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c:17: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2098: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c:9: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c:17: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2106: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c:9: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c:14: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2098: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c:10: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c:14: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2106: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c:10: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c:12: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2098: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, 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/drivers/net/ethernet/broadcom/bnxt/bnxt.h:23, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c:12: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c:12: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2106: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, 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/drivers/net/ethernet/broadcom/bnxt/bnxt.h:23, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c:12: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c:24: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2098: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, from /kisskb/src/include/net/net_namespace.h:39, from /kisskb/src/include/linux/netdevice.h:37, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c:10: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c:24: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2106: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, from /kisskb/src/include/net/net_namespace.h:39, from /kisskb/src/include/linux/netdevice.h:37, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c:10: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c:15: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2098: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c:12: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c:15: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2106: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c:12: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) Completed OK # rm -rf /kisskb/build/linus_parisc-allmodconfig_parisc-gcc8 # Build took: 0:23:11.473043