linux-next: Tree for May 17

linux-next: Tree for May 17

[Stephen Rothwell]

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

Hi all,

Changes since 20220516:

The net-next tree gained a build failure for which I applied a patch.

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

The dmaengine tree gained a conflict against Linus' tree.

The nvdimm tree lost its build failure.

The mm tree gained a conflict against the parisc-hd tree.

Non-merge commits (relative to Linus' tree): 11280
 11119 files changed, 991301 insertions(+), 234191 deletions(-)

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

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" and checkout or reset to the new
master.

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log
files in the Next directory.  Between each merge, the tree was built
with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a
multi_v7_defconfig for arm and a native build of tools/perf. After
the final fixups (if any), I do an x86_64 modules_install followed by
builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit),
ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386,
arm64, sparc and sparc64 defconfig and htmldocs. And finally, a simple
boot test of the powerpc pseries_le_defconfig kernel in qemu (with and
without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 348 trees (counting Linus' and 94 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 (42226c989789 Linux 5.18-rc7)
Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
Merging mm-hotfixes/mm-hotfixes-unstable (3e858b65ac2b assoc_array: Fix BUG_ON during garbage collect)
Merging kbuild-current/fixes (312310928417 Linux 5.18-rc1)
Merging arc-current/for-curr (c6ed4d84a2c4 ARC: remove redundant READ_ONCE() in cmpxchg loop)
Merging arm-current/fixes (9be4c88bb792 ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame())
Merging arm64-fixes/for-next/fixes (51f559d66527 arm64: Enable repeat tlbi workaround on KRYO4XX gold CPUs)
Merging arm-soc-fixes/arm/fixes (609a097f5f06 Merge tag 'v5.18-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes)
Merging drivers-memory-fixes/fixes (73039c6c7f36 memory: renesas-rpc-if: Fix HF/OSPI data transfer in Manual Mode)
Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes)
Merging m68k-current/for-linus (0d52a01a266b m68k: defconfig: Disable fbdev on Sun3/3x)
Merging powerpc-fixes/fixes (ee8348496c77 KVM: PPC: Book3S PR: Enable MSR_DR for switch_mmu_context())
Merging s390-fixes/fixes (a06afe838308 KVM: s390: vsie/gmap: reduce gmap_rmap overhead)
Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net)
Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX)
Merging net/master (da2172a9bfec ptp: ocp: have adjtime handle negative delta_ns correctly)
Merging bpf/master (f3f19f939c11 Merge tag 'net-5.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipsec/master (79396934e289 net: dsa: b53: convert to phylink_pcs)
Merging netfilter/master (05ae2fba821c netfilter: nft_socket: make cgroup match work in input too)
Merging ipvs/master (05ae2fba821c netfilter: nft_socket: make cgroup match work in input too)
Merging wireless/main (a36e07dfe6ee rfkill: uapi: fix RFKILL_IOCTL_MAX_SIZE ioctl request definition)
Merging rdma-fixes/for-rc (c5eb0a61238d Linux 5.18-rc6)
Merging sound-current/for-linus (5c62383c0683 ALSA: usb-audio: Restore Rane SL-1 quirk)
Merging sound-asoc-fixes/for-linus (8b2abf363c7b Merge remote-tracking branch 'asoc/for-5.17' into asoc-linus)
Merging regmap-fixes/for-linus (312310928417 Linux 5.18-rc1)
Merging regulator-fixes/for-linus (b11b3d21a94d regulator: qcom_smd: Fix up PM8950 regulator configuration)
Merging spi-fixes/for-linus (0cf8d32600cf spi: stm32-qspi: Always check SR_TCF flags in stm32_qspi_wait_cmd())
Merging pci-current/for-linus (4246970a3bcb Revert "PCI: brcmstb: Split brcm_pcie_setup() into two funcs")
Merging driver-core.current/driver-core-linus (42226c989789 Linux 5.18-rc7)
Merging tty.current/tty-linus (42226c989789 Linux 5.18-rc7)
Merging usb.current/usb-linus (42226c989789 Linux 5.18-rc7)
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (870b1eee2d84 USB: serial: qcserial: add support for Sierra Wireless EM7590)
Merging phy/fixes (2c8045d48dee phy: amlogic: fix error path in phy_g12a_usb3_pcie_probe())
Merging staging.current/staging-linus (ce522ba9ef7e Linux 5.18-rc2)
Merging iio-fixes/fixes-togreg (ecdde8bf6e6a iio: gyro: mpu3050: Fix the error handling in mpu3050_power_up())
Merging counter-fixes/fixes-togreg (ce522ba9ef7e Linux 5.18-rc2)
Merging char-misc.current/char-misc-linus (42226c989789 Linux 5.18-rc7)
Merging soundwire-fixes/fixes (312310928417 Linux 5.18-rc1)
Merging thunderbolt-fixes/fixes (42226c989789 Linux 5.18-rc7)
Merging input-current/for-linus (4352e23a7ff2 Input: cros-ec-keyb - only register keyboard if rows/columns exist)
Merging crypto-current/master (16287397ec5c crypto: qcom-rng - fix infinite loop on requests not multiple of WORD_SZ)
Merging vfio-fixes/for-linus (1ef3342a934e vfio/pci: Fix vf_token mechanism when device-specific VF drivers are used)
Merging kselftest-fixes/fixes (e8f0c8965932 selftest/vm: add skip support to mremap_test)
Merging modules-fixes/modules-linus (dc0ce6cc4b13 lib/test: use after free in register_test_dev_kmod())
Merging dmaengine-fixes/fixes (7495a5bbf89f dt-bindings: dmaengine: qcom: gpi: Add minItems for interrupts)
Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
Merging mtd-fixes/mtd/fixes (ba7542eb2dd5 mtd: rawnand: qcom: fix memory corruption that causes panic)
Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
Merging v4l-dvb-fixes/fixes (d4cb77112c7b media: isl7998x: select V4L2_FWNODE to fix build error)
Merging reset-fixes/reset/fixes (03cb66463b55 dt-bindings: reset: Add parent "resets" property as optional)
Merging mips-fixes/mips-fixes (f0a6c68f6998 MIPS: Fix CP0 counter erratum detection for R4k CPUs)
Merging at91-fixes/at91-fixes (0c640d9544d0 ARM: dts: at91: fix pinctrl phandles)
Merging omap-fixes/fixes (46ff3df87215 ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35)
Merging kvm-fixes/master (b28cb0cd2c5e KVM: x86/mmu: Update number of zapped pages even if page list is stable)
Merging kvms390-fixes/master (4aa5ac75bf79 KVM: s390: Fix lockdep issue in vm memop)
Merging hwmon-fixes/hwmon (151d6dcbed83 hwmon: (ltq-cputemp) restrict it to SOC_XWAY)
Merging nvdimm-fixes/libnvdimm-fixes (d28820419ca3 cxl/pci: Drop shadowed variable)
Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing)
Merging btrfs-fixes/next-fixes (48de4dc26894 Merge branch 'misc-5.18' into next-fixes)
Merging vfs-fixes/fixes (9d2231c5d74e lib/iov_iter: initialize "flags" in new pipe_buffer)
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 (44acfc22c7d0 platform/surface: aggregator: Fix initialization order when compiling as builtin module)
Merging samsung-krzk-fixes/fixes (436ce66003d5 ARM: s3c: mark as deprecated and schedule removal)
Merging pinctrl-samsung-fixes/fixes (ac875df4d854 pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config)
Merging devicetree-fixes/dt/linus (5dc463042651 dt-bindings: pci: apple,pcie: Drop max-link-speed from example)
Merging scsi-fixes/fixes (775266207105 scsi: lpfc: Correct BDE DMA address assignment for GEN_REQ_WQE)
Merging drm-fixes/drm-fixes (eb7bac3973d2 Merge tag 'drm-misc-fixes-2022-05-13' of git://anongit.freedesktop.org/drm/drm-misc 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 (89e96d822bd5 i915/guc/reset: Make __guc_reset_context aware of guilty engines)
Merging mmc-fixes/fixes (3e5a8e8494a8 mmc: sdhci-msm: Reset GCC_SDCC_BCR register for SDHC)
Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt())
Merging gnss-fixes/gnss-linus (312310928417 Linux 5.18-rc1)
Merging hyperv-fixes/hyperv-fixes (eaa03d345358 Drivers: hv: vmbus: Replace smp_store_mb() with virt_store_mb())
Merging soc-fsl-fixes/fix (a222fd854139 soc: fsl: qe: Check of ioremap return value)
Merging risc-v-fixes/fixes (c6fe81191bd7 RISC-V: relocate DTB if it's outside memory region)
Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
Merging fpga-fixes/fixes (312310928417 Linux 5.18-rc1)
Merging spdx/spdx-linus (42226c989789 Linux 5.18-rc7)
Merging gpio-brgl-fixes/gpio/for-current (0d7e3da09a4d gpio: mvebu/pwm: Refuse requests with inverted polarity)
Merging gpio-intel-fixes/fixes (0c2cae09a765 gpiolib: acpi: Convert type for pin to be unsigned)
Merging pinctrl-intel-fixes/fixes (0be0b70df661 pinctrl: alderlake: Fix register offsets for ADL-N variant)
Merging erofs-fixes/fixes (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
Merging kunit-fixes/kunit-fixes (02c7efa43627 Documentation: kunit: fix path to .kunitconfig in start.rst)
Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb())
Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions)
Merging cel-fixes/for-rc (c5eb0a61238d Linux 5.18-rc6)
Merging irqchip-fixes/irq/irqchip-fixes (544808f7e21c irqchip/gic, gic-v3: Prevent GSI to SGI translations)
Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles)
Merging perf-current/perf/urgent (42226c989789 Linux 5.18-rc7)
Merging efi-fixes/urgent (9feaf8b387ee efi: fix return value of __setup handlers)
Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.)
Merging drm-misc-fixes/for-linux-next-fixes (370704e707a5 dma-buf: ensure unique directory name for dmabuf stats)
Merging kbuild/for-next (2a66c3124afd modpost: change the license of EXPORT_SYMBOL to bool type)
Merging perf/perf/core (843e5ba75ee8 perf tools: Remove unused machines__find_host())
Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn)
Merging dma-mapping/for-next (1b8e5d1a5369 swiotlb: use the right nslabs-derived sizes in swiotlb_init_late)
Merging asm-generic/master (678e9c3a9389 Merge branch 'asm-generic-headers-cleanup' into asm-generic)
CONFLICT (modify/delete): Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml deleted in asm-generic/master and modified in HEAD.  Version HEAD of Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml left in tree.
$ git rm -f Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml
Merging arc/for-next (6aa98f621786 ARC: bpf: define uapi for BPF_PROG_TYPE_PERF_EVENT program type)
Merging arm/for-next (012d2fb6c8c9 Merge branch 'devel-stable' into for-next)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
CONFLICT (content): Merge conflict in arch/arm/boot/compressed/Makefile
CONFLICT (content): Merge conflict in arch/arm/include/asm/switch_to.h
CONFLICT (content): Merge conflict in arch/arm/kernel/traps.c
Merging arm64/for-next/core (cfd03f3b8e7c Merge branch 'for-next/misc' into for-next/core)
Merging arm-perf/for-next/perf (c5781212985a perf/arm-cmn: Decode CAL devices properly in debugfs)
Merging arm-soc/for-next (2b7d17d4b7c1 soc: document merges)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
Merging amlogic/for-next (ed532523b458 Merge branch 'v5.18/fixes' into for-next)
Merging aspeed/for-next (d9540eeaa3d1 Merge branches 'nuvoton-dt-for-v5.18' and 'dt-for-v5.18' into for-next)
Merging at91/at91-next (8feaba25a117 Merge branches 'at91-dt' and 'at91-soc' into at91-next)
Merging drivers-memory/for-next (1e2b798e9664 Merge branch 'for-v5.19/tegra-mc' into for-next)
Merging imx-mxs/for-next (6ed2affe8f7f Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
Merging mediatek/for-next (8434c5a06e3c Merge branch 'v5.18-next/soc' into for-next)
Merging mvebu/for-next (58ec0844bd13 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (b5418fc0478c Merge branch 'omap-for-v5.19/dt' into for-next)
Merging qcom/for-next (b0362ef88de4 Merge branches 'arm64-for-5.19', 'arm64-defconfig-for-5.19', 'clk-for-5.19', 'defconfig-for-5.19', 'drivers-for-5.19', 'dts-for-5.19' and 'arm64-fixes-for-5.18' into for-next)
Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema)
Merging renesas/next (7ae962c56cea Merge branch 'renesas-arm-dt-for-v5.19' into renesas-next)
Merging reset/reset/next (2ca065dc9468 dt-bindings: reset: st,sti-powerdown: Convert to yaml)
Merging rockchip/for-next (61fa5394b576 Merge branch 'v5.19-clk/next' into for-next)
Merging samsung-krzk/for-next (88fb0c4d0aff Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (42226c989789 Linux 5.18-rc7)
Merging stm32/stm32-next (747a29b9a5a5 dt-bindings: clock: stm32mp1: adapt example for "st,stm32mp1-rcc-secure")
Merging sunxi/sunxi/for-next (073220ee354d Merge branch 'sunxi/dt-for-5.19' into sunxi/for-next)
Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next)
Merging tegra/for-next (864067632632 Merge branch for-5.19/arm64/defconfig into for-next)
Merging ti/ti-next (4cc89036bc4f Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (63623390c0d6 arm64: dts: zynqmp: add AMS driver to device tree)
Merging clk/clk-next (b473708bf4b5 Merge branch 'clk-airoha' into clk-next)
Merging clk-imx/for-next (43896f56b59e clk: imx8mp: add clkout1/2 support)
Merging clk-renesas/renesas-clk (23426d1be3c2 clk: renesas: r9a09g011: Add eth clock and reset entries)
Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support)
Merging csky/linux-next (64d83f067746 csky: Move $(core-y) into arch/csky/Kbuild)
Merging m68k/for-next (ed6bc6bf0a7d m68k: math-emu: Fix dependencies of math emulation support)
Merging m68knommu/for-next (a71b9e66fee4 m68knommu: fix undefined reference to `_init_sp')
CONFLICT (content): Merge conflict in arch/m68k/kernel/ptrace.c
Merging microblaze/next (78b5f52ab6f6 microblaze: fix typos in comments)
Merging mips/mips-next (dd089d485849 MIPS: Sibyte: remove unnecessary return variable)
Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
Merging openrisc/for-next (065b8ced7c40 openrisc: remove bogus nops and shutdowns)
Merging parisc-hd/for-next (42625e73ae25 parisc: Fix patch code locking and flushing)
Merging powerpc/next (b6b1c3ce06ca powerpc/rtas: Keep MSR[RI] set when calling RTAS)
Merging soc-fsl/next (1ce93cb102e7 soc: fsl: qe: Check of ioremap return value)
Merging risc-v/for-next (93c0651617a6 riscv: support for Svpbmt and D1 memory types)
Merging s390/for-next (0fa5b6007ed4 Merge branch 'features' into for-next)
Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size)
Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
Merging uml/linux-next (82017457957a um: run_helper: Write error message to kernel log on exec failure on host)
Merging xtensa/xtensa-for-next (236587c28307 xtensa: improve call0 ABI probing)
Merging pidfd/for-next (e1bbcd277a53 fs: hold writers when changing mount's idmapping)
Merging fscrypt/master (218d921b581e fscrypt: add new helper functions for test_dummy_encryption)
Merging fscache/fscache-next (312310928417 Linux 5.18-rc1)
Merging afs/afs-next (26291c54e111 Linux 5.17-rc2)
Merging btrfs/for-next (a38f35eed910 Merge branch 'for-next-next-v5.18-20220516' into for-next-20220516)
Merging ceph/master (e3bab0ecb411 fs: change test in inode_insert5 for adding to the sb list)
Merging cifs/for-next (465301e39c1f SMB3: EBADF/EIO errors in rename/open caused by race condition in smb2_compound_op)
Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem())
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 (34f78be468b9 erofs: scan devices from device table)
Merging exfat/dev (3ed96c651596 exfat: check if cluster num is valid)
Merging ext3/for_next (2ca982b5d6b4 Pull udf directory corruption fix.)
Merging ext4/dev (23e3d7f7061f jbd2: fix a potential race while discarding reserved buffers after an abort)
Merging f2fs/dev (c0d31ec6397d f2fs: do not stop GC when requiring a free section)
Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
Merging fuse/for-next (6b49bc9d8a5f fuse: avoid unnecessary spinlock bump)
Merging gfs2/for-next (2eb0d5f04f26 gfs2: punch_hole cleanups)
Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code)
Merging ksmbd/ksmbd-for-next (158a66b24573 ksmbd: validate length in smb2_write())
Merging nfs/linux-next (085d16d5f949 nfs: fix broken handling of the softreval mount option)
Merging nfs-anna/linux-next (d19e0183a883 NFS: Do not report writeback errors in nfs_getattr())
Merging nfsd/for-next (6d4997ac46d3 SUNRPC: Use RMW bitops in single-threaded hot paths)
Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED)
Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc())
Merging overlayfs/overlayfs-next (bc70682a497c ovl: support idmapped layers)
Merging ubifs/next (705757274599 ubifs: rename_whiteout: correct old_dir size computing)
Merging v9fs/9p-next (22e424feb665 Revert "fs/9p: search open fids first")
Merging xfs/for-next (efd409a4329f Merge branch 'xfs-5.19-quota-warn-remove' into xfs-5.19-for-next)
Merging zonefs/for-next (31a644b3c2ae documentation: zonefs: Document sysfs attributes)
CONFLICT (content): Merge conflict in fs/zonefs/super.c
Merging iomap/iomap-for-next (d74999c8c060 iomap: iomap_write_end cleanup)
Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap)
Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes)
Merging vfs/for-next (fd78f28f9f50 Merge branch 'work.namei' into for-next)
Merging printk/for-next (a110b11164a5 Merge branch 'rework/kthreads' into for-next)
Merging pci/next (617c8a1e527f Merge branch 'remotes/lorenzo/pci/versatile')
Merging pstore/for-next/pstore (8126b1c73108 pstore: Don't use semaphores in always-atomic-context code)
Merging hid/for-next (a2a3b5d6c512 Merge branch 'for-5.19/apple' into for-next)
CONFLICT (content): Merge conflict in drivers/hid/Kconfig
CONFLICT (content): Merge conflict in drivers/hid/Makefile
Merging i2c/i2c/for-next (6f2c48bcb7ed Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i3c/i3c/next (6742ca620bd9 dt-bindings: i3c: Convert snps,dw-i3c-master to DT schema)
Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias)
Merging hwmon-staging/hwmon-next (80c2ab0dfdf5 hwmon: (sl28cpld-hwmon) Use HWMON_CHANNEL_INFO macro)
Merging jc_docs/docs-next (89c30dd22137 docs/zh_CN: fix devicetree usage-model translation)
CONFLICT (content): Merge conflict in Documentation/process/embargoed-hardware-issues.rst
Merging v4l-dvb/master (be938c70e292 media: uvcvideo: Add UVC_GUID_FORMAT_H265)
Merging v4l-dvb-next/master (4a18d21649f4 media: h264: Avoid wrapping long_term_frame_idx)
Merging pm/linux-next (6b601767c503 Merge branch 'thermal-int340x-fixes' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (39b360102f3a cpufreq: mediatek: Add support for MT8186)
Merging cpupower/cpupower (312310928417 Linux 5.18-rc1)
Merging devfreq/devfreq-next (2e691421a2c9 PM / devfreq: rk3399_dmc: Block PMU during transitions)
Merging opp/opp/linux-next (22079af7df5a opp: Reorder definition of ceil/floor helpers)
Merging thermal/thermal/linux-next (c07a7c8dbcd8 tools/thermal: Add thermal daemon skeleton)
Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
Merging dlm/next (8e51ec6146fd dlm: use kref_put_lock in __put_lkb)
Merging rdma/for-next (4703b4f0d94a RDMA/rxe: Enforce IBA C11-17)
Merging net-next/master (f7b88d9ae91e Merge tag 'linux-can-next-for-5.19-20220516' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next)
CONFLICT (content): Merge conflict in net/mptcp/pm.c
CONFLICT (content): Merge conflict in tools/testing/selftests/net/mptcp/mptcp_join.sh
Merging bpf-next/for-next (68084a136420 selftests/bpf: Fix building bpf selftests statically)
CONFLICT (content): Merge conflict in net/core/sysctl_net_core.c
Merging ipsec-next/master (0f9008e5c510 Merge  branch 'Be explicit with XFRM offload direction')
Merging mlx5-next/mlx5-next (846e437387e7 net/mlx5: Expose mlx5_sriov_blocking_notifier_register / unregister APIs)
Merging netfilter-next/master (0c7b27616fbd selftests: netfilter: add fib expression forward test case)
Merging ipvs-next/master (0c7b27616fbd selftests: netfilter: add fib expression forward test case)
Merging bluetooth/master (3b42055388c3 Bluetooth: hci_sync: Fix attempting to suspend with unfiltered passive scan)
Merging wireless-next/main (d93185a92918 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging mtd/mtd/next (0248ab4fb485 mtd: st_spi_fsm: add missing clk_disable_unprepare() in stfsm_remove())
Merging nand/nand/next (6a2277a0ebe7 mtd: rawnand: renesas: Use runtime PM instead of the raw clock API)
Merging spi-nor/spi-nor/next (c47452194641 mtd: spi-nor: debugfs: fix format specifier)
Merging crypto/master (349d03ffd5f6 crypto: s390 - add crypto library interface for ChaCha20)
Merging drm/drm-next (f83493f7d34d Merge tag 'drm-msm-next-2022-05-09' of https://gitlab.freedesktop.org/drm/msm into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c
Applying: fi up for "drm/i915/dmc: Add MMIO range restrictions"
Merging drm-misc/for-linux-next (5ee8c8f930ba drm/rockchip: Change register space names in vop2)
Merging amdgpu/drm-next (494c1432542b drm/amd/pm: consistent approach for smartshift)
Merging drm-intel/for-linux-next (f83493f7d34d Merge tag 'drm-msm-next-2022-05-09' of https://gitlab.freedesktop.org/drm/msm into drm-next)
Merging drm-tegra/drm/tegra/for-next (b53c24f69199 drm/tegra: Support YVYU, VYUY and YU24 formats)
Merging drm-msm/msm-next (24df12013853 MAINTAINERS: Add Dmitry as MSM DRM driver co-maintainer)
Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation)
Merging etnaviv/etnaviv/next (2829a9fcb738 drm/etnaviv: reap idle softpin mappings when necessary)
Merging fbdev/for-next (f443e374ae13 Linux 5.17)
Merging regmap/for-next (5c422f0b970d regmap: Add missing map->bus check)
Merging sound/for-next (c11117b634f4 ALSA: usb-audio: Refcount multiple accesses on the single clock)
Merging sound-asoc/for-next (65c6d914dc5b Merge remote-tracking branch 'asoc/for-5.19' into asoc-next)
Merging modules/modules-next (7390b94a3c2d module: merge check_exported_symbol() into find_exported_symbol_in_section())
Merging input/next (ec648fc0a003 Input: sun4i-lradc-keys - add support for R329 and D1)
Merging block/for-next (cef3f8e4ed04 Merge branch 'for-5.19/block' into for-next)
Merging device-mapper/for-next (d254c3699fdd dm cache metadata: remove unnecessary variable in __dump_mapping)
Merging libata/for-next (71abb4df2981 ata: pata_ftide010: Remove unneeded ERROR check before clk_disable_unprepare)
Merging pcmcia/pcmcia-next (3928cf08334e pcmcia: db1xxx_ss: restrict to MIPS_DB1XXX boards)
Merging mmc/next (ded2c4c34500 mmc: sdhci-of-arasan: Add NULL check for data field)
CONFLICT (content): Merge conflict in drivers/mmc/core/queue.c
Merging mfd/for-mfd-next (3474b838f420 dt-bindings: Drop undocumented i.MX iomuxc-gpr bindings in examples)
Merging backlight/for-backlight-next (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight())
Merging battery/for-next (d96a89407e5f power: supply: bq24190_charger: using pm_runtime_resume_and_get instead of pm_runtime_get_sync)
Merging regulator/for-next (21c4696eedf9 Merge remote-tracking branch 'regulator/for-5.19' into regulator-next)
Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing)
Merging apparmor/apparmor-next (c2489617b3b9 apparmor: Fix undefined reference to `zlib_deflate_workspacesize')
Merging integrity/next-integrity (048ae41bb080 integrity: Fix sparse warnings in keyring_handler)
Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata)
Merging selinux/next (1af0e4a0233f security: declare member holding string literal const)
Merging smack/next (ba6b652bd863 smack: Remove redundant assignments)
Merging tomoyo/master (5015b3b61696 workqueue: Wrap flush_workqueue() using a macro)
Merging tpmdd/next (fad7eba9464e certs: Explain the rationale to call panic())
Merging watchdog/master (5b38db0ed51e dt-bindings: watchdog: sunxi: clarify clock support)
Merging iommu/next (807413e871d6 Merge branches 'apple/dart', 'arm/mediatek', 'arm/msm', 'ppc/pamu', 'x86/vt-d', 'x86/amd', 'vfio-notifier-fix' and 'arm/smmu' into next)
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/iommu/amd/iommu.c
Merging audit/next (312310928417 Linux 5.18-rc1)
Merging devicetree/for-next (52bf4b7147e5 Merge branch 'dt/linus' into dt/next)
Merging mailbox/mailbox-for-next (1b0d0f7c12d5 dt-bindings: mailbox: add definition for mt8186)
Merging spi/for-next (9c63b846e6df spi: spi-mem: Convert Aspeed SMC driver to spi-mem)
Merging tip/master (040a86b40a08 Merge branch into tip/master: 'x86/vdso')
CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt
CONFLICT (content): Merge conflict in kernel/sysctl.c
Merging clockevents/timers/drivers/next (44c38003fd0f clocksource/drivers/timer-sun5i: Convert to SPDX identifier)
Merging edac/edac-for-next (cd2ef50eb483 Merge edac-alloc-cleanup into for-next)
Merging irqchip/irq/irqchip-next (06a606075244 Merge branch irq/gic-v3-nmi-fixes-5.19 into irq/irqchip-next)
Merging ftrace/for-next (c87857e21486 Merge branch 'trace/for-next-rtla' into trace/for-next)
Merging rcu/rcu/next (7ab96061e7fd DIAGS rcu: Diagnose extended sync_rcu_do_polled_gp() loops)
Merging kvm/next (a3808d884612 KVM: x86/pmu: Expose CPUIDs feature bits PDCM, DS, DTES64)
CONFLICT (content): Merge conflict in arch/x86/kvm/pmu.h
Merging kvm-arm/next (5c0ad551e9aa Merge branch kvm-arm64/its-save-restore-fixes-5.19 into kvmarm-master/next)
CONFLICT (content): Merge conflict in Documentation/virt/kvm/api.rst
CONFLICT (content): Merge conflict in arch/arm64/kvm/sys_regs.c
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
Merging kvms390/next (4aa5ac75bf79 KVM: s390: Fix lockdep issue in vm memop)
Merging xen-tip/linux-next (533bec143a4c arm/xen: Fix some refcount leaks)
Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next)
Merging workqueues/for-next (10a5a651e3af workqueue: Restrict kworker in the offline CPU pool running on housekeeping CPUs)
Merging drivers-x86/for-next (619695fab3ba platform/x86: pmc_atom: dont export pmc_atom_read - no modular users)
Merging chrome-platform/for-next (0a4cad9c11ad platform/chrome: Add ChromeOS ACPI device driver)
Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe)
Merging leds/for-next (73bce575ed90 leds: lp50xx: Remove duplicated error reporting in .remove())
Merging ipmi/for-next (a508e33956b5 ipmi:ipmb: Fix refcount leak in ipmi_ipmb_probe)
Merging driver-core/driver-core-next (bc443c31def5 driver core: location: Check for allocations failure)
Merging usb/usb-next (74f55a62c4c3 xhci: Allow host runtime PM as default for Intel Alder Lake N xHCI)
Merging thunderbolt/next (c7c99a09ef0e thunderbolt: Add KUnit test for devices with no DisplayPort adapters)
Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial/usb-next (1b30499ace5b USB: serial: ftdi_sio: clean up printk format specifier)
Merging tty/tty-next (d6da35e0c6d5 Merge 5.18-rc7 into usb-next)
Merging char-misc/char-misc-next (33a1c6618677 nvmem: sfp: Add support for TA 2.1 devices)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging coresight/next (1adff542d67a coresight: cpu-debug: Replace mutex with mutex_trylock on panic notifier)
Merging fpga/for-next (ae23f746d744 fpga: dfl: Allow Port to be linked to FME's DFL)
Merging icc/icc-next (cc64beca6cd4 Merge branch 'icc-const' into icc-next)
Merging iio/togreg (8d12e6b62301 iio: dac: cio-dac: Utilize iomap interface)
Merging phy-next/next (d413a34932f9 phy: qcom-qmp: rename error labels)
Merging soundwire/next (74da272400b4 soundwire: qcom: adjust autoenumeration timeout)
Merging extcon/extcon-next (5dcc2afe716d extcon: Modify extcon device to be created after driver data is set)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/drd.c
Applying: fixup for "usb: dwc3: Don't switch OTG -> peripheral if extcon is present"
Merging gnss/gnss-next (312310928417 Linux 5.18-rc1)
Merging vfio/next (6a985ae80bef vfio/pci: Use the struct file as the handle not the vfio_group)
Merging staging/staging-next (e41f7a5521d7 staging: r8188eu: remove unused IEEE_* defines)
CONFLICT (content): Merge conflict in drivers/net/wireless/silabs/wfx/sta.c
Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4)
Merging dmaengine/next (411dccf9d271 dmaengine: idxd: Remove unnecessary synchronize_irq() before free_irq())
CONFLICT (content): Merge conflict in drivers/dma/idxd/device.c
Merging cgroup/for-next (4d00bb3c2f23 Merge branch 'for-5.19' into for-next)
Merging scsi/for-next (699bc86149f0 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (e33eae0656c8 scsi: elx: efct: Remove redundant memset() statement)
Merging vhost/linux-next (47ed4e127ba2 vdpa/mlx5: Use consistent RQT size)
Merging rpmsg/for-next (6d6ea28a160d Merge branches 'rproc-next', 'rpmsg-next' and 'hwspinlock-next' into for-next)
Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file)
Merging gpio-brgl/gpio/for-next (a998ec3d7bae gpio: ftgpio: Remove unneeded ERROR check before clk_disable_unprepare)
Merging gpio-intel/for-next (edc5601db664 pinctrl: meson: Replace custom code by gpiochip_node_count() call)
Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4)
Merging pinctrl/for-next (5f3841fafbb2 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
Merging pinctrl-intel/for-next (180f9db77545 pinctrl: lynxpoint: make irq_chip immutable)
Merging pinctrl-renesas/renesas-pinctrl (fc883ed5a43e pinctrl: renesas: checker: Add reserved field checks)
Merging pinctrl-samsung/for-next (ac875df4d854 pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config)
Merging pwm/for-next (2bf8ee0faa98 dt-bindings: pwm: Add interrupts property for MediaTek MT8192)
Merging userns/for-next (be5b922836ae Merge of per-namespace-ipc-sysctls-for-v5.19, kthread-cleanups-for-v5.19, and ptrace_stop-cleanup-for-v5.19 for testing in linux-next)
CONFLICT (modify/delete): arch/h8300/kernel/process.c deleted in HEAD and modified in userns/for-next.  Version userns/for-next of arch/h8300/kernel/process.c left in tree.
CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
$ git rm -f arch/h8300/kernel/process.c
Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
Merging kselftest/next (15477b31db10 kselftests/ir : Improve readability of modprobe error message)
Merging livepatching/for-next (0e1b951d6de0 Merge branch 'for-5.18/selftests-fixes' into for-next)
Merging rtc/rtc-next (312310928417 Linux 5.18-rc1)
Merging nvdimm/libnvdimm-for-next (f42e8e5088b9 pmem: implement pmem_recovery_write())
Merging at24/at24/for-next (312310928417 Linux 5.18-rc1)
Merging ntb/ntb-next (e9d0fa5e2482 IDT: Fix Build warnings on some 32bit architectures.)
Merging seccomp/for-next/seccomp (5e91d2a41469 selftests/seccomp: Fix spelling mistake "Coud" -> "Could")
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging fsi/next (f2af60bb7ce2 fsi: Add trace events in initialization path)
Merging slimbus/for-next (54bf672111ee slimbus: qcom: Fix IRQ check in qcom_slim_probe)
Merging nvmem/for-next (0f07cbb92a28 nvmem: sfp: Add support for TA 2.1 devices)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging xarray/main (63b1898fffcd XArray: Disallow sibling entries of nodes)
Merging hyperv/hyperv-next (b4927bd27262 PCI: hv: Fix synchronization between channel callback and hv_pci_bus_exit())
Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy())
Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function)
Merging hmm/hmm (312310928417 Linux 5.18-rc1)
Merging kunit/test (312310928417 Linux 5.18-rc1)
Merging cfi/cfi/next (312310928417 Linux 5.18-rc1)
Merging kunit-next/kunit (8a7ccad38f8b kunit: tool: update riscv QEMU config with new serial dependency)
CONFLICT (content): Merge conflict in drivers/thunderbolt/test.c
CONFLICT (content): Merge conflict in net/mctp/test/route-test.c
CONFLICT (content): Merge conflict in security/apparmor/policy_unpack_test.c
Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree)
Merging mhi/mhi-next (13b9b814da2d bus: mhi: host: Add support for Foxconn T99W373 and T99W368)
Merging memblock/for-next (000605cd1b14 memblock tests: remove completed TODO item)
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
Merging counters/counters (e71ba9452f0b Linux 5.11-rc2)
Merging cxl/next (e6829d1bd3c4 nvdimm: Fix firmware activation deadlock scenarios)
Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller)
Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.)
Merging efi/next (a6cfe03c34ba efi: stub: prefer mirrored memory for randomized allocations)
CONFLICT (content): Merge conflict in drivers/virt/Kconfig
CONFLICT (content): Merge conflict in drivers/virt/Makefile
Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
Merging slab/for-next (6b2d72729581 Merge branches 'slab/for-5.19/stackdepot' and 'slab/for-5.19/refactor' into slab/for-next)
Merging random/master (613abb109b19 random: unify batched entropy implementations)
Merging landlock/next (b0fab2b8e5da landlock: Add design choices documentation for filesystem access rights)
Merging rust/rust-next (425a9fd52cc6 init/Kconfig: Specify the interpreter for rust-is-available.sh)
CONFLICT (content): Merge conflict in Makefile
CONFLICT (content): Merge conflict in include/uapi/linux/android/binder.h
Merging sysctl/sysctl-next (494dcdf46e5c sched: Fix build warning without CONFIG_SYSCTL)
CONFLICT (content): Merge conflict in kernel/rcu/rcu.h
CONFLICT (content): Merge conflict in kernel/trace/ftrace.c
Merging folio/for-next (516edb456f12 nilfs2: Fix some kernel-doc comments)
CONFLICT (content): Merge conflict in fs/btrfs/ctree.h
CONFLICT (content): Merge conflict in fs/btrfs/inode.c
CONFLICT (content): Merge conflict in fs/btrfs/send.c
CONFLICT (content): Merge conflict in fs/f2fs/data.c
Applying: fix up for "btrfs: move btrfs_readpage to extent_io.c"
Applying: fixup for "mm,fs: Remove stray references to ->readpage"
Merging execve/for-next/execve (70578ff3367d binfmt_flat: Remove shared library support)
Merging bitmap/bitmap-for-next (f5717f18955d ia64: cleanup remove_siblinginfo())
Merging hte/hte/for-next (479c5db800e1 hte: Uninitialized variable in hte_ts_get())
Merging kspp/for-next/kspp (ed5edd5a70b9 loadpin: stop using bdevname)
CONFLICT (content): Merge conflict in drivers/misc/lkdtm/stackleak.c
Merging kspp-gustavo/for-next/kspp (0cf2b91d74b7 Merge branch 'for-next/kspp-stringop-overflow' into for-next/kspp)
Merging mm-stable/mm-stable (bbe832b9db2e mm, compaction: fast_find_migrateblock() should return pfn in the target zone)
CONFLICT (content): Merge conflict in arch/x86/mm/Makefile
CONFLICT (content): Merge conflict in fs/nfs/file.c
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in mm/page_io.c
Merging mm-nonmm-stable/mm-nonmm-stable (c7031c144043 proc/sysctl: make protected_* world readable)
CONFLICT (content): Merge conflict in include/linux/ptrace.h
Merging mm/mm-everything (604596f67939 Merge branch 'mm-nonmm-unstable' into mm-everything)
CONFLICT (content): Merge conflict in arch/parisc/kernel/cache.c
Applying: fixup for "mm: change huge_ptep_clear_flush() to return the original pte"
Applying: fix up for "netfilter: conntrack: remove unconfirmed list"
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
Merging akpm/master (7b928d242e91 mm/oom_kill.c: fix vm_oom_kill_table[] ifdeffery)

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

Re: linux-next: Tree for May 17 (drivers/nvme/host/fc.o)

[Randy Dunlap]

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



On 5/17/22 02:41, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20220516:
> 

on i386 or x86_64: (multiple builds)

ld: drivers/nvme/host/fc.o: in function `nvme_fc_io_getuuid':
/work/lnx/next/linux-next-20220517/X64/../drivers/nvme/host/fc.c:1914: undefined reference to `blkcg_get_fc_appid'


Full randconfig file is attached.

-- 
~Randy

[-- Attachment #2: config-r2850.gz --]
[-- Type: application/gzip, Size: 28933 bytes --]

Re: linux-next: Tree for May 17 (drivers/nvme/host/fc.o)

[Christoph Hellwig]

The patch that adds nvme_fc_io_getuuid need something like this
folded in:

diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index a11c69e681180..3c778bb0c2944 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -1911,7 +1911,9 @@ char *nvme_fc_io_getuuid(struct nvmefc_fcp_req *req)
 	struct nvme_fc_fcp_op *op = fcp_req_to_fcp_op(req);
 	struct request *rq = op->rq;
 
-	return rq->bio ? blkcg_get_fc_appid(rq->bio) : NULL;
+	if (!IS_ENABLED(CONFIG_BLK_CGROUP_FC_APPID) || !rq->bio)
+		return NULL;
+	return blkcg_get_fc_appid(rq->bio);
 }
 EXPORT_SYMBOL_GPL(nvme_fc_io_getuuid);
 

Re: linux-next: Tree for May 17 (drivers/nvme/host/fc.o)

[Randy Dunlap]

On 5/17/22 21:57, Christoph Hellwig wrote:
> The patch that adds nvme_fc_io_getuuid need something like this
> folded in:
> 
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index a11c69e681180..3c778bb0c2944 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -1911,7 +1911,9 @@ char *nvme_fc_io_getuuid(struct nvmefc_fcp_req *req)
>  	struct nvme_fc_fcp_op *op = fcp_req_to_fcp_op(req);
>  	struct request *rq = op->rq;
>  
> -	return rq->bio ? blkcg_get_fc_appid(rq->bio) : NULL;
> +	if (!IS_ENABLED(CONFIG_BLK_CGROUP_FC_APPID) || !rq->bio)
> +		return NULL;
> +	return blkcg_get_fc_appid(rq->bio);
>  }
>  EXPORT_SYMBOL_GPL(nvme_fc_io_getuuid);
>  

Thanks. You can add

Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>

to the patch.

-- 
~Randy

Re: linux-next: Tree for May 17 (drivers/nvme/host/fc.o)

[James Smart]

On 5/17/2022 10:21 PM, Randy Dunlap wrote:
> 
> 
> On 5/17/22 21:57, Christoph Hellwig wrote:
>> The patch that adds nvme_fc_io_getuuid need something like this
>> folded in:
>>
>> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
>> index a11c69e681180..3c778bb0c2944 100644
>> --- a/drivers/nvme/host/fc.c
>> +++ b/drivers/nvme/host/fc.c
>> @@ -1911,7 +1911,9 @@ char *nvme_fc_io_getuuid(struct nvmefc_fcp_req *req)
>>   	struct nvme_fc_fcp_op *op = fcp_req_to_fcp_op(req);
>>   	struct request *rq = op->rq;
>>   
>> -	return rq->bio ? blkcg_get_fc_appid(rq->bio) : NULL;
>> +	if (!IS_ENABLED(CONFIG_BLK_CGROUP_FC_APPID) || !rq->bio)
>> +		return NULL;
>> +	return blkcg_get_fc_appid(rq->bio);
>>   }
>>   EXPORT_SYMBOL_GPL(nvme_fc_io_getuuid);
>>   
> 
> Thanks. You can add
> 
> Acked-by: Randy Dunlap <rdunlap@infradead.org>
> Tested-by: Randy Dunlap <rdunlap@infradead.org>
> 
> to the patch.
> 

looks good

Reviewed-by: James Smart <jsmart2021@gmail.com>

-- james

linux-next: Tree for May 17

[Stephen Rothwell]

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

Hi all,

Changes since 20230516:

Non-merge commits (relative to Linus' tree): 2504
 2969 files changed, 89123 insertions(+), 38921 deletions(-)

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

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" and checkout or reset to the new
master.

You can see which trees have been included by looking in the Next/Trees
file in the source.  There is also the merge.log file in the Next
directory.  Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 363 trees (counting Linus' and 103 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 (f1fcbaa18b28 Linux 6.4-rc2)
Merging fixes/fixes (ac9a78681b92 Linux 6.4-rc1)
Merging mm-hotfixes/mm-hotfixes-unstable (61bddfc93843 nilfs2: fix incomplete buffer cleanup in nilfs_btnode_abort_change_key())
CONFLICT (content): Merge conflict in MAINTAINERS
Merging kbuild-current/fixes (f1fcbaa18b28 Linux 6.4-rc2)
Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3)
Merging arm-current/fixes (2b951b0efbaa ARM: 9297/1: vfp: avoid unbalanced stack on 'success' return path)
Merging arm64-fixes/for-next/fixes (fd2d1cb8c545 arm64: Make the ARCH_FORCE_MAX_ORDER config input prompt unconditional)
Merging arm-soc-fixes/arm/fixes (d75eecc3d170 Merge tag 'qcom-arm64-fixes-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes)
Merging davinci-current/davinci/for-current (ac9a78681b92 Linux 6.4-rc1)
Merging drivers-memory-fixes/fixes (ac9a78681b92 Linux 6.4-rc1)
Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8)
Merging m68k-current/for-linus (aaee8c7f2a17 m68k: kexec: Include <linux/reboot.h>)
Merging powerpc-fixes/fixes (8133a3f0aa66 powerpc/crypto: Fix aes-gcm-p10 build when VSX=n)
Merging s390-fixes/fixes (2facd5d3980f s390/ipl: fix IPIB virtual vs physical address confusion)
Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build)
Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref())
Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY)
Merging net/main (225c657945c4 net: bcmgenet: Restore phy_stop() depending upon suspend/close)
Merging bpf/master (a820ca1a739b samples/bpf: Drop unnecessary fallthrough)
Merging ipsec/master (8680407b6f8f xfrm: Check if_id in inbound policy/secpath match)
Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
Merging ipvs/main (225c657945c4 net: bcmgenet: Restore phy_stop() depending upon suspend/close)
Merging wireless/for-next (098abbd48ec1 mac80211_hwsim: fix memory leak in hwsim_new_radio_nl)
Merging wpan/master (bd4e3d82f4cc MAINTAINERS: Add wpan patchwork)
Merging rdma-fixes/for-rc (78b6a9a3f445 MAINTAINERS: Update maintainers of HiSilicon RoCE)
Merging sound-current/for-linus (3b44ec8c5c44 ALSA: hda: Fix Oops by 9.1 surround channel names)
Merging sound-asoc-fixes/for-linus (9be0b3a0074a ASoC: SOF: Intel: hda-mlink: fixes and extensions)
Merging regmap-fixes/for-linus (70a640c0efa7 regmap: REGMAP_KUNIT should not select REGMAP)
Merging regulator-fixes/for-linus (2bf1c45be3b8 regulator: Fix error checking for debugfs_create_dir)
Merging spi-fixes/for-linus (445164e8c136 spi: dw: Replace spi->chip_select references with function calls)
Merging pci-current/for-linus (3b8803494a06 PCI/DPC: Quirk PIO log size for Intel Ice Lake Root Ports)
Merging driver-core.current/driver-core-linus (f1fcbaa18b28 Linux 6.4-rc2)
Merging tty.current/tty-linus (8fb9ea65c9d1 vc_screen: reload load of struct vc_data pointer in vcs_write() to avoid UAF)
Merging usb.current/usb-linus (fe82f16aafda xhci: Fix incorrect tracking of free space on transfer rings)
Merging usb-serial-fixes/usb-linus (09a9639e56c0 Linux 6.3-rc6)
Merging phy/fixes (2a881183dc5a phy: qcom-snps: correct struct qcom_snps_hsphy kerneldoc)
Merging staging.current/staging-linus (b3dad076a058 staging: octeon: delete my name from TODO contact)
Merging iio-fixes/fixes-togreg (55720d242052 dt-bindings: iio: adc: renesas,rcar-gyroadc: Fix adi,ad7476 compatible value)
Merging counter-current/counter-current (ac9a78681b92 Linux 6.4-rc1)
Merging char-misc.current/char-misc-linus (0fa53349c3ac binder: add lockless binder_alloc_(set|get)_vma())
Merging soundwire-fixes/fixes (ac9a78681b92 Linux 6.4-rc1)
Merging thunderbolt-fixes/fixes (c4af8e3fecd0 thunderbolt: Clear registers properly when auto clear isn't in use)
Merging input-current/for-linus (7b63a88bb62b Input: psmouse - fix OOB access in Elantech protocol)
Merging crypto-current/master (b8969a1b6967 crypto: api - Fix CRYPTO_USER checks for report function)
Merging vfio-fixes/for-linus (4928f67bc911 vfio/mlx5: Fix the report of dirty_bytes upon pre-copy)
Merging kselftest-fixes/fixes (d7eafa64a158 tools/nolibc: Fix build of stdio.h due to header ordering)
Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition)
Merging dmaengine-fixes/fixes (ac9a78681b92 Linux 6.4-rc1)
Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2)
Merging mtd-fixes/mtd/fixes (93942b704615 mtd: rawnand: meson: fix bitmask for length in command word)
Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2)
Merging v4l-dvb-fixes/fixes (280a8ab81733 media: dvb-core: Fix use-after-free due to race condition at dvb_ca_en50221)
Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref)
Merging mips-fixes/mips-fixes (ac9a78681b92 Linux 6.4-rc1)
Merging at91-fixes/at91-fixes (fe15c26ee26e Linux 6.3-rc1)
Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes)
Merging kvm-fixes/master (1a5304fecee5 Merge tag 'parisc-for-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging kvms390-fixes/master (21f27df85400 KVM: s390: pv: fix external interruption loop not always detected)
Merging hwmon-fixes/hwmon (ac9a78681b92 Linux 6.4-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (c91d71363084 nvdimm: Support sizeof(struct page) > MAX_STRUCT_PAGE_SIZE)
Merging cxl-fixes/fixes (764d102ef94e cxl: Add missing return to cdat read error path)
Merging btrfs-fixes/next-fixes (a9b282be7894 Merge branch 'misc-6.4' into next-fixes)
Merging vfs-fixes/fixes (609d54441493 fs: prevent out-of-bounds array speculation when closing a file descriptor)
Merging dma-mapping-fixes/for-linus (bbb73a103fbb swiotlb: fix a braino in the alignment check fix)
Merging drivers-x86-fixes/fixes (95e4b25192e9 platform/mellanox: mlxbf-pmc: fix sscanf() error checking)
Merging samsung-krzk-fixes/fixes (ac9a78681b92 Linux 6.4-rc1)
Merging pinctrl-samsung-fixes/fixes (ac9a78681b92 Linux 6.4-rc1)
Merging devicetree-fixes/dt/linus (6997f847cbb7 MAINTAINERS: add Conor as a dt-bindings maintainer)
Merging dt-krzk-fixes/fixes (8bbec86ce6d6 dt-bindings: PCI: fsl,imx6q: fix assigned-clocks warning)
Merging scsi-fixes/fixes (1a7edd041f2d scsi: ufs: core: Fix I/O hang that occurs when BKOPS fails in W-LUN suspend)
Merging drm-fixes/drm-fixes (f1fcbaa18b28 Linux 6.4-rc2)
Merging drm-intel-fixes/for-linux-next-fixes (5896f2d363d5 drm/i915/hdcp: Check if media_gt exists)
Merging mmc-fixes/fixes (81dce1490e28 mmc: sdhci-esdhc-imx: make "no-mmc-hs400" works)
Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource)
Merging gnss-fixes/gnss-linus (1b929c02afd3 Linux 6.2-rc1)
Merging hyperv-fixes/hyperv-fixes (ec97e112985c Drivers: hv: vmbus: Call hv_synic_free() if hv_synic_alloc() fails)
Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18)
Merging risc-v-fixes/fixes (3b90b09af5be riscv: Fix orphan section warnings caused by kernel/pi)
Merging riscv-dt-fixes/riscv-dt-fixes (ac9a78681b92 Linux 6.4-rc1)
Merging riscv-soc-fixes/riscv-soc-fixes (a7a041f2ddf3 soc: microchip: mpfs: handle failed system service requests)
Merging fpga-fixes/fixes (3c66c757bfb1 dt-bindings: fpga: replace Ivan Bornyakov maintainership)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging spdx/spdx-linus (ac9a78681b92 Linux 6.4-rc1)
Merging gpio-brgl-fixes/gpio/for-current (976d3c6778e9 selftests: gpio: gpio-sim: Fix BUG: test FAILED due to recent change)
Merging gpio-intel-fixes/fixes (fe15c26ee26e Linux 6.3-rc1)
Merging pinctrl-intel-fixes/fixes (ac9a78681b92 Linux 6.4-rc1)
Merging erofs-fixes/fixes (ae0bac799263 erofs: avoid pcpubuf.c inclusion if CONFIG_EROFS_FS_ZIP is off)
Merging kunit-fixes/kunit-fixes (ac9a78681b92 Linux 6.4-rc1)
Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5)
Merging memblock-fixes/fixes (647037adcad0 Revert "mm: Always release pages to the buddy allocator in memblock_free_late().")
Merging nfsd-fixes/nfsd-fixes (21a3f3328972 NFSD: Remove open coding of string copy)
Merging irqchip-fixes/irq/irqchip-fixes (cddb536a73ef irqchip/mbigen: Unify the error handling in mbigen_of_create_domain())
Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number)
Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging perf-current/perf/urgent (760ebc45746b perf lock contention: Add empty 'struct rq' to satisfy libbpf 'runqueue' type verification)
Merging efi-fixes/urgent (0b1d9debe303 efi/libstub: randomalloc: Return EFI_OUT_OF_RESOURCES on failure)
Merging zstd-fixes/zstd-linus (6906598f1ce9 zstd: Fix definition of assert())
Merging battery-fixes/fixes (95339f40a8b6 power: supply: Fix logic checking if system is running from battery)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1)
Merging iommufd-fixes/for-rc (f1fcbaa18b28 Linux 6.4-rc2)
Merging rust-fixes/rust-fixes (ac9a78681b92 Linux 6.4-rc1)
Merging v9fs-fixes/fixes/next (36896bc97c0e fs/9p: Fix a datatype used with V9FS_DIRECT_IO)
Merging w1-fixes/fixes (ac9a78681b92 Linux 6.4-rc1)
Merging drm-misc-fixes/for-linux-next-fixes (2d2f5f1e8fd9 accel/qaic: silence some uninitialized variable warnings)
Merging mm-stable/mm-stable (ac9a78681b92 Linux 6.4-rc1)
Merging mm-nonmm-stable/mm-nonmm-stable (ac9a78681b92 Linux 6.4-rc1)
Merging mm/mm-everything (7d4c988c8910 Merge branch 'mm-nonmm-unstable' into mm-everything)
Merging kbuild/for-next (f1fcbaa18b28 Linux 6.4-rc2)
Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros)
Merging perf/perf-tools-next (c0d68601cbce perf test: Add cputype testing to perf stat)
Merging compiler-attributes/compiler-attributes (eeac8ede1755 Linux 6.3-rc2)
Merging dma-mapping/for-next (ec274aff21b6 swiotlb: Omit total_used and used_hiwater if !CONFIG_DEBUG_FS)
Merging asm-generic/master (f1fcbaa18b28 Linux 6.4-rc2)
Merging arc/for-next (f2906aa86338 Linux 5.19-rc1)
Merging arm/for-next (fc6750b0d4a9 Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (0fddb79bf283 arm64: lds: move .got section out of .text)
Merging arm-perf/for-next/perf (257aedb72e73 drivers/perf: hisi: add NULL check for name)
Merging arm-soc/for-next (8ecfe9a0e657 soc: document merges)
Merging amlogic/for-next (0618cb14da6a Merge branch 'v6.5/arm-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (f41aba157819 Merge branch 'asahi-soc/dt' into asahi-soc/for-next)
Merging aspeed/for-next (7d4f0b0df7c5 ARM: dts: aspeed-g6: Add UDMA node)
Merging at91/at91-next (ad5125686a4f Merge branch 'at91-dt' into at91-next)
Merging broadcom/next (bba5ad8482de Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging drivers-memory/for-next (3d56c7364389 memory: renesas-rpc-if: Fix PHYCNT.STRTIM setting)
Merging imx-mxs/for-next (efdde75fee54 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (e586dd447172 Merge branch 'v6.3-next/soc' into for-next)
Merging mvebu/for-next (e5cfa586d513 ARM: dts: armada388-clearfog: add missing phy-modes)
Merging omap/for-next (c45167f4f5cf Merge branch 'omap-for-v6.4/dt' into for-next)
Merging qcom/for-next (4272e06e19f3 Merge branches 'arm64-defconfig-for-6.5', 'arm64-fixes-for-6.4', 'arm64-for-6.5', 'drivers-fixes-for-6.4' and 'drivers-for-6.5' into for-next)
Merging renesas/next (21330625d0f5 Merge branches 'renesas-arm-defconfig-for-v6.5' and 'renesas-drivers-for-v6.5' into renesas-next)
Merging reset/reset/next (afb39e2bd36a reset: mpfs: select AUXILIARY_BUS)
Merging rockchip/for-next (e11ff0914d61 Merge branch 'v6.5-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (5b248db78d1a Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (e06854e84add Merge tags 'scmi-fix-6.4', 'juno-fixes-6.4' and 'ffa-fixes-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging stm32/stm32-next (b195a9d7f721 ARM: dts: stm32: add STM32MP1-based Phytec board)
Merging sunxi/sunxi/for-next (7081db38231a Merge branch 'sunxi/dt-for-6.4' into sunxi/for-next)
Merging tee/next (86dfcfab4fe0 Merge branch 'optee_fix_async_notif_for-v6.3' into next)
Merging tegra/for-next (d52733725601 Merge branch for-6.5/arm64/dt into for-next)
Merging ti/ti-next (f76b8c20b477 arm64: dts: ti: k3-am62x-sk-common: Add main_uart1 and wkup_uart nodes)
Merging xilinx/for-next (12ac543351cc Merge branch 'zynqmp/dt' into for-next)
Merging clk/clk-next (ac9a78681b92 Linux 6.4-rc1)
Merging clk-imx/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging clk-renesas/renesas-clk (7f91fe3a71aa clk: renesas: r8a779a0: Add PWM clock)
Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support)
Merging csky/linux-next (ac9a78681b92 Linux 6.4-rc1)
Merging loongarch/loongarch-next (f1fcbaa18b28 Linux 6.4-rc2)
Merging m68k/for-next (4decdb267a47 nubus: Remove proc entries before adding them)
Merging m68knommu/for-next (f1fcbaa18b28 Linux 6.4-rc2)
Merging microblaze/next (fe15c26ee26e Linux 6.3-rc1)
Merging mips/mips-next (ac9a78681b92 Linux 6.4-rc1)
Merging openrisc/for-next (c91b4a07655d openrisc: Add floating point regset)
Merging parisc-hd/for-next (b645c02c3594 parisc: Allow 64-bit STI calls in PDC firmware abstration)
Merging powerpc/next (f1fcbaa18b28 Linux 6.4-rc2)
Merging soc-fsl/next (4b0986a3613c Linux 5.18)
Merging risc-v/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging riscv-dt/riscv-dt-for-next (6361b7de262a riscv: dts: starfive: jh7110: Add watchdog node)
Merging riscv-soc/riscv-soc-for-next (ac9a78681b92 Linux 6.4-rc1)
Merging s390/for-next (6572a756ef6f Merge branch 'features' into for-next)
Merging sh/for-next (bc9d1f0cecd2 sh: j2: Use ioremap() to translate device tree address into kernel memory)
Merging uml/next (6032aca0deb9 um: make stub data pages size tweakable)
Merging xtensa/xtensa-for-next (d0f94ebe1864 xtensa: add asm-prototypes.h)
Merging pidfd/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging vfs-idmapping/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging fscrypt/for-next (83e57e47906c fscrypt: optimize fscrypt_initialize())
Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux)
Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums)
Merging btrfs/for-next (48ad328fe62d Merge branch 'for-next-next-v6.4-20230515' into for-next-20230515)
Merging ceph/master (a12e5342fa27 ceph: silence smatch warning in reconnect_caps_cb())
Merging cifs/for-next (60c48b7c9ee9 SMB3: drop reference to cfile before sending oplock break)
Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items)
Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix)
Merging erofs/dev (ac9a78681b92 Linux 6.4-rc1)
Merging exfat/dev (fe15c26ee26e Linux 6.3-rc1)
Merging ext3/for_next (df9c5af6a4ef Merge ext2 direct IO conversion to iomap.)
Merging ext4/dev (2a534e1d0d15 ext4: bail out of ext4_xattr_ibody_get() fails for any reason)
Merging f2fs/dev (08c3eab525ef f2fs: remove some dead code)
Merging fsverity/for-next (e08e901faa8f fsverity: use shash API instead of ahash API)
Merging fuse/for-next (c68ea140050e fuse: remove duplicate check for nodeid)
Merging gfs2/for-next (6ddd5e9eaadf gfs2: Don't remember delete unless it's successful)
Merging jfs/jfs-next (fad376fce0af fs/jfs: fix shift exponent db_agl2size negative)
Merging ksmbd/ksmbd-for-next (e7b8b8ed9960 ksmbd: smb2: Allow messages padded to 8byte boundary)
Merging nfs/linux-next (e8d018dd0257 Linux 6.3-rc3)
Merging nfs-anna/linux-next (fbd2a05f29a9 NFSv4.2: Rework scratch handling for READ_PLUS)
Merging nfsd/nfsd-next (8c49a0ffaed0 NFSD: trace nfsctl operations)
Merging ntfs3/master (1f60ec888102 fs/ntfs3: Add support /proc/fs/ntfs3/<dev>/volinfo and /proc/fs/ntfs3/<dev>/label)
Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init())
Merging overlayfs/overlayfs-next (4f11ada10d0a ovl: fail on invalid uid/gid mapping at copy up)
Merging ubifs/next (b5fda08ef213 ubifs: Fix memleak when insert_old_idx() failed)
Merging v9fs/9p-next (4ec5183ec486 Linux 6.2-rc7)
Merging v9fs-ericvh/ericvh/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging xfs/for-next (2254a7396a0c xfs: fix xfs_inodegc_stop racing with mod_delayed_work)
Merging zonefs/for-next (2b188a2cfc4d zonefs: make kobj_type structure constant)
Merging iomap/iomap-for-next (3fd41721cd5c iomap: Add DIO tracepoints)
Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request)
Merging file-locks/locks-next (63355b9884b3 cpumask: be more careful with 'cpumask_setall()')
Merging iversion/iversion-next (63355b9884b3 cpumask: be more careful with 'cpumask_setall()')
Merging vfs/for-next (cff4b23c731a Merge branch 'work.lock_rename_child' into for-next)
Merging printk/for-next (16bff6f075a1 Merge branch 'for-6.4' into for-next)
Merging pci/next (174977dc80b7 Merge branch 'pci/controller/vmd')
Merging pstore/for-next/pstore (48f2c681df43 pstore/ram: Convert to platform remove callback returning void)
Merging hid/for-next (d777b19c6356 Merge branch 'for-6.4/amd-sfh' into for-next)
Merging i2c/i2c/for-next (03230ddddf9d Merge branch 'i2c/for-current' into i2c/for-next)
Merging i3c/i3c/next (6b496a94c590 i3c: ast2600: set variable ast2600_i3c_ops storage-class-specifier to static)
Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks)
Merging hwmon-staging/hwmon-next (92613681c009 Documentation/hwmon: Move misplaced entry in hwmon docs index)
Merging jc_docs/docs-next (bd415b5c9552 Documentation/filesystems: ramfs-rootfs-initramfs: use :Author:)
Merging v4l-dvb/master (ac9a78681b92 Linux 6.4-rc1)
Merging v4l-dvb-next/master (a23a3041c733 Merge tag 'v6.4-rc2' into media_stage)
Merging pm/linux-next (a3c2d8b60e2f Merge branch 'pm-cpufreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (11a3b0ac33d9 cpufreq: imx6q: don't warn for disabling a non-existing frequency)
Merging cpupower/cpupower (c2adb1877b76 cpupower: Make TSC read per CPU for Mperf monitor)
Merging devfreq/devfreq-next (376b1446153c PM / devfreq: exynos-ppmu: Use devm_platform_get_and_ioremap_resource())
Merging opp/opp/linux-next (ac9a78681b92 Linux 6.4-rc1)
Merging thermal/thermal/linux-next (2afa82d1fc64 dt-bindings: thermal: qcom-tsens: Correct unit address)
Merging dlm/next (7a40f1f18a88 fs: dlm: stop unnecessarily filling zero ms_extra bytes)
Merging rdma/for-next (f1fcbaa18b28 Linux 6.4-rc2)
Merging net-next/main (e641577eb6e8 Merge branch 'spdx-conversion-for-bonding-8390-and-i825xx-drivers')
CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec_main.c
Merging bpf-next/for-next (108598c39eef bpf: Fix memleak due to fentry attach failure)
Merging ipsec-next/master (b2cbac9b9b28 net: Remove low_thresh in ip defrag)
Merging mlx5-next/mlx5-next (77f7eb9f3416 net/mlx5: Introduce other vport query for Q-counters)
Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (e641577eb6e8 Merge branch 'spdx-conversion-for-bonding-8390-and-i825xx-drivers')
Merging bluetooth/master (fd4fbf8cd81f Bluetooth: Check for ISO support in controller)
Merging wireless-next/for-next (103d6e9d61e0 wifi: rtl8xxxu: Rename some registers)
Merging wpan-next/master (1af3de62f03f ieee802154: ca8210: Flag the driver as being limited)
Merging wpan-staging/staging (1af3de62f03f ieee802154: ca8210: Flag the driver as being limited)
Merging mtd/mtd/next (7227aacb62ae Merge tag 'nand/for-6.4' into mtd/next)
Merging nand/nand/next (ec185b18c223 mtd: nand: Convert to platform remove callback returning void)
Merging spi-nor/spi-nor/next (df6def86b9dc mtd: spi-nor: spansion: Add support for s25hl02gt and s25hs02gt)
Merging crypto/master (ac52578d6e8d hwrng: virtio - Fix race on data_avail and actual data)
Merging drm/drm-next (ac9a78681b92 Linux 6.4-rc1)
Merging drm-misc/for-linux-next (519ce291168a drm/panel: Modify innolux hj110iz panel initial code)
CONFLICT (content): Merge conflict in drivers/video/fbdev/stifb.c
Merging amdgpu/drm-next (d3295311e589 drm/amdgpu/display: Enable DC_FP for LoongArch)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/Kconfig
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h
CONFLICT (content): Merge conflict in include/drm/display/drm_dp.h
Merging drm-intel/for-linux-next (c598c335da42 drm/i915/tc: Reset TypeC PHYs left enabled in DP-alt mode after the sink disconnects)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (ac7e7c9c65ec drm/msm/dpu: drop unused macros from hw catalog)
Merging drm-msm-lumag/msm-next-lumag (ac7e7c9c65ec drm/msm/dpu: drop unused macros from hw catalog)
Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation)
Merging etnaviv/etnaviv/next (4c22c61e429f drm/etnaviv: show number of NN cores in GPU debugfs info)
Merging fbdev/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging regmap/for-next (7e5a77cccd1f Merge remote-tracking branch 'regmap/for-6.5' into regmap-next)
Merging sound/for-next (bcdbd3b7888e ALSA: emu10k1: enable bit-exact playback, part 2: voice attenuation)
Merging ieee1394/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging sound-asoc/for-next (c9a873c0adf4 Merge remote-tracking branch 'asoc/for-6.5' into asoc-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging modules/modules-next (0b891c83d8c5 module: include internal.h in module/dups.c)
Merging input/next (17caa38a988e dt-bindings: input: cypress,cyapa: convert to dtschema)
Merging block/for-next (69e6e23f4fd8 Merge branch 'for-6.5/block' into for-next)
Merging device-mapper/for-next (38d11da522aa dm: don't lock fs when the map is NULL in process of resume)
Merging libata/for-next (f19c694f744f ata: pata_parport: Fix frpw module code indentation and style)
Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver)
Merging mmc/next (d4ebc9419afb Merge branch 'fixes' into next)
Merging mfd/for-mfd-next (9bdc4322bbd1 mfd: Remove redundant dev_set_drvdata() from I2C drivers)
Merging backlight/for-backlight-next (fb200218b40b backlight: as3711: Use of_property_read_bool() for boolean properties)
Merging battery/for-next (eae36cb82440 power: reset: add HAS_IOPORT dependencies)
Merging regulator/for-next (dd5250193155 Merge remote-tracking branch 'regulator/for-6.5' into regulator-next)
Merging security/next (ac9a78681b92 Linux 6.4-rc1)
Merging apparmor/apparmor-next (0bb84cff96af apparmor: fix missing error check for rhashtable_insert_fast)
Merging integrity/next-integrity (644f17412f5a IMA: allow/fix UML builds)
Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest)
Merging selinux/next (c52df19e3759 selinux: small cleanups in selinux_audit_rule_init())
Merging smack/next (2c085f3a8f23 smack: Record transmuting in smk_transmuted)
Merging tomoyo/master (933fd4391e3d workqueue: Emit runtime message when flush_scheduled_work() is called)
Merging tpmdd/next (e7d3e5c4b1dd tpm/tpm_tis: Disable interrupts for more Lenovo devices)
Merging watchdog/master (fc4354c6e5c2 Merge tag 'mm-stable-2023-05-06-10-49' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm)
Merging iommu/next (e51b4198396c Merge branches 'iommu/fixes', 'arm/allwinner', 'arm/exynos', 'arm/mediatek', 'arm/omap', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'ppc/pamu', 'unisoc', 'x86/vt-d', 'x86/amd', 'core' and 'platform-remove_new' into next)
Merging audit/next (ac9a78681b92 Linux 6.4-rc1)
Merging devicetree/for-next (c50eb01940c7 Merge branch 'dt/address-cleanups' into dt/next)
Merging dt-krzk/for-next (1e0e1e8ba86a Merge branch 'next/dt64' into for-next)
Merging mailbox/mailbox-for-next (d396133dced4 dt-bindings: mailbox: qcom: add compatible for IPQ9574 SoC)
Merging spi/for-next (1d5d2ef7b86f Merge remote-tracking branch 'spi/for-6.5' into spi-next)
Merging tip/master (0932447780e1 Merge branch into tip/master: 'smp/core')
CONFLICT (content): Merge conflict in tools/perf/arch/x86/include/arch-tests.h
CONFLICT (content): Merge conflict in tools/perf/arch/x86/tests/arch-tests.c
Merging clockevents/timers/drivers/next (158009f1b4a3 timekeeping: Fix references to nonexistent ktime_get_fast_ns())
Merging edac/edac-for-next (6c79e42169fe EDAC/amd64: Add support for ECC on family 19h model 60h-7Fh)
Merging irqchip/irq/irqchip-next (2ff1b0839ddd Merge branch irq/misc-6.4 into irq/irqchip-next)
Merging ftrace/for-next (3862f86c1529 Merge tools/for-next)
Merging rcu/rcu/next (d6e962af2fdd Merge branch 'atomicdoc.2023.05.11a' into HEAD)
Applying: fixup for "RDMA/rxe: Add error messages"
Merging kvm/next (7a8016d95651 Merge tag 'kvm-s390-next-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-arm/next (801d857f9811 Merge branch kvm-arm64/eager-page-splitting into kvmarm/next)
Merging kvms390/next (8a46df7cd135 KVM: s390: pci: fix virtual-physical confusion on module unload/load)
Merging kvm-riscv/riscv_kvm_next (2f4d58f7635a RISC-V: KVM: Virtualize per-HART AIA CSRs)
Merging kvm-x86/next (5c291b93e5d6 Merge branch 'pmu')
Merging xen-tip/linux-next (cbfac7707ba1 xen/blkback: move blkif_get_x86_*_req() into blkback.c)
Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next)
Merging workqueues/for-next (4d19140f762c Merge branch 'for-6.5' into for-next)
Merging drivers-x86/for-next (f5a08ed51ed7 platform/x86: toshiba: constify pointers to hwmon_channel_info)
Merging chrome-platform/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging hsi/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1)
Merging leds-lj/for-leds-next (7a9496d0feb5 dt-bindings: leds: Drop redundant cpus enum match)
Merging ipmi/for-next (d08076678ce7 ipmi:ssif: Drop if blocks with always false condition)
Merging driver-core/driver-core-next (f1fcbaa18b28 Linux 6.4-rc2)
Merging usb/usb-next (a4422ff22142 usb: typec: qcom: Add Qualcomm PMIC Type-C driver)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/gadget.c
CONFLICT (content): Merge conflict in drivers/usb/gadget/udc/core.c
Merging thunderbolt/next (ac9a78681b92 Linux 6.4-rc1)
Merging usb-serial/usb-next (a095edfc15f0 USB: serial: option: add UNISOC vendor and TOZED LT70C product)
Merging tty/tty-next (d5b3d02d0b10 serial: Make uart_remove_one_port() return void)
Merging char-misc/char-misc-next (c21c0f9a20a9 Binder: Add async from to transaction record)
Merging accel/habanalabs-next (e8478792ca56 accel/habanalabs: mask part of hmmu page fault captured address)
Merging coresight/next (18996a113f25 coresight: etm_pmu: Set the module field)
Merging fastrpc/for-next (3f6b4c6f0bd0 fastrpc: Don't assert held reservation lock for dma-buf mmapping)
Merging fpga/for-next (da4da5b2d708 fpga: dfl-fme: constify pointers to hwmon_channel_info)
Merging icc/icc-next (b7590f3841f4 dt-bindings: interconnect: qcom,msm8998-bwmon: Resolve MSM8998 support)
Merging iio/togreg (a508fbfed333 iio: kx022a: Probe asynchronously)
Merging phy-next/next (8d087a09c701 phy: ti: gmii-sel: Enable USXGMII mode for J784S4)
Merging soundwire/next (9420c9719f03 soundwire: bus: Don't filter slave alerts)
Merging extcon/extcon-next (4e30418def07 extcon: Drop unneeded assignments)
CONFLICT (content): Merge conflict in drivers/extcon/extcon.c
Merging gnss/gnss-next (1b929c02afd3 Linux 6.2-rc1)
Merging vfio/next (705b004ee377 docs: kvm: vfio: Suggest KVM_DEV_VFIO_GROUP_ADD vs VFIO_GROUP_GET_DEVICE_FD ordering)
Merging w1/for-next (b332af5398a3 w1: Replace usage of found with dedicated list iterator variable)
Merging staging/staging-next (1f3413dc8eb0 staging: rtl8192e: Refactor tmp_ofdm_index variable assignment)
Merging counter-next/counter-next (228354ed692f tools/counter: Makefile: Remove lingering 'include' directories on make clean)
Merging mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on COMPILE_TEST)
Merging dmaengine/next (ceb434d56826 dmaengine: ti: k3-udma: Add support for J721S2 CSI BCDMA instance)
Merging cgroup/for-next (2ef269ef1ac0 cgroup/cpuset: Free DL BW in case can_attach() fails)
Merging scsi/for-next (1a7edd041f2d scsi: ufs: core: Fix I/O hang that occurs when BKOPS fails in W-LUN suspend)
Merging scsi-mkp/for-next (44ef1604ae94 Merge patch series "smartpqi updates")
Merging vhost/linux-next (ebddc00f450d vhost_net: revert upend_idx only on retriable error)
Merging rpmsg/for-next (de598695a2ad remoteproc: stm32: Allow hold boot management by the SCMI reset controller)
Merging gpio/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging gpio-brgl/gpio/for-next (6c19974d1e83 dt-bindings: gpio: Convert STMPE GPIO to YAML schema)
Merging gpio-intel/for-next (782eea0c89f7 gpiolib: acpi: Add a ignore wakeup quirk for Clevo NL5xNU)
Merging pinctrl/for-next (0ad8190a7aa0 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging pinctrl-renesas/renesas-pinctrl (5d32cead772c pinctrl: renesas: Fix spaces followed by tabs)
Merging pinctrl-samsung/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging pwm/for-next (247ee6c78040 pwm: Remove unused radix tree)
Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next)
Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie)
Merging kselftest/next (f8424c54d041 selftests/clone3: test clone3 with exit signal in flags)
Merging kunit/test (ac9a78681b92 Linux 6.4-rc1)
Merging kunit-next/kunit (a5ce66ad292b kunit: example: Provide example exit functions)
Merging livepatching/for-next (5e36be5973b6 Merge branch 'for-6.4/core' into for-next)
Merging rtc/rtc-next (e99ab4abebf8 rtc: armada38x: use devm_platform_ioremap_resource_byname())
Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next)
Merging at24/at24/for-next (a3c10035d12f eeprom: at24: Use dev_err_probe for nvmem register failure)
Merging ntb/ntb-next (942cc9ceccb6 ntb: intel: Remove redundant pci_clear_master)
Merging seccomp/for-next/seccomp (0fb0624b15d2 seccomp: fix kernel-doc function name warning)
Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get)
Merging slimbus/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging nvmem/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated)
Merging hyperv/hyperv-next (a494aef23dfc PCI: hv: Replace retarget_msi_interrupt_params with hyperv_pcpu_input_arg)
Merging auxdisplay/auxdisplay (ddf75a86aba2 auxdisplay: hd44780: Fix potential memory leak in hd44780_remove())
Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function)
Merging hmm/hmm (ac9a78681b92 Linux 6.4-rc1)
Merging cfi/cfi/next (312310928417 Linux 5.18-rc1)
Merging mhi/mhi-next (1d1493bdc25f bus: mhi: host: Use mhi_tryset_pm_state() for setting fw error state)
Merging memblock/for-next (e4bfeb6d6f39 Fix some coding style errors in memblock.c)
Merging cxl/next (bfe58458fd25 cxl/mbox: Update CMD_RC_TABLE)
Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2)
Merging efi/next (0153431c85af efi: make kobj_type structure constant)
Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
Merging slab/for-next (ed4cdfbeb873 Merge branch 'slab/for-6.4/slob-removal' into slab/for-next)
Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging landlock/next (ed35e2f2f0de landlock: Clarify documentation for the LANDLOCK_ACCESS_FS_REFER right)
Merging rust/rust-next (ac9a78681b92 Linux 6.4-rc1)
Merging sysctl/sysctl-next (1685b445d778 sysctl: stop exporting register_sysctl_table)
Merging execve/for-next/execve (60592fb6b67c coredump, vmcore: Set p_align to 4 for PT_NOTE)
Merging bitmap/bitmap-for-next (714f3af11b21 cpumask: fix function description kernel-doc notation)
CONFLICT (content): Merge conflict in include/linux/cpumask.h
Merging hte/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging kspp/for-next/kspp (55c84a5cf2c7 fortify: strcat: Move definition to use fortified strlcat())
Merging kspp-gustavo/for-next/kspp (00168b415a60 uapi: net: ipv6: Replace fake flex-array with flex-array member)
Merging iommufd/for-next (f1fcbaa18b28 Linux 6.4-rc2)

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

Re: linux-next: Tree for May 17

[Palmer Dabbelt]

On Fri, 17 May 2019 02:43:08 PDT (-0700), ktkhai@virtuozzo.com wrote:
> On 17.05.2019 12:41, Kirill Tkhai wrote:
>> On 17.05.2019 07:21, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Please do not add any v5.3 material to your linux-next included
>>> trees/branches until after v5.2-rc1 has been released.
>>>
>>> Changes since 20190516:
>>>
>>> The kvm tree gained conflicts against Linus' tree.
>>>
>>> Non-merge commits (relative to Linus' tree): 1023
>>>  1119 files changed, 27058 insertions(+), 7629 deletions(-)
>>
>> Binary file was added:
>>
>> ~/linux-next$ git log --oneline ./modules.builtin.modinfo
>> 4cbb0d07b4d1 RISC-V: Support nr_cpus command line option.
>
> CC Palmer.

Ya, sorry about that.  It should have been fixed as of last night -- I must
have just done something stupid.

Re: linux-next: Tree for May 17

[Stephen Rothwell]

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

Hi all,

On Fri, 17 May 2019 12:43:08 +0300 Kirill Tkhai <ktkhai@virtuozzo.com> wrote:
>
> On 17.05.2019 12:41, Kirill Tkhai wrote:
> > On 17.05.2019 07:21, Stephen Rothwell wrote:  
> >> Hi all,
> >>
> >> Please do not add any v5.3 material to your linux-next included
> >> trees/branches until after v5.2-rc1 has been released.
> >>
> >> Changes since 20190516:
> >>
> >> The kvm tree gained conflicts against Linus' tree.
> >>
> >> Non-merge commits (relative to Linus' tree): 1023
> >>  1119 files changed, 27058 insertions(+), 7629 deletions(-)  
> > 
> > Binary file was added:
> > 
> > ~/linux-next$ git log --oneline ./modules.builtin.modinfo
> > 4cbb0d07b4d1 RISC-V: Support nr_cpus command line option.  
> 
> CC Palmer.

It's been fixed in the risc-v tree since it was included in linux-next
today.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: Tree for May 17

[Kirill Tkhai]

On 17.05.2019 12:41, Kirill Tkhai wrote:
> On 17.05.2019 07:21, Stephen Rothwell wrote:
>> Hi all,
>>
>> Please do not add any v5.3 material to your linux-next included
>> trees/branches until after v5.2-rc1 has been released.
>>
>> Changes since 20190516:
>>
>> The kvm tree gained conflicts against Linus' tree.
>>
>> Non-merge commits (relative to Linus' tree): 1023
>>  1119 files changed, 27058 insertions(+), 7629 deletions(-)
> 
> Binary file was added:
> 
> ~/linux-next$ git log --oneline ./modules.builtin.modinfo
> 4cbb0d07b4d1 RISC-V: Support nr_cpus command line option.

CC Palmer.

Re: linux-next: Tree for May 17

[Kirill Tkhai]

On 17.05.2019 07:21, Stephen Rothwell wrote:
> Hi all,
> 
> Please do not add any v5.3 material to your linux-next included
> trees/branches until after v5.2-rc1 has been released.
> 
> Changes since 20190516:
> 
> The kvm tree gained conflicts against Linus' tree.
> 
> Non-merge commits (relative to Linus' tree): 1023
>  1119 files changed, 27058 insertions(+), 7629 deletions(-)

Binary file was added:

~/linux-next$ git log --oneline ./modules.builtin.modinfo
4cbb0d07b4d1 RISC-V: Support nr_cpus command line option.

Kirill

Re: linux-next: Tree for May 17

[Anders Roxell]

On Fri, 17 May 2019 at 06:21, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Please do not add any v5.3 material to your linux-next included
> trees/branches until after v5.2-rc1 has been released.
>
> Changes since 20190516:
>
> The kvm tree gained conflicts against Linus' tree.

When I built arm64 I saw this build failure:
../arch/arm64/kvm/../../../virt/kvm/kvm_main.c: In function ‘__kvm_map_gfn’:
../arch/arm64/kvm/../../../virt/kvm/kvm_main.c:1764:9: error: implicit
declaration of function ‘memremap’; did you mean ‘memcmp’?
[-Werror=implicit-function-declaration]
   hva = memremap(pfn_to_hpa(pfn), PAGE_SIZE, MEMREMAP_WB);
         ^~~~~~~~
         memcmp
../arch/arm64/kvm/../../../virt/kvm/kvm_main.c:1764:46: error:
‘MEMREMAP_WB’ undeclared (first use in this function)
   hva = memremap(pfn_to_hpa(pfn), PAGE_SIZE, MEMREMAP_WB);
                                              ^~~~~~~~~~~
../arch/arm64/kvm/../../../virt/kvm/kvm_main.c:1764:46: note: each
undeclared identifier is reported only once for each function it
appears in
../arch/arm64/kvm/../../../virt/kvm/kvm_main.c: In function ‘kvm_vcpu_unmap’:
../arch/arm64/kvm/../../../virt/kvm/kvm_main.c:1796:3: error: implicit
declaration of function ‘memunmap’; did you mean ‘vm_munmap’?
[-Werror=implicit-function-declaration]
   memunmap(map->hva);
   ^~~~~~~~
   vm_munmap
cc1: some warnings being treated as errors
make[2]: *** [../scripts/Makefile.build:279:
arch/arm64/kvm/../../../virt/kvm/kvm_main.o] Error 1
make[2]: Target '__build' not remade because of errors.
make[1]: *** [/home/anders/src/kernel/next/Makefile:1071:
arch/arm64/kvm] Error 2

is this something that should be added maybe?

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 8d83a787fd6b..5c5102799c2c 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -51,6 +51,7 @@
 #include <linux/slab.h>
 #include <linux/sort.h>
 #include <linux/bsearch.h>
+#include <linux/io.h>

 #include <asm/processor.h>
 #include <asm/io.h>


Cheers,
Anders

>
> Non-merge commits (relative to Linus' tree): 1023
>  1119 files changed, 27058 insertions(+), 7629 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 298 trees (counting Linus' and 69 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 (01be377c6221 Merge tag 'media/v5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
> Merging fixes/master (2bbacd1a9278 Merge tag 'kconfig-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
> Merging kspp-gustavo/for-next/kspp (ccaa75187a5f memstick: mark expected switch fall-throughs)
> Merging kbuild-current/fixes (a2d635decbfa Merge tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm)
> Merging arc-current/for-curr (308a06dc72c0 ARC: mm: do_page_fault refactor #8: release mmap_sem sooner)
> Merging arm-current/fixes (e17b1af96b2a ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache)
> Merging arm64-fixes/for-next/fixes (7a0a93c51799 arm64: vdso: Explicitly add build-id option)
> Merging m68k-current/for-linus (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping)
> Merging powerpc-fixes/fixes (12f363511d47 powerpc/32s: Fix BATs setting with CONFIG_STRICT_KERNEL_RWX)
> Merging sparc/master (63863ee8e2f6 Merge tag 'gcc-plugins-v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/kees/linux)
> Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
> Merging net/master (510e2ceda031 ipv6: fix src addr routing with the exception table)
> Merging bpf/master (d72386fe7a84 libbpf: move logging helpers into libbpf_internal.h)
> Merging ipsec/master (9b3040a6aafd ipv4: Define __ipv4_neigh_lookup_noref when CONFIG_INET is disabled)
> Merging netfilter/master (d4c26eb6e721 net: ethernet: stmmac: dwmac-sun8i: enable support of unicast filtering)
> Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects)
> Merging wireless-drivers/master (7a0f8ad5ff63 Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
> Merging mac80211/master (933b40530b4b mac80211: remove set but not used variable 'old')
> Merging rdma-fixes/for-rc (2557fabd6e29 RDMA/hns: Bugfix for mapping user db)
> Merging sound-current/for-linus (56df90b631fc ALSA: hda/realtek - Fix for Lenovo B50-70 inverted internal microphone bug)
> Merging sound-asoc-fixes/for-linus (81566b4cbc5d Merge branch 'asoc-5.1' into asoc-linus)
> Merging regmap-fixes/for-linus (1d6106cafb37 Merge branch 'regmap-5.1' into regmap-linus)
> Merging regulator-fixes/for-linus (0d183fc1760f Merge branch 'regulator-5.1' into regulator-linus)
> Merging spi-fixes/for-linus (72e3b3285a43 Merge branch 'spi-5.1' into spi-linus)
> Merging pci-current/for-linus (9c9c5fc89b09 PCI/LINK: Add Kconfig option (default off))
> Merging driver-core.current/driver-core-linus (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
> Merging tty.current/tty-linus (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
> Merging usb.current/usb-linus (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
> Merging usb-gadget-fixes/fixes (072684e8c58d USB: gadget: f_hid: fix deadlock in f_hidg_write())
> Merging usb-serial-fixes/usb-linus (79a3aaa7b82e Linux 5.1-rc3)
> Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer)
> Merging phy/fixes (e6f32efb1b12 phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode)
> Merging staging.current/staging-linus (8c05f3b965da Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm)
> Merging char-misc.current/char-misc-linus (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
> Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
> Merging thunderbolt-fixes/fixes (e93c9c99a629 Linux 5.1)
> Merging input-current/for-linus (145b11d1baa3 Input: elan_i2c - increment wakeup count if wake source)
> Merging crypto-current/master (cbc22b062106 Revert "crypto: caam/jr - Remove extra memory barrier during job ring dequeue")
> Merging ide/master (b970afcfcabd Merge tag 'powerpc-5.2-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
> Merging vfio-fixes/for-linus (492855939bdb vfio/type1: Limit DMA mappings per container)
> Merging kselftest-fixes/fixes (15ade5d2e777 Linux 5.1-rc4)
> Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
> Merging slave-dma-fixes/fixes (37624b58542f Linux 5.1-rc7)
> Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1)
> Merging mtd-fixes/mtd/fixes (9a8f612ca0d6 mtd: rawnand: marvell: Clean the controller state before each operation)
> Merging mfd-fixes/for-mfd-fixes (e93c9c99a629 Linux 5.1)
> Merging v4l-dvb-fixes/fixes (fc8670d1f72b media: rockchip/vpu: Fix/re-order probe-error/remove path)
> Merging reset-fixes/reset/fixes (d5d4218e1669 reset: remove redundant null check on pointer dev)
> Merging mips-fixes/mips-fixes (a1e8783db8e0 MIPS: perf: ath79: Fix perfcount IRQ assignment)
> Merging at91-fixes/at91-fixes (ba5e60c9b75d arm/mach-at91/pm : fix possible object reference leak)
> Merging omap-fixes/fixes (1ba12322e2f0 Merge branch 'am5-sdio-fixes' into fixes)
> Merging kvm-fixes/master (e8ab8d24b488 KVM: nVMX: Fix size checks in vmx_set_nested_state)
> Merging kvms390-fixes/master (b10bd9a256ae s390: vsie: Use effective CRYCBD.31 to check CRYCBD validity)
> Merging hwmon-fixes/hwmon (b88c5049219a hwmon: (occ) Fix extended status bits)
> Merging nvdimm-fixes/libnvdimm-fixes (c4703ce11c23 libnvdimm/namespace: Fix label tracking error)
> Merging btrfs-fixes/next-fixes (4792878ab434 Merge branch 'misc-5.2' into next-fixes)
> Merging vfs-fixes/fixes (05883eee857e do_move_mount(): fix an unsafe use of is_anon_ns())
> Merging dma-mapping-fixes/for-linus (8c5165430c01 dma-debug: only skip one stackframe entry)
> Merging i3c-fixes/master (709a53e19484 MAINTAINERS: Fix the I3C entry)
> Merging drivers-x86-fixes/fixes (e93c9c99a629 Linux 5.1)
> Merging samsung-krzk-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1)
> Merging pinctrl-samsung-fixes/pinctrl-fixes (9e98c678c2d6 Linux 5.1-rc1)
> Merging devicetree-fixes/dt/linus (e10e55e9d933 dt-bindings: sifive: describe sifive-blocks versioning)
> Merging scsi-fixes/fixes (f4cefcd67067 scsi: bnx2fc: fix incorrect cast to u64 on shift operation)
> Merging drm-fixes/drm-fixes (e93c9c99a629 Linux 5.1)
> Merging amdgpu-fixes/drm-fixes (f7b1844bacec drm/amdgpu: Update gc golden setting for vega family)
> Merging drm-intel-fixes/for-linux-next-fixes (f5c58ba18ab8 drm/i915: Restore correct bxt_ddi_phy_calc_lane_lat_optim_mask() calculation)
> Merging mmc-fixes/fixes (ec0970e0a1b2 mmc: sdhci-iproc: Set NO_HISPD bit to fix HS50 data hold time problem)
> Merging rtc-fixes/rtc-fixes (882c5e552ffd rtc: da9063: set uie_unsupported when relevant)
> Merging gnss-fixes/gnss-linus (79a3aaa7b82e Linux 5.1-rc3)
> Merging hyperv-fixes/hyperv-fixes (69c8caafb72d hv: tools: fixed Python pep8/flake8 warnings for lsvmbus)
> Merging drm-misc-fixes/for-linux-next-fixes (ab042b824c11 Revert "drm/qxl: drop prime import/export callbacks")
> Merging kbuild/for-next (f9d7adc7b0d6 kbuild: remove 'addtree' and 'flags' magic for header search paths)
> Merging compiler-attributes/compiler-attributes (a3b22b9f11d9 Linux 5.0-rc7)
> Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
> Merging dma-mapping/for-next (13bf5ced9377 dma-mapping: add a Kconfig symbol to indicate arch_dma_prep_coherent presence)
> Merging asm-generic/master (6edd1dbace0e asm-generic: optimize generic uaccess for 8-byte loads and stores)
> Merging arc/for-next (5908e6b738e3 Linux 5.0-rc8)
> Merging arm/for-next (d486065b35e4 Merge branches 'fixes' and 'misc' into for-next)
> Merging arm64/for-next/core (6127bf372add Merge branch 'for-next/mmiowb' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core)
> Merging arm-perf/for-next/perf (9bcb929f969e perf/arm-ccn: Clean up CPU hotplug handling)
> Merging arm-soc/for-next (7ad1b252cabe ARM: Document merges)
> Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
> Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
> Merging amlogic/for-next (68a837de19ed Merge branch 'v5.2/fixes' into tmp/aml-rebuild)
> Merging aspeed/for-next (e15425214990 ARM: dts: aspeed: quanta-q71l: enable uart1)
> Merging at91/at91-next (ac650130c227 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
> Merging bcm2835/for-next (1ee128f4fff2 Merge branch 'bcm2835-drivers-next' into for-next)
> Merging imx-mxs/for-next (d9c3322a2906 Merge branch 'imx/defconfig' into for-next)
> CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
> Merging keystone/next (3c3a43c81bda Merge branch 'for_5.1/soc-drivers' into next)
> Merging mediatek/for-next (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next)
> Merging mvebu/for-next (891f0f865c37 Merge branch 'mvebu/dt64' into mvebu/for-next)
> Merging omap/for-next (481df0abf8cf Merge branch 'omap-for-v5.2/ti-sysc' into for-next)
> Merging reset/reset/next (21a5d26b8164 reset: Switch to SPDX license identifier for reset-simple)
> Merging qcom/for-next (1d31c0b1a28a Merge tag 'qcom-arm64-for-5.2-1' into really-done-for-5.2)
> Merging renesas/next (982700f80241 Merge branch 'arm-dt-for-v5.2' into next)
> Merging rockchip/for-next (9c539071723e Merge branch 'v5.2-clk/next' into for-next)
> Merging samsung/for-next (bebc6082da0a Linux 4.14)
> Merging samsung-krzk/for-next (831c75782772 Merge branch 'next/dt64' into for-next)
> Merging sunxi/sunxi/for-next (613c4ce8fddb Merge branch 'sunxi/dt-for-5.2' into sunxi/for-next)
> Merging tegra/for-next (0c0ffecf65fd Merge branch for-5.2/arm64/defconfig into for-next)
> Merging clk/clk-next (62e59c4e69b3 clk: Remove io.h from clk-provider.h)
> Merging clk-samsung/for-next (3c297d9e65d8 clk: samsung: exynos5410: Add gate clock for ADC)
> 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 (d2adb7b6249a csky: Select intc & timer drivers)
> Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration of pcibios_penalize_isa_irq)
> Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files)
> Merging m68k/for-next (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping)
> Merging m68knommu/for-next (37624b58542f Linux 5.1-rc7)
> Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions)
> Merging mips/mips-next (b1e479e3dcbc MIPS: Alchemy: add DMA masks for on-chip ethernet)
> CONFLICT (content): Merge conflict in arch/mips/sgi-ip27/ip27-irq.c
> Merging nds32/next (af9abd65983c nds32: Fix vDSO clock_getres())
> Merging nios2/for-next (21e6bff5e0ef nios2: Fix update_mmu_cache preload the TLB with the new PTE)
> Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32)
> Merging parisc-hd/for-next (4d658e1524ee parisc: Allow building 64-bit kernel without -mlong-calls compiler option)
> Merging powerpc/next (8150a153c013 powerpc/64s: Use early_mmu_has_feature() in set_kuap())
> Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask")
> Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
> Merging risc-v/for-next (81eba518d95f RISC-V: sifive_l2_cache: Add L2 cache controller driver for SiFive SoCs)
> 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 (f3e20ad67b4c s390: move arch/s390/defconfig to arch/s390/configs/defconfig)
> Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
> Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
> Merging uml/linux-next (1987b1b8f9f1 um: irq: don't set the chip for all irqs)
> Merging xtensa/xtensa-for-next (0542593fff0f Merge branch 'xtensa-for-next' into xtensa-5.2-fixes)
> Merging fscrypt/master (2c58d548f570 fscrypt: cache decrypted symlink target in ->i_link)
> Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
> Merging btrfs/next (29dcea88779c Linux 4.17)
> Merging btrfs-kdave/for-next (6fc9f4e59957 Merge branch 'for-next-current-v5.1-20190509' into for-next-20190509)
> Merging ceph/master (00abf69dd24f ceph: flush dirty inodes before proceeding with remount)
> Merging cifs/for-next (dece44e381ab cifs: add support for SEEK_DATA and SEEK_HOLE)
> Merging configfs/for-next (35399f87e271 configfs: fix possible use-after-free in configfs_register_group)
> Merging ecryptfs/next (d43388dea04b eCryptfs: fix permission denied with ecryptfs_xattr mount option when create readonly file)
> Merging ext3/for_next (91e9f2c1d861 Merge quota fix from Chengguang.)
> Merging ext4/dev (0c72924ef346 ext4: fix block validity checks for journal inodes using indirect blocks)
> Merging f2fs/dev (e0654264c480 Merge tag 'backlight-next-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight)
> Merging fuse/for-next (9031a69cf9f0 fuse: clean up fuse_alloc_inode)
> Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
> Merging nfs/linux-next (d7a02fa0a8f9 Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs)
> Merging nfs-anna/linux-next (5940d1cf9f42 SUNRPC: Rebalance a kref in auth_gss.c)
> Merging nfsd/nfsd-next (1c73b9d24f80 nfsd: update callback done processing)
> Merging orangefs/for-next (33713cd09ccd orangefs: truncate before updating size)
> Merging overlayfs/overlayfs-next (acf3062a7e1c ovl: relax WARN_ON() for overlapping layers use case)
> Merging ubifs/linux-next (c16e73587ad6 ubifs: Don't leak orphans on memory during commit)
> Merging v9fs/9p-next (80a316ff1627 9p/xen: Add cleanup path in p9_trans_xen_init)
> Merging xfs/for-next (8869a2d297cb Merge remote-tracking branch 'korg/iomap-5.2-merge' into for-next)
> Merging file-locks/locks-next (945ab8f6de94 locks: wake any locks blocked on request before deadlock check)
> Merging vfs/for-next (6e14c3cf8bc4 Merge branch 'work.icache' into for-next)
> CONFLICT (content): Merge conflict in Documentation/filesystems/porting
> Merging printk/for-next (967aa2217b6d Merge branch 'for-5.2-fixes' into for-next)
> Merging pci/next (c7a1c2bbb65e Merge branch 'pci/trivial')
> Merging pstore/for-next/pstore (0be6a6927254 pstore/ram: Improve backward compatibility with older Chromebooks)
> Merging hid/for-next (eb18d1215405 Merge branch 'for-5.2/logitech' into for-next)
> Merging i2c/i2c/for-next (8d1d950a6072 Merge branch 'i2c/for-5.2' into i2c/for-next)
> Merging i3c/i3c/next (476c7e1d34f2 i3c: Fix a shift wrap bug in i3c_bus_set_addr_slot_status())
> Merging dmi/master (57361846b52b Linux 4.19-rc2)
> Merging hwmon-staging/hwmon-next (39abe9d88b30 hwmon: (lm75) Add support for TMP75B)
> Merging jc_docs/docs-next (afbd4d42470e Merge branch 'x86' into docs-next)
> Merging v4l-dvb/master (fc8670d1f72b media: rockchip/vpu: Fix/re-order probe-error/remove path)
> Merging v4l-dvb-next/master (a455eda33faa Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal)
> Merging fbdev/fbdev-for-next (d4a5611743a6 video: fbdev: Use dev_get_drvdata())
> Merging pm/linux-next (03216f1a350e Merge branch 'acpi-pm' into linux-next)
> Merging cpufreq-arm/cpufreq/arm/linux-next (8db82563451f cpufreq: armada-37xx: fix frequency calculation for opp)
> Merging cpupower/cpupower (21027e78e7c1 cpupower: correct spelling of interval)
> Merging opp/opp/linux-next (2f36bde0fc8f OPP: Introduce dev_pm_opp_find_freq_ceil_by_volt())
> Merging thermal/next (6df24c3e81b9 Merge branches 'thermal-core', 'thermal-built-it' and 'thermal-intel' into next)
> Merging thermal-soc/next (37bcec5d9f71 hwmon: (pwm-fan) Use devm_thermal_of_cooling_device_register)
> Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs)
> Merging dlm/next (54cca4bad076 dlm: allow binding to all network interfaces)
> Merging swiotlb/linux-next (063b8271ec8f swiotlb-xen: ensure we have a single callsite for xen_dma_map_page)
> Merging rdma/for-next (c191f93454bc net/mlx5: Set completion EQs as shared resources)
> Merging net-next/master (35c99ffa20ed Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
> Merging bpf-next/master (35c99ffa20ed Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
> Merging ipsec-next/master (601e6bcc4ef0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
> Merging mlx5-next/mlx5-next (91a40a48d52d net/mlx5: Fix broken hca cap offset)
> Merging netfilter-next/master (601e6bcc4ef0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
> Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
> Merging ipvs-next/master (e2f7cc72cbf4 netfilter: conntrack: fix bogus port values for other l4 protocols)
> Merging wireless-drivers-next/master (f9b628d61fae rtw88: add license for Makefile)
> Merging bluetooth/master (62a91990f4c5 Bluetooth: hci_qca: Rename STATE_<flags> to QCA_<flags>)
> Merging mac80211-next/master (80f232121b69 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
> Merging gfs2/for-next (fbcde197e1be gfs2: Fix error path kobject memory leak)
> Merging mtd/mtd/next (3008ba870938 mtd: part: fix incorrect format specifier for an unsigned long long)
> Merging nand/nand/next (1c14fe2167ef mtd: nandsim: switch to exec_op interface)
> Merging spi-nor/spi-nor/next (e43f53c22a93 spi-nor: intel-spi: Add support for Intel Comet Lake SPI serial flash)
> Merging crypto/master (e59f755ceb6d crypto: ccree - use a proper le32 type for le32 val)
> Merging drm/drm-next (8da0e1525b7f Merge tag 'drm-misc-next-fixes-2019-05-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
> Merging amdgpu/drm-next (af6a5febf001 drm/amd/powerplay: Fix maybe-uninitialized in get_ppfeature_status)
> Merging drm-intel/for-linux-next (c36beba6b296 drm/i915: Seal races between async GPU cancellation, retirement and signaling)
> Merging drm-tegra/drm/tegra/for-next (61b51fb51c01 drm/tegra: gem: Fix CPU-cache maintenance for BO's allocated using get_pages())
> Merging drm-misc/for-linux-next (51a0d1a90bff drm/sun4i: sun6i_mipi_dsi: Fix hsync_porch overflow)
> Merging drm-msm/msm-next (b02872df58ac drm/msm/a6xx: Don't enable GPU state code if dependencies are missing)
> Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
> Merging mali-dp/for-upstream/mali-dp (15e9122d9b5c drm/komeda: Mark the local functions as static)
> Merging imx-drm/imx-drm/next (5d5fe9970c76 drm/imx: enable IDMAC watermark feature)
> Merging etnaviv/etnaviv/next (2b76f5be7c27 drm/etnaviv: initialize idle mask before querying the HW db)
> Merging kconfig/for-next (bebc6082da0a Linux 4.14)
> Merging regmap/for-next (a136e5257f67 Merge branch 'regmap-5.2' into regmap-next)
> Merging sound/for-next (56df90b631fc ALSA: hda/realtek - Fix for Lenovo B50-70 inverted internal microphone bug)
> Merging sound-asoc/for-next (78c1aaab61fa Merge branch 'asoc-5.2' into asoc-next)
> Merging modules/modules-next (dadec066d8fa module: add stubs for within_module functions)
> Merging input/next (b283d0c353de Input: eeti_ts -  read hardware state once after wakeup)
> Merging block/for-next (e35d0b782065 Merge branch 'for-5.2/block-post' into for-next)
> Merging device-mapper/for-next (8454fca4f53b dm: fix a couple brace coding style issues)
> Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
> Merging mmc/next (0a49a619e7e1 mmc: sdhci-pci: Fix BYT OCP setting)
> 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 (ed835136ee67 mfd: Use dev_get_drvdata() directly)
> Merging backlight/for-backlight-next (53fa0f87177d backlight: lm3630a: Add firmware node support)
> Merging battery/for-next (baf5964ecfe1 power: supply: olpc_battery: force the le/be casts)
> Merging regulator/for-next (16f26207b3b1 Merge branch 'regulator-5.2' into regulator-next)
> Merging security/next-testing (5664f5faac11 Merge branch 'next-smack' into next-testing)
> Merging apparmor/apparmor-next (06c13f554a71 apparmor: re-introduce a variant of PROFILE_MEDIATES_SAFE)
> Merging integrity/next-integrity (a2ffe5774e8e selftests/kexec: update get_secureboot_mode)
> Merging selinux/next (35a196bef449 proc: prevent changes to overridden credentials)
> Merging tpmdd/next (ff89e2f4b34d tpm: Actually fail on TPM errors during "get random")
> Merging watchdog/master (a9f0bda567e3 watchdog: Enforce that at least one pretimeout governor is enabled)
> Merging iommu/next (b5531563e8a0 Merge branches 'arm/tegra', 'arm/mediatek', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next)
> Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
> Merging vfio/next (15c80c1659f2 vfio: Add Cornelia Huck as reviewer)
> Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
> Merging audit/next (70c4cf17e445 audit: fix a memory leak bug)
> Merging devicetree/for-next (2a656cb5a4a3 of: unittest: Remove error printing on OOM)
> Merging mailbox/mailbox-for-next (8fbbfd966efa mailbox: Add support for Armada 37xx rWTM mailbox)
> Merging spi/for-next (aa459d194583 Merge remote-tracking branch 'spi/topic/bpw-check' into spi-next)
> Merging tip/auto-latest (09feda54b176 Merge branch 'core/mm')
> Merging clockevents/clockevents/next (8c9374068ef6 misc: atmel_tclib: Do not probe already used TCBs)
> Merging edac-amd/for-next (8de9930a4618 Revert "EDAC/amd64: Support more than two controllers for chip select handling")
> Merging irqchip/irq/irqchip-next (16e32c3cde77 iommu/dma-iommu: Remove iommu_dma_map_msi_msg())
> Merging ftrace/for-next (693713cbdb3a x86: Hide the int3_emulate_call/jmp functions from UML)
> Merging rcu/rcu/next (91df49e187c1 Merge LKMM and RCU commits)
> Merging kvm/linux-next (dd53f6102c30 Merge tag 'kvmarm-for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
> CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/dirty_log_test.c
> CONFLICT (content): Merge conflict in arch/x86/kvm/paging_tmpl.h
> CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt
> Merging kvm-arm/next (9eecfc22e0bf KVM: arm64: Fix ptrauth ID register masking logic)
> Merging kvm-ppc/kvm-ppc-next (4894fbcce856 KVM: PPC: Book3S: Remove useless checks in 'release' method of KVM device)
> Merging kvms390/next (b2d0371d2e37 KVM: s390: vsie: Return correct values for Invalid CRYCB format)
> Merging xen-tip/linux-next (fe846979d305 xen/arm: Use p2m entry with lock protection)
> Merging percpu/for-next (558ac86039fc Merge branch 'for-5.3' into for-next)
> Merging workqueues/for-next (24acfb718225 workqueue: Use normal rcu)
> Merging drivers-x86/for-next (6456fd731517 platform/x86: Add support for Basin Cove power button)
> Merging chrome-platform/for-next (1690e1728451 platform/chrome: Add ChromeOS EC ISHTP driver)
> Merging hsi/for-next (1ff85bfa1614 HSI: omap_ssi_port: fix debugfs_simple_attr.cocci warnings)
> Merging leds/for-next (0db37915d912 leds: avoid races with workqueue)
> Merging ipmi/for-next (a2d635decbfa Merge tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm)
> Merging driver-core/driver-core-next (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
> Merging usb/usb-next (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
> Merging usb-gadget/next (2e487d280525 usb: dwc3: Rename DWC3_DCTL_LPM_ERRATA)
> Merging usb-serial/usb-next (7f6fc50242d1 USB: serial: f81232: implement break control)
> Merging usb-chipidea-next/ci-for-usb-next (bc65fae4b1f0 usb: chipidea: imx: set power polarity)
> Merging phy-next/next (708310711e6c dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy)
> Merging tty/tty-next (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
> Merging char-misc/char-misc-next (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
> Merging extcon/extcon-next (00053de52231 extcon: arizona: Disable mic detect if running when driver is removed)
> Merging soundwire/next (4abbd783d126 soundwire: intel: fix implicit header use of module.h/export.h)
> Merging thunderbolt/next (37209783c73a thunderbolt: Make priority unsigned in struct tb_path)
> Merging staging/staging-next (8c05f3b965da Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm)
> Merging mux/for-next (561eb7335f13 Merge branch 'i2c-mux/for-next' into for-next)
> Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE)
> Merging slave-dma/next (f33e7bb3eb92 dmaengine: tegra210-adma: restore channel status)
> Merging cgroup/for-next (05b289263772 signal: unconditionally leave the frozen state in ptrace_stop())
> Merging scsi/for-next (faec2dda93d3 Merge branch 'misc' into for-next)
> Merging scsi-mkp/for-next (d4023db71108 scsi: qla2xxx: Avoid that lockdep complains about unsafe locking in tcm_qla2xxx_close_session())
> Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
> Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1)
> Merging vhost/linux-next (82c80f76e9da virtio: Fix indentation of VIRTIO_MMIO)
> CONFLICT (content): Merge conflict in drivers/pci/of.c
> Merging rpmsg/for-next (6e9b4f32f9fa Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
> Merging gpio/for-next (0fbee1df2078 gpio: Update documentation)
> Merging gpio-brgl/gpio/for-next (b0d2569d8276 gpio: mlxbf: remove unused including <linux/version.h>)
> Merging pinctrl/for-next (e0e31695b53b pinctrl: mcp23s08: Do not complain about unsupported params)
> Merging pinctrl-samsung/for-next (9e98c678c2d6 Linux 5.1-rc1)
> Merging pwm/for-next (f41efceb46e6 pwm: meson: Add clock source configuration for Meson G12A)
> Merging userns/for-next (cf43a757fd49 signal: Restore the stop PTRACE_EVENT_EXIT)
> Merging ktest/for-next (d20f6b41b7c2 ktest: update sample.conf for grub2bls)
> Merging random/dev (b7d5dc21072c random: add a spinlock_t to struct batched_entropy)
> Merging kselftest/next (61c2018c0743 selftests: avoid KBUILD_OUTPUT dir cluttering with selftest objects)
> CONFLICT (content): Merge conflict in tools/testing/selftests/rseq/rseq-s390.h
> Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI)
> Merging livepatching/for-next (591be2f7f7b5 Merge branch 'for-5.2/core' into for-next)
> Merging coresight/next (78e6427b4e7b coresight: funnel: Support static funnel)
> Merging rtc/rtc-next (dacb6a4035a0 rtc: snvs: Use __maybe_unused instead of #if CONFIG_PM_SLEEP)
> Merging nvdimm/libnvdimm-for-next (1ffc664f9b8c Merge branch 'for-5.1/dax' into libnvdimm-for-next)
> CONFLICT (content): Merge conflict in fs/dax.c
> Merging at24/at24/for-next (d333bad1f6f3 dt-bindings: at24: add Renesas R1EX24016)
> Merging ntb/ntb-next (6202b3c150bc NTB: ntb_test: Fix bug when counting remote files)
> Merging kspp/for-next/kspp (259799ea5a9a gcc-plugins: arm_ssp_per_task_plugin: Fix for older GCC < 6)
> Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
> Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
> Merging gnss/gnss-next (7cc10c5cb143 gnss: ubx: add u-blox,neo-6m compatible)
> Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header)
> Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
> Merging slimbus/for-next (80471330ec58 slimbus: fix a NULL pointer dereference in of_qcom_slim_ngd_register)
> Merging nvmem/for-next (889ba60c36ce nvmem: core: add NVMEM_SYSFS Kconfig)
> Merging xarray/xarray (dd12805ed1db XArray: Remove radix tree compatibility)
> Merging hyperv/hyperv-next (a3fb7bf369ef drivers: input: serio: Add a module desription to the hyperv_keyboard driver)
> Merging auxdisplay/auxdisplay (cc5d04d840d6 auxdisplay: charlcd: make backlight initial state configurable)
> Merging kgdb-dt/kgdb/for-next (ca976bfb3154 kdb: Fix bound check compiler warning)
> Merging pidfd/for-next (2d383e614b17 pidfd: add polling selftests)
> Merging devfreq/for-next (cf451adfa392 PM / devfreq: add tracing for scheduling work)
> Merging akpm-current/current (a21b4ccc1491 scripts/gdb: add hlist utilities)
> CONFLICT (content): Merge conflict in include/linux/pid.h
> $ git checkout -b akpm remotes/origin/akpm/master
> Applying: pinctrl: fix pxa2xx.c build warnings
> Applying: mm, memcg: consider subtrees in memory.events
> Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
> Merging akpm/master (bfc7ef6ead0e drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)

linux-next: Tree for May 17

[Stephen Rothwell]

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

Hi all,

Please do not add any v5.3 material to your linux-next included
trees/branches until after v5.2-rc1 has been released.

Changes since 20190516:

The kvm tree gained conflicts against Linus' tree.

Non-merge commits (relative to Linus' tree): 1023
 1119 files changed, 27058 insertions(+), 7629 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 298 trees (counting Linus' and 69 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 (01be377c6221 Merge tag 'media/v5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging fixes/master (2bbacd1a9278 Merge tag 'kconfig-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging kspp-gustavo/for-next/kspp (ccaa75187a5f memstick: mark expected switch fall-throughs)
Merging kbuild-current/fixes (a2d635decbfa Merge tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm)
Merging arc-current/for-curr (308a06dc72c0 ARC: mm: do_page_fault refactor #8: release mmap_sem sooner)
Merging arm-current/fixes (e17b1af96b2a ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache)
Merging arm64-fixes/for-next/fixes (7a0a93c51799 arm64: vdso: Explicitly add build-id option)
Merging m68k-current/for-linus (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping)
Merging powerpc-fixes/fixes (12f363511d47 powerpc/32s: Fix BATs setting with CONFIG_STRICT_KERNEL_RWX)
Merging sparc/master (63863ee8e2f6 Merge tag 'gcc-plugins-v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (510e2ceda031 ipv6: fix src addr routing with the exception table)
Merging bpf/master (d72386fe7a84 libbpf: move logging helpers into libbpf_internal.h)
Merging ipsec/master (9b3040a6aafd ipv4: Define __ipv4_neigh_lookup_noref when CONFIG_INET is disabled)
Merging netfilter/master (d4c26eb6e721 net: ethernet: stmmac: dwmac-sun8i: enable support of unicast filtering)
Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects)
Merging wireless-drivers/master (7a0f8ad5ff63 Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging mac80211/master (933b40530b4b mac80211: remove set but not used variable 'old')
Merging rdma-fixes/for-rc (2557fabd6e29 RDMA/hns: Bugfix for mapping user db)
Merging sound-current/for-linus (56df90b631fc ALSA: hda/realtek - Fix for Lenovo B50-70 inverted internal microphone bug)
Merging sound-asoc-fixes/for-linus (81566b4cbc5d Merge branch 'asoc-5.1' into asoc-linus)
Merging regmap-fixes/for-linus (1d6106cafb37 Merge branch 'regmap-5.1' into regmap-linus)
Merging regulator-fixes/for-linus (0d183fc1760f Merge branch 'regulator-5.1' into regulator-linus)
Merging spi-fixes/for-linus (72e3b3285a43 Merge branch 'spi-5.1' into spi-linus)
Merging pci-current/for-linus (9c9c5fc89b09 PCI/LINK: Add Kconfig option (default off))
Merging driver-core.current/driver-core-linus (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
Merging tty.current/tty-linus (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
Merging usb.current/usb-linus (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
Merging usb-gadget-fixes/fixes (072684e8c58d USB: gadget: f_hid: fix deadlock in f_hidg_write())
Merging usb-serial-fixes/usb-linus (79a3aaa7b82e Linux 5.1-rc3)
Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer)
Merging phy/fixes (e6f32efb1b12 phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode)
Merging staging.current/staging-linus (8c05f3b965da Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm)
Merging char-misc.current/char-misc-linus (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
Merging thunderbolt-fixes/fixes (e93c9c99a629 Linux 5.1)
Merging input-current/for-linus (145b11d1baa3 Input: elan_i2c - increment wakeup count if wake source)
Merging crypto-current/master (cbc22b062106 Revert "crypto: caam/jr - Remove extra memory barrier during job ring dequeue")
Merging ide/master (b970afcfcabd Merge tag 'powerpc-5.2-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
Merging vfio-fixes/for-linus (492855939bdb vfio/type1: Limit DMA mappings per container)
Merging kselftest-fixes/fixes (15ade5d2e777 Linux 5.1-rc4)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
Merging slave-dma-fixes/fixes (37624b58542f Linux 5.1-rc7)
Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1)
Merging mtd-fixes/mtd/fixes (9a8f612ca0d6 mtd: rawnand: marvell: Clean the controller state before each operation)
Merging mfd-fixes/for-mfd-fixes (e93c9c99a629 Linux 5.1)
Merging v4l-dvb-fixes/fixes (fc8670d1f72b media: rockchip/vpu: Fix/re-order probe-error/remove path)
Merging reset-fixes/reset/fixes (d5d4218e1669 reset: remove redundant null check on pointer dev)
Merging mips-fixes/mips-fixes (a1e8783db8e0 MIPS: perf: ath79: Fix perfcount IRQ assignment)
Merging at91-fixes/at91-fixes (ba5e60c9b75d arm/mach-at91/pm : fix possible object reference leak)
Merging omap-fixes/fixes (1ba12322e2f0 Merge branch 'am5-sdio-fixes' into fixes)
Merging kvm-fixes/master (e8ab8d24b488 KVM: nVMX: Fix size checks in vmx_set_nested_state)
Merging kvms390-fixes/master (b10bd9a256ae s390: vsie: Use effective CRYCBD.31 to check CRYCBD validity)
Merging hwmon-fixes/hwmon (b88c5049219a hwmon: (occ) Fix extended status bits)
Merging nvdimm-fixes/libnvdimm-fixes (c4703ce11c23 libnvdimm/namespace: Fix label tracking error)
Merging btrfs-fixes/next-fixes (4792878ab434 Merge branch 'misc-5.2' into next-fixes)
Merging vfs-fixes/fixes (05883eee857e do_move_mount(): fix an unsafe use of is_anon_ns())
Merging dma-mapping-fixes/for-linus (8c5165430c01 dma-debug: only skip one stackframe entry)
Merging i3c-fixes/master (709a53e19484 MAINTAINERS: Fix the I3C entry)
Merging drivers-x86-fixes/fixes (e93c9c99a629 Linux 5.1)
Merging samsung-krzk-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (9e98c678c2d6 Linux 5.1-rc1)
Merging devicetree-fixes/dt/linus (e10e55e9d933 dt-bindings: sifive: describe sifive-blocks versioning)
Merging scsi-fixes/fixes (f4cefcd67067 scsi: bnx2fc: fix incorrect cast to u64 on shift operation)
Merging drm-fixes/drm-fixes (e93c9c99a629 Linux 5.1)
Merging amdgpu-fixes/drm-fixes (f7b1844bacec drm/amdgpu: Update gc golden setting for vega family)
Merging drm-intel-fixes/for-linux-next-fixes (f5c58ba18ab8 drm/i915: Restore correct bxt_ddi_phy_calc_lane_lat_optim_mask() calculation)
Merging mmc-fixes/fixes (ec0970e0a1b2 mmc: sdhci-iproc: Set NO_HISPD bit to fix HS50 data hold time problem)
Merging rtc-fixes/rtc-fixes (882c5e552ffd rtc: da9063: set uie_unsupported when relevant)
Merging gnss-fixes/gnss-linus (79a3aaa7b82e Linux 5.1-rc3)
Merging hyperv-fixes/hyperv-fixes (69c8caafb72d hv: tools: fixed Python pep8/flake8 warnings for lsvmbus)
Merging drm-misc-fixes/for-linux-next-fixes (ab042b824c11 Revert "drm/qxl: drop prime import/export callbacks")
Merging kbuild/for-next (f9d7adc7b0d6 kbuild: remove 'addtree' and 'flags' magic for header search paths)
Merging compiler-attributes/compiler-attributes (a3b22b9f11d9 Linux 5.0-rc7)
Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
Merging dma-mapping/for-next (13bf5ced9377 dma-mapping: add a Kconfig symbol to indicate arch_dma_prep_coherent presence)
Merging asm-generic/master (6edd1dbace0e asm-generic: optimize generic uaccess for 8-byte loads and stores)
Merging arc/for-next (5908e6b738e3 Linux 5.0-rc8)
Merging arm/for-next (d486065b35e4 Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (6127bf372add Merge branch 'for-next/mmiowb' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core)
Merging arm-perf/for-next/perf (9bcb929f969e perf/arm-ccn: Clean up CPU hotplug handling)
Merging arm-soc/for-next (7ad1b252cabe ARM: Document merges)
Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
Merging amlogic/for-next (68a837de19ed Merge branch 'v5.2/fixes' into tmp/aml-rebuild)
Merging aspeed/for-next (e15425214990 ARM: dts: aspeed: quanta-q71l: enable uart1)
Merging at91/at91-next (ac650130c227 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
Merging bcm2835/for-next (1ee128f4fff2 Merge branch 'bcm2835-drivers-next' into for-next)
Merging imx-mxs/for-next (d9c3322a2906 Merge branch 'imx/defconfig' into for-next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging keystone/next (3c3a43c81bda Merge branch 'for_5.1/soc-drivers' into next)
Merging mediatek/for-next (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next)
Merging mvebu/for-next (891f0f865c37 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (481df0abf8cf Merge branch 'omap-for-v5.2/ti-sysc' into for-next)
Merging reset/reset/next (21a5d26b8164 reset: Switch to SPDX license identifier for reset-simple)
Merging qcom/for-next (1d31c0b1a28a Merge tag 'qcom-arm64-for-5.2-1' into really-done-for-5.2)
Merging renesas/next (982700f80241 Merge branch 'arm-dt-for-v5.2' into next)
Merging rockchip/for-next (9c539071723e Merge branch 'v5.2-clk/next' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (831c75782772 Merge branch 'next/dt64' into for-next)
Merging sunxi/sunxi/for-next (613c4ce8fddb Merge branch 'sunxi/dt-for-5.2' into sunxi/for-next)
Merging tegra/for-next (0c0ffecf65fd Merge branch for-5.2/arm64/defconfig into for-next)
Merging clk/clk-next (62e59c4e69b3 clk: Remove io.h from clk-provider.h)
Merging clk-samsung/for-next (3c297d9e65d8 clk: samsung: exynos5410: Add gate clock for ADC)
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 (d2adb7b6249a csky: Select intc & timer drivers)
Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration of pcibios_penalize_isa_irq)
Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files)
Merging m68k/for-next (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping)
Merging m68knommu/for-next (37624b58542f Linux 5.1-rc7)
Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions)
Merging mips/mips-next (b1e479e3dcbc MIPS: Alchemy: add DMA masks for on-chip ethernet)
CONFLICT (content): Merge conflict in arch/mips/sgi-ip27/ip27-irq.c
Merging nds32/next (af9abd65983c nds32: Fix vDSO clock_getres())
Merging nios2/for-next (21e6bff5e0ef nios2: Fix update_mmu_cache preload the TLB with the new PTE)
Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32)
Merging parisc-hd/for-next (4d658e1524ee parisc: Allow building 64-bit kernel without -mlong-calls compiler option)
Merging powerpc/next (8150a153c013 powerpc/64s: Use early_mmu_has_feature() in set_kuap())
Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask")
Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging risc-v/for-next (81eba518d95f RISC-V: sifive_l2_cache: Add L2 cache controller driver for SiFive SoCs)
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 (f3e20ad67b4c s390: move arch/s390/defconfig to arch/s390/configs/defconfig)
Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
Merging uml/linux-next (1987b1b8f9f1 um: irq: don't set the chip for all irqs)
Merging xtensa/xtensa-for-next (0542593fff0f Merge branch 'xtensa-for-next' into xtensa-5.2-fixes)
Merging fscrypt/master (2c58d548f570 fscrypt: cache decrypted symlink target in ->i_link)
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
Merging btrfs/next (29dcea88779c Linux 4.17)
Merging btrfs-kdave/for-next (6fc9f4e59957 Merge branch 'for-next-current-v5.1-20190509' into for-next-20190509)
Merging ceph/master (00abf69dd24f ceph: flush dirty inodes before proceeding with remount)
Merging cifs/for-next (dece44e381ab cifs: add support for SEEK_DATA and SEEK_HOLE)
Merging configfs/for-next (35399f87e271 configfs: fix possible use-after-free in configfs_register_group)
Merging ecryptfs/next (d43388dea04b eCryptfs: fix permission denied with ecryptfs_xattr mount option when create readonly file)
Merging ext3/for_next (91e9f2c1d861 Merge quota fix from Chengguang.)
Merging ext4/dev (0c72924ef346 ext4: fix block validity checks for journal inodes using indirect blocks)
Merging f2fs/dev (e0654264c480 Merge tag 'backlight-next-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight)
Merging fuse/for-next (9031a69cf9f0 fuse: clean up fuse_alloc_inode)
Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
Merging nfs/linux-next (d7a02fa0a8f9 Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs)
Merging nfs-anna/linux-next (5940d1cf9f42 SUNRPC: Rebalance a kref in auth_gss.c)
Merging nfsd/nfsd-next (1c73b9d24f80 nfsd: update callback done processing)
Merging orangefs/for-next (33713cd09ccd orangefs: truncate before updating size)
Merging overlayfs/overlayfs-next (acf3062a7e1c ovl: relax WARN_ON() for overlapping layers use case)
Merging ubifs/linux-next (c16e73587ad6 ubifs: Don't leak orphans on memory during commit)
Merging v9fs/9p-next (80a316ff1627 9p/xen: Add cleanup path in p9_trans_xen_init)
Merging xfs/for-next (8869a2d297cb Merge remote-tracking branch 'korg/iomap-5.2-merge' into for-next)
Merging file-locks/locks-next (945ab8f6de94 locks: wake any locks blocked on request before deadlock check)
Merging vfs/for-next (6e14c3cf8bc4 Merge branch 'work.icache' into for-next)
CONFLICT (content): Merge conflict in Documentation/filesystems/porting
Merging printk/for-next (967aa2217b6d Merge branch 'for-5.2-fixes' into for-next)
Merging pci/next (c7a1c2bbb65e Merge branch 'pci/trivial')
Merging pstore/for-next/pstore (0be6a6927254 pstore/ram: Improve backward compatibility with older Chromebooks)
Merging hid/for-next (eb18d1215405 Merge branch 'for-5.2/logitech' into for-next)
Merging i2c/i2c/for-next (8d1d950a6072 Merge branch 'i2c/for-5.2' into i2c/for-next)
Merging i3c/i3c/next (476c7e1d34f2 i3c: Fix a shift wrap bug in i3c_bus_set_addr_slot_status())
Merging dmi/master (57361846b52b Linux 4.19-rc2)
Merging hwmon-staging/hwmon-next (39abe9d88b30 hwmon: (lm75) Add support for TMP75B)
Merging jc_docs/docs-next (afbd4d42470e Merge branch 'x86' into docs-next)
Merging v4l-dvb/master (fc8670d1f72b media: rockchip/vpu: Fix/re-order probe-error/remove path)
Merging v4l-dvb-next/master (a455eda33faa Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal)
Merging fbdev/fbdev-for-next (d4a5611743a6 video: fbdev: Use dev_get_drvdata())
Merging pm/linux-next (03216f1a350e Merge branch 'acpi-pm' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (8db82563451f cpufreq: armada-37xx: fix frequency calculation for opp)
Merging cpupower/cpupower (21027e78e7c1 cpupower: correct spelling of interval)
Merging opp/opp/linux-next (2f36bde0fc8f OPP: Introduce dev_pm_opp_find_freq_ceil_by_volt())
Merging thermal/next (6df24c3e81b9 Merge branches 'thermal-core', 'thermal-built-it' and 'thermal-intel' into next)
Merging thermal-soc/next (37bcec5d9f71 hwmon: (pwm-fan) Use devm_thermal_of_cooling_device_register)
Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs)
Merging dlm/next (54cca4bad076 dlm: allow binding to all network interfaces)
Merging swiotlb/linux-next (063b8271ec8f swiotlb-xen: ensure we have a single callsite for xen_dma_map_page)
Merging rdma/for-next (c191f93454bc net/mlx5: Set completion EQs as shared resources)
Merging net-next/master (35c99ffa20ed Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
Merging bpf-next/master (35c99ffa20ed Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
Merging ipsec-next/master (601e6bcc4ef0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging mlx5-next/mlx5-next (91a40a48d52d net/mlx5: Fix broken hca cap offset)
Merging netfilter-next/master (601e6bcc4ef0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
Merging ipvs-next/master (e2f7cc72cbf4 netfilter: conntrack: fix bogus port values for other l4 protocols)
Merging wireless-drivers-next/master (f9b628d61fae rtw88: add license for Makefile)
Merging bluetooth/master (62a91990f4c5 Bluetooth: hci_qca: Rename STATE_<flags> to QCA_<flags>)
Merging mac80211-next/master (80f232121b69 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
Merging gfs2/for-next (fbcde197e1be gfs2: Fix error path kobject memory leak)
Merging mtd/mtd/next (3008ba870938 mtd: part: fix incorrect format specifier for an unsigned long long)
Merging nand/nand/next (1c14fe2167ef mtd: nandsim: switch to exec_op interface)
Merging spi-nor/spi-nor/next (e43f53c22a93 spi-nor: intel-spi: Add support for Intel Comet Lake SPI serial flash)
Merging crypto/master (e59f755ceb6d crypto: ccree - use a proper le32 type for le32 val)
Merging drm/drm-next (8da0e1525b7f Merge tag 'drm-misc-next-fixes-2019-05-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
Merging amdgpu/drm-next (af6a5febf001 drm/amd/powerplay: Fix maybe-uninitialized in get_ppfeature_status)
Merging drm-intel/for-linux-next (c36beba6b296 drm/i915: Seal races between async GPU cancellation, retirement and signaling)
Merging drm-tegra/drm/tegra/for-next (61b51fb51c01 drm/tegra: gem: Fix CPU-cache maintenance for BO's allocated using get_pages())
Merging drm-misc/for-linux-next (51a0d1a90bff drm/sun4i: sun6i_mipi_dsi: Fix hsync_porch overflow)
Merging drm-msm/msm-next (b02872df58ac drm/msm/a6xx: Don't enable GPU state code if dependencies are missing)
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
Merging mali-dp/for-upstream/mali-dp (15e9122d9b5c drm/komeda: Mark the local functions as static)
Merging imx-drm/imx-drm/next (5d5fe9970c76 drm/imx: enable IDMAC watermark feature)
Merging etnaviv/etnaviv/next (2b76f5be7c27 drm/etnaviv: initialize idle mask before querying the HW db)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (a136e5257f67 Merge branch 'regmap-5.2' into regmap-next)
Merging sound/for-next (56df90b631fc ALSA: hda/realtek - Fix for Lenovo B50-70 inverted internal microphone bug)
Merging sound-asoc/for-next (78c1aaab61fa Merge branch 'asoc-5.2' into asoc-next)
Merging modules/modules-next (dadec066d8fa module: add stubs for within_module functions)
Merging input/next (b283d0c353de Input: eeti_ts -  read hardware state once after wakeup)
Merging block/for-next (e35d0b782065 Merge branch 'for-5.2/block-post' into for-next)
Merging device-mapper/for-next (8454fca4f53b dm: fix a couple brace coding style issues)
Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
Merging mmc/next (0a49a619e7e1 mmc: sdhci-pci: Fix BYT OCP setting)
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 (ed835136ee67 mfd: Use dev_get_drvdata() directly)
Merging backlight/for-backlight-next (53fa0f87177d backlight: lm3630a: Add firmware node support)
Merging battery/for-next (baf5964ecfe1 power: supply: olpc_battery: force the le/be casts)
Merging regulator/for-next (16f26207b3b1 Merge branch 'regulator-5.2' into regulator-next)
Merging security/next-testing (5664f5faac11 Merge branch 'next-smack' into next-testing)
Merging apparmor/apparmor-next (06c13f554a71 apparmor: re-introduce a variant of PROFILE_MEDIATES_SAFE)
Merging integrity/next-integrity (a2ffe5774e8e selftests/kexec: update get_secureboot_mode)
Merging selinux/next (35a196bef449 proc: prevent changes to overridden credentials)
Merging tpmdd/next (ff89e2f4b34d tpm: Actually fail on TPM errors during "get random")
Merging watchdog/master (a9f0bda567e3 watchdog: Enforce that at least one pretimeout governor is enabled)
Merging iommu/next (b5531563e8a0 Merge branches 'arm/tegra', 'arm/mediatek', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
Merging vfio/next (15c80c1659f2 vfio: Add Cornelia Huck as reviewer)
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
Merging audit/next (70c4cf17e445 audit: fix a memory leak bug)
Merging devicetree/for-next (2a656cb5a4a3 of: unittest: Remove error printing on OOM)
Merging mailbox/mailbox-for-next (8fbbfd966efa mailbox: Add support for Armada 37xx rWTM mailbox)
Merging spi/for-next (aa459d194583 Merge remote-tracking branch 'spi/topic/bpw-check' into spi-next)
Merging tip/auto-latest (09feda54b176 Merge branch 'core/mm')
Merging clockevents/clockevents/next (8c9374068ef6 misc: atmel_tclib: Do not probe already used TCBs)
Merging edac-amd/for-next (8de9930a4618 Revert "EDAC/amd64: Support more than two controllers for chip select handling")
Merging irqchip/irq/irqchip-next (16e32c3cde77 iommu/dma-iommu: Remove iommu_dma_map_msi_msg())
Merging ftrace/for-next (693713cbdb3a x86: Hide the int3_emulate_call/jmp functions from UML)
Merging rcu/rcu/next (91df49e187c1 Merge LKMM and RCU commits)
Merging kvm/linux-next (dd53f6102c30 Merge tag 'kvmarm-for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/dirty_log_test.c
CONFLICT (content): Merge conflict in arch/x86/kvm/paging_tmpl.h
CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt
Merging kvm-arm/next (9eecfc22e0bf KVM: arm64: Fix ptrauth ID register masking logic)
Merging kvm-ppc/kvm-ppc-next (4894fbcce856 KVM: PPC: Book3S: Remove useless checks in 'release' method of KVM device)
Merging kvms390/next (b2d0371d2e37 KVM: s390: vsie: Return correct values for Invalid CRYCB format)
Merging xen-tip/linux-next (fe846979d305 xen/arm: Use p2m entry with lock protection)
Merging percpu/for-next (558ac86039fc Merge branch 'for-5.3' into for-next)
Merging workqueues/for-next (24acfb718225 workqueue: Use normal rcu)
Merging drivers-x86/for-next (6456fd731517 platform/x86: Add support for Basin Cove power button)
Merging chrome-platform/for-next (1690e1728451 platform/chrome: Add ChromeOS EC ISHTP driver)
Merging hsi/for-next (1ff85bfa1614 HSI: omap_ssi_port: fix debugfs_simple_attr.cocci warnings)
Merging leds/for-next (0db37915d912 leds: avoid races with workqueue)
Merging ipmi/for-next (a2d635decbfa Merge tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm)
Merging driver-core/driver-core-next (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
Merging usb/usb-next (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
Merging usb-gadget/next (2e487d280525 usb: dwc3: Rename DWC3_DCTL_LPM_ERRATA)
Merging usb-serial/usb-next (7f6fc50242d1 USB: serial: f81232: implement break control)
Merging usb-chipidea-next/ci-for-usb-next (bc65fae4b1f0 usb: chipidea: imx: set power polarity)
Merging phy-next/next (708310711e6c dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy)
Merging tty/tty-next (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
Merging char-misc/char-misc-next (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
Merging extcon/extcon-next (00053de52231 extcon: arizona: Disable mic detect if running when driver is removed)
Merging soundwire/next (4abbd783d126 soundwire: intel: fix implicit header use of module.h/export.h)
Merging thunderbolt/next (37209783c73a thunderbolt: Make priority unsigned in struct tb_path)
Merging staging/staging-next (8c05f3b965da Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm)
Merging mux/for-next (561eb7335f13 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE)
Merging slave-dma/next (f33e7bb3eb92 dmaengine: tegra210-adma: restore channel status)
Merging cgroup/for-next (05b289263772 signal: unconditionally leave the frozen state in ptrace_stop())
Merging scsi/for-next (faec2dda93d3 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (d4023db71108 scsi: qla2xxx: Avoid that lockdep complains about unsafe locking in tcm_qla2xxx_close_session())
Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1)
Merging vhost/linux-next (82c80f76e9da virtio: Fix indentation of VIRTIO_MMIO)
CONFLICT (content): Merge conflict in drivers/pci/of.c
Merging rpmsg/for-next (6e9b4f32f9fa Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0fbee1df2078 gpio: Update documentation)
Merging gpio-brgl/gpio/for-next (b0d2569d8276 gpio: mlxbf: remove unused including <linux/version.h>)
Merging pinctrl/for-next (e0e31695b53b pinctrl: mcp23s08: Do not complain about unsupported params)
Merging pinctrl-samsung/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging pwm/for-next (f41efceb46e6 pwm: meson: Add clock source configuration for Meson G12A)
Merging userns/for-next (cf43a757fd49 signal: Restore the stop PTRACE_EVENT_EXIT)
Merging ktest/for-next (d20f6b41b7c2 ktest: update sample.conf for grub2bls)
Merging random/dev (b7d5dc21072c random: add a spinlock_t to struct batched_entropy)
Merging kselftest/next (61c2018c0743 selftests: avoid KBUILD_OUTPUT dir cluttering with selftest objects)
CONFLICT (content): Merge conflict in tools/testing/selftests/rseq/rseq-s390.h
Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI)
Merging livepatching/for-next (591be2f7f7b5 Merge branch 'for-5.2/core' into for-next)
Merging coresight/next (78e6427b4e7b coresight: funnel: Support static funnel)
Merging rtc/rtc-next (dacb6a4035a0 rtc: snvs: Use __maybe_unused instead of #if CONFIG_PM_SLEEP)
Merging nvdimm/libnvdimm-for-next (1ffc664f9b8c Merge branch 'for-5.1/dax' into libnvdimm-for-next)
CONFLICT (content): Merge conflict in fs/dax.c
Merging at24/at24/for-next (d333bad1f6f3 dt-bindings: at24: add Renesas R1EX24016)
Merging ntb/ntb-next (6202b3c150bc NTB: ntb_test: Fix bug when counting remote files)
Merging kspp/for-next/kspp (259799ea5a9a gcc-plugins: arm_ssp_per_task_plugin: Fix for older GCC < 6)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (7cc10c5cb143 gnss: ubx: add u-blox,neo-6m compatible)
Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header)
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
Merging slimbus/for-next (80471330ec58 slimbus: fix a NULL pointer dereference in of_qcom_slim_ngd_register)
Merging nvmem/for-next (889ba60c36ce nvmem: core: add NVMEM_SYSFS Kconfig)
Merging xarray/xarray (dd12805ed1db XArray: Remove radix tree compatibility)
Merging hyperv/hyperv-next (a3fb7bf369ef drivers: input: serio: Add a module desription to the hyperv_keyboard driver)
Merging auxdisplay/auxdisplay (cc5d04d840d6 auxdisplay: charlcd: make backlight initial state configurable)
Merging kgdb-dt/kgdb/for-next (ca976bfb3154 kdb: Fix bound check compiler warning)
Merging pidfd/for-next (2d383e614b17 pidfd: add polling selftests)
Merging devfreq/for-next (cf451adfa392 PM / devfreq: add tracing for scheduling work)
Merging akpm-current/current (a21b4ccc1491 scripts/gdb: add hlist utilities)
CONFLICT (content): Merge conflict in include/linux/pid.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: pinctrl: fix pxa2xx.c build warnings
Applying: mm, memcg: consider subtrees in memory.events
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (bfc7ef6ead0e drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)

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

Re: linux-next: Tree for May 17

[Mark Brown]

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

On Tue, May 22, 2018 at 03:18:43PM +0100, Mark Brown wrote:
> On Thu, May 17, 2018 at 05:06:56PM +1000, Stephen Rothwell wrote:
> 
> > News: I will not be doing any linux-next releases between Friday 18 May
> > and Friday 25 May inclusive.
> 
> Just noticed this, I'm going to try to cover starting tomorrow.  The
> usual caveats about reduced service and reliability apply.

This isn't going to happen for today, I ran into some scripting/infrastructure
issues which effectively delayed the start of the build by about six
hours.  Those are fixed now so fingers crossed things should be fine
tomorrow, I'll let the build run for a while longer today and report any
further issues but there won't be a tree.

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

Re: linux-next: Tree for May 17

[Mark Brown]

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

On Thu, May 17, 2018 at 05:06:56PM +1000, Stephen Rothwell wrote:

> News: I will not be doing any linux-next releases between Friday 18 May
> and Friday 25 May inclusive.

Just noticed this, I'm going to try to cover starting tomorrow.  The
usual caveats about reduced service and reliability apply.

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

Re: linux-next: Tree for May 17

[Naresh Kamboju]

On 17 May 2018 at 12:36, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> News: I will not be doing any linux-next releases between Friday 18 May
> and Friday 25 May inclusive.
>
> Changes since 20180516:
>
> New trees: devicetree-fixes
>
> The kbuild tree still had its build failure for which I applied a patch.
>
> The mvebu tree gained a conflict against the arm-soc tree.
>
> The renesas tree gained conflicts against the mvebu tree.
>
> The net-next tree gained a conflict against the vfs tree.
>
> The drm tree still had its build failure for which I applied a patch.
>
> The usb-gadget tree gained a conflict against the usb tree.
>
> The staging tree gained a conflict against the v4l-dvb tree.
>
> The akpm tree gained a conflict against the vfs tree.
>
> Non-merge commits (relative to Linus' tree): 7398
>  7852 files changed, 294207 insertions(+), 302289 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).

Linux-20180517 - arm64 build failed.
Build failed for HiKey, Juno and dragonboard 410c.

Build failed log:
---------------------
  CC [M]  drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.o
drivers/gpu/drm/rcar-du/rcar_du_vsp.c: In function
 'rcar_du_vsp_plane_atomic_duplicate_state':
drivers/gpu/drm/rcar-du/rcar_du_vsp.c:325:6: error:
 'struct rcar_du_vsp_plane_state' has no member named 'alpha'
  copy->alpha = to_rcar_vsp_plane_state(plane->state)->alpha;
      ^~
drivers/gpu/drm/rcar-du/rcar_du_vsp.c:325:53: error:
 'struct rcar_du_vsp_plane_state' has no member named 'alpha'
  copy->alpha = to_rcar_vsp_plane_state(plane->state)->alpha;
                                                     ^~
scripts/Makefile.build:311: recipe for target
 'drivers/gpu/drm/rcar-du/rcar_du_vsp.o' failed
make[6]: *** [drivers/gpu/drm/rcar-du/rcar_du_vsp.o] Error 1
make[6]: *** Waiting for unfinished jobs....
  CC [M]  drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.o
  CC [M]  net/bluetooth/mgmt_util.o
scripts/Makefile.build:552: recipe for target 'drivers/gpu/drm/rcar-du' failed
make[5]: *** [drivers/gpu/drm/rcar-du] Error 2

Complete log link:
------------------------
https://ci.linaro.org/job/openembedded-lkft-linux-next/DISTRO=rpb,MACHINE=juno,label=docker-stretch-amd64/263/console

linux-next: Tree for May 17

[Stephen Rothwell]

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

Hi all,

News: I will not be doing any linux-next releases between Friday 18 May
and Friday 25 May inclusive.

Changes since 20180516:

New trees: devicetree-fixes

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

The mvebu tree gained a conflict against the arm-soc tree.

The renesas tree gained conflicts against the mvebu tree.

The net-next tree gained a conflict against the vfs tree.

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

The usb-gadget tree gained a conflict against the usb tree.

The staging tree gained a conflict against the v4l-dvb tree.

The akpm tree gained a conflict against the vfs tree.

Non-merge commits (relative to Linus' tree): 7398
 7852 files changed, 294207 insertions(+), 302289 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 277 trees (counting Linus' and 64 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 (21b9f1c7e319 Merge tag 'afs-fixes-20180514' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs)
Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging kbuild-current/fixes (75bc37fefc44 Linux 4.17-rc4)
Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4)
Merging arm-current/fixes (30cfae461581 ARM: replace unnecessary perl with sed and the shell $(( )) operator)
Merging arm64-fixes/for-next/fixes (0583a4ef0598 arm64: capabilities: Add NVIDIA Denver CPU to bp_harden list)
Merging m68k-current/for-linus (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment)
Merging powerpc-fixes/fixes (6c0a8f6b5a45 powerpc/pseries: Fix CONFIG_NUMA=n build)
Merging sparc/master (fff75eb2a08c Merge tag 'errseq-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (7063efd33bb1 tuntap: fix use after free during release)
Merging bpf/master (f3002c1374fb vmxnet3: use DMA memory barriers where required)
Merging ipsec/master (d9f92772e8ec xfrm6: avoid potential infinite loop in _decode_session6())
Merging netfilter/master (9d6b4bfb59a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
Merging ipvs/master (2f99aa31cd7a netfilter: nf_tables: skip synchronize_rcu if transaction log is empty)
Merging wireless-drivers/master (ebd27d3317c6 ssb: make SSB_PCICORE_HOSTMODE depend on SSB = y)
Merging mac80211/master (914eac248d87 mac80211: use timeout from the AddBA response instead of the request)
Merging rdma-fixes/for-rc (8e907ed48827 IB/umem: Use the correct mm during ib_umem_release)
Merging sound-current/for-linus (c99f0802e42f ALSA: usb-audio: Use Class Specific EP for UAC3 devices.)
Merging sound-asoc-fixes/for-linus (1ade2b2f9a3b Merge branch 'asoc-4.17' into asoc-linus)
Merging regmap-fixes/for-linus (e37563bb6c59 Merge tag 'for-4.17-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging regulator-fixes/for-linus (e37563bb6c59 Merge tag 'for-4.17-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging spi-fixes/for-linus (c3317999e7ff Merge branch 'spi-4.17' into spi-linus)
Merging pci-current/for-linus (0cf22d6b317c PCI: Add "PCIe" to pcie_print_link_status() messages)
Merging driver-core.current/driver-core-linus (6da6c0db5316 Linux v4.17-rc3)
Merging tty.current/tty-linus (6da6c0db5316 Linux v4.17-rc3)
Merging usb.current/usb-linus (c171654caa87 usbip: usbip_host: fix bad unlock balance during stub_probe())
Merging usb-gadget-fixes/fixes (ed769520727e usb: gadget: composite Allow for larger configuration descriptors)
Merging usb-serial-fixes/usb-linus (75bc37fefc44 Linux 4.17-rc4)
Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup)
Merging phy/fixes (60cc43fc8884 Linux 4.17-rc1)
Merging staging.current/staging-linus (9d569b1cf7a2 Merge tag 'iio-fixes-for-4.17a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (dd010bd7af62 thunderbolt: Handle NULL boot ACL entries properly)
Merging input-current/for-linus (f6eeb9e54857 Input: atmel_mxt_ts - add missing compatible strings to OF device table)
Merging crypto-current/master (eea0d3ea7546 crypto: drbg - set freed buffers to NULL)
Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time')
Merging vfio-fixes/for-linus (834814e80268 Revert: "vfio-pci: Mask INTx if a device is not capabable of enabling it")
Merging kselftest-fixes/fixes (75bc37fefc44 Linux 4.17-rc4)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
Merging slave-dma-fixes/fixes (613e0bb622e7 Revert "dmaengine: pl330: add DMA_PAUSE feature")
Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks)
Merging mtd-fixes/master (9f825e74d761 mtd: rawnand: Fix return type of __DIVIDE() when called with 32-bit)
Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check)
Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1)
Merging mfd-fixes/for-mfd-fixes (107b7d9fa94c mfd: rtsx: Release IRQ during shutdown)
Merging v4l-dvb-fixes/fixes (b84c8fdf8e6c media: uvcvideo: Prevent setting unavailable flags)
Merging reset-fixes/reset/fixes (e6914365fd28 reset: uniphier: fix USB clock line for LD20)
Merging mips-fixes/mips-fixes (9a3a92ccfe36 MIPS: Fix ptrace(2) PTRACE_PEEKUSR and PTRACE_POKEUSR accesses to o32 FGRs)
Merging omap-fixes/fixes (41bd6adf3c5d Revert "ARM: dts: logicpd-som-lv: Fix pinmux controller references")
Merging kvm-fixes/master (711702b57cc3 KVM: arm/arm64: VGIC/ITS save/restore: protect kvm_read_guest() calls)
Merging kvms390-fixes/master (f07afa0462b7 KVM: s390: fix memory overwrites when not using SCA entries)
Merging hwmon-fixes/hwmon (3b031622f598 hwmon: (k10temp) Use API function to access System Management Network)
Merging nvdimm-fixes/libnvdimm-fixes (75bc37fefc44 Linux 4.17-rc4)
Merging btrfs-fixes/next-fixes (35405bce77bc Merge branch 'misc-4.17' into next-fixes)
Merging vfs-fixes/fixes (36ba00bd932c nfsd: vfs_mkdir() might succeed leaving dentry negative unhashed)
Merging dma-mapping-fixes/for-linus (05e13bb57e6f swiotlb: silent unwanted warning "buffer is full")
Merging drivers-x86-fixes/fixes (7fe3fa3b5ec8 platform/x86: Kconfig: Fix dell-laptop dependency chain.)
Merging samsung-krzk-fixes/fixes (60cc43fc8884 Linux 4.17-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (60cc43fc8884 Linux 4.17-rc1)
Merging devicetree-fixes/dt/linus (f130307054a5 dt-bindings: panel: lvds: Fix path to display timing bindings)
Merging drm-intel-fixes/for-linux-next-fixes (b579f924a90f drm/i915/gen9: Add WaClearHIZ_WM_CHICKEN3 for bxt and glk)
Merging mmc-fixes/fixes (6d08b06e67cd Linux 4.17-rc2)
Merging rtc-fixes/rtc-fixes (60cc43fc8884 Linux 4.17-rc1)
Merging drm-misc-fixes/for-linux-next-fixes (2b6207291b7b drm/dumb-buffers: Integer overflow in drm_mode_create_ioctl())
Merging kbuild/for-next (2eb0d55f3627 powerpc: Allow LD_DEAD_CODE_DATA_ELIMINATION to be selected)
Applying: depmod.sh: fix syntax check and uage message
Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address)
Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
Merging dma-mapping/for-next (d0c8ba40c6cc swiotlb: update comments to refer to physical instead of virtual addresses)
Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers)
Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging arm/for-next (6dc8c9d147dd Merge branches 'fixes' and 'sa1100-for-next' into for-next)
Merging arm-perf/for-next/perf (44300aed5d28 perf: arm_spe: include linux/vmalloc.h for vmap())
Merging arm-soc/for-next (779254581405 ARM: Document merges)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig
Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into next)
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
Merging amlogic/for-next (9999d2013e27 Merge branch 'v4.18/defconfig' into tmp/aml-rebuild)
Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next)
Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into at91-next)
Merging bcm2835/for-next (5c483a0c319c Merge branch anholt/bcm2835-defconfig-64-next into for-next)
Merging imx-mxs/for-next (ba4e30d7475e Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (fb5d812c3cb3 Merge branch 'for_4.18/keystone-dts' into next)
Merging mediatek/for-next (9378b3427341 Merge branch 'v4.17-next/soc' into for-next)
Merging mvebu/for-next (4eddfe936555 Merge branch 'mvebu/dt64' into mvebu/for-next)
CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig
Merging omap/for-next (4a8358b16575 Merge branch 'omap-for-v4.18/dt' into for-next)
Merging reset/reset/next (d7bab65b1f57 reset: uniphier: add LD11/LD20 stream demux system reset control)
Merging qcom/for-next (33f38d6f2e8a Merge branch 'arm64-for-4.18' into all-for-4.18)
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
Merging renesas/next (ee65e4d8856c Merge branch 'arm64-dt-for-v4.18' into next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig
Merging rockchip/for-next (4c0d17bdf92a Merge branch 'v4.18-armsoc/dts64' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (0d261f171e6a Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (a0d44bf53e9a Merge branch 'sunxi/h3-h5-for-4.18' into sunxi/for-next)
Merging tegra/for-next (0331f709c1b5 Merge branch for-4.18/arm64/dt into for-next)
Merging arm64/for-next/core (24534b351182 arm64: assembler: add macros to conditionally yield the NEON under PREEMPT)
Merging clk/clk-next (7ad5741ab98a Merge branch 'clk-meson' into clk-next)
Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata)
Merging c6x/for-linux-next (85fa2cc51104 c6x: pass endianness info to sparse)
Merging m68k/for-next (f245ff73dbe9 m68k: Use read_persistent_clock64() consistently)
Merging m68knommu/for-next (a947b3a22ca0 m68k: fix ColdFire PCI config reads and writes)
Merging microblaze/next (a7a9e2f0410d microblaze: dts: replace 'linux,stdout-path' with 'stdout-path')
Merging mips/mips-next (ea4d340cbea4 Merge branches '4.15-fixes', '4.16-features' and 'octeon-3-net-mips-bits' into mips-next)
Merging mips-james/mips-next (8798e3921e30 MIPS: mscc: Connect phys to ports on ocelot_pcb123)
CONFLICT (content): Merge conflict in arch/mips/boot/dts/xilfpga/Makefile
Merging nds32/next (fb1f3e87c22a nds32: Fix the unaligned access handler)
Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock())
Merging openrisc/for-next (d56f3af9e801 openrisc: remove unused __ARCH_HAVE_MMU define)
Merging parisc-hd/for-next (07943d6329dc parisc: Build kernel without -ffunction-sections)
Merging powerpc/next (675d995297d4 powerpc/book3s64: Enable split pmd ptlock.)
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/ftrace.h
Merging powerpc-pkey/topic/pkey (d86a4ba02fc6 powerpc/pkeys: Drop private VM_PKEY definitions)
Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device)
Merging risc-v/for-next (67b8d5c70812 Linux 4.17-rc5)
Merging s390/features (b7e7f5051bf8 s390: remove closung punctuation from spectre messages)
Merging sparc-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
Merging uml/linux-next (e40238dedb48 Fix vector raw inintialization logic)
Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (6da6c0db5316 Linux v4.17-rc3)
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits)
Applying: f2fs: fixup for cgroup/writeback change
Merging btrfs-kdave/for-next (817be7bbba5a Merge branch 'for-next-next-v4.18-20180514' into for-next-20180514)
CONFLICT (content): Merge conflict in fs/btrfs/props.c
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
Merging ceph/master (fc218544fbc8 ceph: fix iov_iter issues in ceph_direct_read_write())
Merging cifs/for-next (ef86c0628b32 smb3: rename encryption_required to smb3_encryption_required)
Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const)
Merging ecryptfs/next (e86281e700cc eCryptfs: don't pass up plaintext names when using filename encryption)
Merging ext3/for_next (b1255ee6a289 Pull UDF UTF-16 handling improvements.)
Merging ext4/dev (c89128a00838 ext4: handle errors on ext4_commit_super)
Merging f2fs/dev (5b19d284f519 f2fs: avoid fsync() failure caused by EAGAIN in writepage())
CONFLICT (content): Merge conflict in fs/f2fs/namei.c
Merging fuse/for-next (5ba24197b94d fuse: add writeback documentation)
Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location)
Merging nfs/linux-next (036db8bd9637 Merge branch 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata)
Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point crashes)
Merging nfsd/nfsd-next (28771950c592 svcrdma: Fix incorrect return value/type in svc_rdma_post_recvs)
Merging orangefs/for-next (8d720dc81d4d orangefs: formatting cleanups)
Merging overlayfs/overlayfs-next (16149013f839 ovl: update documentation w.r.t "xino" feature)
Merging ubifs/linux-next (b5094b7f135b ubi: Reject MLC NAND)
Merging xfs/for-next (f7664b31975b xfs: implement online get/set fs label)
Merging file-locks/locks-next (7a107c0f55a3 fasync: Fix deadlock between task-context and interrupt-context kill_fasync())
Merging vfs/for-next (45cf8e04e8ff Merge branches 'work.dcache', 'work.misc', 'hch.aio' and 'hch.procfs' into for-next)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (f8521c77fcd4 Merge branch 'for-4.18-vsprintf-cleanup' into for-4.18)
Merging pci/next (03cdfc72ee02 Merge branch 'pci/virtualization')
CONFLICT (content): Merge conflict in arch/microblaze/include/asm/pci.h
Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression)
Merging hid/for-next (1bc9eca1aa90 Merge branch 'for-4.17/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (b3352afa1fa6 Merge branch 'i2c/for-4.18' into i2c/for-next)
Merging dmi/master (5cb06cfce4a8 firmware: dmi: Add access to the SKU ID string)
Merging hwmon-staging/hwmon-next (6153ff637b26 hwmon: (ltc2990) support all measurement modes)
Merging jc_docs/docs-next (b971a90f7dd3 docs: ranoops.rst: fix location of ramoops.txt)
CONFLICT (modify/delete): Documentation/features/io/dma-api-debug/arch-support.txt deleted in HEAD and modified in jc_docs/docs-next. Version jc_docs/docs-next of Documentation/features/io/dma-api-debug/arch-support.txt left in tree.
$ git rm -f Documentation/features/io/dma-api-debug/arch-support.txt
Merging v4l-dvb/master (7e6b6b945272 media: dw9807: remove an unused var)
Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED())
Merging fbdev/fbdev-for-next (dbeef4fe697b video: fbdev: pxafb: match_string() conversion fixup)
Merging pm/linux-next (76d5e09417f5 Merge branch 'pm-cpufreq-sched' into linux-next)
Merging cpupower/cpupower (9fd0c4045146 cpupower: fix spelling mistake: "logilename" -> "logfilename")
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
Merging opp/opp/linux-next (6a89e012aaf4 PM / OPP: silence an uninitialized variable warning)
Merging thermal/next (60abce9f43d8 Merge branch 'thermal-soc' into next)
Merging thermal-soc/next (9efc58dfa14a thermal: mediatek: use of_device_get_match_data())
Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers)
Merging dlm/next (f706d830154b dlm: make sctp_connect_to_sock() return in specified time)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging rdma/for-next (aec05afe641b IB/core: Remove redundant return)
Merging net-next/master (8e725f7caafb cxgb4: update LE-TCAM collection for T6)
CONFLICT (content): Merge conflict in net/ipv4/ipconfig.c
CONFLICT (modify/delete): arch/s390/net/bpf_jit.S deleted in net-next/master and modified in HEAD. Version HEAD of arch/s390/net/bpf_jit.S left in tree.
CONFLICT (content): Merge conflict in MAINTAINERS
$ git rm -f arch/s390/net/bpf_jit.S
Merging bpf-next/master (e23afe5e7cba bpf: sockmap, on update propagate errors back to userspace)
CONFLICT (content): Merge conflict in tools/lib/bpf/libbpf.c
Merging ipsec-next/master (724e47a149f5 net-next/hinic: add pci device ids for 25ge and 100ge card)
Merging netfilter-next/master (289e1f4e9e4a net: ipv4: ipconfig: fix unused variable)
Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support)
Merging ipvs-next/master (90278871d4b0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next)
Merging wireless-drivers-next/master (763ece85f45a brcmfmac: fix initialization of struct cfg80211_inform_bss variable)
Merging bluetooth/master (7f98779fd9b3 Bluetooth: Add a new 13d3:3496 QCA_ROME device)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
Merging mac80211-next/master (57c6cb81717f mac80211: ethtool: avoid 32 bit multiplication overflow)
Merging gfs2/for-next (9a38662ba4e2 gfs2: Remove sdp->sd_jheightsize)
Merging mtd/mtd/next (ea092fb3ce66 mtd: cfi_cmdset_0002: Fix coding style issues)
Merging nand/nand/next (39138c1f4a31 mtd: rawnand: use bit-wise majority to recover the ONFI param page)
Merging spi-nor/spi-nor/next (f134fbbb4ff8 mtd: spi-nor: clear Winbond Extended Address Reg on switch to 3-byte addressing.)
Merging crypto/master (730f23b66095 crypto: vmx - Remove overly verbose printk from AES XTS init)
Merging drm/drm-next (95d2c3e15da6 Merge branch 'drm-next-4.18' of git://people.freedesktop.org/~agd5f/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_engine_cs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/modules/color/color_gamma.c
Applying: drm/xen-front: merge fix for "drivers: remove force dma flag from buses"
Applying: drm/amdgpu: include pagemap.h for release_pages()
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (e7f2af7894b1 drm/i915/dp: fix spelling mistakes: "seqeuncer" and "seqeuencer")
Merging drm-tegra/drm/tegra/for-next (abf5c3f871e6 drm/tegra: Adding new typedef vm_fault_t)
Merging drm-misc/for-linux-next (2045b22461c0 Merge tag 'drm-misc-next-2018-05-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
Merging drm-msm/msm-next (64cb96587ba6 drm/msm: Switch to atomic_helper_commit())
Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.)
Merging mali-dp/for-upstream/mali-dp (6e810eb508f4 drm: mali-dp: Add YUV->RGB conversion support for video layers)
Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next)
Merging imx-drm/imx-drm/next (22cd2b2b3151 drm/imx: Remove last traces of struct imx_drm_crtc)
Merging etnaviv/etnaviv/next (0b50dffa736b drm/etnaviv: remove register logging)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (76f721867da6 Merge branch 'regmap-4.18' into regmap-next)
Merging sound/for-next (862154bbd7d7 ALSA: hda/ca0132: constify parameter table for effects)
Merging sound-asoc/for-next (da369113529f Merge remote-tracking branches 'asoc/topic/doc' and 'asoc/topic/trace' into asoc-next)
Merging modules/modules-next (c554b8986801 module: Allow to always show the status of modsign)
Merging input/next (89f84b84d351 Input: usbtouchscreen - add sysfs attribute for 3M MTouch firmware rev)
Merging block/for-next (76aa1d341257 nbd: call nbd_bdev_reset instead of bd_set_size on disconnect)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (28700a36232b dm thin: update Documentation to clarify when "read_only" is valid)
Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers)
Merging mmc/next (cf56c819c851 mmc: tegra: remove redundant return statement)
Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy)
Merging md/for-next (643369299cfe raid5: copy write hint from origin bio to stripe)
Merging mfd/for-mfd-next (1768391c3674 mfd: tps65911-comparator: Fix an off by one bug)
Merging backlight/for-backlight-next (cd4270258cbe backlight: as3711_bl: fix device-tree node leaks)
Merging battery/for-next (1f140ff46708 Merge tag 'tags/tcpm-pps-4.18' into psy-next)
CONFLICT (content): Merge conflict in drivers/usb/core/hcd.c
Merging regulator/for-next (1fd083554fa0 Merge branch 'regulator-4.18' into regulator-next)
Merging security/next-testing (890e2abe1028 dh key: get rid of stack allocated array for zeroes)
Merging apparmor/apparmor-next (cb740f574c7b apparmor: modify audit rule support to support profile stacks)
Merging integrity/next-integrity (3dea0d93d257 ima: Unify logging)
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting)
Merging selinux/next (d141136f523a audit: normalize MAC_POLICY_LOAD record)
Merging tpmdd/next (f5495bb9aca4 tpm: replace kmalloc() + memcpy() with kmemdup())
Merging watchdog/master (67b8d5c70812 Linux 4.17-rc5)
Merging iommu/next (00dcb938d482 Merge branches 'iommu/fixes', 'arm/io-pgtable', 'arm/qcom', 'arm/tegra', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
Merging vfio/next (e506d953550a vfio: platform: Make printed error messages more consistent)
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
Merging audit/next (c0b0ae8a871b audit: use inline function to set audit context)
CONFLICT (content): Merge conflict in security/selinux/selinuxfs.c
Merging devicetree/for-next (3098e5b7eebc drm: rcar-du: disable dtc graph-endpoint warnings on DT overlays)
Merging mailbox/mailbox-for-next (dfbc9c5841fc mailbox: Remove depends on HAS_DMA in case of platform dependency)
Merging spi/for-next (f69b425742b1 Merge branch 'spi-4.18' into spi-next)
Merging tip/auto-latest (eee5fb11dbc6 Merge branch 'x86/vdso')
CONFLICT (content): Merge conflict in arch/x86/net/bpf_jit_comp.c
Merging clockevents/clockevents/next (0136c741ff40 clocksource/drivers/imx-tpm: Add different counter width support)
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (9ef20753e044 EDAC, altera: Fix ARM64 build warning)
Merging irqchip/irq/irqchip-next (aa08192a254d irqchip/gic: Take lock when updating irq type)
Merging ftrace/for-next (0c5a9acc8b4e tracing: Fix the file mode of stack tracer)
Merging rcu/rcu/next (f4b9c71b9305 rcu: Regularize resetting of rcu_data wrap indicator)
CONFLICT (content): Merge conflict in drivers/nvme/host/core.c
Merging kvm/linux-next (3a2936dedd20 kvm: mmu: Don't expose private memslots to L2)
Merging kvm-arm/next (dc6ed61d2f82 arm64: Add temporary ERRATA_MIDR_ALL_VERSIONS compatibility macro)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (31c8b0d0694a KVM: PPC: Book3S HV: Use __gfn_to_pfn_memslot() in page fault handler)
Merging kvms390/next (911eeef91b48 KVM: s390: generalize kvm_s390_get_tod_clock_ext())
Merging xen-tip/linux-next (d1ecfa9d1f40 x86/xen: Reset VCPU0 info pointer after shared_info remap)
Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods)
Merging workqueues/for-next (1aa3798360db Merge branch 'for-4.17' into for-next)
Merging drivers-x86/for-next (c6d24c324e78 lib/string_helpers: Add missed declaration of struct task_struct)
Merging chrome-platform/for-next (60cc43fc8884 Linux 4.17-rc1)
Merging hsi/for-next (70d52ba9e57e hsi: clients: Change return type to vm_fault_t)
Merging leds/for-next (e081c49e30ec leds: Add Spreadtrum SC27xx breathing light controller driver)
Merging ipmi/for-next (163475ebf9f3 ipmi: Remove the proc interface)
Merging driver-core/driver-core-next (6a8b55d7f226 driver core: add __printf verification to device_create_groups_vargs)
Merging usb/usb-next (58318cd4df41 Merge 4.17-rc4 into usb-next)
CONFLICT (content): Merge conflict in drivers/usb/usbip/stub_main.c
CONFLICT (content): Merge conflict in drivers/usb/usbip/stub_dev.c
Merging usb-gadget/next (b47969924dd4 usb: dwc3: gadget: init req->{direction,epnum} from alloc_request())
CONFLICT (content): Merge conflict in drivers/usb/mtu3/Kconfig
Merging usb-serial/usb-next (4d304a6fe935 USB: serial: option: blacklist unused dwm-158 interfaces)
Merging usb-chipidea-next/ci-for-usb-next (8bcf4c0bd7fb usb: chipidea: properly handle host or gadget initialization failure)
Merging phy-next/next (cd3bf368aa7a phy: Add a driver for the ATH79 USB phy)
Merging tty/tty-next (b6da31b2c07c tty: Fix data race in tty_insert_flip_string_fixed_flag)
Merging char-misc/char-misc-next (897609370d25 Drivers: hv: vmbus: Removed an unnecessary cast from void *)
Merging extcon/extcon-next (60cc43fc8884 Linux 4.17-rc1)
Merging staging/staging-next (45ad559a2962 staging: android: ion: Switch to pr_warn_once in ion_buffer_destroy)
CONFLICT (modify/delete): drivers/staging/media/atomisp/TODO deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/atomisp/TODO left in tree.
$ git rm -f drivers/staging/media/atomisp/TODO
Merging mux/for-next (fa934c06c0f4 mux: add mux_control_get_optional() API)
Merging slave-dma/next (95c1e4acb0c4 Merge branch 'topic/sprd' into next)
Merging cgroup/for-next (cc659e76f375 rdmacg: Convert to use match_string() helper)
Merging scsi/for-next (5aab3787c800 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (66b7eaca548d scsi: mptlan: Fix mpt_lan_sdu_send()'s return type)
Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1)
Merging libata/for-next (daa81a1963b9 Merge branch 'for-4.17-fixes' into for-next)
Merging vhost/linux-next (cfcde40e8ce3 ACPI: disable extra P_LVLx access on KVM)
Merging rpmsg/for-next (ff5cf749a5e5 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (22bd82b645bc Merge branch 'devel' into for-next)
Merging pinctrl/for-next (0aec7e1a946a Merge branch 'devel' into for-next)
Merging pinctrl-samsung/for-next (0ca0557e3727 pinctrl: samsung: Remove support for Exynos5440)
Merging pwm/for-next (692099cdcf27 pwm: simplify getting .drvdata)
Merging userns/for-next (06fe86c9beaf 16 May 2018 Merge of my siginfo and userns trees for testing in linux-next)
Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
Merging random/dev (9e66317d3c92 Linux 4.14-rc3)
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
Merging kselftest/next (505a139d7e43 selftests/intel_pstate: Enhance table printing)
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/vmx_tsc_adjust_test.c
Merging y2038/y2038 (5dc0b1529d21 y2038: ipc: Redirect ipc(SEMTIMEDOP, ...) to compat_ksys_semtimedop)
Merging livepatching/for-next (3beed9bf1e3d Merge branch 'for-4.17/upstream-fixes' into for-next)
Merging coresight/next (659d7e66340e coresight: Remove %px for printing pcsr value)
Merging rtc/rtc-next (c59b3715ac16 rtc: nvmem: don't return an error when not enabled)
Merging nvdimm/libnvdimm-for-next (638a8e3f28dc memremap: mark devm_memremap_pages() EXPORT_SYMBOL_GPL)
CONFLICT (content): Merge conflict in mm/hmm.c
Merging at24/at24/for-next (73b0d922cd5b eeprom: at24: provide a separate routine for creating dummy i2c clients)
Merging ntb/ntb-next (9b42913698a1 ntb: intel: change references of skx to gen3)
Merging kspp/for-next/kspp (bd80928a6e0a Merge branch 'kspp/gcc-plugin/stackleak-v11' into for-next/kspp)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Merging akpm-current/current (a64af9e7000a ipc/shm: fix shmat() nil address after round-down when remapping)
CONFLICT (content): Merge conflict in kernel/sched/core.c
CONFLICT (content): Merge conflict in arch/sh/Kconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm: use octal not symbolic permissions
CONFLICT (content): Merge conflict in mm/vmalloc.c
Applying: treewide: use PHYS_ADDR_MAX to avoid type casting ULLONG_MAX
Applying: mm: fix oom_kill event handling
Applying: kernel/kexec_file.c: add walk_system_ram_res_rev()
Applying: kernel/kexec_file.c: load kernel at top of system RAM if required
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Applying: sparc64: NG4 memset 32 bits overflow
Merging akpm/master (31c4e88060c0 sparc64: NG4 memset 32 bits overflow)

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

linux-next: Tree for May 17

[Stephen Rothwell]

Hi all,

Changes since 20170516:

New trees: nand-fixes (yesterday)
	spi-nor-fixes

The file-locks tree gained a build failure so I used the version from
next-20170516.

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

The sound tree gained a build failure so I used the version from
next-20170516.

The scsi-mkp tree gained a build failure so I used the version from
next-20170516.

Non-merge commits (relative to Linus' tree): 1206
 1254 files changed, 34634 insertions(+), 21339 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 (with
CONFIG_BUILD_DOCSRC=n) 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.

Below is a summary of the state of the merge.

I am currently merging 260 trees (counting Linus' and 40 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 (b23afd384801 Merge tag 'pstore-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging fixes/master (97da3854c526 Linux 4.11-rc3)
Merging kbuild-current/fixes (2ea659a9ef48 Linux 4.12-rc1)
Merging arc-current/for-curr (2ea659a9ef48 Linux 4.12-rc1)
Merging arm-current/fixes (2ea659a9ef48 Linux 4.12-rc1)
Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (be5c5e843c4a powerpc/64: Fix HMI exception on LE with CONFIG_RELOCATABLE=y)
Merging sparc/master (3c7f62212018 sparc64: fix fault handling in NGbzero.S and GENbzero.S)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (2432a3fb5cff mlx5e: add CONFIG_INET dependency)
Merging ipsec/master (2c1497bbc8fd xfrm: Fix NETDEV_DOWN with IPSec offload)
Merging netfilter/master (c953d6354820 ebtables: arpreply: Add the standard target sanity check)
Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections)
Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype avoiding use-after-free of virtual interface)
Merging mac80211/master (29cee56c0be4 Merge tag 'mac80211-for-davem-2017-05-08' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
Merging sound-current/for-linus (fa16b69f1299 ALSA: hda - No loopback on ALC299 codec)
Merging pci-current/for-linus (2ea659a9ef48 Linux 4.12-rc1)
Merging driver-core.current/driver-core-linus (2ea659a9ef48 Linux 4.12-rc1)
Merging tty.current/tty-linus (2ea659a9ef48 Linux 4.12-rc1)
Merging usb.current/usb-linus (2ea659a9ef48 Linux 4.12-rc1)
Merging usb-gadget-fixes/fixes (a351e9b9fc24 Linux 4.11)
Merging usb-serial-fixes/usb-linus (b004ee894f53 USB: serial: ftdi_sio: add Olimex ARM-USB-TINY(H) PIDs)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (3f34d7fc76fa phy: Group vendor specific phy drivers)
Merging staging.current/staging-linus (b72d7451209a staging: fsl-dpaa2/eth: add ETHERNET dependency)
Merging char-misc.current/char-misc-linus (0d83539092dd uio: fix incorrect memory leak cleanup)
Merging input-current/for-linus (3af9256150b3 Input: cros_ec_keyb - remove extraneous 'const')
Merging crypto-current/master (929562b14478 crypto: stm32 - Fix OF module alias information)
Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination)
Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6)
Merging kselftest-fixes/fixes (2ea659a9ef48 Linux 4.12-rc1)
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 nand-fixes/nand/fixes (f7b7ad45f59d mtd: nand: make nand_ooblayout_lp_hamming_ops static)
Merging spi-nor-fixes/spi-nor/fixes (2ea659a9ef48 Linux 4.12-rc1)
Merging mfd-fixes/for-mfd-fixes (b2376407f989 mfd: cros-ec: Fix host command buffer size)
Merging v4l-dvb-fixes/fixes (24a47426066c [media] exynos-gsc: Do not swap cb/cr for semi planar formats)
Merging drm-intel-fixes/for-linux-next-fixes (2f720aac936d drm/i915: don't do allocate_va_range again on PIN_UPDATE)
Merging drm-misc-fixes/for-linux-next-fixes (0c45b36f8acc drm/udl: Fix unaligned memory access in udl_render_hline)
Merging kbuild/for-next (cb77f0d623ff scripts: Switch to more portable Perl shebang)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging arm/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging arm-perf/for-next/perf (2ea659a9ef48 Linux 4.12-rc1)
Merging arm-soc/for-next (e3ec06d4bc1e arm-soc: document merges)
CONFLICT (content): Merge conflict in drivers/tee/tee_shm.c
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
Merging amlogic/for-next (715dcd206041 Merge branch 'v4.12/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next)
Merging at91/at91-next (ce60fdaa7e9e Merge remote-tracking branch 'alex_korg/at91-dt' into at91-next)
Merging bcm2835/for-next (7ea6e490ba7f Merge branch anholt/bcm2835-defconfig-64-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (e13cc349a3c7 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (4495c08e8472 Linux 4.11-rc2)
Merging mvebu/for-next (4cfb1f480e35 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (704ebb2d2fc4 Merge branch 'omap-for-v4.13/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (9f514b0f9cf3 Merge branch 'drivers-for-4.12' into all-for-4.12)
Merging renesas/next (e7b4b5069b25 Merge branches 'arm64-dt-for-v4.13' and 'dt-for-v4.13' into next)
Merging rockchip/for-next (b8c322bd1c56 Merge branch 'v4.13-armsoc/dts32' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (64eaeaf32bc5 Merge branch 'next/defconfig' into for-next)
Merging sunxi/sunxi/for-next (9bff96266476 Merge branches 'sunxi/clk-fixes-for-4.12', 'sunxi/dt-for-4.13', 'sunxi/dt64-for-4.13' and 'sunxi/fixes-for-4.12' into sunxi/for-next)
Merging tegra/for-next (29d04525797f Merge branch for-4.12/clk into for-next)
Merging arm64/for-next/core (0c2cf6d9487c arm64: Silence first allocation with CONFIG_ARM64_MODULE_PLTS=y)
Merging clk/clk-next (2ea659a9ef48 Linux 4.12-rc1)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (1072734a2c63 m68k/defconfig: Update defconfigs for v4.12-rc1)
Merging m68knommu/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (19e816573612 MIPS: mm: adjust PKMAP location)
Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation)
Merging openrisc/for-next (a4d442663580 openrisc: head: Init r0 to 0 on start)
Merging parisc-hd/for-next (5aa2aabff1ce parisc: Stop CPUs via PAT firmware before system halt or reboot.)
Merging powerpc/next (5a61ef74f269 powerpc/64s: Support new device tree binding for discovering CPU features)
Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (05aa5114d050 s390/pkey: add missing __user annotations)
Merging sparc-next/master (94836ecf1e73 Merge tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory)
Merging uml/linux-next (ce4586063f1a um: Add missing NR_CPUS include)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6fad04b7585d Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (6f9d696f016f fscrypt: correct collision claim for digested names)
Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (24f8acd362fc Merge branch 'for-next-next-v4.13-20170512' into for-next-20170512)
Merging ceph/master (eeca958dce0a ceph: fix memory leak in __ceph_setxattr())
Merging cifs/for-next (a95cfad947d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (07f7e3135e58 Merge branch 'fsnotify' into for_next)
Merging ext4/dev (17f423b51607 jbd2: cleanup write flags handling from jbd2_write_superblock())
Merging f2fs/dev (2d3e4866dea9 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (0b6e9ea041e6 fuse: Add support for pid namespaces)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (76b2a303384e pNFS/flexfiles: Always attempt to call layoutstats when flexfiles is enabled)
Merging nfsd/nfsd-next (b26b78cb7260 nfsd: Fix up the "supattr_exclcreat" attributes)
Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
Merging overlayfs/overlayfs-next (02cac3227a28 ovl: mark upper dir with type origin entries "impure")
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (7bccd12d27b7 ubi: Add debugfs file for tracking PEB state)
Merging xfs/for-next (161f55efba5d xfs: fix use-after-free in xfs_finish_page_writeback)
Merging file-locks/linux-next (9c004e8f6bc1 fs/locks: don't mess with the address limit in compat_fcntl64)
$ git reset --hard HEAD^
Merging next-20170516 version of file-locks
Merging vfs/for-next (919bb328b020 Merge branch 'work.misc' into for-next)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (cf39bf58afda printk: fix double printing with earlycon)
Merging pci/next (2ea659a9ef48 Linux 4.12-rc1)
Merging pstore/for-next/pstore (6f61dd3aa351 efi-pstore: Fix read iter after pstore API refactor)
Merging hid/for-next (edb2a51c6fbb Merge branch 'for-4.12/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (88ad60c23a39 i2c: mv64xxx: don't override deferred probing when getting irq)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (b3398adc0da6 firmware: dmi_scan: Look for SMBIOS 3 entry point first)
Merging hwmon-staging/hwmon-next (08f2a3db3e50 hwmon: (adt7475) temperature smoothing)
Merging jc_docs/docs-next (25a0da73f24c doc: replace FTP URL to kernel.org with HTTPS one)
Merging v4l-dvb/master (3622d3e77ece [media] ov2640: print error if devm_*_optional*() fails)
Merging v4l-dvb-next/master (6d95b3f24881 Merge branch 'TTT' into to_next)
Merging fbdev/fbdev-for-next (34bf129a7f06 fbdev: sti: don't select CONFIG_VT)
Merging pm/linux-next (c549d04f0535 Merge branch 'pm-tools' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (cb15c81a0c1c Merge branch 'thermal-soc' into next)
Merging thermal-soc/next (19fd1783c24e Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (c0ae14857677 dlm: Fix kernel memory disclosure)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (9ad098037db5 liquidio: use pcie_flr instead of duplicating it)
Merging ipsec-next/master (a133d93054fa xfrm: use memdup_user)
Merging netfilter-next/master (89c9fea3c803 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period)
Merging wireless-drivers-next/master (a95cfad947d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging bluetooth/master (2a25b3faef44 Bluetooth: hci_ldisc: Use rwlocking to avoid closing proto races)
Merging mac80211-next/master (89c9fea3c803 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
Merging rdma/for-next (67cf3623e097 rxe: expose num_possible_cpus() cnum_comp_vectors)
Merging gfs2/for-next (3ef2bc099d1c Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux)
Merging mtd/master (2ea659a9ef48 Linux 4.12-rc1)
Merging l2-mtd/master (c316cf670491 Merge 'v4.12-rc1' into MTD)
Merging nand/nand/next (6076fd1e9d87 mtd: nand: gpmi: Kill gpmi_nand_exit())
Merging spi-nor/spi-nor/next (05d090f00203 mtd: spi-nor: Potential oops on error path in quad_enable())
Merging crypto/master (929562b14478 crypto: stm32 - Fix OF module alias information)
Merging drm/drm-next (7b8cd3363e8a drm/i915: Make vblank evade warnings optional)
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (d567232cbd9e drm/i915: use vma->size for appgtt allocate_va_range)
Merging drm-tegra/drm/tegra/for-next (b0d36daa0ab5 gpu: host1x: Fix host1x driver shutdown)
Merging drm-misc/for-linux-next (e345da82bd6b drm/edid: Add 10 bpc quirk for LGD 764 panel in HP zBook 17 G2)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (98db803f6413 msm/drm: gpu: Dynamically locate the clocks from the device tree)
Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address)
Merging mali-dp/for-upstream/mali-dp (763656d30b3d drm: mali-dp: use div_u64 for expensive 64-bit divisions)
Merging sunxi-drm/sunxi-drm/for-next (cf80aeef958f drm/sun4i: backend: Clarify sun4i_backend_layer_enable debug message)
Merging imx-drm/imx-drm/next (b8f0951de854 gpu: ipu-v3: prg: remove counter load enable)
Merging etnaviv/etnaviv/next (d79fd1ccf2cd drm/etnaviv: implement cooling support for new GPU cores)
Merging kspp/for-next/kspp (62111ab351b8 Merge branch 'for-next/gcc-plugin-infrastructure' into for-next/kspp)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (a9307c73b36a ALSA: Enable build with m68k)
$ git reset --hard HEAD^
Merging next-20170516 version of sound
Merging sound-asoc/for-next (a8ad31e9ab59 Merge remote-tracking branch 'asoc/topic/tlv320dac31xx' into asoc-next)
Merging modules/modules-next (175861882769 kallsyms: Use bounded strnchr() when parsing string)
Merging input/next (d899520b0431 Input: elantech - force relative mode on a certain module)
Merging block/for-next (0789bd7bdb5b Merge branch 'for-linus' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (f3363394bac9 dm bio prison: use rb_entry() rather than container_of())
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (9a64c8d0bb76 Revert "mmc: dw_mmc: Don't allow Runtime PM for SDIO cards")
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (d82dd0e34d03 raid1: prefer disk without bad blocks)
Merging mfd/for-mfd-next (ab6241ae07c3 input: touchscreen: mxs-lradc: || vs && typos)
Merging backlight/for-backlight-next (e739c5bb20be backlight: Add support for Arctic Sand LED backlight driver chips)
Merging battery/for-next (b5910897b2ee power_supply: Add Apple Brick ID power supply type)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (fa50fb5b5207 Merge remote-tracking branch 'regulator/topic/max8997' into regulator-next)
Merging security/next (99c55fb18fc4 security: Grammar s/allocates/allocated/)
Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.)
Merging keys/keys-next (e36484b5ac31 crypto : asymmetric_keys : verify_pefile:zero memory content before freeing)
Merging selinux/next (e5df4f8bad72 selinux: only invoke capabilities and selinux for CAP_MAC_ADMIN checks)
Merging tpmdd/next (da4cee99ca6d tpm_tis: Consolidate the platform and acpi probe flow)
Merging watchdog/master (00078cff73db Merge branch 'watchdog-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging)
CONFLICT (content): Merge conflict in drivers/watchdog/iTCO_wdt.c
Merging iommu/next (2c0248d68880 Merge branches 'arm/exynos', 'arm/omap', 'arm/rockchip', 'arm/mediatek', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (7cb671e7a34d vfio/type1: Reduce repetitive calls in vfio_pin_pages_remote())
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
Merging audit/next (48d0e023af97 audit: fix the RCU locking for the auditd_connection structure)
Merging devicetree/for-next (df3ed9323944 Partially Revert "of: fix sparse warnings in fdt, irq, reserved mem, and resolver code")
Merging mailbox/mailbox-for-next (cb710ab1d8a2 mailbox: handle empty message in tx_tick)
Merging spi/for-next (a645312f10e8 Merge remote-tracking branches 'spi/topic/imx' and 'spi/topic/spidev' into spi-next)
Merging tip/auto-latest (217dc52c43da Merge branch 'smp/hotplug')
Merging clockevents/clockevents/next (6f9c89000c3f Merge tag 'arch-timer-errata' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into clockevents/4.12)
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (f8d5549df25e EDAC, ghes: Do not enable it by default)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (4dbbe2d8e95c tracing: Use cpumask_available() to check if cpumask variable may be used)
Merging rcu/rcu/next (c654f4e81650 rcu: Eliminate NOCBs CPU-state Kconfig options)
Merging kvm/linux-next (36c344f3f1ff Merge tag 'kvm-arm-for-v4.12-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
Merging kvm-arm/next (a2b19e6e2d4b KVM: arm/arm64: vgic-its: Cleanup after failed ITT restore)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (76d837a4c0f9 KVM: PPC: Book3S PR: Don't include SPAPR TCE code on non-pseries platforms)
Merging kvms390/next (e000b8e0968d s390: kvm: Cpu model support for msa6, msa7 and msa8)
Merging xen-tip/linux-next (69861e0a52f8 xen: adjust early dom0 p2m handling to xen hypervisor behavior)
Merging percpu/for-next (1328710b8ec3 mark most percpu globals as __ro_after_init)
Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next)
Merging drivers-x86/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (3026050179a3 HSI: ssi_protocol: double free in ssip_pn_xmit())
Merging leds/for-next (7678da8ee6de leds: Delete obsolete Versatile driver)
Merging ipmi/for-next (2c1175c2e8e5 ipmi/watchdog: fix wdog hang on panic waiting for ipmi response)
Merging driver-core/driver-core-next (2ea659a9ef48 Linux 4.12-rc1)
Merging usb/usb-next (2ea659a9ef48 Linux 4.12-rc1)
Merging usb-gadget/next (2868b2513aa7 Merge tag 'linux-kselftest-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest)
Merging usb-serial/usb-next (2ea659a9ef48 Linux 4.12-rc1)
Merging usb-chipidea-next/ci-for-usb-next (a932a8041ff9 usb: chipidea: core: add sysfs group)
Merging phy-next/next (2ea659a9ef48 Linux 4.12-rc1)
Merging tty/tty-next (2ea659a9ef48 Linux 4.12-rc1)
Merging char-misc/char-misc-next (2ea659a9ef48 Linux 4.12-rc1)
Merging extcon/extcon-next (2ea659a9ef48 Linux 4.12-rc1)
Merging staging/staging-next (0e3e19cbd8c4 staging: rtl8192e: _rtl92e_dm_check_edca_turbo remove peername message.)
Merging mux/for-next (a351e9b9fc24 Linux 4.11)
Merging slave-dma/next (ca5b1afa6846 Merge branch 'topic/bcm' into next)
Merging cgroup/for-next (0948307b3a5d Merge branch 'for-4.12' into for-next)
Merging scsi/for-next (b77b36cb7272 scsi: pmcraid: remove redundant check to see if request_size is less than zero)
Merging scsi-mkp/for-next (2848e1d503d6 scsi: lpfc: update version to 11.2.0.14)
$ git reset --hard HEAD^
Merging next-20170516 version of scsi-mkp
Merging target-updates/for-next (984a9d4c40be Revert "target: Fix VERIFY and WRITE VERIFY command parsing")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (a351e9b9fc24 Linux 4.11)
Merging libata/for-next (f79e7febd5cd Merge branch 'for-4.13' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (c8b0d7290657 s390/virtio: change maintainership)
Merging rpmsg/for-next (5e78de7eee74 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (b86c86aa9805 gpio: f7188x: Add a missing break)
Merging pinctrl/for-next (1aa2faf52f76 pinctrl: mediatek: Add missing pinctrl bindings for mt7623)
Merging pinctrl-samsung/for-next (7ddaa43ee9fd pinctrl: samsung: Remove unneeded (void *) casts in of_match_table)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (97512ceafaac Merge branch 'for-4.12/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (3fd372262166 pid_ns: Fix race between setns'ed fork() and zap_pid_ns_processes())
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (2ea659a9ef48 Linux 4.12-rc1)
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (608822c0f7af Merge branch 'for-4.12/upstream' into for-next)
Merging coresight/next (196a00385bb8 coresight: etb10: Fix a typo in a comment line)
Merging rtc/rtc-next (2ea659a9ef48 Linux 4.12-rc1)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (f5705aa8cfed dax, xfs, ext4: compile out iomap-dax paths in the FS_DAX=n case)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
Applying: netfilter: xtables: fix for zero padding in data_to_user
Merging akpm-current/current (7428afcf3bab ipc/sem: avoid indexing past end of sem_array)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: sparc64: NG4 memset 32 bits overflow
Applying: mm: zero hash tables in allocator
Applying: mm: update callers to use HASH_ZERO flag
Applying: mm: adaptive hash table scaling
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
Merging akpm/master (cd597f9d8c98 lib/crc-ccitt: add CCITT-FALSE CRC16 variant)

Re: linux-next: Tree for May 17

[Xiong Zhou]

Hi Stephen,

On Mon, May 23, 2016 at 4:37 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Xiong,
>
> On Mon, 23 May 2016 16:13:28 +0800 Xiong Zhou <jencce.kernel@gmail.com> wrote:
>>
>> hi,
>>
>> On Tue, May 17, 2016 at 1:04 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >
>> > 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
>>
>> Patches after 0516 are not there.
>>
>> i'm chasing an oom issue between 0516 and 0518 trees while missed
>> 0517 tag, so is the patch file the only way to get there trying 0517 tree?
>
> They are there, just the version numbering puts them out of order in the
> page listing - they appear before patch-v4.6-rc1-next-20160327.gz

Ya, my bad, i found them.

>
> All the (recent) tags are in the git tree as well, of course.

Yes! git fetch -t saved my mess git repo.

Thank you very much!

--
Xiong


> --
> Cheers,
> Stephen Rothwell

Re: linux-next: Tree for May 17

[Stephen Rothwell]

Hi Xiong,

On Mon, 23 May 2016 16:13:28 +0800 Xiong Zhou <jencce.kernel@gmail.com> wrote:
>
> hi,
> 
> On Tue, May 17, 2016 at 1:04 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > 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  
> 
> Patches after 0516 are not there.
> 
> i'm chasing an oom issue between 0516 and 0518 trees while missed
> 0517 tag, so is the patch file the only way to get there trying 0517 tree?

They are there, just the version numbering puts them out of order in the
page listing - they appear before patch-v4.6-rc1-next-20160327.gz

All the (recent) tags are in the git tree as well, of course.
-- 
Cheers,
Stephen Rothwell

Re: linux-next: Tree for May 17

[Xiong Zhou]

hi,

On Tue, May 17, 2016 at 1:04 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Please do not add any v4.8 destined material to your linux-next included
> branches until after v4.7-rc1 has been released.
>
> Changes since 20160516:
>
> The vfs tree gained a conflict against the ext4 tree.
>
> The net-next tree gained a conflict against the arm64 tree.
>
> The spi tree lost its build failure.
>
> Non-merge commits (relative to Linus' tree): 9737
>  8314 files changed, 424907 insertions(+), 177068 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

Patches after 0516 are not there.

i'm chasing an oom issue between 0516 and 0518 trees while missed
0517 tag, so is the patch file the only way to get there trying 0517 tree?

linux-next: Tree for May 17

[Stephen Rothwell]

Hi all,

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

Changes since 20160516:

The vfs tree gained a conflict against the ext4 tree.

The net-next tree gained a conflict against the arm64 tree.

The spi tree lost its build failure.

Non-merge commits (relative to Linus' tree): 9737
 8314 files changed, 424907 insertions(+), 177068 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 (with
CONFIG_BUILD_DOCSRC=n) 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
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.

Below is a summary of the state of the merge.

I am currently merging 235 trees (counting Linus' and 35 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

$ git checkout master
$ git reset --hard stable
Merging origin/master (cf6ed9a6682d Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging fixes/master (b507146bb6b9 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (44549e8f5eea Linux 4.6-rc7)
Merging arm-current/fixes (ec953b70f368 ARM: 8573/1: domain: move {set,get}_domain under config guard)
Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (b4c112114aab powerpc: Fix bad inline asm constraint in create_zero_mask())
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (33656a1f2ee5 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
Merging net/master (2dcd0af568b0 Linux 4.6)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (f28f20da704d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging wireless-drivers/master (cbbba30f1ac9 Merge tag 'iwlwifi-for-kalle-2016-05-04' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if dev_alloc_name() fails)
Merging sound-current/for-linus (a158f2b79ff1 Merge tag 'asoc-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (9a2a5a638f8e PCI: Do not treat EPROBE_DEFER as device attach failure)
Merging driver-core.current/driver-core-linus (c3b46c73264b Linux 4.6-rc4)
Merging tty.current/tty-linus (44549e8f5eea Linux 4.6-rc7)
Merging usb.current/usb-linus (44549e8f5eea Linux 4.6-rc7)
Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free)
Merging usb-serial-fixes/usb-linus (74d2a91aec97 USB: serial: option: add even more ZTE device ids)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (44549e8f5eea Linux 4.6-rc7)
Merging char-misc.current/char-misc-linus (44549e8f5eea Linux 4.6-rc7)
Merging input-current/for-linus (c52c545ead97 Input: twl6040-vibra - fix DT node memory management)
Merging crypto-current/master (256b1cfb9a34 crypto: qat - change the adf_ctl_stop_devices to void)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
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 (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (2dcd0af568b0 Linux 4.6)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (445a64214285 arc: axs10x: Add DT bindings for I2S PLL Clock)
Merging arm/for-next (b6810489fa29 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (83e0a1672eb5 Merge branch 'next/defconfig' into for-next)
Merging at91/at91-next (5a0d7c6a48ae Merge branch 'at91-4.7-defconfig' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (63b44471754b Merge branch 'imx/defconfig64' into for-next)
Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next)
Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (5c66191b5c76 Merge branch 'omap-for-v4.7/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (100b83d52f51 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (e5c640c6f9cc Merge branches 'heads/arm64-defconfig-for-v4.7', 'heads/arm64-dt-pm-domain-for-v4.7', 'heads/dt-for-v4.7' and 'heads/pci-defconfig-for-v4.7' into next)
Merging rockchip/for-next (f6ec4147adc3 Merge branch 'v4.7-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (05e8e9a8696c Merge branch 'fixes' into for-next)
Merging tegra/for-next (5c282bc9d0a3 Merge branch for-4.7/defconfig into for-next)
Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer)
CONFLICT (content): Merge conflict in drivers/firmware/efi/arm-init.c
CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (787ca32dc704 ia64/unaligned: Silence another GCC warning about an uninitialised variable)
Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging m68knommu/for-next (44156affd184 m68k: change m68knommu maintainer email address)
Merging metag/for-next (096a8b6d5e7a metag: Fix atomic_*_return inline asm constraints)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (b071c5d7998a USB: ohci-jz4740: Remove obsolete driver)
Merging nios2/for-next (a8950e49bd24 nios2: memset: use the right constraint modifier for the %4 output operand)
Merging parisc-hd/for-next (695499920489 parisc: Add native high-resolution sched_clock() implementation)
Merging powerpc/next (1d4e89cf0a4e powerpc/powernv/npu: Add PE to PHB's list)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/prom.c
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (c53db5222b92 s390/vmem: remove unused function parameter)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (4ef00aa30a3f tile: sort the "select" lines in the TILE/TILEGX configs)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (a3a7fdf24a89 Merge branch 'for-next-next-4.7-20160512' into for-next-20160512)
Merging ceph/master (d3767f0faeda rbd: report unsupported features to syslog)
Merging cifs/for-next (2e66cc8422f6 [SMB3] remove directory incorrectly tries to set delete on close on non-empty directories)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (2a28900be206 udf: Export superblock magic to userspace)
Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO)
Merging f2fs/dev (ab47036d8f72 f2fs: fix deadlock when flush inline data)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (4441f63ab7e5 fuse: update mailing list in MAINTAINERS)
Merging gfs2/for-next (68cd4ce2caf2 GFS2: Refactor gfs2_remove_from_journal)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (44549e8f5eea Linux 4.6-rc7)
Merging nfsd/nfsd-next (d9e4084f6c97 svcrdma: Generalize svc_rdma_xdr_decode_req())
Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable)
Merging overlayfs/overlayfs-next (41523ff335f4 ovl: override creds with the ones from the superblock mounter)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (16a9fad4ef80 Merge branch 'sendmsg.cifs' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (content): Merge conflict in fs/ext4/inode.c
CONFLICT (content): Merge conflict in fs/ext4/indirect.c
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
Merging pci/next (c21cdb3a2e9e Merge branches 'pci/arm64' and 'pci/host-hv' into next)
Applying: iommu/amd: fix up for aliases API change
Merging hid/for-next (185a9cac5b1e Merge branch 'for-4.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (d3e47ff44331 Merge branch 'i2c/for-4.7' into i2c/for-next)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (d6a442df63b2 hwmon: (sch5636) trivial fix of spelling mistake on revision)
Merging v4l-dvb/master (73dfb701d254 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (7e84c1f8ca55 Merge branch 'acpi-video' into linux-next)
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Makefile
CONFLICT (content): Merge conflict in MAINTAINERS
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (f1ba9eb85b5e thermal: int340x: processor_thermal: support acpi notification)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (0c1a8ad32520 Merge branch 'topic/core' into next)
Merging net-next/master (7e2c3aea4398 net: also make sch_handle_egress() drop monitor ready)
CONFLICT (content): Merge conflict in include/linux/soc/qcom/smd.h
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
Applying: soc: qcom: smd: fix for Qualcomm IPC router and callback API change
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (698e2a8dca98 ipvs: make drop_entry protection effective for SIP-pe)
Merging wireless-drivers-next/master (52776a700b53 Merge ath-next from ath.git)
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/tx.c
Merging bluetooth/master (7e2c3aea4398 net: also make sch_handle_egress() drop monitor ready)
Merging mac80211-next/master (4f45bb3e8a8f mac80211_hwsim: Allow managing radios from non-initial namespaces)
Merging rdma/for-next (94d7f1a255db Merge branches 'hfi1' and 'iw_cxgb4' into k.o/for-4.7)
Merging rdma-leon/rdma-next (44549e8f5eea Linux 4.6-rc7)
Merging rdma-leon-test/testing/rdma-next (d9233ad6ef2f Merge branch 'topic/srp' into testing/rdma-next)
CONFLICT (content): Merge conflict in drivers/infiniband/hw/i40iw/i40iw_verbs.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb4/cm.c
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (e5366a266a8c mtd: spi-nor: support GigaDevice gd25lq64c)
Merging nand/nand/next (666b65683dad mtd: brcmnand: respect ECC algorithm set by NAND subsystem)
Merging crypto/master (256b1cfb9a34 crypto: qat - change the adf_ctl_stop_devices to void)
Merging drm/drm-next (95306975e9dd Merge tag 'drm/tegra/for-4.7-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next)
Merging drm-panel/drm/panel/for-next (227e4f4079e1 drm/panel: simple: Add support for TPK U.S.A. LLC Fusion 7" and 10.1" panels)
Merging drm-intel/for-linux-next (5b4fd5b1111b drm/i915: Update DRIVER_DATE to 20160425)
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (9ecb549867d7 drm/atomic: Add drm_atomic_helper_best_encoder())
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops)
Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (efea172891fc drm/vc4: Return -EBUSY if there's already a pending flip event.)
Merging sunxi/sunxi/for-next (ed490b3ebfa4 Merge branches 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.7' into sunxi/for-next)
Merging kbuild/for-next (d99c8a9355cf Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (d4ab78d7076d Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (581abbaa0336 Merge branch 'for-next' into for-linus)
Merging sound-asoc/for-next (102283e44630 Merge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/twl6040', 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (d96caf8c33ca Input: rotary-encoder - fix bare use of 'unsigned')
Merging block/for-next (661806a31989 Merge branch 'for-4.7/core' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (202bae52934d dm thin: unroll issue_discard() to create longer discard bio chains)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (1c447116d017 mmc: mmc: Fix partition switch timeout for some eMMCs)
Merging md/for-next (1fa9a1ad0a9d md-cluster: check the return value of process_recvd_msg)
Merging mfd/for-mfd-next (68b21094ef9b mfd: ab8500-debugfs: Trivial fix of spelling mistake on "between")
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (ffe1b6c453ef video: AMBA CLCD: Remove unncessary include in amba-clcd.c)
Merging regulator/for-next (180aaa7717a8 Merge remote-tracking branches 'regulator/topic/tps6524x' and 'regulator/topic/twl' into regulator-next)
Merging security/next (a6926cc989eb Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/selinux into next)
CONFLICT (content): Merge conflict in crypto/asymmetric_keys/pkcs7_parser.c
Merging integrity/next (05d1a717ec04 ima: add support for creating files using the mknodat syscall)
Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record)
Merging selinux/next (c2316dbf1242 selinux: apply execstack check on thread stacks)
Merging tpmdd/next (e8f2f45a4402 tpm: Fix suspend regression)
Merging watchdog/master (ae67643edc6e Documentation: Add ebc-c384_wdt watchdog-parameters.txt entry)
Merging iommu/next (6c0b43df74f9 Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next)
Merging dwmw2-iommu/master (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching)
Merging vfio/next (5ed4aba1265f vfio_iommu_spapr_tce: Remove unneeded iommu_group_get_iommudata)
Merging jc_docs/docs-next (022eedeebfdd Merge branch 'jani-rest' into docs-next)
CONFLICT (content): Merge conflict in samples/Makefile
Merging trivial/for-next (52bbe141f37f gitignore: fix wording)
Merging audit/next (188e3c5cd2b6 tty: provide tty_name() even without CONFIG_TTY)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (b6010770f332 drivers/of: Export of_detach_node())
CONFLICT (content): Merge conflict in drivers/iommu/arm-smmu.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt
Merging mailbox/mailbox-for-next (c430cf376fee mailbox: Fix devm_ioremap_resource error detection code)
Merging spi/for-next (80862e3d2e65 Merge remote-tracking branch 'spi/topic/zynqmp' into spi-next)
Merging tip/auto-latest (73764b364e86 Merge branch 'x86/asm')
CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic.c
CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
CONFLICT (content): Merge conflict in drivers/irqchip/Kconfig
CONFLICT (content): Merge conflict in drivers/cpufreq/longhaul.c
Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (3f37a36b6282 EDAC, amd64_edac: Drop pci_register_driver() use)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (0fc1b09ff1ff tracing: Use temp buffer when filtering events)
Merging rcu/rcu/next (2ba259ab67a8 fixup! rcu: Make call_rcu_tasks() tolerate first call with irqs disabled)
Merging kvm/linux-next (c4a8de357ef1 KVM: s390: set halt polling to 80 microseconds)
CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic.c
CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic-v3.c
Merging kvm-arm/next (064850532444 kvm: arm64: Enable hardware updates of the Access Flag for Stage 2 page tables)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts)
Merging kvms390/next (60a37709ce60 KVM: s390: Populate mask of non-hypervisor managed facility bits)
Merging xen-tip/linux-next (51c2a7526e54 xen/gntdev: reduce copy batch size to 16)
CONFLICT (content): Merge conflict in drivers/xen/efi.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/setup.c
Applying: xen: efi: merge fix patch
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (f1e89a8f3358 Merge branch 'for-4.6-fixes' into for-next)
Merging drivers-x86/for-next (9a73a6895fc5 surfacepro3_button: Add a warning when switching to tablet mode)
Merging chrome-platform/for-next (9e96aa70e9ac platform/chrome: chromeos_laptop - Add Elan touchpad for Wolf)
Merging hsi/for-next (c2f90a465df7 HSI: omap-ssi: move omap_ssi_port_update_fclk)
Merging leds/for-next (80d6737b27bb leds: gpio: Support the "panic-indicator" firmware property)
Merging ipmi/for-next (a1b4e31bfabb IPMI: reserve memio regions separately)
Merging driver-core/driver-core-next (c6e360a0d9d2 Revert "base: dd: don't remove driver_data in -EPROBE_DEFER case")
Merging tty/tty-next (d20bb59af646 MAINTAINERS: 8250: remove website reference)
CONFLICT (content): Merge conflict in include/uapi/linux/serial_core.h
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
Merging usb/usb-next (60d5794fe5a5 Merge tag 'usb-serial-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next)
Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP)
Merging usb-serial/usb-next (b923c6c62981 USB: serial: ti_usb_3410_5052: add MOXA UPORT 11x0 support)
Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM)
Merging staging/staging-next (ffc83a79b44e Staging: emxx_udc: emxx_udc: fixed coding style issue)
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw26.c
Applying: staging: lustre: o2iblnd: fix for ib_map_mr_sg() API changes
Merging char-misc/char-misc-next (725d0123dfff Merge 4.6-rc7 into char-misc-testing)
Merging extcon/extcon-next (453fc627c7b5 extcon: usb-gpio: add support for ACPI gpio interface)
Merging cgroup/for-next (a6b18f07bc86 Merge branch 'for-4.6-fixes' into for-next)
Merging scsi/for-next (02714f2c73a6 Merge branch 'misc' into for-next)
Merging target-updates/for-next (54a5e73f4d6e tcm_qla2xxx Add SCSI command jammer/discard capability)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (a85742332511 Merge branch 'for-4.7' into for-next)
Merging pinctrl/for-next (58d73d264a02 Merge branch 'devel' into for-next)
Merging vhost/linux-next (e00f7bd22129 virtio: Silence uninitialized variable warning)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (0259cd1b6496 Merge remote-tracking branches 'remoteproc/rpmsg-next' and 'remoteproc/rproc-next' into for-next)
Merging gpio/for-next (d30a2b47d4c2 MIPS: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB)
CONFLICT (content): Merge conflict in arch/mips/Kconfig
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (4295ada2fe87 Merge branch 'for-4.7/pwm-atomic' into for-next)
Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (9ffee1c4be7c clk: qcom: mmcc-8996: Remove clocks that should be controlled by RPM)
CONFLICT (content): Merge conflict in drivers/clk/Kconfig
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (6eab37daf0ec tools: testing: define the _GNU_SOURCE macro)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (545a6c33f4a8 coresight: Handle build path error)
Merging rtc/rtc-next (854ec813cc23 rtc: rename so the tps6586x-rtc module can be autoloaded at boot)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (e897b3cc7a5a Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next)
Merging akpm-current/current (a758ba862244 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in include/linux/efi.h
CONFLICT (content): Merge conflict in arch/tile/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/book3s/64/pgtable.h
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (content): Merge conflict in arch/cris/Kconfig
Applying: mm-rename-_count-field-of-the-struct-page-to-_refcount-fix6
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm: make optimistic check for swapin readahead fix
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: mm: make mmap_sem for write waits killable for mm syscalls
Applying: mm: make vm_mmap killable
Applying: mm: make vm_munmap killable
Applying: mm, aout: handle vm_brk failures
Applying: mm, elf: handle vm_brk error
Applying: mm: make vm_brk killable
Applying: mm, proc: make clear_refs killable
Applying: mm, fork: make dup_mmap wait for mmap_sem for write killable
Applying: ipc, shm: make shmem attach/detach wait for mmap_sem killable
Applying: vdso: make arch_setup_additional_pages wait for mmap_sem for write killable
Applying: coredump: make coredump_wait wait for mmap_sem for write killable
Applying: aio: make aio_setup_ring killable
Applying: exec: make exec path waiting for mmap_sem killable
Applying: prctl: make PR_SET_THP_DISABLE wait for mmap_sem killable
Applying: uprobes: wait for mmap_sem for write killable
Applying: drm/i915: make i915_gem_mmap_ioctl wait for mmap_sem killable
Applying: drm/radeon: make radeon_mn_get wait for mmap_sem killable
Applying: drm/amdgpu: make amdgpu_mn_get wait for mmap_sem killable
Applying: drm/amdgpu: use ERR_PTR() to return from amdgpu_mn_get
Applying: kgdb: depends on VT
Merging akpm/master (240210845e20 kgdb: depends on VT)

linux-next: Tree for May 17

[Stephen Rothwell]

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

Hi all,

Changes since 20130516:

<crickets>

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

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 226 trees (counting Linus' and 31 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 (d5fe85a Merge tag 'pm+acpi-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging fixes/master (0279b3c Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging kbuild-current/rc-fixes (f66ba56 package: Makefile: unbreak binrpm-pkg target)
Merging arc-current/for-curr (81ec684 ARC: [mm] change semantics of __sync_icache_dcache() to inv d$ lines)
Merging arm-current/fixes (6eabb33 ARM: 7720/1: ARM v6/v7 cmpxchg64 shouldn't clear upper 32 bits of the old/new value)
Merging m68k-current/for-linus (f722406 Linux 3.10-rc1)
Merging powerpc-merge/merge (e34166a powerpc: Set show_unhandled_signals to 1 by default)
Merging sparc/master (de9c9f8 Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc)
Merging net/master (b0ce350 bonding: allow TSO being set on bonding master)
Merging ipsec/master (da241ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging sound-current/for-linus (436c4a0 ALSA: hda - Add headset mic support for another Dell machine)
Merging pci-current/for-linus (f722406 Linux 3.10-rc1)
Merging wireless/master (61f1598 Merge branch 'wireless')
Merging driver-core.current/driver-core-linus (9affd6b arm: fix mismerge of arch/arm/mach-omap2/timer.c)
Merging tty.current/tty-linus (f722406 Linux 3.10-rc1)
Merging usb.current/usb-linus (98f541c USB: remove remaining instances of USB_SUSPEND)
Merging staging.current/staging-linus (c2b62f6 staging: nvec: cleanup childs on remove)
Merging char-misc.current/char-misc-linus (f722406 Linux 3.10-rc1)
Merging input-current/for-linus (f0aacea Input: wacom - add a few new styli for Cintiq series)
Merging md-current/for-linus (32f9f57 MD: ignore discard request for hard disks of hybid raid1/raid10 array)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (286233e crypto: caam - fix inconsistent assoc dma mapping direction)
Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe())
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 irqdomain-current/irqdomain/merge (a0d271c Linux 3.6)
Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS)
Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error)
Merging gpio-current/gpio/merge (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect)
Merging rr-fixes/fixes (e5c4b5d module: Add section ".ref.data" into kmemleak-scan-area.)
Merging mfd-fixes/master (e9d7b4b mfd: db8500-prcmu: Update stored DSI PLL divider value)
Merging vfio-fixes/for-linus (904c680 vfio-pci: Fix possible integer overflow)
Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (fd5c9c3 ARC: Trim arcregs.h)
Merging arm/for-next (47aa03d Merge branches 'fixes', 'misc' and 'mmci' into for-next)
Merging arm-perf/for-next/perf (ab87304 Merge branches 'perf/fixes' and 'hw-breakpoint' into for-next/perf)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (64e3fd3 arm: zynq: Add support for pmu)
CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c
CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
CONFLICT (add/add): Merge conflict in arch/arm/mach-zynq/platsmp.c
CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/v2m.c
CONFLICT (content): Merge conflict in arch/arm/mach-spear/spear13xx.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c
CONFLICT (content): Merge conflict in arch/arm/mach-highbank/highbank.c
Merging arm64/upstream (02e3cba arm64: Do not source kernel/time/Kconfig explicitly)
Merging blackfin/blackfin-linus (5ae89ee bfin cache: dcplb map: add 16M dcplb map for BF60x)
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)
Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
Merging ia64/next (797f6a6 Add size restriction to the kdump documentation)
Merging m68k/for-next (f722406 Linux 3.10-rc1)
Merging m68knommu/for-next (2842e5b0 m68knommu: enable Timer on coldfire 532x)
Merging metag/for-next (164c013 metag: defconfigs: increase log buffer 8KiB => 128KiB)
Merging microblaze/next (972be32 microblaze: Initialize temp variable to remove compilation warning)
Merging mips/mips-for-linux-next (9c8ba3e Merge branch '3.10-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 (c1be5a5 Linux 3.9)
Merging powerpc/next (674825d Merge tag 'fixes-for-3.10-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (fdeaf0e powerpc/512x: add ifm ac14xx board)
Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
Merging s390/features (ba54229 s390/cio: add channel ID sysfs attribute)
Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
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 (9fc1894 arch/tile: Fix syscall return value passed to tracepoint)
Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (b341d84 xtensa: Switch to asm-generic/linkage.h)
Merging btrfs/next (667e7d9 Btrfs: allow superblock mismatch from older mkfs)
Merging ceph/testing (fc86406 libceph: must hold mutex for reset_changed_osds())
Merging cifs/for-next (c2b93e0 cifs: only set ops for inodes in I_NEW state)
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 (f6161aa Linux 3.9-rc2)
Merging ext3/for_next (e162b2f jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset)
Merging ext4/dev (e2555fd jbd,jbd2: fix oops in jbd2_journal_put_journal_head())
Merging f2fs/dev (f722406 Linux 3.10-rc1)
Merging fuse/for-next (de82b92 fuse: allocate for_background dio requests based on io->async state)
Merging gfs2/master (315debd GFS2: fix DLM depends to fix build errors)
Merging jfs/jfs-next (73aaa22 jfs: fix a couple races)
Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (2aed8b4 SUNRPC: Convert auth_gss pipe detection to work in namespaces)
Merging nfsd/nfsd-next (ba4e55b nfsd4: fix compile in !CONFIG_NFSD_V4_SECURITY_LABEL case)
Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (c1be5a5 Linux 3.9)
Merging ubifs/linux-next (c1be5a5 Linux 3.9)
Merging xfs/for-next (f722406 Linux 3.10-rc1)
Merging vfs/for-next (ac3e3c5 don't bother with deferred freeing of fdtables)
Merging pci/next (f722406 Linux 3.10-rc1)
Merging hid/for-next (f3d6ede Merge branch 'for-3.11/multitouch' into for-next)
Merging i2c/i2c/for-next (f722406 Linux 3.10-rc1)
Merging jdelvare-hwmon/master (1aaf6d3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging hwmon-staging/hwmon-next (d0a665e hwmon: (ds1621) Add ds1721 update interval sysfs attribute)
Merging v4l-dvb/master (1d62caa Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (f66ba56 package: Makefile: unbreak binrpm-pkg target)
Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
Merging libata/for-next (d3f0718 Merge branch 'for-3.10-fixes' into for-next)
Merging infiniband/for-next (f1258ea Merge branches 'misc' and 'mlx4' into for-next)
Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block)
Merging pm/linux-next (fe4ae24 Merge branch 'pnp-next' into linux-next)
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 cpuidle/cpuidle-next (817c876 Merge branch 'pm-fixes-next' into fixes-next)
CONFLICT (content): Merge conflict in drivers/base/power/qos.c
CONFLICT (content): Merge conflict in drivers/acpi/processor_driver.c
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (9d47550 thermal: rcar: Fix typo in probe information message)
Merging ieee1394/for-next (6fe9efb firewire: ohci: dump_stack() for PHY regs read/write failures)
Merging ubi/linux-next (1557b9e UBI: do not abort init when ubi.mtd devices cannot be found)
Merging dlm/next (9000831 dlm: avoid unnecessary posix unlock)
Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
Merging scsi/for-next (222ab59 [SCSI] ipr: Avoid target_destroy accessing memory after it was freed)
Merging target-updates/for-next (04b59ba tcm_vhost: Enable VIRTIO_SCSI_F_HOTPLUG)
Merging target-merge/for-next-merge (b8d26b3 iser-target: Add iSCSI Extensions for RDMA (iSER) target driver)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6734092 isci: add a couple __iomem annotations)
Merging slave-dma/next (9562f83 DMA: AT91: Get residual bytes in dma buffer)
Merging dmaengine/next (41ef2d5 Linux 3.9-rc7)
Merging net-next/master (dbbffe6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging ipsec-next/master (05600a7 xfrm_user: constify netlink dispatch table)
Merging wireless-next/master (f722406 Linux 3.10-rc1)
Merging bluetooth/master (26b5afc Bluetooth: Mgmt Device Found Event)
Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd)
Merging l2-mtd/master (fc228fa mtd: increase max OOB size to 744)
Merging crypto/master (00db14e crypto: sahara - remove dependency on EXPERIMENTAL)
Merging drm/drm-next (9f1d036 drm/mgag200: Fix framebuffer base address programming)
Merging drm-intel/for-linux-next (1ffc528 drm/i915: clear the stolen fb before resuming)
Merging sound/for-next (436c4a0 ALSA: hda - Add headset mic support for another Dell machine)
Merging sound-asoc/for-next (bc16b86 Merge remote-tracking branch 'asoc/topic/x86' into asoc-next)
Merging modules/modules-next (a53a11f3 modpost: fix unwanted VMLINUX_SYMBOL_STR expansion)
Merging virtio/virtio-next (01d779a caif_virtio: Remove bouncing email addresses)
Merging input/next (d520145 Input: w90p910_keypad - remove redundant platform_set_drvdata())
Merging input-mt/for-next (194664e Input: MT - handle semi-mt devices in core)
Merging cgroup/for-next (e691100 Merge branch 'for-3.11' into for-next)
Merging block/for-next (3ba25f6 Merge branch 'for-linus' into for-next)
Merging device-mapper/master (f722406 Linux 3.10-rc1)
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 (f722406 Linux 3.10-rc1)
Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command)
Merging slab/for-next (8a965b3 mm, slab_common: Fix bootstrap creation of kmalloc caches)
Merging uclinux/for-next (6dbe51c Linux 3.9-rc1)
Merging md/for-next (ae59b84 dm-raid: silence compiler warning on rebuilds_per_group.)
Merging mfd/master (43d61ee MAINTAINERS: Add Lee Jones as the MFD co-maintainer)
Merging battery/master (237a1b0 lp8788-charger: Fix kconfig dependency)
Merging fbdev/fbdev-next (a49f0d1 Linux 3.8-rc1)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning)
Merging regulator/for-next (0eeca66 Merge remote-tracking branch 'regulator/topic/isl6271a' into regulator-next)
Merging security/next (4726e8f security: clarify cap_inode_getsecctx description)
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (f722406 Linux 3.10-rc1)
Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
Merging iommu/next (0c4513b Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next)
Merging vfio/next (664e938 vfio: Set container device mode)
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 (071361d mm: Convert print_symbol to %pSR)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device)
Merging edac-amd/for-next (9713fae EDAC: Merge mci.mem_is_per_rank with mci.csbased)
Merging devicetree/devicetree/next (3132f62 Merge branch 'for-next' of git://sources.calxeda.com/kernel/linux into HEAD)
Merging dt-rh/for-next (a2b9ea7 Documentation/devicetree: make semantic of initrd-end more explicit)
Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration)
Merging spi-mb/for-next (4c1f4c9 Merge remote-tracking branch 'spi/topic/sirf' into spi-next)
Merging tip/auto-latest (57e87c1 Merge branch 'timers/urgent')
Merging ftrace/for-next (4c69e6e tracepoints: Prevent null probe from being added)
Merging rcu/rcu/next (4573e86 rcu: Switch to exedited grace periods for suspend as well as hibernation)
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 (f722406 Linux 3.10-rc1)
Merging kvm-arm/kvm-arm-next (b8022d7 arm: kvm: arch_timer: use symbolic constants)
CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c
CONFLICT (content): Merge conflict in arch/arm/include/asm/kvm_host.h
Merging kvm-ppc/kvm-ppc-next (5975a2e KVM: PPC: Book3S: Add API for in-kernel XICS emulation)
Merging oprofile/for-next (f722406 Linux 3.10-rc1)
Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
Merging xen-two/linux-next (f722406 Linux 3.10-rc1)
Merging xen-arm/linux-next (3cc8e40 xen/arm: rename xen_secondary_init and run it on every online cpu)
Merging percpu/for-next (a1b2a55 percpu: add documentation on this_cpu operations)
Merging workqueues/for-next (bbe2a23 Merge branch 'for-3.10-fixes' into for-next)
Merging drivers-x86/linux-next (a1ec56e Add support for fan button on Ideapad Z580)
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 (3615b6e Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (34185fe leds: lp5562: Properly setup of_device_id table)
Merging driver-core/driver-core-next (9affd6b arm: fix mismerge of arch/arm/mach-omap2/timer.c)
Merging tty/tty-next (f722406 Linux 3.10-rc1)
Merging usb/usb-next (e77c4e6 usb: misc: Fixed assignment error in if statement)
Merging usb-gadget/next (added5f ARM: mxs_defconfig: add CONFIG_USB_PHY)
Merging staging/staging-next (3030d40 staging: vt6655: use free_netdev instead of kfree)
Merging char-misc/char-misc-next (f722406 Linux 3.10-rc1)
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 (ed84825 Negative (setpoint-dirty) in bdi_position_ratio())
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (e5182b8 Merge branch 'devel' into for-next)
Merging vhost/linux-next (0107b9b x86: uaccess s/might_sleep/might_fault/)
CONFLICT (content): Merge conflict in drivers/vhost/test.c
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO)
Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO)
Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq)
Merging gpio/gpio/next (08ffb22 gpio: grgpio: Add irq support)
Merging gpio-lw/for-next (352a2d5 gpio/omap: ensure gpio context is initialised)
Merging gen-gpio/for_next (f4c5405 gpio: update gpio Chinese documentation)
Merging mailbox/dbx500-prcmu-mailbox (c497eba mailbox: fix invalid use of sizeof in mailbox_msg_send())
Merging arm-soc/for-next (a0cdbee Merge branch 'fixes' into for-next)
Merging bcm2835/for-next (31880c3 Linux 3.9-rc6)
Merging cortex/for-next (4477ca4 ARM: ARMv7-M: Allow the building of new kernel port)
Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (4a09469 Merge branch 'mxs/dt' into for-next)
Merging ixp4xx/next (19f949f Linux 3.8)
Merging msm/for-next (1df357a Merge branch 'msm-defconfig' into for-next)
Merging mvebu/for-next (2edd102 Merge branch 'mvebu/dt' into for-next)
Merging renesas/next (c482a65 Merge branch 'heads/soc-sh73a0' into next)
CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/Kconfig
CONFLICT (modify/delete): drivers/leds/leds-renesas-tpu.c deleted in renesas/next and modified in HEAD. Version HEAD of drivers/leds/leds-renesas-tpu.c left in tree.
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7740.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-lager.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-armadillo800eva.c
$ git rm -f drivers/leds/leds-renesas-tpu.c
Merging samsung/for-next (f722406 Linux 3.10-rc1)
Merging tegra/for-next (c1be5a5 Linux 3.9)
Merging dma-mapping/dma-mapping-next (c1be5a5 Linux 3.9)
Merging pwm/for-next (affb923 pwm: lpc32xx: Don't change PWM_ENABLE bit in lpc32xx_pwm_config)
Merging dma-buf/for-next (b89e356 dma-buf: Add debugfs support)
Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem)
Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines)
Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging clk/clk-next (fa079b9 clk: sun5i: Add compatibles for Allwinner A13)
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 scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
Merging akpm-current/current (e0fd9af Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/block/xsysace.c: fix id with missing port-number
Applying: rapidio: make enumeration/discovery configurable
Applying: rapidio: add enumeration/discovery start from user space
Applying: rapidio: documentation update for enumeration changes
Applying: fat: fix possible overflow for fat_clusters
Applying: wait: fix false timeouts when using wait_event_timeout()
Applying: mm: mmu_notifier: re-fix freed page still mapped in secondary MMU
Applying: mm-mmu_notifier-re-fix-freed-page-still-mapped-in-secondary-mmu-fix
Applying: ocfs2: unlock rw lock if inode lock failed
Applying: drivers/video: implement a simple framebuffer driver
Applying: mm: memcg: remove incorrect VM_BUG_ON for swap cache pages in uncharge
Applying: hfs: avoid crash in hfs_bnode_create
Applying: CPU hotplug: provide a generic helper to disable/enable CPU hotplug
Applying: cpu-hotplug-provide-a-generic-helper-to-disable-enable-cpu-hotplug-fix
Applying: cpu-hotplug-provide-a-generic-helper-to-disable-enable-cpu-hotplug-fix-fix
Applying: reboot: rigrate shutdown/reboot to boot cpu
Applying: shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size-fix
Applying: rapidio/tsi721: fix bug in MSI interrupt handling
Applying: mm compaction: fix of improper cache flush in migration code
Applying: kernel/audit_tree.c:audit_add_tree_rule(): protect `rule' from kill_rules()
Applying: ipcsem-fix-semctl-getzcnt-fix
Applying: ipcsem-fix-semctl-getncnt-fix
Applying: MAINTAINERS: update Hyper-V file list
Applying: kmsg: honor dmesg_restrict sysctl on /dev/kmsg
Applying: kmsg-honor-dmesg_restrict-sysctl-on-dev-kmsg-fix
Applying: drivers/char/random.c: fix priming of last_data
Applying: random: fix accounting race condition with lockless irq entropy_count update
Applying: sound/soc/codecs/si476x.c: don't use 0bNNN
Applying: x86: make 'mem=' option to work for efi platform
Applying: audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record
Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress
Applying: cyber2000fb: avoid palette corruption at higher clocks
Applying: posix_cpu_timer: consolidate expiry time type
Applying: posix_cpu_timers: consolidate timer list cleanups
Applying: posix_cpu_timers: consolidate expired timers check
Applying: selftests: add basic posix timers selftests
Applying: posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule()
Applying: posix_timers: Fix racy timer delta caching on task exit
Applying: drivers/infiniband/core/cm.c: convert to using idr_alloc_cyclic()
Applying: configfs: use capped length for ->store_attribute()
Applying: ipvs: change type of netns_ipvs->sysctl_sync_qlen_max
Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros
Applying: lglock: update lockdep annotations to report recursive local locks
Applying: block: restore /proc/partitions to not display non-partitionable removable devices
Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
Applying: clear_refs: sanitize accepted commands declaration
Applying: clear_refs: introduce private struct for mm_walk
Applying: pagemap: introduce pagemap_entry_t without pmshift bits
Applying: pagemap-introduce-pagemap_entry_t-without-pmshift-bits-v4
Applying: mm: soft-dirty bits for user memory changes tracking
Applying: pagemap: prepare to reuse constant bits with page-shift
Applying: mm/thp: use the correct function when updating access flags
Applying: mm, memcg: don't take task_lock in task_in_mem_cgroup
Applying: mm: remove free_area_cache
Applying: mm: remove compressed copy from zram in-memory
Applying: mm-remove-compressed-copy-from-zram-in-memory-fix
Applying: mm/page_alloc.c: fix watermark check in __zone_watermark_ok()
Applying: include/linux/mmzone.h: cleanups
Applying: include-linux-mmzoneh-cleanups-fix
Applying: mm: memmap_init_zone() performance improvement
Applying: drop_caches: add some documentation and info message
Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev
Applying: mm/dmapool.c: fix null dev in dma_pool_create()
Applying: memcg: debugging facility to access dangling memcgs
Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix
Applying: mm: add vm event counters for balloon pages compaction
Applying: err.h: IS_ERR() can accept __user pointers
Applying: dump_stack: serialize the output from dump_stack()
Applying: dump_stack-serialize-the-output-from-dump_stack-fix
Applying: panic: add cpu/pid to warn_slowpath_common in WARNING printk()s
Applying: panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix
Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq
Applying: backlight: atmel-pwm-bl: remove unnecessary platform_set_drvdata()
Applying: backlight: ep93xx: remove unnecessary platform_set_drvdata()
Applying: backlight: lp8788: remove unnecessary platform_set_drvdata()
Applying: backlight: pcf50633: remove unnecessary platform_set_drvdata()
Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask
Applying: lib/bitmap.c: speed up bitmap_find_free_region
Applying: lib-bitmapc-speed-up-bitmap_find_free_region-fix
Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
Applying: init: remove permanent string buffer from do_one_initcall()
Applying: autofs4: allow autofs to work outside the initial PID namespace
Applying: autofs4: translate pids to the right namespace for the daemon
Applying: rtc: rtc-88pm80x: remove unnecessary platform_set_drvdata()
Applying: drivers/rtc/rtc-v3020.c: remove redundant goto
Applying: drivers/rtc/interface.c: fix checkpatch errors
Applying: drivers/rtc/rtc-at32ap700x.c: fix checkpatch error
Applying: drivers/rtc/rtc-at91rm9200.c: include <linux/uaccess.h>
Applying: drivers/rtc/rtc-cmos.c: fix whitespace related errors
Applying: drivers/rtc/rtc-davinci.c: fix whitespace warning
Applying: drivers/rtc/rtc-ds1305.c: add missing braces around sizeof
Applying: drivers/rtc/rtc-ds1374.c: fix spacing related issues
Applying: drivers/rtc/rtc-ds1511.c: fix issues related to spaces and braces
Applying: drivers/rtc/rtc-ds3234.c: fix whitespace issue
Applying: drivers/rtc/rtc-fm3130.c: fix whitespace related issue
Applying: drivers/rtc/rtc-m41t80.c: fix spacing related issue
Applying: drivers/rtc/rtc-max6902.c: remove unwanted spaces
Applying: drivers/rtc/rtc-max77686.c: remove space before semicolon
Applying: drivers/rtc/rtc-max8997.c: remove space before semicolon
Applying: drivers/rtc/rtc-mpc5121.c: remove space before tab
Applying: drivers/rtc/rtc-msm6242.c: use pr_warn
Applying: drivers/rtc/rtc-mxc.c: fix checkpatch error
Applying: drivers/rtc/rtc-omap.c: include <linux/io.h> instead of <asm/io.h>
Applying: drivers/rtc/rtc-pcf2123.c: remove space before tabs
Applying: drivers/rtc/rtc-pcf8583.c: move assignment outside if condition
Applying: drivers/rtc/rtc-rs5c313.c: include <linux/io.h> instead of <asm/io.h>
Applying: drivers/rtc/rtc-rs5c313.c: fix spacing related issues
Applying: drivers/rtc/rtc-v3020.c: fix spacing issues
Applying: drivers/rtc/rtc-vr41xx.c: fix spacing issues
Applying: drivers/rtc/rtc-x1205.c: fix checkpatch issues
Applying: rtc: rtc-88pm860x: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ab3100: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ab8500: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-at32ap700x: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-at91rm9200: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-at91sam9: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-au1xxx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-bfin: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-bq4802: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-coh901331: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-da9052: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-da9055: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-davinci: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-dm355evm: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ds1302: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ep93xx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-jz4740: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-lp8788: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-lpc32xx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ls1x: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-m48t59: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-max8925: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-max8998: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-mc13xxx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-msm6242: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-mxc: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-nuc900: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-pcap: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-pm8xxx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-s3c: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-sa1100: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-sh: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-spear: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-stmp3xxx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-twl: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-vr41xx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-vt8500: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-m48t86: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-puv3: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-rp5c01: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-tile: remove unnecessary platform_set_drvdata()
Applying: reiserfs: fix deadlock with nfs racing on create/lookup
Applying: fat: additions to support fat_fallocate
Applying: fat-additions-to-support-fat_fallocate-fix
Applying: idr: print a stack dump after ida_remove warning
Applying: idr-print-a-stack-dump-after-ida_remove-warning-fix
Applying: mwave: fix info leak in mwave_ioctl()
Applying: rapidio/switches: remove tsi500 driver
Applying: drivers/parport/share.c: use kzalloc
Applying: drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
Applying: drivers-w1-slaves-w1_ds2408c-add-magic-sequence-to-disable-p0-test-mode-fix
Applying: relay: fix timer madness
Applying: aio: reqs_active -> reqs_available
Applying: aio: percpu reqs_available
Applying: generic dynamic per cpu refcounting
Applying: aio: percpu ioctx refcount
Applying: aio: use xchg() instead of completion_lock
Applying: block: prep work for batch completion
Applying: block-prep-work-for-batch-completion-fix-2
Applying: block-prep-work-for-batch-completion-fix-3
Applying: block-prep-work-for-batch-completion-fix-3-fix
Applying: block-prep-work-for-batch-completion-fix-99
Applying: block-aio-batch-completion-for-bios-kiocbs-fix
Applying: block, aio: batch completion for bios/kiocbs
Applying: virtio-blk: convert to batch completion
Applying: mtip32xx: convert to batch completion
Applying: aio: fix kioctx not being freed after cancellation at exit time
Applying: lib: add weak clz/ctz functions
Applying: decompressor: add LZ4 decompressor module
Applying: lib: add support for LZ4-compressed kernel
Applying: kbuild: fix for updated LZ4 tool with the new streaming format
Applying: arm: add support for LZ4-compressed kernel
Applying: arm: Remove enforced Os flag for LZ4 decompressor
Applying: x86: add support for LZ4-compressed kernel
Applying: x86, doc: Add LZ4 magic number for the new compression
Applying: lib: add lz4 compressor module
Applying: lib-add-lz4-compressor-module-fix
Applying: crypto: add lz4 Cryptographic API
Applying: crypto-add-lz4-cryptographic-api-fix
Applying: scripts/sortextable.c: fix building on non-Linux systems
Applying: seccomp: add generic code for jitted seccomp filters.
Applying: ARM: net: bpf_jit: make code generation less dependent on struct sk_filter.
Applying: ARM: bpf_jit: seccomp filtering: fixup merge conflict
Applying: ARM: net: bpf_jit: add support for jitted seccomp filters.
Applying: bpf: add comments explaining the schedule_work() operation
Merging akpm/master (f2614fe bpf: add comments explaining the schedule_work() operation)

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

linux-next: Tree for May 17

[Stephen Rothwell]

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

Hi all,

Things do get busy at this time of the release cycle, don't they?  ;-(

Changes since 201205016:

The nfs tree lost its build failure.

The crypto tree gained a conflict against the powerpc tree.

The drm tree gained a build failure so I used the version from
next-20120516.

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

The battery tree still had its build failure for which I reverted 2
commits.

The kvm-ppc tree lost its build failure.

The staging tree lost its build failure.

The arm-soc tree gained more against the arm and staging trees.

The akpm tree gained a conflict against the arm-soc tree and lost 2
patches that turned up elsewhere.

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

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
and sparc64 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 189 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

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

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

$ git checkout master
$ git reset --hard stable
Merging origin/master (0e93b4b Merge git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
Merging kbuild-current/rc-fixes (e88aa7b Fix modpost failures in fedora 17)
Merging arm-current/fixes (9b61a4d ARM: prevent VM_GROWSDOWN mmaps extending below FIRST_USER_ADDRESS)
Merging ep93xx-current/ep93xx-fixes (2b3c83e dmaengine/ep93xx_dma: Implement double buffering for M2M DMA channels)
Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices)
Merging powerpc-merge/merge (7c0482e powerpc/irq: Fix another case of lazy IRQ state getting out of sync)
Merging sparc/master (d60b9c1 Merge branch 'parisc' (PA-RISC compile fixes))
Merging net/master (26a5d3c netfilter: ipset: fix hash size checking in kernel)
Merging sound-current/for-linus (21363cf Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging wireless/master (671267b Bluetooth: mgmt: Fix device_connected sending order)
Merging driver-core.current/driver-core-linus (69964ea Linux 3.4-rc5)
Merging tty.current/tty-linus (d48b97b Linux 3.4-rc6)
Merging usb.current/usb-linus (d48b97b Linux 3.4-rc6)
Merging staging.current/staging-linus (69964ea Linux 3.4-rc5)
Merging char-misc.current/char-misc-linus (e816b57 Linux 3.4-rc3)
Merging input-current/for-linus (899c612 Input: synaptics - fix regression with "image sensor" trackpads)
Merging md-current/for-linus (b16b1b6 md/bitmap: fix calculation of 'chunks' - missing shift.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (511d63c crypto: talitos - properly lock access to global talitos registers)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (3c3c801 Merge branch 'sh/urgent' into sh-fixes-for-linus)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (766644d of/irq: add empty irq_of_parse_and_map() for non-dt builds)
Merging spi-current/spi/merge (ba2092c spi/topcliff: use correct __devexit_p annotation)
Merging gpio-current/gpio/merge (2760f7a gpio/exynos: Fix compiler warnings when non-exynos machines are selected)
Merging arm/for-next (ea7631d Merge branch 'v3-removal' into for-next)
Merging arm-perf/for-next/perf (c16fa4f Linux 3.3)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging renesas/next (f2f1cee Merge branch 'renesas-soc-core' into renesas-next)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (bb1ab0f Merge branch 'next/board-samsung' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (fd17314 blackfin: license: Change ADI BSD license to standart 3 clause BSD license for blackfin arch code.)
Merging c6x/for-linux-next (fce2447 C6X: add support to build with BINFMT_ELF_FDPIC)
Merging cris/for-next (7b91747 cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile)
Merging hexagon/linux-next (4bd8193 various Kconfig cleanup and old platform build code removal)
Merging ia64/next (4035c6d [IA64] Liberate the signal layer from IA64 assembler)
Merging m68k/for-next (f25e918 m68k: Setup CROSS_COMPILE at the top)
Merging m68knommu/for-next (a9025e06 m68knommu: unaligned.h fix for M68000 core)
Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o)
Merging mips/mips-for-linux-next (a6e4ad8 Merge branches 'fixes-for-linus', 'module.h-fixes', 'cavium', 'next/ath79' and 'next/lantiq' into mips-for-linux-next)
Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic syscall)
Merging parisc/for-next (b3cb867 [PARISC] fix panic on prefetch(NULL) on PA7300LC)
Merging powerpc/next (11ff17d powerpc: Fixing a cputhread code documentation)
Merging 4xx/next (dce4c92 powerpc/40x: Use {upper,lower}_32_bits for msi_phys)
Merging mpc5xxx/next (f8d5842 powerpc: Option FB_FSL_DIU is not really optional for mpc512x)
Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0)
Merging s390/features (a7475af s390/ap: Fix wrong or missing comments)
Merging sh/sh-latest (fd37e75 sh64: Set additional fault code values.)
Merging sparc-next/master (e1d7de8 sparc: introduce arch/sparc/Kbuild)
Merging tile/master (9c27eda arch/tile: tilegx PCI root complex support)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (b7f6519 rbd: correct sysfs snap attribute documentation)
Merging cifs/for-next (dec4f1e cifs: Include backup intent search flags during searches {try #2))
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 (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
Merging ext3/for_next (aa9e939 ext2: remove the redundant comment for ext2_export_ops)
Merging ext4/dev (f1d470b ext4: add metadata checksumming to the list of supported features)
Merging fuse/for-next (203627b fuse: fix blksize calculation)
Merging gfs2/master (500242a GFS2: Fix quota adjustment return code)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (ea9265c Merge branches 'bugfixes', 'nfs-for-next' and 'devel' into linux-next)
Merging nfsd/nfsd-next (8709743 nfsd: wrap all accesses to st_deny_bmap)
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (01627d9 Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux)
Merging ubifs/linux-next (5953b51 UBI: rename few functions for consistency)
Merging xfs/for-next (1307bbd xfs: protect xfs_sync_worker with s_umount semaphore)
Merging vfs/for-next (9448152 sch_atm.c: get rid of poinless extern)
Merging pci/next (5420e46 microblaze/PCI: fix "io_offset undeclared" error)
Merging hid/for-next (e941547 Merge branch 'wacom' into for-next)
Merging quilt/i2c (f7c1584 i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING)
Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
Merging i2c-embedded/i2c-embedded/for-next (9868a06 i2c: davinci: Free requested IRQ in remove)
Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (ade7444 hwmon: (it87) Make temp3 attribute conditional for IT8782F)
Merging v4l-dvb/master (9545062 Merge /home/v4l/v4l/for_upstream)
CONFLICT (content): Merge conflict in drivers/usb/gadget/uvc_queue.c
Merging kbuild/for-next (82f4625 Merge branches 'kbuild/kbuild' and 'kbuild/kconfig' into kbuild/for-next)
CONFLICT (content): Merge conflict in arch/sparc/boot/Makefile
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (8d899e7 libata-eh don't waste time retrying media errors (v3))
Merging infiniband/for-next (18acef8 Merge branches 'nes' and 'qib' into for-next)
Merging acpi/next (29bdc67 Merge branch 'pss-workaround' into next)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (8527f8e firewire: core: fw_device_refresh(): clean up error handling)
Merging ubi/linux-next (d48b97b Linux 3.4-rc6)
Merging dlm/next (1e08f90 dlm: improve shrink efficiency)
Merging scsi/for-next (c2ca01e Merge branch 'misc' into for-next)
Merging target-updates/for-next (6624661 target: add support for the WRITE_VERIFY command)
Merging target-merge/for-next-merge (ef872d2 Merge branch 'qla-target-merge' into for-next-merge)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (5d8f50d merge: devel rnc-devel fixes)
Merging slave-dma/next (1dd1ea8 dmaengine: at_hdmac: take maxburst from slave configuration)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (be3eed2 netfilter: nf_ct_h323: fix usage of MODULE_ALIAS_NFCT_HELPER)
CONFLICT (content): Merge conflict in net/ceph/osdmap.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be.h
CONFLICT (content): Merge conflict in arch/sparc/Makefile
Applying: net: arch/sparc/Makefile merge fixup
Merging wireless-next/master (05f8f25 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next)
Merging bluetooth/master (d839c81 Bluetooth: Report proper error number in disconnection)
Merging mtd/master (85cd83f JFFS2: Add parameter to reserve disk space for root)
Merging l2-mtd/master (a14b4e0 mtd: clean up uclinux.c map driver)
CONFLICT (content): Merge conflict in drivers/mtd/nand/plat_nand.c
CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/ixdp425-setup.c
Merging crypto/master (ef45b83 crypto: aesni-intel - move more common code to ablk_init_common)
CONFLICT (content): Merge conflict in drivers/crypto/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/devices-common.h
Merging drm/drm-next (6cf20be x86/vga: set the default device from the fixup.)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/gma500/psb_drv.c
$ git reset --hard HEAD^
Merging refs/next/20120516/drm
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/gma500/psb_drv.c
[master 60490ee] Merge commit 'refs/next/20120516/drm'
Merging sound/for-next (fd33bfe Merge branch 'topic/hda-switcheroo' into for-next)
Merging sound-asoc/for-next (66b9998 Merge branch 'for-3.5' into asoc-next)
Merging quilt/rr (f20fa7b brlocks/lglocks: turn into functions)
Merging input/next (829c4f9 Input: spear-keyboard - add device tree bindings)
Merging input-mt/for-next (66f75a5 Linux 3.4-rc4)
Merging cgroup/for-next (0d4dde1 res_counter: Account max_usage when calling res_counter_charge_nofail())
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging block/for-next (d634e669 Merge branch 'for-3.5/core' into for-next)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging quilt/device-mapper (0f7a379 After the failure of a group of paths, any alternative paths that need initialising do not become available until further I/O is sent to the device.  Until this has happened, ioctls return -EAGAIN.)
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 (f6f4459 mmc: core: Remove dead code)
Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
Merging slab/for-next (b80b6c0 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (4463ee9 md: check the return of mddev_find())
Merging mfd/for-next (68308a8 mfd: Convert wm831x to irq_domain)
$ git reset --hard HEAD^
Merging refs/next/20120511/mfd
Merging battery/master (fcc015c smb347-charger: Clean up battery attributes)
[master 7b91da5] Revert "smb347-charger: Clean up battery attributes"
[master 44740ed] Revert "smb347-charger: Convert to regmap API"
Merging fbdev/fbdev-next (5e7b911 drivers/video: fsl-diu-fb: don't initialize the THRESHOLDS registers)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (05dd0f5 OMAPDSS: DISPC: Update Accumulator configuration for chroma plane)
Merging regulator/for-next (4923b48 regulator: da9052: Convert to set_voltage_sel and map_voltage)
Merging security/next (fbbb456 ima: fix filename hint to reflect script interpreter name)
CONFLICT (content): Merge conflict in include/linux/filter.h
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging selinux/master (c737f82 SELinux: remove unused common_audit_data in flush_unauthorized_files)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (70045f2 watchdog: s3c2410_wdt: Set timeout to actually achieved timeout)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (ce74cec Merge branches 'iommu/fixes', 'dma-debug', 'arm/omap' and 'arm/tegra' into next)
Merging osd/linux-next (72749a2 exofs: Cap on the memcpy() size)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (c0a788c net: Fix tcp_build_and_update_options comment in struct tcp_sock)
CONFLICT (modify/delete): sound/soc/imx/Kconfig deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of sound/soc/imx/Kconfig left in tree.
$ git rm -f sound/soc/imx/Kconfig
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (8188f14 Merge branch 'pm-acpi' into linux-next)
Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
Merging edac/linux_next (a4b4be3 edac: rename channel_info to rank_info)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries)
Merging spi/spi/next (6d6467e spi/ep93xx: clean probe/remove routines)
Merging tip/auto-latest (82cdd72 Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/sparc/include/asm/thread_info_32.h
CONFLICT (content): Merge conflict in arch/sparc/Kconfig
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
CONFLICT (content): Merge conflict in Makefile
Applying: kbuild: merge fix for sorting exceptions tables at build time
Merging rcu/rcu/next (dc36be4 Merge branches 'barrier.2012.05.09a', 'fixes.2012.04.26a', 'inline.2012.05.02b' and 'srcu.2012.05.07b' 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 kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
Merging kvm/linux-next (d54e423 KVM: x86 emulator: convert bsf/bsr instructions to emulate_2op_SrcV_nobyte())
CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_para.h
CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_segment.S
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging kvm-ppc/kvm-ppc-next (2a9195b KVM: PPC: Book3S HV: Fix bug leading to deadlock in guest HPT updates)
Merging oprofile/for-next (c16fa4f Linux 3.3)
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
Merging xen-two/linux-next (bdb1a8b Revert "xen: EXPORT_SYMBOL set_phys_to_machine")
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (641b695 percpu: remove percpu_xxx() functions)
CONFLICT (content): Merge conflict in arch/x86/mm/tlb.c
Merging workqueues/for-next (4d82a1d lockdep: fix oops in processing workqueue)
Merging drivers-x86/linux-next (ad229c5 toshiba_acpi: Add support for transflective LCD)
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 (6550334 mfd: wm8994: Update to fully use irq_domain)
CONFLICT (content): Merge conflict in drivers/base/regmap/regmap.c
CONFLICT (content): Merge conflict in drivers/base/regmap/regmap-irq.c
CONFLICT (content): Merge conflict in drivers/base/regmap/internal.h
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (94ca629 uio_pdrv_genirq: get irq through platform resource if not set otherwise)
Merging tty/tty-next (55e4b8b Revert "serial_core: Update buffer overrun statistics.")
Merging usb/usb-next (0b623f8 Revert "USB: serial: sierra: put reset_resume callback back.")
CONFLICT (modify/delete): drivers/usb/core/inode.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/core/inode.c left in tree.
CONFLICT (content): Merge conflict in drivers/input/tablet/wacom_wac.c
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/mach-universal_c210.c
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/mach-nuri.c
$ git rm -f drivers/usb/core/inode.c
Merging staging/staging-next (16b91a4 staging: iio: rename and prefix CONSTANTs to distinguish between HMC5843 and HMC5883)
CONFLICT (modify/delete): drivers/staging/serial/68360serial.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/serial/68360serial.c left in tree.
CONFLICT (modify/delete): drivers/staging/quatech_usb2/quatech_usb2.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/quatech_usb2/quatech_usb2.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/line6/driver.c
CONFLICT (content): Merge conflict in drivers/staging/android/Makefile
CONFLICT (content): Merge conflict in drivers/staging/android/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/misc/Makefile
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in drivers/Kconfig
$ git rm -f drivers/staging/serial/68360serial.c drivers/staging/quatech_usb2/quatech_usb2.c
Merging char-misc/char-misc-next (9912143 parport: remove unused dead code from lowlevel drivers)
CONFLICT (content): Merge conflict in drivers/extcon/extcon-max8997.c
Merging tmem/linux-next (0f1ea93 Merge branch 'stable/frontswap.v14' into linux-next)
Merging writeback/writeback-for-next (169ebd9 writeback: Avoid iput() from flusher thread)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (d3ed76c pinctrl: pinctrl-imx: add imx51 pinctrl driver)
CONFLICT (content): Merge conflict in drivers/pinctrl/core.c
CONFLICT (content): Merge conflict in Documentation/driver-model/devres.txt
Merging tegra/for-next (ef14f5c Merge branch 'for-3.5/defconfig2' into for-next)
Merging moduleh/for-sfr (d48b97b Linux 3.4-rc6)
Merging vhost/linux-next (53ffd22 virtio-net: remove useless disable on freeze)
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
CONFLICT (content): Merge conflict in drivers/Kconfig
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (d48b97b Linux 3.4-rc6)
Merging irqdomain/irqdomain/next (e7cc3ac dt: fix twl4030 for non-dt compile on x86)
Merging gpio/gpio/next (453007cf Merge branch 'for_3.5/gpio/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next)
CONFLICT (content): Merge conflict in drivers/gpio/gpio-samsung.c
Merging arm-soc/for-next (cda6f4d ARM: ux500: fix mismerge in for-next)
CONFLICT (content): Merge conflict in sound/soc/mxs/mxs-saif.c
CONFLICT (content): Merge conflict in lib/Makefile
CONFLICT (content): Merge conflict in drivers/mtd/nand/gpmi-nand/gpmi-nand.c
CONFLICT (modify/delete): drivers/mfd/ab5500-core.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/mfd/ab5500-core.c left in tree.
CONFLICT (content): Merge conflict in drivers/gpio/gpio-samsung.c
CONFLICT (content): Merge conflict in drivers/dma/imx-sdma.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in arch/arm/plat-omap/counter_32k.c
CONFLICT (content): Merge conflict in arch/arm/mach-lpc32xx/common.c
CONFLICT (modify/delete): arch/arm/mach-ixp23xx/roadrunner.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/roadrunner.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp23xx/pci.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/pci.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp23xx/ixdp2351.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/ixdp2351.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp23xx/include/mach/platform.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/include/mach/platform.h left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/pci.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/pci.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/ixdp2x01.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/ixdp2x01.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/ixdp2800.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/ixdp2800.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/ixdp2400.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/ixdp2400.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/include/mach/platform.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/include/mach/platform.h left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/enp2611.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/enp2611.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/common.c
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig
CONFLICT (content): Merge conflict in arch/arm/boot/dts/at91sam9g20.dtsi
CONFLICT (content): Merge conflict in arch/arm/Kconfig
$ git rm -f drivers/mfd/ab5500-core.c
$ git rm -f -r arch/arm/mach-ixp2000 arch/arm/mach-ixp23xx
Merging ep93xx/ep93xx-cleanup (a1eacd7 arm: ep93xx: use gpio_led_register_device)
Merging kvmtool/master (cdb90a0 kvm tools: increase amount of virtio-9p FIDs)
Merging dma-mapping/dma-mapping-next (bb2b213 Merge branch 'for-next-other' into for-next)
CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h
Merging dma-buf/for-next (1541130 dma-buf: mmap support)
Merging userns/for-next (b38a86e userns: Convert the move_pages, and migrate_pages permission checks to use uid_eq)
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: pagemap.h: fix warning about possibly used before init var
Applying: umem: fix up unplugging
Applying: cciss: fix incorrect scsi status reporting
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: arch/x86/include/asm/spinlock.h: fix comment
Applying: avr32: don't mask signals in the error path
Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
Applying: avr32: use block_sigmask()
Applying: m32r: use set_current_blocked() and block_sigmask()
Applying: m68k: use set_current_blocked() and block_sigmask()
Applying: mn10300: use set_current_blocked() and block_sigmask()
Applying: cpuidle: remove unused hrtimer_peek_ahead_timers() call
Applying: cpuidle: add checks to avoid NULL pointer dereference
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: cris: select GENERIC_ATOMIC64
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: ia64: use set_current_blocked() and block_sigmask()
Applying: microblaze: don't reimplement force_sigsegv()
Applying: microblaze: no need to reset handler if SA_ONESHOT
Applying: microblaze: fix signal masking
Applying: microblaze: use set_current_blocked() and block_sigmask()
Applying: score: don't mask signals if we fail to setup signal stack
Applying: score: use set_current_blocked() and block_sigmask()
Applying: h8300: use set_current_blocked() and block_sigmask()
Applying: drivers/thermal/spear_thermal.c: add Device Tree probing capability
Applying: unicore32: use block_sigmask()
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: drivers/scsi/ufs: use module_pci_driver
Applying: drivers/scsi/ufs: reverse the ufshcd_is_device_present logic
Applying: drivers/scsi/ufs: fix incorrect return value about SUCCESS and FAILED
Applying: drivers/scsi/atp870u.c: fix bad use of udelay
Applying: vfs: increment iversion when a file is truncated
Applying: fs: symlink restrictions on sticky directories
Applying: fs: hardlink creation restrictions
Applying: fsnotify: remove unused parameter from send_to_group()
Applying: fsnotify: handle subfiles' perm events
Applying: blackfin: use set_current_blocked() and block_sigmask()
Applying: mm/memory_failure: let the compiler add the function name
Applying: mm/mempolicy.c: use enum value MPOL_REBIND_ONCE in mpol_rebind_policy()
Applying: mm/hugetlb.c: use long vars instead of int in region_count()
Applying: mm, thp: remove unnecessary ret variable
Applying: mm, thp: allow fallback when pte_alloc_one() fails for huge pmd
Applying: mm: remove swap token code
Applying: mm: vmscan: remove lumpy reclaim
Applying: mm: vmscan: do not stall on writeback during memory compaction
Applying: mm: vmscan: remove reclaim_mode_t
Applying: hugetlb: rename max_hstate to hugetlb_max_hstate
Applying: hugetlbfs: don't use ERR_PTR with VM_FAULT* values
Applying: hugetlbfs: add an inline helper for finding hstate index
Applying: hugetlb: use mmu_gather instead of a temporary linked list for accumulating pages
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2
Applying: hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb
Applying: hugetlb: simplify migrate_huge_page()
Applying: memcg: add HugeTLB extension
Applying: memcg-add-hugetlb-extension-fix
Applying: memcg-add-hugetlb-extension-fix-fix
Applying: hugetlb: add charge/uncharge calls for HugeTLB alloc/free
Applying: memcg: track resource index in cftype private
Applying: hugetlbfs: add memcg control files for hugetlbfs
Applying: memcg: use scnprintf instead of sprintf
Applying: hugetlbfs-add-memcg-control-files-for-hugetlbfs-use-scnprintf-instead-of-sprintf-fix
Applying: hugetlbfs: add a list for tracking in-use HugeTLB pages
Applying: memcg: move HugeTLB resource count to parent cgroup on memcg removal
Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix
Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix-fix
Applying: hugetlb: migrate memcg info from oldpage to new page during migration
Applying: hugetlb-migrate-memcg-info-from-oldpage-to-new-page-during-migration-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2
Applying: memcg: add memory controller documentation for hugetlb management
Applying: mm: fix off-by-one bug in print_nodes_state()
Applying: mm: use kcalloc() instead of kzalloc() to allocate array
Applying: mm/mmap.c: find_vma(): remove unnecessary if(mm) check
Applying: mm-mmapc-find_vma-remove-unnecessary-ifmm-check-fix
Applying: mm/fork: fix overflow in vma length when copying mmap on clone
Applying: mm/vmstat.c: remove debug fs entries on failure of file creation and made extfrag_debug_root dentry local
Applying: mm: correctly synchronize rss-counters at exit/exec
Applying: thp, memcg: split hugepage for memcg oom on cow
Applying: mm: do_migrate_pages() calls migrate_to_node() even if task is already on a correct node
Applying: mm-do_migrate_pages-calls-migrate_to_node-even-if-task-is-already-on-a-correct-node-fix
Applying: mm: do_migrate_pages(): rename arguments
Applying: kernel: cgroup: push rcu read locking from css_is_ancestor() to callsite
Applying: mm: memcg: count pte references from every member of the reclaimed hierarchy
Applying: mm-memcg-count-pte-references-from-every-member-of-the-reclaimed-hierarchy-fix
Applying: mm: rename is_mlocked_vma() to mlocked_vma_newpage()
Applying: mm-rename-is_mlocked_vma-to-mlocked_vma_newpage-fix
Applying: mm, thp: drop page_table_lock to uncharge memcg pages
Applying: Documentation: memcg: future proof hierarchical statistics documentation
Applying: Cross Memory Attach: make it Kconfigurable
Applying: bug: introduce BUILD_BUG_ON_INVALID() macro
Applying: bug: completely remove code generated by disabled VM_BUG_ON()
Applying: x86: print e820 physical addresses consistently with other parts of kernel
Applying: x86: print physical addresses consistently with other parts of kernel
Applying: swiotlb: print physical addresses consistently with other parts of kernel
Applying: mm: print physical addresses consistently with other parts of kernel
Applying: kbuild: install kernel-page-flags.h
Applying: tools/vm/page-types.c: cleanups
Applying: mm: move is_vma_temporary_stack() declaration to huge_mm.h
Applying: mm/page_alloc.c: remove pageblock_default_order()
Applying: mm: bootmem: fix checking the bitmap when finally freeing bootmem
Applying: mm: bootmem: remove redundant offset check when finally freeing bootmem
Applying: mm: bootmem: rename alloc_bootmem_core to alloc_bootmem_bdata
Applying: mm: bootmem: split out goal-to-node mapping from goal dropping
Applying: mm: bootmem: allocate in order node+goal, goal, node, anywhere
Applying: mm: bootmem: unify allocation policy of (non-)panicking node allocations
Applying: mm: nobootmem: panic on node-specific allocation failure
Applying: mm: nobootmem: unify allocation policy of (non-)panicking node allocations
Applying: mm: bootmem: pass pgdat instead of pgdat->bdata down the stack
Applying: mm: remove sparsemem allocation details from the bootmem allocator
Applying: mm-remove-sparsemem-allocation-details-from-the-bootmem-allocator-fix
Applying: mm: compaction: handle incorrect MIGRATE_UNMOVABLE type pageblocks
Applying: memcg: fix/change behavior of shared anon at moving task
Applying: memcg swap: mem_cgroup_move_swap_account never needs fixup
Applying: memcg swap: use mem_cgroup_uncharge_swap()
Applying: mm/memcg: scanning_global_lru means mem_cgroup_disabled
Applying: mm/memcg: move reclaim_stat into lruvec
Applying: mm: push lru index into shrink_[in]active_list()
Applying: mm-push-lru-index-into-shrink_active_list-fix
Applying: mm: mark mm-inline functions as __always_inline
Applying: mm: remove lru type checks from __isolate_lru_page()
Applying: mm/memcg: kill mem_cgroup_lru_del()
Applying: memcg: mark more functions/variables as static
Applying: memcg: remove unused variable
Applying: memcg: mark stat field of mem_cgroup struct as __percpu
Applying: memcg: remove redundant parentheses
Applying: memcg: make threshold index in the right position
Applying: memcg: revise the position of threshold index while unregistering event
Applying: mm/memcg: use vm_swappiness from target memory cgroup
Applying: memcg: add mlock statistic in memory.stat
Applying: memcg-add-mlock-statistic-in-memorystat-fix
Applying: mm/vmscan: store "priority" in struct scan_control
Applying: mm: add link from struct lruvec to struct zone
Applying: mm/vmscan: push lruvec pointer into isolate_lru_pages()
Applying: mm/vmscan: push zone pointer into shrink_page_list()
Applying: mm/vmscan: remove update_isolated_counts()
Applying: mm/vmscan: push lruvec pointer into putback_inactive_pages()
Applying: mm/vmscan: replace zone_nr_lru_pages() with get_lruvec_size()
Applying: mm/vmscan: push lruvec pointer into inactive_list_is_low()
Applying: mm/vmscan: push lruvec pointer into shrink_list()
Applying: mm/vmscan: push lruvec pointer into get_scan_count()
Applying: mm/vmscan: push lruvec pointer into should_continue_reclaim()
Applying: mm/vmscan: kill struct mem_cgroup_zone
Applying: security/keys/keyctl.c: suppress memory allocation failure warning
Applying: frv: use set_current_blocked() and block_sigmask()
Applying: um/kernel/trap.c: port OOM changes to handle_page_fault()
Applying: sgi-xp: use lockdep_assert_held()
Applying: drivers/scsi/aha152x.c: remove broken usage of spin_is_locked()
Applying: XFS: fix lock ASSERT on UP
Applying: mm/huge_memory.c: use lockdep_assert_held()
Applying: futex: use lockdep_assert_held() for lock checking
Applying: drivers/net/irda/sir_dev.c: remove spin_is_locked()
Applying: drivers/net/ethernet/smsc/smsc911x.h: use lockdep_assert_held() instead of home grown buggy construct
Applying: spinlocks.txt: add a discussion on why spin_is_locked() is bad
Applying: spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix
Applying: include/linux/spinlock.h: add a kerneldoc comment to spin_is_locked() that discourages its use
Applying: checkpatch: check for spin_is_locked()
Applying: CodingStyle: add kmalloc_array() to memory allocators
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: introduce SIZE_MAX
Applying: locking: add KERN_CONT when needed to self test
Applying: x86, NMI: add missing KERN_CONT to NMI selftest
Applying: ISDN: add missing KERN_CONT
Applying: clk: add non CONFIG_HAVE_CLK routines
Applying: clk: remove redundant depends on from drivers/Kconfig
Applying: i2c/i2c-pxa: remove conditional compilation of clk code
Applying: usb/marvell: remove conditional compilation of clk code
Applying: usb/musb: remove conditional compilation of clk code
Applying: ata/pata_arasan: remove conditional compilation of clk code
Applying: ata/sata_mv: remove conditional compilation of clk code
CONFLICT (content): Merge conflict in drivers/ata/sata_mv.c
Applying: net/c_can: remove conditional compilation of clk code
Applying: net/stmmac: remove conditional compilation of clk code
Applying: gadget/m66592: remove conditional compilation of clk code
Applying: gadget/r8a66597: remove conditional compilation of clk code
Applying: usb/host/r8a66597: remove conditional compilation of clk code
Applying: kernel/resource.c: correct the comment of allocate_resource()
Applying: sethostname/setdomainname: notify userspace when there is a change in uts_kern_table
Applying: NMI watchdog: fix for lockup detector breakage on resume
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix
Applying: watchdog: fix for lockup detector breakage on resume
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-v2-fix
Applying: task_work_add: generic process-context callbacks
Applying: genirq: reimplement exit_irq_thread() hook via task_work_add()
Applying: hexagon: do_notify_resume() needs tracehook_notify_resume()
Applying: keys: change keyctl_session_to_parent() to use task_work_add()
Applying: keys: kill the dummy key_replace_session_keyring()
Applying: keys: kill task_struct->replacement_session_keyring
Applying: kernel/irq/manage.c: use the pr_foo() infrastructure to prefix printks
Applying: vsprintf: correctly handle width when '#' flag used in %#p format.
Applying: vsprintf-correctly-handle-width-when-flag-used-in-%p-format-checkpatch-fixes
Applying: vsprintf: further optimize decimal conversion
Applying: vsprintf-further-optimize-decimal-conversion-v2
Applying: vsprintf-further-optimize-decimal-conversion-checkpatch-fixes
Applying: hamradio/scc: orphan driver in MAINTAINERS
Applying: MAINTAINERS: remove Alessandro
Applying: blacklight: remove redundant spi driver bus initialization
Applying: lcd: add callbacks for early fb event blank support
Applying: fbdev: add events for early fb event support
Applying: drivers/video/backlight/apple_bl.c: include header for exported symbol prototypes
Applying: drivers-video-backlight-apple_blc-include-header-for-exported-symbol-prototypes-fix
Applying: backlight: add LM3533 backlight driver
Applying: backlight-add-lm3533-backlight-driver-fix
Applying: backlight-add-lm3533-backlight-driver-fix-fix
Applying: drivers/leds/leds-lp5521.c: fix lp5521_read() error handling
Applying: leds: driver for DA9052/53 PMIC v2
Applying: leds-led-module-for-da9052-53-pmic-v2-fix
Applying: leds: add LED driver for lm3556 chip
Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes
Applying: leds: lm3556: don't call kfree for the memory allocated by devm_kzalloc
Applying: leds: simple_strtoul() cleanup
Applying: leds: Use kcalloc instead of kzalloc to allocate array
Applying: leds: add new field to led_classdev struct to save activation state
Applying: leds: change existing triggers to use activated flag
Applying: leds: change ledtrig-timer to use activated flag
Applying: include/linux/led-lm3530.h: comment correction about the range of brightness
Applying: drivers/leds/leds-lm3530.c: simplify als configuration on initialization
Applying: leds: heartbeat: stop on shutdown
Applying: leds-heartbeat-stop-on-shutdown-v5
Applying: leds-heartbeat-stop-on-shutdown-checkpatch-fixes
Applying: leds: add new transient trigger for one shot timer activation
Applying: drivers/leds/leds-pca955x.c: fix race condition while setting brightness on several LEDs
Applying: list_debug: WARN for adding something already in the list
Applying: lib/test-kstrtox.c: mark const init data with __initconst instead of __initdata
Applying: lib/string_helpers.c: make arrays static
Applying: lib/bitmap.c: fix documentation for scnprintf() functions
Applying: vsprintf: fix %ps on non symbols when using kallsyms
Applying: spinlock_debug: print kallsyms name for lock
Applying: radix-tree: fix preload vector size
Applying: lib/vsprintf.c: "%#o",0 becomes '0' instead of '00'
Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
Applying: init: disable sparse checking of the mount.o source files
Applying: rtc/spear: add Device Tree probing capability
Applying: drivers/rtc/rtc-ep93xx.c: convert to use module_platform_driver()
Applying: rtc: add ioctl to get/clear battery low voltage status
Applying: drivers/rtc/rtc-pcf8563.c: add RTC_VL_READ/RTC_VL_CLR ioctl feature
Applying: drivers/rtc/Kconfig: place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
Applying: rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
Applying: rtc-rename-config_rtc_mxc-to-config_rtc_drv_mxc-fix
Applying: rtc: ds1307: remove superfluous initialization
Applying: rtc: ds1307: add trickle charger support
Applying: drivers/rtc/rtc-m41t93.c: don't let get_time() reset M41T93_FLAG_OF
Applying: drivers/rtc/rtc-lpc32xx.c: add device tree support
Applying: nilfs2: flush disk caches in syncing
Applying: HPFS: remove PRINTK() macro
Applying: fat: introduce special inode for managing the FSINFO block
Applying: fat: introduce mark_fsinfo_dirty helper
Applying: fat: mark superblock as dirty less often
Applying: fat: switch to fsinfo_inode
Applying: kmod: unexport call_usermodehelper_freeinfo()
Applying: kmod: convert two call sites to call_usermodehelper_fns()
Applying: kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
Applying: kmod.c: fix kernel-doc warning
Applying: kmod: avoid deadlock from recursive kmod call
Applying: cred: remove task_is_dead() from __task_cred() validation
Applying: stack usage: add pid to warning printk in check_stack_usage
Applying: proc: clean up /proc/<pid>/environ handling
Applying: proc-clean-up-proc-pid-environ-handling-checkpatch-fixes
Applying: proc: unify ptrace_may_access() locking code
Applying: proc: remove mm_for_maps()
Applying: proc: use mm_access() instead of ptrace_may_access()
Applying: proc: don't do dummy rcu_read_lock/rcu_read_unlock on error path
Applying: proc: pass "fd" by value in /proc/*/{fd,fdinfo} code
Applying: procfs: use more apprioriate types when dumping /proc/N/stat
Applying: proc: report file/anon bit in /proc/pid/pagemap
Applying: proc/smaps: carefully handle migration entries
Applying: proc/smaps: show amount of nonlinear ptes in vma
Applying: proc/smaps: show amount of hwpoison pages
Applying: proc: use IS_ERR_OR_NULL()
Applying: fork: call complete_vfork_done() after clearing child_tid and flushing rss-counters
Applying: cpu: introduce clear_tasks_mm_cpumask() helper
Applying: arm: use clear_tasks_mm_cpumask()
Applying: powerpc: use clear_tasks_mm_cpumask()
Applying: sh: use clear_tasks_mm_cpumask()
Applying: blackfin: a couple of task->mm handling fixes
Applying: blackfin: fix possible deadlock in decode_address()
Applying: um: should hold tasklist_lock while traversing processes
Applying: um: fix possible race on task->mm
Applying: um: properly check all process' threads for a live mm
Applying: kernel/cpu.c: document clear_tasks_mm_cpumask()
Applying: kernel-cpuc-document-clear_tasks_mm_cpumask-fix
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: ipc/mqueue: cleanup definition names and locations
Applying: ipc/mqueue: switch back to using non-max values on create
Applying: ipc/mqueue: enforce hard limits
Applying: ipc/mqueue: update maximums for the mqueue subsystem
Applying: ipc/mqueue: using vmalloc requires including vmalloc.h
Applying: mqueue: revert bump up DFLT_*MAX
Applying: mqueue: don't use kmalloc with KMALLOC_MAX_SIZE
Applying: mqueue: separate mqueue default value from maximum value
Applying: selftests: add mq_open_tests
Applying: ipc/mqueue: improve performance of send/recv
Applying: ipc-mqueue-improve-performance-of-send-recv-fix
Applying: ipc/mqueue: correct mq_attr_ok test
Applying: ipc-mqueue-correct-mq_attr_ok-test-fix
Applying: ipc/mqueue: strengthen checks on mqueue creation
Applying: ipc-mqueue-strengthen-checks-on-mqueue-creation-fix
Applying: tools/selftests: add mq_perf_tests
Applying: tools-selftests-add-mq_perf_tests-checkpatch-fixes
Applying: rapidio: add DMA engine support for RIO data transfers
Applying: rapidio/tsi721: add DMA engine support
Applying: pidns: use task_active_pid_ns in do_notify_parent
Applying: pidns: guarantee that the pidns init will be the last pidns process reaped
Applying: pidns: make killed children autoreap
Applying: pidns-make-killed-children-autoreap-checkpatch-fixes
Applying: eventfd: change int to __u64 in eventfd_signal()
Applying: eventfd-change-int-to-__u64-in-eventfd_signal-fix
Applying: aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: c/r: fs, proc: Move children entry back to tid_base_stuff
Applying: syscalls, x86: add __NR_kcmp syscall
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8 comment update
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-comment-update-fix
Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
Applying: c/r: prctl: simplify PR_SET_MM on mm::code/data assignment
Applying: c-r-prctl-simplify-pr_set_mm-on-mm-code-data-assignment-fix
Applying: c/r: prctl: return -EFAULT instead of -EINVAL in case if underlied VMA is not found
Applying: c/r: prctl: add ability to set new mm_struct::exe_file
Applying: c/r: prctl: update prctl_set_mm_exe_file() after mm->num_exe_file_vmas removal
Applying: c/r: prctl: add ability to get clear_tid_address
Applying: c/r: prctl: drop VMA flags test on PR_SET_MM_ stack data assignment
Applying: kconfig: update compression algorithm info
Applying: notify_change(): check that i_mutex is held
Applying: isdn-add-missing-kern_cont-fix
Merging quilt/akpm (8536dd6 isdn-add-missing-kern_cont-fix)

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

linux-next: Tree for May 17

[Stephen Rothwell]

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

Hi all,

Changes since 20110516:

Dropped trees: xen

The net tree gained conflicts against the net-current tree.

The wireless tree lost its build failure.

The tip tree gained conflicts against the sparc and wireless trees.

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

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/v2.6/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
and sparc64 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 191 trees (counting Linus' and 28 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.

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
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
CONFLICT (content): Merge conflict in drivers/net/Kconfig
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
CONFLICT (content): Merge conflict in include/linux/pci_ids.h
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/vmxnet3/vmxnet3_ethtool.c
CONFLICT (content): Merge conflict in net/core/dev.c
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn-tx.c
CONFLICT (content): Merge conflict in net/mac80211/sta_info.h
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging cpufreq-move/move-drivers
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_stats.c
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc_pio.c
Merging kgdb/kgdb-next
Merging slab/for-next
CONFLICT (content): Merge conflict in mm/slub.c
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/mfd/twl4030-power.c
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dsi.c
CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dss_features.c
CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dss_features.h
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
CONFLICT (content): Merge conflict in drivers/mfd/Makefile
Merging security-testing/next
CONFLICT (content): Merge conflict in include/linux/capability.h
Merging selinux/master
CONFLICT (content): Merge conflict in lib/flex_array.c
CONFLICT (content): Merge conflict in security/selinux/avc.c
CONFLICT (content): Merge conflict in security/selinux/hooks.c
CONFLICT (content): Merge conflict in security/selinux/ss/policydb.c
CONFLICT (content): Merge conflict in security/smack/smack_lsm.c
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging suspend/linux-next
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/sparc/kernel/smp_32.c
CONFLICT (content): Merge conflict in net/mac80211/agg-tx.c
Merging rcu/rcu/next
Merging kvm/linux-next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig
CONFLICT (content): Merge conflict in drivers/platform/x86/Makefile
CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c
CONFLICT (content): Merge conflict in drivers/platform/x86/sony-laptop.c
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
CONFLICT (content): Merge conflict in arch/alpha/include/asm/unistd.h
CONFLICT (content): Merge conflict in arch/alpha/kernel/systbls.S
CONFLICT (content): Merge conflict in arch/m68k/kernel/entry_mm.S
Merging driver-core/driver-core-next
CONFLICT (content): Merge conflict in fs/debugfs/file.c
Merging tty/tty-next
CONFLICT (content): Merge conflict in drivers/bluetooth/hci_ldisc.c
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
Merging usb/usb-next
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-nuri.c
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/intel_sst/intelmid.c
CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_pci.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_pci.c left in tree.
CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_usb.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_usb.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/usbip/vhci_sysfs.c
$ git rm -f drivers/staging/rt2860/common/cmm_data_pci.c drivers/staging/rt2860/common/cmm_data_usb.c
Merging slabh/slabh
Merging bkl-config/config
Merging cleancache/linux-next
Merging arm-dt/devicetree/arm-next
Merging scsi-post-merge/merge-base:master

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

linux-next: Tree for May 17

[Stephen Rothwell]

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

Hi all,

We are in the merge window again.  I remind you all not to add stuff for
2.6.36 to your linux-next trees until after 2.6.35-rc1.

Changes since 20100514:

Dropped trees: tmio-mmc (long unresolved conflicts and unable to fetch)
	hwlat (at the maintainer's request)

The msm tree lost its conflict.

The ceph tree lost its conflicts.

The net tree lost a conflct, but gained conflicts against Linus tree and
the m68k tree.

The input tree lost a conflict.

The pcmcia tree gained a conflict against the mtd tree.

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

The devicetree tree gained conflicts against the powerpc and i2c trees.

The tip tree lost its build failure.

The staging-next tree conflicts against the rr and pcmcia trees.

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

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/v2.6/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
and sparc64 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 162 trees (counting Linus' and 22 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 Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.

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
http://www.canb.auug.org.au/~sfr/
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/for-linus
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging gcl-current/merge
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Applying: arm: update gfp/slab.h includes
Merging davinci/davinci-next
Applying: davinci: update gfp/slab.h includes
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/oprofile/op_model_loongson2.c
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
Merging sparc/master
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Applying: ocfs2: update gfp/slab.h includes
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
CONFLICT (content): Merge conflict in fs/9p/vfs_super.c
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
CONFLICT (content): Merge conflict in fs/cifs/file.c
CONFLICT (content): Merge conflict in fs/namei.c
CONFLICT (content): Merge conflict in fs/nfs/inode.c
CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c
CONFLICT (content): Merge conflict in fs/nfsd/vfs.c
CONFLICT (content): Merge conflict in fs/ufs/inode.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c
CONFLICT (content): Merge conflict in security/tomoyo/realpath.c
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Applying: v4l-dvb: update gfp/slab.h includes
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Applying: acpi: update gfp/slab.h includes
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
CONFLICT (content): Merge conflict in kernel/fork.c
CONFLICT (content): Merge conflict in tools/perf/builtin-record.c
Merging dlm/next
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-dev.h
CONFLICT (content): Merge conflict in include/linux/if_link.h
CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h
CONFLICT (content): Merge conflict in scripts/mod/file2alias.c
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-dev.h
Applying: wireless: update gfp/slab.h includes
Merging mtd/master
Applying: mtd: update gfp/slab.h includes
Merging crypto/master
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas_tf/if_usb.c
CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h
CONFLICT (content): Merge conflict in scripts/mod/file2alias.c
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ext3/fsync.c
CONFLICT (content): Merge conflict in fs/ext4/fsync.c
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/mtd/maps/pcmciamtd.c
CONFLICT (content): Merge conflict in drivers/net/pcmcia/3c589_cs.c
CONFLICT (content): Merge conflict in drivers/net/wireless/orinoco/orinoco_cs.c
CONFLICT (content): Merge conflict in drivers/net/wireless/orinoco/spectrum_cs.c
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
$ git reset --hard HEAD^
Merging refs/next/20100507/backlight
Merging kgdb/kgdb-next
Applying: kgdb: update for sysrq handling change
Applying: kdb: update gfp/slab.h includes
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/dma/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/timb_dma.c
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r300.c
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Applying: wireless: update for pm_qos_requirement to pm_qos_request rename
Merging bluetooth/master
Merging fsnotify/for-next
Applying: fsnotify: update gfp/slab.h includes
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging drbd/for-jens
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Applying: vbus: use of kzalloc/kfree requires the include of slab.h
Applying: vbus: update gfp/slab.h includes
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
CONFLICT (content): Merge conflict in drivers/serial/mpc52xx_uart.c
Applying: fixup arch/powerpc/kernel/vio.c
Merging spi/next-spi
Merging omap_dss2/for-next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in kernel/Makefile
CONFLICT (content): Merge conflict in kernel/fork.c
CONFLICT (content): Merge conflict in tools/perf/builtin-record.c
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging bkl-core/bkl/core
Merging bkl-procfs/bkl/procfs
Merging bkl-ioctl/bkl/ioctl
CONFLICT (content): Merge conflict in arch/cris/arch-v10/drivers/ds1302.c
CONFLICT (content): Merge conflict in drivers/block/pktcdvd.c
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/platform.c
Applying: md: fixup for sysfs_get_dirent API change
Merging quilt/tty
CONFLICT (content): Merge conflict in include/linux/tty.h
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/input/tablet/acecad.c
CONFLICT (content): Merge conflict in drivers/input/tablet/kbtab.c
CONFLICT (content): Merge conflict in drivers/input/tablet/wacom_sys.c
CONFLICT (content): Merge conflict in drivers/media/video/gspca/gspca.c
CONFLICT (delete/modify): sound/usb/usbaudio.c deleted in HEAD and modified in quilt/usb. Version quilt/usb of sound/usb/usbaudio.c left in tree.
$ git rm -f sound/usb/usbaudio.c
Applying: usb: update gfp/slab.h includes
Applying: sound: fixup for usb_buffer_alloc/free rename
Merging staging-next/staging-next
CONFLICT (rename/modify): Merge conflict in drivers/staging/hv/hv.c
CONFLICT (delete/modify): drivers/staging/arlan/arlan-main.c deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/arlan/arlan-main.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/cb_das16_cs.c
CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-alsa.c
CONFLICT (content): Merge conflict in drivers/staging/dt3155/dt3155_drv.c
CONFLICT (delete/modify): drivers/staging/netwave/netwave_cs.c deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/netwave/netwave_cs.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/rtl8187se/r8180_core.c
CONFLICT (delete/modify): drivers/staging/wavelan/wavelan.c deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/wavelan/wavelan.c left in tree.
CONFLICT (delete/modify): drivers/staging/wavelan/wavelan_cs.c deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/wavelan/wavelan_cs.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/wlags49_h2/wl_cs.c
$ git rm -f drivers/staging/arlan/arlan-main.c
$ git rm -f drivers/staging/netwave/netwave_cs.c
$ git rm -f drivers/staging/wavelan/wavelan.c
$ git rm -f drivers/staging/wavelan/wavelan_cs.c
Merging slabh/slabh
Merging scsi-post-merge/master

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