Hi all, Merry <insert holiday of choice> to you all! Changes since 20121221: The driver-core.current tree gained conflicts against Linus' tree. The slave-dma tree gained a conflict against the driver-core.current tree. The pinctl tree gained a conflict against the driver-core.current tree. The akpm tree gained a conflict against the driver-core.current tree and lost a patch 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, 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 213 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. 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 (637704c Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux) Merging fixes/master (3b095f2 disable the SB105X driver) Merging kbuild-current/rc-fixes (bad9955 menuconfig: Replace CIRCLEQ by list_head-style lists.) Merging arm-current/fixes (e6ee4b2 ARM: 7607/1: realview: fix private peripheral memory base for EB rev. B boards) Merging m68k-current/for-linus (5fec45a m68k/sun3: Fix instruction faults) Merging powerpc-merge/merge (e716e01 powerpc/eeh: Do not invalidate PE properly) Merging sparc/master (c4271c6 NFS: Kill fscache warnings when mounting without -ofsc) Merging net/master (9b1536c bridge: call br_netpoll_disable in br_add_if) Merging sound-current/for-linus (d846b17 ALSA: hda - Fix build without CONFIG_PM) Merging pci-current/for-linus (ff8e59b PCI/portdrv: Don't create hotplug slots unless port supports hotplug) Merging wireless/master (009b969 wireless: fix Atheros drivers compilation) Merging driver-core.current/driver-core-linus (8ba0c47 Drivers: rtc: rtc-twl.c: fix build error.) CONFLICT (content): Merge conflict in drivers/i2c/muxes/i2c-mux-gpio.c CONFLICT (content): Merge conflict in drivers/i2c/busses/scx200_acb.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-xiic.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-viapro.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-sis96x.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-pxa-pci.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-powermac.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-piix4.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-pasemi.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-nforce2.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mv64xxx.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-intel-mid.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-ibm_iic.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-i801.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-hydra.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-eg20t.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-pcidrv.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-au1550.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-ali1563.c Merging tty.current/tty-linus (a49f0d1 Linux 3.8-rc1) Merging usb.current/usb-linus (a49f0d1 Linux 3.8-rc1) Merging staging.current/staging-linus (a49f0d1 Linux 3.8-rc1) Merging char-misc.current/char-misc-linus (a49f0d1 Linux 3.8-rc1) Merging input-current/for-linus (022573c Merge branch 'next' into for-linus) Merging md-current/for-linus (a9add5d md/raid5: add blktrace calls) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (a2c0911 crypto: caam - Updated SEC-4.0 device tree binding for ERA information.) Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops) Merging dwmw2/master (084a0ec x86: add CONFIG_X86_MOVBE option) CONFLICT (content): Merge conflict in arch/x86/Kconfig 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 (bc1008c gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG) Merging rr-fixes/fixes (f3537f9 ASN.1: Fix an indefinite length skip error) Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) Merging arm/for-next (c5a04d52 Merge branch 'fixes' into for-next) Merging arm-perf/for-next/perf (3d70f8c Linux 3.7-rc4) Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) Merging xilinx/arm-next (a3607ea serial: xilinx_uartps: fix return value check in xuartps_probe()) Merging arm64/upstream (d19766e arm64: Update the MAINTAINERS entry) Merging blackfin/for-linus (86794b4 blackfin: SEC: clean up SEC interrupt initialization) 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 (7843ae0 Merge branch 'pstore_mevent' into next) Merging m68k/for-next (5fec45a m68k/sun3: Fix instruction faults) Merging m68knommu/for-next (280ef31 m68knommu: modify clock code so it can be used by all ColdFire CPU types) Merging microblaze/next (a4f1de1 mm: fix kernel BUG at huge_memory.c:1474!) Merging mips/mips-for-linux-next (fcc638e Merge branch 'current/for-linus' into mips-for-linux-next) Merging openrisc/for-upstream (634bd40 openrisc: use kbuild.h instead of defining macros in asm-offset.c) Merging parisc/for-next (949a05d [PARISC] fix virtual aliasing issue in get_shared_area()) Merging powerpc/next (376bddd Merge remote-tracking branch 'agust/next' into next) Merging 4xx/next (2074b1d powerpc: Fix irq distribution) Merging mpc5xxx/next (a49f0d1 Linux 3.8-rc1) Merging galak/next (1723d90 powerpc/dma/raidengine: add raidengine device) Merging s390/features (1f1c961 s390/ccwdev: Include asm/schid.h.) Merging sh/sh-latest (0dd4d5c sh: Fix up more fallout from pointless ARM __iomem churn.) Merging sparc-next/master (c4271c6 NFS: Kill fscache warnings when mounting without -ofsc) Merging tile/master (e6cdebd arch/tile: set CORE_DUMP_USE_REGSET on tile) Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) Merging xtensa/for_next (055d4db xtensa: don't try to build DTB when OF is disabled) Merging btrfs/next (fb8ec37 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into linus-merge) Merging ceph/master (c3e946c rbd: get rid of rbd_{get,put}_dev()) Merging cifs/for-next (9acbd26 cifs: eliminate cifsERROR variable) 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 (3702875 fs/ecryptfs/crypto.c: make ecryptfs_encode_for_filename() static) Merging ext3/for_next (56df127 quota: Use the pre-processor to compile out quotactl_cmd_write when !CONFIG_BLOCK) Merging ext4/dev (bd9926e ext4: zero out inline data using memset() instead of empty_zero_page) Merging f2fs/dev (1f7013c f2fs: fix equation of has_not_enough_free_secs()) Merging fuse/for-next (23ab0c7 cuse: do not register multiple devices with identical names) Merging gfs2/master (1e2d9d4 GFS2: Set gl_object during inode create) Merging jfs/jfs-next (4e7a4b0 jfs: Fix FITRIM argument handling) Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) Merging nfs/linux-next (cd6c596 SUNRPC: continue run over clients list on PipeFS event instead of break) Merging nfsd/nfsd-next (24ffb93 nfsd4: don't leave freed stateid hashed) 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 (3d59eeb Merge tag 'balancenuma-v11' of git://git.kernel.org/pub/scm/linux/kernel/git/mel/linux-balancenuma) Merging ubifs/linux-next (a28ad42 UBIFS: fix mounting problems after power cuts) Merging xfs/for-next (ec47eb6 xfs remove the XFS_TRANS_DEBUG routines) Merging vfs/for-next (b729d75 vfs: make lremovexattr retry once on ESTALE error) Merging pci/next (1cb73f8 Merge branch 'pci/mjg-pci-roms-from-efi' into next) Merging hid/for-next (01c4f7e Merge branch 'for-3.8/i2c-hid' into for-next) Merging i2c-embedded/i2c-embedded/for-next (0b255e9 i2c: remove __dev* attributes from subsystem) Merging jdelvare-hwmon/master (54e37b8 Merge tag 'vfio-for-v3.8-v2' of git://github.com/awilliam/linux-vfio) Merging hwmon-staging/hwmon-next (86266ca hwmon: (emc6w201) Fix DIV_ROUND_CLOSEST problem with unsigned divisors) Merging v4l-dvb/master (577e688 Merge /home/v4l/v4l/for_upstream) Merging kbuild/for-next (f853c4a Merge branch 'kbuild/kconfig' into kbuild/for-next) Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm') Merging libata/NEXT (72d5f2d sata_dwc_460ex: remove file exec bit (chmod 0755 -> 0644)) Merging infiniband/for-next (d72623b Merge branches 'cxgb4', 'ipoib' and 'mlx4' into for-next) Merging pstore/master (ebacfd1 pstore/ftrace: Adjust for ftrace_ops->func prototype change) Merging acpi/next (61dc7fc tools/power turbostat: fix build error due to uapi changes) Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules) CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c CONFLICT (content): Merge conflict in drivers/cpuidle/Makefile CONFLICT (content): Merge conflict in drivers/cpuidle/Kconfig CONFLICT (content): Merge conflict in drivers/acpi/processor_driver.c Applying: cpuidle: fix mismerge Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) Merging thermal/next (d12250e thermal: rcar: add rcar_zone_to_priv() macro) Merging ieee1394/for-next (db2cad2 firewire: net: remove unused variable in fwnet_receive_broadcast()) Merging ubi/linux-next (eab7377 UBI: embed ubi_debug_info field in ubi_device struct) Merging dlm/next (da8c666 dlm: fix lvb invalidation conditions) Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers) Merging scsi/for-next (e3ff197 [SCSI] mpt3sas: remove unused variables) Merging target-updates/for-next (79e62fc target/iscsi_target: Add NodeACL tags for initiator group support) Merging target-merge/for-next-merge (6f0c058 Linux 3.7-rc2) Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) Merging isci/all (6734092 isci: add a couple __iomem annotations) Merging slave-dma/next (3226658 Merge git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git/next) CONFLICT (content): Merge conflict in drivers/dma/mv_xor.c CONFLICT (content): Merge conflict in drivers/dma/ioat/dma_v3.c CONFLICT (content): Merge conflict in drivers/dma/dw_dmac.c CONFLICT (content): Merge conflict in drivers/dma/dmatest.c CONFLICT (content): Merge conflict in arch/arm/mach-spear13xx/spear13xx.c CONFLICT (content): Merge conflict in arch/arm/mach-spear13xx/spear1310.c CONFLICT (content): Merge conflict in arch/arm/boot/dts/spear1340.dtsi Merging dmaengine/next (7f34986 dma: ipu: Drop unused spinlock) Merging net-next/master (c4271c6 NFS: Kill fscache warnings when mounting without -ofsc) Merging wireless-next/master (eca2a43 bridge: fix icmpv6 endian bug and other sparse warnings) Merging bluetooth/master (c668d4c Bluetooth: mgmt: Avoid using magic number in status code) Merging mtd/master (ca2a88f Merge tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd) Merging l2-mtd/master (d4d4f1b mtd: nand: typo in nand_id_has_period() comments) Merging crypto/master (a2c0911 crypto: caam - Updated SEC-4.0 device tree binding for ERA information.) Merging drm/drm-next (0953e76 drm/ttm: fix delayed ttm_bo_cleanup_refs_and_unlock delayed handling) Merging sound/for-next (cb99864 ALSA: usb-audio: Support for Digidesign Mbox 2 USB sound card:) Merging sound-asoc/for-next (42b3dc8 Merge remote-tracking branch 'asoc/fix/wm2200' into asoc-next) Merging modules/modules-next (2f0bf92 Merge tag 'xtensa-20121218' of git://github.com/czankel/xtensa-linux) Merging virtio/virtio-next (ec2894e Merge branch 'master' into virtio-next) CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c CONFLICT (content): Merge conflict in drivers/net/virtio_net.c Merging input/next (a455e29 Input: walkera0701 - fix crash on startup) Merging input-mt/for-next (6f0c058 Linux 3.7-rc2) Merging cgroup/for-next (15ef4ff cgroup: update Documentation/cgroups/00-INDEX) Merging block/for-next (b6c46cf Merge branch 'stable/for-jens-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus) Merging device-mapper/master (4b76b25 Rename stripe_map_discard to stripe_map_range and reuse it for WRITE SAME bio processing.) 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 (6be35c7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c) Merging slab/for-next (ce343df Merge branch 'slab/next' into for-next) Merging uclinux/for-next (b69f085 Linux 3.7-rc8) Merging md/for-next (eb9efc4 raid5: create multiple threads to handle stripes) Merging mfd/for-next (1881b68 mfd: tps6507x: Convert to devm_kzalloc) Merging battery/master (f36b9dd charger-manager: Fix bug when check dropped voltage after fullbatt event) Merging fbdev/fbdev-next (cd9d6f1 gbefb: fix compile error) 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 (a824b57 Merge remote-tracking branch 'regulator/fix/core' into regulator-next) Merging security/next (e930723 Smack: create a sysfs mount point for smackfs) Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409) Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) Merging watchdog/master (82444d8 Merge branch 'master' of ../linux-watchdog) Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage) Merging iommu/next (9c6ecf6 Merge branches 'iommu/fixes', 'dma-debug', 'x86/amd', 'x86/vt-d', 'arm/tegra' and 'arm/omap' into next) Merging vfio/next (9a92c50 vfio-pci: Enable device before attempting reset) 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 (106f9d9 HOWTO: fix double words typo) Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging pm/linux-next (f91791f Merge branch 'pm-sleep-next' into linux-next) Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) Applying: fsnotify: cope with change from spinlock to mutex Merging edac/linux_next (1c06910 i7core_edac: fix kernel crash on unloading i7core_edac.) Merging edac-amd/for-next (f7dd80d EDAC, MCE, AMD: Remove unneeded exports) Merging devicetree/devicetree/next (93c667c of: *node argument to of_parse_phandle_with_args should be const) Merging dt-rh/for-next (58fea35 arm64: Fix the dtbs target building) Merging spi/spi/next (7cb9436 spi/sparc: Allow of_register_spi_devices for sparc) Merging spi-mb/spi-next (227c4ce spi: omap2-mcspi: remove duplicate inclusion of linux/err.h) Merging tip/auto-latest (60c190c Merge branch 'linus') Merging ftrace/for-next (2faffc4 Merge branch 'trace/tip/perf/urgent' into trace/for-next) Merging rcu/rcu/next (91d1aa43 context_tracking: New context tracking susbsystem) 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 (f924d66 KVM: VMX: remove unneeded temporary variable from vmx_set_segment()) Merging kvm-ppc/kvm-ppc-next (26cb772 powerpc: Corrected include header path in kvm_para.h) Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()) Merging fw-cputime/cputime/adjustment-v2 (fa09205 cputime: Comment cputime's adjusting code) Merging fw-sched/sched/cputime-v2 (1b2852b vtime: Warn if irqs aren't disabled on system time accounting APIs) Merging fw-nohz/nohz/printk-v8 (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 (9736dea Merge commit '74b84233458e9db7c160cec67638efdbec748ca9' into linux-next) CONFLICT (content): Merge conflict in arch/arm/xen/enlighten.c 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 (023f27d workqueue: fix find_worker_executing_work() brekage from hashtable conversion) Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug()) 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 (7c8a299 Merge remote-tracking branch 'regmap/topic/type' into regmap-next) Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (2f05e1d leds: leds-lp5521: return an error code on error in probe()) Merging driver-core/driver-core-next (a49f0d1 Linux 3.8-rc1) Merging tty/tty-next (a49f0d1 Linux 3.8-rc1) Merging usb/usb-next (a49f0d1 Linux 3.8-rc1) Merging staging/staging-next (a49f0d1 Linux 3.8-rc1) Merging char-misc/char-misc-next (a49f0d1 Linux 3.8-rc1) Merging tmem/linux-next (8f0d816 Linux 3.7-rc3) Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug) 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 (e5b4c9d pinctrl: exynos5440: Fix compile error in pinctrl-exynos5440/samsung.c) CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-sirf.c CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-samsung.c CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-exynos5440.c Merging vhost/linux-next (0e9ff68 vhost-blk: add eventfd dependency) 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 (023bba3 irqdomain: update documentation) Merging gpio/gpio/next (fc13d5a gpio: Provide the STMPE GPIO driver with its own IRQ Domain) Merging gpio-lw/for-next (fc13d5a gpio: Provide the STMPE GPIO driver with its own IRQ Domain) Merging arm-soc/for-next (e691d77 Merge branch 'late/omap-cleanup' into for-next) Merging bcm2835/for-next (2959440 Linux 3.7) Merging cortex/for-next (77a3018 Cortex-M3: Add support for exception handling) CONFLICT (content): Merge conflict in arch/arm/kernel/process.c Merging ep93xx/ep93xx-for-next (cf92d86 Merge branch 'ep93xx-fixes' into ep93xx-for-next) Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO) Merging msm/for-next (a0d271c Linux 3.6) Merging renesas/next (e438fd8 Merge branches 'heads/fixes', 'heads/defconfig', 'heads/boards4', 'heads/soc5' and 'heads/maintainers'; commit 'ab6f6d85210c4d0265cf48e9958c04e08595055a' into next) Merging samsung/for-next (10819d9 Merge branch 'next/secure-exynos' into for-next) Merging tegra/for-next (3c8d1fc Merge branch 'for-3.8/fixes-for-rc1' into for-next) Merging kvmtool/master (5f2ad67 kvm tools: remove max_high field in rb_int_node structure) Merging dma-mapping/dma-mapping-next (41b8d1e ARM: iommu: Include linux/kref.h in asm/dma-iommu.h) Merging pwm/for-next (20e8ac3 pwm: samsung: add missing s3c->pwm_id assignment) Merging dma-buf/for-next (1d40cc8 dma-buf: remove fallback for !CONFIG_DMA_SHARED_BUFFER) Merging userns/for-next (5155040 userns: Fix typo in description of the limitation of userns_install) Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements) Merging signal/for-next (50ececc alpha: switch to generic sigaltstack) Applying: fix up for unify SS_ONSTACK/SS_DISABLE definitions Merging clk/clk-next (8f87189 MAINTAINERS: bad email address for Mike Turquette) Merging random/dev (6133705 random: Mix cputime from each thread that exits to the pool) Merging lzo-update/lzo-update (ba32bf9 lib/lzo: Do not leak implementation details in lzo1x_1_compress()) Merging drop-experimental/linux-next (dddaa92 tools/lguest: remove depends on CONFIG_EXPERIMENTAL) CONFLICT (content): Merge conflict in net/dsa/Kconfig CONFLICT (content): Merge conflict in init/Kconfig CONFLICT (content): Merge conflict in drivers/ptp/Kconfig CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/Kconfig Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6) Merging akpm-current/current (3605cce keys: use keyring_alloc() to create module signing keyring) $ git checkout akpm Applying: drivers/rtc/rtc-tegra.c: convert to DT driver CONFLICT (content): Merge conflict in drivers/rtc/rtc-tegra.c Applying: mm: cond_resched in tlb_flush_mmu to fix soft lockups on !CONFIG_PREEMPT Applying: mm: fix zone_watermark_ok_safe() accounting of isolated pages Applying: mm: limit mmu_gather batching to fix soft lockups on !CONFIG_PREEMPT Applying: fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk() Applying: x86 numa: don't check if node is NUMA_NO_NODE Applying: arch/x86/tools/insn_sanity.c: identify source of messages Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue Applying: olpc: fix olpc-xo1-sci.c build errors Applying: x86: convert update_mmu_cache() and update_mmu_cache_pmd() to functions Applying: x86: fix the argument passed to sync_global_pgds() Applying: arch/x86/kernel/cpu/perf_event_p6.c: fix section warning Applying: x86: make 'mem=' option to work for efi platform Applying: audit: create explicit AUDIT_SECCOMP event type Applying: audit: catch possible NULL audit buffers Applying: cris: Use "int" for ssize_t to match size_t Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete Applying: drivers/gpu/drm/drm_fb_helper.c: avoid sleeping in unblank_screen() if oops in progress Applying: fb: rework locking to fix lock ordering on takeover Applying: fb-rework-locking-to-fix-lock-ordering-on-takeover-fix Applying: fb-rework-locking-to-fix-lock-ordering-on-takeover-fix-2 Applying: cyber2000fb: avoid palette corruption at higher clocks Applying: timeconst.pl: remove deprecated defined(@array) Applying: time: don't inline EXPORT_SYMBOL functions Applying: mm, mempolicy: introduce spinlock to read shared policy tree Applying: block: restore /proc/partitions to not display non-partitionable removable devices Applying: fs: change return values from -EACCES to -EPERM Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget() Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic Applying: memcg, oom: provide more precise dump info while memcg oom happening Applying: mm/memcontrol.c: convert printk(KERN_FOO) to pr_foo() Applying: mm/hugetlb.c: convert to pr_foo() Applying: CMA: make putback_lru_pages() call conditional Applying: mm/page_alloc.c:__alloc_contig_migrate_range(): cleanup Applying: mm: memcg: only evict file pages when we have plenty Applying: mm: vmscan: save work scanning (almost) empty LRU lists Applying: mm: vmscan: clarify how swappiness, highest priority, memcg interact Applying: mm: vmscan: improve comment on low-page cache handling Applying: mm: vmscan: clean up get_scan_count() Applying: mm-vmscan-clean-up-get_scan_count-fix Applying: mm: vmscan: compaction works against zones, not lruvecs Applying: mm-vmscan-compaction-works-against-zones-not-lruvecs-fix Applying: mm: reduce rmap overhead for ex-KSM page copies created on swap faults Applying: mm/page_alloc.c:__setup_per_zone_wmarks: make min_pages unsigned long Applying: mm/vmscan.c:__zone_reclaim(): replace max_t() with max() Applying: mm: compaction: do not accidentally skip pageblocks in the migrate scanner Applying: cma-use-unsigned-type-for-count-argument-fix CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c 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: ext3, ext4, ocfs2: remove unused macro NAMEI_RA_INDEX Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes Applying: scripts/tags.sh: add magic for declarations of popular kernel type Applying: backlight: add lms501kf03 LCD driver Applying: backlight-add-lms501kf03-lcd-driver-fix Applying: backlight: ld9040: use sleep instead of delay Applying: backlight: ld9040: remove unnecessary NULL deference check Applying: backlight: ld9040: replace EFAULT with EINVAL Applying: backlight: ld9040: remove redundant return variables Applying: backlight: ld9040: reorder inclusions of <linux/xxx.h> Applying: backlight: s6e63m0: use lowercase names of structs Applying: backlight: s6e63m0: use sleep instead of delay Applying: backlight: s6e63m0: remove unnecessary NULL deference check Applying: backlight: s6e63m0: replace EFAULT with EINVAL Applying: backlight: s6e63m0: remove redundant variable 'before_power' Applying: backlight: s6e63m0: reorder inclusions of <linux/xxx.h> Applying: backlight: ams369fg06: use sleep instead of delay Applying: backlight: ams369fg06: remove unnecessary NULL deference check Applying: backlight: ams369fg06: replace EFAULT with EINVAL Applying: backlight: ams369fg06: remove redundant variable 'before_power' Applying: backlight: ams369fg06: reorder inclusions of <linux/xxx.h> Applying: epoll: support for disabling items, and a self-test app Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting Applying: drivers/rtc: dump small buffers via %*ph Applying: drivers/rtc/rtc-pxa.c: fix alarm not match issue Applying: drivers/rtc/rtc-pxa.c: fix alarm can't wake up system issue Applying: drivers/rtc/rtc-pxa.c: fix set time sync time issue Applying: drivers/rtc/rtc-ds1307.c: long block operations bugfix Applying: rtc-ds1307-long-block-operations-bugfix-fix Applying: rtc: max77686: add Maxim 77686 driver Applying: rtc-max77686-add-maxim-77686-driver-fix Applying: rtc-pcf8523: add low battery voltage support Applying: rtc-pcf8523-add-low-battery-voltage-support-fix Applying: drivers/rtc: use of_match_ptr() macro CONFLICT (content): Merge conflict in drivers/rtc/rtc-mpc5121.c Applying: drivers/rtc/rtc-pxa.c: avoid cpuid checking Applying: drivers/rtc: remove unnecessary semicolons Applying: drivers/rtc/rtc-ds2404.c: use module_platform_driver macro Applying: hfsplus: add osx.* prefix for handling namespace of Mac OS X extended attributes Applying: hfsplus: add on-disk layout declarations related to attributes tree Applying: hfsplus: add functionality of manipulating by records in attributes tree Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes Applying: hfsplus: add support of manipulation by attributes file Applying: Documentation/DMA-API-HOWTO.txt: minor grammar corrections Applying: fork: unshare: remove dead code Applying: kexec: add the values related to buddy system for filtering free pages. Applying: ipc: remove forced assignment of selected message Applying: ipc: add sysctl to specify desired next object id Applying: ipc: message queue receive cleanup Applying: ipc: introduce message queue copy feature Applying: selftests: IPC message queue copy feature test Applying: ipc: simplify free_copy() call Applying: ipc: convert prepare_copy() from macro to function Applying: ipc: simplify message copying Applying: ipc: add more comments to message copying related code Applying: Documentation/sysctl/kernel.txt: document /proc/sys/shmall Applying: ipc/sem.c: alternatives to preempt_disable() Applying: drivers/char/misc.c:misc_register(): do not loop on misc_list unconditionally Applying: drivers-char-miscc-misc_register-do-not-loop-on-misc_list-unconditionally-fix Applying: mtd: mtd_nandecctest: use prandom_bytes instead of get_random_bytes() Applying: mtd: mtd_oobtest: convert to use prandom library Applying: mtd: mtd_pagetest: convert to use prandom library Applying: mtd: mtd_speedtest: use prandom_bytes Applying: mtd: mtd_subpagetest: convert to use prandom library Applying: mtd: mtd_stresstest: use prandom_bytes() Applying: Documentation/DMA-API-HOWTO.txt: fix typo Merging akpm/master (010a794 Documentation/DMA-API-HOWTO.txt: fix typo)
Attachment:
pgpObIesAHNEL.pgp
Description: PGP signature
