Hi all,
Changes since 20211116:
The cifs tree lost its build failure.
The drm-misc tree gained a conflict against Linus' tree.
The drm-intel-gt tree gained a semantic conflict against Linus' tree.
The gpio-brgl tree still had its build failure so I used the version from
next-20211115.
The gpio-sim tree gained a conflict against the gpio-brgl-fixes tree.
I have disabled the ntfs file system write capabaility for now as it
fails for builds with 64k pages.
Non-merge commits (relative to Linus' tree): 1545
1816 files changed, 79381 insertions(+), 36140 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a
multi_v7_defconfig for arm and a native build of tools/perf. After
the final fixups (if any), I do an x86_64 modules_install followed by
builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit),
ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386,
arm64, sparc and sparc64 defconfig and htmldocs. And finally, a simple
boot test of the powerpc pseries_le_defconfig kernel in qemu (with and
without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 342 trees (counting Linus' and 92 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging fixes/fixes (3ca706c189db drm/ttm: fix type mismatch error on sparc64)
Merging kbuild-current/fixes (e851dfae4371 Merge tag 'kgdb-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux)
Merging arc-current/for-curr (b9cac915c541 ARC: thread_info.h: correct two typos in a comment)
Merging arm-current/fixes (418ace9992a7 ARM: 9156/1: drop cc-option fallbacks for architecture selection)
Merging arm64-fixes/for-next/fixes (d3eb70ead647 arm64: mm: Fix VM_BUG_ON(mm != &init_mm) for trans_pgd)
Merging arm-soc-fixes/arm/fixes (76f79231666a Merge tag 'soc-fsl-fix-v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/fixes)
Merging drivers-memory-fixes/fixes (8c5ba21c16bd memory: mtk-smi: Fix a null dereference for the ostd)
Merging m68k-current/for-linus (8a3c0a74ae87 m68k: defconfig: Update defconfigs for v5.15-rc1)
Merging powerpc-fixes/fixes (302039466f6a powerpc/pseries: Fix numa FORM2 parsing fallback code)
Merging s390-fixes/fixes (6c122360cf2f s390: wire up sys_futex_waitv system call)
Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net)
Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX)
Merging net/master (848e5d66fa31 Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue)
Merging bpf/master (099f896f498a udp: Validate checksum in udp_read_sock())
Merging ipsec/master (93ec1320b017 xfrm: fix rcu lock in xfrm_notify_userpolicy())
Merging netfilter/master (a2acf0c0e2da selftests: nft_nat: switch port shadow test cases to socat)
Merging ipvs/master (c45231a7668d litex_liteeth: Fix a double free in the remove function)
Merging wireless-drivers/master (603a1621caa0 mwifiex: avoid null-pointer-subtraction warning)
Merging mac80211/master (30f6cf96912b mac80211: fix throughput LED trigger)
Merging rdma-fixes/for-rc (fa55b7dcdc43 Linux 5.16-rc1)
Merging sound-current/for-linus (bd5e2c22a9cf ALSA: cmipci: Drop stale variable assignment)
Merging sound-asoc-fixes/for-linus (4e6118f860ee Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus)
Merging regmap-fixes/for-linus (459e1cd0d5ec Merge remote-tracking branch 'regmap/for-5.15' into regmap-linus)
Merging regulator-fixes/for-linus (7492b724df4d Merge series "Remove TPS80031 driver" from Dmitry Osipenko <[email protected]>:)
Merging spi-fixes/for-linus (1675f9b6a9d9 Merge remote-tracking branch 'spi/for-5.15' into spi-linus)
Merging pci-current/for-linus (fa55b7dcdc43 Linux 5.16-rc1)
Merging driver-core.current/driver-core-linus (fa55b7dcdc43 Linux 5.16-rc1)
Merging tty.current/tty-linus (fa55b7dcdc43 Linux 5.16-rc1)
Merging usb.current/usb-linus (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (fa55b7dcdc43 Linux 5.16-rc1)
Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle)
Merging phy/fixes (7adaf921b643 phy: ti: report 2 non-kernel-doc comments)
Merging staging.current/staging-linus (47ac6f567c28 staging: Remove Netlogic XLP network driver)
Merging iio-fixes/fixes-togreg (8db63222155d iio: ad7768-1: Call iio_trigger_notify_done() on error)
Merging char-misc.current/char-misc-linus (fa55b7dcdc43 Linux 5.16-rc1)
Merging soundwire-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging thunderbolt-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging input-current/for-linus (efe6f16c6faf Merge branch 'next' into for-linus)
Merging crypto-current/master (beaaaa37c664 crypto: api - Fix boot-up crash when crypto manager is disabled)
Merging vfio-fixes/for-linus (42de956ca7e5 vfio/ap_ops: Add missed vfio_uninit_group_dev())
Merging kselftest-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging modules-fixes/modules-linus (0d67e332e6df module: fix clang CFI with MODULE_UNLOAD=n)
Merging dmaengine-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
Merging mtd-fixes/mtd/fixes (f60f5741002b mtd: rawnand: qcom: Update code word value for raw read)
Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
Merging v4l-dvb-fixes/fixes (13cbaa4c2b7b media: cec: copy sequence field for the reply)
Merging reset-fixes/reset/fixes (3ad60b4b3570 reset: socfpga: add empty driver allowing consumers to probe)
Merging mips-fixes/mips-fixes (fc1aabb08886 mips: lantiq: add support for clk_get_parent())
Merging at91-fixes/at91-fixes (dbe68bc9e82b ARM: dts: at91: sama7g5ek: to not touch slew-rate for SDMMC pins)
Merging omap-fixes/fixes (80d680fdccba ARM: dts: omap3430-sdp: Fix NAND device node)
Merging kvm-fixes/master (84886c262ebc Merge tag 'kvmarm-fixes-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master)
Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu)
Merging hwmon-fixes/hwmon (214f52525506 hwmon: (nct6775) mask out bank number in nct6775_wmi_read_value())
Merging nvdimm-fixes/libnvdimm-fixes (3dd60fb9d95d nvdimm/pmem: stop using q_usage_count as external pgmap refcount)
Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing)
Merging btrfs-fixes/next-fixes (0426549c5d7d Merge branch 'misc-5.16' into next-fixes)
Merging vfs-fixes/fixes (25f54d08f12f autofs: fix wait name hash calculation in autofs_wait())
Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1)
Merging drivers-x86-fixes/fixes (7df227847ab5 platform/x86: int1092: Fix non sequential device mode handling)
Merging samsung-krzk-fixes/fixes (4f5d06d381ba arm64: dts: exynos: drop samsung,ufs-shareability-reg-offset in ExynosAutov9)
Merging pinctrl-samsung-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging devicetree-fixes/dt/linus (913d3a3f8408 dt-bindings: watchdog: sunxi: fix error in schema)
Merging scsi-fixes/fixes (09d9e4d04187 scsi: ufs: ufshpb: Remove HPB2.0 flows)
Merging drm-fixes/drm-fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (8bb7eca972ad Linux 5.15)
Merging mmc-fixes/fixes (adab993c2519 mmc: sdhci-esdhc-imx: disable CMDQ support)
Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt())
Merging gnss-fixes/gnss-linus (fa55b7dcdc43 Linux 5.16-rc1)
Merging hyperv-fixes/hyperv-fixes (f3e613e72f66 x86/hyperv: Move required MSRs check to initial platform probing)
Merging soc-fsl-fixes/fix (7e5e744183bb soc: fsl: dpio: fix qbman alignment error in the virtualization context)
Merging risc-v-fixes/fixes (54c5639d8f50 riscv: Fix asan-stack clang build)
Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
Merging fpga-fixes/fixes (8bb7eca972ad Linux 5.15)
Merging spdx/spdx-linus (fa55b7dcdc43 Linux 5.16-rc1)
Merging gpio-brgl-fixes/gpio/for-current (d6912b1251b4 gpio: rockchip: needs GENERIC_IRQ_CHIP to fix build errors)
Merging gpio-intel-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging pinctrl-intel-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging erofs-fixes/fixes (4c7e42552b3a erofs: remove useless cache strategy of DELAYEDALLOC)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
Merging kunit-fixes/kunit-fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes)
Merging memblock-fixes/fixes (b5013d084e03 Merge tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6)
Merging cel-fixes/for-rc (8bb7eca972ad Linux 5.15)
Merging irqchip-fixes/irq/irqchip-fixes (10a20b34d735 of/irq: Don't ignore interrupt-controller when interrupt-map failed)
Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles)
Merging perf-current/perf/urgent (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging efi-fixes/urgent (38fa3206bf44 efi: Change down_interruptible() in virt_efi_reset_system() to down_trylock())
Merging drm-misc-fixes/for-linux-next-fixes (467dd91e2f78 Merge drm/drm-fixes into drm-misc-fixes)
Merging kbuild/for-next (7528edbafeef [for -next only] kconfig: generate include/generated/rustc_cfg)
Merging perf/perf/core (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn)
Merging dma-mapping/for-next (9fbd8dc19aa5 dma-mapping: use 'bitmap_zalloc()' when applicable)
Merging asm-generic/master (7efbbe6e1414 qcom_scm: hide Kconfig symbol)
CONFLICT (content): Merge conflict in arch/riscv/Kconfig
Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1)
Merging arm/for-next (0ce29cae5ba4 Merge branches 'devel-stable', 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (c7c386fbc202 arm64: pgtable: make __pte_to_phys/__phys_to_pte_val inline functions)
Merging arm-perf/for-next/perf (e656972b6986 drivers/perf: Improve build test coverage)
Merging arm-soc/for-next (76f79231666a Merge tag 'soc-fsl-fix-v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/fixes)
Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
Merging amlogic/for-next (1e9fc71213d7 arm64: dts: meson-gxbb-wetek: use updated LED bindings)
Merging aspeed/for-next (16d6dc8d8030 ARM: dts: aspeed: mtjade: Add uefi partition)
Merging at91/at91-next (f3c0366411d6 ARM: dts: at91: sama7g5-ek: use blocks 0 and 1 of TCB0 as cs and ce)
Merging drivers-memory/for-next (fac1319be07b Merge branch 'for-v5.17/renesas-rpc' into for-next)
Merging imx-mxs/for-next (8bd7cd1cc7f0 Merge branch 'imx/maintainers' into for-next)
Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
Merging mediatek/for-next (dbb948ba8b69 Merge branch 'v5.16-next/dts64' into for-next)
Merging mvebu/for-next (04e78a787b74 arm/arm64: dts: Enable 2.5G Ethernet port on CN9130-CRB)
Merging omap/for-next (92d190433bd8 Merge branch 'omap-for-v5.16/gpmc' into for-next)
Merging qcom/for-next (bbe9515ab088 Merge branches 'arm64-defconfig-for-5.16', 'arm64-for-5.16', 'drivers-for-5.16' and 'dts-for-5.16' into for-next)
Merging raspberrypi/for-next (a036b0a5d7d6 ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address)
Merging renesas/next (17fc0a96f4b4 Merge branches 'renesas-arm-dt-for-v5.17', 'renesas-arm-soc-for-v5.17' and 'renesas-drivers-for-v5.17' into renesas-next)
Merging reset/reset/next (8c81620ac1ac reset: mchp: sparx5: Extend support for lan966x)
Merging rockchip/for-next (cc3bcb015bb1 Merge branch 'v5.16-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (f69590af7cbc Merge branch 'next/soc64' into for-next)
Merging scmi/for-linux-next (f4382a0d4d16 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging stm32/stm32-next (d4b3aaf0f90b ARM: dts: stm32: use usbphyc ck_usbo_48m as USBH OHCI clock on stm32mp151)
Merging sunxi/sunxi/for-next (98b38e443550 Merge branch 'sunxi/dt-for-5.17' into sunxi/for-next)
Merging tegra/for-next (bbd827b4de7e Merge branch for-5.16/arm64/defconfig into for-next)
Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next)
Merging ti-k3-new/ti-k3-next (f46d16cf5b43 arm64: dts: ti: k3-j721e-sk: Add DDR carveout memory nodes)
Merging xilinx/for-next (326b5e9db528 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging clk-imx/for-next (e8271eff5d8c clk: imx: Make CLK_IMX8ULP select MXC_CLK)
Merging clk-renesas/renesas-clk (161450134ae9 clk: renesas: r9a07g044: Add OSTM clock and reset entries)
Merging clk-samsung/for-next (651521d396a8 clk: samsung: remove __clk_lookup() usage)
Merging csky/linux-next (e21e52ad1e01 csky: Make HAVE_TCM depend on !COMPILE_TEST)
Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs)
Merging m68k/for-next (8a3c0a74ae87 m68k: defconfig: Update defconfigs for v5.15-rc1)
Merging m68knommu/for-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging microblaze/next (43bdcbd50043 microblaze: timer: Remove unused properties)
Merging mips/mips-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging nds32/next (07cd7745c6f2 nds32/setup: remove unused memblock_region variable in setup_memory())
CONFLICT (content): Merge conflict in arch/nds32/Kconfig
CONFLICT (content): Merge conflict in arch/nds32/Kbuild
Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
Merging openrisc/for-next (27dff9a9c247 openrisc: fix SMP tlb flush NULL pointer dereference)
Merging parisc-hd/for-next (aeb357979bdd parisc: Revert "parisc: Reduce sigreturn trampoline to 3 instructions")
Merging powerpc/next (158ea2d2b2ff kbuild: Fix -Wimplicit-fallthrough=5 error for GCC 5.x and 6.x)
Merging soc-fsl/next (54c8b5b6f8a8 soc: fsl: dpio: rename the enqueue descriptor variable)
Merging risc-v/for-next (ffa7a9141bb7 riscv: defconfig: enable DRM_NOUVEAU)
Merging s390/for-next (d7c604df5498 Merge branch 'fixes' into for-next)
Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size)
Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
Merging uml/linux-next (ab6ff1fda1e8 uml: x86: add FORCE to user_constants.h)
Merging xtensa/xtensa-for-next (bd47cdb78997 xtensa: move section symbols to asm/sections.h)
Merging pidfd/for-next (74cc324aee16 fs: handle circular mappings correctly)
Merging fscrypt/master (b7e072f9b77f fscrypt: improve a few comments)
Merging fscache/fscache-next (8bb7eca972ad Linux 5.15)
Merging afs/afs-next (52af7105eceb afs: Set mtime from the client for yfs create operations)
Merging btrfs/for-next (279373dee83e Fixup merge-to-merge conflict in lzo_compress_pages)
Merging ceph/master (c02cb7bdc450 ceph: add a new metric to keep track of remote object copies)
Merging cifs/for-next (8ae87bbeb5d1 cifs: introduce cifs_ses_mark_for_reconnect() helper)
Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup())
Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs)
Merging erofs/dev (a0961f351d82 erofs: don't trigger WARN() when decompression fails)
Merging exfat/dev (0df2d764b979 exfat: reuse exfat_inode_info variable instead of calling EXFAT_I())
Merging ext3/for_next (a48fc69fe658 udf: Fix crash after seekdir)
Merging ext4/dev (124e7c61deb2 ext4: fix error code saved on super block during file system abort)
Merging f2fs/dev (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
Merging fuse/for-next (712a951025c0 fuse: fix page stealing)
Merging gfs2/for-next (ef9e7727d062 iomap: Fix inline extent handling in iomap_readpage)
Merging jfs/jfs-next (c48a14dca2cb JFS: fix memleak in jfs_mount)
Merging ksmbd/ksmbd-for-next (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging nfs/linux-next (f96f8cc4a63d NFSv4: Sanity check the parameters in nfs41_update_target_slotid())
Merging nfs-anna/linux-next (8cfb9015280d NFS: Always provide aligned buffers to the RPC read layers)
Merging nfsd/nfsd-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging cel/for-next (c20106944eb6 NFSD: Keep existing listeners on portlist error)
Merging ntfs3/master (8bb7eca972ad Linux 5.15)
Merging orangefs/for-next (ac2c63757f4f orangefs: Fix sb refcount leak when allocate sb info failed.)
Merging overlayfs/overlayfs-next (5b0a414d06c3 ovl: fix filattr copy-up failure)
Merging ubifs/next (9aaa6cc099f6 ubifs: Document sysfs nodes)
Merging v9fs/9p-next (6e195b0f7c8e 9p: fix a bunch of checkpatch warnings)
Merging xfs/for-next (4a6b35b3b3f2 xfs: sync xfs_btree_split macros with userspace libxfs)
Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check)
Merging iomap/iomap-for-next (03b8df8d43ec iomap: standardize tracepoint formatting and storage)
Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID)
Merging file-locks/locks-next (482e00075d66 fs: remove leftover comments from mandatory locking removal)
Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next)
Merging printk/for-next (06cf63cb69be Merge branch 'for-5.16-fixup' into for-next)
Merging pci/next (fa55b7dcdc43 Linux 5.16-rc1)
Merging pstore/for-next/pstore (2f46d7c99830 pstore/blk: Use "%lu" to format unsigned long)
Merging hid/for-next (5554d0b808c2 Merge branch 'for-5.16/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (26950bc4bad3 Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i3c/i3c/next (a3587e2c0578 i3c: fix incorrect address slot lookup on 64-bit)
Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias)
Merging hwmon-staging/hwmon-next (d20638935cec hwmon: (adm1021) Improve detection of LM84, MAX1617, and MAX1617A)
Merging jc_docs/docs-next (53b606fa29e3 docs: filesystems: Fix grammatical error "with" to "which")
Merging v4l-dvb/master (fa55b7dcdc43 Linux 5.16-rc1)
Merging v4l-dvb-next/master (96977c97e2c7 media: atomisp: get rid of #ifdef ISP_VEC_NELEMS)
Merging pm/linux-next (273b3dc3453c Merge branch 'thermal-core' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (4a08e3271c55 cpufreq: Fix parameter in parse_perf_domain())
Merging cpupower/cpupower (79a0dc5530a9 tools: cpupower: fix typo in cpupower-idle-set(1) manpage)
Merging devfreq/devfreq-next (5cf79c293821 PM / devfreq: Strengthen check for freq_table)
Merging opp/opp/linux-next (7ca81b690e59 dt-bindings: opp: Allow multi-worded OPP entry name)
Merging thermal/thermal/linux-next (a67a46af4ad6 thermal/core: Deprecate changing cooling device state from userspace)
Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
Merging dlm/next (92c446053814 fs: dlm: replace use of socket sk_callback_lock with sock_lock)
Merging rdma/for-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging net-next/master (62803fec52f8 Merge branch 'inuse-cleanups')
Merging bpf-next/for-next (d41bc48bfab2 selftests/bpf: Add uprobe triggering overhead benchmarks)
Merging ipsec-next/master (ad57dae8a64d xfrm: Remove redundant fields and related parentheses)
Merging mlx5-next/mlx5-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging netfilter-next/master (1274a4eb318d ipv6: Remove duplicate statements)
Merging ipvs-next/master (cc0356d6a02e Merge tag 'x86_core_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging wireless-drivers-next/master (2619f904b25c Merge tag 'iwlwifi-next-for-kalle-2021-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
Merging bluetooth/master (28491d7ef4af Bluetooth: btusb: enable Mediatek to support AOSP extension)
Merging mac80211-next/master (5833291ab6de Merge tag 'pci-v5.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging mtd/mtd/next (e269d7caf9e0 Merge tag 'spi-nor/for-5.16' into mtd/next)
Merging nand/nand/next (fc9e18f9e987 mtd: rawnand: arasan: Prevent an unsupported configuration)
Merging spi-nor/spi-nor/next (fa55b7dcdc43 Linux 5.16-rc1)
Merging crypto/master (beaaaa37c664 crypto: api - Fix boot-up crash when crypto manager is disabled)
Merging drm/drm-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging drm-misc/for-linux-next (a193f3b4e050 drm/shmem-helper: Pass GEM shmem object in public interfaces)
CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/dispnv50/disp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/kmb/kmb_drv.c
Merging amdgpu/drm-next (5c7bcf498a6a drm/amdgpu/display: set vblank_disable_immediate for DC)
Merging drm-intel/for-linux-next (1a085e23411d drm/i915: Disable D3Cold in s2idle and runtime pm)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_ggtt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c
Merging drm-intel-gt/for-linux-next-gt (fc12b70d12d0 drm/i915/guc: fix NULL vs IS_ERR() checking)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
Applying: fix up for "drm/ttm: remove ttm_bo_vm_insert_huge()"
Merging drm-tegra/drm/tegra/for-next (cef3fb370da3 drm/tegra: Mark nvdec PM functions as __maybe_unused)
CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/gem.c
Merging drm-msm/msm-next (02d44fde976a drm/msm/dp: fix missing #include)
Merging imx-drm/imx-drm/next (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource())
Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function)
Merging regmap/for-next (02d6fdecb9c3 regmap: allow to define reg_update_bits for no bus configuration)
Merging sound/for-next (2c95b92ecd92 ALSA: memalloc: Unify x86 SG-buffer handling (take#3))
Merging sound-asoc/for-next (7548a391c53c ASoC: SOF: i.MX: simplify Kconfig)
Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer)
Merging input/next (744d0090a5f6 Input: iforce - fix control-message timeout)
Merging block/for-next (cb690f5238d7 Merge tag 'for-5.16/drivers-2021-11-09' of git://git.kernel.dk/linux-block)
Merging device-mapper/for-next (7552750d0494 dm table: log table creation error code)
Merging libata/for-next (8e973315564f libata: libahci: declare ahci_shost_attr_group as static)
Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug)
Merging mmc/next (9ce0f0ff7439 Merge branch 'fixes' into next)
Merging mfd/for-mfd-next (5dc6dafe6209 mfd: simple-mfd-i2c: Select MFD_CORE to fix build error)
Merging backlight/for-backlight-next (3976e974df1f video: backlight: ili9320: Make ili9320_remove() return void)
Merging battery/for-next (715ecbc10d6a power: supply: max77976: add Maxim MAX77976 charger driver)
Merging regulator/for-next (4950486cd86f regulator: da9121: Emit only one error message in .remove())
Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing)
Merging apparmor/apparmor-next (582122f1d73a apparmor: remove duplicated 'Returns:' comments)
Merging integrity/next-integrity (32ba540f3c2a evm: mark evm_fixmode as __ro_after_init)
Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring)
CONFLICT (content): Merge conflict in certs/system_keyring.c
Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata)
Merging selinux/next (15bf32398ad4 security: Return xattr name from security_dentry_init_security())
Merging smack/next (0934ad42bb2c smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi)
Merging tomoyo/master (7d2a07b76933 Linux 5.14)
Merging tpmdd/next (7eba41fe8c7b tpm_tis_spi: Add missing SPI ID)
Merging watchdog/master (c738888032ff watchdog: db8500_wdt: Rename symbols)
Merging iommu/next (52d96919d6a8 Merge branches 'apple/dart', 'arm/mediatek', 'arm/renesas', 'arm/smmu', 'arm/tegra', 'iommu/fixes', 'x86/amd', 'x86/vt-d' and 'core' into next)
Merging audit/next (d9516f346e8b audit: return early if the filter rule has a lower priority)
Merging devicetree/for-next (5ebea8244afb dt-bindings: vendor-prefixes: add T-Head Semiconductor)
Merging mailbox/mailbox-for-next (97961f78e8bc mailbox: imx: support i.MX8ULP S4 MU)
Merging spi/for-next (44ebcb44584f spi: dw: Define the capabilities in a continuous bit-flags set)
Merging tip/auto-latest (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging clockevents/timers/drivers/next (eda9a4f7af6e clocksource/drivers/timer-ti-dm: Select TIMER_OF)
Merging edac/edac-for-next (f889e52436d6 Merge branch 'edac-urgent' into edac-for-next)
Merging irqchip/irq/irqchip-next (11e45471abea Merge branch irq/misc-5.16 into irq/irqchip-next)
Merging ftrace/for-next (938aa33f1465 tracing: Add length protection to histogram string copies)
Merging rcu/rcu/next (587a7d1703f3 Merge branch 'kcsan.2021.09.13b' into HEAD)
Merging kvm/next (da1bfd52b930 KVM: x86: Drop arbitrary KVM_SOFT_MAX_VCPUS)
Merging kvm-arm/next (5a2acbbb0179 Merge branch kvm/selftests/memslot into kvmarm-master/next)
Merging kvms390/next (3fd8417f2c72 KVM: s390: add debug statement for diag 318 CPNC data)
Merging xen-tip/linux-next (08f6c2b09ebd xen: don't continue xenstore initialization in case of errors)
Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next)
Merging workqueues/for-next (f9eaaa82b474 workqueue: doc: Call out the non-reentrance conditions)
Merging drivers-x86/for-next (97ae45953ea9 platform/x86: system76_acpi: Fix input device error handling)
Merging chrome-platform/for-next (297d34e73d49 platform/chrome: cros_ec_proto: Use ec_command for check_features)
Merging hsi/for-next (4ef69e17eb56 HSI: cmt_speech: unmark comments as kernel-doc)
Merging leds/for-next (2f61f240215d leds: led-core: Update fwnode with device_set_node)
Merging ipmi/for-next (1d49eb91e86e ipmi: Move remove_work to dedicated workqueue)
Merging driver-core/driver-core-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging usb/usb-next (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial/usb-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed)
Merging tty/tty-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging char-misc/char-misc-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging extcon/extcon-next (9e6ef3a25e5e dt-bindings: extcon: usbc-tusb320: Add TUSB320L compatible string)
Merging phy-next/next (fa55b7dcdc43 Linux 5.16-rc1)
Merging soundwire/next (fa55b7dcdc43 Linux 5.16-rc1)
Merging thunderbolt/next (fa55b7dcdc43 Linux 5.16-rc1)
Merging vfio/next (3bf1311f351e vfio/ccw: Convert to use vfio_register_emulated_iommu_dev())
Merging staging/staging-next (272958bf8ec3 staging: r8188eu: remove the efuse_hal structure)
Merging iio/togreg (12b6d77431f5 iio: adc: ina2xx: Avoid double reference counting from get_task_struct/put_task_struct())
Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging icc/icc-next (dfe14674bf7b Merge branch 'icc-rpm' into icc-next)
Merging dmaengine/next (fa55b7dcdc43 Linux 5.16-rc1)
Merging cgroup/for-next (588e5d876648 cgroup: bpf: Move wrapper for __cgroup_bpf_*() to kernel/bpf/cgroup.c)
Merging scsi/for-next (588702bfaf15 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (375622ecf36e scsi: qla2xxx: Fix mailbox direction flags in qla2xxx_get_adapter_id())
Merging vhost/linux-next (47ed04961471 virtio_gpio: drop packed attribute)
Merging rpmsg/for-next (6ee5808de074 Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file)
Merging gpio-brgl/gpio/for-next (ea708ac5bf41 gpio: xlp: Remove Netlogic XLP variants)
$ git reset --hard HEAD^
Merging next-20211115 version of gpio-brgl
Merging gpio-intel/for-next (2ff64a84bbb3 gpiolib: acpi: shrink devm_acpi_dev_add_driver_gpios())
Merging gpio-sim/gpio/gpio-sim (5065e08e4ef3 gpio: sim: fix missing unlock on error in gpio_sim_config_commit_item())
CONFLICT (content): Merge conflict in tools/testing/selftests/gpio/Makefile
Merging pinctrl/for-next (62209e805b5c pinctrl: qcom: sm8350: Correct UFS and SDC offsets)
Merging pinctrl-intel/for-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging pinctrl-renesas/renesas-pinctrl (adb613f84a9e pinctrl: renesas: rzg2l: Add support to get/set drive-strength and output-impedance-ohms)
Merging pinctrl-samsung/for-next (b0ef7b1a7a07 pinctrl: samsung: Add Exynos7885 SoC specific data)
Merging pwm/for-next (e9d866d5a629 pwm: vt8500: Rename pwm_busy_wait() to make it obviously driver-specific)
Merging userns/for-next (716040e0ae01 Merge of per_signal_struct_coredumps-for-v5.16, ucount-fixes-for-v5.16, and exit-cleanups-for-v5.16 for testing in linux-next)
Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
Merging kselftest/next (fa55b7dcdc43 Linux 5.16-rc1)
Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' into for-next)
Merging coresight/next (934a5dc1546b coresight: Use devm_bitmap_zalloc when applicable)
Merging rtc/rtc-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging nvdimm/libnvdimm-for-next (e765f13ed126 nvdimm/pmem: move dax_attribute_group from dax to pmem)
Merging at24/at24/for-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging ntb/ntb-next (f96cb827ce49 ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data)
Merging seccomp/for-next/seccomp (1e6d69c7b9cd selftests/seccomp: Report event mismatches more clearly)
Merging kspp/for-next/kspp (879f756fa9bf Merge branches 'for-next/hardening', 'for-next/overflow' and 'for-next/thread_info/cpu' into for-next/kspp)
Merging kspp-gustavo/for-next/kspp (4fe2837511ef Merge branch 'testing/cast-function-type' into for-next/kspp)
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (b15c90153fd9 gnss: drop stray semicolons)
Merging fsi/next (7cc2f34e1f4d fsi: sbefifo: Use interruptible mutex locking)
Merging slimbus/for-next (6880fa6c5660 Linux 5.15-rc1)
Merging nvmem/for-next (413333fd6a88 nvmem: imx-ocotp: add support for post processing)
Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1)
Merging hyperv/hyperv-next (285f68afa8b2 x86/hyperv: Protect set_hv_tscchange_cb() against getting preempted)
Merging auxdisplay/auxdisplay (97fbb29fc1eb MAINTAINERS: Add DT Bindings for Auxiliary Display Drivers)
Merging kgdb/kgdb/for-next (b77dbc86d604 kdb: Adopt scheduler's task classification)
Merging hmm/hmm (6880fa6c5660 Linux 5.15-rc1)
Merging fpga/for-next (8bb7eca972ad Linux 5.15)
Merging kunit/test (fa55b7dcdc43 Linux 5.16-rc1)
Merging cfi/cfi/next (fa55b7dcdc43 Linux 5.16-rc1)
Merging kunit-next/kunit (fa55b7dcdc43 Linux 5.16-rc1)
Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mhi/mhi-next (8c61951b372d Merge tag 'soundwire-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next)
Merging memblock/for-next (e888fa7bb882 memblock: Check memory add/cap ordering)
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
Merging counters/counters (e71ba9452f0b Linux 5.11-rc2)
Merging rust/rust-next (988f45dfe7ea MAINTAINERS: Rust)
CONFLICT (content): Merge conflict in scripts/kconfig/confdata.c
CONFLICT (content): Merge conflict in scripts/Makefile.modfinal
CONFLICT (content): Merge conflict in Makefile
Applying: Kbuild: fix for "kbuild: split DEBUG_CFLAGS out to scripts/Makefile.debug"
Merging cxl/next (53989fad1286 cxl/pmem: Fix module reload vs workqueue state)
Merging folio/for-next (d2f0559fc2d1 csky,sparc: Declare flush_dcache_folio())
Merging bitmap/bitmap-master-5.15 (785cb064e2f8 vsprintf: rework bitmap_list_string)
CONFLICT (content): Merge conflict in arch/parisc/include/asm/bitops.h
Merging zstd/zstd-1.4.10 (ca6dad186b9a lib: zstd: Don't add -O3 to cflags)
Merging efi/next (720dff78de36 efi: Allow efi=runtime)
Merging unicode/for-next (e2a58d2d3416 unicode: only export internal symbols for the selftests)
CONFLICT (content): Merge conflict in fs/f2fs/sysfs.c
Applying: Mark NTFS_RW as BROKEN
Merging akpm-current/current (83f5b72c9e67 configs: introduce debug.config for CI-like setup)
CONFLICT (content): Merge conflict in kernel/sched/core.c
CONFLICT (content): Merge conflict in kernel/exit.c
CONFLICT (content): Merge conflict in include/linux/sched/mm.h
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
Merging akpm/master (b96712434106 lib/stackdepot: allow optional init and stack_table allocation by kvmalloc() - fixup3)
On 11/16/21 6:58 PM, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20211116:
>
ARCH=um SUBARCH=x86_64:
# CONFIG_IPV6 is not set
In file included from ../net/ethernet/eth.c:62:0:
../include/net/gro.h: In function ?ip6_gro_compute_pseudo?:
../include/net/gro.h:413:22: error: implicit declaration of function ?csum_ipv6_magic?; did you mean ?csum_tcpudp_magic?? [-Werror=implicit-function-declaration]
return ~csum_unfold(csum_ipv6_magic(&iph->saddr, &iph->daddr,
^~~~~~~~~~~~~~~
csum_tcpudp_magic
After I made ip6_gro_compute_pseudo() conditional on CONFIG_IPV6,
I got this build error:
In file included from ../net/ipv6/tcpv6_offload.c:10:0:
../net/ipv6/tcpv6_offload.c: In function ?tcp6_gro_receive?:
../net/ipv6/tcpv6_offload.c:22:11: error: implicit declaration of function ?ip6_gro_compute_pseudo?; did you mean ?inet_gro_compute_pseudo?? [-Werror=implicit-function-declaration]
ip6_gro_compute_pseudo)) {
^
../include/net/gro.h:235:5: note: in definition of macro ?__skb_gro_checksum_validate?
compute_pseudo(skb, proto)); \
^~~~~~~~~~~~~~
../net/ipv6/tcpv6_offload.c:21:6: note: in expansion of macro ?skb_gro_checksum_validate?
skb_gro_checksum_validate(skb, IPPROTO_TCP,
^~~~~~~~~~~~~~~~~~~~~~~~~
This is UML x86_64 defconfig:
$ make ARCH=um SUBARCH=x86_64 defconfig all
--
~Randy
Hi Randy,
On Wed, Nov 17, 2021 at 6:49 AM Randy Dunlap <[email protected]> wrote:
> On 11/16/21 6:58 PM, Stephen Rothwell wrote:
> > Changes since 20211116:
>
> ARCH=um SUBARCH=x86_64:
> # CONFIG_IPV6 is not set
It doesn't always happen with CONFIG_IPV6=n, so I guess that's why
it wasn't detected before.
> In file included from ../net/ethernet/eth.c:62:0:
> ../include/net/gro.h: In function ‘ip6_gro_compute_pseudo’:
> ../include/net/gro.h:413:22: error: implicit declaration of function ‘csum_ipv6_magic’; did you mean ‘csum_tcpudp_magic’? [-Werror=implicit-function-declaration]
> return ~csum_unfold(csum_ipv6_magic(&iph->saddr, &iph->daddr,
> ^~~~~~~~~~~~~~~
> csum_tcpudp_magic
>
>
> After I made ip6_gro_compute_pseudo() conditional on CONFIG_IPV6,
> I got this build error:
>
> In file included from ../net/ipv6/tcpv6_offload.c:10:0:
> ../net/ipv6/tcpv6_offload.c: In function ‘tcp6_gro_receive’:
> ../net/ipv6/tcpv6_offload.c:22:11: error: implicit declaration of function ‘ip6_gro_compute_pseudo’; did you mean ‘inet_gro_compute_pseudo’? [-Werror=implicit-function-declaration]
> ip6_gro_compute_pseudo)) {
> ^
> ../include/net/gro.h:235:5: note: in definition of macro ‘__skb_gro_checksum_validate’
> compute_pseudo(skb, proto)); \
> ^~~~~~~~~~~~~~
> ../net/ipv6/tcpv6_offload.c:21:6: note: in expansion of macro ‘skb_gro_checksum_validate’
> skb_gro_checksum_validate(skb, IPPROTO_TCP,
> ^~~~~~~~~~~~~~~~~~~~~~~~~
>
>
>
> This is UML x86_64 defconfig:
>
> $ make ARCH=um SUBARCH=x86_64 defconfig all
[email protected] reported the same issue for m5272c3_defconfig,
and I've bisected the failure to commit 4721031c3559db8e ("net:
move gro definitions to include/net/gro.h").
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On Wed, Nov 17, 2021 at 12:44 AM Geert Uytterhoeven
<[email protected]> wrote:
>
> Hi Randy,
>
> On Wed, Nov 17, 2021 at 6:49 AM Randy Dunlap <[email protected]> wrote:
> > On 11/16/21 6:58 PM, Stephen Rothwell wrote:
> > > Changes since 20211116:
> >
> > ARCH=um SUBARCH=x86_64:
> > # CONFIG_IPV6 is not set
>
> It doesn't always happen with CONFIG_IPV6=n, so I guess that's why
> it wasn't detected before.
Thanks for letting me know
I guess the following addition would fix the issue ?
diff --git a/arch/x86/um/asm/checksum_64.h b/arch/x86/um/asm/checksum_64.h
index 7b6cd1921573c97361b8d486bbba3e8870d53ad6..4f0c15a61925c46b261f87fa319e6aff28f4cfce
100644
--- a/arch/x86/um/asm/checksum_64.h
+++ b/arch/x86/um/asm/checksum_64.h
@@ -14,6 +14,30 @@ static inline unsigned add32_with_carry(unsigned a,
unsigned b)
return a;
}
+#define _HAVE_ARCH_IPV6_CSUM
+static inline __sum16
+csum_ipv6_magic(const struct in6_addr *saddr,
+ const struct in6_addr *daddr,
+ __u32 len, __u8 proto, __wsum sum)
+{
+ __u64 rest, sum64;
+
+ rest = (__force __u64)htonl(len) + (__force __u64)htons(proto) +
+ (__force __u64)sum;
+
+ asm(" addq (%[saddr]),%[sum]\n"
+ " adcq 8(%[saddr]),%[sum]\n"
+ " adcq (%[daddr]),%[sum]\n"
+ " adcq 8(%[daddr]),%[sum]\n"
+ " adcq $0,%[sum]\n"
+
+ : [sum] "=r" (sum64)
+ : "[sum]" (rest), [saddr] "r" (saddr), [daddr] "r" (daddr));
+
+ return csum_fold(
+ (__force __wsum)add32_with_carry(sum64 & 0xffffffff, sum64>>32));
+}
+
extern __sum16 ip_compute_csum(const void *buff, int len);
#endif
>
> > In file included from ../net/ethernet/eth.c:62:0:
> > ../include/net/gro.h: In function ‘ip6_gro_compute_pseudo’:
> > ../include/net/gro.h:413:22: error: implicit declaration of function ‘csum_ipv6_magic’; did you mean ‘csum_tcpudp_magic’? [-Werror=implicit-function-declaration]
> > return ~csum_unfold(csum_ipv6_magic(&iph->saddr, &iph->daddr,
> > ^~~~~~~~~~~~~~~
> > csum_tcpudp_magic
> >
> >
> > After I made ip6_gro_compute_pseudo() conditional on CONFIG_IPV6,
> > I got this build error:
> >
> > In file included from ../net/ipv6/tcpv6_offload.c:10:0:
> > ../net/ipv6/tcpv6_offload.c: In function ‘tcp6_gro_receive’:
> > ../net/ipv6/tcpv6_offload.c:22:11: error: implicit declaration of function ‘ip6_gro_compute_pseudo’; did you mean ‘inet_gro_compute_pseudo’? [-Werror=implicit-function-declaration]
> > ip6_gro_compute_pseudo)) {
> > ^
> > ../include/net/gro.h:235:5: note: in definition of macro ‘__skb_gro_checksum_validate’
> > compute_pseudo(skb, proto)); \
> > ^~~~~~~~~~~~~~
> > ../net/ipv6/tcpv6_offload.c:21:6: note: in expansion of macro ‘skb_gro_checksum_validate’
> > skb_gro_checksum_validate(skb, IPPROTO_TCP,
> > ^~~~~~~~~~~~~~~~~~~~~~~~~
> >
> >
> >
> > This is UML x86_64 defconfig:
> >
> > $ make ARCH=um SUBARCH=x86_64 defconfig all
>
> [email protected] reported the same issue for m5272c3_defconfig,
> and I've bisected the failure to commit 4721031c3559db8e ("net:
> move gro definitions to include/net/gro.h").
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
Hi Eric,
On Wed, Nov 17, 2021 at 10:38 AM Eric Dumazet <[email protected]> wrote:
> On Wed, Nov 17, 2021 at 12:44 AM Geert Uytterhoeven
> <[email protected]> wrote:
> > On Wed, Nov 17, 2021 at 6:49 AM Randy Dunlap <[email protected]> wrote:
> > > On 11/16/21 6:58 PM, Stephen Rothwell wrote:
> > > > Changes since 20211116:
> > >
> > > ARCH=um SUBARCH=x86_64:
> > > # CONFIG_IPV6 is not set
> >
> > It doesn't always happen with CONFIG_IPV6=n, so I guess that's why
> > it wasn't detected before.
>
> Thanks for letting me know
>
> I guess the following addition would fix the issue ?
>
> diff --git a/arch/x86/um/asm/checksum_64.h b/arch/x86/um/asm/checksum_64.h
> index 7b6cd1921573c97361b8d486bbba3e8870d53ad6..4f0c15a61925c46b261f87fa319e6aff28f4cfce
> 100644
> --- a/arch/x86/um/asm/checksum_64.h
> +++ b/arch/x86/um/asm/checksum_64.h
Are you sure that's the right fix?
That won't fix the issue with m5272c3_defconfig.
> > > In file included from ../net/ethernet/eth.c:62:0:
> > > ../include/net/gro.h: In function ‘ip6_gro_compute_pseudo’:
> > > ../include/net/gro.h:413:22: error: implicit declaration of function ‘csum_ipv6_magic’; did you mean ‘csum_tcpudp_magic’? [-Werror=implicit-function-declaration]
> > > return ~csum_unfold(csum_ipv6_magic(&iph->saddr, &iph->daddr,
> > > ^~~~~~~~~~~~~~~
> > > csum_tcpudp_magic
> > >
> > >
> > > After I made ip6_gro_compute_pseudo() conditional on CONFIG_IPV6,
> > > I got this build error:
> > >
> > > In file included from ../net/ipv6/tcpv6_offload.c:10:0:
> > > ../net/ipv6/tcpv6_offload.c: In function ‘tcp6_gro_receive’:
> > > ../net/ipv6/tcpv6_offload.c:22:11: error: implicit declaration of function ‘ip6_gro_compute_pseudo’; did you mean ‘inet_gro_compute_pseudo’? [-Werror=implicit-function-declaration]
> > > ip6_gro_compute_pseudo)) {
> > > ^
> > > ../include/net/gro.h:235:5: note: in definition of macro ‘__skb_gro_checksum_validate’
> > > compute_pseudo(skb, proto)); \
> > > ^~~~~~~~~~~~~~
> > > ../net/ipv6/tcpv6_offload.c:21:6: note: in expansion of macro ‘skb_gro_checksum_validate’
> > > skb_gro_checksum_validate(skb, IPPROTO_TCP,
> > > ^~~~~~~~~~~~~~~~~~~~~~~~~
> > >
> > >
> > >
> > > This is UML x86_64 defconfig:
> > >
> > > $ make ARCH=um SUBARCH=x86_64 defconfig all
> >
> > [email protected] reported the same issue for m5272c3_defconfig,
> > and I've bisected the failure to commit 4721031c3559db8e ("net:
> > move gro definitions to include/net/gro.h").
arch/m68k/include/asm/checksum.h defines csum_ipv6_magic()
unconditionally, so it looks like just a missing #include.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On Wed, Nov 17, 2021 at 1:47 AM Geert Uytterhoeven <[email protected]> wrote:
>
> Hi Eric,
>
> On Wed, Nov 17, 2021 at 10:38 AM Eric Dumazet <[email protected]> wrote:
> > On Wed, Nov 17, 2021 at 12:44 AM Geert Uytterhoeven
> > <[email protected]> wrote:
> > > On Wed, Nov 17, 2021 at 6:49 AM Randy Dunlap <[email protected]> wrote:
> > > > On 11/16/21 6:58 PM, Stephen Rothwell wrote:
> > > > > Changes since 20211116:
> > > >
> > > > ARCH=um SUBARCH=x86_64:
> > > > # CONFIG_IPV6 is not set
> > >
> > > It doesn't always happen with CONFIG_IPV6=n, so I guess that's why
> > > it wasn't detected before.
> >
> > Thanks for letting me know
> >
> > I guess the following addition would fix the issue ?
> >
> > diff --git a/arch/x86/um/asm/checksum_64.h b/arch/x86/um/asm/checksum_64.h
> > index 7b6cd1921573c97361b8d486bbba3e8870d53ad6..4f0c15a61925c46b261f87fa319e6aff28f4cfce
> > 100644
> > --- a/arch/x86/um/asm/checksum_64.h
> > +++ b/arch/x86/um/asm/checksum_64.h
>
> Are you sure that's the right fix?
> That won't fix the issue with m5272c3_defconfig.
>
> > > > In file included from ../net/ethernet/eth.c:62:0:
> > > > ../include/net/gro.h: In function ‘ip6_gro_compute_pseudo’:
> > > > ../include/net/gro.h:413:22: error: implicit declaration of function ‘csum_ipv6_magic’; did you mean ‘csum_tcpudp_magic’? [-Werror=implicit-function-declaration]
> > > > return ~csum_unfold(csum_ipv6_magic(&iph->saddr, &iph->daddr,
> > > > ^~~~~~~~~~~~~~~
> > > > csum_tcpudp_magic
> > > >
> > > >
> > > > After I made ip6_gro_compute_pseudo() conditional on CONFIG_IPV6,
> > > > I got this build error:
> > > >
> > > > In file included from ../net/ipv6/tcpv6_offload.c:10:0:
> > > > ../net/ipv6/tcpv6_offload.c: In function ‘tcp6_gro_receive’:
> > > > ../net/ipv6/tcpv6_offload.c:22:11: error: implicit declaration of function ‘ip6_gro_compute_pseudo’; did you mean ‘inet_gro_compute_pseudo’? [-Werror=implicit-function-declaration]
> > > > ip6_gro_compute_pseudo)) {
> > > > ^
> > > > ../include/net/gro.h:235:5: note: in definition of macro ‘__skb_gro_checksum_validate’
> > > > compute_pseudo(skb, proto)); \
> > > > ^~~~~~~~~~~~~~
> > > > ../net/ipv6/tcpv6_offload.c:21:6: note: in expansion of macro ‘skb_gro_checksum_validate’
> > > > skb_gro_checksum_validate(skb, IPPROTO_TCP,
> > > > ^~~~~~~~~~~~~~~~~~~~~~~~~
> > > >
> > > >
> > > >
> > > > This is UML x86_64 defconfig:
> > > >
> > > > $ make ARCH=um SUBARCH=x86_64 defconfig all
> > >
> > > [email protected] reported the same issue for m5272c3_defconfig,
> > > and I've bisected the failure to commit 4721031c3559db8e ("net:
> > > move gro definitions to include/net/gro.h").
>
> arch/m68k/include/asm/checksum.h defines csum_ipv6_magic()
> unconditionally, so it looks like just a missing #include.
I don't know, apparently on UM, csum_ipv6_magic() is only found in
arch/x86/um/asm/checksum_32.h,
no idea why...
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
On Wed, Nov 17, 2021 at 1:50 AM Eric Dumazet <[email protected]> wrote:
> I don't know, apparently on UM, csum_ipv6_magic() is only found in
> arch/x86/um/asm/checksum_32.h,
> no idea why...
>
Oh, maybe this is the missing part :
diff --git a/include/net/gro.h b/include/net/gro.h
index d0e7df691a807410049508355230a4523af590a1..9c22a010369cb89f9511d78cc322be56170d7b20
100644
--- a/include/net/gro.h
+++ b/include/net/gro.h
@@ -6,6 +6,7 @@
#include <linux/indirect_call_wrapper.h>
#include <linux/ip.h>
#include <linux/ipv6.h>
+#include <net/ip6_checksum.h>
#include <linux/skbuff.h>
#include <net/udp.h>
Hi Eric,
On Wed, Nov 17, 2021 at 10:56 AM Eric Dumazet <[email protected]> wrote:
> On Wed, Nov 17, 2021 at 1:50 AM Eric Dumazet <[email protected]> wrote:
> > I don't know, apparently on UM, csum_ipv6_magic() is only found in
> > arch/x86/um/asm/checksum_32.h,
> > no idea why...
> >
>
> Oh, maybe this is the missing part :
>
> diff --git a/include/net/gro.h b/include/net/gro.h
> index d0e7df691a807410049508355230a4523af590a1..9c22a010369cb89f9511d78cc322be56170d7b20
> 100644
> --- a/include/net/gro.h
> +++ b/include/net/gro.h
> @@ -6,6 +6,7 @@
> #include <linux/indirect_call_wrapper.h>
> #include <linux/ip.h>
> #include <linux/ipv6.h>
> +#include <net/ip6_checksum.h>
> #include <linux/skbuff.h>
> #include <net/udp.h>
Thanks, that fixes the ARCH=m68k m5272c3_defconfig issue for me.
Tested-by: Geert Uytterhoeven <[email protected]>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On Wed, Nov 17, 2021 at 2:04 AM Geert Uytterhoeven <[email protected]> wrote:
>
> Hi Eric,
>
> On Wed, Nov 17, 2021 at 10:56 AM Eric Dumazet <[email protected]> wrote:
> > On Wed, Nov 17, 2021 at 1:50 AM Eric Dumazet <[email protected]> wrote:
> > > I don't know, apparently on UM, csum_ipv6_magic() is only found in
> > > arch/x86/um/asm/checksum_32.h,
> > > no idea why...
> > >
> >
> > Oh, maybe this is the missing part :
> >
> > diff --git a/include/net/gro.h b/include/net/gro.h
> > index d0e7df691a807410049508355230a4523af590a1..9c22a010369cb89f9511d78cc322be56170d7b20
> > 100644
> > --- a/include/net/gro.h
> > +++ b/include/net/gro.h
> > @@ -6,6 +6,7 @@
> > #include <linux/indirect_call_wrapper.h>
> > #include <linux/ip.h>
> > #include <linux/ipv6.h>
> > +#include <net/ip6_checksum.h>
> > #include <linux/skbuff.h>
> > #include <net/udp.h>
>
> Thanks, that fixes the ARCH=m68k m5272c3_defconfig issue for me.
>
> Tested-by: Geert Uytterhoeven <[email protected]>
Great, can you carry your Tested-by: on the submission itself ?
Thanks !
https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
On 11/16/21 6:58 PM, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20211116:
>
on m68k (but probably other places as well):
when CONFIG_IPV6 is not set/enabled:
In file included from ../fs/dlm/lowcomms.c:46:
../fs/dlm/lowcomms.c: In function 'lowcomms_error_report':
../include/net/sock.h:386:45: error: 'struct sock_common' has no member named 'skc_v6_daddr'; did you mean 'skc_daddr'?
386 | #define sk_v6_daddr __sk_common.skc_v6_daddr
| ^~~~~~~~~~~~
--
~Randy
On Wed, Nov 17, 2021 at 11:23 PM Randy Dunlap <[email protected]> wrote:
> On 11/16/21 6:58 PM, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20211116:
> >
>
> on m68k (but probably other places as well):
> when CONFIG_IPV6 is not set/enabled:
>
> In file included from ../fs/dlm/lowcomms.c:46:
> ../fs/dlm/lowcomms.c: In function 'lowcomms_error_report':
> ../include/net/sock.h:386:45: error: 'struct sock_common' has no member named 'skc_v6_daddr'; did you mean 'skc_daddr'?
> 386 | #define sk_v6_daddr __sk_common.skc_v6_daddr
> | ^~~~~~~~~~~~
Introduced by commit 4c3d90570bcc2b33 ("fs: dlm: don't call
kernel_getpeername() in error_report()"), which has not been sent
for review to any public mailing list archived by lore.
I have sent a fix
https://lore.kernel.org/r/[email protected]
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds