Hi all, Changes since 20211001: New tree: bitmap The tegra tree gained a build failure so I used the version from next-20211001. The net-next tree gained a build failure so I used the version from next-20211001. The crypto tree lost its build failure. The drm-msm tree gained a conflict against the drm tree. The sound-asoc tree still had its build failure for which I reverted a commit. The selinux tree gained a semantic conflict against the block tree. The audit tree gained a conflict against the selinux tree. The ipmi tree lost its build failure. Non-merge commits (relative to Linus' tree): 5110 4859 files changed, 255590 insertions(+), 100481 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, 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 338 trees (counting Linus' and 91 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 (f6274b06e326 Merge tag 'linux-kselftest-fixes-5.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) Merging fixes/fixes (3ca706c189db drm/ttm: fix type mismatch error on sparc64) Merging kbuild-current/fixes (0664684e1ebd kbuild: Add -Werror=ignored-optimization-argument to CLANG_FLAGS) Merging arc-current/for-curr (6880fa6c5660 Linux 5.15-rc1) Merging arm-current/fixes (463dbba4d189 ARM: 9104/2: Fix Keystone 2 kernel mapping regression) Merging arm64-fixes/for-next/fixes (22b70e6f2da0 arm64: Restore forced disabling of KPTI on ThunderX) Merging arm-soc-fixes/arm/fixes (3f1c260ffddb MAINTAINERS: Add myself as MStar/Sigmastar Armv7 SoC maintainers) Merging drivers-memory-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging m68k-current/for-linus (9fde03486402 m68k: Remove set_fs()) Merging powerpc-fixes/fixes (23c216b335d1 powerpc/iommu: Report the correct most efficient DMA mask for PCI devices) Merging s390-fixes/fixes (a46044a92add s390/pci: fix zpci_zdev_put() on reserve) 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 (b44d52a50bc6 dsa: tag_dsa: Fix mask for trunked packets) Merging bpf/master (b0e875bac0fa libbpf: Fix memory leak in strset) Merging ipsec/master (93ec1320b017 xfrm: fix rcu lock in xfrm_notify_userpolicy()) Merging netfilter/master (7cd8b1542a7b ptp_pch: Load module automatically if ID matches) Merging ipvs/master (3d3b30175a51 netfilter: nf_tables: honor NLM_F_CREATE and NLM_F_EXCL in event notification) Merging wireless-drivers/master (603a1621caa0 mwifiex: avoid null-pointer-subtraction warning) Merging mac80211/master (a2083eeb119f cfg80211: scan: fix RCU in cfg80211_add_nontrans_list()) Merging rdma-fixes/for-rc (9e1ff307c779 Linux 5.15-rc4) Merging sound-current/for-linus (cc03069a3970 ALSA: hda/realtek: Add quirk for Clevo X170KM-G) Merging sound-asoc-fixes/for-linus (c417c32a473e Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus) Merging regmap-fixes/for-linus (6880fa6c5660 Linux 5.15-rc1) Merging regulator-fixes/for-linus (9e1ff307c779 Linux 5.15-rc4) Merging spi-fixes/for-linus (fa382a0f96cf Merge remote-tracking branch 'spi/for-5.15' into spi-linus) Merging pci-current/for-linus (e4e737bb5c17 Linux 5.15-rc2) Merging driver-core.current/driver-core-linus (410d591a1954 kernfs: don't create a negative dentry if inactive node exists) Merging tty.current/tty-linus (5816b3e6577e Linux 5.15-rc3) Merging usb.current/usb-linus (5816b3e6577e Linux 5.15-rc3) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (5816b3e6577e Linux 5.15-rc3) Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle) Merging phy/fixes (6880fa6c5660 Linux 5.15-rc1) Merging staging.current/staging-linus (5816b3e6577e Linux 5.15-rc3) Merging iio-fixes/fixes-togreg (26d90b559057 iio: light: opt3001: Fixed timeout error when 0 lux) Merging char-misc.current/char-misc-linus (ad2b502bc5e6 Merge tag 'misc-habanalabs-fixes-2021-09-29' of https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux into char-misc-linus) Merging soundwire-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging thunderbolt-fixes/fixes (9e1ff307c779 Linux 5.15-rc4) Merging input-current/for-linus (0c5483a5778f Input: analog - always use ktime functions) Merging crypto-current/master (0e14ef38669c crypto: x86/sm4 - Fix frame pointer stack corruption) Merging vfio-fixes/for-linus (42de956ca7e5 vfio/ap_ops: Add missed vfio_uninit_group_dev()) Merging kselftest-fixes/fixes (2f9602870886 selftests: drivers/dma-buf: Fix implicit declaration warns) Merging modules-fixes/modules-linus (0d67e332e6df module: fix clang CFI with MODULE_UNLOAD=n) Merging dmaengine-fixes/fixes (6880fa6c5660 Linux 5.15-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 (206704a1fe0b media: atomisp: restore missing 'return' statement) Merging reset-fixes/reset/fixes (ed104ca4bd9c reset: reset-zynqmp: Fixed the argument data type) Merging mips-fixes/mips-fixes (740da9d7ca4e MIPS: Revert "add support for buggy MT7621S core detection") Merging at91-fixes/at91-fixes (dbe68bc9e82b ARM: dts: at91: sama7g5ek: to not touch slew-rate for SDMMC pins) Merging omap-fixes/fixes (e879f855e590 bus: ti-sysc: Add break in switch statement in sysc_init_soc()) Merging kvm-fixes/master (2353e593a13b Merge tag 'kvm-s390-master-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master) Merging kvms390-fixes/master (25b5476a294c KVM: s390: Function documentation fixes) Merging hwmon-fixes/hwmon (dd4d747ef05a hwmon: (w83793) Fix NULL pointer dereference by removing unnecessary structure field) Merging nvdimm-fixes/libnvdimm-fixes (d55174cccac2 nvdimm/pmem: fix creating the dax group) Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) Merging btrfs-fixes/next-fixes (45940091a3c1 Merge branch 'misc-5.15' into next-fixes) Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx()) 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 (6f6aab1caf6c platform/x86: gigabyte-wmi: add support for B550I Aorus Pro AX) Merging samsung-krzk-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging pinctrl-samsung-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging devicetree-fixes/dt/linus (b2d70c0dbf27 dt-bindings: drm/bridge: ti-sn65dsi86: Fix reg value) Merging scsi-fixes/fixes (79a7482249a7 scsi: csiostor: Add module softdep on cxgb4) Merging drm-fixes/drm-fixes (78ea81417944 Merge tag 'exynos-drm-fixes-for-v5.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (9e1ff307c779 Linux 5.15-rc4) Merging mmc-fixes/fixes (e2845b1d92d7 mmc: meson-gx: do not use memcpy_to/fromio for dram-access-quirk) Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) Merging gnss-fixes/gnss-linus (e73f0f0ee754 Linux 5.14-rc1) Merging hyperv-fixes/hyperv-fixes (41608b64b10b PCI: hv: Fix sleep while in non-sleep context when removing child devices from the bus) Merging soc-fsl-fixes/fix (c1e64c0aec8c soc: fsl: qe: fix static checker warning) Merging risc-v-fixes/fixes (5155cf7b6aae Merge remote-tracking branch 'palmer/riscv-vdso-cleanup' into fixes) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) Merging fpga-fixes/fixes (2a2a79577dda fpga: ice40-spi: Add SPI device ID table) Merging spdx/spdx-linus (6880fa6c5660 Linux 5.15-rc1) Merging gpio-brgl-fixes/gpio/for-current (1649b8376694 gpio: pca953x: Improve bias setting) Merging gpio-intel-fixes/fixes (1649b8376694 gpio: pca953x: Improve bias setting) Merging pinctrl-intel-fixes/fixes (9e1ff307c779 Linux 5.15-rc4) Merging erofs-fixes/fixes (c40dd3ca2a45 erofs: clear compacted_2b if compacted_4b_initial > totalidx) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (f62314b1ced2 kunit: fix reference count leak in kfree_at_end) Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) Merging memblock-fixes/fixes (024591f9a6e0 arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM) Merging cel-fixes/for-rc (7d2a07b76933 Linux 5.14) Merging irqchip-fixes/irq/irqchip-fixes (b78f26926b17 irqchip/gic: Work around broken Renesas integration) Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) Merging perf-current/perf/urgent (0513e464f900 Merge tag 'perf-tools-fixes-for-v5.15-2021-09-27' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) Merging drm-misc-fixes/for-linux-next-fixes (f86e9e383a71 video: fbdev: gbefb: Only instantiate device when built for IP32) CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_hdmi.c Merging kspp-gustavo/for-next/kspp (6409e7102a9b Merge branch 'for-next/kspp-fixes' into for-next/kspp) Merging kbuild/for-next (6988f70cf105 kconfig: rename a variable in the lexer to a clearer name) Merging perf/perf/core (be8ecc57f180 perf srcline: Use long-running addr2line per DSO) Merging compiler-attributes/compiler-attributes (b83a908498d6 compiler_attributes.h: move __compiletime_{error|warning}) Merging dma-mapping/for-next (59583f747664 sparc32: page align size in arch_dma_alloc) Merging asm-generic/master (7962c2eddbfe arch: remove unused function syscall_set_arguments()) Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1) Merging arm/for-next (4603664c0fe9 Merge branches 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (e45ac92bcc92 Merge branches 'for-next/kexec', 'for-next/kselftest', 'for-next/misc', 'for-next/mm', 'for-next/mte', 'for-next/pfn-valid' and 'for-next/scs' into for-next/core) Merging arm-perf/for-next/perf (e656972b6986 drivers/perf: Improve build test coverage) Merging arm-soc/for-next (6880fa6c5660 Linux 5.15-rc1) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (83e38509109e Merge branch 'v5.16/dt64' into for-next) Merging aspeed/for-next (e986277a56da Merge branches 'defconfig-for-v5.16' and 'dt-for-v5.16' into for-next) Merging at91/at91-next (b4af371d908f Merge branch 'at91-soc' into at91-next) Merging drivers-memory/for-next (bf7cf1ccbccc Merge branch 'mem-ctrl-next' into for-next) Merging imx-mxs/for-next (0dd3273df8c2 Merge branch 'imx/dt64' into for-next) Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) Merging mediatek/for-next (69862ae4e378 Merge branch 'v5.14-next/soc' into for-next) Merging mvebu/for-next (930af8dda750 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (7fd4d99072ce Merge branch 'omap-for-v5.16/ti-sysc' into for-next) Merging qcom/for-next (37f6317b1882 Merge branches 'arm64-for-5.16', 'drivers-for-5.16' and 'dts-for-5.16' into for-next) Merging raspberrypi/for-next (9f5289ec6f1c ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address) Merging renesas/next (a462ac13da67 Merge branches 'renesas-arm-defconfig-for-v5.16' and 'renesas-arm-dt-for-v5.16' into renesas-next) Merging reset/reset/next (09f3824342f6 reset: simple: remove ZTE details in Kconfig help) Merging rockchip/for-next (9a6218fd50c1 Merge branch 'v5.16-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (64052e7fbb09 Merge branch 'next/dt' into for-next) Merging scmi/for-linux-next (cb5da0da3602 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 (350081007916 ARM: dts: stm32: set the DCMI pins on stm32mp157c-odyssey) Merging sunxi/sunxi/for-next (bb289f4c0b2b Merge branches 'sunxi/clk-for-5.16', 'sunxi/core-for-5.16', 'sunxi/drivers-for-5.16', 'sunxi/dt-for-5.16' and 'sunxi/fixes-for-5.15' into sunxi/for-next) Merging tegra/for-next (e7ed16ca46b5 Merge branch for-5.16/arm64/dt into for-next) $ git reset --hard HEAD^ Merging next-20211001 version of tegra Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) Merging ti-k3-new/ti-k3-next (6037c75b193a arm64: dts: ti: k3-am65: Relocate thermal-zones to SoC specific location) Merging xilinx/for-next (7a4c31ee877a arm64: zynqmp: Add support for Xilinx Kria SOM board) Merging clk/clk-next (1a10ca10a675 Merge branch 'clk-rockchip' into clk-next) Merging clk-imx/for-next (d1012253a2d3 clk: imx: imx6ul: Fix csi clk gate register) Merging clk-renesas/renesas-clk (cc3e8f97bbd3 clk: renesas: r8a779a0: Add Z0 and Z1 clock support) Merging clk-samsung/for-next (1d26eaeec37a clk: samsung: s5pv210-audss: Make use of devm_platform_ioremap_resource()) Merging csky/linux-next (40e080ed8218 csky: Make HAVE_TCM depend on !COMPILE_TEST) Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs) Merging m68k/for-next (6621cb4a2d0a m68k: muldi3: Use semicolon instead of comma) Merging m68knommu/for-next (16352355b8f4 m68knommu: Remove MCPU32 config symbol) Merging microblaze/next (6880fa6c5660 Linux 5.15-rc1) Merging mips/mips-next (67512a8cf5a7 MIPS: Avoid macro redefinitions) Merging nds32/next (07cd7745c6f2 nds32/setup: remove unused memblock_region variable in setup_memory()) CONFLICT (content): Merge conflict in arch/nds32/Kconfig Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) Merging openrisc/for-next (72698a878926 openrisc: time: don't mark comment as kernel-doc) Merging parisc-hd/for-next (144857444edb parisc/unwind: use copy_from_kernel_nofault()) Merging powerpc/next (e4e737bb5c17 Linux 5.15-rc2) Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) Merging risc-v/for-next (21ccdccd21e4 riscv: mm: don't advertise 1 num_asid for 0 asid bits) Merging s390/for-next (7e8601b12f46 Merge branch 'features' into for-next) Merging sh/for-next (12285ff8667b sh: kdump: add some attribute to function) 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 (234640275675 um: rename set_signals() to um_set_signals()) Merging xtensa/xtensa-for-next (ddc33155115a xtensa: xtfpga: Try software restart before simulating CPU reset) Merging pidfd/for-next (61bc346ce64a uapi/linux/prctl: provide macro definitions for the PR_SCHED_CORE type argument) Merging fscrypt/master (7f595d6a6cdc fscrypt: allow 256-bit master keys with AES-256-XTS) Merging fscache/fscache-next (97b85f2079a9 Merge branch 'fscache-iter-3' into fscache-next) Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") Merging btrfs/for-next (9a10940c7b28 Merge branch 'for-next-next-v5.15-20211004' into for-next-20211004) Merging ceph/master (b96728705f91 ceph: convert to noop_direct_IO) Merging cifs/for-next (9e1ff307c779 Linux 5.15-rc4) 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 (1266b4a7ecb6 erofs: fix double free of 'copied') Merging exfat/dev (50be9417e23a Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block) Merging ext3/for_next (372d1f3e1bfe ext2: fix sleeping in atomic bugs on error) Merging ext4/dev (f2c77973507f ext4: recheck buffer uptodate bit under buffer lock) Merging f2fs/dev (6663b138ded1 f2fs: set SBI_NEED_FSCK flag when inconsistent node block found) Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) Merging fuse/for-next (7a41554fdfb0 fuse: move fuse_invalidate_attr() into fuse_update_ctime()) Merging gfs2/for-next (11603f0011d0 gfs2: Allow append and immutable bits to coexist) Merging jfs/jfs-next (c48a14dca2cb JFS: fix memleak in jfs_mount) Merging ksmbd/ksmbd-for-next (9e1ff307c779 Linux 5.15-rc4) Merging nfs/linux-next (9e1ff307c779 Linux 5.15-rc4) Merging nfs-anna/linux-next (8cfb9015280d NFS: Always provide aligned buffers to the RPC read layers) Merging nfsd/nfsd-next (35940a58f9f1 SUNRPC: Capture value of xdr_buf::page_base) Merging cel/for-next (2ba5acfb3495 SUNRPC: fix sign error causing rpcsec_gss drops) Merging ntfs3/master (35afb70dcfe4 fs/ntfs3: Check for NULL if ATTR_EA_INFO is incorrect) Merging orangefs/for-next (0fdec1b3c9fb orangefs: fix orangefs df output.) Merging overlayfs/overlayfs-next (1dc1eed46f9f ovl: fix IOCB_DIRECT if underlying fs doesn't support direct IO) Merging ubifs/next (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode) Merging v9fs/9p-next (9c4d94dc9a64 net/9p: increase default msize to 128k) Merging xfs/for-next (f38a032b165d xfs: fix I_DONTCACHE) 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 (90f7d7a0d0d6 locks: remove LOCK_MAND flock lock support) Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next) Merging printk/for-next (c15b5fc054c3 ia64: don't do IA64_CMPXCHG_DEBUG without CONFIG_PRINTK) Merging pci/next (ef4bce990eab Merge branch 'pci/virtualization') Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long) Merging hid/for-next (dd0f17ef2ea8 Merge branches 'for-5.15/upstream-fixes' and 'for-5.16/amd-sfh' into for-next) Merging i2c/i2c/for-next (90d8f9584220 Merge branch 'i2c/for-current-fixed' 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 (0889b7c73a4d hwmon: (tmp421) introduce MAX_CHANNELS define) Merging jc_docs/docs-next (250a0a5ba9d2 docs: checkpatch: add multiline, do/while, and multiple-assignment messages) Merging v4l-dvb/master (c52e7b855b33 Merge tag 'v5.15-rc4' into media_tree) Merging v4l-dvb-next/master (c52e7b855b33 Merge tag 'v5.15-rc4' into media_tree) Merging pm/linux-next (d91db9b878c3 Merge branch 'pm-pci' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (c2ace21f937a cpufreq: tegra186/tegra194: Handle errors in BPMP response) Merging cpupower/cpupower (79a0dc5530a9 tools: cpupower: fix typo in cpupower-idle-set(1) manpage) Merging devfreq/devfreq-next (6b28c7d0781e PM / devfreq: Strengthen check for freq_table) Merging opp/opp/linux-next (e69709f6861a opp: Add more resource-managed variants of dev_pm_opp_of_add_table()) Merging thermal/thermal/linux-next (fc26023f8816 thermal/drivers/int340x: Fix tcc offset on resume) CONFLICT (content): Merge conflict in drivers/thermal/intel/int340x_thermal/processor_thermal_device.c Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) Merging dlm/next (ecd95673142e fs: dlm: avoid comms shutdown delay in release_lockspace) Merging swiotlb/linux-next (f3c4b1341e83 swiotlb: use depends on for DMA_RESTRICTED_POOL) Merging rdma/for-next (d30ef6d5c013 Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux) CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/ipoib_tx.c Merging net-next/master (166003436190 Merge branch 'phy-10g-mode-helper') $ git reset --hard HEAD^ Merging next-20211001 version of net-next Applying: fix up for "net: add new socket option SO_RESERVE_MEM" [master 96958d6c3597] next-20211001/net-next Merging bpf-next/for-next (0693b27644f0 Merge branch 'mctp-kunit-tests') CONFLICT (content): Merge conflict in arch/sparc/include/uapi/asm/socket.h $ git reset --hard HEAD^ Merging next-20211001 version of bpf-next Merging ipsec-next/master (83688aec17bf net/ipv4/xfrm4_tunnel.c: remove superfluous header files from xfrm4_tunnel.c) Merging mlx5-next/mlx5-next (d2c8a1554c10 IB/mlx5: Enable UAR to have DevX UID) Merging netfilter-next/master (acde891c243c rxrpc: Fix _usecs_to_jiffies() by using usecs_to_jiffies()) Merging ipvs-next/master (acde891c243c rxrpc: Fix _usecs_to_jiffies() by using usecs_to_jiffies()) Merging wireless-drivers-next/master (a8e5387f8362 ipw2200: Fix a function name in print messages) Merging bluetooth/master (43f51bd946da Bluetooth: Rename driver .prevent_wake to .wakeup) CONFLICT (content): Merge conflict in arch/sparc/include/uapi/asm/socket.h $ git reset --hard HEAD^ Merging next-20211001 version of bluetooth Merging mac80211-next/master (171964252189 mac80211: MBSSID support in interface handling) Merging mtd/mtd/next (b72841e4dcd5 mtd: mtdswap: Remove redundant assignment of pointer eb) Merging nand/nand/next (c2606ddcf5ad mtd: onenand: samsung: drop Exynos4 and describe driver in KConfig) Merging spi-nor/spi-nor/next (5816b3e6577e Linux 5.15-rc3) Merging crypto/master (e42dff467ee6 crypto: api - Export crypto_boot_test_finished) Merging drm/drm-next (1e3944578b74 Merge tag 'amd-drm-next-5.16-2021-09-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) Merging drm-misc/for-linux-next (61bae132030a Revert "drm: cleanup: drm_modeset_lock_all_ctx() --> DRM_MODESET_LOCK_ALL_BEGIN()") Merging amdgpu/drm-next (4e45069010e5 drm/amdgpu/pm: properly handle sclk for profiling modes on vangogh) Merging drm-intel/for-linux-next (7d396cacaea6 drm/i195: Make the async flip VT-d workaround dynamic) Merging drm-tegra/drm/tegra/for-next (c3dbfb9c49ee gpu: host1x: Plug potential memory leak) Merging drm-msm/msm-next (bc80747eb681 drm/msm: Do not run snapshot on non-DPU devices) CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_gem_submit.c 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 (6880fa6c5660 Linux 5.15-rc1) Merging sound/for-next (23939115be18 ALSA: usb-audio: Fix packet size calculation regression) Merging sound-asoc/for-next (6de669e88076 Merge remote-tracking branch 'asoc/for-5.16' into asoc-next) Applying: Revert "firmware: cs_dsp: add driver to support firmware loading on Cirrus Logic DSPs" Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer) Merging input/next (5c4c2c8e6fac Input: ariel-pwrbutton - add SPI device ID table) Merging block/for-next (1b2d1439fc25 Merge branch 'for-5.16/io_uring' into for-next) Merging device-mapper/for-next (d3703ef33129 dm crypt: use in_hardirq() instead of deprecated in_irq()) Merging libata/for-next (0e96dc47b95a ahci: remove duplicated PCI device IDs) Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug) Merging mmc/next (fb99597d255a mmc: slot-gpio: Update default label when no con_id provided) Merging mfd/for-mfd-next (cdff1eda6932 mfd: lpc_sch: Rename GPIOBASE to prevent build error) Merging backlight/for-backlight-next (79fad92f2e59 backlight: pwm_bl: Improve bootloader/kernel device handover) Merging battery/for-next (0668281d329d power: supply: cpcap-battery: use device_get_match_data() to simplify code) Merging regulator/for-next (d17e70999e4a Merge remote-tracking branch 'regulator/for-5.16' into regulator-next) Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) Merging integrity/next-integrity (836f7b6ca082 ima: fix deadlock when traversing "ima_default_rules".) 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 (f5d0e5e9d72d selinux: remove the SELinux lockdown implementation) CONFLICT (content): Merge conflict in fs/io-wq.c Applying: fixup for "io_uring: init opcode in io_init_req()" Merging smack/next (387ef964460f Smack:- Use overlay inode label in smack_inode_copy_up()) Merging tomoyo/master (7d2a07b76933 Linux 5.14) Merging tpmdd/next (f985911b7bc7 crypto: public_key: fix overflow during implicit conversion) Merging watchdog/master (5816b3e6577e Linux 5.15-rc3) Merging iommu/next (0b29edc21567 Merge branches 'arm/mediatek', 'arm/renesas', 'iommu/fixes', 'x86/amd' and 'core' into next) Merging audit/next (571e5c0efcb2 audit: add OPENAT2 record to list "how" info) CONFLICT (content): Merge conflict in include/uapi/linux/audit.h Merging devicetree/for-next (37ef2c34e437 docs: dt: Fix a few grammar nits in the binding/schema docs) Merging mailbox/mailbox-for-next (85dfdbfc13ea mailbox: cmdq: add multi-gce clocks support for mt8195) Merging spi/for-next (8886d5c77f83 Merge remote-tracking branch 'spi/for-5.16' into spi-next) Merging tip/auto-latest (d4bfebd9ef49 Merge remote-tracking branch 'tip/x86/cpu' into tip-master) Merging clockevents/timers/drivers/next (f196ae282070 dt-bindings: timer: Add ABIs for new Ingenic SoCs) Merging edac/edac-for-next (1c60e6f24b67 Merge branch 'edac-misc' into edac-for-next) Merging irqchip/irq/irqchip-next (6e3b473ee064 Merge branch irq/qcom-pdc-nowake-cleanup into irq/irqchip-next) Merging ftrace/for-next (5dfe50b05588 bootconfig: Rename xbc_node_find_child() to xbc_node_find_subkey()) Merging rcu/rcu/next (718ecc280a84 rcu: Make idle entry report expedited quiescent states) Merging kvm/next (deae4a10f166 KVM: x86: only allocate gfn_track when necessary) Merging kvm-arm/next (419025b3b419 Merge branch kvm-arm64/misc-5.15 into kvmarm-master/next) Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests) Merging kvms390/next (d5d7bdc80baf s390/mm: optimize reset_guest_reference_bit()) Merging xen-tip/linux-next (0594c58161b6 xen/x86: fix PV trap handling on secondary processors) Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next) Merging workqueues/for-next (6880fa6c5660 Linux 5.15-rc1) Merging drivers-x86/for-next (c99ca78d67a6 platform/x86: thinkpad_acpi: Switch to common use of attributes) Merging chrome-platform/for-next (eb057514ccca platform/chrome: cros_ec: Fix spelling mistake "responsed" -> "response") Merging hsi/for-next (4ef69e17eb56 HSI: cmt_speech: unmark comments as kernel-doc) Merging leds/for-next (2a5a8fa8b231 leds: trigger: use RCU to protect the led_cdevs list) Merging ipmi/for-next (bc7b6871360e ipmi: Add docs for the IPMI IPMB driver) Merging driver-core/driver-core-next (bb76c823585b Merge 5.15-rc4 into driver-core-next) Merging usb/usb-next (ae9a6149884e Merge 5.15-rc3 into usb-next) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (c8345c0500de USB: serial: kl5kusb105: drop line-status helper) Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) Merging tty/tty-next (5ecb11dd892f Merge 5.15-rc3 into tty-next) Merging char-misc/char-misc-next (8bf7a12c628d Merge 5.15-rc4 into char-misc-next) Merging extcon/extcon-next (f83d7033d4ec dt-bindings: extcon: usbc-tusb320: Add TUSB320L compatible string) Merging phy-next/next (717e04fba4fa phy: rockchip-inno-usb2: Make use of the helper function devm_add_action_or_reset()) Merging soundwire/next (ccfdcb325f2a ABI: sysfs-bus-soundwire-slave: use wildcards on What definitions) Merging thunderbolt/next (0a0624a26f9c thunderbolt: Fix -Wrestrict warning) Merging vfio/next (d9a0cd510c33 Merge branch 'v5.16/vfio/hch-cleanup-vfio-iommu_group-creation-v6' into v5.16/vfio/next) Merging staging/staging-next (42ce32b1ae54 staging: r8188eu: Remove unused macros and defines from odm.h) Merging iio/togreg (4c2d124b3c9d iio: imu: adis16400: Fix buffer alignment requirements.) CONFLICT (content): Merge conflict in drivers/iio/adc/aspeed_adc.c 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 (6880fa6c5660 Linux 5.15-rc1) Merging cgroup/for-next (7ee285395b21 cgroup: Make rebind_subsystems() disable v2 controllers all at once) Merging scsi/for-next (b198c36ab605 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (c749301ebee8 scsi: sd: Fix sd_do_mode_sense() buffer length handling) Merging vhost/linux-next (dd7dc7e82b14 vhost_vdpa: unset vq irq before freeing irq) Merging rpmsg/for-next (eb2685635cb7 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 (7687a5b0ee93 gpio: modepin: Add driver support for modepin GPIO controller) Merging gpio-intel/for-next (1649b8376694 gpio: pca953x: Improve bias setting) Merging pinctrl/for-next (5077a3240bb3 Merge tag 'renesas-pinctrl-for-v5.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel) Merging pinctrl-intel/for-next (176412f8674b pinctrl: intel: Kconfig: Add configuration menu to Intel pin control) Merging pinctrl-renesas/renesas-pinctrl (fcfb63148c24 pinctrl: renesas: rzg2l: Fix missing port register 21h) Merging pinctrl-samsung/for-next (6880fa6c5660 Linux 5.15-rc1) Merging pwm/for-next (3f2b16734914 pwm: mtk-disp: Implement atomic API .get_state()) Merging userns/for-next (a3be01837fc9 Merge of ucount-fixes-for-5.14, siginfo-si_trapno-for-v5.15, and exit-cleanups-for-v5.15 for testing in linux-next) CONFLICT (content): Merge conflict in include/linux/sched/signal.h Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) Merging kselftest/next (6880fa6c5660 Linux 5.15-rc1) Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' into for-next) Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) Merging rtc/rtc-next (27ff63eb076c rtc: msc313: fix missing include) Merging nvdimm/libnvdimm-for-next (e765f13ed126 nvdimm/pmem: move dax_attribute_group from dax to pmem) Merging at24/at24/for-next (762925405482 dt-bindings: at24: add ON Semi CAT24C04 and CAT24C05) Merging ntb/ntb-next (f96cb827ce49 ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data) Merging seccomp/for-next/seccomp (d9bbdbf324cd x86: deduplicate the spectre_v2_user documentation) Merging kspp/for-next/kspp (e6f21e8a3c4f Merge branch 'for-next/overflow' into for-next/kspp) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging gnss/gnss-next (0f79ce970e79 gnss: drop stray semicolons) Merging fsi/next (9ab1428dfe2c fsi/sbefifo: Fix reset timeout) Merging slimbus/for-next (6880fa6c5660 Linux 5.15-rc1) Merging nvmem/for-next (d162d84b27c8 nvmem: Fix shift-out-of-bound (UBSAN) with byte size cells) Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) Merging hyperv/hyperv-next (9d68cd9120e4 hv_utils: Set the maximum packet size for VSS driver to the length of the receive buffer) Merging auxdisplay/auxdisplay (24ebc044c72e auxdisplay: Replace symbolic permissions with octal permissions) Merging kgdb/kgdb/for-next (f8416aa29185 kernel: debug: Convert to SPDX identifier) Merging hmm/hmm (6880fa6c5660 Linux 5.15-rc1) Merging fpga/for-next (57b44817a8d6 MAINTAINERS: Drop outdated FPGA Manager website) Merging kunit/test (6880fa6c5660 Linux 5.15-rc1) Merging cfi/cfi/next (ff1176468d36 Linux 5.14-rc3) Merging kunit-next/kunit (3b29021ddd10 kunit: tool: allow filtering test cases via glob) 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 (813272ed5238 Merge 5.14-rc5 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 (5d3986cf8ed6 MAINTAINERS: Rust) CONFLICT (content): Merge conflict in include/linux/kallsyms.h CONFLICT (content): Merge conflict in Makefile Applying: fixup for rust integration with Makefile.clang creation Merging cxl/next (ed97afb53365 cxl/pci: Disambiguate cxl_pci further from cxl_mem) Merging folio/for-next (27b231798da1 mm/writeback: Add folio_write_one) CONFLICT (modify/delete): fs/cachefiles/rdwr.c deleted in HEAD and modified in folio/for-next. Version folio/for-next of fs/cachefiles/rdwr.c left in tree. $ git rm -f fs/cachefiles/rdwr.c Applying: fix up for "9p: Convert to using the netfs helper lib to do reads and caching" Merging bitmap/bitmap-master-5.15 (785cb064e2f8 vsprintf: rework bitmap_list_string) Merging akpm-current/current (dd22e0752770 ipc/ipc_sysctl.c: remove fallback for !CONFIG_PROC_SYSCTL) $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (506ac22b3b7e mm: unexport {,un}lock_page_memcg)
Attachment:
pgpQfZgb3kRoP.pgp
Description: OpenPGP digital signature
