Hi all, News: I will be on vacation for 2 week froms Saturday, so the next linux-next release will be August 9. Changes since 20210722: The f2fs tree gained a conflict and a semantic conflict against the ext3 tree. The net-next tree gained a conflict against Linus' tree. The amdgpu tree gained a conflict against the drm-fixes tree. The driver-core tree gained a semantic conflict against the drm tree. The dmaengine tree gained a conflict against the driver-core tree. Non-merge commits (relative to Linus' tree): 2724 2791 files changed, 156650 insertions(+), 48353 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 333 trees (counting Linus' and 90 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 (9bead1b58c4c Merge tag 'array-bounds-fixes-5.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux) Merging fixes/fixes (614124bea77e Linux 5.13-rc5) Merging kbuild-current/fixes (5e60f363b38f Documentation: Fix intiramfs script name) Merging arc-current/for-curr (3eada7b4bd85 ARC: fp: set FPU_STATUS.FWE to enable FPU_STATUS update on context switch) Merging arm-current/fixes (dad7b9896a5d ARM: 9081/1: fix gcc-10 thumb2-kernel regression) Merging arm64-fixes/for-next/fixes (d8a719059b9d Revert "mm/pgtable: add stubs for {pmd/pub}_{set/clear}_huge") Merging arm-soc-fixes/arm/fixes (82a1c67554df ARM: dts: versatile: Fix up interrupt controller node names) Merging drivers-memory-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) Merging m68k-current/for-linus (21ed49265986 m68k: MAC should select HAVE_PATA_PLATFORM) Merging powerpc-fixes/fixes (bc4188a2f56e KVM: PPC: Fix kvm_arch_vcpu_ioctl vcpu_load leak) Merging s390-fixes/fixes (0cde560a8bfc s390: update defconfigs) Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) Merging net/master (9f42f674a892 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) Merging bpf/master (d6371c76e20d bpf: Fix OOB read when printing XDP link fdinfo) Merging ipsec/master (7cb745800df9 Merge branch 'xfrm/compat: Fix xfrm_spdattr_type_t copying') Merging netfilter/master (cfbe3650dd3e netfilter: nf_tables: fix audit memory leak in nf_tables_commit) Merging ipvs/master (cfbe3650dd3e netfilter: nf_tables: fix audit memory leak in nf_tables_commit) Merging wireless-drivers/master (09cfae9f13d5 ixgbe: Fix packet corruption due to missing DMA sync) Merging mac80211/master (f4b29d2ee903 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) Merging rdma-fixes/for-rc (dc6afef7e142 RDMA/irdma: Change returned type of irdma_setup_virt_qp to void) Merging sound-current/for-linus (b0084afde27f ALSA: usb-audio: Add registration quirk for JBL Quantum headsets) Merging sound-asoc-fixes/for-linus (a7b7e43d4747 Merge remote-tracking branch 'asoc/for-5.14' into asoc-linus) Merging regmap-fixes/for-linus (e73f0f0ee754 Linux 5.14-rc1) Merging regulator-fixes/for-linus (0ffa19b42099 Merge remote-tracking branch 'regulator/for-5.14' into regulator-linus) Merging spi-fixes/for-linus (c6edba975913 Merge remote-tracking branch 'spi/for-5.14' into spi-linus) Merging pci-current/for-linus (e73f0f0ee754 Linux 5.14-rc1) Merging driver-core.current/driver-core-linus (e64daad660a0 driver core: Prevent warning when removing a device link from unregistered consumer) Merging tty.current/tty-linus (7f0909db7615 serial: 8250_pci: Enumerate Elkhart Lake UARTs via dedicated driver) Merging usb.current/usb-linus (1d1b97d5e763 Merge tag 'usb-serial-5.14-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (d6a206e60124 USB: serial: cp210x: add ID for CEL EM3588 USB ZigBee stick) Merging usb-chipidea-fixes/for-usb-fixes (42c4417937be usb: cdnsp: Fix the IMAN_IE_SET and IMAN_IE_CLEAR macro.) Merging phy/fixes (e73f0f0ee754 Linux 5.14-rc1) Merging staging.current/staging-linus (cb7abd1db6e5 staging: rtl8723bs: select CONFIG_CRYPTO_LIB_ARC4) Merging iio-fixes/fixes-togreg (7e77ef8b8d60 iio: adis: set GPIO reset pin direction) Merging char-misc.current/char-misc-linus (c453db6cd964 nds32: fix up stack guard gap) Merging soundwire-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) Merging thunderbolt-fixes/fixes (13311e74253f Linux 5.13-rc7) Merging input-current/for-linus (818b26588994 Merge branch 'next' into for-linus) Merging crypto-current/master (66192b2e3fd8 crypto: hisilicon/sec - fix the process of disabling sva prefetching) Merging vfio-fixes/for-linus (dc51ff91cf2d vfio/platform: fix module_put call in error flow) Merging kselftest-fixes/fixes (2734d6c1b1a0 Linux 5.14-rc2) Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section()) Merging dmaengine-fixes/fixes (6b4b87f2c31a dmaengine: idxd: fix submission race window) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (ba3562892619 mtd: devices: mchp48l640: Fix memory leak on cmd) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (61c6f04a988e media: s5p-mfc: Fix display delay control creation) Merging reset-fixes/reset/fixes (1435f82689e1 reset: RESET_MCHP_SPARX5 should depend on ARCH_SPARX5) Merging mips-fixes/mips-fixes (e73f0f0ee754 Linux 5.14-rc1) Merging at91-fixes/at91-fixes (6efb943b8616 Linux 5.13-rc1) Merging omap-fixes/fixes (3ff340e24c9d bus: ti-sysc: Fix gpt12 system timer issue with reserved status) Merging kvm-fixes/master (7025098af334 Merge tag 'kvmarm-fixes-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) Merging kvms390-fixes/master (cd4220d23bf3 KVM: selftests: do not require 64GB in set_memory_region_test) Merging hwmon-fixes/hwmon (e73f0f0ee754 Linux 5.14-rc1) Merging nvdimm-fixes/libnvdimm-fixes (b05d4c576b69 dax: Ensure errno is returned from dax_direct_access) Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) Merging btrfs-fixes/next-fixes (a34d068248b7 Merge branch 'misc-5.14' 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 (f7e506ec4a99 platform/x86: think-lmi: Fix possible mem-leaks on tlmi_analyze() error-exit) Merging samsung-krzk-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) Merging pinctrl-samsung-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) Merging devicetree-fixes/dt/linus (50d8d7e19c43 dt-bindings: display: renesas,du: Make resets optional on R-Car H1) Merging scsi-fixes/fixes (a47fa41381a0 scsi: target: Fix NULL dereference on XCOPY completion) Merging drm-fixes/drm-fixes (995a1460f26f Merge tag 'amd-drm-fixes-5.14-2021-07-21' of https://gitlab.freedesktop.org/agd5f/linux 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 (6e0b6528d783 drm/i915: Correct the docs for intel_engine_cmd_parser) Merging mmc-fixes/fixes (10252bae863d mmc: core: Don't allocate IDA for OF aliases) 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 (f5a11c69b699 Revert "x86/hyperv: fix logical processor creation") Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) Merging risc-v-fixes/fixes (c79e89ecaa24 RISC-V: load initrd wherever it fits into memory) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) Merging fpga-fixes/fixes (2e8496f31d0b firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0) Merging spdx/spdx-linus (de5540965853 Merge tag 'rtc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) Merging gpio-brgl-fixes/gpio/for-current (ec7099fdea80 Revert "gpio: mpc8xxx: change the gpio interrupt flags.") Merging gpio-intel-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) Merging pinctrl-intel-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) Merging erofs-fixes/fixes (0852b6ca941e erofs: fix 1 lcluster-sized pcluster for big pcluster) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (2734d6c1b1a0 Linux 5.14-rc2) 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 (9f4ad9e425a1 Linux 5.12) Merging irqchip-fixes/irq/irqchip-fixes (1fee9db9b42d irqchip/mips: Fix RCU violation when using irqdomain lookup on interrupt entry) Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) Merging drm-misc-fixes/for-linux-next-fixes (69de4421bb4c drm/ttm: Initialize debugfs from ttm_global_init()) Merging kspp-gustavo/for-next/kspp (802dad70a535 Merge branch 'for-next/array-bounds' into for-next/kspp) Merging kbuild/for-next (27932b6a2088 scripts: add generic syscallnr.sh) Merging compiler-attributes/compiler-attributes (7ed012969bbc Compiler Attributes: fix __has_attribute(__no_sanitize_coverage__) for GCC 4) CONFLICT (content): Merge conflict in include/linux/compiler_attributes.h Merging dma-mapping/for-next (40ac971eab89 dma-mapping: handle vmalloc addresses in dma_common_{mmap,get_sgtable}) Merging asm-generic/master (14462376858e Merge branch 'asm-generic-unaligned' into asm-generic) Merging arc/for-next (def9d2780727 Linux 5.5-rc7) Merging arm/for-next (3bd1461d1691 Merge branches 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (3d1bf78c7b13 Merge branch 'for-next/sve' into for-next/core) Merging arm-perf/for-next/perf (d96b1b8c9f79 drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe()) Merging arm-soc/for-next (82a1c67554df ARM: dts: versatile: Fix up interrupt controller node names) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (b03485fe99f2 Merge tags 'amlogic-arm64-dt-for-v5.14-v2' and 'amlogic-arm-dt-for-v5.14' into for-next) Merging aspeed/for-next (00e9e776fa19 ARM: dts: aspeed: wedge100: Enable ADC channels) Merging at91/at91-next (b2a7f104a035 Merge branches 'at91-dt' and 'at91-defconfig' into at91-next) Merging drivers-memory/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging imx-mxs/for-next (2332f8e99198 Merge branch 'imx/dt64' into for-next) Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next) Merging mediatek/for-next (a1c8c49de3d7 Merge branch 'v5.13-next/soc' into for-next) Merging mvebu/for-next (72a0a49b7c77 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (91ee322340fb Merge branch 'omap-for-v5.14/dt' into for-next) Merging qcom/for-next (3f8b3dfa5522 Merge remote-tracking branch 'refs/remotes/origin/for-next' into for-next) Merging raspberrypi/for-next (21c6bf8304f0 arm64: dts: broadcom: Add reference to RPi 400) Merging renesas/next (2a022240886d Merge branches 'renesas-arm-defconfig-for-v5.15' and 'renesas-arm-dt-for-v5.15' into renesas-next) Merging reset/reset/next (28edf1d77cd5 dt-bindings: reset: Convert UniPhier glue reset to json-schema) Merging rockchip/for-next (3d5667e52c37 Merge branch 'v5.15-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (bb2c20c976aa Merge branch 'next/soc' into for-next) Merging scmi/for-linux-next (7929b794edc7 Merge branch 'for-next/juno' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (b462e2fc78f0 ARM: dts: stm32: Update AV96 adv7513 node per dtbs_check) Merging sunxi/sunxi/for-next (3f1c53207cf0 Merge branches 'sunxi/dt-for-5.14' and 'sunxi/fixes-for-5.13' into sunxi/for-next) Merging tegra/for-next (51b89b49954f Merge branch for-5.14/arm64/dt 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 (e73f0f0ee754 Linux 5.14-rc1) Merging xilinx/for-next (d98fb9ab6255 Merge branch 'zynq/dt' into for-next) Merging clk/clk-next (67ce7b523a9d Merge branch 'clk-qcom' into clk-next) Merging clk-imx/for-next (c586f53ae159 clk: imx8mq: remove SYS PLL 1/2 clock gates) Merging clk-renesas/renesas-clk (1b87d5bba32c clk: renesas: r9a07g044: Add clock and reset entries for ADC) Merging clk-samsung/for-next (a38fd8748464 Linux 5.12-rc2) Merging csky/linux-next (90dc8c0e664e csky: Kconfig: Remove unused selects) Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next) Merging m68k/for-next (a0b22464ce93 m68k: defconfig: Update defconfigs for v5.14-rc1:) Merging m68knommu/for-next (64151620227a m68k: m5441x: add flexcan support) Merging microblaze/next (14a832498c23 arch: microblaze: Fix spelling mistake "vesion" -> "version") Merging mips/mips-next (d656132d2a2a mips: clean up kvm Makefile) Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>) Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) Merging openrisc/for-next (ad4e600cbf89 drivers/soc/litex: remove 8-bit subregister option) Merging parisc-hd/for-next (ca2b19a4bdb6 parisc: Increase gcc stack frame check to 2048 for 32- and 64-bit) Merging powerpc/next (e73f0f0ee754 Linux 5.14-rc1) Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) Merging risc-v/for-next (67979e927dd0 riscv: kprobes: implement the branch instructions) Merging s390/for-next (2f5f912c5b60 Merge branch 'fixes' into for-next) Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable) 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 (1aee020155f3 um: remove unneeded semicolon in um_arch.c) Merging xtensa/xtensa-for-next (ac637a0ada71 xtensa: add fairness to IRQ handling) Merging pidfd/for-next (5ddf9602d711 Merge branch 'fs.mount_setattr.nosymfollow' into for-next) Merging fscrypt/master (2fc2b430f559 fscrypt: fix derivation of SipHash keys on big endian CPUs) Merging fscache/fscache-next (5193f26aef59 fscache: Use refcount_t for the cookie refcount instead of atomic_t) Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") Merging btrfs/for-next (808c6838dfee Merge branch 'for-next-current-v5.12-20210624' into for-next-20210624) Merging ceph/master (0077a5008272 rbd: resurrect setting of disk->private_data in rbd_init_disk()) Merging cifs/for-next (7b09d4e0be94 CIFS: Clarify SMB1 code for POSIX delete file) Merging cifsd/cifsd-for-next (9946aa630ae7 Merge pull request #61 from namjaejeon/cifsd-for-next) Merging configfs/for-next (420405ecde06 configfs: fix the read and write iterators) 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 (8215d5b7f15f MAINTAINERS: erofs: update my email address) Merging exfat/dev (50be9417e23a Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block) Merging ext3/for_next (f97d9dea9404 Merge hole punch fixes.) Merging ext4/dev (0705e8d1e220 ext4: inline jbd2_journal_[un]register_shrinker()) Merging f2fs/dev (fbc515e1c049 f2fs: don't sleep while grabing nat_tree_lock) CONFLICT (content): Merge conflict in fs/f2fs/file.c Applying: fxup for "f2fs: Convert to using invalidate_lock" Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) Merging fuse/for-next (c4e0cd4e0c16 virtiofs: Fix spelling mistakes) Merging gfs2/for-next (a6579cbfd721 gfs2: Fix memory leak of object lsi on error return path) Merging jfs/jfs-next (5d299f44d765 jfs: Avoid field-overflowing memcpy()) Merging nfs/linux-next (2734d6c1b1a0 Linux 5.14-rc2) Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing system.nfs4_acl) Merging nfsd/nfsd-next (ab1016d39cc0 nfsd: fix NULL dereference in nfs3svc_encode_getaclres) Merging cel/for-next (9b5b7a72fdc4 NFSD: Use new __string_len C macros for nfsd_clid_class) Merging orangefs/for-next (0fdec1b3c9fb orangefs: fix orangefs df output.) Merging overlayfs/overlayfs-next (cd94017fb9fa ovl: use kvalloc in xattr copy-up) Merging ubifs/next (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode) Merging v9fs/9p-next (cba7dcd8878e 9p/trans_virtio: Remove sysfs file on probe failure) Merging xfs/for-next (b102a46ce16f xfs: detect misaligned rtinherit directory extent size hints) Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) Merging iomap/iomap-for-next (229adf3c64db iomap: Don't create iomap_page objects in iomap_page_mkwrite_actor) Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) Merging file-locks/locks-next (e1cc6e8c1969 fcntl: fix potential deadlock for &fasync_struct.fa_lock) Merging vfs/for-next (303392fd5c16 Merge tag 'leds-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds) Merging printk/for-next (fbdc7b96a5ae Merge branch 'for-5.15-printk-index' into for-next) Merging pci/next (e73f0f0ee754 Linux 5.14-rc1) Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long) Merging hid/for-next (1b97ec646386 Merge branch 'for-5.15/goodix' into for-next) Merging i2c/i2c/for-next (4a8ac5e45cda i2c: mpc: Poll for MCF) Merging i3c/i3c/next (3e5feb11a829 i3c: master: svc: fix doc warning in svc-i3c-master.c) Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) Merging hwmon-staging/hwmon-next (e2c744af9cd3 hwmon: (w83627ehf) Switch to SIMPLE_DEV_PM_OPS) Merging jc_docs/docs-next (4b3abe1fde47 docs/zh_CN: add core api protection keys translation) Merging v4l-dvb/master (e73f0f0ee754 Linux 5.14-rc1) Merging v4l-dvb-next/master (c27479d762de media: atomisp: pci: reposition braces as per coding style) Merging pm/linux-next (d713e0c83398 Merge branch 'pm-pci' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (e73f0f0ee754 Linux 5.14-rc1) Merging cpupower/cpupower (5499f2b80b56 tools: cpupower: fix typo in cpupower-idle-set(1) manpage) Merging devfreq/devfreq-next (e73f0f0ee754 Linux 5.14-rc1) Merging opp/opp/linux-next (e73f0f0ee754 Linux 5.14-rc1) Merging thermal/thermal/linux-next (fe6a6de6692e thermal/drivers/int340x/processor_thermal: Fix tcc setting) Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) Merging dlm/next (62699b3f0a62 fs: dlm: move receive loop into receive handler) Merging swiotlb/linux-next (868c9ddc182b swiotlb: add overflow checks to swiotlb_bounce) Merging rdma/for-next (923232bbea88 RDMA/rxe: Fix types in rxe_icrc.c) Merging net-next/master (4431531c482a nfp: fix return statement in nfp_net_parse_meta()) CONFLICT (content): Merge conflict in net/ipv4/tcp_ipv4.c CONFLICT (content): Merge conflict in net/bpf/test_run.c CONFLICT (content): Merge conflict in drivers/bus/mhi/pci_generic.c Merging bpf-next/for-next (9907442fcddb selftests/bpf: Mute expected invalid map creation error msg) Merging ipsec-next/master (2d151d39073a xfrm: Add possibility to set the default to block if we have no policy) Merging mlx5-next/mlx5-next (96cd2dd65bb0 net/mlx5: Add DCS caps & fields support) Merging netfilter-next/master (84fe73996c2e Merge branch 'do_once_lite') Merging ipvs-next/master (84fe73996c2e Merge branch 'do_once_lite') Merging wireless-drivers-next/master (0d6835ffe50c net: phy: Fix data type in DP83822 dp8382x_disable_wol()) Merging bluetooth/master (64832df2ac05 Bluetooth: btusb: Add support for Foxconn Mediatek Chip) Merging mac80211-next/master (0d6835ffe50c net: phy: Fix data type in DP83822 dp8382x_disable_wol()) Merging mtd/mtd/next (ff44b90b325d dt_bindings: mtd: partitions: redboot: convert to YAML) Merging nand/nand/next (c5b9ee9c361f mtd: rawnand: Fix a couple of spelling mistakes in Kconfig) Merging spi-nor/spi-nor/next (2734d6c1b1a0 Linux 5.14-rc2) Merging crypto/master (f03a3cab26c1 crypto: lib - rename 'mod_init' & 'mod_exit' functions to be module-specific) Merging drm/drm-next (588b3eee5288 Merge tag 'drm-misc-next-2021-07-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) Merging drm-misc/for-linux-next (85fd4a8a8431 drm/ttm: Fix COW check) Merging amdgpu/drm-next (d91a713ed367 drm/amdgpu/display: add support for multiple backlights) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu_v11_0.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_svm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/nv.c CONFLICT (rename/delete): drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h deleted in HEAD and renamed to drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h in amdgpu/drm-next. Version amdgpu/drm-next of drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h left in tree. Merging drm-intel/for-linux-next (e73db72732dc drm/i915/firmware: Update to DMC v2.03 on RKL) Merging drm-tegra/drm/tegra/for-next (8874e3a7baec drm/tegra: Fix compilation of variadic macro) Merging drm-msm/msm-next (e88bbc91849b Revert "drm/msm/mdp5: provide dynamic bandwidth management") Merging imx-drm/imx-drm/next (fc1e985b67f9 drm/imx: ipuv3-plane: add color encoding and range properties) Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function) Merging regmap/for-next (d63aa09f7c53 regmap: Prefer unsigned int to bare use of unsigned) Merging sound/for-next (f976e8a94176 ALSA: sc6000: Use explicit cast for __iomem pointer) Merging sound-asoc/for-next (86db346793f9 Merge remote-tracking branch 'asoc/for-5.15' into asoc-next) Merging modules/modules-next (4c5afb74d945 module: combine constructors in module linker script) Merging input/next (7d3370e506ec Revert "Input: serio - make write method mandatory") Merging block/for-next (60b8191c4777 Merge branch 'for-5.15/block' into for-next) Merging device-mapper/for-next (e820ba87f9d1 dm: add documentation for IMA measurement support) Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting) Merging mmc/next (49fc2be70e7f Merge branch 'fixes' into next) Merging mfd/for-mfd-next (495fb48dbd9b mfd: wm831x: Use DEFINE_RES_IRQ_NAMED() and DEFINE_RES_IRQ() to simplify code) Merging backlight/for-backlight-next (1181f2164135 backlight: lm3630a: Convert to atomic PWM API and check for errors) Merging battery/for-next (56d629af09b9 power: supply: PCHG: Peripheral device charger) Merging regulator/for-next (336e3a8679c4 Merge remote-tracking branch 'regulator/for-5.15' 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 (907a399de7b0 evm: Check xattr size discrepancy between kernel and user) 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 (893c47d1964f selinux: return early for possible NULL audit buffers) Merging smack/next (bfc3cac0c761 smack: mark 'smack_enabled' global variable as __initdata) Merging tomoyo/master (4fb9c588398f Bluetooth: call lock_sock() outside of spinlock section) Merging tpmdd/next (0178f9d0f60b tpm: Replace WARN_ONCE() with dev_err_once() in tpm_tis_status()) Merging watchdog/master (cf813c67d961 watchdog: iTCO_wdt: use dev_err() instead of pr_err()) Merging iommu/next (4a5c155a5ab3 MAINTAINERS: Add Suravee Suthikulpanit as Reviewer for AMD IOMMU (AMD-Vi)) Merging audit/next (d97e99386ad0 audit: add header protection to kernel/audit.h) Merging devicetree/for-next (1c14c1695e78 dt-bindings: PCI: remove designware-pcie.txt) Merging mailbox/mailbox-for-next (4f197188da66 MAINTAINERS: add entry for polarfire soc mailbox) Merging spi/for-next (199ec5db2dc5 Merge remote-tracking branch 'spi/for-5.15' into spi-next) Merging tip/auto-latest (de35038b40c1 Merge branch 'timers/urgent') Merging clockevents/timers/drivers/next (6f64c8159af9 clocksource/drivers/arm_global_timer: Remove duplicated argument in arm_global_timer) Merging edac/edac-for-next (e1ca90b7cc5c EDAC/mc: Add new HBM2 memory type) Merging irqchip/irq/irqchip-next (c51e96dace68 Merge branch irq/irqchip-driver-updates into irq/irqchip-next) Merging ftrace/for-next (704adfb5a997 tracing: Do not reference char * as a string in histograms) Merging rcu/rcu/next (fa31b17088f9 Merge branch 'clocksource.2021.07.20c' into HEAD) Merging kvm/next (7025098af334 Merge tag 'kvmarm-fixes-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) Merging kvm-arm/next (188982cda00e Merge branch kvm-arm64/mmu/mte 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 (1f703d2cf204 KVM: s390: allow facility 192 (vector-packed-decimal-enhancement facility 2)) Merging xen-tip/linux-next (83f877a09516 xen/events: remove redundant initialization of variable irq) Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next) Merging workqueues/for-next (b42b0bddcbc8 workqueue: fix UAF in pwq_unbound_release_workfn()) Merging drivers-x86/for-next (f7e506ec4a99 platform/x86: think-lmi: Fix possible mem-leaks on tlmi_analyze() error-exit) Merging chrome-platform/for-next (6efb943b8616 Linux 5.13-rc1) Merging hsi/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging leds/for-next (e642197562cd leds: is31fl32xx: Fix missing error code in is31fl32xx_parse_dt()) Merging ipmi/for-next (1a2055cd5091 bindings: ipmi: Add binding for SSIF BMC driver) Merging driver-core/driver-core-next (e7deeb9d79d8 driver: base: Prefer unsigned int to bare use of unsigned) Applying: fix for "drm: Introduce the DP AUX bus" Merging usb/usb-next (8e6cb5d27e82 usb: dwc3: dwc3-qcom: Fix typo in the dwc3 vbus override API) CONFLICT (content): Merge conflict in drivers/usb/dwc3/gadget.c CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/sc7280.dtsi Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (2734d6c1b1a0 Linux 5.14-rc2) Merging usb-chipidea-next/for-usb-next (956df1bb0ab8 usb: chipidea: host: fix port index underflow and UBSAN complains) Merging tty/tty-next (e679004dec37 tty: hvc: replace BUG_ON() with negative return value) Merging char-misc/char-misc-next (03b1292d1c0e scripts/spdxcheck-test.sh: Drop python2) Merging extcon/extcon-next (e73f0f0ee754 Linux 5.14-rc1) Merging phy-next/next (c1302e8ce517 phy: tegra: xusb: mark PM functions as __maybe_unused) Merging soundwire/next (e73f0f0ee754 Linux 5.14-rc1) Merging thunderbolt/next (b18f901382fd thunderbolt: Fix DROM handling for USB4 DROM) Merging vfio/next (6a45ece4c9af vfio/pci: Handle concurrent vma faults) Merging staging/staging-next (334201d503d5 staging: hisilicon,hi6421-spmi-pmic.yaml: fix patternProperties) Merging iio/togreg (73380b9ad247 iio: st-sensors: Remove some unused includes and add some that should be there) 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 (2092cdb412f0 Merge branch 'icc-fixes' into icc-next) Merging dmaengine/next (0e96454ca26c dmaengine: idxd: remove fault processing code) CONFLICT (content): Merge conflict in drivers/dma/idxd/sysfs.c Applying: fixup for "bus: Make remove callback return void" Merging cgroup/for-next (1e7107c5ef44 cgroup1: fix leaked context root causing sporadic NULL deref in LTP) Merging scsi/for-next (c18a4e657ce6 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (e15f669cd996 scsi: libsas: Allow libsas to include SCSI header files directly) Merging vhost/linux-next (db7b337709a1 virtio-mem: prioritize unplug from ZONE_MOVABLE in Big Block Mode) Merging rpmsg/for-next (7486f29e5e60 Merge branches 'hwspinlock-next', '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 (f3f1017a98f9 docs: gpio: explain GPIOD_OUT_* values and toggling active low) Merging gpio-intel/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging pinctrl/for-next (bfa50166cd9d pinctrl: ralink: rt305x: add missing include) Merging pinctrl-intel/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging pinctrl-renesas/renesas-pinctrl (e9d66bdbc5ab pinctrl: renesas: r8a77995: Add bias pinconf support) Merging pinctrl-samsung/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging pwm/for-next (f4a8e31ed84e pwm: ep93xx: Ensure configuring period and duty_cycle isn't wrongly skipped) Merging userns/for-next (5e6b8a50a7ce cred: add missing return error code when set_cred_ucounts() failed) Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) Merging kselftest/next (2734d6c1b1a0 Linux 5.14-rc2) Merging livepatching/for-next (c150bbbb1731 Merge branch 'for-5.13/signal' 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 (4aa90c036df6 rtc: pcf8523: rename register and bit defines) Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next) Merging at24/at24/for-next (6efb943b8616 Linux 5.13-rc1) Merging ntb/ntb-next (28293b6c68cd ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data) Merging seccomp/for-next/seccomp (19d67694745c Documentation: seccomp: Fix typo in user notification) Merging kspp/for-next/kspp (6160d948cc6f hardening: Clarify Kconfig text for auto-var-init) 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 (e5c578adcdd9 slimbus: ngd: reset dma setup during runtime pm) Merging nvmem/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) Merging hyperv/hyperv-next (63fb60c2fcc9 hv: hyperv.h: Remove unused inline functions) Merging auxdisplay/auxdisplay (24ebc044c72e auxdisplay: Replace symbolic permissions with octal permissions) Merging kgdb/kgdb/for-next (c8daba4640ac kgdb: Fix fall-through warning for Clang) Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) Merging fpga/for-next (c485d3bf3cc7 fpga: fpga-mgr: wrap the write_sg() op) Merging kunit/test (e73f0f0ee754 Linux 5.14-rc1) Merging cfi/cfi/next (6efb943b8616 Linux 5.13-rc1) Merging kunit-next/kunit (2734d6c1b1a0 Linux 5.14-rc2) 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 (b8c95616d154 bus: mhi: core: Improve debug messages for power up) Merging memblock/for-next (a4d5613c4dc6 arm: extend pfn_valid to take into account freed memory map alignment) 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 Merging cxl/next (4ad6181e4b21 cxl/pci: Rename CXL REGLOC ID) Merging folio/for-next (a4757d06df08 mm/filemap: Add FGP_STABLE) CONFLICT (content): Merge conflict in mm/rmap.c CONFLICT (content): Merge conflict in mm/filemap.c Merging akpm-current/current (ace6e27b9019 selftests/memfd: remove unused variable) CONFLICT (content): Merge conflict in mm/page-writeback.c CONFLICT (content): Merge conflict in mm/memcontrol.c CONFLICT (content): Merge conflict in include/linux/memcontrol.h $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (1141df70117a Merge branch 'akpm-current/current')
Attachment:
pgpoVfnk7el15.pgp
Description: OpenPGP digital signature
