Hi all, Changes since 20150729: The nfsd tree gained a conflict against Linus' tree. The net-next tree gained a conflict against the net tree. The drm-misc tree gained a conflict against Linus' tree. The block tree gained conflicts against the ext3 and f2fs trees and a build failure for which I applied a fix patch. The akpm-current tree lost its build failure. Non-merge commits (relative to Linus' tree): 4787 4876 files changed, 232494 insertions(+), 112420 deletions(-) ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 224 trees (counting Linus' and 32 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx $ git checkout master $ git reset --hard stable Merging origin/master (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) Merging fixes/master (c7e9ad7da219 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) Merging arm-current/fixes (0871b7248113 ARM: fix __virt_to_idmap build error on !MMU) Merging m68k-current/for-linus (1214c525484c m68k: Use for_each_sg()) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-fixes/fixes (120d200a8627 macintosh/ans-lcd: fix build failure after module_init/exit relocation) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging sparc/master (4a10a91756ef Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit) Merging net/master (7ae90a4f9648 bridge: mdb: fix delmdb state in the notification) Merging ipsec/master (158cd4af8ded packet: missing dev_put() in packet_do_bind()) Merging sound-current/for-linus (342e84490574 ALSA: hda - Fix race between PM ops and HDA init/probe) Merging pci-current/for-linus (c9ddbac9c891 PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition) Merging wireless-drivers/master (df2cd4586f17 Merge tag 'iwlwifi-for-kalle-2015-06-12' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (cbfe8fa6cd67 Linux 4.2-rc4) Merging tty.current/tty-linus (cbfe8fa6cd67 Linux 4.2-rc4) Merging usb.current/usb-linus (84b6b023cb33 Merge tag 'fixes-for-v4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) Merging usb-gadget-fixes/fixes (4248bd7d3e2c usb: gadget: f_printer: actually limit the number of instances) Merging usb-serial-fixes/usb-linus (74472233233f USB: sierra: add 1199:68AB device ID) Merging staging.current/staging-linus (cbfe8fa6cd67 Linux 4.2-rc4) Merging char-misc.current/char-misc-linus (cbfe8fa6cd67 Linux 4.2-rc4) Merging input-current/for-linus (3213afb8bf5c Revert "Input: zforce - don't overwrite the stack") Merging crypto-current/master (17fb874dee09 hwrng: core - correct error check of kthread_run call) Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) Merging rr-fixes/fixes (fe0d34d242fa module: weaken locking assertion for oops path.) Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue) Merging kselftest-fixes/fixes (fee50f3c8427 selftests/futex: Fix futex_cmp_requeue_pi() error handling) Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) Merging drm-intel-fixes/for-linux-next-fixes (ee0a227b7ac6 drm/i915: Replace WARN inside I915_READ64_2x32 with retry loop) Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic) Merging arc/for-next (450ed0db011d ARCv2: allow selection of page size for MMUv4) Merging arm/for-next (45358ea7bc40 Merge branches 'fixes', 'fiq', 'misc', 'omap-barrier' and 'pcmcia' into for-next) CONFLICT (content): Merge conflict in arch/arm/include/asm/Kbuild Merging arm-perf/for-next/perf (73d9b01e4184 arm: perf: factor arm_pmu core out to drivers) CONFLICT (content): Merge conflict in drivers/perf/arm_pmu.c Merging arm-soc/for-next (afaddf076fcd arm-soc: document merges) Merging at91/at91-next (dd1f58f398fb Merge branch 'at91-4.2-dt' into at91-next) Merging bcm2835/for-next (b2776bf7149b Linux 3.18) Merging berlin/berlin/for-next (d770e558e219 Linux 4.2-rc1) Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) Merging imx-mxs/for-next (45aa2ab9a4e0 Merge branch 'imx/defconfig' into for-next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw54xx.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw53xx.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw52xx.dtsi Merging keystone/next (a6ba4234e474 ARM: dts: k2l: fix the netcp range size) Merging mvebu/for-next (4cc669a6a937 Merge branch 'mvebu/config' into mvebu/for-next) Merging omap/for-next (a0ea0dda273a Merge tag 'omap-for-v4.3/dt-dm814x' into for-next) Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c Merging qcom/qcom/for-next (ca8c78b44e67 ARM: dts: ifc6410: add inforce LVDS panel support) Merging renesas/next (c0ab9ba5d2b0 Merge branch 'heads/dt-for-v4.3' into next) CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7779.c CONFLICT (modify/delete): arch/arm/mach-shmobile/board-marzen.c deleted in renesas/next and modified in HEAD. Version HEAD of arch/arm/mach-shmobile/board-marzen.c left in tree. CONFLICT (modify/delete): arch/arm/mach-shmobile/board-marzen-reference.c deleted in renesas/next and modified in HEAD. Version HEAD of arch/arm/mach-shmobile/board-marzen-reference.c left in tree. $ git rm -f arch/arm/mach-shmobile/board-marzen-reference.c arch/arm/mach-shmobile/board-marzen.c Merging rpi/for-rpi-next (50b674b89355 Merge branches 'for-rpi-next-soc' and 'for-rpi-next-dt' into for-rpi-next) Merging samsung/for-next (9456110eb381 Merge branch 'v4.3-next/clk-cpufreq-samsung' into for-next) Merging samsung-krzk/for-next (a67151993ad6 Merge remote-tracking branch 'remotes/krzk-github/for-v4.3/samsung-cpufreq' into for-next) Merging sunxi/sunxi/for-next (5de4b42a3a6d Merge branch 'sunxi/dt-for-4.3' into sunxi/for-next) Merging tegra/for-next (66a41f4ac17e Merge branch for-4.3/defconfig into for-next) Merging arm64/for-next/core (6c020ea8dc3a arm64/Documentation: clarify wording regarding memory below the Image) Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) Merging c6x/for-linux-next (960a2741d5fd c67: irq: Use __handle_domain_irq()) Merging cris/for-next (1e4d6e13d050 cris: don't use module_init for non-modular core eeprom.c code) CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild Merging h8300/h8300-next (99bcfda85f66 Revert "asm-generic: {get,put}_user ptr argument evaluate only 1 time") Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) Merging ia64/next (ae40b7e28752 Merge branch 'misc-4.2' into next) Merging m68k/for-next (1214c525484c m68k: Use for_each_sg()) Merging m68knommu/for-next (cea36619a7a3 m68k/coldfire/pit: Migrate to new 'set-state' interface) Merging metag/for-next (7ce0c22b0787 metag/irq: Use access helper irq_data_get_affinity_mask()) Merging microblaze/next (c4fa9a6ae285 microblaze/PCI: Remove unnecessary struct pci_dev declaration) Merging mips/mips-for-linux-next (9ceb953ee6e1 Merge branch '4.2-fixes' into mips-for-linux-next) Merging nios2/nios2-next (a8955cc3a504 nios2: check number of timer instances) Merging parisc-hd/for-next (9d37e6679dfd Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) Merging powerpc/next (79cd95200035 powerpc/eeh: Dump PHB diag-data for non-existing PE) Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) Merging fsl/next (f1b3b4450dcb powerpc/85xx: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760) Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) Merging s390/features (2a01bd1bd3d2 s390/pci: use pci_rescan_remove_lock) Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging tile/master (44775935e388 tile: enable full SECCOMP support) Merging uml/linux-next (46acfb806813 um: Fix out-of-tree build) Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) Merging xtensa/for_next (1203b34261e4 xtensa: fix threadptr reload on return to userspace) Merging btrfs/next (5a5003df98d5 btrfs: delayed-ref: double free in btrfs_add_delayed_tree_ref()) Merging ceph/master (64c1797a9371 libceph: Remove spurious kunmap() of the zero page) Merging cifs/for-next (6468ffb3e9da cifs: Fix use-after-free on mid_q_entry) Merging ecryptfs/next (6d65261a09ad eCryptfs: don't pass fs-specific ioctl commands through) Merging ext3/for_next (926631c2012d ext4: memory leak on error in ext4_symlink()) Merging ext4/dev (bb9a4e7e824e ext4 crypto: fix spelling typo in comment) Merging f2fs/dev (0145e822619c f2fs: handle error cases in commit_inmem_pages) Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry) Merging gfs2/for-next (ea79f0ec7a38 GFS2: Make ht_parms static) Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock) Merging nfs/linux-next (956325bd55bb Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma) Merging nfsd/nfsd-next (a70df3f082c1 sunrpc: Switch to using hash list instead single list) CONFLICT (content): Merge conflict in fs/nfs/nfs42proc.c Merging orangefs/for-next (e0107f2e63e4 Orangefs: address problems found by static checker) Merging overlayfs/overlayfs-next (cdb672795876 ovl: lookup whiteouts outside iterate_dir()) Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) Merging v9fs/for-next (3d99e3fe13d4 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile) Merging ubifs/linux-next (669d3d123395 UBI: Remove unnecessary `\') Merging xfs/for-next (5461ad99cab9 Merge branch 'xfs-meta-uuid' into for-next) Merging file-locks/linux-next (ee296d7c5709 locks: inline posix_lock_file_wait and flock_lock_file_wait) Merging vfs/for-next (0f1db7dee200 9p: cope with bogus responses from server in p9_client_{read,write}) Merging pci/next (bc0195aad0da Linux 4.2-rc2) Merging hid/for-next (7fd651f16407 Merge branch 'for-4.2/upstream-fixes' into for-next) Merging i2c/i2c/for-next (19e0ff423382 i2c: omap: fix cleanup regression) Merging jdelvare-hwmon/master (902fd32b7711 hwmon: (k10temp) Remove duplicate pci-id define) Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging hwmon-staging/hwmon-next (2159acdcdbf6 hwmon: (nct7802) Add auto_point attributes) Merging v4l-dvb/master (5bab86243d94 [media] media/pci/cobalt: fix Kconfig and build when SND is not enabled) Merging kbuild/for-next (31d61069530b Merge branch 'kbuild/kconfig' into kbuild/for-next) Merging kconfig/for-next (b953c0d234bc Linux 4.1) Merging libata/for-next (e058860daadc Merge branch 'for-4.2-fixes' into for-next) Merging pm/linux-next (4834d6b37437 Merge branch 'acpi-pm-next' into linux-next) Merging idle/next (a576d08d4eb2 Merge branches 'cpuidle' and 'turbostat' into release) Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) Merging thermal/next (eda118f6d479 Merge branches 'for-rc' and 'thermal-core' of .git into next) Merging thermal-soc/next (b89384e9e8c0 Merge branch 'work-linus' into work-next) Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs) Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks) Merging swiotlb/linux-next (023600f192be swiotlb: do not export map_single function) Merging slave-dma/next (db084c00acb7 Merge branch 'fixes' into next) Merging net-next/master (71382bc0431e net: netcp: Fixes efuse mac addr swap on k2e and k2l) CONFLICT (content): Merge conflict in net/ipv4/ip_fragment.c CONFLICT (content): Merge conflict in net/bridge/br_multicast.c CONFLICT (content): Merge conflict in arch/s390/net/bpf_jit_comp.c Merging ipsec-next/master (0b42c2863b3b Merge branch 'arm-bpf-next') Merging wireless-drivers-next/master (92ff7a698bad bcma: fix build error when build as module) Merging bluetooth/master (fa4cf04e65cb Bluetooth: hci_h5: Cleaned up coding style warnings) Merging rdma/for-next (8e4349d13f33 IB/mad: Add final OPA MAD processing) Merging mtd/master (5f867db63473 mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict) Merging l2-mtd/master (43163022927b mtd: m25p80: allow arbitrary OF matching for "jedec,spi-nor") Merging crypto/master (caa8c508494c crypto: qat - remove unnecessary list iteration) Merging drm/drm-next (dcd14dd957f0 Merge tag 'topic/connector-locking-2015-07-23' of git://anongit.freedesktop.org/drm-intel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c Merging drm-panel/drm/panel/for-next (4946b0430c69 drm/panel: simple: Add bus format for HannStar HSD100PXN1) Merging drm-intel/for-linux-next (8453580cb883 drm/i915: Fix command parser table validator) Merging drm-tegra/drm/tegra/for-next (8a8005e3e199 drm/tegra: dpaux: Registers are 32-bit) Merging drm-misc/topic/drm-misc (1c473be11958 drm: Fixup locking WARNINGs in drm_mode_config_reset) CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c Merging drm-exynos/exynos-drm/for-next (93e97be0ef1c drm/exynos: move order to register vidi kms driver) Merging drm-msm/msm-next (e05ed095a634 drm/msm: Enable clocks during enable/disable_vblank() callbacks) Merging sound/for-next (527c465a3c87 Merge branch 'for-linus' into for-next) Merging sound-asoc/for-next (7f4db0d20088 Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm8996' and 'asoc/topic/xtensa' into asoc-next) Merging modules/modules-next (20bdc2cfdbc4 modules: only use mod->param_lock if CONFIG_MODULES) Merging input/next (d257f2980feb Input: tsc2005 - convert to gpiod) Merging block/for-next (89c5a5c7f990 Merge branch 'for-4.3/core' into for-next) CONFLICT (content): Merge conflict in fs/f2fs/data.c CONFLICT (content): Merge conflict in block/bounce.c Applying: block: lustre: temporary fix for bio_endio API change Merging device-mapper/for-next (795e633a2dc6 dm cache: fix device destroy hang due to improper prealloc_used accounting) Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) Merging mmc-uh/next (77a5f675e2d8 mmc: block: add fixup of broken CMD23 for Sandisk card) CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw54xx.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw53xx.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw52xx.dtsi Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) Merging md/for-next (1d1581197320 md-cluster: Read the disk bitmap sb and check if it needs recovery) Merging mfd/for-mfd-next (45bc1e960d6a mfd: da9062: Support for the DA9063 OnKey in the DA9062 core) Applying: ACPI / PM: merge fix for code movement Merging backlight/for-backlight-next (cca0ba2df3d4 backlight: Change the return type of backlight_update_status() to int) Merging battery/master (3e1d9c6f2419 power: olpc_battery: clean up eeprom read function) Merging omap_dss2/for-next (f778dad38a54 Merge omapdss scaling fixes) Merging regulator/for-next (7f5dee2d35a7 Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next) Merging security/next (730daa164e7c Yama: remove needless CONFIG_SECURITY_YAMA_STACKED) Merging integrity/next (24fd03c87695 ima: update builtin policies) Merging selinux/next (fda4d578ed0a selinux: explicitly declare the role "base_r") Merging lblnet/next (b2776bf7149b Linux 3.18) Merging watchdog/master (1c4c7159ed24 Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) Merging iommu/next (289903b0b819 Merge branch 'iommu/fixes' into next) Merging dwmw2-iommu/master (5dbaf90a6780 iommu/vt-d: Add initial shell of SVM support) Merging vfio/next (a714ea5fa416 MAINTAINERS: Add vfio-platform sub-maintainer) Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) Merging jc_docs/docs-next (7c97211b61d8 Documentation: Minor changes to men-chameleon-bus.txt) Merging trivial/for-next (79ce48df755e lpfc: Grammar s/an negative/a negative/) Merging audit/next (0b08c5e59441 audit: Fix check of return value of strnlen_user()) Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) Merging dt-rh/for-next (76f90d76c27a of: Add vendor prefix for Sharp Microelectronics) Merging mailbox/mailbox-for-next (7d641938aa2a mailbox/bcm2835: Fix mailbox full detection.) Merging spi/for-next (44c344bc16ae Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/spidev', 'spi/topic/stats' and 'spi/topic/xcomm' into spi-next) Merging tip/auto-latest (5ba02b9f290c Merge branch 'x86/platform') CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7779.c CONFLICT (modify/delete): arch/arm/mach-shmobile/intc-sh73a0.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/arm/mach-shmobile/intc-sh73a0.c left in tree. $ git rm -f arch/arm/mach-shmobile/intc-sh73a0.c Merging clockevents/clockevents/next (6fd817226ae6 clockevents/drivers/timer-sp804: Migrate to new 'set-state' interface) Merging edac/linux_next (fa2ce64f85be sb_edac: support for Broadwell -EP and -EX) Merging edac-amd/for-next (f586abe27a44 EDAC, ppc4xx: Access mci->csrows array elements properly) Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next) Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) Merging ftrace/for-next (b44754d8262d ring_buffer: Allow to exit the ring buffer benchmark immediately) Merging rcu/rcu/next (623f41bedea6 rcu: Silence lockdep false positive for expedited grace periods) CONFLICT (content): Merge conflict in arch/x86/kernel/traps.c Merging kvm/linux-next (549283037017 KVM: svm: handle KVM_X86_QUIRK_CD_NW_CLEARED in svm_get_mt_mask) Merging kvm-arm/next (f6596a60303f arm64: KVM: remove remaining reference to vgic_sr_vectors) Merging kvm-ppc/kvm-ppc-next (b79013b2449c Merge tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) Merging kvms390/next (c92ea7b9f7d2 KVM: s390: log capability enablement and vm attribute changes) Merging xen-tip/linux-next (e98f79cc5de0 xen-blkfront: convert to blk-mq APIs) Merging percpu/for-next (292c24a073ee percpu: clean up of schunk->map[] assignment in pcpu_setup_first_chunk) Merging workqueues/for-next (badb7f5e8bdd workqueue: add myself as a dedicated reviwer) Merging drivers-x86/for-next (3e07e5baa2af toshiba_acpi: Add set_fan_status function) Merging chrome-platform/for-next (96cba9b00e29 platform/chrome: chromeos_laptop - instantiate Atmel at primary address) Merging regmap/for-next (9faf99c55eba Merge remote-tracking branches 'regmap/topic/debugfs', 'regmap/topic/force-update' and 'regmap/topic/seq-delay' into regmap-next) Applying: mfd: Fixup clients of multi_reg_write/register_patch Merging hsi/for-next (d770e558e219 Linux 4.2-rc1) Merging leds/for-next (efbc61308e23 leds: leds-ns2: depends on MACH_ARMADA_370) Merging ipmi/for-next (cc5c8d2cc014 ipmi: Make some data const that was only read) Merging driver-core/driver-core-next (cbfe8fa6cd67 Linux 4.2-rc4) Merging tty/tty-next (458e2c82c5fb Revert "tty: serial: imx.c: Reset UART before activating interrupts") Merging usb/usb-next (722b262c966a Merge 4.2-rc4 into usb-next) Merging usb-gadget/next (b5a2875605ca usb: renesas_usbhs: Allow an OTG PHY driver to provide VBUS) CONFLICT (content): Merge conflict in drivers/usb/renesas_usbhs/mod_gadget.c Merging usb-serial/usb-next (f4c126ecaef1 USB: serial: ftdi_sio: Fix broken URL in comment) Merging staging/staging-next (6e64e2244902 Merge 4.2-rc4 into staging-next) Merging char-misc/char-misc-next (14e51e599db0 misc: Drop owner assignment from i2c_driver) Merging extcon/extcon-next (5d900d071232 extcon: Drop owner assignment from i2c_driver) Merging kdbus/kdbus (63c8e2f6f337 kdbus: fix wrong message size on 32bit) Merging cgroup/for-next (917d8e2d10f4 cgroup: add documentation for the PIDs controller) Merging scsi/for-next (1278dd6809b1 scsi: fix host max depth checking for the 'queue_depth' sysfs interface) Merging target-updates/for-next (a73c2a2f9123 libiscsi: Use scsi helper to set information descriptor) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) Merging pinctrl/for-next (48356aa79ccb pinctrl: sirf: add power management support for atlas7) Merging vhost/linux-next (6569ffbcd749 PCI/MSI: Make pci_msi_shutdown(), pci_msix_shutdown() static) CONFLICT (content): Merge conflict in include/uapi/linux/pci_regs.h Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage) Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) Merging gpio/for-next (505936131ea7 gpio: mpc8xxx: Convert mpc8xxx_gpio_chip.lock to raw_spinlock) Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) Merging pwm/for-next (361c1066c939 pwm: lpss: pci: Add support for Broxton platform) Merging dma-buf/for-next (bc0195aad0da Linux 4.2-rc2) Merging userns/for-next (75509fd88fbd nsfs: Add a show_path method to fix mountinfo) Merging ktest/for-next (b953c0d234bc Linux 4.1) Merging clk/clk-next (e323d56eb06b clk: exynos4: Fix wrong clock for Exynos4x12 ADC) CONFLICT (content): Merge conflict in drivers/clk/ti/Makefile Applying: clk: ti: fix for definition movement Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0) Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) Merging kselftest/next (d770e558e219 Linux 4.2-rc1) Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux) Merging access_once/linux-next (bc465aa9d045 Linux 4.0-rc5) Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next) Merging coresight/next (395855d956ed coresight: Fix implicit inclusion of linux/sched.h) Merging rtc/rtc-next (bf459bb3f04f rtc: rx8025: remove obsolete local_irq_disable() and local_irq_enable() for rtc_update_irq()) Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) Merging nvdimm/libnvdimm-for-next (60e95f43fc85 nfit: Don't check _STA on NVDIMM devices) Merging akpm-current/current (32d8136e7b9b ipc/msg.c: use freezable blocking call) CONFLICT (modify/delete): fs/ext3/super.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of fs/ext3/super.c left in tree. CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl $ git rm -f fs/ext3/super.c Applying: userfaultfd: selftest: update userfaultfd x86 32bit syscall number $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpu/drm/i915/intel_sprite.c: fix build Applying: drivers/gpu/drm/i915/intel_tv.c: fix build Applying: net/netfilter/ipset: work around gcc-4.4.4 initializer bug Applying: ARM: mm: do not use virt_to_idmap() for NOMMU systems Applying: namei: fix warning while make xmldocs caused by namei.c Applying: fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void Applying: fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix Applying: mm: mark most vm_operations_struct const Applying: mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff() Applying: mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix Applying: mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix-checkpatch-fixes Applying: mm: make sure all file VMAs have ->vm_ops set Applying: mm: use vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd() Applying: mm, madvise: use vma_is_anonymous() to check for anon VMA Applying: drivers/w1/w1_int.c: call put_device if device_register fails Merging akpm/master (bd2580a55a40 drivers/w1/w1_int.c: call put_device if device_register fails) -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
