linux-next: Tree for Aug 20

linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* linux-next: Tree for Aug 20
@ 2014-08-19 20:17 Stephen Rothwell
  2014-08-20 15:52 ` Mark Brown
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2014-08-19 20:17 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 24367 bytes --]

Hi all,

Changes since 20140818:

I applied a patch supplied by Hugh Dickins to the vfs tree.  Hopefully
this will fix the crashes people are seeing.

The nfsd tree gained a build failure so I used the version from
next-20140818.

The sound-asoc tree still had its build failure for which I reverted
a commit.

The regulator tree still had its build failure so I used the version from
next-20140815.

The staging tree still had its build failure for which I applied a
fix patch.

Non-merge commits (relative to Linus' tree): 1190
 1132 files changed, 28214 insertions(+), 22814 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 and an allmodconfig for x86_64 and a
multi_v7_defconfig for arm. After the final fixups (if any), it is also
built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and
allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm
defconfig.

Below is a summary of the state of the merge.

I am currently merging 220 trees (counting Linus' and 30 trees of patches
pending for Linus' tree).

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                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (7d1311b93e58 Linux 3.17-rc1)
Merging fixes/master (23cf8d3ca0fd powerpc: Fix "attempt to move .org backwards" error)
Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1)
Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4)
Merging arm-current/fixes (e57e41931134 ARM: wire up memfd_create syscall)
Merging m68k-current/for-linus (9117710a5997 m68k/sun3: Remove define statement no longer needed)
Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
Merging mips-fixes/mips-fixes (08a9c3c9afcf MIPS: OCTEON: make get_system_type() thread-safe)
Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash)
Merging sparc/master (c9d26423e56c Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging net/master (21009686662f net: phy: smsc: move smsc_phy_config_init reset part in a soft_reset function)
Merging ipsec/master (21009686662f net: phy: smsc: move smsc_phy_config_init reset part in a soft_reset function)
Merging sound-current/for-linus (ca2e7224d7e7 ALSA: hda/hdmi - apply Valleyview fix-ups to Cherryview display codec)
Merging pci-current/for-linus (8d7004a6904c PCI: spear: Remove module option)
Merging wireless/master (77b2f2865956 iwlwifi: mvm: disable scheduled scan to prevent firmware crash)
Merging driver-core.current/driver-core-linus (7d1311b93e58 Linux 3.17-rc1)
Merging tty.current/tty-linus (7d1311b93e58 Linux 3.17-rc1)
Merging usb.current/usb-linus (7d1311b93e58 Linux 3.17-rc1)
Merging usb-gadget-fixes/fixes (a8a85b01d185 usb: musb/cppi41: call musb_ep_select() before accessing an endpoint's CSR)
CONFLICT (content): Merge conflict in drivers/usb/musb/musb_host.c
Merging usb-serial-fixes/usb-linus (646907f5bfb0 USB: ftdi_sio: Added PID for new ekey device)
Merging staging.current/staging-linus (eb29835fb3ae staging: android: fix a possible memory leak)
Merging char-misc.current/char-misc-linus (7d1311b93e58 Linux 3.17-rc1)
Merging input-current/for-linus (91167e191467 Merge branch 'next' into for-linus)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
Merging crypto-current/master (ce5481d01f67 crypto: drbg - fix failure of generating multiple of 2**16 bytes)
Merging ide/master (a53dae49b2fe ide: use module_platform_driver())
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging devicetree-current/devicetree/merge (5a12a597a862 arm: Add devicetree fixup machine function)
Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.)
Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
Merging drm-intel-fixes/for-linux-next-fixes (1a125d8a2c22 drm/i915: don't try to retrain a DP link on an inactive CRTC)
Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (2a5e95d4181c mm, arc: remove obsolete pagefault oom killer comment)
Merging arm/for-next (e57e41931134 ARM: wire up memfd_create syscall)
Merging arm-perf/for-next/perf (7d1311b93e58 Linux 3.17-rc1)
Merging arm-soc/for-next (74f9f3185b80 Merge branch 'fixes' into for-next)
Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6)
Merging berlin/berlin/for-next (251f72d06c59 Merge branch 'berlin/soc' into berlin/for-next)
Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support)
Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (83de53b38adf Merge branch 'imx/dt' into for-next)
Merging ixp4xx/next (19f949f52599 Linux 3.8)
Merging keystone/next (c9eaa447e77e Linux 3.15-rc1)
Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
Merging mvebu/for-next (9dfb5c417c32 ARM: mvebu: Add proper pin muxing on Armada 370 RD board)
Merging renesas/next (1cd25dbb732d Merge branch 'heads/defconfig-for-v3.18' into next)
Merging samsung/for-next (213e1f6f5f0b Merge branch 'v3.18-next/dt-samsung' into for-next)
Merging sunxi/sunxi/for-next (779b646c8102 Merge branch 'sunxi/dt-for-3.18' into sunxi/for-next)
Merging tegra/for-next (9a3c4145af32 Linux 3.16-rc6)
Merging arm64/for-next/core (ea1719672f59 arm64: add newline to I-cache policy string)
Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP)
Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header)
Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h)
Merging ia64/next (6b15075c2c36 [IA64] sn: Do not needlessly convert between pointers and integers)
Merging m68k/for-next (9117710a5997 m68k/sun3: Remove define statement no longer needed)
Merging m68knommu/for-next (7d1311b93e58 Linux 3.17-rc1)
Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check)
Merging microblaze/next (5676d5bfb93b microblaze: Wire-up getrandom syscall)
Merging mips/mips-for-linux-next (475d5928b79b Merge branch '3.16-fixes' into mips-for-linux-next)
Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging parisc-hd/for-next (64aa90f26c06 Linux 3.16-rc7)
Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
Merging fsl/next (78eb9094ca08 powerpc/t2080rdb: Add T2080RDB board support)
Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs)
Merging s390/features (b8a2bbdf02b8 s390/sclp: remove unnecessary XTABS flag)
Merging sparc-next/master (c9d26423e56c Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging tile/master (ed93567c6fbc tile: Remove tile-specific _sinitdata and _einitdata)
Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (e792290be763 Merge tag 'xtensa-for-next-20140815' into for_next)
Merging btrfs/next (8d875f95da43 btrfs: disable strict file flushes for renames and truncates)
Merging ceph/master (5f740d7e1531 libceph: set last_piece in ceph_msg_data_pages_cursor_init() correctly)
Merging cifs/for-next (90da7492a86c [CIFS] Incorrect error returned on setting file compressed on SMB2)
Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (04ec5f5c0022 ecryptfs: remove unnecessary break after goto)
Merging ext3/for_next (01777836c870 reiserfs: Fix use after free in journal teardown)
Merging ext4/dev (86f0afd46321 ext4: fix ext4_discard_allocated_blocks() if we can't allocate the pa struct)
Merging f2fs/dev (7f0d32e0c1a7 Merge tag 'microblaze-3.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze)
Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree)
Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT)
Merging gfs2/master (9a464443aec5 GFS2: Change maxlen variables to size_t)
Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr)
Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (7d1311b93e58 Linux 3.17-rc1)
Merging nfsd/nfsd-next (561d9c24fa6b Simplify logic in cache_listeners_exist - only return true if someone has the file open.)
$ git reset --hard HEAD^
Merging next-20140818 version of nfsd
Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set)
Merging ubifs/linux-next (25601a3c9737 UBIFS: Add log overlap assertions)
Merging xfs/for-next (645f98572134 Merge branch 'xfs-misc-fixes-3.17-2' into for-next)
Merging file-locks/linux-next (7d1311b93e58 Linux 3.17-rc1)
Merging vfs/for-next (ef115d4d3296 fs: Fix theoretical division by 0 in super_cache_scan().)
Applying: vfs: initialize m_list to fix crash in mnt_set_mountpoint
Merging pci/next (981c191778a4 Merge branches 'pci/host-designware', 'pci/host-mvebu' and 'pci/host-tegra' into next)
Merging hid/for-next (71095593b5d8 Merge branch 'for-3.17/hyperv' into for-next)
CONFLICT (add/add): Merge conflict in drivers/hid/hid-gt683r.c
Merging i2c/i2c/for-next (7d1311b93e58 Linux 3.17-rc1)
Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7)
Merging hwmon-staging/hwmon-next (899552d6e84b Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild)
Merging v4l-dvb/master (d1352f268415 Merge two fixes from branch 'patchwork' into to_next)
Merging kbuild/for-next (a33a405323e0 Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
Merging libata/for-next (7dd78d02692d Merge branch 'for-3.17-fixes' into for-next)
Merging pm/linux-next (af5b7e84d022 Merge branch 'pm-tools')
Merging idle/next (e7c95ff32d00 tools/power turbostat: tweak whitespace in output format)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (47d104ba5879 Merge branches 'exynos-fix', 'for-rc', 'int3403-fix', 'misc', 'rcar-thermal' and 'sti-thermal' of .git into next)
Merging ieee1394/for-next (d584a6627994 firewire: ohci: disable MSI for VIA VT6315 again)
Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode)
Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
Merging slave-dma/next (7d1311b93e58 Linux 3.17-rc1)
Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup())
Merging net-next/master (c9d26423e56c Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging ipsec-next/master (c9d26423e56c Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging wireless-next/master (33caee39925b Merge branch 'akpm' (patchbomb from Andrew Morton))
Merging bluetooth/master (cf0ba860a91e Bluetooth: Move clock offset reading into hci_disconnect())
Merging infiniband/for-next (d087f6ad724d Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'iwcm', 'mad', 'misc', 'mlx4', 'mlx5', 'ocrdma' and 'srp' into for-next)
Merging mtd/master (5d20bad19d25 mtd: cfi_cmdset_0002: check return code for get_chip())
Merging l2-mtd/master (5d20bad19d25 mtd: cfi_cmdset_0002: check return code for get_chip())
Merging crypto/master (ce5481d01f67 crypto: drbg - fix failure of generating multiple of 2**16 bytes)
Merging drm/drm-next (7963e9db1b1f Revert "drm: drop redundant drm_file->is_master")
Merging drm-panel/drm/panel/for-next (9746c61960b6 drm/panel: simple: Use devm_gpiod_get_optional())
Merging drm-intel/for-linux-next (be71eabebaf9 Revert "drm/i915: Enable semaphores on BDW")
Merging drm-tegra/drm/tegra/for-next (ef70728c7a65 drm/tegra: add MODULE_DEVICE_TABLEs)
Merging sound/for-next (54db6c394935 ALSA: hda/realtek - Use tables for batch COEF writes/updtes)
Merging sound-asoc/for-next (57fc1a7fa243 Merge remote-tracking branches 'asoc/topic/tas2552' and 'asoc/topic/wm8994' into asoc-next)
$ git am -3 ../patches/0001-Revert-ASoC-fsl-add-imx-es8328-machine-driver.patch
Applying: Revert "ASoC: fsl: add imx-es8328 machine driver"
Merging modules/modules-next (76215b04fd29 arch/powerpc/platforms/powernv/opal-dump.c: fix world-writable sysfs files)
Merging virtio/virtio-next (eeec626366ff Revert "hwrng: virtio - ensure reads happen after successful probe")
Merging input/next (3361a97601f2 Input: edt-ft5x06 - remove superfluous assignment)
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
Merging block/for-next (b686bff4a938 Merge branch 'for-linus' into for-next)
Merging device-mapper/for-next (465a3d61c229 dm crypt: sort writes)
Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (e1da8cd2557c mmc: core: Use regulator_get_voltage() if OCR mask is empty.)
Merging kgdb/kgdb-next (662bfa325be1 kernel/debug/debug_core.c: Logging clean-up)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
Merging md/for-next (cb8b12b5d81c md/raid10: always initialise ->state on newly allocated r10_bio)
Merging mfd/for-mfd-next (7caa79917ad4 MAINTAINERS: Update MFD repo location)
Merging backlight/for-backlight-next (87464cdba2ae backlight: ipaq_micro: Fix sparse non static symbol warning)
Merging battery/master (5e37195f30cc ipaq_micro_battery: fix sparse non static symbol warning)
Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (be92abea827b Merge branch '3.17/hdmi-infoframe' into for-next)
Merging regulator/for-next (7dfb37059c58 Merge remote-tracking branches 'regulator/topic/sky81452' and 'regulator/topic/tps65910' into regulator-next)
$ git reset --hard HEAD^
Merging next-20140815 version of regulator
Merging security/next (478d085524c5 Merge tag 'keys-next-20140805' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
Merging integrity/next (e27319cdf468 ima: provide double buffering for hash calculation)
CONFLICT (content): Merge conflict in include/linux/key.h
CONFLICT (content): Merge conflict in crypto/asymmetric_keys/x509_public_key.c
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging selinux/next (aa9e0de81b5b Merge tag 'v3.16' into next)
Merging lblnet/next (d8ec26d7f828 Linux 3.13)
Merging watchdog/master (8083baba5e9c wdt: sunxi: Move restart code to the watchdog driver)
Merging iommu/next (0fdb6739098d Merge branches 'iommu/fixes', 'arm/exynos' and 'x86/vt-d' into next)
Merging dwmw2-iommu/master (1860e379875d Linux 3.15)
Merging vfio/next (9b936c960f22 drivers/vfio: Enable VFIO if EEH is not supported)
Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6)
Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
Merging trivial/for-next (51a7097426f2 doc: fix two typos in watchdog-api.txt)
Merging audit/master (3efe33f5d2da audit: x86: drop arch from __audit_syscall_entry() interface)
CONFLICT (content): Merge conflict in kernel/audit.c
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c
CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
Merging devicetree/devicetree/next (a9ecdc0fdc54 of/irq: Fix lookup to use 'interrupts-extended' property first)
Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root)
Merging spi/for-next (17c17b755bd0 Merge remote-tracking branches 'spi/topic/sh-msiof' and 'spi/topic/xilinx' into spi-next)
Merging tip/auto-latest (8590e100eca6 Merge branch 'x86/xsave')
CONFLICT (content): Merge conflict in kernel/trace/trace.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_event_intel_uncore.c
Applying: perf/x86/uncore: fix for DEFINE_PCI_DEVICE_TABLE removal
Merging clockevents/clockevents/next (3252a646aa2c clocksource: exynos_mct: Only use 32-bits where possible)
Merging edac/linux_next (50d1bb93672f sb_edac: add support for Haswell based systems)
Merging edac-amd/for-next (eba4bfb34d45 EDAC, MCE, AMD: Add MCE decoding for F15h M60h)
Merging irqchip/irqchip/for-next (b8643691af0a Merge branch 'irqchip/keystone' into irqchip/for-next)
Merging ftrace/for-next (45ed695ac10a ARM64: add IPI tracepoints)
Merging rcu/rcu/next (1c91efb24799 rcutorture: Specify CONFIG_CPUMASK_OFFSTACK=y for TREE07)
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (c77dcacb3975 KVM: Move more code under CONFIG_HAVE_KVM_IRQFD)
Merging kvm-arm/next (dedf97e8ff2c arm64: KVM: fix 64bit CP15 VM access for 32bit guests)
Merging kvm-ppc/kvm-ppc-next (c77dcacb3975 KVM: Move more code under CONFIG_HAVE_KVM_IRQFD)
Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
Merging xen-tip/linux-next (e38230eb3789 xen/pciback: Remove tons of dereferences)
Merging percpu/for-next (3189eddbcafc percpu: free percpu allocation info for uniprocessor system)
Merging workqueues/for-next (ebb48ccd98d1 Merge branch 'for-3.17' into for-next)
Merging drivers-x86/linux-next (770235f68ab6 platform/x86: Enable build support for toshiba_haps)
Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries)
Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (22b96a67aa6c Merge remote-tracking branch 'regmap/topic/dt-endian' into regmap-next)
Merging hsi/for-next (3fd276e9c0d7 HSI: omap_ssi: Fix return value check in ssi_debug_add_ctrl())
Merging leds/for-next (45384ea0add3 leds: lp3944: fix sparse warning)
Merging driver-core/driver-core-next (7d1311b93e58 Linux 3.17-rc1)
Merging tty/tty-next (7d1311b93e58 Linux 3.17-rc1)
Merging usb/usb-next (7d1311b93e58 Linux 3.17-rc1)
Merging usb-gadget/next (8346b33fad01 Documentation: DocBook: elieminate doc build break)
Merging usb-serial/usb-next (7d1311b93e58 Linux 3.17-rc1)
Merging staging/staging-next (ed7f92da59f2 staging: dgnc: Remove unnecessary dgnc_Major_Control_Registered variable)
Applying: staging: rtl8188eu: using unique names is good
Merging char-misc/char-misc-next (7d1311b93e58 Linux 3.17-rc1)
Merging cgroup/for-next (abdfd21809f2 Merge branch 'for-3.17' into for-next)
Merging scsi/for-next (f6105c080888 [SCSI] save command pool address of Scsi_Host)
Merging target-updates/for-next (4ca7ea3ceeb9 iscsi-target: Ignore ICF_GOT_LAST_DATAOUT during Data-Out ITT lookup)
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (4b6fe45a79a9 pinctrl: pinctrl-at91.c: fix decimal printf format specifiers prefixed with 0x)
Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs)
CONFLICT (content): Merge conflict in drivers/vhost/net.c
Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6)
Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
Merging gpio/for-next (de25de5e1eef Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (f70e3c4f8b6a CMA: correct unlock target)
Merging pwm/for-next (f6306299080b pwm: rockchip: Added to support for RK3288 SoC)
Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning)
Merging userns/for-next (87b47932f40a mnt: Implicitly add MNT_NODEV on remount as we do on mount)
Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect)
Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging clk/clk-next (b11a6face1b6 clk: Add missing of_clk_set_defaults export)
Merging random/dev (e02b87659777 hwrng: Pass entropy to add_hwgenerator_randomness() in bits, not bytes)
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging aio/master (00fefb9cf2b5 aio: use iovec array rather than the single one)
Merging llvmlinux/for-next (7380100aa7ce arm64: LLVMLinux: Use current_stack_pointer in kernel/traps.c)
Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states)
Merging rd-docs/master (483ecaf2b002 Fix scripts/kernel-doc to recognize __meminit in a function prototype and to stip it, as done with many other attributes.)
Merging signal-cleanup/signal_v4 (b9f0fb2d4a7a powerpc: Use sigsp())
Merging akpm-current/current (a7d66c114cee ipc: always handle a new value of auto_msgmni)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/gpio/gpio-zevio.c: fix build
Applying: x86, vdso: fix vdso2c's special_pages error checking
Applying: include/linux: remove strict_strto* definitions
Applying: mm: replace remap_file_pages() syscall with emulation
Applying: fat: add i_disksize to represent uninitialized size
Applying: fat: add fat_fallocate operation
Applying: fat: zero out seek range on _fat_get_block
Applying: fat: fallback to buffered write in case of fallocated region on direct IO
Applying: fat: permit to return phy block number by fibmap in fallocated region
Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: mm: add strictlimit knob
Merging akpm/master (ef50518e96a5 mm: add strictlimit knob)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: Tree for Aug 20
  2014-08-19 20:17 linux-next: Tree for Aug 20 Stephen Rothwell
@ 2014-08-20 15:52 ` Mark Brown
       [not found]   ` <5248cecd-03f6-407b-a4a7-1d2989ee0469@email.android.com>
  0 siblings, 1 reply; 13+ messages in thread
From: Mark Brown @ 2014-08-20 15:52 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 471 bytes --]

On Wed, Aug 20, 2014 at 06:17:03AM +1000, Stephen Rothwell wrote:

> The sound-asoc tree still had its build failure for which I reverted
> a commit.

Are you sure about this?  There's a bunch of updates to the tree
including one that's supposed to have fixed the build failure on PowerPC
which haven't made it into the tree, was there a problem with the fetch
perhaps?  I just checked and cgit says I pushed 23 hours ago so it
doesn't look like a problem with the push.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

[parent not found: <5248cecd-03f6-407b-a4a7-1d2989ee0469@email.android.com>]

* Re: linux-next: Tree for Aug 20
       [not found]   ` <5248cecd-03f6-407b-a4a7-1d2989ee0469@email.android.com>
@ 2014-08-21 14:34     ` Stephen Rothwell
  2014-08-21 14:52       ` Mark Brown
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2014-08-21 14:34 UTC (permalink / raw)
  To: Mark Brown; +Cc: linux-next, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]

Hi Mark,

On Wed, 20 Aug 2014 13:53:56 -0500 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On August 20, 2014 10:52:22 AM CDT, Mark Brown <broonie@kernel.org> wrote:
> >On Wed, Aug 20, 2014 at 06:17:03AM +1000, Stephen Rothwell wrote:
> >
> >> The sound-asoc tree still had its build failure for which I reverted
> >> a commit.
> >
> >Are you sure about this?  There's a bunch of updates to the tree
> >including one that's supposed to have fixed the build failure on
> >PowerPC
> >which haven't made it into the tree, was there a problem with the fetch
> >perhaps?  I just checked and cgit says I pushed 23 hours ago so it
> >doesn't look like a problem with the push.
> 
> I thought I checked, but I may have missed it, sorry.  I will check again before the next linux-next.

The fix appears to be there today, but I dont; think it was for the
previous linux-next.  Does it matter that I am currently in Chicago
(despite what the date on this email says :-))?  I guess I must have
fetched your tree earlier than you may have expected.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: Tree for Aug 20
  2014-08-21 14:34     ` Stephen Rothwell
@ 2014-08-21 14:52       ` Mark Brown
  0 siblings, 0 replies; 13+ messages in thread
From: Mark Brown @ 2014-08-21 14:52 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1038 bytes --]

On Fri, Aug 22, 2014 at 12:34:40AM +1000, Stephen Rothwell wrote:
> On Wed, 20 Aug 2014 13:53:56 -0500 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> > >Are you sure about this?  There's a bunch of updates to the tree
> > >including one that's supposed to have fixed the build failure on
> >PowerPC
> > >which haven't made it into the tree, was there a problem with the fetch
> > >perhaps?  I just checked and cgit says I pushed 23 hours ago so it
> > >doesn't look like a problem with the push.
> > 
> > I thought I checked, but I may have missed it, sorry.  I will check again before the next linux-next.

> The fix appears to be there today, but I dont; think it was for the
> previous linux-next.  Does it matter that I am currently in Chicago
> (despite what the date on this email says :-))?  I guess I must have
> fetched your tree earlier than you may have expected.

Right, that's why I checked that the push really had been the day before
as I had expected before I mailed - I'm in Chicago too.  Very odd.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: Tree for Aug 20
@ 2025-08-20  4:34 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2025-08-20  4:34 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 39730 bytes --]

Hi all,

Changes since 20250819:

The vfs-brauner tree still had its build failure so I used the version
from next-20250815.

The drm tree gained a conflict against the drm-misc-fixes tree.

The input tree gained a (sort of) conflict against Linus' tree for which
I applied a merge fix patch.

The pinctrl-renesas tree gained a semantic conflict against the pinctrl
tree.

The kunit-next tree still had its build failure so I used the version
from next-20250815.

The nvmem tree lost its build failure.

Non-merge commits (relative to Linus' tree): 3057
 3205 files changed, 106528 insertions(+), 46678 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 is also the merge.log file 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, s390, 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 405 trees (counting Linus' and 404 trees of bug
fix patches pending for the current release).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

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 (b19a97d57c15 Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging fixes/fixes (89be9a83ccf1 Linux 6.16-rc7)
Merging ext4-fixes/fixes (d0b3b7b22dfa Linux 6.16-rc4)
Merging vfs-brauner-fixes/vfs.fixes (a2c1f82618b0 signal: Fix memory leak for PIDFD_SELF* sentinels)
Merging fscrypt-current/for-current (8f5ae30d69d7 Linux 6.17-rc1)
Merging fsverity-current/for-current (8f5ae30d69d7 Linux 6.17-rc1)
Merging btrfs-fixes/next-fixes (8299ec04baed Merge branch 'misc-6.17' into next-fixes)
Merging vfs-fixes/fixes (fb924b7b8669 change_mnt_propagation(): calculate propagation source only if we'll need it)
Merging erofs-fixes/fixes (c17b750b3ad9 Linux 6.17-rc2)
Merging nfsd-fixes/nfsd-fixes (bee47cb026e7 sunrpc: fix handling of server side tls alerts)
Merging v9fs-fixes/fixes/next (2014c95afece Linux 6.14-rc1)
Merging overlayfs-fixes/ovl-fixes (e8bd877fb76b ovl: fix possible double unlink)
Merging bcachefs/for-next (c544816b018a bcachefs: improve trace_data_update_done_no_rw_devs)
Merging fscrypt/for-next (0e6608d4938e fscrypt: Remove redundant __GFP_NOWARN)
Merging btrfs/for-next (d4114ae7e504 Merge branch 'for-next-next-v6.17-20250818' into for-next-20250818)
Merging ceph/master (c6d08336aadd ceph: fix potential race condition on operations with CEPH_I_ODIRECT flag)
Merging cifs/for-next (830b3f7301d3 smb: client: make use of smbdirect_socket.status_wait)
Merging configfs/configfs-next (c6b190822459 MAINTAINERS: add configfs Rust abstractions)
Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros())
Merging dlm/next (8e4021078863 dlm: check for undefined release_option values)
Merging erofs/dev (df0ce6cefa45 erofs: support to readahead dirent blocks in erofs_readdir())
Merging exfat/dev (cf5c57400c3f exfat: drop redundant conversion to bool)
Merging exportfs/exportfs-next (adc218676eef Linux 6.12)
Merging ext3/for_next (17e58687367a Merge fsnotify changes with fixed up authorship.)
Merging ext4/dev (9d98cf463225 jbd2: prevent softlockup in jbd2_log_do_checkpoint())
Merging f2fs/dev (3ea4ad0a1df0 f2fs: clean up w/ get_left_section_blocks())
Merging fsverity/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging fuse/for-next (f0e84022479b virtio_fs: Remove redundant spinlock in virtio_fs_request_complete())
Merging gfs2/for-next (0d473109e1e7 gfs2: Fix unlikely race in gdlm_put_lock)
Merging jfs/jfs-next (856db3759202 jfs: fix metapage reference count leak in dbAllocCtl)
Merging ksmbd/ksmbd-for-next (89bb430f6211 ksmbd: fix refcount leak causing resource not released)
Merging nfs/linux-next (76d2e3890fb1 NFS: Fix a race when updating an existing write)
Merging nfs-anna/linux-next (38074de35b01 NFSv4/flexfiles: Fix handling of NFS level errors in I/O)
Merging nfsd/nfsd-next (497bb5ee80fa NFSD: Fix last write offset handling in layoutcommit)
Merging ntfs3/master (8f5ae30d69d7 Linux 6.17-rc1)
Merging orangefs/for-next (2138e89cb066 fs/orangefs: Allow 2 more characters in do_c_string())
Merging overlayfs/overlayfs-next (6f9ccdad0fea ovl: Annotate struct ovl_entry with __counted_by())
Merging ubifs/next (99dbb2a1bd66 ubifs: stop using write_cache_pages)
Merging v9fs/9p-next (afdaa9f9ea45 net/9p: fix double req put in p9_fd_cancelled)
Merging v9fs-ericvh/ericvh/for-next (2014c95afece Linux 6.14-rc1)
Merging xfs/for-next (8e5a2441e186 xfs: reject swapon for inodes on a zoned file system earlier)
Merging zonefs/for-next (a42938e80357 zonefs: correct some spelling mistakes)
Merging vfs-brauner/vfs.all (41198005091f Merge branch 'vfs-6.18.rust' into vfs.all)
$ git reset --hard HEAD^
Merging next-20250815 version of vfs-brauner
Merging vfs/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging mm-hotfixes/mm-hotfixes-unstable (3293fd7224b7 mm/userfaultfd: fix kmap_local LIFO ordering for CONFIG_HIGHPTE)
Merging fs-current (b471d5fdedf8 Merge branch 'next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git)
Merging kbuild-current/kbuild-fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging arc-current/for-curr (d7b8f8e20813 Linux 6.16-rc5)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging arm-soc-fixes/arm/fixes (0c952efa0d7c Merge tag 'tegra-for-6.17-arm64-dt-v3' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/fixes)
Merging davinci-current/davinci/for-current (8f5ae30d69d7 Linux 6.17-rc1)
Merging drivers-memory-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging sophgo-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging m68k-current/for-linus (c8995932db2b m68k: mac: Improve clocksource driver commentary)
Merging powerpc-fixes/fixes (c17b750b3ad9 Linux 6.17-rc2)
Merging s390-fixes/fixes (c17b750b3ad9 Linux 6.17-rc2)
Merging net/main (01792bc3e5bd net: ti: icssg-prueth: Fix HSR and switch offload Enablement during firwmare reload.)
Merging bpf/master (e4414b01c1cd bpf: Check the helper function is valid in get_helper_proto)
Merging ipsec/master (52565a935213 net: kcm: Fix race condition in kcm_unattach())
Merging netfilter/main (01792bc3e5bd net: ti: icssg-prueth: Fix HSR and switch offload Enablement during firwmare reload.)
Merging ipvs/main (d942fe13f72b net: ti: icssg-prueth: Fix skb handling for XDP_PASS)
Merging wireless/for-next (6832a9317eee Merge tag 'net-6.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ath/for-current (d9104cec3e8f Merge tag 'bpf-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next)
Merging iwlwifi/fixes (6832a9317eee Merge tag 'net-6.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return)
Merging rdma-fixes/for-rc (fa2e2d31ee3b RDMA/hns: Fix dip entries leak on devices newer than hip09)
Merging sound-current/for-linus (f4b3cef55f5f ALSA: hda/realtek: Audio disappears on HP 15-fc000 after warm boot again)
Merging sound-asoc-fixes/for-linus (af24c20c4633 ASoC: codecs: ES9389: Modify the standby configuration)
Merging regmap-fixes/for-linus (8f5ae30d69d7 Linux 6.17-rc1)
Merging regulator-fixes/for-linus (11cd7a5c21db regulator: tps65219: regulator: tps65219: Fix error codes in probe())
Merging spi-fixes/for-linus (4b778c576a04 Merge remote-tracking branch 'spi/for-6.16' into spi-linus)
Merging pci-current/for-linus (5149bbb56bdc PCI: vmd: Remove MSI-X check on child devices)
Merging driver-core.current/driver-core-linus (3a68841d1d9b Documentation: smooth the text flow in the security bug reporting process)
Merging tty.current/tty-linus (cfd956dcb101 tty: hvc_console: Call hvc_kick in hvc_write unconditionally)
Merging usb.current/usb-linus (ff9a09b3e09c usb: xhci: fix host not responding after suspend and resume)
Merging usb-serial-fixes/usb-linus (ad1244e1ce18 USB: serial: option: add Foxconn T99W709)
Merging phy/fixes (aac1256a41cf dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Update pcie phy bindings)
Merging staging.current/staging-linus (52ff2b840bc7 staging: axis-fifo: fix maximum TX packet length check)
Merging iio-fixes/fixes-togreg (43c0f6456f80 iio: pressure: bmp280: Use IS_ERR() in bmp280_common_probe())
Merging counter-current/counter-current (19272b37aa4f Linux 6.16-rc1)
Merging char-misc.current/char-misc-linus (b47b493d6387 most: core: Drop device reference after usage in get_channel())
Merging soundwire-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging thunderbolt-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging input-current/for-linus (ab93e0dd72c3 Merge branch 'next' into for-linus)
Merging crypto-current/master (9d9b193ed73a crypto: hash - Increase HASH_MAX_DESCSIZE for hmac(sha3-224-s390))
Merging libcrypto-fixes/libcrypto-fixes (fd7e5de4b2ed lib/crypto: ensure generated *.S files are removed on make clean)
Merging vfio-fixes/for-linus (c1d9dac0db16 vfio/pci: Align huge faults to order)
Merging kselftest-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging dmaengine-fixes/fixes (5068b5254812 dmaengine: qcom: bam_dma: Fix DT error handling for num-channels/ees)
Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1)
Merging mtd-fixes/mtd/fixes (6463cbe08b0c mtd: spinand: fix memory leak of ECC engine conf)
Merging mfd-fixes/for-mfd-fixes (d9d79e4f7dc9 mfd: Fix building without CONFIG_OF)
Merging v4l-dvb-fixes/fixes (6f6fbd9a0c5a media: Remove redundant pm_runtime_mark_last_busy() calls)
Merging reset-fixes/reset/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging mips-fixes/mips-fixes (86731a2a651e Linux 6.16-rc3)
Merging at91-fixes/at91-fixes (19272b37aa4f Linux 6.16-rc1)
Merging omap-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
Merging kvm-fixes/master (038d61fd6422 Linux 6.16)
Merging kvms390-fixes/master (d8dfda5af0be KVM: s390: pv: fix race when making a page secure)
Merging hwmon-fixes/hwmon (6d24d3a1a5c6 hwmon: mlxreg-fan: Prevent fans from getting stuck at 0 RPM)
Merging nvdimm-fixes/libnvdimm-fixes (d0b3b7b22dfa Linux 6.16-rc4)
Merging cxl-fixes/fixes (d0b3b7b22dfa Linux 6.16-rc4)
Merging dma-mapping-fixes/dma-mapping-fixes (89a2d212bdb4 dma/pool: Ensure DMA_DIRECT_REMAP allocations are decrypted)
Merging drivers-x86-fixes/fixes (748f89751144 platform/x86: hp-wmi: mark Victus 16-r1xxx for victus_s fan and thermal profile support)
Merging samsung-krzk-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging pinctrl-samsung-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging devicetree-fixes/dt/linus (79aef1a3705b of: Clarify OF device context in of_match_device() comment)
Merging dt-krzk-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging scsi-fixes/fixes (6300d5c54387 scsi: ufs: ufs-qcom: Fix ESI null pointer dereference)
Merging drm-fixes/drm-fixes (c17b750b3ad9 Linux 6.17-rc2)
Merging drm-intel-fixes/for-linux-next-fixes (8236820fd767 drm/i915/gt: Relocate compression repacking WA for JSL/EHL)
Merging mmc-fixes/fixes (99d7ab8db9d8 memstick: Fix deadlock by moving removing flag earlier)
Merging rtc-fixes/rtc-fixes (08d82d0cad51 rtc: pcf2127: add missing semicolon after statement)
Merging gnss-fixes/gnss-linus (86731a2a651e Linux 6.16-rc3)
Merging hyperv-fixes/hyperv-fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging risc-v-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging riscv-dt-fixes/riscv-dt-fixes (19272b37aa4f Linux 6.16-rc1)
Merging riscv-soc-fixes/riscv-soc-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging fpga-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
Merging spdx/spdx-linus (8f5ae30d69d7 Linux 6.17-rc1)
Merging gpio-brgl-fixes/gpio/for-current (810bd9066fb1 gpio: mlxbf3: use platform_get_irq_optional())
Merging gpio-intel-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging pinctrl-intel-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging auxdisplay-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging kunit-fixes/kunit-fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging memblock-fixes/fixes (d045c3154080 mm/numa_memblks: Use pr_debug instead of printk(KERN_DEBUG))
Merging renesas-fixes/fixes (379c590113ce ARM: shmobile: smp: Enforce shmobile_smp_* alignment)
Merging perf-current/perf-tools (6235ce77749f perf record: Cache build-ID of hit DSOs only)
Merging efi-fixes/urgent (64e135f1eaba efivarfs: Fix memory leak of efivarfs_fs_info in fs_context error paths)
Merging battery-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging iommufd-fixes/for-rc (447c6141e8ea iommufd: Fix spelling errors in iommufd.rst)
Merging rust-fixes/rust-fixes (c17b750b3ad9 Linux 6.17-rc2)
Merging w1-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging pmdomain-fixes/fixes (d8f3ae7b38fe pmdomain: renesas: rcar-sysc: Make rcar_sysc_onecell_np __initdata)
Merging i2c-host-fixes/i2c/i2c-host-fixes (82b350dd8185 i2c: rtl9300: Add missing count byte for SMBus Block Ops)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging thead-clk-fixes/thead-clk-fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging pwrseq-fixes/pwrseq/for-current (8f5ae30d69d7 Linux 6.17-rc1)
Merging thead-dt-fixes/thead-dt-fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging ftrace-fixes/ftrace/fixes (327e28664307 fgraph: Do not enable function_graph tracer when setting funcgraph-args)
Merging ring-buffer-fixes/ring-buffer/fixes (e4d4b8670c44 ring-buffer: Use flush_kernel_vmap_range() over flush_dcache_folio())
Merging trace-fixes/trace/fixes (b5e8acc14dcb tracing: Add down_write(trace_event_sem) when adding trace event)
Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tracefs mount options test)
Merging spacemit-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging tip-fixes/tip/urgent (704e427ebc4d Merge branch into tip/master: 'x86/urgent')
Merging slab-fixes/slab/for-next-fixes (be8250786ca9 mm, slab: clean up slab->obj_exts always)
Merging drm-msm-fixes/msm-fixes (0b6974bb4134 soc: qcom: ubwc: Add missing UBWC config for SM7225)
Merging uml-fixes/fixes (2dca89df0d11 Merge tag 'uml-for-6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux)
Merging fwctl-fixes/for-rc (7f059e473267 fwctl/mlx5: Fix memory alloc/free in mlx5ctl_fw_rpc())
Merging devsec-tsm-fixes/fixes (fba4ceaa242d configfs-tsm-report: Fix NULL dereference of tsm_ops)
Merging drm-misc-fixes/for-linux-next-fixes (3271faf42d13 drm/hisilicon/hibmc: fix dp and vga cannot show together)
Merging linus/for-next (ffd294d346d1 Linux 6.13)
Merging mm-stable/mm-stable (dfc0f6373094 Merge tag 'erofs-for-6.17-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs)
Merging mm-nonmm-stable/mm-nonmm-stable (dfc0f6373094 Merge tag 'erofs-for-6.17-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs)
Merging mm-unstable/mm-unstable (07c27ab74ba7 mm-filemap-align-last_index-to-folio-size-fix)
CONFLICT (content): Merge conflict in rust/kernel/alloc/allocator.rs
Merging mm-nonmm-unstable/mm-nonmm-unstable (452049197f9f watchdog/softlockup:Fix incorrect CPU utilization output during softlockup)
Merging kbuild/kbuild-next (75a6b4595daa kconfig: qconf/xconfig: show the OptionsMode radio button setting at startup)
Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list)
Merging perf/perf-tools-next (6235ce77749f perf record: Cache build-ID of hit DSOs only)
Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11)
Merging dma-mapping/dma-mapping-for-next (110aa2c74dbd swiotlb: Remove redundant __GFP_NOWARN)
Merging asm-generic/master (582847f97024 Makefile.kcov: apply needed compiler option unconditionally in CFLAGS_KCOV)
Merging alpha/alpha-next (1523226edda5 alpha: Use str_yes_no() helper in pci_dac_dma_supported())
Merging arm/for-next (8dd85887ad83 Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (5b1ae9de7133 Merge branch 'for-next/feat_mte_store_only' into for-next/core)
Merging arm-perf/for-next/perf (e480898e767c drivers/perf: hisi: Support PMUs with no interrupt)
Merging arm-soc/for-next (9f9d41d64322 Merge tag 'arm-soc/for-6.17/drivers-part2' of https://github.com/Broadcom/stblinux into arm/fixes)
Merging amlogic/for-next (58abdca0eb65 Merge branch 'v6.17/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (a0d983779391 Merge branch 'apple-soc/drivers-6.18' into asahi-soc/for-next)
Merging at91/at91-next (e99113d11171 Merge branch 'clk-microchip' into at91-next)
Merging bmc/for-next (f070580abddc Merge branches 'aspeed/dt', 'aspeed/drivers', 'nuvoton/arm/dt' and 'nuvoton/arm64/dt' into for-next)
Merging broadcom/next (89abb622d518 Merge branch 'drivers/next' into next)
Merging davinci/davinci/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging drivers-memory/for-next (1aba1eab0bd8 dt-bindings: memory: Update brcmstb-memc-ddr binding with older chips)
Merging fsl/soc_fsl (8f5ae30d69d7 Linux 6.17-rc1)
Merging imx-mxs/for-next (cdc22fb12eff Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (6cbb623586d5 Merge branches 'v6.16-next/arm32', 'v6.16-next/dts32', 'v6.16-next/dts64' and 'v6.16-next/soc' into for-next)
Merging mvebu/for-next (88084e0358ff Merge branch 'mvebu/dt' into mvebu/for-next)
Merging omap/for-next (db91121f001a Merge branch 'omap-for-v6.17/soc' into tmp/omap-next-20250707.142928)
Merging qcom/for-next (1aa50d938e88 Merge branches 'arm32-for-6.18', 'arm64-defconfig-for-6.18', 'arm64-for-6.18', 'clk-fixes-for-6.17', 'clk-for-6.18', 'drivers-fixes-for-6.17' and 'drivers-for-6.18' into for-next)
Merging renesas/next (c0536d350036 Merge branches 'renesas-drivers-for-v6.18' and 'renesas-dts-for-v6.18' into renesas-next)
Merging reset/reset/next (1527cd3b89f0 reset: remove unneeded 'fast_io' parameter in regmap_config)
Merging rockchip/for-next (7f0817eee7ba Merge branch 'v6.18-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (e886e1abbd08 Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging sophgo/for-next (349ae53a949c Merge branch 'dt/riscv' into for-next)
Merging sophgo-soc/soc-for-next (c8754c7deab4 soc: sophgo: cv1800: rtcsys: New driver (handling RTC only))
Merging spacemit/for-next (bab8dea25910 riscv: dts: spacemit: Add OrangePi RV2 board device tree)
Merging stm32/stm32-next (1a32f7427eb3 arm64: dts: st: remove empty line in stm32mp251.dtsi)
Merging sunxi/sunxi/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging tee/next (0518f0b44b9a Merge branch 'optee_typo_fix_for_v6.17' into next)
Merging tegra/for-next (499b75defe56 Merge branch for-6.17/arm64/defconfig into for-next)
Merging thead-dt/thead-dt-for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging ti/ti-next (0ad78b7cc779 Merge branch 'ti-keystone-dts-next' into ti-next)
Merging xilinx/for-next (3a0e3f82b8ee Merge branch 'zynqmp/dt' into for-next)
Merging clk/clk-next (54f5212c8f21 Merge branch 'clk-cleanup' into clk-next)
Merging clk-imx/for-next (c78865241ecf MAINTAINERS: Update i.MX Clock Entry)
Merging clk-renesas/renesas-clk (60d0d88552cb clk: renesas: r9a09g077: Add module clocks for SCI1-SCI5)
Merging thead-clk/thead-clk-for-next (c567bc5fc68c clk: thead: th1520-ap: set all AXI clocks to CLK_IS_CRITICAL)
Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working)
Merging loongarch/loongarch-next (d35ec48fa6c8 LoongArch: vDSO: Remove -nostdlib complier flag)
Merging m68k/for-next (c8995932db2b m68k: mac: Improve clocksource driver commentary)
Merging m68knommu/for-next (c17b750b3ad9 Linux 6.17-rc2)
Merging microblaze/next (c0e7bb02f796 microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers)
Merging mips/mips-next (3ebcbf079c26 MIPS: Don't use %pK through printk)
Merging openrisc/for-next (f0eedcf22581 openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers)
Merging parisc-hd/for-next (89f686a0fb6e parisc: Revise __get_user() to probe user read access)
Merging powerpc/next (c17b750b3ad9 Linux 6.17-rc2)
Merging risc-v/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging riscv-dt/riscv-dt-for-next (481ee0fcbb9a riscv: dts: starfive: jh7110-common: drop no-sdio property from mmc1)
Merging riscv-soc/riscv-soc-for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging s390/for-next (85f744617f1a Merge branch 'features' into for-next)
Merging sh/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging sparc/for-next (2cec2c4dc90c sparc/irq: Remove unneeded if check in sun4v_cookie_only_virqs())
Merging uml/next (fc9ed2f6589d um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers)
Merging xtensa/xtensa-for-next (44a4ef59d550 xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers)
Merging fs-next (72b8db005d91 next-20250815/vfs-brauner)
CONFLICT (content): Merge conflict in fs/bcachefs/darray.c
Merging printk/for-next (dcc3191a3dde Merge branch 'rework/ringbuffer-kunit-test' into for-next)
Merging pci/next (b98611d72db4 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (d679c2e1e8d9 pstore/zone: rewrite some comments for better understanding)
Merging hid/for-next (3093b65bd04b Merge branch 'for-6.18/pidff' into for-next)
Merging i2c/i2c/for-next (94c296776403 i2c: muxes: pca954x: Reset if (de)select fails)
Merging i2c-host/i2c/i2c-host (5b4488c9ec00 i2c: rtl9300: Implement I2C block read and write)
Merging i3c/i3c/next (3b661ca549b9 i3c: add missing include to internal header)
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (9703c672af8d MAINTAINERS: Mark coretemp driver as orphaned)
Merging jc_docs/docs-next (37c52167b007 docs: Remove remainders of reiserfs)
Merging v4l-dvb/next (a75b8d198c55 media: imon: Remove unused defines)
Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init())
Merging pm/linux-next (b52a57d2305d Merge branch 'fixes' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (cd5d4621ba84 cpufreq: scmi: Account for malformed DT in scmi_dev_used_by_cpus())
Merging cpupower/cpupower (357d1fc38aad cpupower: Allow control of boost feature on non-x86 based systems with boost support.)
Merging devfreq/devfreq-next (7da2fdaaa1e6 PM / devfreq: Add HiSilicon uncore frequency scaling driver)
Merging pmdomain/next (ffeebf7587f5 pmdomain: mediatek: Convert all SoCs to new style regmap retrieval)
Merging opp/opp/linux-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging thermal/thermal/linux-next (1d264d3a1988 dt-bindings: thermal: tegra: Document Tegra210B01)
Merging rdma/for-next (211dc59b7bb5 IB/hfi1: Use for_each_online_cpu() instead of for_each_cpu())
Merging net-next/main (da114122b831 net: ethernet: stmmac: dwmac-rk: Make the clk_phy could be used for external phy)
Merging bpf-next/for-next (5b6d6fe1ca7b Merge branch 'bpf-next/net' into for-next)
Merging ipsec-next/master (9f4f591cd5a4 xfrm: xfrm_user: use strscpy() for alg_name)
Merging mlx5-next/mlx5-next (40653f280b26 {rdma,net}/mlx5: export mlx5_vport_get_vhca_id)
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
Merging netfilter-next/main (88250d40ed59 Merge branch 'net-dsa-b53-mmap-add-bcm63268-gphy-power-control')
Merging ipvs-next/main (d9104cec3e8f Merge tag 'bpf-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next)
Merging bluetooth/master (e090ee03a6ed Bluetooth: hci_event: Mark connection as closed during suspend disconnect)
Merging wireless-next/for-next (126d85fb0405 Merge tag 'wireless-next-2025-07-24' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next)
Merging ath-next/for-next (d9104cec3e8f Merge tag 'bpf-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next)
Merging iwlwifi-next/next (d2af710d6d50 wifi: iwlwifi: mvm/fw: Avoid -Wflex-array-member-not-at-end warnings)
Merging wpan-next/master (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit())
Merging wpan-staging/staging (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit())
Merging mtd/mtd/next (9cf9db888f38 Merge tag 'nand/for-6.17' into mtd/next)
Merging nand/nand/next (fb2fae70e7e9 mtd: spinand: winbond: Add comment about the maximum frequency)
Merging spi-nor/spi-nor/next (2e3a7476ec39 mtd: spi-nor: Fix spi_nor_try_unlock_all())
Merging crypto/master (34c065fe1d0d crypto: ccp - Remove redundant __GFP_ZERO)
Merging libcrypto/libcrypto-next (56784a422086 lib/crypto: tests: Add KUnit tests for MD5 and HMAC-MD5)
Merging drm/drm-next (dd489c01c397 Merge tag 'drm-misc-next-2025-08-14' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/nova/file.rs
Merging drm-exynos/for-linux-next (19272b37aa4f Linux 6.16-rc1)
Merging drm-misc/for-linux-next (54d4f445517f drm/panfrost: Print RSS for tiler heap BO's in debugfs GEMS file)
Merging amdgpu/drm-next (645cc7863da5 drm/amd/display: Fix DP audio DTO1 clock source on DCE 6.)
Merging drm-intel/for-linux-next (0492e13eb819 drm/i915/dram: move fsb_freq and mem_freq to dram info)
  cbd3baeffbc0 ("drm/i915: silence rpm wakeref asserts on GEN11_GU_MISC_IIR access")
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_tc.c
Merging drm-msm/msm-next (8290d37ad2b0 drm/msm: Small function param doc fix)
Merging drm-msm-lumag/msm-next-lumag (75717bce00d1 drm/msm: Don't use %pK through printk)
Merging drm-nova/nova-next (0988099646cf gpu: nova-core: register: add support for relative array registers)
Merging drm-xe/drm-xe-next (b85bb2d67715 drm/xe: Make page size consistent in loop)
Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset support)
Merging fbdev/for-next (b87662f1dcc7 fbdev: s3fb: Implement powersave for S3 FB)
Merging regmap/for-next (5c36b86d2bf6 regmap: Remove superfluous check for !config in __regmap_init())
Merging sound/for-next (d9f063386771 ALSA: usb-audio: us144mkii: Use le16_to_cpu() for product ID comparison)
Merging ieee1394/for-next (c17b750b3ad9 Linux 6.17-rc2)
Merging sound-asoc/for-next (01d6bdc104e4 Merge remote-tracking branch 'asoc/for-6.18' into asoc-next)
Merging modules/modules-next (5eb4b9a4cdbb params: Replace deprecated strcpy() with strscpy() and memcpy())
Merging input/next (80025149db06 Input: include export.h in modules using EXPORT_SYMBOL*())
Applying: input: remove second addition of <linux/stdarg.h>
Merging block/for-next (627cae98250c Merge branch 'for-6.18/io_uring' into for-next)
Merging device-mapper/for-next (fd5cc4922bef dm-pcache: add persistent cache target in device-mapper)
Merging libata/for-next (6cb43739b93c ata: pata_pdc2027x: Remove space before newline and abbreviations)
Merging pcmcia/pcmcia-next (4a81f78caa53 pcmcia: Add error handling for add_interval() in do_validate_mem())
Merging mmc/next (7138017038c4 mmc: Merge branch fixes into next)
Merging mfd/for-mfd-next (c0eb742dd61c dt-bindings: mfd: qnap,ts433-mcu: Allow nvmem-layout child node)
Merging backlight/for-backlight-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging battery/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging regulator/for-next (121e399e125d Merge remote-tracking branch 'regulator/for-6.18' into regulator-next)
Merging security/next (046c56178a73 rust,cred: update AlwaysRefCounted import to sync::aref)
Merging apparmor/apparmor-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging integrity/next-integrity (a4cc916bf572 lib/digsig: Use SHA-1 library instead of crypto_shash)
Merging selinux/next (f20e70a341dd selinux: Remove redundant __GFP_NOWARN)
Merging smack/next (6ddd169d0288 smack: fix kernel-doc warnings for smk_import_valid_label())
Merging tomoyo/master (038d61fd6422 Linux 6.16)
Merging tpmdd/next (be48bcf004f9 Merge tag 'for-6.17-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging watchdog/master (48defdf6b083 watchdog: sbsa: Adjust keepalive timeout to avoid MediaTek WS0 race condition)
Merging iommu/next (41f0200c718c iommu/tegra241-cmdqv: Fix missing cpu_to_le64 at lvcmdq_err_map)
Merging audit/next (70d00858645c audit: add a missing tab)
Merging devicetree/for-next (326d25198112 dt-bindings: powerpc: Drop duplicate fsl/mpic.txt)
Merging dt-krzk/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging mailbox/for-next (5378bdf6a611 mailbox/pcc: support mailbox management of the shared buffer)
Merging spi/for-next (61750d3ad67d Merge remote-tracking branch 'spi/for-6.18' into spi-next)
Merging tip/master (2fd6a6194558 Merge branch into tip/master: 'x86/misc')
Merging clockevents/timers/drivers/next (461f124656e6 clocksource/drivers/arm_arch_timer_mmio: Add MMIO clocksource)
Merging edac/edac-for-next (2408a0359b6f Merge branch 'edac-drivers' into edac-for-next)
Merging ftrace/for-next (39f069d5a466 Merge unwind/for-next)
Merging rcu/next (61399e0c5410 rcu: Fix racy re-initialization of irq_work causing hangs)
Merging paulmck/non-rcu/next (b706eec9304f Merge branches 'lkmm.2025.07.09a', 'ratelimit.2025.06.24a' and 'stop-machine.2025.07.17a' into HEAD)
Merging kvm/next (196d9e72c4b0 Merge tag 'kvm-s390-next-6.17-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-arm/next (7b8346bd9fce KVM: arm64: Don't attempt vLPI mappings when vPE allocation is disabled)
Merging kvms390/next (efe54612bdb6 improve interrupt cpu)
Merging kvm-ppc/topic/ppc-kvm (c17b750b3ad9 Linux 6.17-rc2)
Merging kvm-riscv/riscv_kvm_next (07a289a03140 RISC-V: KVM: Avoid re-acquiring memslot in kvm_riscv_gstage_map())
Merging kvm-x86/next (91b392ada892 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests' and 'vmx')
Merging xen-tip/linux-next (8ea815399c3f compiler: remove __ADDRESSABLE_ASM{_STR,}() again)
Merging percpu/for-next (87d6aab2389e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
Merging workqueues/for-next (324cee0c272c Merge branch 'for-6.17' into for-next)
Merging sched-ext/for-next (4b3570b49067 Merge branch 'for-6.17-fixes' into for-next)
Merging drivers-x86/for-next (3bffbe0497f9 platform/x86: wmi-capdata01: Remove unneeded semicolon)
Merging chrome-platform/for-next (f7439a723e5a platform/chrome: wilco_ec: Remove redundant semicolons)
Merging chrome-platform-firmware/for-firmware-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging hsi/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging leds-lj/for-leds-next (7d5c3cac1f39 leds: flash: leds-qcom-flash: Add a separate register map for PMI8998)
Merging ipmi/for-next (1a032a59d27f ipmi:msghandler:Change seq_lock to a mutex)
Merging driver-core/driver-core-next (292cb391479d software node: Constify node_group in registration functions)
Merging usb/usb-next (956606bafb5f usb: gadget: f_ncm: Fix MAC assignment NCM ethernet)
Merging thunderbolt/next (5d03847175e8 thunderbolt: Use is_pciehp instead of is_hotplug_bridge)
Merging usb-serial/usb-next (bdf2ab177e2f USB: serial: cp210x: use new GPIO line value setter callbacks)
Merging tty/tty-next (7cd9f5d6c5a3 s390/char/con3270: use tty_port_tty guard())
Merging char-misc/char-misc-next (4d2604833e8e binder: remove MODULE_LICENSE())
Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging coresight/next (a80198ba650f coresight: fix indentation error in cscfg_remove_owned_csdev_configs())
Merging fastrpc/for-next (b52ebc078bb6 misc: fastrpc: add support for gdsp remoteproc)
Merging fpga/for-next (4f156ee58bb8 fpga: zynq_fpga: Fix the wrong usage of dma_map_sgtable())
  4f156ee58bb8 ("fpga: zynq_fpga: Fix the wrong usage of dma_map_sgtable()")
Merging icc/icc-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging iio/togreg (788c57f4766b docs: iio: ad3552r: Fix malformed code-block directive)
Merging phy-next/next (8427a4ca85b3 phy: qualcomm: phy-qcom-eusb2-repeater: Add support for PMIV0104)
Merging soundwire/next (8b63fee9f623 soundwire: debugfs: add SCP_SDCA_IntStatX and SCP_SDCA_IntMaskX registers)
Merging extcon/extcon-next (5f09caafc652 extcon: fsa9480: Avoid buffer overflow in fsa9480_handle_change())
Merging gnss/gnss-next (e326371f3002 dt-bindings: gnss: u-blox: add u-blox,neo-9m compatible)
Merging vfio/next (b1779e4f209c vfio/type1: conditional rescheduling while pinning)
Merging w1/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging spmi/spmi-next (0ff41df1cb26 Linux 6.15)
Merging staging/staging-next (260221b2a053 staging: vc04_services/vchiq-mmal: fix typos in comments)
Merging counter-next/counter-next (19272b37aa4f Linux 6.16-rc1)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (59b723cd2adb Linux 6.12-rc6)
Merging dmaengine/next (8f5ae30d69d7 Linux 6.17-rc1)
Merging cgroup/for-next (ac412e77dc29 Merge branch 'for-6.18' into for-next)
Merging scsi/for-next (8d7ec03a6727 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (2cb5168f1e74 Merge patch series "scsi: pm80xx: Fix expander support")
Merging vhost/linux-next (9b26fdd93310 virtio_net: adjust the execution order of function `virtnet_close` during freeze)
Merging rpmsg/for-next (01d7d9241256 Merge branches 'rproc-next' and 'rpmsg-next' into for-next)
Merging gpio-brgl/gpio/for-next (5893165a27e7 gpio: remove unneeded 'fast_io' parameter in regmap_config)
Merging gpio-intel/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging pinctrl/for-next (c5998be4099b Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging pinctrl-renesas/renesas-pinctrl (9eb40bb26ace pinctrl: renesas: rzt2h: Add support for RZ/N2H)
Applying: fix up for "pinctrl: renesas: Add support for RZ/T2H"
Merging pinctrl-samsung/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging pwm/pwm/for-next (f15f651def70 pwm: pca9586: Convert to waveform API)
Merging ktest/for-next (a5e71638ddd7 ktest.pl: Add new PATCHCHECK_SKIP option to skip testing individual commits)
Merging kselftest/next (8f5ae30d69d7 Linux 6.17-rc1)
Merging kunit/test (8f5ae30d69d7 Linux 6.17-rc1)
Merging kunit-next/kunit (e520219adc99 kunit: tool: Accept --raw_output=full as an alias of 'all')
$ git reset --hard HEAD^
Merging next-20250815 version of kunit-next
Merging livepatching/for-next (dcf9f31c62b3 Merge tag 'livepatching-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching)
Merging rtc/rtc-next (bb5b0b4317c9 rtc: ds1685: Update Joshua Kinard's email address.)
Merging nvdimm/libnvdimm-for-next (9f97e61bde6a cxl: Include range.h in cxl.h)
Merging at24/at24/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging ntb/ntb-next (0cadf92e93d4 NTB/msi: Remove unused functions)
Merging seccomp/for-next/seccomp (b0c9bfbab925 selftests/seccomp: Add a test for the WAIT_KILLABLE_RECV fast reply race)
Merging slimbus/for-next (e1aab955386f slimbus: qcom: remove unused qcom controller driver)
Merging nvmem/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends)
Merging hyperv/hyperv-next (15b07d3e2be2 mshv: Add support for a new parent partition configuration)
Merging auxdisplay/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging kgdb/kgdb/for-next (afdbe49276ac kdb: Remove optional size arguments from strscpy() calls)
Merging hmm/hmm (19272b37aa4f Linux 6.16-rc1)
Merging cfi/cfi/next (19272b37aa4f Linux 6.16-rc1)
Merging mhi/mhi-next (00559ba3ae74 bus: mhi: host: pci_generic: Add Telit FN990B40 modem support)
Merging memblock/for-next (3b394dff15e1 memblock tests: add test for memblock_set_node)
Merging cxl/next (e6a9530b3ee7 cxl: Fix emit of type resource_size_t argument for validate_region_offset())
Merging zstd/zstd-next (65d1f5507ed2 zstd: Import upstream v1.5.7)
Merging efi/next (02eb7a8eee20 efi: add API doc entry for ovmf_debug_log)
Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree)
Merging slab/slab/for-next (8185696483dc MAINTAINERS: add missing files to slab section)
Merging random/master (3778dcb2dcc1 random: use offstack cpumask when necessary)
Merging landlock/next (6dde339a3df8 landlock: Minor comments improvements)
Merging rust/rust-next (c17b750b3ad9 Linux 6.17-rc2)
Merging rust-alloc/alloc-next (8efe8816a7dd rust: alloc: add ARCH_KMALLOC_MINALIGN to bindgen blocklist)
CONFLICT (content): Merge conflict in rust/kernel/alloc.rs
Merging rust-io/io-next (86731a2a651e Linux 6.16-rc3)
Merging rust-pin-init/pin-init-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging rust-timekeeping/timekeeping-next (d4b29ddf82a4 rust: time: Add wrapper for fsleep() function)
Merging rust-xarray/xarray-next (fa616196fbea MAINTAINERS: add entry for Rust XArray API)
Merging sysctl/sysctl-next (19272b37aa4f Linux 6.16-rc1)
Merging execve/for-next/execve (7f71195c15dc fork: reorder function qualifiers for copy_clone_args_from_user)
Merging bitmap/bitmap-for-next (89748acdf226 Merge tag 'drm-next-2025-08-01' of https://gitlab.freedesktop.org/drm/kernel)
Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro)
Merging kspp/for-next/kspp (f627b51aaa04 compiler_types: Provide __no_kstack_erase to disable coverage only on Clang)
Merging nolibc/for-next (850047b19741 selftests/nolibc: always compile the kernel with GCC)
Merging iommufd/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging turbostat/next (447c98c1ca4a tools/power turbostat: Add idle governor statistics reporting)
CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.8
CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.c
Merging pwrseq/pwrseq/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging capabilities-next/caps-next (cdd73b166607 uapi: fix broken link in linux/capability.h)
Merging ipe/next (038d61fd6422 Linux 6.16)
Merging kcsan/next (9872916ad1a1 kcsan: test: Initialize dummy variable)
Merging crc/crc-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging fwctl/for-next (19272b37aa4f Linux 6.16-rc1)
Merging devsec-tsm/next (9d948b880409 Merge branch 'for-6.16/tsm-mr' into tsm-next)
Merging hisilicon/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function name to match code)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: Tree for Aug 20
@ 2024-08-20  3:55 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2024-08-20  3:55 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 39348 bytes --]

Hi all,

Changes since 20240819:

Removed trees:	(all not updated in a year)
	drm-tegra, pidfd, soc-fsl, soc-fsl-fixes, uml-fixes

The vfs-bauner tree gained a build failure so I used the version from
next-20240819.

The input tree gained a conflict against Linus' tree.

Non-merge commits (relative to Linus' tree): 4899
 5344 files changed, 199234 insertions(+), 92797 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 is also the merge.log file 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, s390, 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 375 trees (counting Linus' and 140 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 (6e4436539ae1 Merge tag 'hid-for-linus-2024081901' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid)
Merging vfs-brauner-fixes/vfs.fixes (780d60bac21e Revert "pidfd: prevent creation of pidfds for kthreads")
Merging fscrypt-current/for-current (256abd8e550c Linux 6.10-rc7)
Merging fsverity-current/for-current (256abd8e550c Linux 6.10-rc7)
Merging btrfs-fixes/next-fixes (2c3d2a490ba9 Merge branch 'misc-6.11' into next-fixes)
Merging vfs-fixes/fixes (046667c4d319 memcg_write_event_control(): fix a user-triggerable oops)
Merging erofs-fixes/fixes (e080a26725fb erofs: allow large folios for compressed files)
Merging nfsd-fixes/nfsd-fixes (91da337e5d50 nfsd: don't set SVC_SOCK_ANONYMOUS when creating nfsd sockets)
Merging v9fs-fixes/fixes/next (0c3836482481 Linux 6.10)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging bcachefs/for-next (62439c6f1a6d bcachefs: Simplify bch2_xattr_emit() implementation)
Merging fscrypt/for-next (256abd8e550c Linux 6.10-rc7)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (43a74a98d7fc Merge branch 'for-next-next-v6.11-20240819' into for-next-20240819)
Merging ceph/master (43f5b8b50fb5 ceph: Remove unused declarations)
Merging cifs/for-next (b5e99e6c6dcd smb3: fix problem unloading module due to leaked refcount on shutdown)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging dlm/next (652b0ae675fe dlm: add missing -ENOMEM if alloc_workqueue() fails)
Merging erofs/dev (7c626ce4bae1 Linux 6.11-rc3)
Merging exfat/dev (98ad7b9012b5 exfat: Implement sops->shutdown and ioctl)
Merging exportfs/exportfs-next (0c3836482481 Linux 6.10)
Merging ext3/for_next (85f22bb5d2c2 Merge UDF consistency fixes.)
Merging ext4/dev (8400291e289e Linux 6.11-rc1)
Merging f2fs/dev (d33ebd57b987 f2fs: fix to use per-inode maxbytes and cleanup)
Merging fsverity/for-next (256abd8e550c Linux 6.10-rc7)
Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support)
Merging gfs2/for-next (6706415bf9f3 Merge tag 'gfs2-v6.10-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2)
Merging jfs/jfs-next (d0fa70aca54c jfs: don't walk off the end of ealist)
Merging ksmbd/ksmbd-for-next (7c525dddbee7 ksmbd: Replace one-element arrays with flexible-array members)
Merging nfs/linux-next (47ac09b91bef Linux 6.11-rc4)
Merging nfs-anna/linux-next (b9fae9f06d84 SUNRPC: Fixup gss_status tracepoint error output)
Merging nfsd/nfsd-next (3cd8719c4fd9 nfsd: map the EBADMSG to nfserr_io to avoid warning)
Merging ntfs3/master (8400291e289e Linux 6.11-rc1)
Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access)
Merging overlayfs/overlayfs-next (004b8d1491b4 ovl: fix encoding fid for lower only root)
Merging ubifs/next (92a286e90203 ubi: Fix ubi_init() ubiblock_exit() section mismatch)
Merging v9fs/9p-next (2211561723a6 9p: Enable multipage folios)
Merging v9fs-ericvh/ericvh/for-next (0c3836482481 Linux 6.10)
Merging xfs/for-next (8d16762047c6 xfs: conditionally allow FS_XFLAG_REALTIME changes if S_DAX is set)
Merging zonefs/for-next (df2f9708ff1f zonefs: enable support for large folios)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (d4c416e18e3b Merge branch 'vfs.idmap' into vfs.all Signed-off-by: Christian Brauner <brauner@kernel.org>)
CONFLICT (content): Merge conflict in fs/exfat/inode.c
Applying: fixup for "fs: Convert aops->write_end to take a folio"
$ git reset --hard HEAD^
Merging next-20240819 version of vfs-brauner
CONFLICT (content): Merge conflict in fs/exfat/inode.c
CONFLICT (content): Merge conflict in tools/testing/selftests/core/close_range_test.c
[fs-next abc318b01c10] next-20240819/vfs-brauner
Applying: fixup for "fs: Convert aops->write_end to take a folio"
[fs-next d7cf76b6fd76] next-20240819/vfs-brauner
Merging vfs/for-next (a38297e3fb01 Linux 6.9)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (441f53c6c545 kexec_file: fix elfcorehdr digest exclusion when CONFIG_CRASH_HOTPLUG=y)
Merging fs-current (a0694fc7a4c2 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git)
Merging kbuild-current/fixes (145082ebfcf0 Documentation/llvm: turn make command for ccache into code block)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (f75c235565f9 arm64: Fix KASAN random tag seed initialization)
Merging arm-soc-fixes/arm/fixes (6b1124c4526f Merge tag 'ti-k3-dt-fixes-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (8400291e289e Linux 6.11-rc1)
Merging sophgo-fixes/fixes (8400291e289e Linux 6.11-rc1)
Merging m68k-current/for-linus (21b9e722ad28 m68k: cmpxchg: Fix return value for default case in __arch_xchg())
Merging powerpc-fixes/fixes (227bbaabe64b powerpc/topology: Check if a core is online)
Merging s390-fixes/fixes (de9c2c66ad8e Linux 6.11-rc2)
Merging net/main (565d121b6998 tcp: prevent concurrent execution of tcp_sk_exit_batch)
Merging bpf/master (9d5906799f7d Merge tag 'selinux-pr-20240814' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux)
Merging ipsec/master (89a2aefe4b08 xfrm: call xfrm_dev_policy_delete when kill policy)
Merging netfilter/main (565d121b6998 tcp: prevent concurrent execution of tcp_sk_exit_batch)
Merging ipvs/main (9c5af2d7dfe1 Merge tag 'nf-24-08-15' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf)
Merging wireless/for-next (27ec3c57fcad wifi: mwifiex: duplicate static structs used in driver instances)
Merging ath/for-current (38055789d151 wifi: ath12k: use 128 bytes aligned iova in transmit path for WCN7850)
Merging wpan/master (b8ec0dc3845f net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD())
Merging rdma-fixes/for-rc (8400291e289e Linux 6.11-rc1)
Merging sound-current/for-linus (32108c22ac61 ALSA: seq: Skip event type filtering for UMP events)
Merging sound-asoc-fixes/for-linus (a42db293e598 ASoC: SOF: amd: Fix for acp init sequence)
Merging regmap-fixes/for-linus (e0ee39920027 Merge remote-tracking branch 'regmap/for-6.10' into regmap-linus)
Merging regulator-fixes/for-linus (7c626ce4bae1 Linux 6.11-rc3)
Merging spi-fixes/for-linus (57d5af2660e9 spi: spi-cadence-quadspi: Fix OSPI NOR failures during system resume)
Merging pci-current/for-linus (80a2a75a2a9c Merge branch 'controller/qcom' into for-linus)
Merging driver-core.current/driver-core-linus (47ac09b91bef Linux 6.11-rc4)
Merging tty.current/tty-linus (47ac09b91bef Linux 6.11-rc4)
Merging usb.current/usb-linus (47ac09b91bef Linux 6.11-rc4)
Merging usb-serial-fixes/usb-linus (00af4f3dda14 USB: serial: debug: do not echo input by default)
Merging phy/fixes (5af9b304bc60 phy: xilinx: phy-zynqmp: Fix SGMII linkup failure on resume)
Merging staging.current/staging-linus (8400291e289e Linux 6.11-rc1)
Merging iio-fixes/fixes-togreg (0a3b517c8089 iio: imu: inv_mpu6050: fix interrupt status read for old buggy chips)
Merging counter-current/counter-current (8400291e289e Linux 6.11-rc1)
Merging char-misc.current/char-misc-linus (47ac09b91bef Linux 6.11-rc4)
Merging soundwire-fixes/fixes (ab8d66d132bc soundwire: stream: fix programming slave ports for non-continous port maps)
Merging thunderbolt-fixes/fixes (47ac09b91bef Linux 6.11-rc4)
Merging input-current/for-linus (aaa4ca873d3d Input: i8042 - use new forcenorestore quirk to replace old buggy quirk combination)
Merging crypto-current/master (df1e9791998a hwrng: core - remove (un)register_miscdev())
Merging vfio-fixes/for-linus (5a88a3f67e37 vfio/pci: Init the count variable in collecting hot-reset devices)
Merging kselftest-fixes/fixes (170c966cbe27 selftests: ksft: Fix finished() helper exit code on skipped tests)
Merging dmaengine-fixes/fixes (b53b831919a0 dmaengine: stm32-dma3: Set lli_size after allocation)
Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1)
Merging mtd-fixes/mtd/fixes (b27d8946b5ed mtd: rawnand: rockchip: ensure NVDDR timings are rejected)
Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range)
Merging v4l-dvb-fixes/fixes (63de936b513f media: atomisp: Fix streaming no longer working on BYT / ISP2400 devices)
Merging reset-fixes/reset/fixes (ab35896730a5 reset: hisilicon: hi6220: add missing MODULE_DESCRIPTION() macro)
Merging mips-fixes/mips-fixes (1cb6ab446424 MIPS: Loongson64: Set timer mode in cpu-probe)
Merging at91-fixes/at91-fixes (e9408fa234fb MAINTAINERS: Update DTS path for ARM/Microchip (AT91) SoC)
Merging omap-fixes/fixes (5062d9c0cbbc ARM: dts: omap3-n900: correct the accelerometer orientation)
Merging kvm-fixes/master (1c0e5881691a KVM: SEV: uapi: fix typo in SEV_RET_INVALID_CONFIG)
Merging kvms390-fixes/master (cff59d8631e1 s390/uv: Panic for set and remove shared access UVC errors)
Merging hwmon-fixes/hwmon (ff7a96571aa7 hwmon: (asus-ec-sensors) remove VRM temp X570-E GAMING)
Merging nvdimm-fixes/libnvdimm-fixes (d5240fa65db0 nvdimm/pmem: Set dax flag for all 'PFN_MAP' cases)
Merging cxl-fixes/fixes (2c402bd2e85b cxl/test: Skip cxl_setup_parent_dport() for emulated dports)
Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y)
Merging drivers-x86-fixes/fixes (bc923d594db2 platform/surface: aggregator: Fix warning when controller is destroyed in probe)
Merging samsung-krzk-fixes/fixes (8400291e289e Linux 6.11-rc1)
Merging pinctrl-samsung-fixes/fixes (8400291e289e Linux 6.11-rc1)
Merging devicetree-fixes/dt/linus (b739dffa5d57 of/irq: Prevent device address out-of-bounds read in interrupt map walk)
Merging dt-krzk-fixes/fixes (8400291e289e Linux 6.11-rc1)
Merging scsi-fixes/fixes (cbaac68987b8 scsi: sd: Do not attempt to configure discard unless LBPME is set)
Merging drm-fixes/drm-fixes (47ac09b91bef Linux 6.11-rc4)
Merging drm-intel-fixes/for-linux-next-fixes (5d41eeb6725e drm/i915/hdcp: Use correct cp_irq_count)
Merging mmc-fixes/fixes (9374ae912dbb mmc: mtk-sd: receive cmd8 data when hs400 tuning fail)
Merging rtc-fixes/rtc-fixes (8400291e289e Linux 6.11-rc1)
Merging gnss-fixes/gnss-linus (8400291e289e Linux 6.11-rc1)
Merging hyperv-fixes/hyperv-fixes (3b85a2eacd3d Documentation: hyperv: Add overview of Confidential Computing VM support)
Merging risc-v-fixes/fixes (32d5f7add080 Merge patch series "RISC-V: hwprobe: Misaligned scalar perf fix and rename")
Merging riscv-dt-fixes/riscv-dt-fixes (7d9d88890f04 MAINTAINERS: invert Misc RISC-V SoC Support's pattern)
Merging riscv-soc-fixes/riscv-soc-fixes (8400291e289e Linux 6.11-rc1)
Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1)
Merging spdx/spdx-linus (47ac09b91bef Linux 6.11-rc4)
Merging gpio-brgl-fixes/gpio/for-current (47ac09b91bef Linux 6.11-rc4)
Merging gpio-intel-fixes/fixes (8400291e289e Linux 6.11-rc1)
Merging pinctrl-intel-fixes/fixes (a366e46da10d pinctrl: meteorlake: Add Arrow Lake-H/U ACPI ID)
Merging auxdisplay-fixes/fixes (8400291e289e Linux 6.11-rc1)
Merging kunit-fixes/kunit-fixes (8400291e289e Linux 6.11-rc1)
Merging memblock-fixes/fixes (8043832e2a12 memblock: use numa_valid_node() helper to check for invalid node ID)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (4bbe60029319 perf daemon: Fix the build on 32-bit architectures)
Merging efi-fixes/urgent (ae835a96d72c x86/efistub: Revert to heap allocated boot_params for PE entrypoint)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (7c626ce4bae1 Linux 6.11-rc3)
Merging iommufd-fixes/for-rc (cf1e515c9a40 iommufd/selftest: Make dirty_ops static)
Merging rust-fixes/rust-fixes (47ac09b91bef Linux 6.11-rc4)
Merging w1-fixes/fixes (8400291e289e Linux 6.11-rc1)
Merging pmdomain-fixes/fixes (52dd070c62e4 pmdomain: imx: wait SSAR when i.MX93 power domain on)
Merging i2c-host-fixes/i2c/i2c-host-fixes (47ac09b91bef Linux 6.11-rc4)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (39a3396558fb clk: thead: fix dependency on clk_ignore_unused)
Merging pwrseq-fixes/pwrseq/for-current (a9aaf1ff88a8 power: sequencing: request the WLAN enable GPIO as-is)
Merging thead-dt-fixes/thead-dt-fixes (8400291e289e Linux 6.11-rc1)
Merging drm-misc-fixes/for-linux-next-fixes (9b340aeb26d5 nouveau/firmware: use dma non-coherent allocator)
Merging mm-stable/mm-stable (7c626ce4bae1 Linux 6.11-rc3)
Merging mm-nonmm-stable/mm-nonmm-stable (7c626ce4bae1 Linux 6.11-rc3)
Merging mm/mm-everything (4b202fe93997 foo)
Merging kbuild/for-next (7809144639f6 kbuild: modinst: remove the multithread option from zstd compression)
Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list)
Merging perf/perf-tools-next (3bce87eb744f Merge remote-tracking branch 'torvalds/master' into perf-tools-next)
Merging compiler-attributes/compiler-attributes (8400291e289e Linux 6.11-rc1)
Merging dma-mapping/for-next (bd44ca3de49c dma-debug: avoid deadlock between dma debug vs printk and netconsole)
Merging asm-generic/master (b82c1d235a30 syscalls: add back legacy __NR_nfsservctl macro)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (ba954cad0ce7 Merge branches 'clkdev', 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (5c43d43bad35 Merge branches 'for-next/acpi', 'for-next/misc' and 'for-next/perf' into for-next/core)
Merging arm-perf/for-next/perf (7c626ce4bae1 Linux 6.11-rc3)
Merging arm-soc/for-next (6b1124c4526f Merge tag 'ti-k3-dt-fixes-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/fixes)
Merging amlogic/for-next (0c6580c514ec Merge branch 'v6.11/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (995d8fe0341e ARM: dts: aspeed: System1: Updates to BMC board)
Merging at91/at91-next (870c43904be2 Merge branch 'at91-defconfig' into at91-next)
Merging broadcom/next (643a42808eb5 Merge branch 'soc/next' into next)
Merging davinci/davinci/for-next (973d248c43f2 ARM: davinci: remove unused cpuidle code)
Merging drivers-memory/for-next (67dd9e861add memory: tegra186-emc: drop unused to_tegra186_emc())
Merging imx-mxs/for-next (1d43464566cd Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (9dd04bf6bf1c Merge branch 'v6.11-next/dts64' into for-next)
Merging mvebu/for-next (ffd0d7df6bdb Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (6cb1ac2b11b2 Merge branch 'omap-for-v6.12/drivers' into omap-reset)
Merging qcom/for-next (4ce8c2afa64e Merge branches 'arm32-for-6.12', 'arm64-defconfig-fixes-for-6.11', 'arm64-defconfig-for-6.12', 'arm64-fixes-for-6.11', 'arm64-for-6.12', 'clk-fixes-for-6.11', 'clk-for-6.12' and 'drivers-for-6.12' into for-next)
Merging renesas/next (3f3b7f43c49a Merge branches 'renesas-arm-defconfig-for-v6.12' and 'renesas-dts-for-v6.12' into renesas-next)
Merging reset/reset/next (c1267e1afae6 arm64: dts: renesas: rz-smarc: Replace fixed regulator for USB VBUS)
Merging rockchip/for-next (c5d143c77327 Merge branch 'v6.12-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (0c280f9bf41c Merge branch 'next/drivers' into for-next)
Merging scmi/for-linux-next (9deda3a96612 Merge branches 'for-next/juno/updates', 'for-next/scmi/updates' and 'for-next/ffa/updates' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (d9773e09addd riscv: dts: sophgo: Add i2c device support for sg2042)
Merging stm32/stm32-next (1eafc48af859 arm64: stm32: enable scmi regulator for stm32)
Merging sunxi/sunxi/for-next (2873085a8cd5 arm64: dts: allwinner: h700: Add Anbernic RG35XX-SP)
Merging tee/next (cd88a296582c Merge branch 'optee_notif_wait_timeout_for_v6.11' into next)
Merging tegra/for-next (5211d93c551f Merge branch for-6.11/arm64/defconfig into for-next)
Merging thead-dt/thead-dt-for-next (2d98fea7491a riscv: dts: thead: change TH1520 SPI node to use clock controller)
Merging ti/ti-next (140b0b1e6e77 Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (0c559f8a91de drivers: soc: xilinx: add the missing kfree in xlnx_add_cb_for_suspend())
Merging clk/clk-next (96e52588fb2c Merge branch 'clk-mediatek' into clk-next)
Merging clk-imx/for-next (466da3d2d967 clk: imx: composite-7ulp: Use NULL instead of 0)
Merging clk-renesas/renesas-clk (42b54d52ecb7 clk: renesas: Add RZ/V2H(P) CPG driver)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (494b0792d962 LoongArch: KVM: Remove undefined a6 argument comment for kvm_hypercall())
Merging m68k/for-next (21b9e722ad28 m68k: cmpxchg: Fix return value for default case in __arch_xchg())
Merging m68knommu/for-next (47ac09b91bef Linux 6.11-rc4)
Merging microblaze/next (d829e7ee6354 microblaze: Export xmb_manager functions)
Merging mips/mips-next (8400291e289e Linux 6.11-rc1)
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (d173d4d9e831 parisc: Improve monotonic clock_gettime() resolution on SMP machines)
Merging powerpc/next (fa740ca82277 powerpc: Remove useless config comment in asm/percpu.h)
Merging risc-v/for-next (0e3f3649d44b riscv: Enable generic CPU vulnerabilites support)
Merging riscv-dt/riscv-dt-for-next (8400291e289e Linux 6.11-rc1)
Merging riscv-soc/riscv-soc-for-next (8400291e289e Linux 6.11-rc1)
Merging s390/for-next (1baaf1ccf111 Merge branch 'features' into for-next)
Applying: fixup for "s390/mm/ptdump: Generate address marker array dynamically"
Merging sh/for-next (8fe76a1c2264 sh: push-switch: Add missing MODULE_DESCRIPTION() macro)
Merging sparc/for-next (a3da15389112 sparc64: Fix prototype warnings in hibernate.c)
Merging uml/next (98ff534ec2cd um: vector: always reset vp->opened)
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging fs-next (d7cf76b6fd76 next-20240819/vfs-brauner)
Merging printk/for-next (bcc954c6caba printk/panic: Allow cpu backtraces to be written into ringbuffer during panic)
Merging pci/next (79b01efa89b2 Merge branch 'pci/controller/affinity')
Merging pstore/for-next/pstore (a7050ca72480 pstore/ramoops: Fix typo as there is no "reserver")
Merging hid/for-next (3e088ad7ce04 Merge branch 'for-6.12/goodix-spi' into for-next)
Merging i2c/i2c/for-next (e3310fb8dede Merge branch 'i2c/for-current' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (8bc921e413c3 i2c: imx: Switch to RUNTIME_PM_OPS())
Merging i3c/i3c/next (8400291e289e Linux 6.11-rc1)
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (df9686ab8ee9 hwmon: (ntc_thermistor) fix module autoloading)
Merging jc_docs/docs-next (0769a1b7cf30 Documentation: Capitalize Fahrenheit in watchdog-api.rst)
CONFLICT (content): Merge conflict in Documentation/admin-guide/device-mapper/dm-crypt.rst
Merging v4l-dvb/master (31aaa7d95e09 media: cec: cec-adap.c: improve CEC_MSG_FL_REPLY_VENDOR_ID check)
Merging v4l-dvb-next/master (a043ea54bbb9 Merge tag 'next-media-rkisp1-20240814' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git)
Merging pm/linux-next (bb3652b90dba Merge branch 'thermal-core' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (ea24b529e345 cpufreq: Add SM7325 to cpufreq-dt-platdev blocklist)
Merging cpupower/cpupower (76fb981ad677 tools/cpupower: display residency value in idle-info)
Merging devfreq/devfreq-next (1d143dde7679 PM / devfreq: exynos: Use Use devm_clk_get_enabled() helpers)
Merging pmdomain/next (bca1c19f7a07 pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (8400291e289e Linux 6.11-rc1)
Merging thermal/thermal/linux-next (7eeb114a635a dt-bindings: thermal: convert hisilicon-thermal.txt to dt-schema)
Merging rdma/for-next (ec7ad6530909 RDMA/mlx5: Introduce GET_DATA_DIRECT_SYSFS_PATH ioctl)
Merging net-next/main (1bf8e07c382b dt-binding: ptp: fsl,ptp: add pci1957,ee02 compatible string for fsl,enetc-ptp)
Merging bpf-next/for-next (c3d80eaac0a6 Merge branch 'bpf-next/master' into for-next)
CONFLICT (content): Merge conflict in fs/coda/inode.c
Applying: fixup for "introduce fd_file(), convert all accessors to it."
Applying: fixup2 for "introduce fd_file(), convert all accessors to it."
Merging ipsec-next/master (9b49f55838b1 xfrm: Remove documentation WARN_ON to limit return values for offloaded SA)
Merging mlx5-next/mlx5-next (c772a2c69018 net/mlx5: Add IFC related stuff for data direct)
Merging netfilter-next/main (1bf8e07c382b dt-binding: ptp: fsl,ptp: add pci1957,ee02 compatible string for fsl,enetc-ptp)
Merging ipvs-next/main (bbfeba260364 Merge branch 'mlx5-misc-patches-2024-08-08')
Merging bluetooth/master (0553b3a4ef28 dt-bindings: bluetooth: bring the HW description closer to reality for wcn6855)
CONFLICT (content): Merge conflict in drivers/bluetooth/btusb.c
Merging wireless-next/for-next (daaf0dd0398d wifi: mwifiex: keep mwifiex_cfg80211_ops constant)
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath12k/hw.c
Merging ath-next/for-next (94745807f3eb wifi: ath9k_htc: Use __skb_set_length() for resetting urb before resubmit)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (78a0b13f5744 Merge tag 'nand/for-6.11' into mtd/next)
Merging nand/nand/next (a503f91a3645 mtd: rawnand: lpx32xx: Fix dma_request_chan() error checks)
Merging spi-nor/spi-nor/next (b6491eb021e4 mtd: spi-nor: winbond: add Zetta ZD25Q128C support)
Merging crypto/master (8e84a650079a crypto: octeontx2 - Remove custom swap functions in favor of built-in sort swap)
Merging drm/drm-next (a809b92ee0f8 Merge tag 'drm-intel-next-2024-08-13' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device_types.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_submit.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_rtp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
Merging drm-exynos/for-linux-next (627a24f5f25d Merge tag 'amd-drm-fixes-6.11-2024-07-18' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
Merging drm-misc/for-linux-next (64ddf5123eff drm/panel: jd9365da: Modify the init code of Melfas)
Merging amdgpu/drm-next (19cff16559a4 drm/amdgpu: abort KIQ waits when there is a pending reset)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
Applying: fixup for "drm/amdgpu: add per ring reset support (v5)"
Merging drm-intel/for-linux-next (fbc64aafc99b drm/i915: make intel_display_power_domain_str() static)
  dd925902634d ("drm/i915/hdcp: Use correct cp_irq_count")
Merging drm-msm/msm-next (fe34394ecdad dt-bindings: display/msm: dsi-controller-main: Add SM7150)
Merging drm-msm-lumag/msm-next-lumag (399af57ccca2 dt-bindings: display/msm/gpu: fix the schema being not applied)
Merging drm-xe/drm-xe-next (23683061805b drm/xe/lnl: Offload system clear page activity to GPU)
Merging etnaviv/etnaviv/next (704d3d60fec4 drm/etnaviv: don't block scheduler when GPU is still active)
Merging fbdev/for-next (8b05b12e86ff fbdev/hpfb: Fix an error handling path in hpfb_dio_probe())
Merging regmap/for-next (9eeca3012ae6 Merge remote-tracking branch 'regmap/for-6.12' into regmap-next)
Merging sound/for-next (b29ba8f1f942 ALSA: hda/realtek: Convert existing CS35L56 products to use autodetect fixup function)
Merging ieee1394/for-next (9377acc34c13 firewire: ohci: fix error path to detect initiated reset in TI TSB41BA3D phy)
Merging sound-asoc/for-next (64b244c81516 Merge remote-tracking branch 'asoc/for-6.12' into asoc-next)
Merging modules/modules-next (f94ce04e5403 module: Clean up the description of MODULE_SIG_<type>)
Merging input/next (105a0c76fd0c Input: colibri-vf50-ts - make use of the helper function dev_err_probe())
CONFLICT (modify/delete): drivers/input/touchscreen/cyttsp4_core.c deleted in input/next and modified in HEAD.  Version HEAD of drivers/input/touchscreen/cyttsp4_core.c left in tree.
$ git rm -f drivers/input/touchscreen/cyttsp4_core.c
Merging block/for-next (611c88af494f Merge branch 'for-6.12/io_uring' into for-next)
Merging device-mapper/for-next (8dd5000d9dff dm: Remove unused declaration and empty definition "dm_zone_map_bio")
Merging libata/for-next (66afec7c6992 ata: ahci_imx: Fix error code in probe())
Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros)
Merging mmc/next (538076ce6b8d mmc: Merge branch fixes into next)
Merging mfd/for-mfd-next (d94fc0f04121 dt-bindings: mfd: mediatek: Add codec property for MT6357 PMIC)
Merging backlight/for-backlight-next (fea88a13a5d1 backlight: l4f00242t03: Add check for spi_setup)
Merging battery/for-next (8400291e289e Linux 6.11-rc1)
Merging regulator/for-next (88e01f1bd4b9 Merge remote-tracking branch 'regulator/for-6.12' into regulator-next)
Merging security/next (9ee688145434 lockdown: Make lockdown_lsmid static)
Merging apparmor/apparmor-next (8400291e289e Linux 6.11-rc1)
Merging integrity/next-integrity (fa8a4ce432e8 ima: fix buffer overrun in ima_eventdigest_init_common)
Merging selinux/next (05da3fe161e9 Automated merge of 'dev' into 'next')
Merging smack/next (e86cac0acdb1 smack: unix sockets: fix accept()ed socket label)
Merging tomoyo/master (dc1c8034e31b minmax: simplify min()/max()/clamp() implementation)
Merging tpmdd/next (5e1c39cbccba tpm: ibmvtpm: Call tpm2_sessions_init() to initialize session support)
Merging watchdog/master (7c626ce4bae1 Linux 6.11-rc3)
Merging iommu/next (91fe40d93ec3 Merge branches 'fixes', 'amd/amd-vi' and 'core' into next)
Merging audit/next (8400291e289e Linux 6.11-rc1)
Merging devicetree/for-next (ee74817b0d66 ASoC: dt-bindings: serial-midi: reference serial-peripheral-props.yaml)
Merging dt-krzk/for-next (08fd3b6e0df4 Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (a8bd68e4329f mailbox: mtk-cmdq: Move devm_mbox_controller_register() after devm_pm_runtime_enable())
Merging spi/for-next (8670ba25dcdf Merge remote-tracking branch 'spi/for-6.12' into spi-next)
Merging tip/master (81b6ef7427cb Merge branch into tip/master: 'x86/timers')
Merging clockevents/timers/drivers/next (b7625d67eb1a Merge tag 'timers-v6.11-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core)
Merging edac/edac-for-next (090786479325 Merge ras/edac-misc into for-next)
Merging ftrace/for-next (2a07e30c19f3 Merge ring-buffer/for-next)
Merging rcu/next (1e98bce39ad2 rcu/nocb: Remove superfluous memory barrier after bypass enqueue)
Merging paulmck/non-rcu/next (f01f18f2ed7d Merge branches 'cmpxchg.2024.08.06a', 'lkmm.2024.08.02a', 'kcsan.2024.08.01a' and 'misc.2024.08.02a' into HEAD)
Merging kvm/next (15e1c3d65975 KVM: x86: Use this_cpu_ptr() instead of per_cpu_ptr(smp_processor_id()))
Merging kvm-arm/next (1541ef1a8194 Merge branch kvm-arm64/tlbi-fixes-6.12 into kvmarm-master/next)
Merging kvms390/next (7816e58967d0 kvm: s390: Reject memory region operations for ucontrol VMs)
Merging kvm-ppc/topic/ppc-kvm (9739ff4887c7 KVM: PPC: Book3S HV: Refactor HFSCR emulation for KVM guests)
Merging kvm-riscv/riscv_kvm_next (dd4a799bcc13 KVM: riscv: selftests: Fix compile error)
Merging kvm-x86/next (332d2c1d713e crypto: ccp: Add the SNP_VLEK_LOAD command)
Merging xen-tip/linux-next (4c006734898a x86/xen: fix memblock_reserve() usage on PVH)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (7b0b5f2609dc Merge branch 'for-6.12' into for-next)
Merging sched-ext/for-next (89909296a51e sched_ext: Don't use double locking to migrate tasks across CPUs)
Merging drivers-x86/for-next (6c1fa8edfef8 platform/x86: ideapad-laptop: move ACPI helpers from header to source file)
Merging chrome-platform/for-next (a1927fbbf74f platform/chrome: cros_ec_typec: add remove driver hook)
Merging chrome-platform-firmware/for-firmware-next (8400291e289e Linux 6.11-rc1)
Merging hsi/for-next (f02cfe695047 HSI: ssi_protocol: Remove unused linux/gpio.h)
Merging leds-lj/for-leds-next (6eefd65ba6ae leds: pca995x: Use device_for_each_child_node() to access device child nodes)
Merging ipmi/for-next (19a01155ddfe ipmi: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging driver-core/driver-core-next (87ee9981d1f8 Merge 6.11-rc4 into driver-core-next)
Merging usb/usb-next (ca7df2c7bb5f Merge 6.11-rc4 into usb-next)
Merging thunderbolt/next (47ac09b91bef Linux 6.11-rc4)
Merging usb-serial/usb-next (da74a5100a2b USB: serial: drop driver owner initialization)
Merging tty/tty-next (ebbe30f4bba1 Merge 6.11-rc4 into tty-next)
Merging char-misc/char-misc-next (10c8d1bd7865 Merge 6.11-rc4 into char-misc-next)
Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging coresight/next (e6b64cda393e Coresight: Set correct cs_mode for dummy source to fix disable issue)
Merging fastrpc/for-next (590c42d9e278 misc: fastrpc: Add support for cdsp1 remoteproc)
Merging fpga/for-next (8de36789bd03 fpga: zynq-fpga: Rename 'timeout' variable as 'time_left')
Merging icc/icc-next (226e58b20975 Merge branch 'icc-rpmh-qos' into icc-next)
Merging iio/togreg (0f718e10da81 iio: ABI: add missing calibbias attributes)
Merging phy-next/next (c4b09c562086 phy: phy-rockchip-samsung-hdptx: Add clock provider support)
Merging soundwire/next (5aedb8d8336b soundwire: intel_bus_common: enable interrupts before exiting reset)
Merging extcon/extcon-next (e508f2606c0b extcon: Add LC824206XA microUSB switch driver)
Merging gnss/gnss-next (8400291e289e Linux 6.11-rc1)
Merging vfio/next (0756bec2e45b vfio-mdev: add missing MODULE_DESCRIPTION() macros)
Merging w1/for-next (e940ff286ec4 w1: ds2482: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging spmi/spmi-next (7c626ce4bae1 Linux 6.11-rc3)
Merging staging/staging-next (d727f0217ad6 Staging: rtl8192e: Rename variable nSubframe_Length)
Merging counter-next/counter-next (8400291e289e Linux 6.11-rc1)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (0204485c5a1e dt-bindings: fsl-qdma: allow compatible string fallback to fsl,ls1021a-qdma)
Merging cgroup/for-next (d8454758e6e4 Merge branch 'for-6.12' into for-next)
Merging scsi/for-next (580d1a3e1560 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (3ba963597d19 scsi: ufs: ufshcd-pltfrm: Signedness bug in ufshcd_parse_clock_info())
Merging vhost/linux-next (d820e8fcea38 net: virtio: unify code to init stats)
Merging rpmsg/for-next (1a491aaf1d1c Merge branches 'rproc-next', 'rpmsg-next' and 'hwspinlock-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (88d8a3082a94 Merge tag 'ib-mfd-gpio-pwm-v6.12' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/lee/mfd into gpio/for-next)
Merging gpio-intel/for-next (8400291e289e Linux 6.11-rc1)
Merging pinctrl/for-next (6fb214cdf7df Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (47ac09b91bef Linux 6.11-rc4)
Merging pinctrl-renesas/renesas-pinctrl (f73f63b24491 pinctrl: renesas: rzg2l: Use dev_err_probe())
Merging pinctrl-samsung/for-next (e61f1a729da8 pinctrl: samsung: Add support for pull-up and pull-down)
Merging pwm/pwm/for-next (861a4272660a pwm: lp3943: Fix an incorrect type in lp3943_pwm_parse_dt())
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (41f37c852ac3 selftests/ftrace: Add required dependency for kprobe tests)
Merging kunit/test (8400291e289e Linux 6.11-rc1)
Merging kunit-next/kunit (8400291e289e Linux 6.11-rc1)
Merging livepatching/for-next (9871e6af43db Merge branch 'for-6.11/sysfs-patch-replace' into for-next)
Merging rtc/rtc-next (04dcadb87da6 rtc: stm32: add alarm A out feature)
Merging nvdimm/libnvdimm-for-next (b0d478e34dbf testing: nvdimm: Add MODULE_DESCRIPTION() macros)
Merging at24/at24/for-next (36e071d2a152 dt-bindings: eeprom: at24: Add compatible for Giantec GT24C04A)
Merging ntb/ntb-next (92aee2f6d156 NTB: ntb_transport: fix all kernel-doc warnings)
Merging seccomp/for-next/seccomp (de9c2c66ad8e Linux 6.11-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (9b6e704955fa slimbus: generate MODULE_ALIAS() from MODULE_DEVICE_TABLE())
Merging nvmem/for-next (a94699fa406d MAINTAINERS: Update path for U-Boot environment variables YAML)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (8400291e289e Linux 6.11-rc1)
Merging kgdb/kgdb/for-next (9bccbe7b2087 kdb: Get rid of redundant kdb_curr_task())
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (8400291e289e Linux 6.11-rc1)
Merging mhi/mhi-next (65bc58c3dcad net: wwan: mhi: make default data link id configurable)
Merging memblock/for-next (cb088e38aab4 s390/mm: get estimated free pages by memblock api)
CONFLICT (rename/delete): tools/testing/radix-tree/linux/init.h renamed to tools/testing/shared/linux/init.h in HEAD, but deleted in memblock/for-next.
$ git rm -f tools/testing/shared/linux/init.h
Merging cxl/next (a0328b397f33 cxl/core/pci: Move reading of control register to immediately before usage)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4a2ebb082297 efi: Replace efi_memory_attributes_table_t 0-sized array with flexible array)
Merging unicode/for-next (68318904a775 unicode: add MODULE_DESCRIPTION() macros)
Merging slab/slab/for-next (248081776627 Merge branch 'slab/for-6.12/rcu_barriers' into slab/for-next)
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Merging random/master (c86927f528a8 selftests/vDSO: don't #include sodium header in chacha test)
Merging landlock/next (ad1b27fc9877 Landlock: Document LANDLOCK_SCOPED_ABSTRACT_UNIX_SOCKET and ABI versioning)
Merging rust/rust-next (e26fa546042a rust: kbuild: auto generate helper exports)
Merging sysctl/sysctl-next (acc154691fc7 sysctl: Warn on an empty procname element)
Merging execve/for-next/execve (44f65d900698 binfmt_elf: mseal address zero)
CONFLICT (content): Merge conflict in fs/binfmt_elf.c
Merging bitmap/bitmap-for-next (54c9e0085bd1 nodemask: Switch from inline to __always_inline)
Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro)
Merging kspp/for-next/kspp (05269aaef889 Merge branches 'for-next/hardening' and 'for-linus/hardening' into for-next/kspp)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (8400291e289e Linux 6.11-rc1)
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4be8b00b2b0f iommufd: Reorder include files)
CONFLICT (content): Merge conflict in drivers/iommu/iommufd/selftest.c
Merging turbostat/next (75879bd898ee tools/power turbostat: fix GCC9 build regression)
Merging pwrseq/pwrseq/for-next (b8e4b0529d59 power: sequencing: qcom-wcn: add support for the WCN6855 PMU)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: Tree for Aug 20
@ 2021-08-20  9:26 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2021-08-20  9:26 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 38500 bytes --]

Hi all,

Changes since 20210819:

The net-next tree still had its build failure for which I applied a patch.

The drm tree gained a semantic conflict against the kbuild tree.

The ftrace tree gained a conflict against the jc_docs tree.

The drivers-x86 tree gained a build failure so I used the version from
next-20210819.

The driver-core tree gained a conflict against the pci-current tree.

Non-merge commits (relative to Linus' tree): 8514
 8252 files changed, 481311 insertions(+), 196532 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 334 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 (f87d64319e6f Merge tag 'net-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging fixes/fixes (614124bea77e Linux 5.13-rc5)
Merging kbuild-current/fixes (36a21d51725a Linux 5.14-rc5)
Merging arc-current/for-curr (7c60610d4767 Linux 5.14-rc6)
Merging arm-current/fixes (463dbba4d189 ARM: 9104/2: Fix Keystone 2 kernel mapping regression)
Merging arm64-fixes/for-next/fixes (bde8fff82e4a arm64: initialize all of CNTHCTL_EL2)
Merging arm-soc-fixes/arm/fixes (1e16a4021120 Merge tag 'omap-for-v5.14/gpt12-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes)
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 (9f7853d7609d powerpc/mm: Fix set_memory_*() against concurrent accesses)
Merging s390-fixes/fixes (2a671f77ee49 s390/pci: fix use after free of zpci_dev)
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 (f87d64319e6f Merge tag 'net-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bpf/master (316749009fdf Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
Merging ipsec/master (480e93e12aa0 net: xfrm: Fix end of loop tests for list_for_each_entry)
Merging netfilter/master (e3245a7b7b34 netfilter: nft_ct: protect nft_ct_pcpu_template_refcnt with mutex)
Merging ipvs/master (269fc69533de netfilter: nfnetlink_hook: translate inet ingress to netdev)
Merging wireless-drivers/master (abf3d98dee7c mt76: fix enum type mismatch)
Merging mac80211/master (0a298d133893 net: qlcnic: add missed unlock in qlcnic_83xx_flash_read32)
Merging rdma-fixes/for-rc (17f2569dce18 RDMA/bnxt_re: Add missing spin lock initialization)
Merging sound-current/for-linus (65ca89c2b12c ASoC: intel: atom: Fix breakage for PCM buffer address setup)
Merging sound-asoc-fixes/for-linus (70212c4c657f Merge remote-tracking branch 'asoc/for-5.14' into asoc-linus)
Merging regmap-fixes/for-linus (ff1176468d36 Linux 5.14-rc3)
Merging regulator-fixes/for-linus (3f00f451f6d1 Merge remote-tracking branch 'regulator/for-5.14' into regulator-linus)
Merging spi-fixes/for-linus (80b3a9808557 Merge remote-tracking branch 'spi/for-5.14' into spi-linus)
Merging pci-current/for-linus (045a9277b561 PCI/sysfs: Use correct variable for the legacy_mem sysfs object)
Merging driver-core.current/driver-core-linus (36a21d51725a Linux 5.14-rc5)
Merging tty.current/tty-linus (36a21d51725a Linux 5.14-rc5)
Merging usb.current/usb-linus (5571ea3117ca usb: typec: tcpm: Fix VDMs sometimes not being forwarded to alt-mode drivers)
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (8da0e55c7988 USB: serial: ftdi_sio: add device ID for Auto-M3 OP-COM v2)
Merging usb-chipidea-fixes/for-usb-fixes (5df09c15bab9 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 (7c60610d4767 Linux 5.14-rc6)
Merging iio-fixes/fixes-togreg (a5056c0bc24f Merge tag 'iio-fixes-5.14a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (d30836a95289 Merge tag 'icc-5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-linus)
Merging soundwire-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
Merging thunderbolt-fixes/fixes (7c60610d4767 Linux 5.14-rc6)
Merging input-current/for-linus (818b26588994 Merge branch 'next' into for-linus)
Merging crypto-current/master (5261cdf457ce crypto: drbg - select SHA512)
Merging vfio-fixes/for-linus (dc51ff91cf2d vfio/platform: fix module_put call in error flow)
Merging kselftest-fixes/fixes (567c39047dbe selftests/sgx: Fix Q1 and Q2 calculation in sigstruct.c)
Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section())
Merging dmaengine-fixes/fixes (7199ddede9f0 dmaengine: imx-dma: configure the generic DMA type to make it work)
Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
Merging mtd-fixes/mtd/fixes (b48027083a78 mtd: rawnand: Fix probe failure due to of_get_nand_secure_regions())
Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
Merging v4l-dvb-fixes/fixes (f1de1c780359 media: atmel: fix build when ISC=m and XISC=y)
Merging reset-fixes/reset/fixes (1435f82689e1 reset: RESET_MCHP_SPARX5 should depend on ARCH_SPARX5)
Merging mips-fixes/mips-fixes (6aa32467299e MIPS: check return value of pgtable_pmd_page_ctor)
Merging at91-fixes/at91-fixes (6efb943b8616 Linux 5.13-rc1)
Merging omap-fixes/fixes (e879f855e590 bus: ti-sysc: Add break in switch statement in sysc_init_soc())
Merging kvm-fixes/master (c7dfa4009965 KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656))
Merging kvms390-fixes/master (cd4220d23bf3 KVM: selftests: do not require 64GB in set_memory_region_test)
Merging hwmon-fixes/hwmon (03726fd90f4b hwmon: sht4x: update Documentation for Malformed table)
Merging nvdimm-fixes/libnvdimm-fixes (96dcb97d0a40 Merge branch 'for-5.14/dax' into libnvdimm-fixes)
Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing)
Merging btrfs-fixes/next-fixes (01e9fcf19c13 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 (1e35b8a7780a platform/x86: gigabyte-wmi: add support for B450M S2H V2)
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 (40d32727931c scsi: mpt3sas: Fix incorrectly assigned error return and check)
Merging drm-fixes/drm-fixes (7c60610d4767 Linux 5.14-rc6)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (e3e86f41385b drm/i915/dp: remove superfluous EXPORT_SYMBOL())
Merging mmc-fixes/fixes (419dd626e357 mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN on BCM2711)
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 (c1e64c0aec8c soc: fsl: qe: fix static checker warning)
Merging risc-v-fixes/fixes (fdf3a7a1e0a6 riscv: Fix comment regarding kernel mapping overlapping with IS_ERR_VALUE)
Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
Merging fpga-fixes/fixes (1d345c3e5941 fpga: machxo2-spi: Fix missing error code in machxo2_write_complete())
Merging spdx/spdx-linus (36a21d51725a Linux 5.14-rc5)
Merging gpio-brgl-fixes/gpio/for-current (9b87f43537ac gpio: tqmx86: really make IRQ optional)
Merging gpio-intel-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
Merging pinctrl-intel-fixes/fixes (2f658f7a3953 pinctrl: tigerlake: Fix GPIO mapping for newer version of software)
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 (fa0b1ef5f7a6 drm: Copy drm_wait_vblank to user before returning)
Merging kspp-gustavo/for-next/kspp (7bc04ce6b914 Makefile: Enable -Wimplicit-fallthrough for Clang)
Merging kbuild/for-next (fb3fdea45030 kbuild: Fix 'no symbols' warning when CONFIG_TRIM_UNUSD_KSYMS=y)
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 (c1dec343d7ab hexagon: use the generic global coherent pool)
Merging asm-generic/master (8f76f9c46952 bitops/non-atomic: make @nr unsigned to avoid any DIV)
Merging arc/for-next (28bfbfd7a713 ARC: mm: move MMU specific bits out of entry code ...)
Merging arm/for-next (3e9a47a71364 Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (92b5529ab76e Merge branch 'for-next/entry' into for-next/core)
Merging arm-perf/for-next/perf (fd264b310579 arm64/perf: Replace '0xf' instances with ID_AA64DFR0_PMUVER_IMP_DEF)
Merging arm-soc/for-next (4364229fd558 soc: document merges)
Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
Merging amlogic/for-next (6285af2a2821 Merge tags 'amlogic-arm-configs-for-v5.15', 'amlogic-arm64-dt-for-v5.15' and 'amlogic-arm-dt-for-v5.15' into for-next)
Merging aspeed/for-next (0f32f00af344 Merge branches 'dt-for-v5.15', 'soc-for-v5.15' and 'defconfig-for-v5.15' into for-next)
Merging at91/at91-next (b102356e5bc1 Merge branch 'at91-dt' into at91-next)
Merging drivers-memory/for-next (c28b584deb1b Merge branch 'for-v5.15/omap-gpmc' into for-next)
Merging imx-mxs/for-next (2cb411d89676 Merge branch 'imx/defconfig' 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 (7911f95d1713 Merge branch 'fixes' into for-next)
Merging qcom/for-next (57249830120b Merge remote-tracking branch 'refs/remotes/origin/for-next' into for-next)
Merging raspberrypi/for-next (b1f2fcb28228 ARM: dts: bcm283x: Fix VEC address for BCM2711)
Merging renesas/next (59d7f78144a8 Merge branches 'renesas-arm-dt-for-v5.15' and 'renesas-drivers-for-v5.15' into renesas-next)
Merging reset/reset/next (bee08559701f reset: renesas: Add RZ/G2L usbphy control driver)
Merging rockchip/for-next (abfe14de9197 Merge branch 'v5.15-armsoc/drivers' into for-next)
Merging samsung-krzk/for-next (90861bf54255 Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (7c414a7d93c6 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 (1e6bc5987a52 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 (cc701ccede61 Merge branch for-5.15/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 (c1fa5ac6c2f4 arm64: dts: ti: k3-am642-sk: Add pwm nodes)
Merging xilinx/for-next (4cddd9be7ef6 Merge branch 'zynq/soc' of https://github.com/Xilinx/linux-xlnx into for-next)
Merging clk/clk-next (765f4fa0e9f1 Merge branch 'clk-qcom' into clk-next)
Merging clk-imx/for-next (fb3f4bca19b3 clk: imx: clk-divider-gate: Switch to clk_divider.determine_rate)
Merging clk-renesas/renesas-clk (e8425dd55abb clk: renesas: Make CLK_R9A06G032 invisible)
Merging clk-samsung/for-next (a38fd8748464 Linux 5.12-rc2)
Merging csky/linux-next (90dc8c0e664e csky: Kconfig: Remove unused selects)
Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs)
Merging m68k/for-next (2189e928b62e m68k: Fix invalid RMW_INSNS on CPUs that lack CAS)
Merging m68knommu/for-next (07c4e80124d1 m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch)
Merging microblaze/next (14a832498c23 arch: microblaze: Fix spelling mistake "vesion" -> "version")
Merging mips/mips-next (4d2ee1be4c2a MIPS: generic: Return true/false (not 1/0) from bool functions)
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 (94effcedaa54 openrisc: Fix compiler warnings in setup)
Merging parisc-hd/for-next (ca2b19a4bdb6 parisc: Increase gcc stack frame check to 2048 for 32- and 64-bit)
Merging powerpc/next (8b893ef190b0 powerpc/pseries: Fix build error when NUMA=n)
CONFLICT (content): Merge conflict in arch/powerpc/sysdev/xive/common.c
Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver)
Merging risc-v/for-next (8ba1a8b77ba1 riscv: Support allocating gigantic hugepages using CMA)
Merging s390/for-next (54157006715d Merge branch 'features' 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 (7b7cec477fc3 xtensa: move core-y in arch/xtensa/Makefile to arch/xtensa/Kbuild)
Merging pidfd/for-next (f4dd02cd8631 Merge branch 'kernel.sys' into for-next)
Merging fscrypt/master (38ef66b05cfa fscrypt: document struct fscrypt_operations)
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 (b61bdbb49be3 Merge branch 'for-next-next-v5.14-20210817' into for-next-20210817)
Merging ceph/master (8434ffe71c87 ceph: take snap_empty_lock atomically with snaprealm refcount change)
Merging cifs/for-next (1c2809b3d6e6 cifs: fix wrong release in sess_alloc_buffer() failed path)
Merging cifsd/cifsd-for-next (bdbb7400523b Merge pull request #65 from namjaejeon/cifsd-for-next)
Merging configfs/for-next (769f52676756 configfs: restore the kernel v5.13 text attribute write behavior)
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 (eadcd6b5a1eb erofs: add fiemap support with iomap)
Merging exfat/dev (50be9417e23a Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block)
Merging ext3/for_next (a95dc17633ab Pull utf8 handling fixes from Pali Rohar)
Merging ext4/dev (6c6ce4d71465 jbd2: add sparse annotations for add_transaction_credits())
Merging f2fs/dev (bbe1da7e34ac f2fs: compress: do sanity check on cluster)
Applying: fxup for "f2fs: Convert to using invalidate_lock"
Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
Merging fuse/for-next (76224355db75 fuse: truncate pagecache on atomic_o_trunc)
Merging gfs2/for-next (98fd6514d37b gfs2: Remove redundant check from gfs2_glock_dq)
Merging jfs/jfs-next (5d299f44d765 jfs: Avoid field-overflowing memcpy())
Merging nfs/linux-next (2734d6c1b1a0 Linux 5.14-rc2)
Merging nfs-anna/linux-next (ca7d1d1a0b97 NFSv4.2: remove restriction of copy size for inter-server copy.)
Merging nfsd/nfsd-next (ab1016d39cc0 nfsd: fix NULL dereference in nfs3svc_encode_getaclres)
Merging cel/for-next (729580ddc53e svcrdma: xpt_bc_xprt is already clear in __svc_rdma_free())
Merging ntfs3/master (96b18047a717 fs/ntfs3: Add MAINTAINERS)
Merging orangefs/for-next (0fdec1b3c9fb orangefs: fix orangefs df output.)
Merging overlayfs/overlayfs-next (332f606b32b6 ovl: enable RCU'd ->get_acl())
Applying: ntfs3: fix up for "vfs: add rcu argument to ->get_acl() callback"
Merging ubifs/next (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode)
Merging v9fs/9p-next (732b33d0dbf1 9p/xen: Fix end of loop tests for list_for_each_entry)
Merging xfs/for-next (a437b9b488e3 xfs: remove support for untagged lookups in xfs_icwalk*)
Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check)
Merging iomap/iomap-for-next (742dd4b8c5bb mm/swap: consider max pages in iomap_swapfile_add_extent)
Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID)
Merging file-locks/locks-next (e1cc6e8c1969 fcntl: fix potential deadlock for &fasync_struct.fa_lock)
Merging vfs/for-next (d75b9fa053e4 gfs2: Switch to may_setattr in gfs2_setattr)
Merging printk/for-next (23d8adcf8022 Merge branch 'rework/printk_safe-removal' into for-next)
Merging pci/next (7fc74df20a87 Merge branch 'remotes/lorenzo/pci/tools')
Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long)
Merging hid/for-next (e2e4893180f3 Merge branch 'for-5.14/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (ec1127b4dd61 Merge branch 'i2c/for-mergewindow' into i2c/for-next)
CONFLICT (content): Merge conflict in include/uapi/linux/virtio_ids.h
Merging i3c/i3c/next (e73f0f0ee754 Linux 5.14-rc1)
Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved)
Merging hwmon-staging/hwmon-next (b51f752c586c hwmon: (dell-smm) Rework SMM function debugging)
Merging jc_docs/docs-next (37397b092e7f docs: sphinx-requirements: Move sphinx_rtd_theme to top)
Merging v4l-dvb/master (9c3a0f285248 Merge tag 'v5.14-rc4' into media_tree)
Merging v4l-dvb-next/master (19e95228c722 media: netup_unidvb: handle interrupt properly according to the firmware)
Merging pm/linux-next (10bc7fbefe3a Merge branch 'pm-cpufreq-fixes' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (86afc1df661a cpufreq: qcom-cpufreq-hw: Add dcvs interrupt support)
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 (e122d7edf1a2 dt-bindings: opp: Convert to DT schema)
Merging thermal/thermal/linux-next (0284b52e8534 dt-bindings: thermal: Add dt binding for QCOM LMh)
Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
Merging dlm/next (aee742c9928a fs: dlm: fix return -EINTR on recovery stopped)
Merging swiotlb/linux-next (a449ffaf9181 powerpc/svm: Don't issue ultracalls if !mem_encrypt_active())
CONFLICT (content): Merge conflict in kernel/dma/direct.c
Merging rdma/for-next (d2b10794fc13 RDMA/core: Create clean QP creations interface for uverbs)
Merging net-next/master (9e5f10fe577b octeontx2-af: remove redudant second error check on variable err)
CONFLICT (content): Merge conflict in drivers/ptp/Kconfig
Applying: NET_VENDOR_CIRRUS is not ready for COMPILE_TEST
Merging bpf-next/for-next (f2a6ee924d26 selftests/bpf: Add tests for {set|get} socket option from setsockopt BPF)
Merging ipsec-next/master (5d8dbb7fb82b net: xfrm: fix shift-out-of-bounce)
Merging mlx5-next/mlx5-next (598fe77df855 net/mlx5: Lag, Create shared FDB when in switchdev mode)
Merging netfilter-next/master (6f45933dfed0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next)
Merging ipvs-next/master (9344988d2979 netfilter: ctnetlink: allow to filter dump by status bits)
Merging wireless-drivers-next/master (d249ff28b1d8 intersil: remove obsolete prism54 wireless driver)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging bluetooth/master (61969ef867d4 Bluetooth: Fix return value in hci_dev_do_close())
CONFLICT (content): Merge conflict in net/bluetooth/hci_sysfs.c
CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c
CONFLICT (content): Merge conflict in include/net/bluetooth/hci_core.h
Merging mac80211-next/master (c448f0fd2ce5 cfg80211: fix BSS color notify trace enum confusion)
Merging mtd/mtd/next (a89d69a44e28 mtd: mtdconcat: Check _read, _write callbacks existence before assignment)
Merging nand/nand/next (0792ec82175e mtd: rawnand: intel: Fix error handling in probe)
Merging spi-nor/spi-nor/next (2734d6c1b1a0 Linux 5.14-rc2)
Merging crypto/master (9491923e4a68 crypto: wp512 - correct a non-kernel-doc comment)
Merging drm/drm-next (397ab98e2d69 Merge tag 'drm-msm-next-2021-08-12' of https://gitlab.freedesktop.org/drm/msm into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/dp/dp_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c
CONFLICT (modify/delete): drivers/gpu/drm/i915/i915_globals.c deleted in drm/drm-next and modified in HEAD. Version HEAD of drivers/gpu/drm/i915/i915_globals.c left in tree.
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
CONFLICT (content): Merge conflict in drivers/firmware/Makefile
$ git rm -f drivers/gpu/drm/i915/i915_globals.c
Merging drm-misc/for-linux-next (d03a493f6782 drm/mgag200: Fix uninitialized variable delta)
Merging amdgpu/drm-next (06a631a08050 drm/radeon: Add HD-audio component notifier support (v2))
Merging drm-intel/for-linux-next (c00e14cd4d3f drm/i915/adl_p: Also disable underrun recovery with MSO)
Merging drm-tegra/drm/tegra/for-next (fed028939417 gpu: host1x: debug: Dump DMASTART and DMAEND register)
Merging drm-msm/msm-next (cb0927ab80d2 drm/msi/mdp4: populate priv->kms in mdp4_kms_init)
Merging imx-drm/imx-drm/next (59e4e762a17d gpu: ipu-v3: Fix i.MX IPU-v3 offset calculations for (semi)planar U/V formats)
Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function)
Applying: drm/i915: use linux/stddef.h due to "isystem: trim/fixup stdarg.h and other headers"
Merging regmap/for-next (cc15156265f0 Merge remote-tracking branch 'regmap/for-5.15' into regmap-next)
Merging sound/for-next (d2d837563743 ALSA: hda/analog - Sink ad198x_shutup() and shuffle CONFIG_PM guards)
Merging sound-asoc/for-next (dc392f00eb58 Merge remote-tracking branch 'asoc/for-5.15' into asoc-next)
Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer)
Merging input/next (76ba1900cb67 dt-bindings: power: reset: qcom-pon: Convert qcom PON binding to yaml)
Merging block/for-next (39916d4054e7 Merge branch 'for-5.15/io_uring' into for-next)
CONFLICT (modify/delete): block/mq-deadline-cgroup.c deleted in HEAD and modified in block/for-next. Version block/for-next of block/mq-deadline-cgroup.c left in tree.
$ git rm -f block/mq-deadline-cgroup.c
Merging device-mapper/for-next (528b16bfc3ae dm crypt: Avoid percpu_counter spinlock contention in crypt_page_alloc())
Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug)
Merging mmc/next (7d6fab2c3ea8 mmc: renesas_sdhi: Refactor renesas_sdhi_probe())
Merging mfd/for-mfd-next (be722576fd63 dt-bindings: mfd: Add Broadcom CRU)
Merging backlight/for-backlight-next (79fad92f2e59 backlight: pwm_bl: Improve bootloader/kernel device handover)
Merging battery/for-next (eaa2c490514d power: supply: max17042_battery: log SOC threshold using debug log level)
Merging regulator/for-next (aa9f92097dcc 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 (d07eeeb87459 Merge branch 'restrict-digest-alg-v8' into next-integrity)
Applying: dm ima: fix for "ima: Add digest and digest_len params to the functions to measure a buffer"
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 (ff1176468d36 Linux 5.14-rc3)
Merging tpmdd/next (ada16d6b0f0a tpm: ibmvtpm: Avoid error message when process gets signal while waiting)
Merging watchdog/master (cf813c67d961 watchdog: iTCO_wdt: use dev_err() instead of pr_err())
Merging iommu/next (cf1f65a86d45 Merge branches 'apple/dart', 'arm/smmu', 'iommu/fixes', 'x86/amd' and 'x86/vt-d' into next)
Merging audit/next (d97e99386ad0 audit: add header protection to kernel/audit.h)
Merging devicetree/for-next (ec6c6c9c1386 dt-bindings: eeprom-93xx46: Convert to json schema)
CONFLICT (modify/delete): Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt deleted in devicetree/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt left in tree.
$ git rm -f Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
Applying: dt-bindings: arm: mediatek: mmsys: fixup for conversion to yaml
Merging mailbox/mailbox-for-next (4f197188da66 MAINTAINERS: add entry for polarfire soc mailbox)
Merging spi/for-next (5d14499b5016 Merge remote-tracking branch 'spi/for-5.15' into spi-next)
Merging tip/auto-latest (a27fdfde0570 Merge branch 'locking/core')
CONFLICT (content): Merge conflict in include/asm-generic/bitops/non-atomic.h
Merging clockevents/timers/drivers/next (631c7c0df0ef dt-bindings: timer: Add ABIs for new Ingenic SoCs)
Merging edac/edac-for-next (7d07deb3b838 EDAC/altera: Skip defining unused structures for specific configs)
Merging irqchip/irq/irqchip-next (cf39e60c83f1 Merge branch irq/generic_handle_domain_irq into irq/irqchip-next)
Merging ftrace/for-next (db396be6ddc4 MAINTAINERS: Add an entry for os noise/latency)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging rcu/rcu/next (213605c149ff kcsan: selftest: Cleanup and add missing __init)
CONFLICT (content): Merge conflict in kernel/time/tick-internal.h
Merging kvm/next (5a4bfabcc865 KVM: SVM: Add 5-level page table support for SVM)
Merging kvm-arm/next (f2267b87ecd5 Merge branch kvm-arm64/misc-5.15 into kvmarm-master/next)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/sysreg.h
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 (88ca2521bd5b xen/events: Fix race in set_evtchn_to_irq)
Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next)
Merging workqueues/for-next (bdb0a6548d22 workqueue: Remove unused WORK_NO_COLOR)
Merging drivers-x86/for-next (c58259bc83a2 asus-wmi: Add support for platform_profile)
$ git reset --hard HEAD^
Merging next-20210819 version of drivers-x86
Merging chrome-platform/for-next (e73f0f0ee754 Linux 5.14-rc1)
Merging hsi/for-next (e73f0f0ee754 Linux 5.14-rc1)
Merging leds/for-next (3d3d65bd2764 leds: pwm: add support for default-state device property)
Merging ipmi/for-next (bf064c7bec3b char: ipmi: use DEVICE_ATTR helper macro)
Merging driver-core/driver-core-next (bd1e336aa853 driver core: platform: Remove platform_device_add_properties())
CONFLICT (content): Merge conflict in drivers/pci/pci-sysfs.c
Merging usb/usb-next (e4788edc730a USB: EHCI: Add alias for Broadcom INSNREG)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/sc7280.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/sc7280-idp.dts
Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial/usb-next (4e9340bb551a USB: serial: cp210x: determine fw version for CP2105 and CP2108)
Merging usb-chipidea-next/for-usb-next (956df1bb0ab8 usb: chipidea: host: fix port index underflow and UBSAN complains)
Merging tty/tty-next (88c1d2478ec8 tty: serial: fsl_lpuart: check dma_tx_in_progress in tx dma callback)
Merging char-misc/char-misc-next (b2159182dd49 lkdtm: remove IDE_CORE_CP crashpoint)
Merging extcon/extcon-next (07de34f5ce1e extcon: max3355: Drop unused include)
Merging phy-next/next (34633219b894 phy: qmp: Provide unique clock names for DP clocks)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
Merging soundwire/next (dd81e7c3f0bb soundwire: cadence: override PDI configurations to create loopback)
Merging thunderbolt/next (42716425ad7e thunderbolt: Fix port linking by checking all adapters)
Merging vfio/next (eb24c1007e68 vfio: Remove struct vfio_device_ops open/release)
Merging staging/staging-next (093991aaadf0 staging: r8188eu: Remove empty rtw_mfree_xmit_priv_lock())
CONFLICT (modify/delete): drivers/staging/rtl8188eu/os_dep/os_intfs.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8188eu/os_dep/os_intfs.c left in tree.
CONFLICT (modify/delete): drivers/staging/rtl8188eu/os_dep/ioctl_linux.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8188eu/os_dep/ioctl_linux.c left in tree.
CONFLICT (modify/delete): drivers/staging/rtl8188eu/include/osdep_intf.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8188eu/include/osdep_intf.h left in tree.
CONFLICT (content): Merge conflict in drivers/staging/r8188eu/os_dep/rtw_android.c
CONFLICT (content): Merge conflict in drivers/staging/r8188eu/include/rtw_android.h
CONFLICT (content): Merge conflict in drivers/misc/Kconfig
$ git rm -f drivers/staging/rtl8188eu/include/osdep_intf.h drivers/staging/rtl8188eu/os_dep/ioctl_linux.c drivers/staging/rtl8188eu/os_dep/os_intfs.c
Merging iio/togreg (d484c21bacfa iio: adc: Add driver for Renesas RZ/G2L A/D converter)
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 (8bf5d31c4f06 interconnect: qcom: osm-l3: Use driver-specific naming)
Merging dmaengine/next (9760383b22ed Merge tag 'v5.14-rc5' into next)
Merging cgroup/for-next (c5b6c8a56ef3 Merge branch 'for-5.15' into for-next)
Merging scsi/for-next (52e22d4d4e37 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (848ade90ba9c scsi: sd: Do not exit sd_spinup_disk() quietly)
Merging vhost/linux-next (879753c816db vdpa/mlx5: Fix queue type selection logic)
Merging rpmsg/for-next (c93ca5f21d93 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 (d0ef631d40ba gpio: mlxbf2: Use DEFINE_RES_MEM_NAMED() helper macro)
Merging gpio-intel/for-next (5111c2b6b019 gpio: dwapb: Get rid of legacy platform data)
Merging pinctrl/for-next (04853352952b Merge tag 'samsung-pinctrl-5.15' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung into devel)
Merging pinctrl-intel/for-next (2f658f7a3953 pinctrl: tigerlake: Fix GPIO mapping for newer version of software)
Merging pinctrl-renesas/renesas-pinctrl (c4c4637eb57f pinctrl: renesas: Add RZ/G2L pin and gpio controller driver)
Merging pinctrl-samsung/for-next (cdd3d945dcec pinctrl: samsung: Add Exynos850 SoC specific data)
Merging pwm/for-next (7954f76161ea pwm: ab8500: Fix register offset calculation to not depend on probe order)
Merging userns/for-next (534471c614f8 Merge of ucount-fixes-for-5.14, and siginfo-si_trapno-for-v5.15 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 (2734d6c1b1a0 Linux 5.14-rc2)
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 (8158da6a33f2 dt-bindings: rtc: add Epson RX-8025 and RX-8035)
Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next)
Merging at24/at24/for-next (658ae44345c1 dt-bindings: at24: add ON Semi CAT24C04 and CAT24C05)
Merging ntb/ntb-next (28293b6c68cd ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data)
Merging seccomp/for-next/seccomp (b4d8a58f8dcf seccomp: Fix setting loaded filter count during TSYNC)
Merging kspp/for-next/kspp (b88972649fa0 lib/test_stackinit: Add assigned initializers)
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 (80c3356bea4e nvmem: nintendo-otp: Add new driver for the Wii and Wii U OTP)
Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1)
Merging hyperv/hyperv-next (7aff79e297ee Drivers: hv: Enable Hyper-V code to be built on ARM64)
Merging auxdisplay/auxdisplay (24ebc044c72e auxdisplay: Replace symbolic permissions with octal permissions)
Merging kgdb/kgdb/for-next (e868f0a3c4b9 kdb: Rename members of struct kdbtab_t)
Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1)
Merging fpga/for-next (4f45f3404960 spi: spi-altera-dfl: support n5010 feature revision)
Merging kunit/test (e73f0f0ee754 Linux 5.14-rc1)
Merging cfi/cfi/next (ff1176468d36 Linux 5.14-rc3)
Merging kunit-next/kunit (acd8e8407b8f kunit: Print test statistics on failure)
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 (ceeb0da0a032 cxl/mem: Adjust ram/pmem range to represent DPA ranges)
Merging folio/for-next (1a90e9dae32c mm/writeback: Add folio_write_one)
CONFLICT (content): Merge conflict in mm/util.c
CONFLICT (content): Merge conflict in mm/rmap.c
CONFLICT (content): Merge conflict in mm/filemap.c
Merging akpm-current/current (2832d098abfd ipc: replace costly bailout check in sysvipc_find_ipc())
CONFLICT (content): Merge conflict in mm/page-writeback.c
CONFLICT (content): Merge conflict in mm/memcontrol.c
CONFLICT (content): Merge conflict in include/linux/units.h
CONFLICT (content): Merge conflict in include/linux/sched.h
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 (652afd45cf13 arch: remove compat_alloc_user_space)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: Tree for Aug 20
@ 2020-08-20  5:55 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2020-08-20  5:55 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 33589 bytes --]

Hi all,

Changes since 20200819:

New tree: ti-k3-new

My fixes tree contains:

  73c7adb54169 ("device_cgroup: Fix RCU list debugging warning")

The dma-mapping tree caused my qemu test boot to fail so I reverted
a commit.

I applied a supplied patch for a runtime fault to the selinux tree.

The rcu tree lost its build failure.

The pinctrl-intel tree gained a build failure so I used the version
from next-20200819.

The mhi tree lost its failures.

Non-merge commits (relative to Linus' tree): 1787
 3241 files changed, 56930 insertions(+), 22206 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 328 trees (counting Linus' and 86 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 (18445bf405cb Merge tag 'spi-fix-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
Merging fixes/master (73c7adb54169 device_cgroup: Fix RCU list debugging warning)
Merging kbuild-current/fixes (66c262be8f50 kconfig: qconf: remove unused colNr)
Merging arc-current/for-curr (97363c07f023 ARC: show_regs: fix r12 printing and simplify)
Merging arm-current/fixes (5c6360ee4a0e ARM: 8988/1: mmu: fix crash in EFI calls due to p4d typo in create_mapping_late())
Merging arm64-fixes/for-next/fixes (6a7389f0312f MAINTAINERS: Include drivers subdirs for ARM PMU PROFILING AND DEBUGGING entry)
Merging arm-soc-fixes/arm/fixes (fe1d899f4212 ARM: dts: keystone-k2g-evm: fix rgmii phy-mode for ksz9031 phy)
Merging uniphier-fixes/fixes (48778464bb7d Linux 5.8-rc2)
Merging drivers-memory-fixes/fixes (7ff3a2a626f7 memory: jz4780_nemc: Fix an error pointer vs NULL check in probe())
Merging m68k-current/for-linus (382f429bb559 m68k: defconfig: Update defconfigs for v5.8-rc3)
Merging powerpc-fixes/fixes (801980f64979 powerpc/pseries/hotplug-cpu: wait indefinitely for vCPU death)
Merging s390-fixes/fixes (b97bf44f9915 s390/pci: fix PF/VF linking on hot plug)
Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro)
Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key)
Merging net/master (d1fb55592909 netlink: fix state reallocation in policy export)
Merging bpf/master (00fa1d83a8b5 bpftool: Handle EAGAIN error code properly in pids collection)
Merging ipsec/master (4eb2e1341575 espintcp: restore IP CB before handing the packet to xfrm)
Merging netfilter/master (b3b2854dcf70 mptcp: sendmsg: reset iter on error redux)
Merging ipvs/master (7c7ab580db49 net: Convert to use the fallthrough macro)
Merging wireless-drivers/master (9a2a0862d973 brcmfmac: reserve tx credit only when txctl is ready to send)
Merging mac80211/master (ad6641189c59 net: ipv4: remove duplicate "the the" phrase in Kconfig text)
Merging rdma-fixes/for-rc (9123e3a74ec7 Linux 5.9-rc1)
Merging sound-current/for-linus (b90b925fd52c ALSA: hda: avoid reset of sdo_limit)
Merging sound-asoc-fixes/for-linus (65e25c29b158 Merge remote-tracking branch 'asoc/for-5.9' into asoc-linus)
Merging regmap-fixes/for-linus (9123e3a74ec7 Linux 5.9-rc1)
Merging regulator-fixes/for-linus (ff945eff122d Merge remote-tracking branch 'regulator/for-5.9' into regulator-linus)
Merging spi-fixes/for-linus (41bc5599fe08 Merge remote-tracking branch 'spi/for-5.9' into spi-linus)
Merging pci-current/for-linus (7c2308f79fc8 PCI/P2PDMA: Fix build without DMA ops)
Merging driver-core.current/driver-core-linus (9123e3a74ec7 Linux 5.9-rc1)
Merging tty.current/tty-linus (ea1fc02e12b6 tty: serial: imx: add dependence and build for earlycon)
Merging usb.current/usb-linus (9a469bc9f32d usb: uas: Add quirk for PNY Pro Elite)
Merging usb-gadget-fixes/fixes (bc9a2e226ea9 usb: dwc3: gadget: Handle ZLP for sg requests)
Merging usb-serial-fixes/usb-linus (47ec5303d73e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging usb-chipidea-fixes/ci-for-usb-stable (2d79b3360dcc usb: chipidea: core: add wakeup support for extcon)
Merging phy/fixes (04db2304a949 phy: qualcomm: fix return value check in qcom_ipq806x_usb_phy_probe())
Merging staging.current/staging-linus (1dffeb8b8b4c staging: greybus: audio: fix uninitialized value issue)
Merging char-misc.current/char-misc-linus (51072c0f5b5e mei: hdcp: fix mei_hdcp_verify_mprime() input parameter)
Merging soundwire-fixes/fixes (f8d0168e035f soundwire: bus: fix typo in comment on INTSTAT registers)
Merging thunderbolt-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging input-current/for-linus (9e8238020c5b Merge branch 'next' into for-linus)
Merging crypto-current/master (21dfbcd1f5cb crypto: algif_aead - fix uninitialized ctx->init)
Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer)
Merging vfio-fixes/for-linus (aae7a75a821a vfio/type1: Add proper error unwind for vfio_iommu_replay())
Merging kselftest-fixes/fixes (3c01655ac82e kselftest: ksft_test_num return type should be unsigned)
Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
Merging dmaengine-fixes/fixes (e097eb7473d9 dmaengine: at_hdmac: add missing kfree() call in at_dma_xlate())
Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4)
Merging mtd-fixes/mtd/fixes (f7e6b19bc764 mtd: properly check all write ioctls for permissions)
Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core)
Merging v4l-dvb-fixes/fixes (0d6db85131e0 Revert "media: atomisp: keep the ISP powered on when setting it")
Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
Merging mips-fixes/mips-fixes (433c1ca0d441 MIPS: Loongson64: Do not override watch and ejtag feature)
Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
Merging omap-fixes/fixes (6542e2b613c2 ARM: dts: omap5: Fix DSI base address and clocks)
Merging kvm-fixes/master (06a81c1c7db9 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux)
Merging kvms390-fixes/master (774911290c58 KVM: s390: reduce number of IO pins to 1)
Merging hwmon-fixes/hwmon (51fb91ed5a6f hwmon: (pmbus/isl68137) remove READ_TEMPERATURE_1 telemetry for RAA228228)
Merging nvdimm-fixes/libnvdimm-fixes (080b2a9dbf93 dax: do not print error message for non-persistent memory block device)
Merging btrfs-fixes/next-fixes (c9f8e44ec4a5 Merge branch 'misc-5.9' into next-fixes)
Merging vfs-fixes/fixes (bb1a773d5b6b kill unused dump_fpu() instances)
Merging dma-mapping-fixes/for-linus (7dc6fd0f3b84 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
Merging drivers-x86-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging samsung-krzk-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging devicetree-fixes/dt/linus (d1ac0002dd29 of: address: Work around missing device_type property in pcie nodes)
Merging scsi-fixes/fixes (dca93232b361 Revert "scsi: qla2xxx: Disable T10-DIF feature with FC-NVMe during probe")
Merging drm-fixes/drm-fixes (485d41b092c8 Merge tag 'amd-drm-fixes-5.9-2020-08-12' of git://people.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 (4a4064ad7969 drm/i915/tgl: Make sure TC-cold is blocked before enabling TC AUX power wells)
Merging mmc-fixes/fixes (ebd4050c6144 mmc: sdhci-of-aspeed: Fix clock divider calculation)
Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2)
Merging hyperv-fixes/hyperv-fixes (b9d8cf2eb3ce x86/hyperv: Make hv_setup_sched_clock inline)
Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create)
Merging risc-v-fixes/fixes (76d4467a97bd riscv: Setup exception vector for nommu platform)
Merging pidfd-fixes/fixes (bda4c60d02e9 sys: Convert to the new fallthrough notation)
Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake)
Merging spdx/spdx-linus (9123e3a74ec7 Linux 5.9-rc1)
Merging gpio-intel-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging pinctrl-intel-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging erofs-fixes/fixes (9ebcfadb0610 Linux 5.8-rc3)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
Merging kunit-fixes/kunit-fixes (c63d2dd7e134 Documentation: kunit: Add some troubleshooting tips to the FAQ)
Merging ubifs-fixes/fixes (f37e99aca03f Merge tag 's390-5.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux into master)
Merging memblock-fixes/fixes (bd05220c7be3 arch/ia64: Restore arch-specific pgd_offset_k implementation)
Merging drm-misc-fixes/for-linux-next-fixes (77ef38574beb drm/modeset-lock: Take the modeset BKL for legacy drivers)
Merging kspp-gustavo/for-next/kspp (efd46a8da025 treewide: Use fallthrough pseudo-keyword)
Merging kbuild/for-next (514bad879fdb Merge branch 'kconfig' into for-next)
CONFLICT (content): Merge conflict in scripts/kconfig/qconf.h
Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4)
Merging dma-mapping/for-next (04d324bf549d dma-mapping: set default segment_boundary_mask to ULONG_MAX)
Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates)
Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
Merging arm/for-next (4dffbda6a996 Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (3df14264ad99 recordmcount: Fix build failure on non arm64)
Merging arm-perf/for-next/perf (55fdc1f44cd6 arm64: perf: Expose some new events via sysfs)
Merging arm-soc/for-next (e7e7df91deea soc: document merges)
Merging amlogic/for-next (c943b84fab78 Merge branch 'v5.10/dt64' into tmp/aml-rebuild)
Merging aspeed/for-next (2c887638a5fa ARM: dts: Aspeed: tacoma: Enable EHCI controller)
Merging at91/at91-next (b68f43873b72 Merge branch 'at91-soc' into at91-next)
Merging drivers-memory/for-next (ea0c0ad6b6eb memory: Enable compile testing for most of the drivers)
Merging imx-mxs/for-next (3c1a41dab7b8 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (50c950e2c8b6 Merge branch 'for_5.9/driver-soc' into next)
Merging mediatek/for-next (647a84d1e4dc Merge branch 'v5.8-next/soc' into for-next)
Merging mvebu/for-next (29bd9d8c2ac1 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (390f789055a0 Merge branch 'omap-for-v5.10/dt' into for-next)
Merging qcom/for-next (0854ab24c098 Merge branch 'arm64-defconfig-for-5.10' into for-next)
Merging raspberrypi/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next)
Merging renesas/next (923afaacb49d Merge branches 'renesas-arm-defconfig-for-v5.10' and 'renesas-arm-dt-for-v5.10' into renesas-next)
Merging reset/reset/next (2983e2385ff6 reset: imx7: add the cm4 reset for i.MX8MQ)
CONFLICT (content): Merge conflict in drivers/reset/reset-imx7.c
Merging rockchip/for-next (088d74f51158 Merge branch 'v5.9-clk/next' into for-next)
Merging samsung-krzk/for-next (93da582407b3 Merge branch 'next/soc-s3c-cleanup' into for-next)
Merging scmi/for-linux-next (9123e3a74ec7 Linux 5.9-rc1)
Merging sunxi/sunxi/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging tegra/for-next (8617339892a6 Merge branch for-5.9/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 (9123e3a74ec7 Linux 5.9-rc1)
Merging uniphier/for-next (4f8fb65af529 Merge branch 'dt64' into for-next)
Merging clk/clk-next (9123e3a74ec7 Linux 5.9-rc1)
Merging clk-samsung/for-next (3d77e6a8804a Linux 5.7)
Merging csky/linux-next (bdcd93ef9afb csky: Add context tracking support)
Merging h8300/h8300-next (9d48776fc609 Merge remote-tracking branch 'origin/master' into h8300-next)
Merging ia64/next (1a9d3c34c593 x86/cpu: Add Lakefield, Alder Lake and Rocket Lake to Intel family)
Merging m68k/for-next (382f429bb559 m68k: defconfig: Update defconfigs for v5.8-rc3)
Merging m68knommu/for-next (89d77da0166d binfmt_flat: revert "binfmt_flat: don't offset the data start")
Merging microblaze/next (b3a9e3b9622a Linux 5.8-rc1)
Merging mips/mips-next (07989ee3abad MIPS: BCM47xx: Include bcm47xx_sprom.h)
Merging nds32/next (0a2e478902c7 nds32: use get_kernel_nofault in dump_mem)
Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through)
Merging openrisc/for-next (55b2662ec665 openrisc: uaccess: Add user address space check to access_ok)
Merging parisc-hd/for-next (bcf876870b95 Linux 5.8)
Merging powerpc/next (9123e3a74ec7 Linux 5.9-rc1)
Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
Merging soc-fsl/next (e9e4ef9116b1 soc: fsl: dpio: Remove unused inline function qbman_write_eqcr_am_rt_register)
Merging risc-v/for-next (a407942f1825 Documentation/features: refresh RISC-V arch support files)
Merging s390/features (9123e3a74ec7 Linux 5.9-rc1)
Merging sh/for-next (0c64a0dce51f sh: landisk: Add missing initialization of sh_io_port_base)
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 (f6e8c474390b um: virtio: Replace zero-length array with flexible-array)
Merging xtensa/xtensa-for-next (a0fc1436f1f4 xtensa: add missing exclusive access state management)
Merging fscrypt/master (55e32c54bbd5 fscrypt: don't load ->i_crypt_info before it's known to be valid)
Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly)
Merging btrfs/for-next (cd37cdd68ef1 Merge branch 'for-next-current-v5.7-20200730' into for-next-20200730)
CONFLICT (content): Merge conflict in fs/btrfs/super.c
Merging ceph/master (02e37571f9e7 ceph: handle zero-length feature mask in session messages)
Merging cifs/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging configfs/for-next (059ccbfff8a8 configfs: use flush file op to commit writes to a binary file)
Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6)
Merging erofs/dev (cfcedfe21820 erofs: avoid duplicated permission check for "trusted." xattrs)
Merging exfat/dev (34d41dbe5455 exfat: use i_blocksize() to get blocksize)
Merging ext3/for_next (de575ac602ab Pull reiserfs spelling fixes.)
Merging ext4/dev (12ada33d7ac4 ext4: limit the length of per-inode prealloc list)
Merging f2fs/dev (9123e3a74ec7 Linux 5.9-rc1)
Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() for ->i_verity_info)
Merging fuse/for-next (9e9e23bd2d36 fuse: update project homepage)
Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member)
Merging nfs/linux-next (9123e3a74ec7 Linux 5.9-rc1)
Merging nfs-anna/linux-next (65caafd0d214 SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion"))
Merging nfsd/nfsd-next (b3a9e3b9622a Linux 5.8-rc1)
Merging cel/cel-next (34b09af4f54e nfsd: fix oops on mixed NFSv4/NFSv3 client access)
Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret)
Merging overlayfs/overlayfs-next (4518dfcf761e ovl: fix lookup of indexed hardlinks with metacopy)
Merging ubifs/next (798b7347e4f2 jffs2: fix UAF problem)
Merging v9fs/9p-next (2ed0b7578170 9p: Remove unneeded cast from memory allocation)
Merging xfs/for-next (96cf2a2c7556 xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init)
Merging zonefs/for-next (2f4b7462d2fa zonefs: update documentation to reflect zone size vs capacity)
Merging iomap/iomap-for-next (60263d5889e6 iomap: fall back to buffered writes for invalidation failures)
Merging djw-vfs/vfs-for-next (e4f9ba20d3b8 fs/xfs: Update xfs_ioctl_setattr_dax_invalidate())
Merging file-locks/locks-next (c0842fbc1b18 random32: move the pseudo-random 32-bit definitions to prandom.h)
Merging vfs/for-next (bcf876870b95 Linux 5.8)
Merging printk/for-next (20d6ee092831 Merge branch 'for-5.10' into for-next)
Merging pci/next (9123e3a74ec7 Linux 5.9-rc1)
Merging pstore/for-next/pstore (137c6236aeec mailmap: Add WeiXiong Liao)
Merging hid/for-next (de11ec5fedd9 Merge branch 'for-5.9/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (8cd60a71c849 Merge branch 'i2c/for-5.9' into i2c/for-next)
Merging i3c/i3c/next (9da36a7ec421 i3c: master add i3c_master_attach_boardinfo to preserve boardinfo)
Merging dmi/dmi-for-next (a3d13a0a23ea Replace HTTP links with HTTPS ones: DMI/SMBIOS SUPPORT)
Merging hwmon-staging/hwmon-next (4f31c8c48312 hwmon: (ltc2947) use simple i2c probe)
Merging jc_docs/docs-next (9123e3a74ec7 Linux 5.9-rc1)
Merging v4l-dvb/master (9a538b83612c media: venus: core: Add support for opp tables/perf voting)
CONFLICT (content): Merge conflict in drivers/media/platform/pxa_camera.c
Merging v4l-dvb-next/master (0d6db85131e0 Revert "media: atomisp: keep the ISP powered on when setting it")
Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
Merging pm/linux-next (1f08d51cd57f Merge branch 'opp/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm)
Merging cpufreq-arm/cpufreq/arm/linux-next (f259eab3ea0e cpufreq: make schedutil the default for arm and arm64)
Merging cpupower/cpupower (94bd8ea151da cpupowerutils: fix spelling mistake "dependant" -> "dependent")
Merging devfreq/devfreq-next (9123e3a74ec7 Linux 5.9-rc1)
Merging opp/opp/linux-next (06a8a059e88b opp: Allow disabled OPPs in dev_pm_opp_get_freq())
Merging thermal/thermal/linux-next (c569e805c7bc thermal: intel: intel_pch_thermal: Add Cannon Lake Low Power PCH support)
Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1)
Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor)
Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid')
Merging dlm/next (fa601a9ebd49 fs: dlm: implement tcp graceful shutdown)
Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region())
CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c
Merging rdma/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging net-next/master (e5b15f5af21a Merge branch 'ptp-Add-generic-helper-functions')
CONFLICT (content): Merge conflict in lib/nlattr.c
Merging bpf-next/master (c1447efdafff Merge branch 'type-and-enum-value-relos')
Merging ipsec-next/master (da7955405fb2 sfc: Fix build with CONFIG_RFS_ACCEL disabled.)
Merging mlx5-next/mlx5-next (9123e3a74ec7 Linux 5.9-rc1)
Merging netfilter-next/master (7fca4dee610d Merge tag 'powerpc-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
Merging ipvs-next/master (bfdd5aaa54b0 Merge tag 'Smack-for-5.9' of git://github.com/cschaufler/smack-next)
Merging wireless-drivers-next/master (eb77802e0daa Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (3b799254cf6f Bluetooth: hci_uart: Cancel init work before unregistering)
Merging mac80211-next/master (e3ec1e8ca02b net: eliminate meaningless memcpy to data in pskb_carve_inside_nonlinear())
Merging gfs2/for-next (e28c02b94f9e gfs2: When gfs2_dirty_inode gets a glock error, dump the glock)
Merging mtd/mtd/next (6a1380271b75 Merge tag 'nand/for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next)
Merging nand/nand/next (da151e3458c8 dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl, upm-wait-flags)
Merging spi-nor/spi-nor/next (e93a977367b2 mtd: revert "spi-nor: intel: provide a range for poll_timout")
Merging crypto/master (1dbb920e342c crypto: algapi - Move crypto_yield into internal.h)
Merging drm/drm-next (62975d27d647 drm/ttm: revert "drm/ttm: make TT creation purely optional v3")
Merging amdgpu/drm-next (ed6b26c2fb7f Revert "drm/radeon: handle PCIe root ports with addressing limitations")
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu_v11_0.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dc_bios_types.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Merging drm-intel/for-linux-next (d24f1341a63c drm/i915: Apply Wa_14011264657:gen11+)
Merging drm-tegra/drm/tegra/for-next (4fba6d22ca9a drm/tegra: plane: Support 180° rotation)
Merging drm-misc/for-linux-next (62975d27d647 drm/ttm: revert "drm/ttm: make TT creation purely optional v3")
Merging drm-msm/msm-next (9d5cbf5fe46e drm/msm: add shutdown support for display platform_driver)
Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500)
Merging imx-drm/imx-drm/next (efd5a93d2a89 drm/imx: drop explicit drm_mode_config_cleanup)
Merging etnaviv/etnaviv/next (c5d5a32ead1e drm/etnaviv: fix ref count leak via pm_runtime_get_sync)
Merging regmap/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging sound/for-next (b90b925fd52c ALSA: hda: avoid reset of sdo_limit)
Merging sound-asoc/for-next (8828feede9b2 Merge remote-tracking branch 'asoc/for-5.10' into asoc-next)
Merging modules/modules-next (262e6ae7081d modules: inherit TAINT_PROPRIETARY_MODULE)
Merging input/next (d862a3068ea5 Input: exc3000 - add support to query model and fw_version)
Merging block/for-next (86cfccb66937 Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging device-mapper/for-next (a9cb9f4148ef dm: don't call report zones for more than the user requested)
Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static)
Merging mmc/next (7f4bc2e8687e mmc: mediatek: make function msdc_cqe_disable() static)
Merging mfd/for-mfd-next (e15d7f2b81d2 mfd: syscon: Use a unique name with regmap_config)
Merging backlight/for-backlight-next (7eb99a39ef76 video: backlight: cr_bllcd: Remove unused variable 'intensity')
Merging battery/for-next (46cbd0b05799 power: supply: wilco_ec: Add long life charging mode)
Merging regulator/for-next (87cf76f7f898 Merge remote-tracking branch 'regulator/for-5.10' into regulator-next)
Merging security/next-testing (ddcf4ecd547e Merge branch 'for-v5.8' into next-testing)
Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable)
Merging integrity/next-integrity (3db0d0c276a7 integrity: remove redundant initialization of variable ret)
Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type)
Merging safesetid/safesetid-next (0476c865ded6 LSM: SafeSetID: Fix warnings reported by test bot)
Merging selinux/next (69ea651c40f7 selinux: fix allocation failure check on newpolicy->sidtab)
Applying: selinux: avoid dereferencing the policy prior to initialization
Merging smack/next (42a2df3e829f Smack: prevent underflow in smk_set_cipso())
Merging tomoyo/master (9123e3a74ec7 Linux 5.9-rc1)
Merging tpmdd/next (9123e3a74ec7 Linux 5.9-rc1)
Merging watchdog/master (18445bf405cb Merge tag 'spi-fix-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
Merging iommu/next (e46b3c0d011e Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next)
Merging vfio/next (ccd59dce1a21 vfio/type1: Refactor vfio_iommu_type1_ioctl())
Merging audit/next (265c32072b0c audit: uninitialize variable audit_sig_sid)
Merging devicetree/for-next (7ba58fff001d dt-bindings: Validate DT binding schema in a single call)
Merging mailbox/mailbox-for-next (884996986347 mailbox: mediatek: cmdq: clear task in channel before shutdown)
Merging spi/for-next (e6bf656ae6bf Merge remote-tracking branch 'spi/for-5.10' into spi-next)
Merging tip/auto-latest (d8211042f91d Merge branch 'perf/urgent')
Merging clockevents/timers/drivers/next (9fba22584e54 clocksource: Ingenic: Add support for the Ingenic X1000 OST.)
Merging edac/edac-for-next (e4c5913b9f2e Merge branch 'edac-urgent' into edac-for-next)
Merging irqchip/irq/irqchip-next (7828a3ef8646 irqchip: Fix probing deferal when using IRQCHIP_PLATFORM_DRIVER helpers)
Merging ftrace/for-next (38ce2a9e33db tracing: Add trace_array_init_printk() to initialize instance trace_printk() buffers)
Merging rcu/rcu/next (88f8ab921c95 bitops, kcsan: Partially revert instrumentation for non-atomic bitops)
Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup)
Merging kvm-arm/next (16314874b12b Merge branch 'kvm-arm64/misc-5.9' into kvmarm-master/next)
Merging kvm-ppc/kvm-ppc-next (81ab595ddd3c KVM: PPC: Book3S HV: Rework secure mem slot dropping)
Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset)
Merging xen-tip/linux-next (585c6ed738a5 drm/xen-front: Pass dumb buffer data offset to the backend)
Merging percpu/for-next (4fa640dc5230 Merge tag 'vfio-v5.8-rc7' of git://github.com/awilliam/linux-vfio into master)
Merging workqueues/for-next (10cdb1575954 workqueue: use BUILD_BUG_ON() for compile time test instead of WARN_ON())
Merging drivers-x86/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging chrome-platform/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging leds/for-next (242b81170fb8 leds: lp50xx: Add the LP50XX family of the RGB LED driver)
Merging ipmi/for-next (83dea1285672 char: ipmi: convert tasklets to use new tasklet_setup() API)
Merging driver-core/driver-core-next (9123e3a74ec7 Linux 5.9-rc1)
Merging usb/usb-next (28157b8c7d9a USB: Better name for __check_usb_generic())
Merging usb-gadget/next (f5e46aa4a124 usb: dwc3: gadget: when the started list is empty stop the active xfer)
Merging usb-serial/usb-next (47ec5303d73e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging usb-chipidea-next/ci-for-usb-next (d6f93d21001e usb: chipidea: imx: get available runtime dr mode for wakeup setting)
Merging phy-next/next (9123e3a74ec7 Linux 5.9-rc1)
Merging tty/tty-next (377c0d7ea5bb dt-bindings: timer: Add compatible for Mediatek MT8192)
Merging char-misc/char-misc-next (d162219c655c mei: virtio: virtualization frontend driver)
Merging extcon/extcon-next (b3a9e3b9622a Linux 5.8-rc1)
Merging soundwire/next (08abad9f45f1 soundwire: intel: refine runtime pm for SDW_INTEL_CLK_STOP_BUS_RESET)
Merging thunderbolt/next (9123e3a74ec7 Linux 5.9-rc1)
Merging staging/staging-next (bc752d2f345b staging: hikey9xx: Kconfig: add regulator dependency)
Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr)
Merging icc/icc-next (12a400b016ab interconnect: Mark all dummy functions as static inline)
Merging dmaengine/next (144ceb27d737 dmaengine: xilinx: dpdma: Make symbol 'dpdma_debugfs_reqs' static)
Merging cgroup/for-next (936f2a70f207 cgroup: add cpu.stat file to root cgroup)
Merging scsi/for-next (7b08f25e38ce Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (e62212672ab5 scsi: ufs: Remove several redundant goto statements)
Merging vhost/linux-next (8a7c3213db06 vdpa/mlx5: fix up endian-ness for mtu)
Merging rpmsg/for-next (ca69dba7f13a Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (22cc422070d9 gpio: wcove: Request IRQ after all initialisation done)
Merging gpio-brgl/gpio/for-next (01e8d85b68fd gpio: aggregator: Refactor ->{get, set}_multiple() to make Sparse happy)
Merging gpio-intel/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging pinctrl/for-next (fc80c51fd4b2 Merge tag 'kbuild-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging pinctrl-intel/for-next (80c1050d3f49 pinctrl: intel: Update header block to reflect direct dependencies)
$ git reset --hard HEAD^
Merging next-20200819 version of pinctrl-intel
Merging pinctrl-samsung/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging pwm/for-next (6ced5ff0be8e pwm: bcm-iproc: handle clk_get_rate() return)
Merging userns/for-next (7fce69dff8db Implement kernel_execve)
Merging ktest/for-next (ff131efff141 ktest.pl: Fix spelling mistake "Cant" -> "Can't")
Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds)
Merging kselftest/next (850d0cc64c8e selftests/harness: Limit step counter reporting)
Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC")
Merging livepatching/for-next (bf14b015bf51 Merge branch 'for-5.9/selftests-cleanup' into for-next)
Merging coresight/next (ff1304be0a05 coresight: etm4x: Add Support for HiSilicon ETM device)
Merging rtc/rtc-next (9123e3a74ec7 Linux 5.9-rc1)
Merging nvdimm/libnvdimm-for-next (03b68d5d7d4b Merge branch 'for-5.9/copy_mc' into libnvdimm-for-next)
Merging at24/at24/for-next (a4423cedc56f eeprom: at24: Add support for the Sony VAIO EEPROMs)
Merging ntb/ntb-next (b3a9e3b9622a Linux 5.8-rc1)
Merging seccomp/for-next/seccomp (16b89f695313 net/scm: Fix typo in SCM_RIGHTS compat refactoring)
Merging kspp/for-next/kspp (55dde35fdb7f overflow: Add __must_check attribute to check_*() helpers)
Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2)
Merging fsi/next (4ca8b73f16f0 fsi: aspeed: Support CFAM reset GPIO)
Merging slimbus/for-next (b3a9e3b9622a Linux 5.8-rc1)
Merging nvmem/for-next (a24ef5be460b nvmem: qcom-spmi-sdam: Enable multiple devices)
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas_find_marked)
Merging hyperv/hyperv-next (49971e6bad2d drivers: hv: remove cast from hyperv_die_event)
Merging auxdisplay/auxdisplay (46d4a403a04c auxdisplay: Replace HTTP links with HTTPS ones)
Merging kgdb/kgdb/for-next (2c308ef41351 kgdb: Make "kgdbcon" work properly with "kgdb_earlycon")
Merging pidfd/for-next (da83d0cb9237 Merge branch 'cap_checkpoint_restore' into for-next)
Merging hmm/hmm (9123e3a74ec7 Linux 5.9-rc1)
Merging fpga/for-next (3359f5f44cb5 fpga: dfl: change data type of feature id to u16)
Merging kunit/test (48778464bb7d Linux 5.8-rc2)
Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache)
Merging cfi/cfi/next (11399346ac39 mtd: Replace zero-length array with flexible-array)
Merging kunit-next/kunit (d43c7fb05765 kunit: tool: fix improper treatment of file location)
Merging trivial/for-next (c1a371cf80fb printk: fix global comment)
Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7)
Merging mhi/mhi-next (18e9533ac877 bus: mhi: core: Introduce APIs to allocate and free the MHI controller)
Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications)
Merging memblock/for-next (762d4d1a174c arch/ia64: Restore arch-specific pgd_offset_k implementation)
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
Merging akpm-current/current (8c4285719116 ROMFS: support inode blocks calculation)
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
Merging akpm/master (cc3af00352dd mm/mmap: add inline munmap_vma_range() for code readability)
Applying: Revert "dma-mapping: set default segment_boundary_mask to ULONG_MAX"

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: Tree for Aug 20
@ 2019-08-20  7:09 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2019-08-20  7:09 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 34924 bytes --]

Hi all,

Changes since 20190819:

The drm-misc tree gained a conflict against the drm-intel tree.

The security tree lost its build failure.

Non-merge commits (relative to Linus' tree): 6824
 7412 files changed, 368368 insertions(+), 221059 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 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 309 trees (counting Linus' and 77 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 (06821504fd47 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging fixes/master (609488bc979f Linux 5.3-rc2)
Merging kbuild-current/fixes (451577f3e3a9 Merge tag 'kbuild-fixes-v5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging arc-current/for-curr (e86d94fdda8e ARC: unwind: Mark expected switch fall-throughs)
Merging arm-current/fixes (c5d0e49e8d8f ARM: 8867/1: vdso: pass --be8 to linker if necessary)
Merging arm-soc-fixes/arm/fixes (305cd70ec311 Merge tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes)
Merging arm64-fixes/for-next/fixes (b6143d10d23e arm64: ftrace: Ensure module ftrace trampoline is coherent with I-side)
Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire)
Merging powerpc-fixes/fixes (b9ee5e04fd77 powerpc/64e: Drop stale call to smp_processor_id() which hangs SMP startup)
Merging s390-fixes/fixes (d45331b00ddb Linux 5.3-rc4)
Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (e15dbcdeb9f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging bpf/master (d34b044038bf tools: bpftool: close prog FD before exit on showing a single program)
Merging ipsec/master (22d6552f827e xfrm interface: fix management of phydev)
Merging netfilter/master (38a429c898dd netfilter: add include guard to nf_conntrack_h323_types.h)
Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes')
Merging wireless-drivers/master (1f6607250331 iwlwifi: dbg_ini: fix compile time assert build errors)
Merging mac80211/master (d8a1de3d5bb8 isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer on the stack)
Merging rdma-fixes/for-rc (2c8ccb37b08f RDMA/siw: Change CQ flags from 64->32 bits)
Merging sound-current/for-linus (f9ef724d4896 ALSA: hda - Fixes inverted Conexant GPIO mic mute led)
Merging sound-asoc-fixes/for-linus (9dd959fb934e Merge branch 'asoc-5.3' into asoc-linus)
Merging regmap-fixes/for-linus (0161b8716465 Merge branch 'regmap-5.3' into regmap-linus)
Merging regulator-fixes/for-linus (c8c4e33fb85d Merge branch 'regulator-5.3' into regulator-linus)
Merging spi-fixes/for-linus (ec010644e3b7 Merge branch 'spi-5.3' into spi-linus)
Merging pci-current/for-linus (7bafda88de20 Documentation PCI: Fix pciebus-howto.rst filename typo)
Merging driver-core.current/driver-core-linus (d45331b00ddb Linux 5.3-rc4)
Merging tty.current/tty-linus (d45331b00ddb Linux 5.3-rc4)
Merging usb.current/usb-linus (d1abaeb3be7b Linux 5.3-rc5)
Merging usb-gadget-fixes/fixes (4a56a478a525 usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt)
Merging usb-serial-fixes/usb-linus (d1abaeb3be7b Linux 5.3-rc5)
Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue)
Merging phy/fixes (609488bc979f Linux 5.3-rc2)
Merging staging.current/staging-linus (d1abaeb3be7b Linux 5.3-rc5)
Merging char-misc.current/char-misc-linus (d1abaeb3be7b Linux 5.3-rc5)
Merging soundwire-fixes/fixes (8676b3ca4673 soundwire: fix regmap dependencies and align with other serial links)
Merging thunderbolt-fixes/fixes (d1abaeb3be7b Linux 5.3-rc5)
Merging input-current/for-linus (849f5ae3a513 Input: iforce - add sanity checks)
Merging crypto-current/master (e2664ecbb2f2 crypto: ccp - Ignore tag length when decrypting GCM ciphertext)
Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible)
Merging vfio-fixes/for-linus (5715c4dd66a3 vfio/mdev: Synchronize device create/remove with parent removal)
Merging kselftest-fixes/fixes (fbb01c52471c selftests/livepatch: push and pop dynamic debug config)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
Merging slave-dma-fixes/fixes (d555c34338ca omap-dma/omap_vout_vrfb: fix off-by-one fi value)
Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1)
Merging mtd-fixes/mtd/fixes (834de5c1aa76 mtd: spi-nor: Fix the disabling of write protection at init)
Merging mfd-fixes/for-mfd-fixes (63b2de12b7ee mfd: stmfx: Fix an endian bug in stmfx_irq_handler())
Merging v4l-dvb-fixes/fixes (92f5b0313e37 media: vivid: fix missing cec adapter name)
Merging reset-fixes/reset/fixes (a71dcd3757e2 reset: remove redundant null check on pointer dev)
Merging mips-fixes/mips-fixes (74034a09267c MIPS: BCM63XX: Mark expected switch fall-through)
Merging at91-fixes/at91-fixes (5f9e832c1370 Linus 5.3-rc1)
Merging omap-fixes/fixes (4a65bbb9109e soc: ti: pm33xx: Make two symbols static)
Merging kvm-fixes/master (a738b5e75b4c Merge tag 'kvmarm-fixes-for-5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
Merging kvms390-fixes/master (a86cb413f4bf KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID)
Merging hwmon-fixes/hwmon (4207f85eb0f6 hwmon: (lm75) Fix write operations for negative temperatures)
Merging nvdimm-fixes/libnvdimm-fixes (06282373ff57 mm/memremap: Fix reuse of pgmap instances with internal references)
Merging btrfs-fixes/next-fixes (efa6b617e067 Merge branch 'misc-5.3' into next-fixes)
Merging vfs-fixes/fixes (e272d4fb74d6 configfs: fix a deadlock in configfs_symlink())
Merging dma-mapping-fixes/for-linus (33dcb37cef74 dma-mapping: fix page attributes for dma_mmap_*)
Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
Merging drivers-x86-fixes/fixes (d45331b00ddb Linux 5.3-rc4)
Merging samsung-krzk-fixes/fixes (5f9e832c1370 Linus 5.3-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c1370 Linus 5.3-rc1)
Merging devicetree-fixes/dt/linus (83f82d7a4258 of: irq: fix a trivial typo in a doc comment)
Merging scsi-fixes/fixes (7c7cfdcf7f17 scsi: ufs: Fix NULL pointer dereference in ufshcd_config_vreg_hpm())
Merging drm-fixes/drm-fixes (d1abaeb3be7b Linux 5.3-rc5)
Merging amdgpu-fixes/drm-fixes (e1b4ce25dbc9 drm/scheduler: use job count instead of peek)
Merging drm-intel-fixes/for-linux-next-fixes (d1abaeb3be7b Linux 5.3-rc5)
Merging mmc-fixes/fixes (b803974a8603 mmc: cavium: Add the missing dma unmap when the dma has finished.)
Merging rtc-fixes/rtc-fixes (5f9e832c1370 Linus 5.3-rc1)
Merging gnss-fixes/gnss-linus (f2c7c76c5d0a Linux 5.2-rc3)
Merging hyperv-fixes/hyperv-fixes (bafe1e79e05d MAINTAINERS: Fix Hyperv vIOMMU driver file name)
Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request())
Merging risc-v-fixes/fixes (69703eb9a8ae riscv: Make __fstate_clean() work correctly.)
Merging pidfd-fixes/fixes (d45331b00ddb Linux 5.3-rc4)
Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio)
Merging spdx/spdx-linus (d1abaeb3be7b Linux 5.3-rc5)
Merging gpio-intel-fixes/fixes (5f9e832c1370 Linus 5.3-rc1)
Merging pinctrl-intel-fixes/fixes (5f9e832c1370 Linus 5.3-rc1)
Merging drm-misc-fixes/for-linux-next-fixes (63daf4e16654 drm/omap: ensure we have a valid dma_mask)
Merging kspp-gustavo/for-next/kspp (af905189716f dmaengine: fsldma: Mark expected switch fall-through)
Merging kbuild/for-next (b0907316fd2b kbuild: split final module linking out into Makefile.modfinal)
Merging compiler-attributes/compiler-attributes (6c4d6bc54864 auxdisplay: Fix a typo in cfag12864b-example.c)
Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
Merging dma-mapping/for-next (ad3c7b18c5b3 arm: use swiotlb for bounce buffering on LPAE configs)
Merging asm-generic/master (7f3a8dff1219 asm-generic: remove ptrace.h)
Merging arc/for-next (6fbc7275c7a9 Linux 5.2-rc7)
Merging arm/for-next (b7a735f3a606 Merge branch 'for-arm-soc' into for-next)
Merging arm64/for-next/core (436ce61aeb33 Merge branches 'for-next/error-injection', 'for-next/tbi', 'for-next/psci-cpuidle', 'for-next/cpu-topology' and 'for-next/52-bit-kva' into for-next/core)
Merging arm-perf/for-next/perf (228f855fb57a perf: Remove dev_err() usage after platform_get_irq())
Merging arm-soc/for-next (50e5bf56ba2f arm-soc: document merges)
Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
Merging amlogic/for-next (f2e66ae69e8b Merge branch 'v5.4/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (821569c33633 Merge branch 'dt-for-v5.4' into for-next)
Merging at91/at91-next (90fbe456b5f0 Merge branch 'at91-dt' into at91-next)
Merging bcm2835/for-next (c165c01bb6f7 Merge branch 'bcm2835-dt-next' into for-next)
Merging imx-mxs/for-next (da9e97dce800 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (78145dbeaea1 Merge branch 'for_5.3/driver-soc' into next)
Merging mediatek/for-next (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next)
Merging mvebu/for-next (e1b0b32a5ad6 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (29baae1e8b9d Merge branch 'omap-for-v5.4/dt' into for-next)
Merging qcom/for-next (3a653663d568 Merge branches 'arm64-for-5.4' and 'drivers-for-5.3' into for-next)
Merging renesas/next (45f5d5a9e34d arm64: dts: renesas: r8a77995: draak: Fix backlight regulator name)
Merging renesas-geert/next (926d9def0a14 Merge branches 'renesas-arm-dt-for-v5.4', 'renesas-arm64-dt-for-v5.4' and 'renesas-drivers-for-v5.4' into renesas-next)
Merging reset/reset/next (ea651ffd4f7f reset: Add DesignWare IP support to simple reset)
Merging rockchip/for-next (6350a4960285 Merge branch 'v5.4-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (1bccc7798f03 Merge branch 'next/drivers' into for-next)
Merging scmi/for-linux-next (d1abaeb3be7b Linux 5.3-rc5)
Merging sunxi/sunxi/for-next (3f049a94ffce Merge branch 'sunxi/dt-for-5.4' into sunxi/for-next)
Merging tegra/for-next (6290ae1fb7e2 Merge branch for-5.4/firmware into for-next)
Merging clk/clk-next (92c90f38b17c Merge branch 'clk-unused' into clk-next)
Merging clk-samsung/for-next (a188339ca5a3 Linux 5.2-rc1)
Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging csky/linux-next (ada384a7fd2d csky: Optimize arch_sync_dma_for_cpu/device with dma_inv_range)
Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h)
Merging ia64/next (0d3d343560ba genirq: remove the is_affinity_mask_valid hook)
Merging m68k/for-next (49ff824a028a m68k: defconfig: Update defconfigs for v5.3-rc2)
Merging m68knommu/for-next (d1abaeb3be7b Linux 5.3-rc5)
Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions)
Merging mips/mips-next (8084499bd7d4 irqchip/irq-ingenic-tcu: Fix COMPILE_TEST building)
CONFLICT (content): Merge conflict in arch/mips/include/asm/vdso/vdso.h
CONFLICT (content): Merge conflict in Documentation/index.rst
Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction)
Merging nios2/for-next (f017da5c7077 nios2: configs: Remove useless UEVENT_HELPER_PATH)
Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32)
Merging parisc-hd/for-next (a5ff2130a4d9 parisc: speed up flush_tlb_all_local with qemu)
Merging powerpc/next (2b87a2553aa0 powerpc/64s: Make boot look nice(r))
Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask")
Merging soc-fsl/next (eadf0b17b43d bus: fsl-mc: remove explicit device_link_del)
Merging risc-v/for-next (f51edcec5288 MAINTAINERS: Add an entry for generic architecture topology)
Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging s390/features (e79333569918 s390/startup: purge obsolete .gitignore patterns)
Merging sh/sh-next (baf58858e8b6 sh: prefer __section from compiler_attributes.h)
CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree.
CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree.
$ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types.h
Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging uml/linux-next (b482e48d29f1 um: fix build without CONFIG_UML_TIME_TRAVEL_SUPPORT)
Merging xtensa/xtensa-for-next (fa4b55813b1e Merge branch 'xtensa-5.3' into xtensa-for-next)
Merging fscrypt/master (ba13f2c8d7a0 fscrypt: document the new ioctls and policy version)
Merging afs/afs-next (ac8ca2d9ce2f afs: Support RCU pathwalk)
Merging btrfs/next (29dcea88779c Linux 4.17)
Merging btrfs-kdave/for-next (a668d8d6543c Merge branch 'cleanup/sysfs-refactoring' into for-next-20190805)
CONFLICT (content): Merge conflict in fs/btrfs/extent-tree.c
CONFLICT (content): Merge conflict in fs/btrfs/ctree.h
Applying: btrfs: merge fix up for "Btrfs: fix sysfs warning and missing raid sysfs directories"
Merging ceph/master (d31d07b97a5e ceph: fix end offset in truncate_inode_pages_range call)
Merging cifs/for-next (af816b1fac41 cifs: remove redundant assignment to variable rc)
Merging configfs/for-next (f6122ed2a4f9 configfs: Fix use-after-free when accessing sd->s_dentry)
Merging ecryptfs/next (7451c54abc91 ecryptfs: Change return type of ecryptfs_process_flags)
Merging ext3/for_next (56db1991690f udf: prevent allocation beyond UDF partition)
Merging ext4/dev (7a14826ede1d ext4: set error return correctly when ext4_htree_store_dirent fails)
CONFLICT (content): Merge conflict in fs/ext4/ioctl.c
Merging f2fs/dev (3f27158cb511 f2fs: support FS_IOC_{GET,SET}FSLABEL)
Merging fsverity/fsverity (95ae251fe828 f2fs: add fs-verity support)
CONFLICT (content): Merge conflict in fs/f2fs/inode.c
CONFLICT (content): Merge conflict in fs/f2fs/file.c
CONFLICT (content): Merge conflict in fs/ext4/ioctl.c
Merging fuse/for-next (e7d6cd694383 fuse: cleanup fuse_wait_on_page_writeback)
Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
Merging nfs/linux-next (d1abaeb3be7b Linux 5.3-rc5)
Merging nfs-anna/linux-next (68f461593f76 NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O)
Merging nfsd/nfsd-next (ed9927533a64 nfsd: Fix the documentation for svcxdr_tmpalloc())
Merging orangefs/for-next (e65682b55956 orangefs: eliminate needless variable assignments)
Merging overlayfs/overlayfs-next (0be0bfd2de9d ovl: fix regression caused by overlapping layers detection)
Merging ubifs/linux-next (8009ce956c3d ubifs: Don't leak orphans on memory during commit)
Merging v9fs/9p-next (80a316ff1627 9p/xen: Add cleanup path in p9_trans_xen_init)
Merging xfs/for-next (5d888b481e6a xfs: fix reflink source file racing with directio writes)
Merging iomap/iomap-for-next (791ee52eb10b iomap: Fix trivial typo)
Merging djw-vfs/vfs-for-next (7e328e5930ad mm/fs: don't allow writes to immutable files)
Merging file-locks/locks-next (df2474a22c42 locks: print a warning when mount fails due to lack of "mand" support)
Merging vfs/for-next (dad5ea4bac62 ceph_real_mount(): missing initialization)
CONFLICT (content): Merge conflict in fs/ubifs/super.c
CONFLICT (content): Merge conflict in fs/gfs2/super.c
CONFLICT (content): Merge conflict in fs/ceph/super.c
CONFLICT (modify/delete): Documentation/filesystems/vfs.txt deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of Documentation/filesystems/vfs.txt left in tree.
$ git rm -f Documentation/filesystems/vfs.txt
Applying: docs: filesystems: vfs: update for "vfs: Kill mount_single()"
Merging printk/for-next (ba174ef6d224 Merge branch 'for-5.3-fixes' into for-next)
Merging pci/next (882e5d3f6fe0 Merge branch 'pci/trivial')
Merging pstore/for-next/pstore (609488bc979f Linux 5.3-rc2)
Merging hid/for-next (f5a9f36f8be7 Merge branch 'for-5.3/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (cf254eed8bd5 Merge branch 'i2c/for-5.4' into i2c/for-next)
Merging i3c/i3c/next (7afe9a4e5665 i3c: master: fix a memory leak bug)
Merging dmi/master (57361846b52b Linux 4.19-rc2)
Merging hwmon-staging/hwmon-next (c69c9498b789 hwmon: (raspberrypi) update MODULE_AUTHOR() email address)
Merging jc_docs/docs-next (4514fe8cd96f Documentation/arm/samsung-s3c24xx: Remove stray U+FEFF character to fix title)
CONFLICT (add/add): Merge conflict in Documentation/mips/index.rst
CONFLICT (content): Merge conflict in Documentation/admin-guide/cifs/todo.rst
Merging v4l-dvb/master (d4e0f82ac840 media: pixfmt-compressed.rst: improve H264/HEVC/MPEG1+2/VP8+9 documentation)
Merging v4l-dvb-next/master (5f9e832c1370 Linus 5.3-rc1)
Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
Merging pm/linux-next (82be27a260ab Merge branches 'acpi-apei', 'acpi-processor' and 'acpi-tables' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (c7b48823a13f Merge branch 'cpufreq/qcom-updates' into cpufreq/arm/linux-next)
Merging cpupower/cpupower (04507c0a9385 cpupower : frequency-set -r option misses the last cpu in related cpu list)
Merging opp/opp/linux-next (0203c0343a1f Merge branch 'opp/qcom-updates' into opp/linux-next)
Merging thermal/next (d093f91ff7d0 Merge branch 'for-rc' into next)
CONFLICT (rename/add): Rename Documentation/thermal/index.rst->Documentation/driver-api/thermal/index.rst in HEAD. Documentation/driver-api/thermal/index.rst added in thermal/next
Merging thermal-soc/next (4cb9f043447e thermal: thermal_mmio: remove some dead code)
Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs)
Merging dlm/next (a48f9721e6db dlm: no need to check return value of debugfs_create functions)
Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region())
Merging rdma/for-next (77905379e9b2 RDMA/hns: Remove unuseful member)
Merging net-next/master (44b3769b3857 Merge branch 'RTL8125-EEE')
CONFLICT (content): Merge conflict in scripts/link-vmlinux.sh
Merging bpf-next/master (1f7267232711 Merge branch 'bpf-af-xdp-xskmap-improvements')
Merging ipsec-next/master (c7b37c769d2a xfrm: remove get_mtu indirection from xfrm_type)
Merging mlx5-next/mlx5-next (b1635ee6120c net/mlx5: Add XRQ legacy commands opcodes)
Merging netfilter-next/master (20e79a0a2cfd net: hns: add phy_attached_info() to the hns driver)
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c
Merging ipvs-next/master (1b0b807dd746 Merge branch 'r8169-fw')
Merging wireless-drivers-next/master (6004cf298a41 b43legacy: Remove pointless cond_resched() wrapper)
Merging bluetooth/master (cf80618a8402 Bluetooth: hci_qca: Use kfree_skb() instead of kfree())
Merging mac80211-next/master (6a7ce95d752e staging/octeon: Fix build error without CONFIG_NETDEVICES)
Merging gfs2/for-next (1e5227a3a98b gfs2: Fix possible fs name overflows)
Merging mtd/mtd/next (5f9e832c1370 Linus 5.3-rc1)
Merging nand/nand/next (80107e764846 mtd: rawnand: remove redundant assignment to variable ret)
Merging spi-nor/spi-nor/next (5fbdac150d48 mtd: spi-nor: fix description for int (*flash_is_locked)())
Merging crypto/master (198429631a85 crypto: arm64/aegis128 - implement plain NEON version)
Merging drm/drm-next (8120ed5ebd2a Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
Merging amdgpu/drm-next (283791cbb202 drm/amdkfd: Remove GPU ID in GWS queue creation)
CONFLICT (content): Merge conflict in include/uapi/linux/kfd_ioctl.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
Merging drm-intel/for-linux-next (cc3375607d79 drm/i915: Use 0 for the unordered context)
Merging drm-tegra/drm/tegra/for-next (2a6fc3cb5cb6 drm/tegra: Fix gpiod_get_from_of_node() regression)
Merging drm-misc/for-linux-next (96158346b59b drm/i915: Select DMABUF_SELFTESTS for the default i915.ko debug build)
CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c
CONFLICT (modify/delete): drivers/gpu/drm/i915/i915_gem_batch_pool.c deleted in HEAD and modified in drm-misc/for-linux-next. Version drm-misc/for-linux-next of drivers/gpu/drm/i915/i915_gem_batch_pool.c left in tree.
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
$ git rm -f drivers/gpu/drm/i915/i915_gem_batch_pool.c
Applying: drm: fix up fallout from "dma-buf: rename reservation_object to dma_resv"
Merging drm-msm/msm-next (ddc73f32ba95 drm/msm: drop use of drmP.h)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_atomic.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
Merging mali-dp/for-upstream/mali-dp (4cf643a39221 Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next)
Merging imx-drm/imx-drm/next (a59957172b0c gpu: ipu-v3: enable remaining 32-bit RGB V4L2 pixel formats)
Merging etnaviv/etnaviv/next (088880ddc0b2 drm/etnaviv: implement softpin)
CONFLICT (content): Merge conflict in drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
Merging regmap/for-next (1bd4584626a9 Merge branch 'regmap-5.4' into regmap-next)
Merging sound/for-next (7c0a69394c26 ALSA: hda - Define a fallback_pin_fixup_tbl for alc269 family)
Merging sound-asoc/for-next (1eac0c5c55b3 Merge branch 'asoc-5.4' into asoc-next)
Merging modules/modules-next (38f054d549a8 modules: always page-align module section allocations)
Merging input/next (62c3801619e1 Input: cros_ec_keyb - add back missing mask for event_type)
Merging block/for-next (a51c4acca236 Merge branch 'for-5.4/block' into for-next)
Merging device-mapper/for-next (bf2a804b36b8 dm dust: use dust block size for badblocklist index)
Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
Merging mmc/next (9637eb6749b9 Merge branch 'fixes' into next)
Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses)
CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c
Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
Merging mfd/for-mfd-next (5cd690a308e8 mfd: asic3: Include the right header)
Merging backlight/for-backlight-next (73fbfc499448 backlight: pwm_bl: Fix heuristic to determine number of brightness levels)
Merging battery/for-next (5f9e832c1370 Linus 5.3-rc1)
Merging regulator/for-next (9170108af492 Merge branch 'regulator-5.4' into regulator-next)
Merging security/next-testing (0ecfebd2b524 Linux 5.2)
Merging apparmor/apparmor-next (136db994852a apparmor: increase left match history buffer size)
Merging integrity/next-integrity (70433f67ec3a MODSIGN: make new include file self contained)
Merging keys/keys-next (8cf8684e0d24 Merge branch 'keys-acl' into keys-next)
CONFLICT (content): Merge conflict in include/linux/key.h
CONFLICT (modify/delete): fs/crypto/keyinfo.c deleted in HEAD and modified in keys/keys-next. Version keys/keys-next of fs/crypto/keyinfo.c left in tree.
CONFLICT (content): Merge conflict in fs/afs/security.c
$ git rm -f fs/crypto/keyinfo.c
Applying: fsverity: merge fix for keyring_alloc API change
Applying: fscrypt: merge resolution for "keys: Replace uid/gid/perm permissions checking with an ACL"
Applying: dm verity: merge fix for "keys: Replace uid/gid/perm permissions checking with an ACL"
Merging selinux/next (ac5656d8a4cd fanotify, inotify, dnotify, security: add security hook for fs notifications)
Merging tpmdd/next (d1abaeb3be7b Linux 5.3-rc5)
Merging watchdog/master (194108705c9e watchdog: remove w90x900 driver)
Merging iommu/next (6cd27422a626 Merge branches 'arm/omap', 'arm/exynos', 'x86/amd' and 'core' into next)
Merging vfio/next (1e4d09d2212d mdev: Send uevents around parent device registration)
Merging audit/next (5f9e832c1370 Linus 5.3-rc1)
Merging devicetree/for-next (7aa8dd91da63 devicetree: Expose dtbs_check and dt_binding_check some more)
CONFLICT (add/add): Merge conflict in Documentation/devicetree/writing-schema.rst
Merging mailbox/mailbox-for-next (25777e5784a7 mailbox: handle failed named mailbox channel request)
Merging spi/for-next (f27df9226672 Merge branch 'spi-5.4' into spi-next)
Merging tip/auto-latest (2230b8443ae0 Merge branch 'efi/core')
CONFLICT (content): Merge conflict in arch/ia64/include/asm/sn/sn_sal.h
Merging clockevents/clockevents/next (012bb0283514 clocksource/drivers/renesas-ostm: Use DIV_ROUND_CLOSEST() helper)
Merging edac/edac-for-next (718d58514ebc EDAC/mc: Cleanup _edac_mc_free() code)
Merging irqchip/irq/irqchip-next (3dae67ce600c irqchip/gic-pm: Remove PM_CLK dependency)
Merging ftrace/for-next (6d54ceb539aa tracing: Fix user stack trace "??" output)
Merging rcu/rcu/next (07f038a408fb Merge LKMM and RCU commits)
Merging kvm/linux-next (a738b5e75b4c Merge tag 'kvmarm-fixes-for-5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
Merging kvm-arm/next (07ab0f8d9a12 KVM: Call kvm_arch_vcpu_blocking early into the blocking sequence)
Merging kvm-ppc/kvm-ppc-next (3bda7f0ae0f7 KVM: PPC: Book3S PR: Fix software breakpoints)
Merging kvms390/next (a049a377164c KVM: selftests: Enable dirty_log_test on s390x)
Merging xen-tip/linux-next (b877ac9815a8 xen/swiotlb: remember having called xen_create_contiguous_region())
Merging percpu/for-next (03ed70fb0e5e Merge branch 'for-5.3' into for-next)
Merging workqueues/for-next (be69d00d9769 workqueue: Remove GPF argument from alloc_workqueue_attrs())
Merging drivers-x86/for-next (109e8adfbc66 platform/x86: asus-wmi: Remove unnecessary blank lines)
Merging chrome-platform/for-next (5f9e832c1370 Linus 5.3-rc1)
Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq())
Merging leds/for-next (3881a72f8d06 leds: pca953x: Include the right header)
Merging ipmi/for-next (2033f6858970 ipmi: Free receive messages when in an oops)
Merging driver-core/driver-core-next (2a77eec0d3ca devcoredump: fix typo in comment)
CONFLICT (content): Merge conflict in drivers/base/power/runtime.c
Merging usb/usb-next (7ffc95e90e30 Merge 5.3-rc5 into usb-next)
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
Merging usb-gadget/next (b2357839c56a usb: renesas_usbhs: add a workaround for a race condition of workqueue)
Merging usb-serial/usb-next (e21a712a9685 Linux 5.3-rc3)
Merging usb-chipidea-next/ci-for-usb-next (034252e37b31 usb: chipidea: msm: Use devm_platform_ioremap_resource())
Merging phy-next/next (609488bc979f Linux 5.3-rc2)
Merging tty/tty-next (591f935db448 serial: mxs-auart: Don't check for mctrl_gpio_to_gpiod() returning error)
Merging char-misc/char-misc-next (e70c971d7d8a Merge 5.3-rc5 into char-misc-next)
Merging extcon/extcon-next (a3fc57233977 extcon: adc-jack: Remove dev_err() usage after platform_get_irq())
Merging soundwire/next (15ed3ea2280e soundwire: bus: split handling of Device0 events)
Merging thunderbolt/next (04f7745300ed thunderbolt: Show key using %*pE not %*pEp)
Merging staging/staging-next (c6d6832ce398 Merge 5.3-rc5 into staging-next)
Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (dcc31687b8b9 interconnect: qcom: remove COMPILE_TEST from CONFIG_INTERCONNECT_QCOM_QCS404)
Merging slave-dma/next (7607a121f461 dmaengine: fsldma: Mark expected switch fall-through)
Merging cgroup/for-next (653a23ca7e1e Use kvmalloc in cgroups-v1)
Merging scsi/for-next (182747f87687 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c
Merging scsi-mkp/for-next (c54591a3c8b8 Merge branch '5.4/scsi-queue' into 5.4/scsi-next)
Merging vhost/linux-next (73f628ec9e6b vhost: disable metadata prefetch optimization)
Merging rpmsg/for-next (7f1345e9efcc Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (984078b26420 Merge branch 'devel' into for-next)
Merging gpio-brgl/gpio/for-next (f2ee73147a3f gpio: lpc32xx: allow building on non-lpc32xx targets)
CONFLICT (content): Merge conflict in include/linux/gpio/driver.h
Merging gpio-intel/for-next (a7db285664dd gpio: pch: Use dev_get_drvdata)
Merging pinctrl/for-next (dcd12a00f45f Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (6cb0880f0822 pinctrl: intel: remap the pin number to gpio offset for irq enabled pin)
Merging pinctrl-samsung/for-next (10971e2ab6eb pinctrl: samsung: Fix device node refcount leaks in init code)
Merging pwm/for-next (6cf9481b440d pwm: Fallback to the static lookup-list when acpi_pwm_get fails)
Merging userns/for-next (318759b4737c signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus)
Merging ktest/for-next (aecea57f84b0 ktest: Fix some typos in config-bisect.pl)
Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool)
Merging kselftest/next (0ac33e4e9b5e selftests: use "$(MAKE)" instead of "make")
Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI)
CONFLICT (content): Merge conflict in arch/riscv/include/uapi/asm/unistd.h
Merging livepatching/for-next (1cfe141e1715 Merge branch 'for-5.4-core' into for-next)
Merging coresight/next (a7a03a695648 coresight: tmc-etr: Fix updating buffer in not-snapshot mode.)
Merging rtc/rtc-next (b0a3fa44659c rtc: mxc: use spin_lock_irqsave instead of spin_lock_irq in IRQ context)
Merging nvdimm/libnvdimm-for-next (cb3110f7452d Merge branch 'for-5.3/dax' into libnvdimm-for-next)
Merging at24/at24/for-next (10742fee98eb eeprom: at24: remove unneeded include)
Merging ntb/ntb-next (5f9e832c1370 Linus 5.3-rc1)
Merging kspp/for-next/kspp (60f2c82ed20b randstruct: Check member structs in is_pure_ops_struct())
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (f2c7c76c5d0a Linux 5.2-rc3)
Merging fsi/next (371975b0b075 fsi/core: Fix error paths on CFAM init)
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
Merging slimbus/for-next (0a43bffb7e21 slimbus: fix slim_tid_txn())
Merging nvmem/for-next (8555b95dbd8b nvmem: imx: add i.MX8QM platform support)
Merging xarray/xarray (91abab83839a XArray: Fix xas_next() with a single entry at 0)
Merging hyperv/hyperv-next (221f6df008ab hv_balloon: Reorganize the probe function)
Merging auxdisplay/auxdisplay (30f48c108abe auxdisplay: ht16k33: Make ht16k33_fb_fix and ht16k33_fb_var constant)
Merging kgdb-dt/kgdb/for-next (ca976bfb3154 kdb: Fix bound check compiler warning)
Merging pidfd/for-next (590ef0128b42 waitid: Add support for waiting for the current process group)
Merging devfreq/for-next (26f9b841c455 PM / devfreq: tegra20: add COMMON_CLK dependency)
Merging hmm/hmm (3dc05ddf9aaa mm/mmu_notifiers: check if mmu notifier callbacks are allowed to fail)
Merging fpga/for-next (7d62460b4060 MAINTAINERS: Move linux-fpga tree to new location)
Merging akpm-current/current (e25aee40a9ef ipc/msg.c: consolidate all xxxctl_down() functions)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/processor.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: pinctrl: fix pxa2xx.c build warnings
Applying: lib: untag user pointers in strn*_user
Applying: mm: untag user pointers passed to memory syscalls
Applying: mm: untag user pointers in mm/gup.c
Applying: mm: untag user pointers in get_vaddr_frames
Applying: fs/namespace: untag user pointers in copy_mount_options
Applying: userfaultfd: untag user pointers
Applying: drm/amdgpu: untag user pointers
Applying: drm/radeon: untag user pointers in radeon_gem_userptr_ioctl
Applying: media/v4l2-core: untag user pointers in videobuf_dma_contig_user_get
Applying: tee/shm: untag user pointers in tee_shm_register
Applying: vfio/type1: untag user pointers in vaddr_get_pfn
Applying: mm: treewide: clarify pgtable_page_{ctor,dtor}() naming
Applying: drivers/tty/serial/sh-sci.c: suppress warning
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (c0092990167e drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: Tree for Aug 20
@ 2018-08-20  5:25 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2018-08-20  5:25 UTC (permalink / raw)
  To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 32112 bytes --]

Hi all,

Please do not add any v4.20 material to your linux-next included
branches until after v4.19-rc1 has been released.

Changes since 20180817:

The akpm-current tree gained conflicts against the tip tree.

Non-merge commits (relative to Linus' tree): 2346
 2426 files changed, 93635 insertions(+), 35418 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 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 286 trees (counting Linus' and 65 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 (2ad0d5269970 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging kbuild-current/fixes (08b5fa819970 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging arc-current/for-curr (fce0d0affdc5 ARC: cleanup show_faulting_vma())
Merging arm-current/fixes (afc9f65e01cd ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+)
Merging arm64-fixes/for-next/fixes (5ad356eabc47 arm64: mm: check for upper PAGE_SHIFT bits in pfn_valid())
Merging m68k-current/for-linus (71a896687b85 m68k/defconfig: Update defconfigs for v4.18-rc6)
Merging powerpc-fixes/fixes (cca19f0b684f powerpc/64s/radix: Fix missing global invalidations when removing copro)
Merging sparc/master (c1d61e7fe376 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (e2948e5af8ee ip6_vti: fix creating fallback tunnel device for vti6)
Merging bpf/master (f6069b9aa993 bpf: fix redirect to map under tail calls)
Merging ipsec/master (25432eba9cd8 openvswitch: meter: Fix setting meter id for new entries)
Merging netfilter/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set)
Merging wireless-drivers/master (299b6365a3b7 brcmfmac: fix regression in parsing NVRAM for multiple devices)
Merging mac80211/master (484004339d45 mac80211_hwsim: require at least one channel)
Merging rdma-fixes/for-rc (addb8a6559f0 RDMA/uverbs: Expand primary and alt AV port checks)
Merging sound-current/for-linus (250ea7c5f56e ALSA: ac97: fix unbalanced pm_runtime_enable)
Merging sound-asoc-fixes/for-linus (ba095ffc9324 Merge branch 'asoc-4.18' into asoc-linus)
Merging regmap-fixes/for-linus (94710cac0ef4 Linux 4.18)
Merging regulator-fixes/for-linus (84d77c5ab32d Merge branch 'regulator-4.18' into regulator-linus)
Merging spi-fixes/for-linus (8a7c14551b9b Merge branch 'spi-4.18' into spi-linus)
Merging pci-current/for-linus (44bda4b7d26e PCI: Fix is_added/is_busmaster race condition)
Merging driver-core.current/driver-core-linus (08b5fa819970 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tty.current/tty-linus (08b5fa819970 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging usb.current/usb-linus (08b5fa819970 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging usb-gadget-fixes/fixes (acb1872577b3 Linux 4.18-rc7)
Merging usb-serial-fixes/usb-linus (9d3cce1e8b85 Linux 4.18-rc5)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code)
Merging phy/fixes (ad5003300b07 phy: mapphone-mdm6600: Fix wrong enum used for status lines)
Merging staging.current/staging-linus (08b5fa819970 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging char-misc.current/char-misc-linus (3d27c4de8d4f Revert "uio: use request_threaded_irq instead")
Merging input-current/for-linus (13fe7056bebb Merge branch 'next' into for-linus)
Merging crypto-current/master (22240df7ac6d crypto: arm64/ghash-ce - implement 4-way aggregation)
Merging ide/master (a2eed33dcdb7 ide: mark expected switch fall-throughs)
Merging vfio-fixes/for-linus (0e714d27786c vfio/pci: Fix potential Spectre v1)
Merging kselftest-fixes/fixes (ce397d215ccd Linux 4.18-rc1)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
Merging slave-dma-fixes/fixes (1e4b044d2251 Linux 4.18-rc4)
Merging backlight-fixes/for-backlight-fixes (ce397d215ccd Linux 4.18-rc1)
Merging mtd-fixes/master (aa7eee8a143a mtd: spi-nor: cadence-quadspi: Fix direct mode write timeouts)
Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check)
Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1)
Merging mfd-fixes/for-mfd-fixes (ce397d215ccd Linux 4.18-rc1)
Merging v4l-dvb-fixes/fixes (8eb0e6421958 media: v4l: vsp1: Fix deadlock in VSPDL DRM pipelines)
Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0)
Merging mips-fixes/mips-fixes (d5ea019f8a38 Revert "MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum")
Merging omap-fixes/fixes (0aa5348bf8c9 arm: dts: am4372: setup rtc as system-power-controller)
Merging kvm-fixes/master (63aff65573d7 kvm: x86: vmx: fix vpid leak)
Merging kvms390-fixes/master (f4a551b72358 KVM: s390: vsie: fix < 8k check for the itdba)
Merging hwmon-fixes/hwmon (a1648cc8eb9d hwmon: (nct6775) Fix potential Spectre v1)
Merging nvdimm-fixes/libnvdimm-fixes (ee6581ceba7f nfit: fix unchecked dereference in acpi_nfit_ctl)
Merging btrfs-fixes/next-fixes (0b7162742121 Merge branch 'for-next-current-v4.18-20180717' into next-fixes)
Merging vfs-fixes/fixes (4c0d7cd5c841 make sure that __dentry_kill() always invalidates d_seq, unhashed or not)
Merging dma-mapping-fixes/for-linus (7ec916f82c48 Revert "iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()")
Merging drivers-x86-fixes/fixes (2502e5a02593 platform/x86: dell-laptop: Fix backlight detection)
Merging samsung-krzk-fixes/fixes (ce397d215ccd Linux 4.18-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (ce397d215ccd Linux 4.18-rc1)
Merging devicetree-fixes/dt/linus (b9952b5218ad of: overlay: update phandle cache on overlay apply and remove)
Merging scsi-fixes/fixes (e95153b64d03 scsi: vmw_pvscsi: Return DID_RESET for status SAM_STAT_COMMAND_TERMINATED)
Merging drm-fixes/drm-fixes (51973dc079a9 Merge tag 'drm-misc-fixes-2018-07-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (94710cac0ef4 Linux 4.18)
Merging mmc-fixes/fixes (3b1074bf9817 mmc: mxcmmc: Fix missing parentheses and brace)
Merging rtc-fixes/rtc-fixes (fd6792bb022e rtc: fix alarm read and set offset)
Merging drm-misc-fixes/for-linux-next-fixes (404fb5c9ef26 drm/vc4: Fix the "no scaling" case on multi-planar YUV formats)
Merging kbuild/for-next (78914dad3d2f export.h: remove VMLINUX_SYMBOL() and VMLINUX_SYMBOL_STR())
Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address)
Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
Merging dma-mapping/for-next (6fa1d28e38cf sh: use generic dma_noncoherent_ops)
Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers)
Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging arm/for-next (6f6874f70c32 Merge branch 'clkdev' into for-next)
Merging arm-perf/for-next/perf (809092dc3e60 drivers/perf: arm-ccn: Use devm_ioremap_resource() to map memory)
Merging arm-soc/for-next (cd0a9070a96a arm-soc: Document merges)
Merging actions/for-next (35afadd11222 Merge branch 'v4.19/drivers' into next)
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
Merging amlogic/for-next (a1cec9f3baab Merge branch 'v4.19/dt64' into tmp/aml-rebuild)
Merging aspeed/for-next (c224edaa4a46 Merge branches 'defconfig-for-v4.19' and 'dt-for-v4.19' into for-next)
Merging at91/at91-next (f45853da06e3 Merge tag 'at91-ab-4.19-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (5997adb14985 Merge branch anholt/bcm2835-defconfig-64-next into for-next)
CONFLICT (content): Merge conflict in drivers/hwmon/Kconfig
CONFLICT (content): Merge conflict in drivers/firmware/raspberrypi.c
Merging imx-mxs/for-next (7586f152bcad Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (ed3bf0f321b9 Merge branch 'for_4.19/drivers-soc' into next)
Merging mediatek/for-next (b75253e66bc5 Merge branch 'v4.18-next/soc' into for-next)
Merging mvebu/for-next (23b7c60b80f6 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (d356801075c5 Merge branch 'omap-for-v4.19/dt' into for-next)
Merging reset/reset/next (d903779b58be reset: meson: add meson audio arb driver)
Merging qcom/for-next (76b9e7f947f1 Merge tag 'qcom-defconfig-for-4.19' into all-for-4.19)
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
Merging renesas/next (7e58fb78c672 Merge branches 'fixes-for-v4.18', 'arm-defconfig-for-v4.19', 'arm-soc-for-v4.19', 'arm-dt-for-v4.19', 'arm64-defconfig-for-v4.19', 'arm64-dt-for-v4.19' and 'dt-bindings-for-v4.19' into next)
Merging rockchip/for-next (3d546dd75ef4 Merge branch 'v4.20-armsoc/dts64' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (babb70ce9674 Merge branch 'next/soc' into for-next)
Merging sunxi/sunxi/for-next (51c756fe7803 Merge branch 'sunxi/dt64-for-4.19' into sunxi/for-next)
Merging tegra/for-next (f29cfb31cf00 Merge branch for-4.19/arm64/dt into for-next)
Merging arm64/for-next/core (3c4d9137eefe arm64: alternative: Use true and false for boolean values)
Merging clk/clk-next (ac7da1b787d9 Merge branches 'clk-actions-s700', 'clk-exynos-unused', 'clk-qcom-dispcc-845', 'clk-scmi-round' and 'clk-cs2000-spdx' into clk-next)
Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata)
Merging c6x/for-linux-next (31b02fe54206 c6x: switch to NO_BOOTMEM)
Merging h8300/h8300-next (724d2da5ebca h8300: Add missing output register.)
Merging m68k/for-next (71a896687b85 m68k/defconfig: Update defconfigs for v4.18-rc6)
Merging m68knommu/for-next (58064e1f46b1 m68knommu: Fix typos in Coldfire 5272 DMA debug code)
Merging microblaze/next (9fe37714c13c microblaze: delete wrong comment about machine_early_init)
Merging mips/mips-next (bba2c7385248 MIPS: Workaround GCC __builtin_unreachable reordering bug)
Merging nds32/next (efd00fbeec82 nds32: add NULL entry to the end of_device_id array)
Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock())
Merging openrisc/for-next (5600779ea5f3 openrisc: use generic dma_noncoherent_ops)
Merging parisc-hd/for-next (9e0d5c451f9e parisc: Consolidate unwind initialization calls)
Merging powerpc/next (a2dc009afa9a powerpc/mm/book3s/radix: Add mapping statistics)
Merging hvc/topic/hvc (9f65b81f36e3 tty: hvc: introduce the hv_ops.flush operation for hvc drivers)
Merging fsl/next (bd96461249bd powerpc/dts/fsl: t2080rdb: use the Cortina PHY driver compatible)
Merging risc-v/for-next (627672cf431b dt-bindings: interrupt-controller: SiFive Plaform Level Interrupt Controller)
Merging s390/features (28b7465376b9 s390/kdump: Remove kzalloc_panic)
Merging sparc-next/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
Merging uml/linux-next (5ec9121195a4 um: Fix raw interface options)
Merging xtensa/xtensa-for-next (f0f84837c6da xtensa: rework noMMU cache attributes initialization)
Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm implementations)
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
Merging btrfs/next (29dcea88779c Linux 4.17)
Merging btrfs-kdave/for-next (1e5f18740238 Merge branch 'for-next-current-v4.19-20180817' into for-next-20180817)
Merging ceph/master (0fcf6c02b205 ceph: don't drop message if it contains more data than expected)
Merging cifs/for-next (eeeb8acbfad2 number of iovs in smb3.1.1 open could overflow)
Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal)
Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion bugs)
Merging ext3/for_next (6aee47d7f61e Pull in fsnotify cleanups from Amir and new inotify IN_MASK_CREATE flag support.)
Merging ext4/dev (863c37fcb14f ext4: remove unneeded variable "err" in ext4_mb_release_inode_pa())
Merging f2fs/dev (58591a4b5735 f2fs: avoid fi->i_gc_rwsem[WRITE] lock in f2fs_gc)
CONFLICT (content): Merge conflict in fs/f2fs/data.c
Merging fuse/for-next (963545357202 fuse: reduce allocation size for splice_write)
Merging jfs/jfs-next (bd646104ac5a jfs: use time64_t for otime)
Merging nfs/linux-next (94710cac0ef4 Linux 4.18)
Merging nfs-anna/linux-next (6c9c168be0c2 pNFS/flexfiles: ff_layout_pg_init_read should exit on error)
Merging nfsd/nfsd-next (df02211afe8e NFSD stop ongoing async copies on client shutdown)
Merging orangefs/for-next (e1b437691a62 orangefs: remove redundant pointer orangefs_inode)
Merging overlayfs/overlayfs-next (9475938ce8cf ovl: set I_CREATING on inode being created)
Merging ubifs/linux-next (99a24e02ccf6 ubifs: Set default assert action to read-only)
Merging v9fs/9p-next (edcd9d977354 net/9p/trans_virtio.c: add null terminal for mount tag)
Merging xfs/for-next (7d5e049e72c4 iomap: fix WARN_ON_ONCE on uninitialized variable)
Merging file-locks/locks-next (10f3e23f07cb Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging vfs/for-next (24979defe7ce Merge branch 'work.mount' into for-next)
CONFLICT (content): Merge conflict in include/linux/fs.h
Applying: vfs: samples: fix up for HOSTLOADLIBES rename
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (a4322becd21e Merge branch 'for-4.19-nmi' into for-next)
Merging pci/next (fa687fb9ced4 Merge branch 'remotes/lorenzo/pci/vmd')
Merging pstore/for-next/pstore (1021bcf44d0e pstore: add zstd compression support)
Merging hid/for-next (872d1282470b Merge branch 'for-4.19/intel-ish' into for-next)
Merging i2c/i2c/for-next (3c0f4de9fd61 Merge branch 'i2c/for-current' into i2c/for-next)
Merging dmi/master (7f73745fec52 firmware: dmi: Add access to the SKU ID string)
Merging hwmon-staging/hwmon-next (4afec79f652b hwmon: (adt7475) Change show functions to return error data correctly)
Merging jc_docs/docs-next (3d83d3188460 Documentation: corrections to console/console.txt)
Merging v4l-dvb/master (da2048b7348a Revert "media: vivid: shut up warnings due to a non-trivial logic")
Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED())
Merging fbdev/fbdev-for-next (f39684524b39 Documentation/fb: corrections for fbcon.txt)
Merging pm/linux-next (fa4b5c46cddb Merge branch 'pm-cpuidle' into linux-next)
Merging cpupower/cpupower (1d83ddc13680 cpupower: change strncpy+truncation to strlcpy)
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
Merging opp/opp/linux-next (c5c2a97b3ac7 PM / OPP: Update voltage in case freq == old_freq)
Merging thermal/next (5043f06ecec6 MAINTAINERS: Add Daniel Lezcano as designated reviewer for thermal)
Merging thermal-soc/next (84b64de597bc thermal: armada: fix copy-paste error in armada_thermal_probe())
Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers)
Merging dlm/next (da3627c30d22 dlm: remove O_NONBLOCK flag in sctp_connect_to_sock)
Merging swiotlb/linux-next (4855c92dbb7b xen-swiotlb: fix the check condition for xen_swiotlb_free_coherent)
Merging rdma/for-next (0a3173a5f09b Merge branch 'linus/master' into rdma.git for-next)
Merging net-next/master (d01e12dd3f42 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal)
Merging bpf-next/master (9a76aba02a37 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
Merging ipsec-next/master (ba7f4b3a3810 xfrm: Make function xfrmi_get_link_net() static)
Merging mlx5-next/mlx5-next (664000b6bb43 net/mlx5: Add support for flow table destination number)
Merging netfilter-next/master (26a1ccc6c117 bpf: test: fix spelling mistake "REUSEEPORT" -> "REUSEPORT")
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
Merging ipvs-next/master (26a1ccc6c117 bpf: test: fix spelling mistake "REUSEEPORT" -> "REUSEPORT")
Merging wireless-drivers-next/master (209b43759d65 ssb: Remove SSB_WARN_ON, SSB_BUG_ON and SSB_DEBUG)
Merging bluetooth/master (9a76aba02a37 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
Merging mac80211-next/master (3a9536e5e459 mac80211_hwsim: Fix possible Spectre-v1 for hwsim_world_regdom_custom)
Merging gfs2/for-next (f5580d0f8bf6 gfs2: eliminate update_rgrp_lvb_unlinked)
Merging mtd/mtd/next (9805d4bcf8f9 mtd: rawnand: atmel: Select GENERIC_ALLOCATOR)
Merging nand/nand/next (ed128e8b757b MAINTAINERS: drop Wenyou Yang from Atmel NAND driver support)
Merging spi-nor/spi-nor/next (bb276262e88d mtd: spi-nor: only apply reset hacks to broken hardware)
Merging crypto/master (22240df7ac6d crypto: arm64/ghash-ce - implement 4-way aggregation)
Merging drm/drm-next (3d63a3c14741 Merge tag 'drm-msm-next-2018-08-10' of git://people.freedesktop.org/~robclark/linux into drm-next)
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (4795ac626a2f Merge tag 'gvt-next-fixes-2018-08-14' of https://github.com/intel/gvt-linux into drm-intel-next-fixes)
Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc for UAPI)
Merging drm-misc/for-linux-next (4acd8d01a239 MAINTAINERS: drm-misc: Change seanpaul's email address)
Merging drm-msm/msm-next (546907de9952 drm/msm: a6xx: fix spelling mistake: "initalization" -> "initialization")
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
Merging mali-dp/for-upstream/mali-dp (e368fc75c190 drm/arm/malidp: Added the late system pm functions)
Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next)
Merging imx-drm/imx-drm/next (5c41bb607125 gpu: ipu-v3: add support for XRGB32 and XBGR32 V4L2 pixel formats)
Merging etnaviv/etnaviv/next (5b1474655323 drm/etnaviv: fix crash in GPU suspend when init failed due to buffer placement)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (94710cac0ef4 Linux 4.18)
Merging sound/for-next (250ea7c5f56e ALSA: ac97: fix unbalanced pm_runtime_enable)
Merging sound-asoc/for-next (1545281d92f0 Merge branch 'asoc-4.19' into asoc-next)
Merging modules/modules-next (9be936f4b3a2 kernel/module: Use kmemdup to replace kmalloc+memcpy)
Merging input/next (100294cee9a9 Input: do not use WARN() in input_alloc_absinfo())
Merging block/for-next (9dd1947c690d Merge branch 'for-4.19/post' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (1e1132ea21da dm writecache: fix a crash due to reading past end of dirty_bitmap)
Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers)
Merging mmc/next (7f38abf220e2 mmc: core: improve reasonableness of bus width setting for HS400es)
Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy)
Merging md/for-next (d63e2fc804c4 md/raid5: fix data corruption of replacements after originals dropped)
Merging mfd/for-mfd-next (d2c9281c184b mfd: madera: Add register definitions for accessory detect)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig
CONFLICT (content): Merge conflict in MAINTAINERS
Merging backlight/for-backlight-next (633786736ed5 backlight: pwm_bl: Fix uninitialized variable)
Merging battery/for-next (5198a4838145 Merge branch 'psy-fixes' into psy-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging regulator/for-next (35050de31c32 Merge branch 'regulator-4.19' into regulator-next)
Merging security/next-testing (d83c732fffc3 Merge branch 'smack-for-4.19-a' of https://github.com/cschaufler/next-smack into next-testing)
Merging apparmor/apparmor-next (24b87a16fee0 apparmor: Fix failure to audit context info in build_change_hat)
Merging integrity/next-integrity (3dd0f18c70d9 EVM: fix return value check in evm_write_xattrs())
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting)
Merging selinux/next (7e4237faa721 selinux: cleanup dentry and inodes on error in selinuxfs)
Merging tpmdd/next (ec403d8ed08c ima: Get rid of ima_used_chip and use ima_tpm_chip != NULL instead)
Merging watchdog/master (12aea518a202 watchdog: fix dependencies of menz69_wdt.o)
Merging iommu/next (6488a7f35eea Merge branches 'arm/shmobile', 'arm/renesas', 'arm/msm', 'arm/smmu', 'arm/omap', 'x86/amd', 'x86/vt-d' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/iommu/ipmmu-vmsa.c
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
Merging vfio/next (0dd0e297f0ec vfio-pci: Disable binding to PFs with SR-IOV enabled)
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
Merging audit/next (baa2a4fdd525 audit: fix use-after-free in audit_add_watch)
Merging devicetree/for-next (f11b9abc9318 Documentation: remove dynamic-resolution-notes reference to non-existent file)
Merging mailbox/mailbox-for-next (2bb7005696e2 mailbox: Add support for i.MX messaging unit)
Merging spi/for-next (d2aa98d1e493 Merge branch 'spi-4.19' into spi-next)
Merging tip/auto-latest (33747b70a837 Merge branch 'perf/urgent')
Merging clockevents/clockevents/next (6bd9549d8a7d clocksource/drivers/arc_timer: Add comments about locking while read GFRC)
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (190bd6e98afc EDAC, sb_edac: Add support for systems with segmented PCI buses)
Merging irqchip/irq/irqchip-next (f3b28362b683 irqchip/s3c24xx: Remove unneeded comparison of unsigned long to 0)
Merging ftrace/for-next (bb730b5833b5 tracing: Fix SPDX format headers to use C++ style comments)
CONFLICT (content): Merge conflict in kernel/events/uprobes.c
Merging rcu/rcu/next (d57fa29ddc3c Merge LKMM and RCU commits)
Merging kvm/linux-next (fd8ca6dac9b4 KVM/x86: Use CC_SET()/CC_OUT in arch/x86/kvm/vmx.c)
Applying: kvm: x86: fix semantic conflict in platform init
Merging kvm-arm/next (976d34e2dab1 KVM: arm/arm64: Skip updating PTE entry if no change)
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpucaps.h
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (c066fafc595e KVM: PPC: Book3S HV: Use correct pagesize in kvm_unmap_radix())
Merging kvms390/next (237584619366 Merge tag 'hlp_stage1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvms390/next)
Merging xen-tip/linux-next (ef9cd8bae146 xen/ACPI: don't upload Px/Cx data for disabled processors)
Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods)
Merging workqueues/for-next (66448bc274ca workqueue: move function definitions within CONFIG_SMP block)
Merging drivers-x86/for-next (340fd4cff43f platform/x86: intel_punit_ipc: fix build errors)
Merging chrome-platform/for-next (40291fb75123 Merge tag 'ib-platform-chrome-mfd-move-cros-ec-transport-for-4.19' into working-branch-for-4.19)
Merging hsi/for-next (ce397d215ccd Linux 4.18-rc1)
Merging leds/for-next (2224f2ff9670 leds: ns2: Change unsigned to unsigned int)
Merging ipmi/for-next (a4fb7ddc6356 ipmi: kcs_bmc: don't change device name)
Merging driver-core/driver-core-next (08b5fa819970 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging usb/usb-next (08b5fa819970 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging usb-gadget/next (4ea438da76f4 usb: dwc3: gadget: Check MaxPacketSize from descriptor)
Merging usb-serial/usb-next (c8acfe0aadbe USB: serial: cp210x: implement GPIO support for CP2102N)
Merging usb-chipidea-next/ci-for-usb-next (ba0ab35a81de usb: chipidea: tegra: Use aligned DMA on Tegra114/124)
Merging phy-next/next (ec14b83a1ee4 phy: mvebu-cp110-comphy: switch to SPDX identifier)
Merging tty/tty-next (08b5fa819970 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging char-misc/char-misc-next (128f38041035 android: binder: Rate-limit debug and userspace triggered err msgs)
Merging extcon/extcon-next (838588289b76 extcon: maxim: Add SPDX license identifiers)
Merging staging/staging-next (08b5fa819970 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging mux/for-next (2c01260df661 mux: add mux_control_get_optional() API)
Merging slave-dma/next (39245da8313d Merge branch 'topic/owl' into next)
Merging cgroup/for-next (e4f8d81c738d cgroup/tracing: Move taking of spin lock out of trace event handlers)
Merging scsi/for-next (714d7fe777fc Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_init.c
Merging scsi-mkp/for-next (51372570ac3c scsi: core: use blk_mq_run_hw_queues in scsi_kick_queue)
Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1)
Merging libata/for-next (cc28cd5c6181 Merge branch 'for-4.19' into for-next)
Merging vhost/linux-next (89da619bc18d virtio_balloon: fix another race between migration and ballooning)
Merging rpmsg/for-next (326792e0d262 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (a5ec96ddfd55 gpio: it87: Add support for IT8613)
Merging pinctrl/for-next (c2944a9a09a2 pinctrl: nomadik: silence uninitialized variable warning)
Merging pinctrl-samsung/for-next (b3793159249b dt-bindings: pinctrl: samsung: Add SPDX license identifier)
Merging pwm/for-next (19ad2b75c643 pwm: mxs: Switch to SPDX identifier)
Merging userns/for-next (84fe4cc09abc signal: Don't send signals to tasks that don't exist)
Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
Merging random/dev (9a47249d444d random: Make crng state queryable)
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
Merging kselftest/next (01675e9503c4 selftests/ftrace: Fix kprobe string testcase to not probe notrace function)
Merging y2038/y2038 (e264abeaf9da pstore: Remove bogus format string definition)
Merging livepatching/for-next (c72a7f515329 Merge branch 'for-4.18/upstream' into for-next)
Merging coresight/next (a154bd6aec53 coresight: etm-perf: Add support for ETR backend)
Merging rtc/rtc-next (6b583a64fd1e rtc: ds1307: simplify hwmon config)
Merging nvdimm/libnvdimm-for-next (9103365c3acd libnvdimm: fix ars_status output length calculation)
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging at24/at24/for-next (a2b3bf4846e5 eeprom: at24: Add support for address-width property)
Merging ntb/ntb-next (b1ce023ae8a2 ntb_netdev: fix sleep time mismatch)
Merging kspp/for-next/kspp (31a5f9d04cd8 Merge branch 'for-next/gcc-plugin/stackleak' into for-next/kspp)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Merging cisco/for-next (ce397d215ccd Linux 4.18-rc1)
Merging xarray/xarray (8d7cf3e16ed4 radix tree: Remove radix_tree_clear_tags)
CONFLICT (content): Merge conflict in fs/dax.c
CONFLICT (content): Merge conflict in MAINTAINERS
Merging fsi/master (15e2a7218c27 fsi: sbefifo: Bump max command length)
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
Merging ida/ida (e204222244f0 ida: Convert to XArray)
Applying: partial revert of no longer needed kvm merge fix
Merging akpm-current/current (49e227e039e5 ipc/util.c: update return value of ipc_getref from int to bool)
CONFLICT (content): Merge conflict in include/linux/sched.h
CONFLICT (content): Merge conflict in include/linux/kcore.h
CONFLICT (content): Merge conflict in fs/proc/kcore.c
CONFLICT (content): Merge conflict in drivers/md/bcache/util.h
CONFLICT (content): Merge conflict in drivers/md/bcache/Kconfig
Applying: fixup for bit.h/bitops.h merge
Applying: merge fix up for "signal: Pass pid type into group_send_sig_info"
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/hwtracing/intel_th/msu.c: change return type to vm_fault_t
Applying: fs/afs: use new return type vm_fault_t
Applying: treewide: correct "differenciate" and "instanciate" typos
Applying: fs/proc/vmcore.c: hide vmcoredd_mmap_dumps() for nommu builds
Applying: mm/util: make strndup_user description a kernel-doc comment
Applying: mm/util: add kernel-doc for kvfree
Applying: docs/core-api: kill trailing whitespace in kernel-api.rst
Applying: docs/core-api: move *{str,mem}dup* to "String Manipulation"
Applying: docs/core-api: split memory management API to a separate file
Applying: docs/mm: make GFP flags descriptions usable as kernel-doc
Applying: docs/core-api: mm-api: add section about GFP flags
Applying: drivers/gpu/drm/gma500/: change return type to vm_fault_t
Applying: treewide: convert ISO_8859-1 text comments to utf-8
Applying: s390: ebcdic: convert comments to UTF-8
Applying: lib/fonts: convert comments to utf-8
Applying: mm: Change return type int to vm_fault_t for fault handlers
Applying: mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix
Applying: vfs: replace current_kernel_time64 with ktime equivalent
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (635ab8038966 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: Tree for Aug 20
@ 2015-08-20 10:37 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2015-08-20 10:37 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

Hi all,

Changes since 20150819:

The tile tree gained a conflict against the microblaze tree.

The nfs tree still had its build failure for which I disabled a staging
driver.

The net-next tree gained a build failure for which I reverted a commit.

The tip tree gained a conflict against the s390 tree.

The tty tree still had its build failure for which I reverted part of
a commit.

Non-merge commits (relative to Linus' tree): 8804
 7839 files changed, 459837 insertions(+), 193190 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 and an allmodconfig for x86_64,
a multi_v7_defconfig for arm and a native build of tools/perf. After
the final fixups (if any), it is also built with powerpc allnoconfig
(32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final
link) and i386, sparc, sparc64 and arm defconfig.

Below is a summary of the state of the merge.

I am currently merging 224 trees (counting Linus' and 33 trees of patches
pending for Linus' tree).

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                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (1b647a166f07 Merge tag 'dmaengine-fix-4.2-rc8' of git://git.infradead.org/users/vkoul/slave-dma)
Merging fixes/master (c7e9ad7da219 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify)
Merging arm-current/fixes (3939f3345050 ARM: 8418/1: add boot image dependencies to not generate invalid images)
Merging m68k-current/for-linus (1214c525484c m68k: Use for_each_sg())
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (f7644cbfcdf0 Linux 4.2-rc6)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave)
Merging net/master (fd7dec25a18f batman-adv: Fix memory leak on tt add with invalid vlan)
Merging ipsec/master (158cd4af8ded packet: missing dev_put() in packet_do_bind())
Merging sound-current/for-linus (e24b6c03a17b Merge tag 'asoc-v4.2-disable-topology' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (c9ddbac9c891 PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition)
Merging wireless-drivers/master (741e3b9902d1 rtlwifi: rtl8723be: Add module parameter for MSI interrupts)
Merging driver-core.current/driver-core-linus (cbfe8fa6cd67 Linux 4.2-rc4)
Merging tty.current/tty-linus (cbfe8fa6cd67 Linux 4.2-rc4)
Merging usb.current/usb-linus (f7644cbfcdf0 Linux 4.2-rc6)
Merging usb-gadget-fixes/fixes (c93e64e91248 usb: udc: core: add device_del() call to error pathway)
Merging usb-serial-fixes/usb-linus (d071a3cdd2e1 USB: qcserial: add HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module)
Merging staging.current/staging-linus (f7644cbfcdf0 Linux 4.2-rc6)
Merging char-misc.current/char-misc-linus (f7644cbfcdf0 Linux 4.2-rc6)
Merging input-current/for-linus (6b30c73e9f37 Input: elantech - add special check for fw_version 0x470f01 touchpad)
Merging crypto-current/master (b310c178e6d8 crypto: caam - fix memory corruption in ahash_final_ctx)
Merging ide/master (d681f1166919 ide: remove deprecated use of pci api)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (fe0d34d242fa module: weaken locking assertion for oops path.)
Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue)
Merging kselftest-fixes/fixes (fee50f3c8427 selftests/futex: Fix futex_cmp_requeue_pi() error handling)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (fb9caeedafe6 mfd: Remove MFD_CROS_EC_SPI depends on OF)
Merging drm-intel-fixes/for-linux-next-fixes (ed63baaf849e drm/i915: Avoid TP3 on CHV)
Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic)
Merging arc/for-next (af6c253b6158 ARCv2: IOC: Allow boot time disable)
Merging arm/for-next (4ed502fb82b8 Merge branch 'devel-stable' into for-next)
CONFLICT (content): Merge conflict in arch/arm/include/asm/Kbuild
Merging arm-perf/for-next/perf (fa8ad7889d83 arm: perf: factor arm_pmu core out to drivers)
Merging arm-soc/for-next (db5c5fd1b0dd arm-soc: document merges)
CONFLICT (modify/delete): arch/arm/kernel/psci.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of arch/arm/kernel/psci.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
$ git rm -f arch/arm/kernel/psci.c
Applying: ARM: fix for PSCI code movement
Merging at91/at91-next (253ebd4df402 Merge branch 'at91-4.3-defconfig' into at91-next)
CONFLICT (content): Merge conflict in arch/arm/mach-at91/sama5.c
CONFLICT (content): Merge conflict in arch/arm/configs/at91_dt_defconfig
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging berlin/berlin/for-next (d770e558e219 Linux 4.2-rc1)
Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M)
Merging imx-mxs/for-next (c746ef1b64e9 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (a6ba4234e474 ARM: dts: k2l: fix the netcp range size)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/k2l.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/k2hk.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/k2e.dtsi
Merging mvebu/for-next (adfc8c76d84a Merge branch 'mvebu/config' into mvebu/for-next)
Merging omap/for-next (b2a882022a1e Merge branch 'omap-for-v4.3/dt-v2' into for-next)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Merging qcom/qcom/for-next (4ae93a64be4f soc: qcom: smem: Fix errant private access)
Merging renesas/next (dd97771953c4 Merge branch 'heads/sh-drivers-for-v4.3' into next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (112129267f1a Merge branch 'v4.3-next/dt64-samsung' into for-next)
Merging samsung-krzk/for-next (87b0b2733351 Merge branch 'dt-for-next' into for-next)
Merging sunxi/sunxi/for-next (9d73c13a139c Merge branches 'sunxi/dt-for-4.3' and 'sunxi/defconfig-for-4.3' into sunxi/for-next)
Merging tegra/for-next (47061a497cc7 Merge branch for-4.3/defconfig into for-next)
Merging arm64/for-next/core (bf0c4e047324 arm64: kconfig: Move LIST_POISON to a safe value)
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
Merging c6x/for-linux-next (960a2741d5fd c67: irq: Use __handle_domain_irq())
Merging cris/for-next (1e4d6e13d050 cris: don't use module_init for non-modular core eeprom.c code)
CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
Merging h8300/h8300-next (99bcfda85f66 Revert "asm-generic: {get,put}_user ptr argument evaluate only 1 time")
Merging hexagon/linux-next (15978bfde3bb hexagon/time: Migrate to new 'set-state' interface)
Merging ia64/next (ae40b7e28752 Merge branch 'misc-4.2' into next)
Merging m68k/for-next (1ecb40643a9a m68k/bootinfo: Use kmemdup rather than duplicating its implementation)
Merging m68knommu/for-next (a7014b3034a5 m68k/coldfire: use PFN_DOWN macro)
Merging metag/for-next (3fe6942f0486 Documentation/features/vm: Meta2 is capable of THP)
Merging microblaze/next (bb88ba0946dd elf-em.h: move EM_MICROBLAZE to the common header)
Merging mips/mips-for-linux-next (1853ad00dae5 Merge branch '4.2-fixes' into mips-for-linux-next)
Merging nios2/for-next (81c9517e7ab4 nios2/time: Migrate to new 'set-state' interface)
Merging parisc-hd/for-next (9d37e6679dfd Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm)
Merging powerpc/next (acf6cec8365b powerpc/512x: silence a USB Kconfig dependency warning)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (4524cd093fa8 powerpc/t1023rdb/dts: set ifc nand chip select from 2 to 1)
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
Merging s390/features (42cfc6b590c5 s390/dcssblk: correct out of bounds array indexes)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (ff3e9a7307db tile/vdso: emit a GNU hash as well)
CONFLICT (content): Merge conflict in include/uapi/linux/elf-em.h
Merging uml/linux-next (bdbac7d0e2b3 um: Fix kernel mode fault condition)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (1203b34261e4 xtensa: fix threadptr reload on return to userspace)
Merging btrfs/next (5a5003df98d5 btrfs: delayed-ref: double free in btrfs_add_delayed_tree_ref())
Merging ceph/master (64c1797a9371 libceph: Remove spurious kunmap() of the zero page)
Merging cifs/for-next (6468ffb3e9da cifs: Fix use-after-free on mid_q_entry)
Merging ecryptfs/next (0dad87fcb732 eCryptfs: Delete a check before the function call "key_put")
Merging ext3/for_next (72d4d0e48995 quota: remove an unneeded condition)
Merging ext4/dev (bdfe0cbd746a Revert "ext4: remove block_device_ejected")
Merging f2fs/dev (22de5f8bf8c0 f2fs: skip checkpoint if there is no dirty and prefree segments)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry)
Merging gfs2/for-next (ea79f0ec7a38 GFS2: Make ht_parms static)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (69f230d907e8 NFS41/flexfiles: update inode after write finishes)
Applying: disable lustre for now
Merging nfsd/nfsd-next (5494e10316e3 nfsd: don't hold i_mutex over userspace upcalls)
Merging orangefs/for-next (600896a3b8b0 Orangefs: Swap order of include files)
Merging overlayfs/overlayfs-next (cdb672795876 ovl: lookup whiteouts outside iterate_dir())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (3d99e3fe13d4 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile)
Merging ubifs/linux-next (071a1f837f72 UGIFS: fix a typo in comment of ubifs_budget_req)
Merging xfs/for-next (5bb05d55f75f Merge branch 'xfs-misc-fixes-for-4.3-2' into for-next)
Merging file-locks/linux-next (ee296d7c5709 locks: inline posix_lock_file_wait and flock_lock_file_wait)
Merging vfs/for-next (0f1db7dee200 9p: cope with bogus responses from server in p9_client_{read,write})
Merging pci/next (f0d9ac7510ee Merge branches 'pci/host-dra7xx' and 'pci/host-iproc' into next)
CONFLICT (content): Merge conflict in drivers/pci/host/pcie-iproc.c
CONFLICT (content): Merge conflict in drivers/pci/host/Kconfig
Merging hid/for-next (14abe2e13099 Merge branch 'for-4.3/upstream' into for-next)
Merging i2c/i2c/for-next (3508ff0175aa Merge branch 'i2c/for-4.3' into i2c/for-next)
Merging jdelvare-hwmon/master (902fd32b7711 hwmon: (k10temp) Remove duplicate pci-id define)
Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging hwmon-staging/hwmon-next (ccf2dc51bc4a hwmon: (ltc2978) Add support for LTM4675)
Merging v4l-dvb/master (5d26c12b70e9 Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (438ad5646950 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (b1ebd835445e Merge branch 'for-4.3' into for-next)
Merging pm/linux-next (4803373ae0da Merge branch 'cpufreq-fixes' into linux-next)
CONFLICT (modify/delete): drivers/cpufreq/exynos-cpufreq.c deleted in HEAD and modified in pm/linux-next. Version pm/linux-next of drivers/cpufreq/exynos-cpufreq.c left in tree.
$ git rm -f drivers/cpufreq/exynos-cpufreq.c
Merging idle/next (aba5686671dc Merge branch 'cpuidle' into release)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (6ce87b2a60f1 Merge branches 'for-rc' and 'release' of .git into next)
Merging thermal-soc/next (1afb9c539dae thermal/cpu_cooling: update policy limits if clipped_freq < policy->max)
Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
Merging dlm/next (18df8a87bada dlm: sctp_accept_from_sock() can be static)
Merging swiotlb/linux-next (023600f192be swiotlb: do not export map_single function)
Merging slave-dma/next (04b4cafaf664 Merge branch 'for-linus' into next)
Merging net-next/master (def63be85fe7 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue)
CONFLICT (content): Merge conflict in drivers/net/usb/qmi_wwan.c
$ git am -3 ../patches/0001-Revert-lwtunnel-fix-memory-leak.patch
Applying: Revert "lwtunnel: fix memory leak"
Merging ipsec-next/master (e69948a0a530 net: Document xfrm4_gc_thresh and xfrm6_gc_thresh)
Merging wireless-drivers-next/master (a6bf49db8c94 Merge tag 'iwlwifi-next-for-kalle-2015-08-18' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
Merging bluetooth/master (0e7bd306e98c Bluetooth: Make the function sco_conn_del have a return type of void)
Merging rdma/for-next (153b7306b7c6 Merge branch 'hfi1-v4' into to-be-rebased/for-4.3)
Merging mtd/master (5f867db63473 mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict)
Merging l2-mtd/master (bc3e00f04cc1 mtd: pxa3xx_nand: add a default chunk size)
Merging crypto/master (8f183751a860 crypto: cmac - allow usage in FIPS mode)
CONFLICT (content): Merge conflict in arch/arm/configs/imx_v6_v7_defconfig
Merging drm/drm-next (294947a5c7f6 Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next)
CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig
Merging drm-panel/drm/panel/for-next (a33ee95f8f45 drm/bridge: Put Kconfig entries in a separate menu)
Merging drm-intel/for-linux-next (187474a69175 drm/i915: fix VBT parsing for SDVO child device mapping)
Merging drm-tegra/drm/tegra/for-next (459cc2c6800b drm/tegra: sor: Add HDMI support)
Merging drm-misc/topic/drm-misc (e8b4855b5dd3 drm: WARN_ON if a modeset driver uses legacy suspend/resume helpers)
Merging drm-exynos/exynos-drm/for-next (1b647a166f07 Merge tag 'dmaengine-fix-4.2-rc8' of git://git.infradead.org/users/vkoul/slave-dma)
Merging drm-msm/msm-next (d248b61f6114 drm/msm/dsi: Introduce DSI configuration module)
Merging sound/for-next (9430e547894d ALSA: usb-audio: Recurse before saving terminal properties)
Merging sound-asoc/for-next (be6b12576b55 Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm8960', 'asoc/topic/wm8983', 'asoc/topic/wm8996' and 'asoc/topic/xtensa' into asoc-next)
Merging modules/modules-next (5cfb203a304d modpost: abort if a module symbol is too long)
Merging input/next (95ecdc2549cc Input: cros_ec_keyb - replace KEYBOARD_CROS_EC dependency)
Merging block/for-next (1f8c703f92d3 Merge branch 'for-4.3/drivers' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (content): Merge conflict in drivers/md/dm.c
CONFLICT (content): Merge conflict in crypto/ccm.c
CONFLICT (content): Merge conflict in block/bounce.c
Applying: block: lustre: temporary fix for bio_endio API change
Merging device-mapper/for-next (bd49784fd1e8 dm stats: report precise_timestamps and histogram in @stats_list output)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (57e104864bc4 mmc: dw_mmc: add quirk for broken data transfer over scheme)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (fd1349c643ec md/raid5: ensure device failure recorded before write request returns.)
CONFLICT (content): Merge conflict in drivers/md/raid5.c
CONFLICT (content): Merge conflict in drivers/md/raid10.c
CONFLICT (content): Merge conflict in drivers/md/raid0.c
Merging mfd/for-mfd-next (8de4efdaf3db mfd: axp20x: Add a cell for the usb power_supply part of the axp20x PMICs)
Merging backlight/for-backlight-next (cca0ba2df3d4 backlight: Change the return type of backlight_update_status() to int)
Merging battery/master (b49d15d138aa twl4030_charger: fix compile error when TWL4030_MADC not available.)
Merging omap_dss2/for-next (2a17d7e80f1d fbcon: unconditionally initialize cursor blink interval)
Merging regulator/for-next (ba75083f8032 Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next)
Merging security/next (3e5f206c00f7 Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next)
CONFLICT (content): Merge conflict in security/yama/yama_lsm.c
Merging integrity/next (24fd03c87695 ima: update builtin policies)
Merging selinux/next (fda4d578ed0a selinux: explicitly declare the role "base_r")
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (1c4c7159ed24 Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging iommu/next (4d400e71a1ee Merge branches 'arm/omap', 'arm/msm', 'arm/smmu', 'arm/tegra', 'x86/vt-d', 'x86/amd', 'ppc/pamu' and 'core' into next)
Merging dwmw2-iommu/master (5dbaf90a6780 iommu/vt-d: Add initial shell of SVM support)
Merging vfio/next (a714ea5fa416 MAINTAINERS: Add vfio-platform sub-maintainer)
Merging jc_docs/docs-next (5699f871d2d5 scripts/kernel-doc: Adding cross-reference links to html documentation.)
Merging trivial/for-next (e5f6450c3f40 MAINTAINERS: update my e-mail address)
CONFLICT (modify/delete): drivers/regulator/max77843.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of drivers/regulator/max77843.c left in tree.
CONFLICT (content): Merge conflict in drivers/media/v4l2-core/videobuf2-memops.c
$ git rm -f drivers/regulator/max77843.c
Merging audit/next (15ce414b82b0 fixup: audit: implement audit by executable)
CONFLICT (content): Merge conflict in kernel/audit.c
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (76f90d76c27a of: Add vendor prefix for Sharp Microelectronics)
Merging mailbox/mailbox-for-next (86e488adaab7 mailbox: arm_mhu: reduce txpoll_period from 10ms to 1 ms)
Merging spi/for-next (b5ed3a470684 Merge remote-tracking branches 'spi/topic/stats' and 'spi/topic/xcomm' into spi-next)
Merging tip/auto-latest (489de182e85e Merge branch 'locking/core' into auto-latest)
CONFLICT (content): Merge conflict in arch/x86/entry/entry_64_compat.S
CONFLICT (content): Merge conflict in arch/s390/lib/uaccess.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/barrier.h
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7779.c
CONFLICT (modify/delete): arch/arm/mach-shmobile/intc-sh73a0.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/arm/mach-shmobile/intc-sh73a0.c left in tree.
$ git rm -f arch/arm/mach-shmobile/intc-sh73a0.c
Merging clockevents/clockevents/next (2b5cf544934f cris/time: Migrate to new 'set-state' interface)
Merging edac/linux_next (fa2ce64f85be sb_edac: support for Broadwell -EP and -EX)
Merging edac-amd/for-next (99e1dfb7d209 EDAC, mce_amd: Don't emit 'CE' for Deferred error)
Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (b44754d8262d ring_buffer: Allow to exit the ring buffer benchmark immediately)
Merging rcu/rcu/next (12d560f4ea87 rcu,locking: Privatize smp_mb__after_unlock_lock())
Merging kvm/linux-next (4d283ec908e6 x86/kvm: Rename VMX's segment access rights defines)
Merging kvm-arm/next (054167b3d551 arm: KVM: keep arm vfp/simd exit handling consistent with arm64)
Merging kvm-ppc/kvm-ppc-next (b79013b2449c Merge tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging)
Merging kvms390/next (152b28392a8d KVM: s390: Fix assumption that kvm_set_irq_routing is always run successfully)
Merging xen-tip/linux-next (d09b9107c46e xen/xenbus: Rename the variable xen_store_mfn to xen_store_gfn)
CONFLICT (content): Merge conflict in arch/x86/xen/enlighten.c
CONFLICT (content): Merge conflict in arch/x86/xen/Makefile
Merging percpu/for-next (292c24a073ee percpu: clean up of schunk->map[] assignment in pcpu_setup_first_chunk)
Merging workqueues/for-next (355c06633e23 workqueue: fix some docbook warnings)
Merging drivers-x86/for-next (6d212b8adce4 ideapad-laptop: add alternative representation for Yoga 2 to DMI table)
Merging chrome-platform/for-next (96cba9b00e29 platform/chrome: chromeos_laptop - instantiate Atmel at primary address)
Merging regmap/for-next (917e95733ed4 Merge remote-tracking branches 'regmap/topic/raw' and 'regmap/topic/seq-delay' into regmap-next)
Applying: mfd: Fixup clients of multi_reg_write/register_patch
Merging hsi/for-next (d770e558e219 Linux 4.2-rc1)
Merging leds/for-next (c5d39d96ac57 leds/led-class: Add missing put_device())
Merging ipmi/for-next (7275cc8fd407 ipmi: Make some data const that was only read)
Merging driver-core/driver-core-next (71db87ba5700 bus: subsys: update return type of ->remove_dev() to void)
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c
Merging tty/tty-next (c868cbb7e5c6 serial: imx: save and restore context in the suspend path)
Applying: serial: imx: partial revert of "introduce serial_imx_enable_wakeup()"
Merging usb/usb-next (44840dec6127 USB: qcserial: add HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module)
Merging usb-gadget/next (2f3cc24f07b8 usb: musb: gadget: fix build break by adding missing 'break')
Merging usb-serial/usb-next (26c78daade0f USB: io_ti: Add heartbeat to keep idle EP/416 ports from disconnecting)
Merging staging/staging-next (415bcb5c6eff staging/lustre/o2iblnd: remove references to ib_reg_phsy_mr())
CONFLICT (modify/delete): drivers/staging/ozwpan/ozproto.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/ozwpan/ozproto.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
$ git rm -f drivers/staging/ozwpan/ozproto.c
Applying: staging/lustre: fix for bio_endio() API change
Applying: reenable lustre
Merging char-misc/char-misc-next (672cfeeb93e5 Merge tag 'extcon-next-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-testing)
CONFLICT (content): Merge conflict in drivers/misc/ti-st/st_kim.c
Applying: Drivers: hv: vmbus: fix for the removal of rdtscll()
Merging extcon/extcon-next (ac22a1d3386e extcon: palmas: Fix build break due to devm_gpiod_get_optional API change)
Merging kdbus/kdbus (a36324913ff2 kdbus: selftests: add more name registry tests)
Merging cgroup/for-next (4864ab126c9c Merge branch 'for-4.3' into for-next)
Merging scsi/for-next (6713819bd866 Merge branch 'fixes' into for-next)
Merging target-updates/for-next (109e2381749c target: Drop iSCSI use of mutex around max_cmd_sn increment)
CONFLICT (content): Merge conflict in include/scsi/scsi_eh.h
CONFLICT (content): Merge conflict in drivers/scsi/scsi_error.c
CONFLICT (content): Merge conflict in drivers/ata/libata-scsi.c
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
Merging pinctrl/for-next (3ab897d2113c Merge branch 'devel' into for-next)
Merging vhost/linux-next (0c63b715912b PCI/MSI: Make pci_msi_shutdown(), pci_msix_shutdown() static)
Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (929550b9f9f8 gpio: mxc: fix section mismatch warning)
Applying: tc358743: fix for devm_gpiod_get API change
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (6e146f5c41da pwm: Add to device-drivers documentation)
Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging userns/for-next (4b75de861505 fs: Set the size of empty dirs to 0.)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (c42743f11f58 clk: add bindings for the Ux500 clocks)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c
CONFLICT (content): Merge conflict in drivers/clk/ti/Makefile
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0)
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (d770e558e219 Linux 4.2-rc1)
Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump)
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c
Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
Merging access_once/linux-next (c231afa3ccf1 compiler.h: cast away attributes in WRITE_ONCE magic)
Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next)
Merging coresight/next (395855d956ed coresight: Fix implicit inclusion of linux/sched.h)
Merging rtc/rtc-next (8db49af110eb rtc: armada38x: Align RTC set time procedure with the official errata)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (6f0f1dd59c67 Merge branch 'pmem-api' into libnvdimm-for-next)
Merging akpm-current/current (6ea736ae2de2 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in mm/early_ioremap.c
CONFLICT (content): Merge conflict in mm/Makefile
CONFLICT (content): Merge conflict in mm/Kconfig
CONFLICT (content): Merge conflict in kernel/cgroup.c
CONFLICT (content): Merge conflict in include/linux/kexec.h
CONFLICT (modify/delete): fs/ext3/super.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of fs/ext3/super.c left in tree.
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl
$ git rm -f fs/ext3/super.c
Applying: userfaultfd: selftest: update userfaultfd x86 32bit syscall number
$ git checkout -b akpm remotes/origin/akpm/master
Applying: namei: fix warning while make xmldocs caused by namei.c
Applying: fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void
Applying: fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix
Applying: fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix-fix
Applying: mm: mark most vm_operations_struct const
Applying: mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff()
Applying: mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix
Applying: mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix-checkpatch-fixes
Applying: mm: make sure all file VMAs have ->vm_ops set
Applying: mm: use vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd()
Applying: mm, madvise: use vma_is_anonymous() to check for anon VMA
Applying: sys_membarrier(): system-wide memory barrier (generic, x86)
Applying: selftests: add membarrier syscall test
Applying: selftests: enhance membarrier syscall test
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Merging akpm/master (1227564d94d2 drivers/w1/w1_int.c: call put_device if device_register fails)

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: Tree for Aug 20
@ 2013-08-20  7:36 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2013-08-20  7:36 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 28107 bytes --]

Hi all,

Changes since 20130819:

The xfs tree gained a build failure for which I reverted a commit.

The libata tree lost its build failure.

----------------------------------------------------------------------------

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" as mentioned in the FAQ on the wiki
(see below).

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 and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 222 trees (counting Linus' and 30 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (fd3930f proc: more readdir conversion bug-fixes)
Merging fixes/master (b3a3a9c Merge tag 'trace-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1)
Merging arc-current/for-curr (c095ba7 Linux 3.11-rc4)
Merging arm-current/fixes (e1f0203 Merge branch 'security-fixes' into fixes)
Merging m68k-current/for-linus (ea077b1 m68k: Truncate base in do_div())
Merging metag-fixes/fixes (dfe248b MAINTAINERS: add linux-metag mailing list)
Merging powerpc-merge/merge (28e61cc powerpc/tm: Fix context switching TAR, PPR and DSCR SPRs)
Merging sparc/master (1c2696c sparc64: Fix ITLB handler of null page)
Merging net/master (0f7dd1a Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux)
Merging ipsec/master (844d487 xfrm: choose protocol family by skb protocol)
Merging sound-current/for-linus (d3d3835 ALSA: hda - Add inverted digital mic fixup for Acer Aspire One)
Merging pci-current/for-linus (36dd1f3 PCI: mvebu: Disable prefetchable memory support in PCI-to-PCI bridge)
Merging wireless/master (48c3e37 Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
Merging driver-core.current/driver-core-linus (5ae90d8 Linux 3.11-rc3)
Merging tty.current/tty-linus (c095ba7 Linux 3.11-rc4)
Merging usb.current/usb-linus (b36f4be Linux 3.11-rc6)
Merging staging.current/staging-linus (d4e4ab8 Linux 3.11-rc5)
Merging char-misc.current/char-misc-linus (b36f4be Linux 3.11-rc6)
Merging input-current/for-linus (88ce3c3 Merge branch 'next' into for-linus)
Merging md-current/for-linus (f94c0b6 md/raid5: fix interaction of 'replace' and 'recovery'.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (e70308e Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework")
Merging ide/master (6d128e1 Revert "Makefile: Fix install error with make -j option")
Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
Merging devicetree-current/devicetree/merge (cf9e236 of/irq: init struct resource to 0 in of_irq_to_resource())
Merging rr-fixes/fixes (6c2580c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32)
Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata)
Merging vfio-fixes/for-linus (d24cdbf vfio-pci: Avoid deadlock on remove)
Merging drm-intel-fixes/drm-intel-fixes (884020b drm/i915: Invalidate TLBs for the rings after a reset)
Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (a00b92e ARC: [ASID] Optimize the threads-of-process switching case)
Merging arm/for-next (2c5d489 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (ad81f05 Linux 3.11-rc1)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (b028161 Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup)
Merging arm64/upstream (c095ba7 Linux 3.11-rc4)
Merging blackfin/for-linus (eb043d3 smp: blackfin: fix check error, using atomic_ops to handle atomic_t type)
Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore)
Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file)
CONFLICT (content): Merge conflict in arch/cris/arch-v32/drivers/Kconfig
Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
Merging ia64/next (76299de Merge branch 'pstore' into next)
Merging m68k/for-next (ad81f05 Linux 3.11-rc1)
Merging m68knommu/for-next (5fbed81 m68k: remove 16 unused boards in Kconfig.machine)
Merging metag/for-next (8a69782 metag: tz1090: instantiate gpio-tz1090-pdc)
Merging microblaze/next (a9b9d22 of/pci: Use of_pci_range_parser)
Merging mips/mips-for-linux-next (49e12af Merge branch '3.11-fixes' into mips-for-linux-next)
Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS)
Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging parisc-hd/for-next (9f0f4fb parisc: add generic 32- and 64-bit defconfigs)
Merging powerpc/next (afbcdd9 powerpc/wsp: Fix early debug build)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (6391f69 powerpc: 52xx: provide a default in mpc52xx_irqhost_map())
Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
Merging s390/features (c4a6394 s390/mm: introduce ptep_flush_lazy helper)
Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux)
Merging tile/master (a36cd9c tile: make __write_once a synonym for __read_mostly)
Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (3b2f64d Linux 3.11-rc2)
Merging btrfs/next (cbacd76 Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into next)
Merging ceph/master (fe2a801 ceph: Remove bogus check in invalidatepage)
Merging cifs/for-next (de09ae6 cifs: Move and expand MAX_SERVER_SIZE definition)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (07bc9dc Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
Merging ext3/for_next (97a2847 Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeffm/linux-reiserfs into for_next_testing)
Merging ext4/dev (e9b81fc ext4: fix lost truncate due to race with writeback)
Merging f2fs/dev (7b40527 f2fs: fix a compound statement label error)
Merging fscache/fscache (bcd7351 Merge tag 'fscache-20130702' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs)
Merging fuse/for-next (c7263bc fuse: readdirplus: cleanup)
Merging gfs2/master (6c0d451 GFS2: Check for glock already held in gfs2_getxattr)
Merging jfs/jfs-next (4451244 jfs: fix readdir cookie incompatibility with NFSv4)
Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (9743120 NFSv4.1 Use clientid management rpc_clnt for secinfo_no_name)
Merging nfsd/nfsd-next (df66e75 nfsd: nfs4_file_get_access: need to be more careful with O_RDWR)
Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (b3f8ab4 fs: 9p: use strlcpy instead of strncpy)
Merging ubifs/linux-next (d4e4ab8 Linux 3.11-rc5)
Merging xfs/for-next (2ad01f5 xfs: use reference counts to free clean buffer items)
CONFLICT (content): Merge conflict in fs/xfs/xfs_inode.c
Merging vfs/for-next (d405be4 ext4: ->tmpfile() support)
CONFLICT (content): Merge conflict in mm/shmem.c
CONFLICT (content): Merge conflict in fs/ext4/namei.c
Merging pci/next (7d8c4a2 Merge branch 'pci/aw-reset-v5' into next)
Merging hid/for-next (e999c8b Merge branch 'for-3.12/upstream' into for-next)
Merging i2c/i2c/for-next (869c6a3 i2c: mxs: fix broken timing calculation)
Merging jdelvare-hwmon/master (6f7e0b6 hwmon: (w83792d) Update module author)
Merging hwmon-staging/hwmon-next (f767589 hwmon: (adt7462) ADT7462_REG_VOLT_MAX() should return 0)
Merging v4l-dvb/master (e5c9146 Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (e7f855f Merge branch 'kbuild/kconfig' into kbuild/for-next)
Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
Merging libata/for-next (b930427 Merge branch 'for-3.11-fixes' into for-next)
Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block)
Merging pm/linux-next (2d7e7a5 Merge branch 'pm-cpufreq')
Merging idle/next (5c99726b Merge branch 'fspin' into next)
Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (f61d5b4d Merge branch 'fixes' of .git into next)
Merging ieee1394/for-next (0dbe15f firewire: ohci: beautify some macro definitions)
Merging ubi/linux-next (5ef4414 UBI: Fix PEB leak in wear_leveling_worker())
Merging dlm/next (c6ca7bc dlm: remove signal blocking)
CONFLICT (content): Merge conflict in fs/dlm/user.c
Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
Merging slave-dma/next (13699ae Merge branch 'for-linus' into next)
Merging dmaengine/next (41ef2d5 Linux 3.9-rc7)
Merging net-next/master (2ff1cf1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/pcie/trans.c
Merging ipsec-next/master (e3fec5a xfrm: remove irrelevant comment in xfrm_input().)
Merging wireless-next/master (24de851 Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/pcie/trans.c
Merging bluetooth/master (e056739 Bluetooth: Set different event mask for LE-only controllers)
Merging infiniband/for-next (3e76458 Merge branches 'cxgb4', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next)
Applying: cxgb4: fix up for bond_for_each_slave API change
Merging mtd/master (e79265b mtd: ofpart: add compatible check for child nodes)
Merging l2-mtd/master (efd27a6 mtd: MTD_NAND_DENALI should depend on HAS_DMA)
Merging crypto/master (9dc4803 hwrng: tx4939 - simplify use of devm_ioremap_resource)
Merging drm/drm-next (f336ab7 drm: move dev data clearing from drm_setup to lastclose)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c
Merging drm-intel/for-linux-next (3d79113 drm/i915: make IVB FDI training match spec v3)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_dmabuf.c
Merging drm-tegra/drm/for-next (ebae30b gpu: host1x: Rework CPU syncpoint increment)
Merging sound/for-next (b43dd41 ALSA: hdspm - Fix SNDRV_HDSPM_IOCTL_GET_LTC)
Merging sound-asoc/for-next (105ef70c Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next)
Merging modules/modules-next (ad81f05 Linux 3.11-rc1)
Merging virtio/virtio-next (3b868a4 virtio: console: prevent use-after-free of port name in port unplug)
Merging input/next (c3b3a38 Input: elantech - fix packet check for v3 and v4 hardware)
Merging input-mt/for-next (ad81f05 Linux 3.11-rc1)
Merging cgroup/for-next (d02a7a5 Merge branch 'for-3.12' into for-next)
CONFLICT (content): Merge conflict in include/net/netprio_cgroup.h
Merging block/for-next (3fe9649 Merge branch 'for-3.11/drivers' into for-next)
Merging device-mapper/for-next (4eb5d47 dm: add statistics support)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (6d1d6b4 mmc: tmio: fix compiler warning)
Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command)
Merging slab/for-next (9de1bc8 mm, slab_common: add 'unlikely' to size check of kmalloc_slab())
Merging uclinux/for-next (6dbe51c Linux 3.9-rc1)
Merging md/for-next (5ad58b4 md/raid5: make release_stripe lockless)
Merging mfd/master (38c4faa mfd: ucb1x00: Explicitely include linux/device.h)
Merging mfd-lj/for-mfd-next (5d945d9 mfd: ti_am335x_tscadc: Update reg_cache variable in clr function)
Merging battery/master (f107ae1 power_supply: Replace strict_strtol() with kstrtol())
Merging fbdev/for-next (5e8be02 video: atmel_lcdfb: add device tree suport)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (fd3cd7e OMAPDSS: HDMI: Fix AVI infoframe bug)
Merging regulator/for-next (0854db5 Merge remote-tracking branch 'regulator/topic/tps65912' into regulator-next)
Merging security/next (f8eb8a1 apparmor: add the ability to report a sha1 hash of loaded policy)
Merging selinux/master (2be4d74 Add SELinux policy capability for always checking packet and peer classes.)
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging lblnet/master (07bc9dc Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
Merging watchdog/master (b3a3a9c Merge tag 'trace-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
Merging iommu/next (f098cc4 Merge branches 'arm/exynos', 'ppc/pamu', 'arm/smmu', 'x86/amd' and 'iommu/fixes' into next)
Merging vfio/next (6cdd978 vfio: add external user support)
Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (ccb7cc0 credits: update contact information for Chris Cheney)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
Merging devicetree/devicetree/next (245d964 of/platform: Staticize of_platform_device_create_pdata())
Merging dt-rh/for-next (8851b9f include: dt-binding: input: create a DT header defining key codes.)
Merging spi/for-next (9e55a20 Merge remote-tracking branch 'spi/topic/xilinx' into spi-next)
Merging tip/auto-latest (4a1a274 Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in drivers/video/simplefb.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/processor.h
Applying: simplefb: merge conflict fix
Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device)
Merging edac-amd/for-next (75a9551 cpc925_edac: Use proper array termination)
Merging ftrace/for-next (9457158 tracing: Fix reset of time stamps during trace_clock changes)
Merging rcu/rcu/next (0cecd37 Merge branches 'doc.2013.08.13a', 'fixes.2013.08.13a', 'sysidle.2013.08.13a' and 'torture.2013.08.13a' into HEAD)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (205befd KVM: nVMX: correctly set tr base on nested vmexit emulation)
Merging kvm-arm/kvm-arm-next (8bd4ffd ARM: kvm: don't include drivers/virtio/Kconfig)
Merging kvm-ppc/kvm-ppc-next (20f7462 Merge remote-tracking branch 'cmadma/for-v3.12-cma-dma' into kvm-ppc-next)
CONFLICT (content): Merge conflict in mm/Kconfig
Merging oprofile/for-next (f722406 Linux 3.10-rc1)
Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
Merging xen-tip/linux-next (85e5d6e Merge remote branch 'xentip/stable/for-linus-3.11' into xentip-linux-next)
Merging percpu/for-next (a424445 percpu-refcount: use RCU-sched insted of normal RCU)
Merging workqueues/for-next (b84acfb Merge branch 'for-3.11-fixes' into for-next)
Merging drivers-x86/linux-next (41c8bd1 Revert "hp-wmi: Enable hotkeys on some systems")
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (f76f948 Merge remote-tracking branch 'regmap/topic/sparse' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (6a1c59a leds-pca963x: Fix device tree parsing)
Merging driver-core/driver-core-next (c7991b0 driver core / cpu: Check if NUMA node is valid before bringing CPU up)
CONFLICT (content): Merge conflict in net/core/net-sysfs.c
Merging tty/tty-next (e438ac9 OMAP: serial: Remove incorrect disabling of IER interrupt)
CONFLICT (content): Merge conflict in include/uapi/linux/serial_core.h
CONFLICT (content): Merge conflict in include/linux/of.h
CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
Merging usb/usb-next (bd479f2 Merge 3.11-rc6 into usb-next)
CONFLICT (content): Merge conflict in include/linux/usb/usbnet.h
Merging usb-gadget/next (aaeaae0 usb: dwc3: core: cope with NULL pdata)
Merging staging/staging-next (1da4ee2 staging: vt6656: desc.h remove typedef tagSTxDataHead_a_FB to new structure in rxtx.h)
Merging char-misc/char-misc-next (5bc0b12 Merge 3.11-rc6 into char-misc-next)
Merging scsi/for-next (959823b Merge branch 'fixes' into for-next)
Merging target-updates/for-next (56e8f85 target/pscsi: remove an unneeded check)
Merging target-merge/for-next-merge (d4e4ab8 Linux 3.11-rc5)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6734092 isci: add a couple __iomem annotations)
Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation)
CONFLICT (content): Merge conflict in drivers/block/Kconfig
Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
Merging writeback/writeback-for-next (8bb495e Linux 3.10)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (1ec3eee Merge branch 'devel' into for-next)
Merging vhost/linux-next (8c325ee vhost: wake up worker outside spin_lock)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO)
Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO)
Merging gpio/for-next (311d60e Merge branch 'devel' into for-next)
Merging arm-soc/for-next (78f7e25 Merge branch 'fixes' into for-next)
CONFLICT (modify/delete): drivers/leds/leds-renesas-tpu.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/leds/leds-renesas-tpu.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
$ git rm -f drivers/leds/leds-renesas-tpu.c
Merging bcm2835/for-next (7d13205 Linux 3.10-rc6)
Merging cortex/for-next (3ad87ac ARM: ARMv7-M: Fix name of NVIC handler function)
Merging ep93xx/ep93xx-for-next (9c59be7 Merge branch 'ep93xx-devel' into ep93xx-for-next)
Merging imx-mxs/for-next (21a4d17 Merge branches 'mxs/soc' and 'mxs/dt' into for-next)
CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
Merging ixp4xx/next (19f949f Linux 3.8)
Merging msm/for-next (8fb0bf1 Merge branch 'for-3.12/msm-cleanup2' into for-next)
Merging mvebu/for-next (782371b Merge branch 'mvebu/dove_pcie-mbus-dt' into for-next)
CONFLICT (content): Merge conflict in drivers/pci/host/pci-mvebu.c
CONFLICT (content): Merge conflict in drivers/pci/host/Kconfig
Merging renesas/next (8a8c6f7 Merge tag 'renesas-defconfig-for-v3.12' into next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7790.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a73a4.dtsi
Merging samsung/for-next (88ae7ba Merge branch 'v3.12-next/mach-exynos' into for-next)
Merging tegra/for-next (dca9ac6 Merge branch for-3.12/defconfig into for-next)
CONFLICT (content): Merge conflict in drivers/pci/host/Makefile
Merging dma-mapping/dma-mapping-next (f7d8f1e Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next)
Merging pwm/for-next (6d0cf4d ARM: dts: Use the PWM polarity flags)
Merging dma-buf/for-next (8bb495e Linux 3.10)
Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem)
Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines)
Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging clk/clk-next (18f5863 clk: prima2: Fix incorrect placement of __initdata)
Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock)
Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging arm64-hugepages/for-next/hugepages (af07484 ARM64: mm: THP support.)
Merging ptr-ret/PTR_RET (ad151d5 GFS2: Replace PTR_RET with PTR_ERR_OR_ZERO)
CONFLICT (modify/delete): drivers/staging/zcache/zcache-main.c deleted in HEAD and modified in ptr-ret/PTR_RET. Version ptr-ret/PTR_RET of drivers/staging/zcache/zcache-main.c left in tree.
$ git rm -f drivers/staging/zcache/zcache-main.c
Merging aio/master (f30d704 aio: table lookup: verify ctx pointer)
Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
Merging akpm-current/current (a31cfb9 mm: page_alloc: use vmstats for fair zone allocation batching fix)
CONFLICT (content): Merge conflict in fs/ext4/inode.c
$ git am -3 ../patches/0001-Revert-drivers-block-brd.c-make-rd_size-static.patch
Applying: Revert "drivers/block/brd.c: make 'rd_size' static"
$ git checkout -b akpm remotes/origin/akpm/master
Applying: revert "SELinux: do not handle seclabel as a special flag"
Applying: memcg: remove redundant code in mem_cgroup_force_empty_write()
Applying: memcg, vmscan: integrate soft reclaim tighter with zone shrinking code
Applying: memcg: get rid of soft-limit tree infrastructure
Applying: vmscan, memcg: do softlimit reclaim also for targeted reclaim
Applying: memcg: enhance memcg iterator to support predicates
Applying: memcg: track children in soft limit excess to improve soft limit
Applying: memcg, vmscan: do not attempt soft limit reclaim if it would not scan anything
Applying: memcg: track all children over limit in the root
Applying: memcg, vmscan: do not fall into reclaim-all pass too quickly
Applying: memcg: trivial cleanups
Applying: arch: mm: remove obsolete init OOM protection
Applying: arch: mm: do not invoke OOM killer on kernel fault OOM
Applying: arch: mm: pass userspace fault flag to generic fault handler
Applying: x86: finish user fault error path with fatal signal
Applying: mm: memcg: enable memcg OOM killer only for user faults
Applying: mm: memcg: rework and document OOM waiting and wakeup
Applying: mm: memcg: do not trap chargers with full callstack on OOM
Applying: memcg: correct RESOURCE_MAX to ULLONG_MAX
Applying: memcg: rename RESOURCE_MAX to RES_COUNTER_MAX
Applying: memcg: avoid overflow caused by PAGE_ALIGN
Applying: memcg: reduce function dereference
Applying: mm: make lru_add_drain_all() selective
Applying: fs: bump inode and dentry counters to long
Applying: super: fix calculation of shrinkable objects for small numbers
Applying: dcache: convert dentry_stat.nr_unused to per-cpu counters
Applying: dentry: move to per-sb LRU locks
Applying: dcache: remove dentries from LRU before putting on dispose list
Applying: mm: new shrinker API
Applying: shrinker: convert superblock shrinkers to new API
Applying: shrinker-convert-superblock-shrinkers-to-new-api-fix
Applying: list: add a new LRU list type
Applying: inode: convert inode lru list to generic lru list code.
Applying: inode: move inode to a different list inside lock
Applying: dcache: convert to use new lru list infrastructure
Applying: list_lru: per-node list infrastructure
Applying: list_lru: per-node list infrastructure fix
Applying: list_lru: fix broken LRU_RETRY behaviour
Applying: list_lru: per-node API
Applying: list_lru: remove special case function list_lru_dispose_all.
Applying: shrinker: add node awareness
Applying: vmscan: per-node deferred work
Applying: fs: convert inode and dentry shrinking to be node aware
Applying: xfs: convert buftarg LRU to generic code
Applying: xfs-convert-buftarg-lru-to-generic-code-fix
Applying: xfs: rework buffer dispose list tracking
Applying: xfs: convert dquot cache lru to list_lru
Applying: xfs-convert-dquot-cache-lru-to-list_lru-fix
Applying: xfs: fix dquot isolation hang
Applying: fs: convert fs shrinkers to new scan/count API
Applying: fs-convert-fs-shrinkers-to-new-scan-count-api-fix
Applying: UBIFS: signedness bug in ubifs_shrink_count()
Applying: fs-convert-fs-shrinkers-to-new-scan-count-api-fix-fix-2
Applying: drivers: convert shrinkers to new count/scan API
Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix
Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix-2
Applying: i915: bail out earlier when shrinker cannot acquire mutex
Applying: shrinker: convert remaining shrinkers to count/scan API
Applying: shrinker-convert-remaining-shrinkers-to-count-scan-api-fix
Applying: hugepage: convert huge zero page shrinker to new shrinker API
Applying: hugepage-convert-huge-zero-page-shrinker-to-new-shrinker-api-fix
Applying: shrinker: Kill old ->shrink API.
Applying: shrinker-kill-old-shrink-api-fix
Applying: list_lru: dynamically adjust node arrays
Applying: super: fix for destroy lrus
Applying: staging/lustre/ldlm: convert to shrinkers to count/scan API
Applying: staging/lustre/obdclass: convert lu_object shrinker to count/scan API
Applying: staging/lustre/ptlrpc: convert to new shrinker API
Applying: staging/lustre/libcfs: cleanup linux-mem.h
Applying: mm/Kconfig: add MMU dependency for MIGRATION.
Merging akpm/master (1fbb5af mm/Kconfig: add MMU dependency for MIGRATION.)
[master 2c0fd8a] Revert "enable building user namespace with xfs"

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: Tree for Aug 20
@ 2012-08-20  9:23 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2012-08-20  9:23 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

[-- Attachment #1: Type: text/plain, Size: 25302 bytes --]

Hi all,

Changes since 20120817:

The v4l-dvb tree lost its build failure.

The tip tree still has its build failure so I used the version from
next-20120814.

The drivers-x86 tree gained a build failure so I used the version from
next-20120817.

The driver-core tree lost its build failure.

I have still reverted 3 commits from the signal tree at the request of the
arm maintainer.

----------------------------------------------------------------------------

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" as mentioned in the FAQ on the wiki
(see below).

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 and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 195 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (6dab7ed Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm)
Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
Merging kbuild-current/rc-fixes (f8f5701 Linux 3.5-rc1)
Merging arm-current/fixes (8986873 ARM: 7490/1: Drop duplicate select for GENERIC_IRQ_PROBE)
Merging m68k-current/for-linus (9e2760d m68k: Make sys_atomic_cmpxchg_32 work on classic m68k)
Merging powerpc-merge/merge (ad36cb0 powerpc/kvm/book3s_32: Fix MTMSR_EERI macro)
Merging sparc/master (6dab7ed Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm)
Merging net/master (476ad15 net: netprio: fix cgrp create and write priomap race)
Merging sound-current/for-linus (5e68fb3 ALSA: hda - Don't send invalid volume knob command on IDT 92hd75bxx)
Merging pci-current/for-linus (9f6445a Merge branch 'pci/rafael-3.6-fixes' into for-linus)
Merging wireless/master (7dd6753 ath5k: fix spin_lock_irqsave/spin_lock_bh nesting in mesh)
Merging driver-core.current/driver-core-linus (ebdc828 dyndbg: fix for SOH in logging messages)
Merging tty.current/tty-linus (38f8eef pmac_zilog,kdb: Fix console poll hook to return instead of loop)
Merging usb.current/usb-linus (99f347c USB: CDC ACM: Fix NULL pointer dereference)
Merging staging.current/staging-linus (3a491ae Merge tag 'v3.6-rc1-iio-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (f3261df 1-Wire: Add support for the maxim ds1825 temperature sensor)
Merging input-current/for-linus (cf45b5a Merge branch 'next' into for-linus)
Merging md-current/for-linus (58e94ae md/raid1: close some possible races on write errors during resync)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (76f16f8 crypto: hifn_795x - fix 64bit division and undefined __divdi3 on 32bit archs)
Merging ide/master (39a50b4 Merge branch 'hfsplus')
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
Merging arm/for-next (22018e9 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (b90c4b9 Merge branch 'hw-breakpoint' into for-next/perf)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (719154c bf60x: fix build warning)
Merging c6x/for-linux-next (01ddd9a C6X: select GENERIC_ATOMIC64)
Merging cris/for-next (2608747 CRIS: Remove VCS simulator specific code)
Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
Merging ia64/next (a119365 [IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts)
Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
Merging m68knommu/for-next (aa27fba m68k: select CONFIG_GENERIC_ATOMIC64 for all m68k CPU types)
Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd)
Merging mips/mips-for-linux-next (9754e26 Merge branches 'next/ath79', 'next/for-linus', 'next/generic', 'next/lantiq' and 'next/trace' into mips-for-linux-next)
Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic syscall)
Merging parisc/for-next (5b24c42 [PARISC] fix personality flag check in copy_thread())
Merging powerpc/next (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (4d2f4e1 powerpc: Option FB_FSL_DIU is not really optional for mpc512x)
Merging galak/next (1ee9545 powerpc/mpc85xx: Add new ext fields to Integrated FLash Controller)
Merging s390/features (3c011c6 s390/bpf,jit: BPF Just In Time compiler for s390)
Merging sh/sh-latest (fa75ce6 Merge branches 'sh/urgent' and 'sh/gpiolib' into sh-latest)
Merging sparc-next/master (6dab7ed Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm)
Merging tile/master (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler)
Merging xtensa/for_next (499d9ec xtensa: ISS: exit simulator in case of halt or panic)
Merging ceph/master (1fe5e99 rbd: create rbd_refresh_helper())
Merging cifs/for-next (30e5913 Remove sparse warning in cifsfs.c)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (0d7614f Linux 3.6-rc1)
Merging ext3/for_next (68766a2 udf: fix retun value on error path in udf_load_logicalvol)
Merging ext4/dev (8a2f846 ext4: remove duplicated declarations in inode.c)
Merging fuse/for-next (fb6ccff fuse: verify all ioctl retry iov elements)
Merging gfs2/master (257cd64 GFS2: Use rbm for gfs2_setbit())
Merging logfs/master (9f0bbd8 logfs: query block device for number of pages to send with bio)
Merging nfs/linux-next (12dfd08 NFS: return -ENOKEY when the upcall fails to map the name)
Merging nfsd/nfsd-next (2c142ba NFSd: make boot_time variable per network namespace)
Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (5fcb08b 9p: BUG before corrupting memory)
Merging ubifs/linux-next (7074e5e UBIFS: remove invalid reference to list iterator variable)
Merging xfs/for-next (643bfc0 xfs: check for possible overflow in xfs_ioc_trim)
Merging vfs/for-next (808d1b7 unexport sock_map_fd(), switch to sock_alloc_file())
Merging pci/next (0d7614f Linux 3.6-rc1)
Merging hid/for-next (86476aa Merge branch 'picolcd' into for-next)
Merging quilt/i2c (a918790 i2c: Convert struct i2c_msg initialization to C99 format)
Merging i2c-embedded/i2c-embedded/for-next (d987569 Linux 3.6-rc2)
Merging quilt/jdelvare-hwmon (4ac1223 hwmon: (coretemp) Use get_online_cpus to avoid races involving CPU hotplug)
Merging hwmon-staging/hwmon-next (b7e3a9f hwmon: (adt7410) handle errors from adt7410_update_device())
Merging v4l-dvb/master (34d9dac Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (85b170e Merge branches 'kbuild/kconfig' and 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (45f4c81 localmodconfig: Use my variable for loop in streamline_config.pl)
Merging libata/NEXT (1b26d29 [libata] scsi: implement MODE SELECT command)
Merging infiniband/for-next (c0369b2 Merge branches 'cma', 'ipoib', 'misc', 'mlx4', 'ocrdma', 'qib' and 'srp' into for-next)
Merging acpi/next (9d0b01a Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie' into base)
Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (449488c thermal: Fix potential NULL pointer accesses)
Merging ieee1394/for-next (e3cbd92 firewire: core: document is_local sysfs attribute)
Merging ubi/linux-next (a07ade1 arm: sam9_l9260_defconfig: remove non-existing config option)
Merging dlm/next (9c5bef5 dlm: cleanup send_to_sock routine)
Merging scsi/for-next (641aa03 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/ata/libata-core.c
Merging target-updates/for-next (6a922a3 target: Fix minor spelling typos in drivers/target)
Merging target-merge/for-next-merge (d987569 Linux 3.6-rc2)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6734092 isci: add a couple __iomem annotations)
Merging slave-dma/next (c87a9fc Merge branch 'fixes_for-3.6' into next)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (5689226 xfrm: Use rcu_dereference_bh to deference pointer protected by rcu_read_lock_bh)
Merging wireless-next/master (22c5649 p54: fix powerpc gcc warnings)
Merging bluetooth/master (b691f1a Bluetooth: mgmt: Add device disconnect reason)
Merging mtd/master (4800399 mtd: m25p80: Add support for serial flash STM/Micron N25Q032)
Merging l2-mtd/master (31311c4 mtd: s3c2410: Fix line over 80 characters warning)
Merging crypto/master (35a1fc1 powerpc/crypto: add 842 crypto driver)
Merging drm/drm-next (e2f895f Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next)
Merging sound/for-next (1c86845 ALSA: hda - Add 3stack-automute model to AD1882 codec)
Merging sound-asoc/for-next (6664923 Merge branches 'for-3.6' and 'for-3.7' into asoc-next)
Merging quilt/rr (d673c23 Make most arch asm/module.h files use asm-generic/module.h)
CONFLICT (content): Merge conflict in arch/xtensa/Kconfig
CONFLICT (content): Merge conflict in arch/s390/Kconfig
Merging input/next (2b94e25 Input: random formatting fixes)
Merging input-mt/for-next (0d7614f Linux 3.6-rc1)
Merging cgroup/for-next (4b2ebf0 Merge branch 'for-3.6' into for-next)
Merging block/for-next (4004e90 Documentation: update tunable options in block/cfq-iosched.txt)
Merging quilt/device-mapper (057d040 Overflow checking in dm-verity was not sufficient. It would check overflow if sector_t was smaller than long long but not if sector_t and long long have the same size. This patch implements proper overflow checking.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (72d0f11 mmc: bfin_sdh: Reset SD controller when resume from power saving mode.)
Merging kgdb/kgdb-next (15d7ea0 kgdboc: Accept either kbd or kdb to activate the vga + keyboard kdb shell)
Merging slab/for-next (77be4b1 mm/slab: restructure kmem_cache_create() debug checks)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (eef0978 md: avoid taking the mutex on some ioctls.)
Merging mfd/for-next (3c1534c mfd: Ensure AB8500 platform data is passed through db8500-prcmu to MFD Core)
Merging battery/master (ecc2edd olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteries)
Merging fbdev/fbdev-next (a023907 da8xx-fb: fix compile issue due to missing include)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (974a658 Merge "Apply LCD manager related parameters" from Archit)
Merging regulator/for-next (4785f97 Merge branch 'regulator-drivers' into regulator-next)
Merging security/next (51b743f Merge tag 'v3.6-rc2' into next)
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (06a3fa7 watchdog: fix watchdog-test.c build warning)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (6f286cc Merge branches 'iommu/fixes' and 'arm/tegra' into next)
Merging vfio/next (d987569 Linux 3.6-rc2)
Merging osd/linux-next (b8017d2 exofs: check for allocation failure in uri_store())
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (ef706fb irqdesc: delete now orphaned references to timer_rand_state)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (8b97819 Merge branch 'pm-cpuidle-next' into linux-next)
Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
Merging edac/linux_next (a92cdec Merge branch 'devel' into next)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
CONFLICT (content): Merge conflict in Documentation/edac.txt
Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
Merging dt-rh/for-next (5d61b16 of: Allow busses with #size-cells=0)
Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
Merging spi-mb/spi-next (a6c16d9 Merge branch 'spi-mxs' into spi-next)
Merging tip/auto-latest (bf09da2 Merge branch 'timers/urgent' into auto-latest)
$ git reset --hard HEAD^
Merging refs/next/20120814/tip
Merging rcu/rcu/next (d1d61c1 Merge branches 'bigrt.2012.07.31a', 'doctorture.2012.08.03a', 'fixes.2012.08.03a', 'hotplug.2012.08.03a' and 'idle.2012.07.31a' into dev.3.7.2012.08.03a)
CONFLICT (content): Merge conflict in include/linux/sched.h
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/Kconfig
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
Merging kvm/linux-next (8fbe6a5 KVM guest: disable stealtime on reboot to avoid mem corruption)
CONFLICT (content): Merge conflict in arch/s390/include/asm/processor.h
Merging kvm-ppc/kvm-ppc-next (e9908a4 KVM: PPC: BookE: Support FPU on non-hv systems)
Merging oprofile/for-next (c16fa4f Linux 3.3)
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
Merging xen-two/linux-next (df3c572 Merge branch 'stable/for-linus-3.6' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging workqueues/for-next (7635d2f workqueue: use system_highpri_wq for unbind_work)
Merging drivers-x86/linux-next (973713e classmate-laptop: always call input_sync() after input_report_switch())
$ git reset --hard HEAD^
Merging refs/next/20120817/drivers-x86
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (e0bf121 Merge branch 'regmap-irq' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (052a876 leds: leds-gpio: Use platform_{get,set}_drvdata)
Merging driver-core/driver-core-next (0592969 hv: fail the probing immediately when we are not in hyperv platform)
Merging tty/tty-next (5d4121c TTY: check if tty->port is assigned)
Merging usb/usb-next (26f944b usb: hcd: use *resource_size_t* for specifying resource data)
Merging staging/staging-next (d602a06 staging: comedi: contec_pci: remove manual legacy attach)
Merging char-misc/char-misc-next (877cdf3 drivers/misc/ti-st: check chip_awake NULL check)
CONFLICT (content): Merge conflict in drivers/misc/mei/interrupt.c
Merging tmem/linux-next (15773b6 Merge branch 'stable/for-linus-3.6' into linux-next)
Merging writeback/writeback-for-next (331cbde writeback: Fix some comment errors)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (2853ff28 Merge branch 'devel' into for-next)
Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
CONFLICT (content): Merge conflict in drivers/net/tun.c
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (6bb697b MAINTAINERS: add remoteproc's git)
Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging gpio-lw/for-next (f47c3df Merge branch 'devel' into for-next)
Merging arm-soc/for-next (e149302 Merge branch 'next/dt' into for-next)
CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig
Merging ep93xx/ep93xx-for-next (fbad878 Merge branch 'ep93xx-cleanup' into ep93xx-for-next)
Merging renesas/next (45c7a01 Merge branch 'renesas-marzen' into renesas-board)
Merging samsung/for-next (c1f9bee Merge branch 'next/board-samsung' into for-next)
Merging tegra/for-next (eb9c6a7 Merge branch 'for-3.7/defconfig' into for-next)
Merging kvmtool/master (3c8ef41 kvm tools: Add 'install' target to Makefile)
Merging dma-mapping/dma-mapping-next (d987569 Linux 3.6-rc2)
Merging pwm/for-next (d767a41 pwm: add devm_pwm_get() and devm_pwm_put())
Merging dma-buf/for-next (42a579a Merge branches 'timers-urgent-for-linus' and 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging userns/for-next (898132a ipv6: move dereference after check in fl_free())
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging signal/from-sfr (2e117f2 Revert "arm: pull all work_pending logics into C function")
CONFLICT (content): Merge conflict in arch/x86/kernel/signal.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/entry_64.S
CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h
Merging clk/clk-next (137f8a7 clk: fix compile for OF && !COMMON_CLK)
Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf())
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: cs5535-clockevt: typo, it's MFGPT, not MFPGT
Applying: mm: change nr_ptes BUG_ON to WARN_ON
Applying: Documentation: update mount option in filesystem/vfat.txt
Applying: cciss: fix incorrect scsi status reporting
Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
Applying: acpi_memhotplug.c: remove memory info from list before freeing it
Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: arch/x86/include/asm/spinlock.h: fix comment
Applying: mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it
Applying: drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma channel message
Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: time: don't inline EXPORT_SYMBOL functions
Applying: thermal: add generic cpufreq cooling implementation
Applying: hwmon: exynos4: move thermal sensor driver to driver/thermal directory
Applying: thermal: exynos5: add exynos5 thermal sensor driver support
Applying: thermal: exynos: register the tmu sensor with the kernel thermal layer
Applying: ARM: exynos: add thermal sensor driver platform data support
Applying: drivers/scsi/atp870u.c: fix bad use of udelay
Applying: vfs: increment iversion when a file is truncated
Applying: fs: push rcu_barrier() from deactivate_locked_super() to filesystems
Applying: mm/slab: remove duplicate check
Applying: mm: remove __GFP_NO_KSWAPD
Applying: mm: remove __GFP_NO_KSWAPD fixes
Applying: remove-__gfp_no_kswapd-fixes-fix
Applying: x86, pat: remove the dependency on 'vm_pgoff' in track/untrack pfn vma routines
Applying: x86, pat: separate the pfn attribute tracking for remap_pfn_range and vm_insert_pfn
Applying: x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix
Applying: mm, x86, pat: rework linear pfn-mmap tracking
Applying: mm: introduce arch-specific vma flag VM_ARCH_1
Applying: mm: kill vma flag VM_INSERTPAGE
Applying: mm: kill vma flag VM_CAN_NONLINEAR
Applying: mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
Applying: mm: kill vma flag VM_EXECUTABLE and mm->num_exe_file_vmas
Applying: mm: prepare VM_DONTDUMP for using in drivers
Applying: mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
Applying: mm-kill-vma-flag-vm_reserved-and-mm-reserved_vm-counter-fix
Applying: frv: kill used but uninitialized variable
Applying: ipc/mqueue: remove unnecessary rb_init_node() calls
Applying: rbtree: reference Documentation/rbtree.txt for usage instructions
Applying: rbtree: empty nodes have no color
Applying: rbtree-empty-nodes-have-no-color-fix
Applying: rbtree: fix incorrect rbtree node insertion in fs/proc/proc_sysctl.c
Applying: rbtree: move some implementation details from rbtree.h to rbtree.c
Applying: rbtree: fix jffs2 build issue due to renamed __rb_parent_color field
Applying: rbtree: performance and correctness test
Applying: rbtree-performance-and-correctness-test-fix
Applying: rbtree: break out of rb_insert_color loop after tree rotation
Applying: rbtree: adjust root color in rb_insert_color() only when necessary
Applying: rbtree: low level optimizations in rb_insert_color()
Applying: rbtree: adjust node color in __rb_erase_color() only when necessary
Applying: rbtree: optimize case selection logic in __rb_erase_color()
Applying: rbtree: low level optimizations in __rb_erase_color()
Applying: rbtree: coding style adjustments
Applying: rbtree: rb_erase updates and comments
Applying: rbtree: optimize fetching of sibling node
Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
Applying: fat (exportfs): move NFS support code
Applying: fat (exportfs): fix dentry reconnection
Applying: ipc/sem.c: alternatives to preempt_disable()
Merging akpm/master (5fb158a ipc/sem.c: alternatives to preempt_disable())

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2025-08-20  4:34 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-19 20:17 linux-next: Tree for Aug 20 Stephen Rothwell
2014-08-20 15:52 ` Mark Brown
     [not found]   ` <5248cecd-03f6-407b-a4a7-1d2989ee0469@email.android.com>
2014-08-21 14:34     ` Stephen Rothwell
2014-08-21 14:52       ` Mark Brown
  -- strict thread matches above, loose matches on Subject: below --
2025-08-20  4:34 Stephen Rothwell
2024-08-20  3:55 Stephen Rothwell
2021-08-20  9:26 Stephen Rothwell
2020-08-20  5:55 Stephen Rothwell
2019-08-20  7:09 Stephen Rothwell
2018-08-20  5:25 Stephen Rothwell
2015-08-20 10:37 Stephen Rothwell
2013-08-20  7:36 Stephen Rothwell
2012-08-20  9:23 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).