linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: Tree for Sep 2
@ 2019-09-02 12:43 Stephen Rothwell
  2019-09-02 17:39 ` linux-next: Tree for Sep 2 (exfat) Randy Dunlap
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2019-09-02 12:43 UTC (permalink / raw)
  To: Linux Next Mailing List, Linux Kernel Mailing List

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

Hi all,

News: I will only be doing 2 more releases before I leave for Kernel
Summit (there may be some reports on Thursday, but I doubt I will have
time to finish the full release) and then no more until Sept 30.

Changes since 20190830:

The compiler-attributes tree lost its build failure.

The powerpc tree gained a conflict against the arm64 tree. Also a build
failure due to an interaction with the dma-mapping tree.

The afs tree gained conflicts against the net tree.

The pci tree lost its build failure.

The net-next tree lost its build failure.

The sound-asoc tree gained a conflict against the jc_docs tree.

The regulator tree lost its build failure.

The keys tree still has its build failure but I changed to applying a
fix patch.

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

The tip tree gained conflicts against Linus' tree.

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

The akpm-current tree gained a conflict against the risc-v tree.

Non-merge commits (relative to Linus' tree): 9928
 9748 files changed, 583587 insertions(+), 269559 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 310 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 (9f159ae07f07 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging fixes/master (609488bc979f Linux 5.3-rc2)
Merging kbuild-current/fixes (d45331b00ddb Linux 5.3-rc4)
Merging arc-current/for-curr (2f029413cbfb arc: prefer __section from compiler_attributes.h)
Merging arm-current/fixes (5b3efa4f1479 ARM: 8901/1: add a criteria for pfn_valid of arm)
Merging arm-soc-fixes/arm/fixes (7a6c9dbb36a4 soc: ixp4xx: Protect IXP4xx SoC drivers by ARCH_IXP4XX || COMPILE_TEST)
Merging arm64-fixes/for-next/fixes (82e40f558de5 KVM: arm/arm64: vgic-v2: Handle SGI bits in GICD_I{S,C}PENDR0 as WI)
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 (e1e54ec7fb55 net: seeq: Fix the function used to release some memory in an error handling path)
Merging bpf/master (ede7c460b1da bpf: handle 32-bit zext during constant blinding)
Merging ipsec/master (769a807d0b41 xfrm: policy: avoid warning splat when merging nodes)
Merging netfilter/master (c3d7a089f945 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes')
Merging wireless-drivers/master (5a8c31aa6357 iwlwifi: pcie: fix recognition of QuZ devices)
Merging mac80211/master (869326532956 Merge tag 'mac80211-for-davem-2019-08-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
Merging rdma-fixes/for-rc (531a64e4c35b RDMA/siw: Fix IPv6 addr_list locking)
Merging sound-current/for-linus (89781d0806c2 ALSA: hda/realtek - Fix overridden device-specific initialization)
Merging sound-asoc-fixes/for-linus (2803b0e5da24 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 (a380ed768064 Merge branch 'regulator-5.3' into regulator-linus)
Merging spi-fixes/for-linus (443929295edc 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 (1426bd2c9f7e USB: cdc-wdm: fix race between write and disconnect due to flag abuse)
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 (8919dfcb3116 fsi: scom: Don't abort operations for minor errors)
Merging soundwire-fixes/fixes (d1abaeb3be7b Linux 5.3-rc5)
Merging thunderbolt-fixes/fixes (a55aa89aab90 Linux 5.3-rc6)
Merging input-current/for-linus (849f5ae3a513 Input: iforce - add sanity checks)
Merging crypto-current/master (5871cd93692c crypto: ccp - Ignore unconfigured CCP device on suspend/resume)
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 (962411b05a6d dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe())
Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1)
Merging mtd-fixes/mtd/fixes (dc9cfd269222 mtd: hyperbus: fix dependency and build error)
Merging mfd-fixes/for-mfd-fixes (4d82fa67dd6b mfd: rk808: Make PM function declaration static)
Merging v4l-dvb-fixes/fixes (63ad05e36ec5 media: cec-notifier: clear cec_adap in cec_notifier_unregister)
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 (75ee23b30dc7 KVM: x86: Don't update RIP or do single-step on faulting emulation)
Merging kvms390-fixes/master (a86cb413f4bf KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID)
Merging hwmon-fixes/hwmon (e027a2dea5fd hwmon (coretemp) Fix a memory leak bug)
Merging nvdimm-fixes/libnvdimm-fixes (274b924088e9 libnvdimm/pfn: Fix namespace creation on misaligned addresses)
Merging btrfs-fixes/next-fixes (2384eefd74b8 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 (0622800d2ebc scsi: lpfc: Raise config max for lpfc_fcp_mq_threshold variable)
Merging drm-fixes/drm-fixes (1c0d63eb0e82 Merge tag 'drm-intel-fixes-2019-08-29' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes)
Merging amdgpu-fixes/drm-fixes (41940ff50f6c drm/amdgpu: fix GFXOFF on Picasso and Raven2)
Merging drm-intel-fixes/for-linux-next-fixes (32f0a982650b drm/i915: Call dma_set_max_seg_size() in i915_driver_hw_probe())
Merging mmc-fixes/fixes (e73a3896eaca mmc: sdhci-cadence: enable v4_mode to fix ADMA 64-bit addressing)
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 (a9fc4340aee0 Drivers: hv: vmbus: Fix virt_to_hvpfn() for X86_PAE)
Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request())
Merging risc-v-fixes/fixes (a256f2e329df RISC-V: Fix FIXMAP area corruption on RV32 systems)
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 (424c38a4e325 drm/selftests: modes: Add more unit tests for the cmdline parser)
Merging kspp-gustavo/for-next/kspp (57bd739ffe7a usb: udc: lpc32xx: Silence fall-through warning)
Merging kbuild/for-next (e2079e93f562 kbuild: Do not enable -Wimplicit-fallthrough for clang for now)
Merging compiler-attributes/compiler-attributes (c4814af0b75c compiler_attributes.h: add note about __section)
Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
Merging dma-mapping/for-next (db91427b6502 MIPS: document mixing "slightly different CCAs")
Merging asm-generic/master (9b87647c665d asm-generic: add unlikely to default BUG_ON(x))
Merging arc/for-next (6fbc7275c7a9 Linux 5.2-rc7)
Merging arm/for-next (e36b90e24fe4 Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (61b7cddfe861 Merge branch 'for-next/atomics' into for-next/core)
Merging arm-perf/for-next/perf (3724e186fead docs/perf: Add documentation for the i.MX8 DDR PMU)
Merging arm-soc/for-next (236316d6bb48 Merge branch 'arm/fixes' into for-next)
CONFLICT (modify/delete): arch/arm/mach-iop13xx/pci.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-iop13xx/pci.c left in tree.
$ git rm -f arch/arm/mach-iop13xx/pci.c
Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
Merging amlogic/for-next (db1564abbd33 Merge branch 'v5.4/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (ba0fdbb07d05 Merge branch 'dt-for-v5.4' into for-next)
Merging at91/at91-next (1069a5a3f3d8 Merge branches 'at91-soc' and 'at91-dt' into at91-next)
Merging bcm2835/for-next (c165c01bb6f7 Merge branch 'bcm2835-dt-next' into for-next)
Merging imx-mxs/for-next (d26d83e3e1fc Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (78145dbeaea1 Merge branch 'for_5.3/driver-soc' into next)
Merging mediatek/for-next (4ae1ce88e9a0 Merge branch 'v5.3-next/soc' into for-next)
Merging mvebu/for-next (153e97d3bdf3 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (345b1bdaa219 Merge branch 'omap-for-v5.4/ti-sysc-drop-pdata' into for-next)
Merging qcom/for-next (63e584644247 Merge tag 'qcom-arm64-defconfig-for-5.4' into all-for-5.4)
Merging renesas/next (ae688e1720fd arm64: dts: renesas: hihope-common: Fix eMMC status)
Merging renesas-geert/next (a115ec27cec7 Merge branch 'renesas-dt-bindings-for-v5.4' into renesas-next)
Merging reset/reset/next (ea651ffd4f7f reset: Add DesignWare IP support to simple reset)
Merging rockchip/for-next (de9183bca276 Merge branch 'v5.4-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (b2ee857b8174 Merge branch 'next/soc' into for-next)
Merging scmi/for-linux-next (a55aa89aab90 Linux 5.3-rc6)
Merging sunxi/sunxi/for-next (15ea63583bfb 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 (4c1fc2c811fb Merge branch 'clk-doc' 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 (4ad35c1f5638 csky: Fixup 610 vipt cache flush mechanism)
CONFLICT (content): Merge conflict in arch/csky/mm/dma-mapping.c
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 (284f3a8e0947 m68k: coldfire: Include the GPIO driver header)
Merging microblaze/next (04e3543e228f microblaze: use the generic dma coherent remap allocator)
Merging mips/mips-next (42344113ba7a mips/atomic: Fix smp_mb__{before,after}_atomic())
CONFLICT (content): Merge conflict in arch/mips/include/asm/vdso/vdso.h
CONFLICT (content): Merge conflict in arch/mips/Kconfig
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 (f3b17320db25 openrisc: map as uncached in ioremap)
Merging parisc-hd/for-next (a5ff2130a4d9 parisc: speed up flush_tlb_all_local with qemu)
Merging powerpc/next (bf75a8db72e9 powerpc/configs: Enable secure guest support in pseries and ppc64 defconfigs)
CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_64_vio_hv.c
CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_64_vio.c
CONFLICT (content): Merge conflict in arch/Kconfig
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 (909548d6c578 riscv: add arch/riscv/Kbuild)
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 (deffa48fb014 s390/zcrypt: fix wrong handling of cca cipher keygenflags)
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 (e0917f879536 um: fix time travel mode)
Merging xtensa/xtensa-for-next (9c2ec7545cbd Merge branch 'xtensa-call0' into xtensa-for-next)
Merging fscrypt/master (0642ea2409f3 ext4 crypto: fix to check feature status before get policy)
Merging afs/afs-next (986d1c7de75a afs: Fix possible oops in afs_lookup trace event)
CONFLICT (content): Merge conflict in net/rxrpc/skbuff.c
CONFLICT (content): Merge conflict in net/rxrpc/recvmsg.c
CONFLICT (content): Merge conflict in net/rxrpc/input.c
CONFLICT (content): Merge conflict in net/rxrpc/conn_client.c
CONFLICT (content): Merge conflict in net/rxrpc/call_object.c
CONFLICT (content): Merge conflict in net/rxrpc/ar-internal.h
CONFLICT (content): Merge conflict in include/trace/events/rxrpc.h
$ git merge --abort
Merging btrfs/next (29dcea88779c Linux 4.17)
Merging btrfs-kdave/for-next (a406b66710ba Merge branch 'for-next-next-v5.3-20190828' into for-next-20190828)
Merging ceph/master (de4c5bafb6d5 libceph: drop unused con parameter of calc_target())
Merging cifs/for-next (a0fe1331e3ff smb3: add some more descriptive messages about share when mounting cache=ro)
Merging configfs/for-next (f6122ed2a4f9 configfs: Fix use-after-free when accessing sd->s_dentry)
Merging ecryptfs/next (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecryptfs_init_messaging())
Merging ext3/for_next (8cbd9af9d208 udf: Use dynamic debug infrastructure)
Merging ext4/dev (15c497e97e1a ext4: fix potential use after free after remounting with noblock_validity)
CONFLICT (content): Merge conflict in fs/ext4/ioctl.c
Merging f2fs/dev (497dd8f203e6 f2fs: add missing documents of reserve_root/resuid/resgid)
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 (9a13698480ca virtio-fs: add Documentation/filesystems/virtiofs.rst)
CONFLICT (content): Merge conflict in Documentation/filesystems/index.rst
Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
Merging nfs/linux-next (eea173097dfb Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging nfs-anna/linux-next (f836b27ecad9 NFS: Have nfs4_proc_get_lease_time() call nfs4_call_sync_custom())
Merging nfsd/nfsd-next (bb13f35b96f4 nfsd: remove duplicated include from filecache.c)
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 (0af83abbd4a6 ubifs: Limit the number of pages in shrink_liability)
Merging v9fs/9p-next (80a316ff1627 9p/xen: Add cleanup path in p9_trans_xen_init)
Merging xfs/for-next (1baa2800e62d xfs: remove the unused XFS_ALLOC_USERDATA flag)
Merging iomap/iomap-for-next (1c1daa47a0ae xfs: refactor the ioend merging code)
Merging djw-vfs/vfs-for-next (dc617f29dbe5 vfs: don't allow writes to swap files)
Merging file-locks/locks-next (cfddf9f4c9f0 locks: fix a memory leak bug in __break_lease())
Merging vfs/for-next (e4f04a87a45f Merge branches 'work.misc', 'work.mount', 'work.dcache' and 'work.autofs' into for-next)
CONFLICT (content): Merge conflict in fs/fuse/inode.c
CONFLICT (content): Merge conflict in fs/ceph/super.c
Applying: docs: filesystems: vfs: update for "vfs: Kill mount_single()"
Applying: Revert "vfs: Move the subtype parameter into fuse"
Merging printk/for-next (ba174ef6d224 Merge branch 'for-5.3-fixes' into for-next)
Merging pci/next (325eb5b9b37b Merge branch 'pci/trivial')
Merging pstore/for-next/pstore (609488bc979f Linux 5.3-rc2)
Merging hid/for-next (5bd8d1a78c30 Merge branch 'for-5.3/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (26d97fe8bbed Merge branch 'i2c/for-5.4' into i2c/for-next)
Merging i3c/i3c/next (6030f42d20ce i3c: master: Use dev_to_i3cmaster())
Merging dmi/master (57361846b52b Linux 4.19-rc2)
Merging hwmon-staging/hwmon-next (f58a6ecaed2c pmbus: (ibm-cffps) Add support for version 2 of the PSU)
Merging jc_docs/docs-next (5aff7c46172b docs: process: fix broken link)
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 (20a438d53fd9 media: sun4i: Make sun4i_csi_formats static)
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 (65eaac7736ab Merge branch 'pm-devfreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (76e75f3b8386 Merge branch 'cpufreq/qcom-updates' into cpufreq/arm/linux-next)
Merging cpupower/cpupower (87ce24320694 cpupower: update German translation)
Merging opp/opp/linux-next (5ffdb1529b7f Merge branch 'opp/qcom-updates' into opp/linux-next)
Merging thermal/next (0ca7ab5b0092 Merge branch 'thermal-soc' into next)
CONFLICT (content): Merge conflict in Documentation/driver-api/thermal/index.rst
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 (98c09b8c9767 RDMA/hns: Fix wrong assignment of qp_access_flags)
CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/mlx5_ib.h
Merging net-next/master (4bc61b0b1695 Merge branch 'net-dsa-mv88e6xxx-centralize-SERDES-IRQ-handling')
CONFLICT (content): Merge conflict in scripts/link-vmlinux.sh
CONFLICT (content): Merge conflict in drivers/pci/controller/pci-hyperv.c
CONFLICT (content): Merge conflict in drivers/pci/Kconfig
CONFLICT (content): Merge conflict in drivers/net/usb/r8152.c
Merging bpf-next/master (bdb15a29cc28 Merge branch 'bpf-xdp-unaligned-chunk')
Merging ipsec-next/master (00ebd4998b53 Merge branch 'stmmac-Add-EHL-and-TGL-PCI-info-and-PCI-ID')
Merging mlx5-next/mlx5-next (00679b631edd net/mlx5: Set ODP capabilities for DC transport to max)
Merging netfilter-next/master (d0a8d877da97 netfilter: nft_dynset: support for element deletion)
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 (932630fa9028 Merge tag 'wireless-drivers-next-for-davem-2019-08-19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next)
Merging bluetooth/master (657fb9c74266 Bluetooth: btrtl: Remove trailing newline from calls to rtl_dev macros)
Merging mac80211-next/master (c8cd6e7f159e cfg80211: add local BSS receive time to survey information)
Merging gfs2/for-next (1c4691199fbe gfs2: Fix recovery slot bumping)
Merging mtd/mtd/next (5f9e832c1370 Linus 5.3-rc1)
Merging nand/nand/next (f480b969448e mtd: rawnand: omap2: Fix number of bitflips reporting with ELM)
Merging spi-nor/spi-nor/next (9607af6f857f mtd: spi-nor: Rename "n25q512a" to "mt25qu512a (n25q512a)")
Merging crypto/master (1bbbbcfdc0f0 crypto: hisilicon - select CRYPTO_LIB_DES while compiling SEC driver)
CONFLICT (content): Merge conflict in arch/x86/purgatory/Makefile
Merging drm/drm-next (578d2342ec70 Merge tag 'drm-next-5.4-2019-08-23' of git://people.freedesktop.org/~agd5f/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/mediatek/mtk_drm_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/arm/display/komeda/komeda_dev.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/navi10_ppt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/soc15.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
Merging amdgpu/drm-next (9c9284f9cee9 drm/amdgpu: Move null pointer dereference check)
Merging drm-intel/for-linux-next (dffa8feb3084 drm/i915/perf: Assert locking for i915_init_oa_perf_state())
Merging drm-tegra/drm/tegra/for-next (2a6fc3cb5cb6 drm/tegra: Fix gpiod_get_from_of_node() regression)
Merging drm-misc/for-linux-next (45d0dbd15a3b drm/panfrost: Remove unnecessary hwaccess_lock spin_lock)
Merging drm-msm/msm-next (7981dc1262f5 drm/msm: Remove Kconfig default)
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 (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary)
Merging etnaviv/etnaviv/next (088880ddc0b2 drm/etnaviv: implement softpin)
Merging regmap/for-next (1bd4584626a9 Merge branch 'regmap-5.4' into regmap-next)
Merging sound/for-next (6af86bdb8ad4 ALSA: firewire-motu: add support for MOTU 4pre)
Merging sound-asoc/for-next (ff97ad2bc8ea Merge branch 'asoc-5.4' into asoc-next)
CONFLICT (modify/delete): Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt deleted in sound-asoc/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt left in tree.
$ git rm -f Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt
Merging modules/modules-next (3b5be16c7e90 modules: page-align module section allocations only for arches supporting strict module rwx)
Merging input/next (e95656ea15e5 Input: add support for polling to input devices)
Merging block/for-next (8ba64588ef21 Merge branch 'for-5.4/libata' into for-next)
Merging device-mapper/for-next (c1499a044d7c dm space map common: remove check for impossible sm_find_free() return value)
Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
Merging mmc/next (6078f28cf9d1 mmc: sdhci: use lower/upper_32_bits() macros for DMA addresses)
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 (e526e501f0d4 power: supply: Init device wakeup after device_add())
CONFLICT (content): Merge conflict in drivers/power/supply/ab8500_charger.c
Merging regulator/for-next (2b734b6ebb98 Merge branch 'regulator-5.4' into regulator-next)
Merging security/next-testing (b602614a8107 lockdown: Print current->comm in restriction messages)
CONFLICT (content): Merge conflict in security/integrity/ima/Kconfig
CONFLICT (content): Merge conflict in kernel/trace/trace_kprobe.c
CONFLICT (content): Merge conflict in fs/tracefs/inode.c
CONFLICT (modify/delete): arch/s390/configs/performance_defconfig deleted in HEAD and modified in security/next-testing. Version security/next-testing of arch/s390/configs/performance_defconfig left in tree.
CONFLICT (content): Merge conflict in arch/s390/configs/defconfig
CONFLICT (content): Merge conflict in arch/s390/configs/debug_defconfig
$ git rm -f arch/s390/configs/performance_defconfig
Merging apparmor/apparmor-next (136db994852a apparmor: increase left match history buffer size)
Merging integrity/next-integrity (cbc0425d3dd3 sefltest/ima: support appended signatures (modsig))
CONFLICT (content): Merge conflict in arch/s390/kernel/machine_kexec_file.c
Merging keys/keys-next (52d865534794 Merge branch 'keys-acl' into keys-next)
CONFLICT (content): Merge conflict in include/linux/security.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.
$ 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"
Applying: usb: include watch_queue.h for needed enum
Merging selinux/next (116f21bb967f selinux: avoid atomic_t usage in sidtab)
Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock)
Merging tpmdd/next (8dbcb44f392e tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before probing for interrupts)
Merging watchdog/master (194108705c9e watchdog: remove w90x900 driver)
Merging iommu/next (aede20306942 Merge branches 'iommu/fixes', 'arm/omap', 'arm/exynos', 'arm/mediatek', 'arm/qcom', 'x86/amd', 'x86/vt-d' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/panfrost/panfrost_mmu.c
Applying: Revert "iommu: Disable passthrough mode when SME is active"
Merging vfio/next (e6c5d727db0a Merge branches 'v5.4/vfio/alexey-tce-memory-free-v1', 'v5.4/vfio/connie-re-arrange-v2', 'v5.4/vfio/hexin-pci-reset-v3', 'v5.4/vfio/parav-mtty-uuid-v2' and 'v5.4/vfio/shameer-iova-list-v8' into v5.4/vfio/next)
Merging audit/next (5f9e832c1370 Linus 5.3-rc1)
Merging devicetree/for-next (146fa39943b1 dt-bindings: Convert Arm Mali Utgard GPU to DT schema)
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 (3b69a15d2952 Merge branch 'spi-5.4' into spi-next)
Merging tip/auto-latest (fe7c37cbabbc Merge branch 'perf/core')
CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.c
CONFLICT (content): Merge conflict in arch/ia64/include/asm/sn/sn_sal.h
Applying: ASoC: Intel: boards: merge fix for INTEL_FAM6_KABYLAKE_MOBILE -> INTEL_FAM6_KABYLAKE_L change
Merging clockevents/clockevents/next (befd04abfbe4 clocksource/drivers/sh_cmt: Document "cmt-48" as deprecated)
CONFLICT (content): Merge conflict in kernel/time/posix-timers.c
Merging edac/edac-for-next (81f5090db843 EDAC/amd64: Support asymmetric dual-rank DIMMs)
Merging irqchip/irq/irqchip-next (2178add02238 irqchip/mmp: Coexist with GIC root IRQ controller)
CONFLICT (content): Merge conflict in drivers/pci/controller/pci-hyperv.c
Merging ftrace/for-next (6d54ceb539aa tracing: Fix user stack trace "??" output)
Merging rcu/rcu/next (049b405029c0 MAINTAINERS: Update from paulmck@linux.ibm.com to paulmck@kernel.org)
Merging kvm/linux-next (b6852ae75d4b KVM: VMX: Fix and tweak the comments for VM-Enter)
Merging kvm-arm/next (e8688ba38749 arm64: KVM: Device mappings should be execute-never)
Merging kvm-ppc/kvm-ppc-next (ff42df49e75f KVM: PPC: Book3S HV: Don't lose pending doorbell request on migration on P9)
Merging kvms390/next (be6f55a60d28 KVM: selftests: Add a test for the KVM_S390_MEM_OP ioctl)
Merging xen-tip/linux-next (b877ac9815a8 xen/swiotlb: remember having called xen_create_contiguous_region())
Merging percpu/for-next (7eebb3ad9742 Merge branch 'for-5.4' 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 (058bf149b92a platform/chrome: cros_ec_rpmsg: Add host command AP sleep state support)
Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq())
Merging leds/for-next (4e4210402639 leds: trigger: gpio: GPIO 0 is valid)
Merging ipmi/for-next (383035211c79 ipmi: move message error checking to avoid deadlock)
Merging driver-core/driver-core-next (d9430f96c051 driver core: platform: Export platform_get_irq_optional())
CONFLICT (content): Merge conflict in drivers/base/power/runtime.c
Merging usb/usb-next (b2fcb285ade3 usb: xhci-mtk: add an optional xhci_ck clock)
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
Merging usb-gadget/next (18a93cd38be3 usb: gadget: net2280: Add workaround for AB chip Errata 11)
Merging usb-serial/usb-next (7a786b847907 USB: serial: ftdi_sio: add support for FT232H CBUS gpios)
Merging usb-chipidea-next/ci-for-usb-next (05559f10ed79 usb: chipidea: add role switch class support)
Merging phy-next/next (5af67635c36e phy: marvell: phy-mvebu-cp110-comphy: rename instances of DLT)
Merging tty/tty-next (591f4ea2ed61 serial: 8250_pci: Add F81504A series Support)
Merging char-misc/char-misc-next (d4e34999a757 Merge tag 'lkdtm-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-next)
Merging extcon/extcon-next (a3fc57233977 extcon: adc-jack: Remove dev_err() usage after platform_get_irq())
Merging soundwire/next (395713d8ca43 soundwire: intel: handle disabled links)
Merging thunderbolt/next (dfda20419884 ACPI / property: Add two new Thunderbolt property GUIDs to the list)
Merging staging/staging-next (097a802ae15e erofs: reduntant assignment in __erofs_get_meta_page())
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (6311b6521bcc drivers: qcom: Add BCM vote macro to header)
Merging slave-dma/next (f5e84eae7956 dmaengine: dw: platform: Split OF helpers to separate module)
Merging cgroup/for-next (653a23ca7e1e Use kvmalloc in cgroups-v1)
Merging scsi/for-next (22d48c3e8eb4 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (cb9e763ed9eb Merge branch '5.4/scsi-queue' into 5.4/scsi-next)
CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_sli4.h
Merging vhost/linux-next (73f628ec9e6b vhost: disable metadata prefetch optimization)
Merging rpmsg/for-next (0431e0d0926d Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (1fc4f3c962b7 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/gpio/gpio-ixp4xx.c
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 (85af79659f45 MAINTAINERS: Remove stale record for gpio-intel-mid.c)
Merging pinctrl/for-next (73345a18d464 pinctrl: bcm2835: Pass irqchip when adding gpiochip)
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 (9659ef791c3f selftests: tpm2: install python files)
Merging y2038/y2038 (9d14545b05f9 Merge branch 'limits' of https://github.com/deepa-hub/vfs into y2038)
Merging livepatching/for-next (1cfe141e1715 Merge branch 'for-5.4-core' into for-next)
Merging coresight/next (eb748213be48 coresight: tmc-etr: Add barrier packets when moving offset forward)
Merging rtc/rtc-next (4a9eb8154ffd dt-bindings: rtc: ds1307: add rx8130 compatible)
Merging nvdimm/libnvdimm-for-next (7b60422cb796 libnvdimm/security: Consolidate 'security' operations)
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 (799e064cc79e fsi: scom: Don't abort operations for minor errors)
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 (9b5434196529 Tools: hv: move to tools buildsystem)
Merging auxdisplay/auxdisplay (a180d023ec7b 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 (0465814831a9 PM / devfreq: passive: fix compiler warning)
Merging hmm/hmm (126470c8a58b libnvdimm: Enable unit test infrastructure compile checks)
Applying: Revert "libnvdimm: Enable unit test infrastructure compile checks"
Merging fpga/for-next (e56476897448 fpga: Remove dev_err() usage after platform_get_irq())
Applying: merge fixes for "dma-mapping: make dma_atomic_pool_init self-contained"
Merging akpm-current/current (f7dcf869ad39 ipc/msg.c: consolidate all xxxctl_down() functions)
CONFLICT (content): Merge conflict in include/linux/memremap.h
CONFLICT (content): Merge conflict in arch/riscv/Kconfig
CONFLICT (content): Merge conflict in arch/arm64/include/asm/processor.h
Applying: mm: merge fix for "pagewalk: separate function pointers from iterator data"
$ 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: untag user pointers in mmap/munmap/mremap/brk
Applying: hexagon: drop empty and unused free_initrd_mem
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 (3064ff1c7666 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

* Re: linux-next: Tree for Sep 2 (exfat)
  2019-09-02 12:43 linux-next: Tree for Sep 2 Stephen Rothwell
@ 2019-09-02 17:39 ` Randy Dunlap
  2019-09-02 17:42   ` Greg KH
  2019-09-02 17:46   ` Greg KH
  0 siblings, 2 replies; 13+ messages in thread
From: Randy Dunlap @ 2019-09-02 17:39 UTC (permalink / raw)
  To: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Valdis Kletnieks, devel,
	Linux FS Devel

On 9/2/19 5:43 AM, Stephen Rothwell wrote:
> Hi all,
> 
> News: I will only be doing 2 more releases before I leave for Kernel
> Summit (there may be some reports on Thursday, but I doubt I will have
> time to finish the full release) and then no more until Sept 30.
> 
> Changes since 20190830:
> 

Hi,
I am seeing lots of exfat build errors when CONFIG_BLOCK is not set/enabled.
Maybe its Kconfig should also say
	depends on BLOCK
?

-- 
~Randy

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

* Re: linux-next: Tree for Sep 2 (exfat)
  2019-09-02 17:39 ` linux-next: Tree for Sep 2 (exfat) Randy Dunlap
@ 2019-09-02 17:42   ` Greg KH
  2019-09-02 17:46   ` Greg KH
  1 sibling, 0 replies; 13+ messages in thread
From: Greg KH @ 2019-09-02 17:42 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Valdis Kletnieks, devel,
	Linux FS Devel

On Mon, Sep 02, 2019 at 10:39:39AM -0700, Randy Dunlap wrote:
> On 9/2/19 5:43 AM, Stephen Rothwell wrote:
> > Hi all,
> > 
> > News: I will only be doing 2 more releases before I leave for Kernel
> > Summit (there may be some reports on Thursday, but I doubt I will have
> > time to finish the full release) and then no more until Sept 30.
> > 
> > Changes since 20190830:
> > 
> 
> Hi,
> I am seeing lots of exfat build errors when CONFIG_BLOCK is not set/enabled.
> Maybe its Kconfig should also say
> 	depends on BLOCK
> ?

Yes it should, sorry, will go fix that up now...

greg k-h

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

* Re: linux-next: Tree for Sep 2 (exfat)
  2019-09-02 17:39 ` linux-next: Tree for Sep 2 (exfat) Randy Dunlap
  2019-09-02 17:42   ` Greg KH
@ 2019-09-02 17:46   ` Greg KH
  2019-09-02 18:07     ` Randy Dunlap
  1 sibling, 1 reply; 13+ messages in thread
From: Greg KH @ 2019-09-02 17:46 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Valdis Kletnieks, devel,
	Linux FS Devel

On Mon, Sep 02, 2019 at 10:39:39AM -0700, Randy Dunlap wrote:
> On 9/2/19 5:43 AM, Stephen Rothwell wrote:
> > Hi all,
> > 
> > News: I will only be doing 2 more releases before I leave for Kernel
> > Summit (there may be some reports on Thursday, but I doubt I will have
> > time to finish the full release) and then no more until Sept 30.
> > 
> > Changes since 20190830:
> > 
> 
> Hi,
> I am seeing lots of exfat build errors when CONFIG_BLOCK is not set/enabled.
> Maybe its Kconfig should also say
> 	depends on BLOCK
> ?

Here's what I committed to my tree:


From e2b880d3d1afaa5cad108c29be3e307b1917d195 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 2 Sep 2019 19:45:06 +0200
Subject: staging: exfat: make exfat depend on BLOCK

This should fix a build error in some configurations when CONFIG_BLOCK
is not selected.  Also properly set the dependancy for no FAT support at
the same time.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/staging/exfat/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/staging/exfat/Kconfig b/drivers/staging/exfat/Kconfig
index f52129c67f97..290dbfc7ace1 100644
--- a/drivers/staging/exfat/Kconfig
+++ b/drivers/staging/exfat/Kconfig
@@ -1,11 +1,13 @@
 config EXFAT_FS
 	tristate "exFAT fs support"
+	depends on BLOCK
 	select NLS
 	help
 	  This adds support for the exFAT file system.
 
 config EXFAT_DONT_MOUNT_VFAT
 	bool "Prohibit mounting of fat/vfat filesysems by exFAT"
+	depends on EXFAT_FS
 	default y
 	help
 	  By default, the exFAT driver will only mount exFAT filesystems, and refuse
-- 
2.23.0


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

* Re: linux-next: Tree for Sep 2 (exfat)
  2019-09-02 17:46   ` Greg KH
@ 2019-09-02 18:07     ` Randy Dunlap
  2019-09-02 18:11       ` Joe Perches
  0 siblings, 1 reply; 13+ messages in thread
From: Randy Dunlap @ 2019-09-02 18:07 UTC (permalink / raw)
  To: Greg KH
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Valdis Kletnieks, devel,
	Linux FS Devel

On 9/2/19 10:46 AM, Greg KH wrote:
> On Mon, Sep 02, 2019 at 10:39:39AM -0700, Randy Dunlap wrote:
>> On 9/2/19 5:43 AM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> News: I will only be doing 2 more releases before I leave for Kernel
>>> Summit (there may be some reports on Thursday, but I doubt I will have
>>> time to finish the full release) and then no more until Sept 30.
>>>
>>> Changes since 20190830:
>>>
>>
>> Hi,
>> I am seeing lots of exfat build errors when CONFIG_BLOCK is not set/enabled.
>> Maybe its Kconfig should also say
>> 	depends on BLOCK
>> ?
> 
> Here's what I committed to my tree:
> 
> 
> From e2b880d3d1afaa5cad108c29be3e307b1917d195 Mon Sep 17 00:00:00 2001
> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Date: Mon, 2 Sep 2019 19:45:06 +0200
> Subject: staging: exfat: make exfat depend on BLOCK
> 
> This should fix a build error in some configurations when CONFIG_BLOCK
> is not selected.  Also properly set the dependancy for no FAT support at
> the same time.
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Valdis Kletnieks <valdis.kletnieks@vt.edu>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

That works. Thanks.
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested

> ---
>  drivers/staging/exfat/Kconfig | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/staging/exfat/Kconfig b/drivers/staging/exfat/Kconfig
> index f52129c67f97..290dbfc7ace1 100644
> --- a/drivers/staging/exfat/Kconfig
> +++ b/drivers/staging/exfat/Kconfig
> @@ -1,11 +1,13 @@
>  config EXFAT_FS
>  	tristate "exFAT fs support"
> +	depends on BLOCK
>  	select NLS
>  	help
>  	  This adds support for the exFAT file system.
>  
>  config EXFAT_DONT_MOUNT_VFAT
>  	bool "Prohibit mounting of fat/vfat filesysems by exFAT"
> +	depends on EXFAT_FS
>  	default y
>  	help
>  	  By default, the exFAT driver will only mount exFAT filesystems, and refuse
> 


-- 
~Randy

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

* Re: linux-next: Tree for Sep 2 (exfat)
  2019-09-02 18:07     ` Randy Dunlap
@ 2019-09-02 18:11       ` Joe Perches
  2019-09-02 18:44         ` Greg KH
  0 siblings, 1 reply; 13+ messages in thread
From: Joe Perches @ 2019-09-02 18:11 UTC (permalink / raw)
  To: Randy Dunlap, Greg KH
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Valdis Kletnieks, devel,
	Linux FS Devel

On Mon, 2019-09-02 at 11:07 -0700, Randy Dunlap wrote:
> On 9/2/19 10:46 AM, Greg KH wrote:
> > On Mon, Sep 02, 2019 at 10:39:39AM -0700, Randy Dunlap wrote:
> > > On 9/2/19 5:43 AM, Stephen Rothwell wrote:
> > > > Hi all,
> > > > 
> > > > News: I will only be doing 2 more releases before I leave for Kernel
> > > > Summit (there may be some reports on Thursday, but I doubt I will have
> > > > time to finish the full release) and then no more until Sept 30.
> > > > 
> > > > Changes since 20190830:
> > > > 
> > > 
> > > Hi,
> > > I am seeing lots of exfat build errors when CONFIG_BLOCK is not set/enabled.
> > > Maybe its Kconfig should also say
> > > 	depends on BLOCK
> > > ?
> > 
> > Here's what I committed to my tree:
> > 
> > 
> > From e2b880d3d1afaa5cad108c29be3e307b1917d195 Mon Sep 17 00:00:00 2001
> > From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Date: Mon, 2 Sep 2019 19:45:06 +0200
> > Subject: staging: exfat: make exfat depend on BLOCK
> > 
> > This should fix a build error in some configurations when CONFIG_BLOCK
> > is not selected.  Also properly set the dependancy for no FAT support at
> > the same time.
> > 
> > Reported-by: Randy Dunlap <rdunlap@infradead.org>
> > Cc: Valdis Kletnieks <valdis.kletnieks@vt.edu>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> That works. Thanks.
> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
> 
> > ---
> >  drivers/staging/exfat/Kconfig | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/drivers/staging/exfat/Kconfig b/drivers/staging/exfat/Kconfig
> > index f52129c67f97..290dbfc7ace1 100644
> > --- a/drivers/staging/exfat/Kconfig
> > +++ b/drivers/staging/exfat/Kconfig
> > @@ -1,11 +1,13 @@
> >  config EXFAT_FS
> >  	tristate "exFAT fs support"
> > +	depends on BLOCK
> >  	select NLS
> >  	help
> >  	  This adds support for the exFAT file system.
> >  
> >  config EXFAT_DONT_MOUNT_VFAT
> >  	bool "Prohibit mounting of fat/vfat filesysems by exFAT"
> > +	depends on EXFAT_FS
> >  	default y
> >  	help
> >  	  By default, the exFAT driver will only mount exFAT filesystems, and refuse

I think this last one is backwards and should be

config EXFAT_ALLOW_MOUNT_VFAT
and
default n

> 
> 


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

* Re: linux-next: Tree for Sep 2 (exfat)
  2019-09-02 18:11       ` Joe Perches
@ 2019-09-02 18:44         ` Greg KH
  0 siblings, 0 replies; 13+ messages in thread
From: Greg KH @ 2019-09-02 18:44 UTC (permalink / raw)
  To: Joe Perches
  Cc: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Valdis Kletnieks, devel,
	Linux FS Devel

On Mon, Sep 02, 2019 at 11:11:45AM -0700, Joe Perches wrote:
> On Mon, 2019-09-02 at 11:07 -0700, Randy Dunlap wrote:
> > On 9/2/19 10:46 AM, Greg KH wrote:
> > > On Mon, Sep 02, 2019 at 10:39:39AM -0700, Randy Dunlap wrote:
> > > > On 9/2/19 5:43 AM, Stephen Rothwell wrote:
> > > > > Hi all,
> > > > > 
> > > > > News: I will only be doing 2 more releases before I leave for Kernel
> > > > > Summit (there may be some reports on Thursday, but I doubt I will have
> > > > > time to finish the full release) and then no more until Sept 30.
> > > > > 
> > > > > Changes since 20190830:
> > > > > 
> > > > 
> > > > Hi,
> > > > I am seeing lots of exfat build errors when CONFIG_BLOCK is not set/enabled.
> > > > Maybe its Kconfig should also say
> > > > 	depends on BLOCK
> > > > ?
> > > 
> > > Here's what I committed to my tree:
> > > 
> > > 
> > > From e2b880d3d1afaa5cad108c29be3e307b1917d195 Mon Sep 17 00:00:00 2001
> > > From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > Date: Mon, 2 Sep 2019 19:45:06 +0200
> > > Subject: staging: exfat: make exfat depend on BLOCK
> > > 
> > > This should fix a build error in some configurations when CONFIG_BLOCK
> > > is not selected.  Also properly set the dependancy for no FAT support at
> > > the same time.
> > > 
> > > Reported-by: Randy Dunlap <rdunlap@infradead.org>
> > > Cc: Valdis Kletnieks <valdis.kletnieks@vt.edu>
> > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > 
> > That works. Thanks.
> > Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
> > 
> > > ---
> > >  drivers/staging/exfat/Kconfig | 2 ++
> > >  1 file changed, 2 insertions(+)
> > > 
> > > diff --git a/drivers/staging/exfat/Kconfig b/drivers/staging/exfat/Kconfig
> > > index f52129c67f97..290dbfc7ace1 100644
> > > --- a/drivers/staging/exfat/Kconfig
> > > +++ b/drivers/staging/exfat/Kconfig
> > > @@ -1,11 +1,13 @@
> > >  config EXFAT_FS
> > >  	tristate "exFAT fs support"
> > > +	depends on BLOCK
> > >  	select NLS
> > >  	help
> > >  	  This adds support for the exFAT file system.
> > >  
> > >  config EXFAT_DONT_MOUNT_VFAT
> > >  	bool "Prohibit mounting of fat/vfat filesysems by exFAT"
> > > +	depends on EXFAT_FS
> > >  	default y
> > >  	help
> > >  	  By default, the exFAT driver will only mount exFAT filesystems, and refuse
> 
> I think this last one is backwards and should be
> 
> config EXFAT_ALLOW_MOUNT_VFAT
> and
> default n

This is just a "bandage" for now, it should be fixed properly by ripping
out the code wherever possible and making this the default functionality
anyway.  This just keeps the code from breaking existing working systems
if users accidentally build this module.

thanks,

greg k-h

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

* linux-next: Tree for Sep 2
@ 2021-09-02  6:23 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2021-09-02  6:23 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Please do not add any v5.16 related code to your linux-next included
branches until after v5.15-rc1 has been released.

Changes since 20210901:

The net-next tree build failure is now in Linus' tree so the fix is in
my fixes tree.

The amdgpu tree gained a conflict against Linus' tree.

Non-merge commits (relative to Linus' tree): 4122
 4457 files changed, 245375 insertions(+), 69865 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 (477f70cd2a67 Merge tag 'drm-next-2021-08-31-1' of git://anongit.freedesktop.org/drm/drm)
Merging fixes/fixes (9efa95cbd46b NET_VENDOR_CIRRUS is not ready for COMPILE_TEST)
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 (3eb9cdffb397 Partially revert "arm64/mm: drop HAVE_ARCH_PFN_VALID")
Merging arm-soc-fixes/arm/fixes (6c35ca069741 Merge tag 'reset-fixes-for-v5.14' of git://git.pengutronix.de/pza/linux into arm/fixes)
Merging drivers-memory-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
Merging m68k-current/for-linus (87d93029fe83 m68k: Fix asm register constraints for atomic ops)
Merging powerpc-fixes/fixes (787c70f2f999 powerpc/64s: Fix scv implicit soft-mask table for relocated kernels)
Merging s390-fixes/fixes (c7a5238ef68b Merge tag 's390-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
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 (780aa1209f88 mptcp: Fix duplicated argument in protocol.h)
Merging bpf/master (9e9fb7655ed5 Merge tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging ipsec/master (57f780f1c433 atlantic: Fix driver resume flow.)
Merging netfilter/master (d7e7747ac5c2 netfilter: refuse insertion if chain has grown too large)
Merging ipvs/master (e3245a7b7b34 netfilter: nft_ct: protect nft_ct_pcpu_template_refcnt with mutex)
Merging wireless-drivers/master (abf3d98dee7c mt76: fix enum type mismatch)
Merging mac80211/master (57f780f1c433 atlantic: Fix driver resume flow.)
Merging rdma-fixes/for-rc (cc4f596cf85e RDMA/rxe: Zero out index member of struct rxe_queue)
Merging sound-current/for-linus (c8b177b6e3a0 ALSA: usb-audio: Add registration quirk for JBL Quantum 800)
Merging sound-asoc-fixes/for-linus (14c72128792a Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus)
Merging regmap-fixes/for-linus (e22ce8eb631b Linux 5.14-rc7)
Merging regulator-fixes/for-linus (7cb623f775d5 Merge remote-tracking branch 'regulator/for-5.15' into regulator-linus)
Merging spi-fixes/for-linus (d5f78f50fff3 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 (835d31d319d9 Merge tag 'media/v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging tty.current/tty-linus (835d31d319d9 Merge tag 'media/v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging usb.current/usb-linus (835d31d319d9 Merge tag 'media/v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (dcf097e7d21f USB: serial: pl2303: fix GL type detection)
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 (ebf435d3b51b Merge tag 'staging-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging)
Merging iio-fixes/fixes-togreg (ce9e3d5989e5 iio: adc128s052: Fix the error handling path of 'adc128_probe()')
Merging char-misc.current/char-misc-linus (ba1dc7f273c7 Merge tag 'char-misc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
Merging soundwire-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
Merging thunderbolt-fixes/fixes (7d2a07b76933 Linux 5.14)
Merging input-current/for-linus (818b26588994 Merge branch 'next' into for-linus)
Merging crypto-current/master (6ae51ffe5e76 crypto: sha512 - remove imaginary and mystifying clearing of variables)
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 (ed104ca4bd9c reset: reset-zynqmp: Fixed the argument data type)
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 (276281b8e898 hwmon: sht4x: update Documentation for Malformed table)
Merging nvdimm-fixes/libnvdimm-fixes (32b2397c1e56 libnvdimm/pmem: Fix crash triggered when I/O in-flight during unbind)
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 (02c6dcd543f8 scsi: core: Fix hang of freezing queue between blocking and running device)
Merging drm-fixes/drm-fixes (7d2a07b76933 Linux 5.14)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (7d2a07b76933 Linux 5.14)
Merging mmc-fixes/fixes (885814a97f5a Revert "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 (417166ddec02 riscv: dts: microchip: Add ethernet0 to the aliases node)
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 (087e856cfb76 kbuild: redo fake deps at include/ksym/*.h)
Applying: drm/i915: use linux/stddef.h due to "isystem: trim/fixup stdarg.h and other headers"
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)
CONFLICT (content): Merge conflict in include/asm-generic/bitops/non-atomic.h
Merging arc/for-next (56809a28d45f ARC: mm: vmalloc sync from kernel to user table to update PMD ...)
Merging arm/for-next (1c9b5911f53b Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (65266a7c6abf Merge remote-tracking branch 'tip/sched/arm64' 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 (5e115b419d2b soc: document merges)
CONFLICT (content): Merge conflict in include/uapi/linux/virtio_ids.h
CONFLICT (content): Merge conflict in drivers/firmware/Makefile
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 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 (09f3824342f6 reset: simple: remove ZTE details in Kconfig help)
Merging rockchip/for-next (d46148623f26 Merge branch 'v5.15-armsoc/dts64' 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 (4d7e3c8de98e Merge branch 'zynqmp/dt' of https://github.com/Xilinx/linux-xlnx into for-next)
Merging clk/clk-next (47505bf3a821 Merge branches 'clk-kirkwood', 'clk-imx', 'clk-doc', 'clk-zynq' and 'clk-ralink' into clk-next)
Merging clk-imx/for-next (86842d255b45 clk: imx8mn: Add M7 core clock)
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 (87d93029fe83 m68k: Fix asm register constraints for atomic ops)
Merging m68knommu/for-next (db87db65c105 m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch)
Merging microblaze/next (315511166469 microblaze: move core-y in arch/microblaze/Makefile to arch/microblaze/Kbuild)
Merging mips/mips-next (71f8817c28e2 MIPS: ingenic: Unconditionally enable clock of CPU #0)
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 (1955d843efc3 openrisc/litex: Update defconfig)
Merging parisc-hd/for-next (6f1fce595b78 parisc: math-emu: Fix fall-through warnings)
Merging powerpc/next (e432fe97f3e5 powerpc/bug: Cast to unsigned long before passing to inline asm)
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 (c24a19674258 riscv: add support for hugepage migration)
Merging s390/for-next (81912856e0fb s390/configs: enable CONFIG_KFENCE in debug_defconfig)
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 (adf9ae0d159d um: fix stub location calculation)
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 (20ec197bfa13 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 (1efc6199e6b9 Merge branch 'for-next-current-v5.14-20210830' into for-next-20210830)
Merging ceph/master (a9e6ffbc5b73 ceph: fix possible null-pointer dereference in ceph_mdsmap_decode())
Merging cifs/for-next (3998f0b8bc49 cifs: Do not leak EDEADLK to dgetents64 for STATUS_USER_SESSION_DELETED)
Merging cifsd/cifsd-for-next (7d5d8d715689 ksmbd: fix __write_overflow warning in ndr_read_string)
Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup())
Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs)
Merging erofs/dev (1266b4a7ecb6 erofs: fix double free of 'copied')
Merging exfat/dev (50be9417e23a Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block)
Merging ext3/for_next (ed518dd035fa Pull udf xattr sanity checks.)
Merging ext4/dev (3e5533948c16 ext4: Improve scalability of ext4 orphan file handling)
Merging f2fs/dev (9605f75cf36e f2fs: should put a page beyond EOF when preparing a write)
CONFLICT (content): Merge conflict in fs/f2fs/file.c
Applying: fxup for "f2fs: Convert to using invalidate_lock"
Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
Merging fuse/for-next (df1379ecc670 fuse: remove unused arg in fuse_write_file_get())
Merging gfs2/for-next (08d736667185 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 (2a7a451a9084 NFSv4.1 add network transport when session trunking is detected)
Merging nfsd/nfsd-next (e22ce8eb631b Linux 5.14-rc7)
Merging cel/for-next (e38b3f200594 SUNRPC: don't pause on incomplete allocation)
Merging ntfs3/master (d3624466b56d fs/ntfs3: Restyle comments to better align with kernel-doc)
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 (f38a032b165d xfs: fix I_DONTCACHE)
Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check)
Merging iomap/iomap-for-next (03b8df8d43ec iomap: standardize tracepoint formatting and storage)
Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID)
Merging file-locks/locks-next (b91db6a0b52e Merge tag 'for-5.15/io_uring-vfs-2021-08-30' of git://git.kernel.dk/linux-block)
Merging vfs/for-next (2cfbffc62045 Merge branch 'work.init' into for-next)
Merging printk/for-next (c57343431170 Merge branch 'for-5.15-printk-index' into for-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging pci/next (5d7cf8d4793b Merge branch 'remotes/lorenzo/pci/tools')
CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/bnxt/bnxt.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/bnx2.c
CONFLICT (content): Merge conflict in MAINTAINERS
Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long)
Merging hid/for-next (4bc44ba4871f Merge branch 'for-5.15/core' into for-next)
Merging i2c/i2c/for-next (cc1dbdeb17dd Merge branch 'i2c/for-mergewindow' into i2c/for-next)
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 (0e35f63f7f4e hwmon: add driver for Aquacomputer D5 Next)
Merging jc_docs/docs-next (630c8fa02f9a Documentation: Update details of The Linux Kernel Module Programming Guide)
Merging v4l-dvb/master (9c3a0f285248 Merge tag 'v5.14-rc4' into media_tree)
Merging v4l-dvb-next/master (d62cd4d277cc media: uvcvideo: Remove unused including <linux/version.h>)
Merging pm/linux-next (103d2fac60d0 Merge branches 'pm-opp' and 'pm-cpufreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (f0712ace7fe0 cpufreq: qcom-hw: Set dvfs_possible_from_any_cpu cpufreq driver flag)
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 (94274f20f6bf dt-bindings: opp: Convert to DT schema)
Merging thermal/thermal/linux-next (da6deb655a58 thermal/drivers/qcom/spmi-adc-tm5: Don't abort probing if a sensor is not used)
Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
Merging dlm/next (ecd95673142e fs: dlm: avoid comms shutdown delay in release_lockspace)
Merging swiotlb/linux-next (f3c4b1341e83 swiotlb: use depends on for DMA_RESTRICTED_POOL)
CONFLICT (content): Merge conflict in kernel/dma/direct.c
Merging rdma/for-next (6a217437f9f5 Merge branch 'sg_nents' into rdma.git for-next)
Applying: drm/i915/ttm: fix up for "lib/scatterlist: Provide a dedicated function to support tableappend"
Merging net-next/master (9e9fb7655ed5 Merge tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging bpf-next/for-next (9e9fb7655ed5 Merge tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging ipsec-next/master (a16ef91aa61a net: pasemi: Remove usage of the deprecated "pci-dma-compat.h" API)
Merging mlx5-next/mlx5-next (598fe77df855 net/mlx5: Lag, Create shared FDB when in switchdev mode)
Merging netfilter-next/master (9dfa859da0f5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next)
Merging ipvs-next/master (7bc416f14716 netfilter: x_tables: handle xt_register_template() returning an error value)
Merging wireless-drivers-next/master (eaf2aaec0be4 Merge tag 'wireless-drivers-next-2021-08-29' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next)
Merging bluetooth/master (9bba12860fc7 Bluetooth: btusb: Add the new support ID for Realtek RTL8852A)
Merging mac80211-next/master (464a57281f29 net/mlxbf_gige: Make use of devm_platform_ioremap_resourcexxx())
Merging mtd/mtd/next (ee28b42006c3 mtd_blkdevs: simplify the refcounting in blktrans_{open, release})
Merging nand/nand/next (6b430c7595e4 mtd: rawnand: cafe: Fix a resource leak in the error handling path of 'cafe_nand_probe()')
Merging spi-nor/spi-nor/next (2734d6c1b1a0 Linux 5.14-rc2)
Merging crypto/master (6ae51ffe5e76 crypto: sha512 - remove imaginary and mystifying clearing of variables)
Merging drm/drm-next (8f0284f190e6 Merge tag 'amd-drm-next-5.15-2021-08-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
Merging drm-misc/for-linux-next (efcefc712729 drm/ttm: Fix ttm_bo_move_memcpy() for subclassed struct ttm_resource)
Merging amdgpu/drm-next (b8430770b55c drm/sched: fix the bug of time out calculation(v4))
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
Merging drm-intel/for-linux-next (fb43ebc83e06 drm/i915/selftest: Fix use of err in igt_reset_{fail, nop}_engine())
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 (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource())
Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function)
Merging regmap/for-next (ca5537c9be13 Merge remote-tracking branch 'regmap/for-5.15' into regmap-next)
Merging sound/for-next (c8b177b6e3a0 ALSA: usb-audio: Add registration quirk for JBL Quantum 800)
Merging sound-asoc/for-next (14c72128792a Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus)
Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer)
Merging input/next (247141f5286b dt-bindings: input: tsc2005: Convert to YAML schema)
Merging block/for-next (0fedff25ca5a Merge branch 'for-5.15/io_uring' into for-next)
Merging device-mapper/for-next (d3703ef33129 dm crypt: use in_hardirq() instead of deprecated in_irq())
Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug)
Merging mmc/next (a75c95616297 Merge branch 'fixes' into next)
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 (c9398455b046 power: supply: core: Fix parsing of battery chemistry/technology)
Merging regulator/for-next (7cb623f775d5 Merge remote-tracking branch 'regulator/for-5.15' into regulator-linus)
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 (cb181da16196 IMA: reject unknown hash algorithms in ima_get_hash_algo)
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 (7d2a07b76933 Linux 5.14)
Merging tpmdd/next (f985911b7bc7 crypto: public_key: fix overflow during implicit conversion)
Merging watchdog/master (41e73feb1024 dt-bindings: watchdog: Add compatible for Mediatek MT7986)
Merging iommu/next (d8768d7eb9c2 Merge branches 'apple/dart', 'arm/smmu', 'iommu/fixes', 'x86/amd', 'x86/vt-d' and 'core' into next)
Merging audit/next (67d69e9d1a6c audit: move put_tree() to avoid trim_trees refcount underflow and UAF)
Merging devicetree/for-next (b1e202503508 dt-bindings: display: remove zte,vou.txt binding doc)
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 (85dfdbfc13ea mailbox: cmdq: add multi-gce clocks support for mt8195)
Merging spi/for-next (6e9c846aa0c5 Merge remote-tracking branch 'spi/for-5.15' into spi-next)
Merging tip/auto-latest (689db7cba0d8 Merge branch 'locking/debug')
Merging clockevents/timers/drivers/next (f196ae282070 dt-bindings: timer: Add ABIs for new Ingenic SoCs)
Merging edac/edac-for-next (cf4e6d52f583 EDAC/i10nm: Retrieve and print retry_rd_err_log registers)
Merging irqchip/irq/irqchip-next (6e3b473ee064 Merge branch irq/qcom-pdc-nowake-cleanup into irq/irqchip-next)
Merging ftrace/for-next (297e1dcdca3d selftests/ftrace: Add selftest for testing duplicate eprobes and kprobes)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging rcu/rcu/next (38babc43f45e rcutorture: Avoid problematic critical section nesting on PREEMPT_RT)
CONFLICT (content): Merge conflict in kernel/time/tick-internal.h
Merging kvm/next (43e540cc9f2c KVM: SVM: Add 5-level page table support for SVM)
Merging kvm-arm/next (419025b3b419 Merge branch kvm-arm64/misc-5.15 into kvmarm-master/next)
Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests)
Merging kvms390/next (a3e03bc1368c KVM: s390: index kvm->arch.idle_mask by vcpu_idx)
Merging xen-tip/linux-next (58e636039b51 xen: remove stray preempt_disable() from PV AP startup code)
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 (0487d4fc42d7 platform/x86: dell-smbios-wmi: Add missing kfree in error-exit from run_smbios_call)
Merging chrome-platform/for-next (4665584888ad platform/chrome: cros_ec_trace: Fix format warnings)
Merging hsi/for-next (e73f0f0ee754 Linux 5.14-rc1)
Merging leds/for-next (239f32b4f161 leds: pca955x: Switch to i2c probe_new)
Merging ipmi/for-next (bf064c7bec3b char: ipmi: use DEVICE_ATTR helper macro)
Merging driver-core/driver-core-next (835d31d319d9 Merge tag 'media/v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging usb/usb-next (1b4f3dfb4792 Merge tag 'usb-serial-5.15-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next)
Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial/usb-next (a65ab973c166 USB: serial: replace symbolic permissions by octal permissions)
Merging usb-chipidea-next/for-usb-next (e5d6a7c6cfae usb: chipidea: host: fix port index underflow and UBSAN complains)
Merging tty/tty-next (835d31d319d9 Merge tag 'media/v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging char-misc/char-misc-next (ba1dc7f273c7 Merge tag 'char-misc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
Merging extcon/extcon-next (07de34f5ce1e extcon: max3355: Drop unused include)
Merging phy-next/next (152a810eae03 phy: qcom-qmp: Add support for SM6115 UFS phy)
Merging soundwire/next (2564a2d4418b soundwire: cadence: do not extend reset delay)
Merging thunderbolt/next (42716425ad7e thunderbolt: Fix port linking by checking all adapters)
Merging vfio/next (ea870730d83f Merge branches 'v5.15/vfio/spdx-license-cleanups', 'v5.15/vfio/dma-valid-waited-v3', 'v5.15/vfio/vfio-pci-core-v5' and 'v5.15/vfio/vfio-ap' into v5.15/vfio/next)
CONFLICT (content): Merge conflict in drivers/vfio/pci/vfio_pci.c
Applying: fixup for "vfio/pci: Rename vfio_pci.c to vfio_pci_core.c"
Merging staging/staging-next (ebf435d3b51b Merge tag 'staging-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging)
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 (11a427be2c47 dmaengine: sh: fix some NULL dereferences)
Merging cgroup/for-next (96aff80dde1b Merge branch 'for-5.15' into for-next)
Merging scsi/for-next (27f681116fdf Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/st.c
Merging scsi-mkp/for-next (9b5ac8ab4e8b scsi: ufs: Fix ufshcd_request_sense_async() for Samsung KLUFG8RHDA-B2D1)
Merging vhost/linux-next (4a3a6d9fb65f vdpa/mlx5: fix feature negotiation across device reset)
CONFLICT (content): Merge conflict in include/uapi/linux/virtio_ids.h
CONFLICT (content): Merge conflict in drivers/virtio/virtio.c
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 (889a1b3f35db gpio: mpc8xxx: Use 'devm_gpiochip_add_data()' to simplify the code and avoid a leak)
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 (a3be01837fc9 Merge of ucount-fixes-for-5.14, siginfo-si_trapno-for-v5.15, and exit-cleanups-for-v5.15 for testing in linux-next)
Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
Merging kselftest/next (67d6d80d90fb selftests/cpufreq: Rename DEBUG_PI_LIST to DEBUG_PLIST)
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 (bdd3c50d83bf dax: remove bdev_dax_supported)
Applying: fixup for "dax: remove bdev_dax_supported"
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 (3103f67eb440 Merge branch 'for-next/overflow' into for-next/kspp)
CONFLICT (content): Merge conflict in Makefile
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 (9d68cd9120e4 hv_utils: Set the maximum packet size for VSS driver to the length of the receive buffer)
Merging auxdisplay/auxdisplay (24ebc044c72e auxdisplay: Replace symbolic permissions with octal permissions)
Merging kgdb/kgdb/for-next (e868f0a3c4b9 kdb: Rename members of struct kdbtab_t)
Merging hmm/hmm (79fbd3e1241c RDMA: Use the sg_table directly and remove the opencoded version from umem)
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 (e13d206924f5 cxl/core: Replace devm_cxl_add_decoder() with non-devm version)
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 (6326eb4a3915 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 ipc/sem.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 (13002430b9e1 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 Sep 2
@ 2020-09-02  8:09 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2020-09-02  8:09 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20200828:

The drm tree inherited the drm-misc tree's build failure.

The rcu tree gained a conflict against the jc_docs tree.

The scsi tree gained conflicts against Linus' tree.

The akpm tree lost 3 patches that turned up elsewhere.

Non-merge commits (relative to Linus' tree): 3942
 5044 files changed, 143363 insertions(+), 62394 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 (b765a32a2e91 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging kbuild-current/fixes (6a5576dcb206 kbuild: Documentation: clean up makefiles.rst)
Merging arc-current/for-curr (26907eb605fb ARC: [plat-hsdk]: Switch ethernet phy-mode to rgmii-id)
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 (71a7f8cb1ca4 KVM: arm64: Set HCR_EL2.PTW to prevent AT taking synchronous exception)
Merging arm-soc-fixes/arm/fixes (9c8b0a9c37b7 Merge tag 'imx-fixes-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes)
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 (fc1f178cdb31 selftests/powerpc: Skip PROT_SAO test in guests/LPARS)
Merging s390-fixes/fixes (bffc2f7aa963 s390/vmem: fix vmem_add_range for 4-level paging)
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 (a609d0259183 net: usb: dm9601: Add USB ID of Keenetic Plus DSL)
Merging bpf/master (1eb832ac2dee tools/bpf: build: Make sure resolve_btfids cleans up after itself)
Merging ipsec/master (45a36a18d019 xfrmi: drop ignore_df check before updating pmtu)
Merging netfilter/master (6b6382a857d8 cxgb4: fix thermal zone device registration)
Merging ipvs/master (7c7ab580db49 net: Convert to use the fallthrough macro)
Merging wireless-drivers/master (4afc850e2e9e mwifiex: Increase AES key storage size to 256 bits)
Merging mac80211/master (c8146fe292a7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
Merging rdma-fixes/for-rc (097a9d23b725 RDMA/bnxt_re: Remove the qp from list only if the qp destroy succeeds)
Merging sound-current/for-linus (949a1ebe8cea ALSA: pcm: oss: Remove superfluous WARN_ON() for mulaw sanity check)
Merging sound-asoc-fixes/for-linus (b7f7a0be8d9b Merge remote-tracking branch 'asoc/for-5.9' into asoc-linus)
Merging regmap-fixes/for-linus (f75aef392f86 Linux 5.9-rc3)
Merging regulator-fixes/for-linus (e2e3889a697b Merge remote-tracking branch 'regulator/for-5.9' into regulator-linus)
Merging spi-fixes/for-linus (3812e0343b42 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 (40b8b826a699 kobject: Restore old behaviour of kobject_del(NULL))
Merging tty.current/tty-linus (f75aef392f86 Linux 5.9-rc3)
Merging usb.current/usb-linus (6b6c71e897e2 Merge tag 'thunderbolt-for-v5.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus)
Merging usb-gadget-fixes/fixes (bc9a2e226ea9 usb: dwc3: gadget: Handle ZLP for sg requests)
Merging usb-serial-fixes/usb-linus (2bb70f0a4b23 USB: serial: option: support dynamic Quectel USB compositions)
Merging usb-chipidea-fixes/ci-for-usb-stable (2d79b3360dcc usb: chipidea: core: add wakeup support for extcon)
Merging phy/fixes (ad7a7acaedcf phy: omap-usb2-phy: disable PHY charger detect)
Merging staging.current/staging-linus (a139ffa40f0c iio: adc: mcp3422: fix locking on error path)
Merging char-misc.current/char-misc-linus (c626c5fb7fe4 Merge tag 'misc-habanalabs-fixes-2020-08-31' of git://people.freedesktop.org/~gabbayo/linux into char-misc-nexxt)
Merging soundwire-fixes/fixes (f8d0168e035f soundwire: bus: fix typo in comment on INTSTAT registers)
Merging thunderbolt-fixes/fixes (813050e0a9b8 thunderbolt: Use maximum USB3 link rate when reclaiming if link is not up)
Merging input-current/for-linus (9e8238020c5b Merge branch 'next' into for-linus)
Merging crypto-current/master (c195d66a8a75 crypto: af_alg - Work around empty control messages without MSG_MORE)
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 (5c1e4f7e9e49 selftests/timers: Turn off timeout setting)
Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
Merging dmaengine-fixes/fixes (6d6018fc30be drivers/dma/dma-jz4780: Fix race condition between probe and irq handler)
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 (22380b65dc70 mfd: mfd-core: Ensure disabled devices are ignored without error)
Merging v4l-dvb-fixes/fixes (ddecfc76979d media: mceusb: Avoid GFP_ATOMIC where it is not needed)
Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
Merging mips-fixes/mips-fixes (91dbd73a1739 mips/oprofile: Fix fallthrough placement)
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 (b5331379bc62 KVM: arm64: Only reschedule if MMU_NOTIFIER_RANGE_BLOCKABLE is not set)
Merging kvms390-fixes/master (774911290c58 KVM: s390: reduce number of IO pins to 1)
Merging hwmon-fixes/hwmon (f75aef392f86 Linux 5.9-rc3)
Merging nvdimm-fixes/libnvdimm-fixes (c2affe920b0e 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 (9d682ea6bcc7 vboxsf: Fix the check for the old binary mount-arguments struct)
Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitialized variable bug in atomic_pool_expand())
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 (5cd841d2676a dt-bindings: vendor-prefixes: Remove trailing whitespace)
Merging scsi-fixes/fixes (75d46c6d15ef scsi: scsi_debug: Remove superfluous close zone in resp_open_zone())
Merging drm-fixes/drm-fixes (2a3f9da32de4 Merge tag 'drm-intel-fixes-2020-08-27' of git://anongit.freedesktop.org/drm/drm-intel 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 (f75aef392f86 Linux 5.9-rc3)
Merging mmc-fixes/fixes (8048822bac01 sdhci: tegra: Add missing TMCLK for data timeout)
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 (b46b4a8a57c3 hv_utils: drain the timesync packets on onchannelcallback)
Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create)
Merging risc-v-fixes/fixes (0981b50cd6c7 riscv/mm: Simplify retry logic in do_page_fault())
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 (21a6d1780d5b kunit: tool: allow generating test results in JSON)
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 (5f7b81c18366 ia64: fix min_low_pfn/max_low_pfn build errors)
Merging drm-misc-fixes/for-linux-next-fixes (6546d28f0ef2 Documentation: fix dma-buf.rst underline length warning)
Merging kspp-gustavo/for-next/kspp (a56dbff00095 scsi: target: tcmu: Replace zero-length array with flexible-array member)
Merging kbuild/for-next (6ad7cbc01527 Makefile: Add clang-tidy and static analyzer support to makefile)
Merging compiler-attributes/compiler-attributes (e5fc436f06ee sparse: use static inline for __chk_{user,io}_ptr())
Merging dma-mapping/for-next (eef520b232c6 dma-mapping: introduce DMA range map, supplanting dma_pfn_offset)
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 (f75aef392f86 Linux 5.9-rc3)
Merging arm-perf/for-next/perf (f75aef392f86 Linux 5.9-rc3)
Merging arm-soc/for-next (210ecbc29884 ARM: Document merges)
Merging amlogic/for-next (c943b84fab78 Merge branch 'v5.10/dt64' into tmp/aml-rebuild)
Merging aspeed/for-next (393d812b5ec1 ARM: config: aspeed: Fix selection of media drivers)
Merging at91/at91-next (b68f43873b72 Merge branch 'at91-soc' into at91-next)
Merging drivers-memory/for-next (4c2af5ddf84b memory: samsung: exynos5422-dmc: add missing and fix kerneldoc)
Merging imx-mxs/for-next (fffd14dc58ab Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (50c950e2c8b6 Merge branch 'for_5.9/driver-soc' into next)
Merging mediatek/for-next (63424bbb31b7 Merge branch 'v5.9-next/soc' into for-next)
Merging mvebu/for-next (29bd9d8c2ac1 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (a8e0698a5d2e Merge branch 'omap-for-v5.10/prm-genpd-data' into for-next)
Merging qcom/for-next (4c7f2d50c2e3 Merge branches 'arm64-for-5.10' and '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 (67dc47513ada Merge branches 'renesas-arm-defconfig-for-v5.10' and 'renesas-drivers-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 (5b54a6a5703f Merge branch 'v5.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (722aa791af0f Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (d012a7190fc1 Linux 5.9-rc2)
Merging sunxi/sunxi/for-next (4fc958d5a0c6 Merge branches 'sunxi/clk-for-5.10', 'sunxi/dt-for-5.10' and 'sunxi/fixes-for-5.9' into sunxi/for-next)
Merging tegra/for-next (ce0ead94461f Merge branch for-5.10/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 (269a5641b1ed arm64: dts: ti: k3-am65: restrict PCIe to Gen2 speed)
Merging uniphier/for-next (4f8fb65af529 Merge branch 'dt64' into for-next)
Merging clk/clk-next (24907ec54702 Merge branch 'clk-fixes' into clk-next)
Merging clk-samsung/for-next (3d77e6a8804a Linux 5.7)
Merging csky/linux-next (bdcd93ef9afb csky: Add context tracking support)
Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>)
Merging ia64/next (1a9d3c34c593 x86/cpu: Add Lakefield, Alder Lake and Rocket Lake to Intel family)
Merging m68k/for-next (5661bccb70ef m68k: Correct some typos in comments)
Merging m68knommu/for-next (f75aef392f86 Linux 5.9-rc3)
Merging microblaze/next (4a17e8513376 microblaze: fix kbuild redundant file warning)
Merging mips/mips-next (aa9c45db018f MIPS: SGI-IP32: No need to include mc14818*.h)
Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>)
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 (7afb5877e392 parisc: Drop parisc special case for __sighandler_t)
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 (d012a7190fc1 Linux 5.9-rc2)
Merging s390/features (d012a7190fc1 Linux 5.9-rc2)
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 (4ca4c562efb6 xtensa: uaccess: Add missing __user to strncpy_from_user() prototype)
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 (70daa2f88d69 Merge branch 'for-next-next-v5.9-20200826' into for-next-20200826)
Merging ceph/master (496ceaf12432 ceph: don't allow setlease on cephfs)
Merging cifs/for-next (f75aef392f86 Linux 5.9-rc3)
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 (9409a51062c1 exfat: fix pointer error checking)
Merging ext3/for_next (de575ac602ab Pull reiserfs spelling fixes.)
Merging ext4/dev (27bc446e2def ext4: limit the length of per-inode prealloc list)
Merging f2fs/dev (c5921fa9c848 f2fs: change compr_blocks of superblock info to 64bit)
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 (3d7a9520f0c3 NFSv4.1 handle ERR_DELAY error reclaiming locking state on delegation recall)
Merging nfs-anna/linux-next (65caafd0d214 SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion"))
Merging nfsd/nfsd-next (9123e3a74ec7 Linux 5.9-rc1)
Merging cel/cel-next (9fe8cbb3e9ba NFSD: Correct type annotations in user xattr helpers)
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 (125eac243806 xfs: initialize the shortform attr header padding entry)
Merging zonefs/for-next (d012a7190fc1 Linux 5.9-rc2)
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 (1ad5f100e3ba locks: Remove extra "0x" in tracepoint format specifier)
Merging vfs/for-next (bcf876870b95 Linux 5.8)
Merging printk/for-next (b1b58fe90d07 Merge branch 'printk-rework' into for-next)
Merging pci/next (5bb4567cd17c Merge branch 'pci/pm')
Merging pstore/for-next/pstore (137c6236aeec mailmap: Add WeiXiong Liao)
CONFLICT (content): Merge conflict in .mailmap
Merging hid/for-next (4b782e3d2028 Merge branch 'for-5.9/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (4323405f424e Merge branch 'i2c/for-5.10' 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 (33efa9e652f5 hwmon: (adt7462) replace impossible fallthroughs with breaks)
Merging jc_docs/docs-next (755a2f180c91 Documentation: clarify driver licensing rules)
Merging v4l-dvb/master (cfe9e707c564 media: open.rst: document mc-centric and video-node-centric)
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 (7eada1ae101b Merge branch 'pm-cpufreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (4a5bbb6dc2dd cpufreq: s5pv210: Use dev_err instead of pr_err in probe)
Merging cpupower/cpupower (527b7779e5ec cpupower: speed up generating git version string)
Merging devfreq/devfreq-next (4b1e767350fb devfreq: rk3399_dmc: Simplify with dev_err_probe())
Merging opp/opp/linux-next (257eba525a2e opp: Prevent memory leak in dev_pm_opp_attach_genpd())
Merging thermal/thermal/linux-next (6f55be9fd5ee Merge branch 'thermal/fixes' into thermal/linux-next)
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 (7ae0451e2e6c fs: dlm: use free_con to free connection)
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 (524d8ffd07f0 RDMA/qib: Tidy up process_cc())
Merging net-next/master (dc1a9bf2c816 octeontx2-pf: Add UDP segmentation offload support)
CONFLICT (content): Merge conflict in net/ipv4/raw.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/ibm/ibmvnic.c
Merging bpf-next/master (0697fecf7ecd Merge branch 'dpaa2-eth-add-a-dpaa2_eth_-prefix-to-all-functions')
Merging ipsec-next/master (50aba46c234e gtp: add notification mechanism)
Merging mlx5-next/mlx5-next (9123e3a74ec7 Linux 5.9-rc1)
Merging netfilter-next/master (144b0a0e6086 ipvs: remove dependency on ip6_tables)
Merging ipvs-next/master (bfdd5aaa54b0 Merge tag 'Smack-for-5.9' of git://github.com/cschaufler/smack-next)
Merging wireless-drivers-next/master (2c92790b1203 libertas_tf: Remove unused macro QOS_CONTROL_LEN)
Merging bluetooth/master (0e9952804ec9 Bluetooth: Clear suspend tasks on unregister)
Merging mac80211-next/master (0f091e43310f netlabel: remove unused param from audit_log_format())
Merging gfs2/for-next (18312396b454 gfs2: Make sure we don't miss any delayed withdraws)
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 (bbb2832620ac crypto: stm32 - Fix sparse warnings)
Merging drm/drm-next (3393649977f9 Merge tag 'drm-intel-next-2020-08-24-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next)
CONFLICT (content): Merge conflict in drivers/video/fbdev/savage/savagefb_driver.c
CONFLICT (content): Merge conflict in drivers/video/fbdev/atmel_lcdfb.c
CONFLICT (content): Merge conflict in drivers/video/fbdev/arcfb.c
Applying: fix interaction with drm-misc-fix commit
Merging amdgpu/drm-next (1b7eca59ceb0 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/powerplay/hwmgr/vega10_thermal.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/dml/display_mode_vba.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/bios/command_table2.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
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Merging drm-intel/for-linux-next (1fa0140956e7 drm/i915: Add HDCP 1.4 support for MST connectors)
Merging drm-tegra/drm/tegra/for-next (4fba6d22ca9a drm/tegra: plane: Support 180° rotation)
Merging drm-misc/for-linux-next (c08503ec03db drm/gma500: Constify static structs)
Merging drm-msm/msm-next (5e0c22d4a9dd drm/msm/a6xx: fix frequency not always being restored on GMU resume)
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 (27104c3a4d00 Merge remote-tracking branch 'regmap/for-5.10' into regmap-next)
Merging sound/for-next (685a04a53747 ALSA: hda/ca0132 - Add AE-7 exit commands.)
Merging sound-asoc/for-next (c931ccf0ad38 Merge remote-tracking branch 'asoc/for-5.10' into asoc-next)
Merging modules/modules-next (f75aef392f86 Linux 5.9-rc3)
Merging input/next (9b5fbad1dcee Input: MT - avoid comma separated statements)
Merging block/for-next (57e97caa5f82 Merge branch 'for-5.10/block' into for-next)
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 (174e889d08aa Merge branch 'fixes' into next)
Merging mfd/for-mfd-next (c563a66537d2 mfd: rn5t618: Add a power supply subdevice)
Merging backlight/for-backlight-next (7eb99a39ef76 video: backlight: cr_bllcd: Remove unused variable 'intensity')
Merging battery/for-next (d8483f31487c dt-bindings: power: supply: Cleanup charger-manager bindings)
Merging regulator/for-next (19ba0c5e4274 Merge remote-tracking branch 'regulator/for-5.10' into regulator-next)
Merging security/next-testing (bc62d68e2a0a device_cgroup: Fix RCU list debugging warning)
Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable)
Merging integrity/next-integrity (d012a7190fc1 Linux 5.9-rc2)
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 (66ccd2560aff selinux: simplify away security_policydb_len())
Merging smack/next (d012a7190fc1 Linux 5.9-rc2)
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 (c07203516439 audit: Remove redundant null check)
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 (a37344d70f47 Merge remote-tracking branch 'spi/for-5.10' into spi-next)
Merging tip/auto-latest (d444af79439c Merge branch 'linus')
Merging clockevents/timers/drivers/next (9fba22584e54 clocksource: Ingenic: Add support for the Ingenic X1000 OST.)
Merging edac/edac-for-next (8d5d94603eaf Merge branch 'edac-misc' into edac-for-next)
Merging irqchip/irq/irqchip-next (821fc9e261f3 irqchip/ingenic: Leave parent IRQ unmasked on suspend)
Merging ftrace/for-next (38ce2a9e33db tracing: Add trace_array_init_printk() to initialize instance trace_printk() buffers)
Merging rcu/rcu/next (c104850647b2 locktorture: Track time of last ->writeunlock())
CONFLICT (content): Merge conflict in Documentation/memory-barriers.txt
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 (9d3004bf7ba3 arm/xen: Add misuse warning to virt_to_gfn)
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 (814318242687 platform/chrome: cros_ec_trace: Add fields to command traces)
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 (d012a7190fc1 Linux 5.9-rc2)
Merging usb/usb-next (5fedf0d295d3 Merge 5.9-rc3 into usb-next)
Merging usb-gadget/next (f5e46aa4a124 usb: dwc3: gadget: when the started list is empty stop the active xfer)
Merging usb-serial/usb-next (9123e3a74ec7 Linux 5.9-rc1)
Merging usb-chipidea-next/ci-for-usb-next (58a3cefb3840 usb: chipidea: imx: add two samsung picophy parameters tuning implementation)
Merging phy-next/next (23bea1be4eea phy: qcom-ipq4019-usb: Constify static phy_ops structs)
Merging tty/tty-next (8f49a2fe8e6b Merge 5.9-rc3 into tty-next)
Merging char-misc/char-misc-next (dd5597245d35 Merge 5.9-rc3 into char-misc-next)
Merging extcon/extcon-next (b49959fcfb2d extcon: palmas: Simplify with dev_err_probe())
Merging soundwire/next (f046b2334083 soundwire: intel: fix intel_suspend/resume defined but not used warning)
Merging thunderbolt/next (fff15f23b8e7 thunderbolt: Use kobj_to_dev() instead of container_of())
Merging staging/staging-next (cc34073c6248 staging: emxx_udc: Fix passing of NULL to dma_alloc_coherent())
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 (78a2f92e4c4a dmaengine: axi-dmac: add support for reading bus attributes from registers)
Merging cgroup/for-next (936f2a70f207 cgroup: add cpu.stat file to root cgroup)
Merging scsi/for-next (5da7eb801d50 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (5cdf0639a18f scsi: smartpqi: Update copyright)
CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.h
CONFLICT (content): Merge conflict in drivers/scsi/aacraid/aachba.c
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 (feeaefd378ca gpio: dwapb: Use resource managed GPIO-chip add data method)
Merging gpio-brgl/gpio/for-next (805a6ef8ac28 gpio: zynq: Simplify with dev_err_probe())
Merging gpio-intel/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging pinctrl/for-next (ebc2599144b6 pinctrl: mcp23s08: Improve error messaging in ->probe())
Merging pinctrl-intel/for-next (04d53068508e pinctrl: intel: Update header block to reflect direct dependencies)
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 (f69237e1e954 selftests: more general make nesting support)
Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC")
Merging livepatching/for-next (338c0aff6dbb Merge branch 'for-5.9/upstream-fixes' into for-next)
Merging coresight/next (17f17c8f02a3 coresight: etm4x: Fix issues within reset interface of sysfs)
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 (99363d1c26c8 eeprom: at24: Tidy at24_read())
Merging ntb/ntb-next (b8e2c8bbdf77 NTB: Use struct_size() helper in devm_kzalloc())
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 (9123e3a74ec7 Linux 5.9-rc1)
Merging nvmem/for-next (9123e3a74ec7 Linux 5.9-rc1)
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 (f2e9aec45e9e Merge tag 'kernel-clone-v5.9' into for-next)
Merging hmm/hmm (9123e3a74ec7 Linux 5.9-rc1)
Merging fpga/for-next (89eb35e810a8 fpga: dfl: map feature mmio resources in their own feature drivers)
Merging kunit/test (9123e3a74ec7 Linux 5.9-rc1)
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 (abe83f7621ee kunit: ubsan integration)
Merging trivial/for-next (2a9b29b28983 xtensa: fix Kconfig typo)
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 (f60aef257493 ROMFS: support inode blocks calculation)
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
dropping a790b4471d47ea359ba2fba1fd8f49d0755dbb01 scripts/gdb: add utils.read_ulong() -- patch contents already upstream
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
CONFLICT (content): Merge conflict in Documentation/admin-guide/kdump/gdbmacros.txt
dropping 4018197d82dada34ffe2010cda11bbac36cafeff scripts-gdb-update-for-lockless-printk-ringbuffer-checkpatch-fixes -- patch contents already upstream
Merging akpm/master (8fdb73cd09ca mm/mmap: add inline munmap_vma_range() for code readability)

[-- 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 Sep 2
@ 2015-09-02  8:17 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2015-09-02  8:17 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

Hi all,

There will be no linux-next release this Friday or Monday.

Please do not add material for v4.4 until after v4.3-rc1 is out.

Changes since 20150901:

I used the h8300 tree from next-20150828 since the current tree has been
rebased onto something very old :-(

The block tree gained a conflict against the xfs tree.

The device-mapper tree gained a conflicta against the block tree.

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

The tty tree lost its build failure.

Non-merge commits (relative to Linus' tree): 7381
 6840 files changed, 451330 insertions(+), 183665 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 225 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 (8d01b66b4f23 Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
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 (1ecb40643a9a m68k/bootinfo: Use kmemdup rather than duplicating its implementation)
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 (4d9aac397a5d powerpc/PCI: Disable MSI/MSI-X interrupts at PCI probe time in OF case)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave)
Merging net/master (f892a84cc890 net/smsc911x: Fix deferred probe for interrupt)
Merging ipsec/master (158cd4af8ded packet: missing dev_put() in packet_do_bind())
Merging sound-current/for-linus (08ceab9d8758 Merge tag 'asoc-v4.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (45ea2a5fed6d PCI: Don't use 64-bit bus addresses on PA-RISC)
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 (e51e38494a8e Input: synaptics - fix handling of disabling gesture mode)
Merging crypto-current/master (bf433416e675 crypto: algif_aead - fix for multiple operations on AF_ALG sockets)
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 (275d7d44d802 module: Fix locking in symbol_put_addr())
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 (c13dcf9f2d6f Linux 4.2-rc8)
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 (3d5926599a6b ARCv2: entry: Fix reserved handler)
Merging arm/for-next (0986c811d54f Merge branch 'drm-dwhdmi-devel' into for-next)
CONFLICT (modify/delete): arch/arm/kernel/psci.c deleted in arm/for-next and modified in HEAD. Version HEAD of arch/arm/kernel/psci.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/include/asm/Kbuild
$ git rm -f arch/arm/kernel/psci.c
Merging arm-perf/for-next/perf (fa8ad7889d83 arm: perf: factor arm_pmu core out to drivers)
Merging arm-soc/for-next (38af586237cf arm-soc: document merges)
CONFLICT (modify/delete): drivers/cpufreq/exynos-cpufreq.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/cpufreq/exynos-cpufreq.c left in tree.
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/serial/mtk-uart.txt
$ git rm -f drivers/cpufreq/exynos-cpufreq.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 (4f4cd70a7f65 arm: dt: Add scm support for MSM8974)
Merging renesas/next (53d5bd1b09d2 Merge branch 'heads/sh-drivers-for-v4.3' into next)
Merging rockchip/for-next (ed0450118b2f Merge branch 'v4.3-armsoc/soc' into for-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 (d770e558e219 Linux 4.2-rc1)
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 (bea5a17a8beb Merge branch for-4.3/defconfig into for-next)
Merging arm64/for-next/core (674c242c9323 arm64: flush FP/SIMD state correctly after execve())
CONFLICT (content): Merge conflict in arch/xtensa/include/asm/atomic.h
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 (50e48bd06731 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 (016c3edb9815 Merge branch '4.2-fixes' into mips-for-linux-next)
CONFLICT (content): Merge conflict in arch/mips/include/asm/switch_to.h
Merging nios2/for-next (81c9517e7ab4 nios2/time: Migrate to new 'set-state' interface)
Merging parisc-hd/for-next (0c0f80b3f908 parisc: Define ioremap_uc and ioremap_wc)
Merging powerpc/next (390fd5929f52 cxl: Set up and enable PSL Timebase)
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 (e4ec73510812 s390/jump_label: Use %*ph to print small buffers)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (8d03bc56cc27 tile: correct some typos in opcode type names)
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 (895fb3159280 xtensa: improve vmlinux.lds.S sed post-processing)
Merging btrfs/next (3a9508b0221d btrfs: fix compile when block cgroups are not enabled)
Merging ceph/master (64c1797a9371 libceph: Remove spurious kunmap() of the zero page)
Merging cifs/for-next (5fb4e288a025 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 (9181f8bf5abf udf: Don't modify filesystem for read-only mounts)
Merging ext4/dev (bdfe0cbd746a Revert "ext4: remove block_device_ejected")
Merging f2fs/dev (54d718564289 f2fs: avoid accessing NULL pointer in f2fs_drop_largest_extent)
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 (972398fa0a5f NFSv4.1/flexfiles: Fix freeing of mirrors)
CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
Merging nfsd/nfsd-next (244f5497362b 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 (b5ac1fb2717e 9p: fix return code of read() when count is 0)
Merging ubifs/linux-next (071a1f837f72 UGIFS: fix a typo in comment of ubifs_budget_req)
Merging xfs/for-next (5d54b8cdeaf4 Merge branch 'xfs-misc-fixes-for-4.3-4' into for-next)
Merging file-locks/linux-next (ee296d7c5709 locks: inline posix_lock_file_wait and flock_lock_file_wait)
Merging vfs/for-next (397d425dc26d vfs: Test for and handle paths that are unreachable from their mnt_root)
Merging pci/next (9ca678d1dff6 Merge branches 'pci/enumeration' and 'pci/misc' into next)
Merging hid/for-next (c5a0db1eed32 Merge branch 'for-4.3/wacom' into for-next)
Merging i2c/i2c/for-next (31bb26d67b48 Merge branch 'i2c/for-4.3' into i2c/for-next)
CONFLICT (content): Merge conflict in drivers/misc/ti-st/st_kim.c
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 (1ed32160dba6 hwmon: (fam15h_power) Add ratio of Tsample to the PTSC period)
Merging v4l-dvb/master (cb72d295ed59 Merge branch 'patchwork' into to_next)
Merging kbuild/for-next (3161460642b5 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (82908d67958c Merge branch 'for-4.2-fixes' into for-next)
Merging pm/linux-next (baf710bca1e3 Merge branches 'pm-avs' and 'pm-tools')
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 (b3a5bbfd780d dlm: print error from kernel_sendpage)
Merging swiotlb/linux-next (023600f192be swiotlb: do not export map_single function)
Merging slave-dma/next (f53d906c6323 Merge branch 'for-linus' into next)
CONFLICT (content): Merge conflict in drivers/dma/Makefile
CONFLICT (content): Merge conflict in drivers/dma/Kconfig
Merging net-next/master (9b8ff5182289 net: Make table id type u32)
Merging ipsec-next/master (e69948a0a530 net: Document xfrm4_gc_thresh and xfrm6_gc_thresh)
Merging wireless-drivers-next/master (0ba3ac03c1f3 Merge ath-next from ath.git)
Merging bluetooth/master (75f01fcbafb8 Bluetooth: hci_bcm: Use bt_dev logging helpers)
Merging rdma/for-next (153b7306b7c6 Merge branch 'hfi1-v4' into to-be-rebased/for-4.3)
CONFLICT (content): Merge conflict in net/core/dev.c
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
Applying: net: merge change upper notifier changes
Merging mtd/master (718e38b4d960 mtd: mtd_oobtest: Fix the address offset with vary_offset case)
Merging l2-mtd/master (718e38b4d960 mtd: mtd_oobtest: Fix the address offset with vary_offset case)
Merging crypto/master (bf433416e675 crypto: algif_aead - fix for multiple operations on AF_ALG sockets)
Merging drm/drm-next (879a37d00f18 Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c
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 (69f92f67b68a drm/i915: Preserve SSC earlier)
Merging drm-tegra/drm/tegra/for-next (459cc2c6800b drm/tegra: sor: Add HDMI support)
Merging drm-misc/topic/drm-misc (449ff2d8614e drm/i2c/ch7006: Constify ch7006_tv_norms[] and ch7006_modes[])
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 (08ceab9d8758 Merge tag 'asoc-v4.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc/for-next (c10c685b073b Merge remote-tracking branch 'asoc/topic/mtk' into asoc-next)
Merging modules/modules-next (5cfb203a304d modpost: abort if a module symbol is too long)
Merging input/next (d6f5aef298b5 Input: max8997_haptic - fix module alias)
Merging block/for-next (3cb73014ad06 Merge branch 'for-4.3/core' into for-next)
CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
CONFLICT (content): Merge conflict in fs/fs-writeback.c
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
CONFLICT (content): Merge conflict in fs/btrfs/scrub.c
CONFLICT (content): Merge conflict in fs/btrfs/raid56.c
CONFLICT (content): Merge conflict in fs/btrfs/inode.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: staging/lustre: fix for bio_endio() API change
Merging device-mapper/for-next (cc7da0ba9c96 dm cache: fix use after freeing migrations)
CONFLICT (content): Merge conflict in drivers/md/dm-cache-target.c
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 (092b6dbe8a4a mmc: android-goldfish: remove incorrect __iomem annotation)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (c3cce6cda162 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 (5a688c455066 mfd: jz4740-adc: Init mask cache in generic IRQ chip)
CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
Merging backlight/for-backlight-next (13d20b3b618a backlight: tosa: Export I2C module alias information)
Merging battery/master (b68c3161430a bq2415x_charger: Allow to load and use driver even if notify device is not registered yet)
Merging omap_dss2/for-next (b06ece93cf96 video: fbdev: s3c-fb: Constify platform_device_id)
Merging regulator/for-next (f5164b883349 Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next)
Merging security/next (07f081fb5057 PKCS#7: Add OIDs for sha224, sha284 and sha512 hash algos and use them)
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 (330de3d85671 Watchdog: Fix parent of watchdog_devices)
Merging iommu/next (4ad79562577a 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 (ce14c5831364 Documentation, add kernel-parameters.txt entry for dis_ucode_ldr)
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
CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.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 (c8fb70a3e8dd MAINTAINERS: Add Frank Rowand as DT maintainer)
Merging mailbox/mailbox-for-next (86e488adaab7 mailbox: arm_mhu: reduce txpoll_period from 10ms to 1 ms)
Merging spi/for-next (d63e96800175 Merge tag 'spi-v4.3' into spi-next)
Merging tip/auto-latest (1e2d24a48445 Merge branch 'x86/platform')
CONFLICT (content): Merge conflict in kernel/notifier.c
CONFLICT (modify/delete): drivers/staging/ozwpan/ozproto.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of drivers/staging/ozwpan/ozproto.c left in tree.
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
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 drivers/staging/ozwpan/ozproto.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 (f0a515780393 tracing: Don't make assumptions about length of string on task rename)
Merging rcu/rcu/next (5511900d171f rcu: Change _wait_rcu_gp() to work around GCC bug 67055)
$ git reset --hard HEAD^
Merging next-20150831 version of rcu
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 (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_hv.c
Merging kvms390/next (152b28392a8d KVM: s390: Fix assumption that kvm_set_irq_routing is always run successfully)
Merging xen-tip/linux-next (50672d663eb7 xen: avoid another early crash of memory limited dom0)
CONFLICT (content): Merge conflict in arch/x86/xen/enlighten.c
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 (628b3198ccc2 acer-wmi: No rfkill on HP Omen 15 wifi)
Merging chrome-platform/for-next (1d95e6f10fd8 platform/chrome: cros_ec: Fix possible leak in led_rgb_store())
Merging regmap/for-next (b64946359021 Merge remote-tracking branches 'regmap/topic/lockdep' 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 (4d59ed85451b leds: Export OF module alias information in missing drivers)
Merging ipmi/for-next (43ad3e6dcf35 ipmi:ssif: Add a module parm to specify that SMBus alerts don't work)
Merging driver-core/driver-core-next (71db87ba5700 bus: subsys: update return type of ->remove_dev() to void)
Merging tty/tty-next (c868cbb7e5c6 serial: imx: save and restore context in the suspend path)
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())
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)
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 (eacb1e7d4bfa Merge branch 'for-4.3' into for-next)
Merging scsi/for-next (26a1d1ceda0a Merge branch 'misc' into for-next)
Merging target-updates/for-next (140373b074ba target/qla2xxx: Honor max_data_sg_nents I/O transfer limit)
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 (db9e2f795915 mpt3sas: Refcount fw_events and fix unsafe list usage)
Merging pinctrl/for-next (1ab36387ea4f pinctrl: at91: fix null pointer dereference)
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 (01e2dae99177 Revert "gpio: extraxfs: fix returnvar.cocci warnings")
Applying: tc358743: fix for devm_gpiod_get API change
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (01ec8472009c pwm-pca9685: Support changing the output frequency)
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 (ba3001157733 clk: s5pv210: add missing call to samsung_clk_of_add_provider())
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 (7eba7d90d482 selftests/zram: Makefile fix)
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 (8503d45d4f27 Coresight: ETMv4: Prevent TRCRSCTLR0&1 from being accessed)
Merging rtc/rtc-next (a591008582b8 rtc: Fix module autoload for OF platform drivers)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/am437x-gp-evm.dts
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (004f1afbe199 libnvdimm, pmem: direct map legacy pmem by default)
CONFLICT (content): Merge conflict in mm/Kconfig
CONFLICT (content): Merge conflict in drivers/acpi/nfit.c
Merging akpm-current/current (0931fbddc5f2 lib: scatterlist: add sg splitting function)
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 drivers/video/console/Kconfig
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: dma-mapping: consolidate dma_{alloc,free}_{attrs,coherent}
Applying: dma-mapping: consolidate dma_{alloc,free}_noncoherent
Applying: dma-mapping: cosolidate dma_mapping_error
Applying: dma-mapping: consolidate dma_supported
Applying: dma-mapping: consolidate dma_set_mask
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Merging akpm/master (dbc87b382056 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 Sep 2
@ 2014-09-03 19:01 Mark Brown
  0 siblings, 0 replies; 13+ messages in thread
From: Mark Brown @ 2014-09-03 19:01 UTC (permalink / raw)
  To: linux-next, linux-kernel

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

Changes since 20140902:

The akpm-current tree lost its conflict against Linus' tree and two
patches from it got applied.

Non-merge commits (relative to Linus' tree): 3475
 2949 files changed, 116735 insertions(+), 88213 deletions(-)

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git .
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 an
allmodconfig for x86_64 and a multi_v7_defconfig for arm.

Below is a summary of the state of the merge.

I am currently merging 214 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 Stephen's 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.

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

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

* linux-next: Tree for Sep 2
@ 2014-09-02 18:36 Mark Brown
  0 siblings, 0 replies; 13+ messages in thread
From: Mark Brown @ 2014-09-02 18:36 UTC (permalink / raw)
  To: linux-next, linux-kernel

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

Changes since 20140901:

The akpm-current tree lost its conflict against Linus' tree and two
patches from it got applied.

Non-merge commits (relative to Linus' tree): 3078
 2790 files changed, 105584 insertions(+), 81173 deletions(-)

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git .
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 an
allmodconfig for x86_64 and a multi_v7_defconfig for arm.

Below is a summary of the state of the merge.

I am currently merging 214 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 Stephen's 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.

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

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

* linux-next: Tree for Sep 2
@ 2013-09-02  9:21 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2013-09-02  9:21 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

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

Hi all,

Changes since 20130830:

New tree: h8300-remove

The drm tree gained a build failure for which I applied a patch.

The net-next tree gained a conflict against Linus' tree and a build
failure for which I applied a patch.

The ipsec-next tree gained a conflict against Linus' tree.

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

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 (a878764 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging fixes/master (fa8218d Merge tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap)
Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1)
Merging arc-current/for-curr (26f8136 Kconfig.debug: Add FRAME_POINTER anti-dependency for ARC)
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 (3b2f64d Linux 3.11-rc2)
Merging powerpc-merge/merge (d220980 powerpc/hvsi: Increase handshake timeout from 200ms to 400ms.)
Merging sparc/master (63d4996 sparc64: Fix off by one in trampoline TLB mapping installation loop.)
Merging net/master (0affdf3 net: fec: fix time stamping logic after napi conversion)
Merging ipsec/master (302a50b xfrm: Fix potential null pointer dereference in xdst_queue_output)
Merging sound-current/for-linus (fb61549 ALSA: opti9xx: Fix conflicting driver object name)
Merging pci-current/for-linus (36dd1f3 PCI: mvebu: Disable prefetchable memory support in PCI-to-PCI bridge)
Merging wireless/master (19c3616 ath9k: Enable PLL fix only for AR9340/AR9330)
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 (d347404 USB: OHCI: fix build error related to ohci_suspend/resume)
Merging staging.current/staging-linus (d8dfad3 Linux 3.11-rc7)
Merging char-misc.current/char-misc-linus (b36f4be Linux 3.11-rc6)
Merging input-current/for-linus (fa46c79 Input: i8042 - disable the driver on ARC platforms)
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 (77fa4cb drm/i915: ivb: fix edp voltage swing reg val)
Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (d8dfad3 Linux 3.11-rc7)
Merging arm/for-next (936fa05 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 arm64/upstream (326b16d arm64: delay: don't bother reporting bogomips in /proc/cpuinfo)
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 h8300-remove/h8300-remove (9410953 fs/minix: Drop dependency on H8300)
Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
Merging ia64/next (174a9a0 Merge branch 'misc-3.12' into next)
Merging m68k/for-next (5549005 m68k/atari: ARAnyM - Always use physical addresses in NatFeat calls)
Merging m68knommu/for-next (c065edd m68k: remove 16 unused boards in Kconfig.machine)
Merging metag/for-next (b6ef916 irq-imgpdc: add ImgTec PDC irqchip driver)
Merging microblaze/next (a9b9d22 of/pci: Use of_pci_range_parser)
Merging mips/mips-for-linux-next (0ab12c9 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 (83c93e2 powerpc/pseries: Move lparcfg.c to platforms/pseries)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (f2110cb dts: mpc512x: prepare for preprocessor support)
Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
Merging s390/features (2245932 s390/pci: use virtual memory for iommu bitmap)
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 (d43b17c tile PCI RC: make default consistent DMA mask 32-bit)
Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (3b2f64d Linux 3.11-rc2)
Merging aio-direct/for-next (b080082 tmpfs: add support for read_iter and write_iter)
Merging btrfs/next (d7396f0 Btrfs: optimize key searches in btrfs_search_slot)
Merging ceph/master (7d6e1f5 ceph: use vfs __set_page_dirty_nobuffers interface instead of doing it inside filesystem)
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 (ad4eec6 ext4: allow specifying external journal by pathname mount option)
Merging f2fs/dev (749ebfd f2fs: use strncasecmp() simplify the string comparison)
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 (9d35814 GFS2: Merge ordered and writeback writepage)
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 (e8bbdc3 NFS: Ensure that rmdir() waits for sillyrenames to complete)
Merging nfsd/nfsd-next (b8297ce Merge tag 'v3.11-rc5' into for-3.12 branch)
Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (28d7b56 Squashfs: sanity check information from disk)
Merging v9fs/for-next (50192ab fs/9p: avoid accessing utsname after namespace has been torn down)
Merging ubifs/linux-next (c23e9b7 UBIFS: remove invalid warn msg with tst_recovery enabled)
Merging xfs/for-next (0d0ab12 xfs: check for underflow in xfs_iformat_fork())
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
CONFLICT (content): Merge conflict in fs/ceph/file.c
Merging pci/next (e89c331 Merge branch 'pci/misc' into next)
Merging hid/for-next (f8709e7 Merge branch 'for-3.12/multitouch-win8' into for-next)
Merging i2c/i2c/for-next (617da00 i2c: sirf: retry 3 times as sometimes we get random noack and timeout)
Merging jdelvare-hwmon/master (d9d5701 hwmon: (emc6w201) Do not declare enum variable)
Merging hwmon-staging/hwmon-next (f060c65 hwmon: (htu21) Add Measurement Specialties HTU21D support)
Merging v4l-dvb/master (b668360 [media] s5p-mfc: Fix build break in s5p_mfc_dec.c and s5p_mfc_enc.c)
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c
Merging kbuild/for-next (b020bae 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 (38af2b4 Merge branch 'for-3.12' into for-next)
Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block)
Merging pm/linux-next (6927e26 Merge branch 'acpi-hotplug-next' into linux-next)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/prom.c
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 (db9ae8f firewire: ohci: Fix deadlock at bus reset)
Merging ubi/linux-next (8930fa5 UBI: Fix invalidate_fastmap())
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 (20ddb3c Merge branch 'for-linus' into next)
Merging dmaengine/next (e6a5fa6 ioatdma: silence GCC warnings)
Merging net-next/master (ba39767 Merge branch 'qlcnic')
CONFLICT (content): Merge conflict in net/mac80211/ibss.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
Merging ipsec-next/master (aba8269 {ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode callback)
CONFLICT (content): Merge conflict in include/net/xfrm.h
Merging wireless-next/master (076f0d2 cw1200: When debug is enabled, display all wakeup conditions for the wait_event_interruptible_timeout() call.)
CONFLICT (content): Merge conflict in net/mac80211/ibss.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/pcie/trans.c
Merging bluetooth/master (5a30d1f Bluetooth: Use devname:vhci module alias for virtual HCI driver)
Merging infiniband/for-next (74b15c3 Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next)
Applying: cxgb4: fix up for bond_for_each_slave API change
Merging mtd/master (6c3b889 mtd: chips: Add support for PMC SPI Flash chips in m25p80.c)
Merging l2-mtd/master (c4287ef mtd: nand: pxa3xx: Remove unneeded ifdef CONFIG_OF)
Merging crypto/master (b8b4a41 padata - Register hotcpu notifier after initialization)
Merging drm/drm-next (2254f63 drm/nouveau: fix up 32-bit ioctls and device wake up.)
Merging drm-intel/for-linux-next (ee75f95 x86: add early quirk for reserving Intel graphics stolen memory v5)
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
Merging drm-tegra/drm/for-next (745cecc gpu: host1x: returning success instead of -ENOMEM)
Merging sound/for-next (3fd8a80 Merge tag 'asoc-v3.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next)
CONFLICT (content): Merge conflict in sound/pci/hda/hda_intel.c
Merging sound-asoc/for-next (8a7eb52 Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next)
Merging modules/modules-next (f4940ab kernel/params.c: use scnprintf() instead of sprintf())
Merging virtio/virtio-next (3b868a4 virtio: console: prevent use-after-free of port name in port unplug)
Merging input/next (52764fe Input: add SYN_MAX and SYN_CNT constants)
Merging input-mt/for-next (ad81f05 Linux 3.11-rc1)
Merging cgroup/for-next (66c144c Merge branch 'for-3.11-fixes' 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 (769ba72d dm ioctl: cleanup error handling in table_load)
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 (490104a mmc: esdhc: add support to get voltage from device-tree)
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 (4d77e3b md/raid5: flush out all pending requests before proceeding with reshape.)
CONFLICT (content): Merge conflict in lib/raid6/test/Makefile
CONFLICT (content): Merge conflict in lib/raid6/Makefile
Merging mfd/master (6228218 mmc: memstick: rtsx: Modify copyright comments)
Merging mfd-lj/for-mfd-next (8a105ca mfd: pcf50633-adc: Use devm_*() functions)
Merging battery/master (db15e63 rx51_battery: Fix channel number when reading adc value)
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 (6f001cc Merge branch '3.12/dss-legacy-removal' into for-next)
Merging regulator/for-next (a584862 Merge remote-tracking branch 'regulator/topic/tps65912' into regulator-next)
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq-cpu0.c
Merging security/next (7320336 Merge branch 'smack-for-3.12' of git://git.gitorious.org/smack-next/kernel into ra-next)
Merging selinux/master (0b4bdb3 Revert "SELinux: do not handle seclabel as a special flag")
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 (f9a67f3 watchdog: s3c2410_wdt: simplify use of devm_ioremap_resource)
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 (20e7745 vfio-pci: Use fdget() rather than eventfd_fget())
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 (9cf510a Fix comment typo for init_cma_reserved_pageblock)
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/mvm/time-event.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
CONFLICT (content): Merge conflict in drivers/crypto/ux500/hash/hash_core.c
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
Merging devicetree/devicetree/next (109b623 of: Feed entire flattened device tree into the random pool)
Merging dt-rh/for-next (8851b9f include: dt-binding: input: create a DT header defining key codes.)
Merging spi/for-next (5787392 Merge remote-tracking branch 'spi/topic/txx9' into spi-next)
Merging tip/auto-latest (a369d0c 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 (fc30f13 Merge branch 'trace/ftrace/core-tpstring' into trace/for-next)
Merging rcu/rcu/next (25f27ce Merge branches 'doc.2013.08.19a', 'fixes.2013.08.20a', 'sysidle.2013.08.31a' and 'torture.2013.08.20a' 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 (6b9e4fa Merge tag 'kvm-arm-for-3.12' of git://git.linaro.org/people/cdall/linux-kvm-arm into queue)
Applying: s390: fix tlb_gather_mmu fallout
Merging kvm-arm/kvm-arm-next (8bd4ffd ARM: kvm: don't include drivers/virtio/Kconfig)
Merging kvm-ppc/kvm-ppc-next (bf550fc Merge remote-tracking branch 'origin/next' into kvm-ppc-next)
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 (32d70ed4 Merge branch 'stable/for-linus-3.12' into linux-next)
Merging percpu/for-next (abec1a8 percpu: Make __verify_pcu_ptr handle per cpu pointers to arrays)
Merging workqueues/for-next (5f6b2bb Merge branch 'for-3.11-fixes' into for-next)
CONFLICT (content): Merge conflict in kernel/workqueue.c
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 (365c9ee 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 (61abeba leds: wm831x-status: Request a REG resource)
Merging driver-core/driver-core-next (1eeeef1 firmware loader: fix pending_fw_head list corruption)
CONFLICT (content): Merge conflict in net/core/net-sysfs.c
CONFLICT (content): Merge conflict in drivers/base/core.c
Merging tty/tty-next (2d1d3f3 hvc_xen: Remove unnecessary __GFP_ZERO from kzalloc)
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 (b9a1048 usbcore: fix incorrect type in assignment in descriptors_changed())
CONFLICT (content): Merge conflict in include/linux/usb/usbnet.h
CONFLICT (content): Merge conflict in drivers/dma/Makefile
Merging usb-gadget/next (0f2aa8c usb: musb: ux500: Add check for NULL board data)
Merging staging/staging-next (91121c1 staging: dwc2: make dwc2_core_params documentation more complete)
CONFLICT (content): Merge conflict in Documentation/driver-model/devres.txt
Merging char-misc/char-misc-next (3cc1f95 drivers: uio: Kconfig: add MMU dependancy for UIO)
Merging scsi/for-next (bb1ebe0 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/iser/iser_initiator.c
Merging target-updates/for-next (3a624c5 target: remove unused including <linux/version.h>)
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 (07b7eb9 pinctrl: sunxi: drop lock on error path)
Merging vhost/linux-next (8c325ee vhost: wake up worker outside spin_lock)
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 (fc9bbfb gpio: improve error path in gpiolib)
Merging arm-soc/for-next (af9b642 Merge branch 'late/all' into for-next)
CONFLICT (content): Merge conflict in drivers/pci/host/Makefile
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 drivers/cpuidle/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7779.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7778.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/r8a7779.h
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/r8a7778.h
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-marzen.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c
CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/platsmp.c
CONFLICT (content): Merge conflict in arch/arm/boot/dts/omap5.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/am335x-evmsk.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/am335x-evm.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/am335x-bone.dts
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 (c418b7e Merge branches 'imx/fixes-3.12', 'imx/soc-3.13' and 'imx/dt-3.13' into for-next)
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 (e3cd46e 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 (8b7ea09 Merge branch 'fixes3-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 (e56406b Merge branch 'v3.12-next/dt-s3c64xx' into for-next)
Merging tegra/for-next (d8dfad3 Linux 3.11-rc7)
Merging dma-mapping/dma-mapping-next (10bcdfb ARM: init: add support for reserved memory defined by device tree)
CONFLICT (content): Merge conflict in mm/Kconfig
CONFLICT (content): Merge conflict in drivers/base/dma-contiguous.c
Merging pwm/for-next (984d131 ARM: pxa: make pwm driver module_platform_driver)
Merging dma-buf/for-next (8bb495e Linux 3.10)
Merging userns/for-next (c7b96ac userns:  Kill nsown_capable it makes the wrong thing easy)
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 (08442ce clk: wm831x: Initialise wm831x pointer on init)
CONFLICT (content): Merge conflict in drivers/clk/zynq/clkc.c
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 (77d30b1 aio: fix rcu sparse warnings introduced by ioctx table lookup patch)
CONFLICT (content): Merge conflict in fs/nfs/direct.c
CONFLICT (content): Merge conflict in fs/block_dev.c
Applying: aio: semantic fixup
Applying: aio: another semantic merge fix
Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
Merging akpm-current/current (ea8adca mm-page-writebackc-add-strictlimit-feature-fix)
CONFLICT (content): Merge conflict in kernel/fork.c
Applying: fat: fix up for lockref changes
$ git checkout -b akpm remotes/origin/akpm/master
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: mm: fix memcg-less page reclaim
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: memcg: remove MEMCG_NR_FILE_MAPPED
Applying: memcg: check for proper lock held in mem_cgroup_update_page_stat
Applying: memcg: add per cgroup writeback pages accounting
Applying: memcg: document cgroup dirty/writeback memory statistics
Applying: mm: make lru_add_drain_all() selective
Applying: truncate: drop 'oldsize' truncate_pagecache() parameter
Applying: mm: drop actor argument of do_generic_file_read()
Applying: mm-drop-actor-argument-of-do_generic_file_read-fix
Applying: thp: account anon transparent huge pages into NR_ANON_PAGES
Applying: mm: cleanup add_to_page_cache_locked()
Applying: thp: move maybe_pmd_mkwrite() out of mk_huge_pmd()
Applying: thp: do_huge_pmd_anonymous_page() cleanup
Applying: thp: consolidate code between handle_mm_fault() and do_huge_pmd_anonymous_page()
Applying: mm, thp: count thp_fault_fallback anytime thp fault fails
Applying: kernel: replace strict_strto*() with kstrto*()
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.
Applying: dcache: fix up for lockref changes
Merging akpm/master (a3ffc3c dcache: fix up for lockref changes)
Applying: drm/radeon: protect ACPI calls with CONFIG_ACPI
Applying: vxlan: include the file that declares csum_ipv6_magic

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

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

end of thread, other threads:[~2021-09-02  6:23 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-02 12:43 linux-next: Tree for Sep 2 Stephen Rothwell
2019-09-02 17:39 ` linux-next: Tree for Sep 2 (exfat) Randy Dunlap
2019-09-02 17:42   ` Greg KH
2019-09-02 17:46   ` Greg KH
2019-09-02 18:07     ` Randy Dunlap
2019-09-02 18:11       ` Joe Perches
2019-09-02 18:44         ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2021-09-02  6:23 linux-next: Tree for Sep 2 Stephen Rothwell
2020-09-02  8:09 Stephen Rothwell
2015-09-02  8:17 Stephen Rothwell
2014-09-03 19:01 Mark Brown
2014-09-02 18:36 Mark Brown
2013-09-02  9:21 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).