Hi all, Please be careful testing this tree due to some unfixed warnings in the block layer ... Changes since 20130325: The vl4-dvb tree gained a build failure for which I disabled a staging driver. The net-next tree gained conflicts against the wireless tree. The wireless-next tree gained conflicts against the wireless tree. The block tree gained a conflict against Linus' tree and a build failure for which I applied a patch. The tty tree lost its build failure. The usb tree gained a conflict against the tty tree. The char-misc tree gained a build failure so I used the version from next-20130325. The akpm tree gained conflicts against the block tree. I applied a patch to partially fix the powerpc allmodconfig build failures. ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 222 trees (counting Linus' and 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@xxxxxxxxxxxxxxxx $ git checkout master $ git reset --hard stable Merging origin/master (53b6809 Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband) Merging fixes/master (f9294e9 powerpc: define the conditions where the ePAPR idle hcall can be supported) Merging kbuild-current/rc-fixes (6dbe51c Linux 3.9-rc1) Merging arc-current/for-curr (367f3fc ARC: Fix the typo in event identifier flags used by ptrace) Merging arm-current/fixes (68a154f ARM: 7681/1: hw_breakpoint: use warn_once to avoid spam from reset_ctrl_regs()) Merging m68k-current/for-linus (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA) Merging powerpc-merge/merge (af81d78 powerpc: Rename USER_ESID_BITS* to ESID_BITS*) Merging sparc/master (53b6809 Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband) Merging net/master (a79ca22 ipv6: fix bad free of addrconf_init_net) Merging ipsec/master (85dfb74 af_key: initialize satype in key_notify_policy_flush()) Merging sound-current/for-linus (55a63d4 ALSA: hda - Fix DAC assignment for independent HP) Merging pci-current/for-linus (249bfb8 PCI/PM: Clean up PME state when removing a device) Merging wireless/master (0f49d64 mwifiex: reset skb->data after processing PCIe sleep confirm cmd respose) Merging driver-core.current/driver-core-linus (e5110f4 sysfs: handle failure path correctly for readdir()) Merging tty.current/tty-linus (8b5c913 serial: 8250_pci: Add WCH CH352 quirk to avoid Xscale detection) Merging usb.current/usb-linus (85ecd03 USB: EHCI: fix bug in iTD/siTD DMA pool allocation) Merging staging.current/staging-linus (e4317ce8 staging: comedi: s626: fix continuous acquisition) Merging char-misc.current/char-misc-linus (347e089 VMCI: Fix process-to-process DRGAMs.) Merging input-current/for-linus (4b7d293 Input: mms114 - Fix regulator enable and disable paths) Merging md-current/for-linus (238f590 md: remove CONFIG_MULTICORE_RAID456 entirely) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (246bbed Revert "crypto: caam - add IPsec ESN support") Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe()) Merging dwmw2/master (63662139 params: Fix potential memory leak in add_sysfs_param()) 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 (d3601e5 spi/sh-hspi: fix return value check in hspi_probe().) Merging gpio-current/gpio/merge (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect) Merging rr-fixes/fixes (b7d44d9 hw_random: free rng_buffer at module exit) Merging mfd-fixes/master (0371541 mfd: twl4030-madc: Remove __exit_p annotation) Merging vfio-fixes/for-linus (25e9789 vfio: include <linux/slab.h> for kmalloc) Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (191db3f ARC: remove #ifdef-ed out include of dead header) Merging arm/for-next (c5083a1 Merge branches 'devel-stable', 'fixes', 'mach-types' and 'misc' into for-next) Merging arm-perf/for-next/perf (a937536 Linux 3.9-rc3) Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) Merging xilinx/arm-next (42ead3a arm: zynq: timer: Set clock_event cpumask) CONFLICT (content): Merge conflict in arch/arm/mach-zynq/common.c Merging arm64/upstream (0359b0e arm64: head: match all affinity levels in the pen of the secondaries) Merging blackfin/for-linus (f656c24 blackfin: time-ts: Remove duplicate assignment) Merging c6x/for-linux-next (93bbd0c c6x: use generic kvm_para.h) Merging cris/for-next (77c8006 UAPI: Fix up empty files in arch/cris/) Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes) Merging ia64/next (dadbee1 [IA64] Fix build error for numa_clear_node() under IA64) Merging m68k/for-next (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA) Merging m68knommu/for-next (b46ab88 m68k: clean up unused "config ROMVECSIZE") Merging metag/for-next (2b8660e memblock: Kill ARCH_POPULATES_NODE_MAP once more) Merging microblaze/next (01cc2cb microblaze: intc: set the default irq_domain) Merging mips/mips-for-linux-next (306d20e Merge branches 'next/3.9-fixes', 'next/kvm' and 'next/micromips' 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 powerpc/next (9e2d59a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal) Merging 4xx/next (2074b1d powerpc: Fix irq distribution) Merging mpc5xxx/next (cb1dc32 powerpc/mpc512x: create SoC devices for more nodes) Merging galak/next (3dfd44c powerpc/fsl-booke: Update T4240 device config node in device tree) Merging s390/features (635640a s390/mm: speedup storage key initialization) Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) Merging sparc-next/master (d6d88ba sparc64: Kill __ARCH_WANT_UNLOCKED_CTXSW) Merging tile/master (d9acae6 arch: remove KCORE_ELF again [tile]) Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) Merging xtensa/for_next (9cf81c7 xtensa: add accept4 syscall) Merging btrfs/next (6aec51f Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-linus-3.9) Merging ceph/master (d6c0dd6 libceph: fix decoding of pgids) Merging cifs/for-next (457d215 cifs: remove ENOSPC handling in smb_sendv) 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 (c288d29 ext2: Fix BUG_ON in evict() on inode deletion) Merging ext4/dev (2b405bf ext4: fix data=journal fast mount/umount hang) Merging f2fs/dev (111d249 f2fs: fix typo in comments) Merging fuse/for-next (634734b fuse: allow control of adaptive readdirplus use) Merging gfs2/master (1987566 GFS2: Issue discards in 512b sectors) Merging jfs/jfs-next (9d48017 jfs: avoid undefined behavior from left-shifting by 32 bits) Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) Merging nfs/linux-next (1166fde SUNRPC: Add barriers to ensure read ordering in rpc_wake_up_task_queue_locked) Merging nfsd/nfsd-next (6dbe51c Linux 3.9-rc1) 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 (b6f4bee fs/9p: Fix atomic_open) Merging ubifs/linux-next (67e753c UBIFS: make space fixup work in the remount case) Merging xfs/for-next (ff9a28f xfs: Fix WARN_ON(delalloc) in xfs_vm_releasepage()) CONFLICT (content): Merge conflict in fs/xfs/xfs_iomap.c Merging vfs/for-next (dcf787f constify path_get/path_put and fs_struct.c stuff) Merging pci/next (f6161aa Linux 3.9-rc2) Merging hid/for-next (26c3791 Merge branch 'for-3.10/upstream' into for-next) Merging i2c/i2c/for-next (21ea3f4 i2c: core: Pick i2c bus number from dt alias if present) Merging jdelvare-hwmon/master (c662b7a hwmon: (lm75) Add support for the Dallas/Maxim DS7505) Merging hwmon-staging/hwmon-next (95be1ee hwmon: (pmbus/lm25066) Add support for LM25056) Merging v4l-dvb/master (9240da0 Merge /home/v4l/v4l/patchwork) CONFLICT (content): Merge conflict in drivers/media/platform/Kconfig Merging kbuild/for-next (4382a99 Merge branch 'kbuild/kbuild' into kbuild/for-next) Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm') Merging libata/NEXT (b186aff pata_samsung_cf: use module_platform_driver_probe()) Merging infiniband/for-next (4e73a54 Merge branches 'cxgb4', 'ipoib' and 'qib' into for-next) Merging pstore/master (c530267 pstore: Replace calls to kmalloc and memcpy with kmemdup) Merging pm/linux-next (4f3cbf3 Merge branch 'pm-cpufreq-next' into linux-next) Merging idle/next (deda402 tools/power turbostat: additional Haswell CPU-id) 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 (d1c3ed6 Linux 3.8-rc2) Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) Merging thermal/next (043e465 thermal: exynos_thermal: return a proper error code while thermal_zone_device_register fail.) Merging ieee1394/for-next (6dbe51c Linux 3.9-rc1) Merging ubi/linux-next (f6161aa Linux 3.9-rc2) Merging dlm/next (f117228 dlm: avoid scanning unchanged toss lists) Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers) Merging scsi/for-next (6dbe51c Linux 3.9-rc1) Merging target-updates/for-next (783e150 target: Change default sense key of NOT_READY) Merging target-merge/for-next-merge (a937536 Linux 3.9-rc3) 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 (5dfbcbf Merge branch 'for-linus' into next) Merging dmaengine/next (7f34986 dma: ipu: Drop unused spinlock) CONFLICT (content): Merge conflict in drivers/dma/ioat/dma_v3.c Merging net-next/master (eaac5f3 net: Print functions in /proc/net/ptype without the offset.) CONFLICT (content): Merge conflict in net/wireless/core.h CONFLICT (content): Merge conflict in net/mac80211/sta_info.c Merging ipsec-next/master (05600a7 xfrm_user: constify netlink dispatch table) Merging wireless-next/master (64513ef b43: remove warning for LP-PHY with sprom < 8) CONFLICT (content): Merge conflict in net/mac80211/sta_info.c Merging bluetooth/master (e32ca96 Bluetooth: Add support for Foxconn/Hon Hai [0489:e04d]) Merging mtd/master (35f8c76 Merge tag 'for-linus-20130318' of git://git.infradead.org/linux-mtd) Merging l2-mtd/master (91aabd2 mtd: nand_ids: use size macros) Merging crypto/master (5cec26e crypto: picoxcell - Use of_match_ptr() macro) Merging drm/drm-next (be88298 drm/tilcdc: only build on arm) Merging drm-intel/drm-intel-next-queued (a42f704 drm/i915: Warn if a pipe is enabled with a bogus port) Merging sound/for-next (4abdbd1 ALSA: hda - VIA prefers side surrounds over HP) Merging sound-asoc/for-next (287441c Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next) Merging modules/modules-next (d70f82a genksyms: pass symbol-prefix instead of arch) Merging virtio/virtio-next (a8c7687 caif_virtio: Check that vringh_config is not null) Merging input/next (38a46eb Input: mc13783_ts - use module_platform_driver_probe()) Merging input-mt/for-next (8bb9660 Linux 3.9-rc4) Merging cgroup/for-next (081aa45 cgroup: consolidate cgroup_attach_task() and cgroup_attach_proc()) CONFLICT (content): Merge conflict in include/linux/res_counter.h Merging block/for-next (2439ecd Merge branch 'for-3.10/drivers' into for-next) CONFLICT (content): Merge conflict in drivers/md/raid5.c Merging device-mapper/master (fc60439 Correct the documented requirement on the return code from dm cache policy lookup functions stated in the policy module header file.) 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 (e573d69 mmc: mvsdio: use dev_*() API instead of pr_*() API) Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command) Merging slab/for-next (7d557b3 slub: correctly bootstrap boot caches) Merging uclinux/for-next (6dbe51c Linux 3.9-rc1) Merging md/for-next (864e8cb md/raid10: Allow skipping recovery when clean arrays are assembled) Merging mfd/master (e8ea76b mfd: as3711: Add OF support) Merging battery/master (6e997bb Merge branch 'urgent') 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 (e7f5c9a Merge tag 'omapdss-for-3.8' of git://gitorious.org/linux-omap-dss2/linux into for-linus) Merging regulator/for-next (5c0b46e Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next) Merging security/next (921f3ac tomoyo: use DEFINE_SRCU() to define tomoyo_ss) Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409) Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) Merging watchdog/master (112b55a watchdog: Convert to devm_ioremap_resource()) Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage) Merging iommu/next (ae19158 iommu: OMAP: build only on OMAP2+) Merging vfio/next (0bced2f vfio: make local function vfio_pci_intx_unmask_handler() static) 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 (c25a4a0 doc: Remove text on tracepoint samples) CONFLICT (modify/delete): Documentation/virtual/virtio-spec.txt deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of Documentation/virtual/virtio-spec.txt left in tree. $ git rm -f Documentation/virtual/virtio-spec.txt Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) Merging edac/linux_next (b076989 i5100_edac: convert to use simple_open()) Merging edac-amd/for-next (9713fae EDAC: Merge mci.mem_is_per_rank with mci.csbased) Merging devicetree/devicetree/next (02bbde7 Revert "of: use platform_device_add") Merging dt-rh/for-next (1421954 documentation/devicetree: Fix a typo in exynos-dw-mshc.txt) Merging spi/spi/next (095c375 spi: Document cs_gpios and cs_gpio in kernel-doc) Merging spi-mb/spi-next (b66c773 spi/bcm63xx: use devm_ioremap_resource()) Merging tip/auto-latest (a2d66a370 Merge branch 'x86/platform') Merging ftrace/for-next (22f4564 tracing: Update debugfs README file) CONFLICT (content): Merge conflict in kernel/trace/ftrace.c Merging rcu/rcu/next (8d9eeac Merge branches 'doc.2013.03.12a', 'fixes.2013.03.13a' and 'idlenocb.2013.03.18b' into HEAD) Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (81f4f76 KVM: MMU: Rename kvm_mmu_free_some_pages() to make_mmu_pages_available()) CONFLICT (content): Merge conflict in drivers/s390/kvm/virtio_ccw.c Merging kvm-ppc/kvm-ppc-next (4fe27d2 KVM: PPC: Remove unused argument to kvmppc_core_dequeue_external) Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()) 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 (83a41ef Merge branch 'stable/for-linus-3.9-take-two' into linux-next) Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend) Merging percpu/for-next (5479c78 mm, percpu: Make sure percpu_alloc early parameter has an argument) Merging workqueues/for-next (30db5f1 Merge branch 'master' into for-next) Merging drivers-x86/linux-next (e6e5224 ideapad-laptop: Depend on BACKLIGHT_CLASS_DEVICE instead of selecting it) CONFLICT (content): Merge conflict in drivers/platform/x86/chromeos_laptop.c 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 (7f8e176 Merge remote-tracking branch 'regmap/topic/range' into regmap-next) Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (9f1d0b3 leds: leds-bd2802: add CONFIG_PM_SLEEP to suspend/resume functions) Merging driver-core/driver-core-next (3db3c62 sysfs: use atomic_inc_unless_negative in sysfs_get_active) Merging tty/tty-next (44a459f tty: tty_vhangup_session can be static) Merging usb/usb-next (659597b USB: serial: update copyright information) CONFLICT (content): Merge conflict in drivers/usb/serial/usb-serial.c Merging usb-gadget/next (4895a2e usb: gadget: mv_u3d: make mv_u3d_pm_ops static) CONFLICT (content): Merge conflict in drivers/usb/gadget/net2280.c CONFLICT (content): Merge conflict in drivers/usb/gadget/net2272.c Merging staging/staging-next (c5cf460 staging: comedi: s626: remove MC_DISABLE macro) Merging char-misc/char-misc-next (a6025a2 Drivers: hv: balloon: make local functions static) $ git reset --hard HEAD^ Merging 20130325 version of char-misc Merging bcon/master (06c6942 blockconsole: Mark a local work struct static) 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 (5c8d3f7 Merge branch 'devel' into for-next) Merging vhost/linux-next (0e9ff68 vhost-blk: add eventfd dependency) CONFLICT (content): Merge conflict in drivers/vhost/Makefile Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2) Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq) Merging gpio/gpio/next (753c598 gpio/em: Add Device Tree support) Merging gpio-lw/for-next (46bbd99 Merge branch 'next' into for-next) Merging gen-gpio/for_next (a2523d3 blackfin: force use of gpiolib) CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile Merging mailbox/dbx500-prcmu-mailbox (adbf1b7 mailbox: call request_irq after mbox queues are allocated) Merging arm-soc/for-next (db6f62a Merge branch 'next/dt' into for-next) Merging bcm2835/for-next (4c4d449 Merge branch 'for-3.10/defconfig' into for-next) CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug CONFLICT (content): Merge conflict in arch/arm/Kconfig Merging cortex/for-next (6ebd4d0 ARM: stub out read_cpuid and read_cpuid_ext for CPU_CP15=n) Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next) Merging imx-mxs/for-next (5e56049 Merge branches 'imx/fixes', 'imx/cleanup', 'imx/soc' and 'imx/dt' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c Merging ixp4xx/next (19f949f Linux 3.8) Merging msm/for-next (d0f6e50 Merge branch 'msm-defconfig' into for-next) Merging renesas/next (442d651 Merge branch 'heads/boards' into next) Merging samsung/for-next (9daee5a Merge branch 'next/clk-exynos' into for-next) Merging tegra/for-next (e6dd100 Merge branch 'for-3.10/defconfig' into for-next) CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c Merging dma-mapping/dma-mapping-next (a937536 Linux 3.9-rc3) Merging pwm/for-next (1bf0f20 pwm: davinci: Add Kconfig support for ECAP & EHRPWM devices) Merging dma-buf/for-next (6dbe51c Linux 3.9-rc1) Merging userns/for-next (92f28d9 scm: Require CAP_SYS_ADMIN over the current pidns to spoof pids.) Merging ktest/for-next (7328735 ktest: Remove indexes from warnings check) Merging signal/for-next (99e621f syscalls.h: slightly reduce the jungles of macros) CONFLICT (content): Merge conflict in include/asm-generic/unistd.h CONFLICT (content): Merge conflict in arch/tile/kernel/compat.c CONFLICT (content): Merge conflict in arch/tile/Kconfig CONFLICT (content): Merge conflict in arch/mips/kernel/linux32.c Applying: cond_syscall and SYSCALL_ALIAS merge fixup Merging clk/clk-next (ce4f331 clk: add table lookup to mux) 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 (9217cbb Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6) $ git checkout -b akpm remotes/origin/akpm/master Applying: mips: define KVM_USER_MEM_SLOTS Applying: thinkpad-acpi: kill hotkey_thread_mutex Applying: drivers/char/random.c: fix priming of last_data Applying: kthread: introduce to_live_kthread() Applying: kthread: kill task_get_live_kthread() Applying: arch/x86/mm/init_64.c: fix build warning when CONFIG_MEMORY_HOTREMOVE=n Applying: sound: convert snd_info_register() to use proc_create_data() Applying: x86: make 'mem=' option to work for efi platform Applying: mm: remove free_area_cache use in powerpc architecture Applying: mm: use vm_unmapped_area() on powerpc architecture Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress Applying: matroxfb: convert struct i2c_msg initialization to C99 format Applying: drivers/video/console/fbcon_cw.c: fix compiler warning in cw_update_attr Applying: drivers/video: add Hyper-V Synthetic Video Frame Buffer Driver Applying: video: fix a type warning in hyperv_fb.c Applying: drivers/video/exynos/exynos_mipi_dsi.c: convert to devm_ioremap_resource() Applying: drivers/video/ep93xx-fb.c: fix section mismatch and use module_platform_driver Applying: drivers/video/mmp: remove legacy hw definitions Applying: cyber2000fb: avoid palette corruption at higher clocks Applying: timer_list: split timer_list_show_tickdevices() Applying: timer_list-split-timer_list_show_tickdevices-v4 Applying: timer_list: convert timer list to be a proper seq_file Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v3 Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v3-fix 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: ktime_add_ns() may overflow on 32bit architectures Applying: mkcapflags.pl: convert to mkcapflags.sh Applying: headers_install.pl: convert to headers_install.sh Applying: scripts/decodecode: make faulting insn ptr more robust Applying: ipvs: change type of netns_ipvs->sysctl_sync_qlen_max Applying: ocfs2: delay inode update transactions after verifying the input flags Applying: debug_locks.h: make warning more verbose Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros Applying: lglock: update lockdep annotations to report recursive local locks Applying: loop-cleanup-partitions-when-detaching-loop-device-fix Applying: block: restore /proc/partitions to not display non-partitionable removable devices Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget() Applying: fs: return EAGAIN when O_NONBLOCK write should block on frozen fs Applying: fs: fix hang with BSD accounting on frozen filesystem Applying: ocfs2: add freeze protection to ocfs2_file_splice_write() Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic Applying: HWPOISON: check dirty flag to match against clean page Applying: mm: trace filemap add and del Applying: mm-trace-filemap-add-and-del-v2 Applying: mm, show_mem: suppress page counts in non-blockable contexts Applying: mm/shmem.c: remove an ifdef Applying: vm: adjust ifdef for TINY_RCU Applying: mm: frontswap: lazy initialization to allow tmem backends to build/run as modules Applying: frontswap: make frontswap_init use a pointer for the ops Applying: mm: frontswap: cleanup code Applying: frontswap: get rid of swap_lock dependency Applying: mm: cleancache: lazy initialization to allow tmem backends to build/run as modules Applying: cleancache: Make cleancache_init use a pointer for the ops Applying: mm: cleancache: clean up cleancache_enabled Applying: xen: tmem: enable Xen tmem shim to be built/loaded as a module Applying: xen-tmem-enable-xen-tmem-shim-to-be-built-loaded-as-a-module-fix Applying: zcache/tmem: Better error checking on frontswap_register_ops return value. Applying: staging: zcache: enable ramster to be built/loaded as a module Applying: staging: zcache: enable zcache to be built/loaded as a module Applying: rmap: recompute pgoff for unmapping huge page Applying: memblock: add assertion for zero allocation alignment Applying: mm: walk_memory_range(): fix typo in comment Applying: direct-io: Fix boundary block handling Applying: mm/vmscan.c: minor cleanup for kswapd Applying: mm: introduce common help functions to deal with reserved/managed pages Applying: mm/alpha: use common help functions to free reserved pages Applying: mm/ARM: use common help functions to free reserved pages Applying: mm/avr32: use common help functions to free reserved pages Applying: mm/blackfin: use common help functions to free reserved pages Applying: mm/c6x: use common help functions to free reserved pages Applying: mm/cris: use common help functions to free reserved pages Applying: mm/FRV: use common help functions to free reserved pages Applying: mm/h8300: use common help functions to free reserved pages Applying: mm/IA64: use common help functions to free reserved pages Applying: mm/m32r: use common help functions to free reserved pages Applying: mm/m68k: use common help functions to free reserved pages Applying: mm/microblaze: use common help functions to free reserved pages Applying: mm/MIPS: use common help functions to free reserved pages Applying: mm/mn10300: use common help functions to free reserved pages Applying: mm/openrisc: use common help functions to free reserved pages Applying: mm/parisc: use common help functions to free reserved pages Applying: mm/ppc: use common help functions to free reserved pages Applying: mm/s390: use common help functions to free reserved pages Applying: mm/score: use common help functions to free reserved pages Applying: mm/SH: use common help functions to free reserved pages Applying: mm/SPARC: use common help functions to free reserved pages Applying: mm/um: use common help functions to free reserved pages Applying: mm/unicore32: use common help functions to free reserved pages Applying: mm/x86: use common help functions to free reserved pages Applying: mm/xtensa: use common help functions to free reserved pages Applying: mm/arc: use common help functions to free reserved pages Applying: mm/metag: use common help functions to free reserved pages Applying: mm,kexec: use common help functions to free reserved pages Applying: mm: introduce free_highmem_page() helper to free highmem pages into buddy system Applying: mm/ARM: use free_highmem_page() to free highmem pages into buddy system Applying: mm/FRV: use free_highmem_page() to free highmem pages into buddy system Applying: mm/metag: use free_highmem_page() to free highmem pages into buddy system Applying: mm/microblaze: use free_highmem_page() to free highmem pages into buddy system Applying: mm/MIPS: use free_highmem_page() to free highmem pages into buddy system Applying: mm/PPC: use free_highmem_page() to free highmem pages into buddy system Applying: mm/SPARC: use free_highmem_page() to free highmem pages into buddy system Applying: mm/um: use free_highmem_page() to free highmem pages into buddy system Applying: mm/x86: use free_highmem_page() to free highmem pages into buddy system Applying: memcg: keep prev's css alive for the whole mem_cgroup_iter Applying: memcg: rework mem_cgroup_iter to use cgroup iterators Applying: memcg: relax memcg iter caching Applying: memcg-relax-memcg-iter-caching-checkpatch-fixes Applying: memcg: simplify mem_cgroup_iter Applying: memcg: further simplify mem_cgroup_iter Applying: cgroup: remove css_get_next Applying: fs: don't compile in drop_caches.c when CONFIG_SYSCTL=n Applying: mm/hugetlb: add more arch-defined huge_pte functions Applying: mm: make snapshotting pages for stable writes a per-bio operation CONFLICT (content): Merge conflict in include/linux/blk_types.h Applying: mm-make-snapshotting-pages-for-stable-writes-a-per-bio-operation-fix Applying: mm-make-snapshotting-pages-for-stable-writes-a-per-bio-operation-fix-fix Applying: mm, vmalloc: change iterating a vmlist to find_vm_area() Applying: mm, vmalloc: move get_vmalloc_info() to vmalloc.c Applying: mm, vmalloc: protect va->vm by vmap_area_lock Applying: mm, vmalloc: iterate vmap_area_list, instead of vmlist in vread/vwrite() Applying: mm, vmalloc: iterate vmap_area_list in get_vmalloc_info() Applying: mm, vmalloc: iterate vmap_area_list, instead of vmlist, in vmallocinfo() Applying: mm, vmalloc: export vmap_area_list, instead of vmlist Applying: mm, vmalloc: remove list management of vmlist after initializing vmalloc Applying: kexec, vmalloc: export additional vmalloc layer information Applying: kexec-vmalloc-export-additional-vmalloc-layer-information-fix Applying: mmap: find_vma: remove the WARN_ON_ONCE(!mm) check Applying: memcg: do not check for do_swap_account in mem_cgroup_{read,write,reset} Applying: mm: allow arch code to control the user page table ceiling Applying: arm: set the page table freeing ceiling to TASK_SIZE Applying: mm: merging memory blocks resets mempolicy Applying: mm: speedup in __early_pfn_to_nid() Applying: mm, hugetlb: include hugepages in meminfo Applying: mm-hugetlb-include-hugepages-in-meminfo-checkpatch-fixes Applying: mm: try harder to allocate vmemmap blocks Applying: sparse-vmemmap: specify vmemmap population range in bytes Applying: x86-64: remove dead debugging code for !pse setups Applying: x86-64: use vmemmap_populate_basepages() for !pse setups Applying: x86-64: fall back to regular page vmemmap on allocation failure Applying: mm: page_alloc: avoid marking zones full prematurely after zone_reclaim() Applying: mm/migrate: fix comment typo syncronous->synchronous Applying: mm: remove free_area_cache 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: drivers/rpmsg/virtio_rpmsg_bus.c: fix error return code in rpmsg_probe() Applying: kernel/watchdog.c: add comments to explain watchdog_disabled variable Applying: kernel/range.c: subtract_range: fix the broken phrase issued by printk Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq Applying: include/linux/fs.h: disable preempt when acquire i_size_seqcount write lock Applying: kernel/smp.c: cleanups Applying: printk/tracing: rework console tracing Applying: early_printk: consolidate random copies of identical code Applying: early_printk: consolidate random copies of identical code Applying: early_printk-consolidate-random-copies-of-identical-code-v3-fix Applying: include/linux/printk.h: include stdarg.h Applying: get_maintainer: use filename-only regex match for Tegra Applying: get_maintainer-use-filename-only-regex-match-for-tegra-fix Applying: MAINTAINERS: i8k driver is orphan Applying: drivers/video/backlight/ams369fg06.c: convert ams369fg06 to dev_pm_ops Applying: drivers-video-backlight-ams369fg06c-convert-ams369fg06-to-dev_pm_ops-fix Applying: drivers/video/backlight/platform_lcd.c: remove unnecessary ifdefs Applying: drivers/video/backlight/ep93xx_bl.c: remove incorrect __init annotation Applying: drivers/video/backlight/atmel-pwm-bl.c: use module_platform_driver_probe() Applying: drivers/video/backlight/atmel-pwm-bl.c: add __init annotation Applying: drivers/video/backlight/lp855x_bl.c: fix compiler warning in lp855x_probe Applying: drivers/video/backlight/jornada720_*.c: use dev_err()/dev_info() instead of pr_err()/pr_info() Applying: drivers/video/backlight/omap1_bl.c: use dev_info() instead of pr_info() Applying: drivers/video/backlight/generic_bl.c: use dev_info() instead of pr_info() Applying: drivers/video/backlight/adp8870_bl.c: add missing braces Applying: drivers/video/backlight/l4f00242t03.c: check return value of regulator_enable() Applying: drivers-video-backlight-l4f00242t03c-check-return-value-of-regulator_enable-fix Applying: backlight: ld9040: convert ld9040 to dev_pm_ops Applying: backlight: lms501kf03: convert lms501kf03 to dev_pm_ops Applying: backlight: s6e63m0: convert s6e63m0 to dev_pm_ops Applying: backlight: adp5520: convert adp5520_bl to dev_pm_ops Applying: backlight: adp8860: convert adp8860 to dev_pm_ops Applying: backlight: adp8870: convert adp8870 to dev_pm_ops Applying: backlight: corgi_lcd: convert corgi_lcd to dev_pm_ops Applying: backlight: ep93xx: convert ep93xx to dev_pm_ops Applying: backlight: hp680_bl: convert hp680bl to dev_pm_ops Applying: backlight: kb3886_bl: convert kb3886bl to dev_pm_ops Applying: backlight: lm3533_bl: convert lm3533_bl to dev_pm_ops Applying: backlight: locomolcd: convert locomolcd to dev_pm_ops Applying: backlight: ltv350qv: convert ltv350qv to dev_pm_ops Applying: backlight: tdo24m: convert tdo24m to dev_pm_ops Applying: drivers/video/backlight/Kconfig: fix typo "MACH_SAM9...EK" three times Applying: drivers/video/backlight/adp5520_bl.c: fix compiler warning in adp5520_show() Applying: video: backlight: add ili922x lcd driver Applying: backlight: da903x_bl: use BL_CORE_SUSPENDRESUME option Applying: drivers/video/backlight/lp855x_bl.c: use PAGE_SIZE for the sysfs read operation Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask Applying: lib/int_sqrt.c: optimize square root algorithm Applying: argv_split(): teach it to handle mutable strings Applying: argv_split-teach-it-to-handle-mutable-strings-fix Applying: argv_split-teach-it-to-handle-mutable-strings-fix-2 Applying: checkpatch: add check for reuse of krealloc arg Applying: checkpatch: Prefer seq_puts to seq_printf Applying: checkpatch: Complain about executable files Applying: epoll: trim epitem by one cache line Applying: epoll-trim-epitem-by-one-cache-line-on-x86_64-fix Applying: epoll: comment + BUILD_BUG_ON to prevent epitem bloat Applying: epoll: support for disabling items, and a self-test app Applying: epoll: stop comparing pointers with 0 in self-test app Applying: epoll: use RCU to protect wakeup_source in epitem Applying: epoll: fix suspicious RCU usage in ep_poll_callback Applying: epoll: lock ep->mtx in ep_free to silence lockdep Applying: epoll: cleanup: hoist out f_op->poll calls Applying: fs: make binfmt support for #! scripts modular and removable Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting Applying: init: scream bloody murder if interrupts are enabled too early Applying: dmi_scan: refactor dmi_scan_machine(), {smbios,dmi}_present() Applying: dmi_scan: proper buf type in dmi_present() Applying: i2o: check copy_from_user() size parameter Applying: rtc: rtc-mv: add __init annotation Applying: rtc: rtc-davinci: add __exit annotation Applying: rtc: rtc-ds1302: add __exit annotation Applying: rtc: rtc-imxdi: add __init/__exit annotation Applying: rtc: rtc-nuc900: add __init/__exit annotation Applying: rtc: rtc-pcap: add __init/__exit annotation Applying: rtc: rtc-tegra: add __init/__exit annotation Applying: rtc: add devm_rtc_device_{register,unregister}() Applying: drivers/rtc/rtc-max77686.c: use module_platform_driver() Applying: drivers/rtc/rtc-max77686.c: add missing module author name Applying: drivers/rtc/rtc-max77686.c: use devm_kzalloc() Applying: drivers/rtc/rtc-max77686.c: fix indentation of bit definitions Applying: drivers/rtc/rtc-max77686.c: use dev_info()/dev_emerg() instead of pr_info()/pr_emerg() Applying: drivers/rtc/rtc-v3020.c: use gpio_request_array() Applying: drivers/rtc/class.c: use struct device as the first argument for devm_rtc_device_register() Applying: rtc: rtc-ab3100: use module_platform_driver_probe() Applying: rtc: rtc-at32ap700x: use module_platform_driver_probe() Applying: rtc: rtc-at91rm9200: use module_platform_driver_probe() Applying: rtc: rtc-au1xxx: use module_platform_driver_probe() Applying: rtc: rtc-coh901331: use module_platform_driver_probe() Applying: rtc: rtc-davinci: use module_platform_driver_probe() Applying: rtc: rtc-ds1302: use module_platform_driver_probe() Applying: rtc: rtc-efi: use module_platform_driver_probe() Applying: rtc: rtc-generic: use module_platform_driver_probe() Applying: rtc: rtc-imxdi: use module_platform_driver_probe() Applying: rtc: rtc-mc13xxx: use module_platform_driver_probe() Applying: rtc: rtc-msm6242: use module_platform_driver_probe() Applying: rtc: rtc-mv: use module_platform_driver_probe() Applying: rtc: rtc-nuc900: use module_platform_driver_probe() Applying: rtc: rtc-omap: use module_platform_driver_probe() Applying: rtc: rtc-pcap: use module_platform_driver_probe() Applying: rtc: rtc-ps3: use module_platform_driver_probe() Applying: rtc: rtc-pxa: use module_platform_driver_probe() Applying: rtc: rtc-rp5c01: use module_platform_driver_probe() Applying: rtc: rtc-sh: use module_platform_driver_probe() Applying: rtc: rtc-starfire: use module_platform_driver_probe() Applying: rtc: rtc-sun4v: use module_platform_driver_probe() Applying: rtc: rtc-tegra: use module_platform_driver_probe() Applying: rtc: rtc-tx4939: use module_platform_driver_probe() Applying: rtc: rtc-88pm80x: use devm_rtc_device_register() Applying: rtc: rtc-coh90133: use devm_rtc_device_register() Applying: rtc: rtc-da9052: use devm_rtc_device_register() Applying: rtc: rtc-da9055: use devm_rtc_device_register() Applying: rtc: rtc-davinci: use devm_rtc_device_register() Applying: rtc: rtc-ds1511: use devm_rtc_device_register() Applying: rtc: rtc-ds1553: use devm_rtc_device_register() Applying: rtc: rtc-ds1742: use devm_rtc_device_register() Applying: rtc: rtc-ep93xx: use devm_rtc_device_register() Applying: rtc: rtc-imxdi: use devm_rtc_device_register() Applying: rtc: rtc-lp8788: use devm_rtc_device_register() Applying: rtc: rtc-lpc32xx: use devm_rtc_device_register() Applying: rtc: rtc-max77686: use devm_rtc_device_register() Applying: rtc: rtc-max8907: use devm_rtc_device_register() Applying: rtc: rtc-max8997: use devm_rtc_device_register() Applying: rtc: rtc-mv: use devm_rtc_device_register() Applying: rtc: rtc-mxc: use devm_rtc_device_register() Applying: rtc: rtc-palmas: use devm_rtc_device_register() Applying: rtc: rtc-pcf8523: use devm_rtc_device_register() Applying: rtc: rtc-s3c: use devm_rtc_device_register() Applying: rtc: rtc-snvs: use devm_rtc_device_register() Applying: rtc: rtc-spear: use devm_rtc_device_register() Applying: rtc: rtc-stk17ta8: use devm_rtc_device_register() Applying: rtc: rtc-tps6586x: use devm_rtc_device_register() Applying: rtc: rtc-tps65910: use devm_rtc_device_register() Applying: rtc: rtc-tps80031: use devm_rtc_device_register() Applying: rtc: rtc-tx4939: use devm_rtc_device_register() Applying: rtc: rtc-vt8500: use devm_rtc_device_register() Applying: rtc: rtc-wm831x: use devm_rtc_device_register() Applying: below is the warning reported with the gcc (gcc (GCC) 4.7.2 20121109 (Red Applying: drivers/rtc/rtc-pxa.c: fix set time sync time issue Applying: drivers-rtc-rtc-pxac-fix-set-time-sync-time-issue-fix Applying: drivers/rtc/rtc-tegra.c: protect suspend/resume callbacks with CONFIG_PM_SLEEP Applying: drivers/rtc/rtc-tegra.c: use struct dev_pm_ops for power management Applying: drivers/rtc/rtc-tegra.c: set irq name as device name Applying: drivers/rtc/rtc-tegra.c: use managed rtc_device_register() Applying: drivers/rtc/rtc-tegra.c: fix build warning Applying: drivers/rtc/rtc-ds1307.c: long block operations bugfix Applying: rtc: rtc-palmas: use devm_request_threaded_irq() Applying: drivers/rtc/rtc-s3c.c: convert s3c_rtc to dev_pm_ops Applying: rtc: rtc-ds1307: use dev_dbg() instead of pr_debug() Applying: rtc: rtc-fm3130: use dev_dbg() instead of pr_debug() Applying: rtc: rtc-ab3100: use devm_rtc_device_register() Applying: rtc: rtc-au1xxx: use devm_rtc_device_register() Applying: rtc: rtc-bq32k: use devm_rtc_device_register() Applying: rtc: rtc-dm355evm: use devm_rtc_device_register() Applying: rtc: rtc-ds1302: use devm_rtc_device_register() Applying: rtc: rtc-ds1672: use devm_rtc_device_register() Applying: rtc: rtc-ds3234: use devm_rtc_device_register() Applying: rtc: rtc-efi: use devm_rtc_device_register() Applying: rtc: rtc-em3027: use devm_rtc_device_register() Applying: rtc: rtc-generic: use devm_rtc_device_register() Applying: rtc: hid-sensor-time: use devm_rtc_device_register() Applying: rtc: rtc-ls1x: use devm_rtc_device_register() Applying: rtc: rtc-m41t93: use devm_rtc_device_register() Applying: rtc: rtc-m41t94: use devm_rtc_device_register() Applying: rtc: rtc-m48t86: use devm_rtc_device_register() Applying: rtc: rtc-max6900: use devm_rtc_device_register() Applying: rtc: rtc-max6902: use devm_rtc_device_register() Applying: rtc: rtc-ps3: use devm_rtc_device_register() Applying: rtc: rtc-r9701: use devm_rtc_device_register() Applying: rtc: rtc-rc5t583: use devm_rtc_device_register() Applying: rtc: rtc-rs5c313: use devm_rtc_device_register() Applying: rtc: rtc-rv3029c2: use devm_rtc_device_register() Applying: rtc: rtc-rx4581: use devm_rtc_device_register() Applying: rtc: rtc-rx8581: use devm_rtc_device_register() Applying: rtc: rtc-starfire: use devm_rtc_device_register() Applying: rtc: rtc-sun4v: use devm_rtc_device_register() Applying: rtc: rtc-test: use devm_rtc_device_register() Applying: rtc: rtc-tile: use devm_rtc_device_register() Applying: rtc: rtc-wm8350: use devm_rtc_device_register() Applying: rtc: rtc-x1205: use devm_rtc_device_register() Applying: rtc: rtc-at91rm9200: switch to using SIMPLE_DEV_PM_OPS Applying: rtc: rtc-mxc: switch to using SIMPLE_DEV_PM_OPS Applying: rtc: rtc-pxa: switch to using SIMPLE_DEV_PM_OPS Applying: rtc: rtc-rc5t583: switch to using SIMPLE_DEV_PM_OPS Applying: rtc: rtc-sa1100: switch to using SIMPLE_DEV_PM_OPS Applying: rtc: rtc-sh: switch to using SIMPLE_DEV_PM_OPS Applying: rtc: rtc-wm8350: switch to using SIMPLE_DEV_PM_OPS Applying: rtc: rtc-tps6586x: switch to using SIMPLE_DEV_PM_OPS Applying: rtc: rtc-tps65910: switch to using SIMPLE_DEV_PM_OPS Applying: rtc: rtc-tps80031: switch to using SIMPLE_DEV_PM_OPS Applying: drivers/rtc/rtc-omap.c: update to devm_* API Applying: drivers/rtc/rtc-palmas.c: add dt support Applying: drivers/rtc/rtc-ds1374.c: add CONFIG_PM_SLEEP to suspend/resume functions Applying: drivers/rtc/rtc-88pm80x.c: add CONFIG_PM_SLEEP to suspend/resume functions Applying: hfsplus: fix warnings in fs/hfsplus/bfind.c Applying: hfsplus-fix-warnings-in-fs-hfsplus-bfindc-in-function-hfs_find_1st_rec_by_cnid-fix Applying: fat: introduce 2 new values for the -o nfs mount option Applying: fat: move fat_i_pos_read to fat.h Applying: fat: introduce a helper fat_get_blknr_offset() Applying: fat: restructure export_operations Applying: fat (exportfs): rebuild inode if ilookup() fails Applying: fat (exportfs): rebuild directory-inode if fat_dget() Applying: Documentation: update nfs option in filesystem/vfat.txt Applying: ptrace: add ability to retrieve signals without removing from a queue (v4) Applying: selftest: add a test case for PTRACE_PEEKSIGINFO Applying: usermodehelper: export call_usermodehelper_exec() and call_usermodehelper_setup() Applying: usermodehelper-export-_exec-and-_setup-functions-fix Applying: kmod: split call to call_usermodehelper_fns() Applying: KEYS: split call to call_usermodehelper_fns() Applying: coredump: remove trailling whitespace Applying: usermodehelper: split remaining calls to call_usermodehelper_fns() Applying: kmod: remove call_usermodehelper_fns() Applying: coredump: only SIGKILL should interrupt the coredumping task Applying: coredump: ensure that SIGKILL always kills the dumping thread Applying: coredump: sanitize the setting of signal->group_exit_code Applying: coredump: introduce dump_interrupted() Applying: coredump: factor out the setting of PF_DUMPCORE Applying: coredump: change wait_for_dump_helpers() to use wait_event_interruptible() Applying: procfs: improve scaling in proc Applying: procfs-improve-scaling-in-proc-v5 Applying: set_task_comm: kill the pointless memset() + wmb() Applying: exec: do not abuse ->cred_guard_mutex in threadgroup_lock() Applying: kexec: fix wrong types of some local variables Applying: kexec: Use min() and min_t() to simplify logic Applying: kexec-use-min_t-to-simplify-logic-fix Applying: ipc: clamp with min() Applying: ipc: separate msg allocation from userspace copy Applying: ipc: tighten msg copy loops Applying: ipc: set EFAULT as default error in load_msg() Applying: ipc: remove msg handling from queue scan Applying: ipc: implement MSG_COPY as a new receive mode Applying: ipc: simplify msg list search Applying: ipc: refactor msg list search into separate function Applying: ipc: find_msg can be static Applying: ipc/msgutil.c: use linux/uaccess.h Applying: ipc: remove bogus lock comment for ipc_checkid Applying: ipc: introduce obtaining a lockless ipc object Applying: ipc-introduce-obtaining-a-lockless-ipc-object-fix Applying: ipc: introduce lockless pre_down ipcctl Applying: ipc,sem: do not hold ipc lock more than necessary Applying: ipc,sem: open code and rename sem_lock Applying: ipcsem-open-code-and-rename-sem_lock-fix Applying: ipc,sem: have only one list in struct sem_queue Applying: ipc,sem: fine grained locking for semtimedop Applying: ipc/sem.c: alternatives to preempt_disable() Applying: kernel/pid.c: improve flow of a loop inside alloc_pidmap. Applying: kernel-pidc-improve-flow-of-a-loop-inside-alloc_pidmap-fix Applying: pid_namespace.c/.h: simplify defines Applying: pid_namespacec-h-simplify-defines-fix Applying: aoe: replace kmalloc and then memcpy with kmemdup Applying: raid6test: use prandom_bytes() Applying: uuid: use prandom_bytes() Applying: x86: pageattr-test: remove srandom32 call Applying: x86: rename random32() to prandom_u32() Applying: lib/: rename random32() to prandom_u32() Applying: mm/: rename random32() to prandom_u32() Applying: kernel/: rename random32() to prandom_u32() Applying: drbd: rename random32() to prandom_u32() Applying: infiniband: rename random32() to prandom_u32() Applying: mmc: rename random32() to prandom_u32() Applying: video/uvesafb: rename random32() to prandom_u32() Applying: uwb: rename random32() to prandom_u32() Applying: lguest: rename random32() to prandom_u32() Applying: scsi: rename random32() to prandom_u32() Applying: scsi: fix the wrong position of the comment Applying: drivers/net: rename random32() to prandom_u32() Applying: drivers-net-rename-random32-to-prandom_u32-fix Applying: net/sunrpc: rename random32() to prandom_u32() Applying: net/sched: rename random32() to prandom_u32() Applying: net/netfilter: rename random32() to prandom_u32() Applying: net/core: rename random32() to prandom_u32() Applying: net/core: remove duplicate statements by do-while loop Applying: net: rename random32 to prandom Applying: remove unused random32() and srandom32() Applying: parport: use kmemdup instead of kmalloc + memcpy Applying: semaphore: use unlikely() for down's timeout Applying: semaphore: use `bool' type for semaphore_waiter's up Applying: drivers/memstick/host/r592.c: make r592_pm_ops static Applying: kernel/relay.c: remove unused function argument actor Applying: kernel/relay.c: move FIX_SIZE macro into relay.c Applying: relay: use macro PAGE_ALIGN instead of FIX_SIZE Applying: mm: remove old aio use_mm() comment Applying: aio: remove dead code from aio.h Applying: gadget: remove only user of aio retry Applying: gadget-remove-only-user-of-aio-retry-checkpatch-fixes Applying: aio: remove retry-based AIO Applying: aio-remove-retry-based-aio-checkpatch-fixes Applying: char: add aio_{read,write} to /dev/{null,zero} Applying: aio: kill return value of aio_complete() Applying: aio: add kiocb_cancel() Applying: aio: move private stuff out of aio.h Applying: aio: dprintk() -> pr_debug() Applying: aio: do fget() after aio_get_req() Applying: aio: make aio_put_req() lockless Applying: aio-make-aio_put_req-lockless-checkpatch-fixes Applying: aio: refcounting cleanup Applying: aio-refcounting-cleanup-checkpatch-fixes Applying: wait: add wait_event_hrtimeout() Applying: aio: make aio_read_evt() more efficient, convert to hrtimers Applying: aio-make-aio_read_evt-more-efficient-convert-to-hrtimers-checkpatch-fixes Applying: aio: use flush_dcache_page() Applying: aio: use cancellation list lazily Applying: aio: change reqs_active to include unreaped completions Applying: aio: kill batch allocation Applying: aio: kill struct aio_ring_info Applying: aio: give shared kioctx fields their own cachelines Applying: aio: reqs_active -> reqs_available Applying: aio: percpu reqs_available Applying: generic dynamic per cpu refcounting Applying: generic-dynamic-per-cpu-refcounting-checkpatch-fixes Applying: aio: percpu ioctx refcount Applying: aio: use xchg() instead of completion_lock Applying: aio: don't include aio.h in sched.h Applying: aio: kill ki_key Applying: aio: kill ki_retry Applying: aio-kill-ki_retry-checkpatch-fixes Applying: block: prep work for batch completion CONFLICT (content): Merge conflict in drivers/md/raid10.c CONFLICT (content): Merge conflict in drivers/md/raid1.c Applying: block-prep-work-for-batch-completion-checkpatch-fixes Applying: block, aio: batch completion for bios/kiocbs CONFLICT (content): Merge conflict in include/linux/bio.h CONFLICT (content): Merge conflict in block/blk-core.c Applying: block-aio-batch-completion-for-bios-kiocbs-checkpatch-fixes Applying: block-aio-batch-completion-for-bios-kiocbs-fix 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: Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS Applying: kconfig-consolidate-config_debug_strict_user_copy_checks-fix Applying: kconfig menu: move Virtualization drivers near other virtualization options Applying: kernel/sys.c: make prctl(PR_SET_MM) generally available Applying: decompressor: add LZ4 decompressor module Applying: lib: add support for LZ4-compressed kernel Applying: arm: add support for LZ4-compressed kernel Applying: x86: add support for LZ4-compressed kernel 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: fix for sem_lock Merging akpm/master (5ae9d45 fix for sem_lock) Applying: disable solo6x10 driver due to build errors Applying: block: remove the extra copy of bio_alloc_pages
Attachment:
pgptJKqG1GRAW.pgp
Description: PGP signature
