Hi all, Changes since 20131204: The akpm-current tree gained a conflict against the modules tree. Non-merge commits (relative to Linus' tree): 2453 2661 files changed, 104935 insertions(+), 71055 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" 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 and a multi_v7_defconfig for arm. 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. I am currently merging 210 trees (counting Linus' and 29 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. 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 (8ecffd791448 Merge tag 'gpio-v3.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) Merging fixes/master (8ae516aa8b81 Merge tag 'trace-fixes-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux) Merging arc-current/for-curr (da990a4f2d5a ARC: [perf] Fix a few thinkos) Merging arm-current/fixes (11d4bb1bd067 ARM: 7907/1: lib: delay-loop: Add align directive to fix BogoMIPS calculation) Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_DISABLED) Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) Merging powerpc-merge/merge (721cb59e9d95 powerpc/windfarm: Fix XServe G5 fan control Makefile issue) Merging sparc/master (1de425c7b271 sparc64: Fix build regression) Merging net/master (988bf4f01e6a Merge branch 'cxgb4') Merging ipsec/master (dff345c5c85d be2net: call napi_disable() for all event queues) Merging sound-current/for-linus (0756f09c4946 ALSA: hda - Fix silent output on MacBook Air 2,1) Merging pci-current/for-linus (4bff6749905d PCI: Move device_del() from pci_stop_dev() to pci_destroy_dev()) Merging wireless/master (a59b40b30f3f Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) Merging driver-core.current/driver-core-linus (dc1ccc48159d Linux 3.13-rc2) Merging tty.current/tty-linus (39434abd942c n_tty: Fix missing newline echo) Merging usb.current/usb-linus (eee52f9edd0f USB: switch maintainership of chipidea to Peter) Merging staging.current/staging-linus (55ef003e4ae6 Merge tag 'iio-fixes-for-3.13b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) Merging char-misc.current/char-misc-linus (d0b00d3fb96d Merge tag 'extcon-linus-for-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus) Merging input-current/for-linus (4ef38351d770 Input: usbtouchscreen - separate report and transmit buffer size handling) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (8ec25c512916 crypto: testmgr - fix sglen in test_aead for case 'dst != src') Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvdata()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions) Merging devicetree-current/devicetree/merge (1931ee143b0a Revert "drivers: of: add initialization code for dma reserved memory") Merging rr-fixes/fixes (af91706d5dde ima: store address of template_fmt_copy in a pointer before calling strsep) Merging mfd-fixes/master (88ec6a4d8369 Merge tag 'mfd-lee-3.13-fixes-1' of git://git.linaro.org/people/ljones/mfd) Merging vfio-fixes/for-linus (dc1ccc48159d Linux 3.13-rc2) Merging drm-intel-fixes/for-linux-next-fixes (0d1430a3f4b7 drm/i915: Hold mutex across i915_gem_release) Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (418556e7743b ARC: [SMP] optimize IPI send and receive) Merging arm/for-next (fb4bdc534590 Merge branches 'fixes', 'kees' and 'misc' into for-next) Merging arm-perf/for-next/perf (6ce4eac1f600 Linux 3.13-rc1) Merging arm-soc/for-next (2e3b55132560 Merge branch 'fixes' into for-next) Merging arm-v7-cache-opt/v7-cache-opt (e11d68fee368 arm: mm: refactor v7 cache cleaning ops to use way/index sequence) Merging bcm2835/for-next (7d132055814e Linux 3.10-rc6) Merging cortex-m/for-next (9c031a483646 ARM: v7-M: drop using mach/entry-macro.S) Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) Merging imx-mxs/for-next (5d49e797de3a Merge branch 'imx/dt' into for-next) Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) Merging mvebu/for-next (02d93eb266e3 Merge branch 'mvebu/dt' into for-next) Merging renesas/next (c6146726fb94 Merge branch 'fixes-for-v3.13' into next) Merging samsung/for-next (8465d57097ce Merge branch 'v3.14-next/samsung-defconfig' into for-next) Merging tegra/for-next (850500ad1edd Merge branch for-3.14/dt into for-next) Merging arm64/upstream (dc1ccc48159d Linux 3.13-rc2) Merging blackfin/for-linus (36855dcfc980 blackfin: fix build warning for unused variable) Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by cache.h) Merging cris/for-next (be8cb7f42ab9 CRIS: drop unused Kconfig symbols) Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) Merging ia64/next (959f58544b7f Linux 3.12-rc7) Merging m68k/for-next (50190edb2a56 m68k/amiga: Provide mach_random_get_entropy()) Merging m68knommu/for-next (d4d80b54a862 m68k : Kill CONFIG_MTD_PARTITIONS) Merging metag/for-next (5a25f7bb5aa1 metag: smp: don't set irq regs in do_IPI()) Merging microblaze/next (a1dd107fcafa microblaze: Remove duplicate declarations of _stext[] and _etext[]) Merging mips/mips-for-linux-next (6ca0bf323c14 Merge branch '3.13-fixes' into mips-for-linux-next) Merging openrisc/for-upstream (60a9dd5a10a1 openrisc: Use get_signal() signal_setup_done()) Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) Merging parisc-hd/for-next (dc1ccc48159d Linux 3.13-rc2) Merging powerpc/next (66c29da6782b powerpc/powernv: Replace CONFIG_POWERNV_MSI with just CONFIG_PPC_POWERNV) Merging mpc5xxx/next (4384290b1f1a powerpc/512x: dts: remove misplaced IRQ spec from 'soc' node) Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) Merging s390/features (c9b851905dba s390/blacklist: Perform subchannel scan only when needed) Merging sh/sh-latest (37284bd93103 Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) CONFLICT (content): Merge conflict in include/linux/serial_sci.h CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) Merging tile/master (9248053f80fd tile: Remove tile-specific _sinitdata and _einitdata) Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL) Merging xtensa/for_next (3bf4c10bb2e3 xtensa: implement CPU hotplug) Merging btrfs/next (91aef86f3b8a Btrfs: rename btrfs_start_all_delalloc_inodes) Merging ceph/master (ff638b7df5a9 ceph: allocate non-zero page to fscache in readpage()) Merging cifs/for-next (dea4f48a0a30 Merge branch 'leds-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) Merging ecryptfs/next (2000f5beabc9 eCryptfs: file->private_data is always valid) Merging ext3/for_next (df4e7ac0bb70 ext2: Fix oops in ext2_get_block() called from ext2_quota_write()) Merging ext4/dev (0826a7e1ffac ext4: check for overlapping extents in ext4_valid_extent_entries()) Merging f2fs/dev (0491fe20cb11 f2fs: replace the debugfs_root with f2fs_debugfs_root) Merging fscache/fscache (7c604e5d6e56 FS-Cache: Fix handling of an attempt to store a page that is now beyond EOF) Merging fuse/for-next (ce128de6260f fuse: writepages: protect secondary requests from fuse file release) Merging gfs2/master (c599ca2dc6f5 GFS2: Remove test which is always true) Merging jfs/jfs-next (8660998608cf jfs: fix error path in ialloc) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) Merging nfs/linux-next (3873d064b853 nfs: fix do_div() warning by instead using sector_div()) Merging nfsd/nfsd-next (d2c2ad54c485 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error) Merging v9fs/for-next (f94741fd2832 net/9p: remove virtio default hack and set appropriate bits instead) Merging ubifs/linux-next (58a4e23703b2 UBIFS: correct data corruption range) Merging xfs/for-next (f9fd01356100 xfs: don't perform discard if the given range length is less than block size) Merging vfs/for-next (27ac0ffeac80 locks: break delegations on any attribute modification) Merging pci/next (6ce4eac1f600 Linux 3.13-rc1) Merging hid/for-next (074fb898390b Merge branch 'for-3.14/upstream' into for-next) Merging i2c/i2c/for-next (af91706d5dde ima: store address of template_fmt_copy in a pointer before calling strsep) Merging jdelvare-hwmon/master (672cbc9af2bf hwmon: (it87) Print proper names for the IT8771E and IT8772E) Merging hwmon-staging/hwmon-next (7f438058ec86 hwmon: remove DEFINE_PCI_DEVICE_TABLE macro) Merging v4l-dvb/master (258a9e5cbc63 Merge branch 'patchwork' into to_next) Merging kbuild/for-next (e6483a58eca6 Merge branch 'kbuild/misc' into kbuild/for-next) Merging kconfig/for-next (4eae518d4b01 localmodconfig: Fix localyesconfig to set to 'y' not 'm') Merging libata/for-next (c5fd0781fbae Merge branch 'for-3.14' into for-next) Merging pstore/master (bd08ec33b5c2 pstore/ram: Restore ecc information block) Merging pm/linux-next (034b30b068a0 Merge branch 'acpi-hotplug-next' into linux-next) Merging idle/next (1ae2a8af4228 tools/power turbostat: run on HSX) Merging apm/for-next (fb9d78aca709 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) Merging thermal/next (86e0a0bdf81c Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next) Merging ieee1394/for-next (db9ae8fec7b1 firewire: ohci: Fix deadlock at bus reset) Merging ubi/linux-next (ae0d14695566 UBI: Add some asserts to ubi_attach_fastmap()) Merging dlm/next (a97f4a66d8ee dlm: Avoid that dlm_release_lockspace() incorrectly returns -EBUSY) Merging swiotlb/linux-next (af51a9f1848f swiotlb: Do not export swiotlb_bounce since there are no external consumers) Merging slave-dma/next (29732357a296 Merge branch 'for-linus' into next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx53.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx51.dtsi Merging dmaengine/next (6ce4eac1f600 Linux 3.13-rc1) Merging net-next/master (42a2d923cc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) Merging ipsec-next/master (9bb8ca86075f virtio-net: switch to use XPS to choose txq) Merging wireless-next/master (4b074b07625f Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next) CONFLICT (content): Merge conflict in net/mac80211/util.c CONFLICT (content): Merge conflict in drivers/net/wireless/brcm80211/Kconfig Merging bluetooth/master (201a5929c8c7 Bluetooth: Remove dead code from SMP encryption function) Merging infiniband/for-next (b4fdf52b3fc8 Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next) Merging mtd/master (6ce4eac1f600 Linux 3.13-rc1) Merging l2-mtd/master (79d9d3ba063b mtd: nand: mxc_nand: Check the return value from clk_prepare_enable()) Merging crypto/master (f262f0f5cad0 crypto: s390 - Fix aes-cbc IV corruption) Merging drm/drm-next (a3483353ca4e drm: check for !kdev in drm_unplug_minor()) Merging drm-intel/for-linux-next (d299cce76e00 drm/i915: check context reset stats before relocations) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c Merging drm-tegra/drm/for-next (977386a04bae drm/tegra: Reserve syncpoint base for gr3d) Merging sound/for-next (b13a714923fe ALSA: AACI: Convert to modern PM ops) Merging sound-asoc/for-next (6a097d5531b7 Merge remote-tracking branches 'asoc/topic/ad193x', 'asoc/topic/adav80x', 'asoc/topic/adsp', 'asoc/topic/ak4641', 'asoc/topic/ak4642', 'asoc/topic/arizona', 'asoc/topic/bcm2835', 'asoc/topic/cs4271', 'asoc/topic/cs42l52', 'asoc/topic/da7210', 'asoc/topic/ep93xx', 'asoc/topic/fsl', 'asoc/topic/hdmi', 'asoc/topic/jack', 'asoc/topic/jz4740', 'asoc/topic/mxs', 'asoc/topic/omap', 'asoc/topic/rcar', 'asoc/topic/spear', 'asoc/topic/ssm2602', 'asoc/topic/uda1380', 'asoc/topic/ux500', 'asoc/topic/wm8510', 'asoc/topic/wm8523', 'asoc/topic/wm8580', 'asoc/topic/wm8711', 'asoc/topic/wm8728', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'asoc/topic/wm8750', 'asoc/topic/wm8753', 'asoc/topic/wm8776', 'asoc/topic/wm8804', 'asoc/topic/wm8900', 'asoc/topic/wm8901', 'asoc/topic/wm8940', 'asoc/topic/wm8962', 'asoc/topic/wm8974', 'asoc/topic/wm8985', 'asoc/topic/wm8988', 'asoc/topic/wm8990', 'asoc/topic/wm8991', 'asoc/topic/wm8994', 'asoc/topic/wm8995', 'asoc/topic/wm9081' and 'asoc/topic/x86' into asoc-next) CONFLICT (content): Merge conflict in sound/soc/fsl/fsl_ssi.c Merging modules/modules-next (74e22fac8858 module.h: Remove unnecessary semicolon) Merging virtio/virtio-next (7d2dddda5c92 virtio: pci: remove unnecessary pci_set_drvdata()) Merging input/next (c52b4fc78175 Input: ads7846 - use IS_ENABLED() macro) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging cgroup/for-next (717a24e62220 Merge branch 'for-3.14' into for-next) Merging block/for-next (391b7a7bfb52 Merge branch 'for-3.14/drivers' into for-next) CONFLICT (content): Merge conflict in include/trace/events/f2fs.h CONFLICT (content): Merge conflict in fs/f2fs/segment.c CONFLICT (content): Merge conflict in fs/f2fs/data.c Merging device-mapper/for-next (27cafc612c3b dm snapshot: avoid snapshot space leak on crash) Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence) Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3) Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage) Merging mmc/mmc-next (e395c4387c74 mmc: wbsd: Silence compiler warning) Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) CONFLICT (content): Merge conflict in kernel/debug/debug_core.h Merging slab/for-next (a8c0b0837359 Merge branch 'slab/next' into for-next) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (6d183de40771 md/raid5: fix newly-broken locking in get_active_stripe.) Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd) Merging mfd-lj/for-mfd-next (2b12ea963aa2 mfd: wm831x: Use PM ops for shutdown) Merging battery/master (d36240d26025 power_supply: Add power_supply notifier) Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) Merging omap_dss2/for-next (46ac29568e63 video: vt8500: fix error handling in probe()) Merging regulator/for-next (9850e8c5d7ea Merge remote-tracking branches 'regulator/topic/ab8500', 'regulator/topic/arizona', 'regulator/topic/lp3971', 'regulator/topic/lp3972', 'regulator/topic/pcf50633' and 'regulator/topic/tps51632' into regulator-next) Merging security/next (217091dd7a7a ima: define '_ima' as a builtin 'trusted' keyring) Merging selinux/master (dd0a11815a33 Merge tag 'v3.12') Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) Merging watchdog/master (608564867a38 watchdog: Drop unnecessary include of miscdevice.h) CONFLICT (add/add): Merge conflict in drivers/watchdog/rt2880_wdt.c Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) Merging iommu/next (e6ca48d995e4 Merge branches 'iommu/fixes', 'tracing', 'core', 'arm/tegra' and 'x86/vt-d' into next) Merging vfio/next (15c03dd4859a Linux 3.12-rc3) Merging osd/linux-next (861d66601acd exofs: don't leak io_state and pages on read error) Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) Merging trivial/for-next (6bbdc3984efb vio: remove dangly makefile bits) Merging audit/master (fc582aef7dcc Merge tag 'v3.12') Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) Merging devicetree/devicetree/next (355e62f5ad12 of/irq: Fix potential buffer overflow) Merging dt-rh/for-next (1b50b0c3330e Merge branch 'for-3.14' into for-next) Merging spi/for-next (6099087e62df Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm63xx-hsspi', 'spi/topic/coldfire', 'spi/topic/davinci', 'spi/topic/falcon', 'spi/topic/gpio', 'spi/topic/msiof', 'spi/topic/omap', 'spi/topic/pci', 'spi/topic/rcar', 'spi/topic/sc18is602' and 'spi/topic/xcomm' into spi-next) Merging tip/auto-latest (c4372b1b29f2 Merge branch 'x86/urgent') Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put) Merging edac-amd/for-next (c92132f59806 edac/85xx: Add PCIe error interrupt edac support) Merging ftrace/for-next (8a56d7761d2d ftrace: Fix function graph with loading of modules) Merging rcu/rcu/next (4102adab9189 rcu: Move RCU-related source code to kernel/rcu directory) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (0a00a775d2a4 KVM: Change maintainer email address) Merging kvm-arm/kvm-arm-next (ede582224231 Merge tag 'kvm-arm64/for-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-next) Merging kvm-ppc/kvm-ppc-next (27025a602cb9 powerpc: kvm: optimize "sc 1" as fast return) Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) Merging xen-tip/linux-next (aa5437afa9b3 Merge branch 'xentip-3.13-3' into linux-next-3) Merging percpu/for-next (90f2492cf9c8 x86: remove this_cpu_xor() implementation) Merging workqueues/for-next (4e8b22bd1a37 workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues) Merging drivers-x86/linux-next (a80e1053aaa3 x86, wmi fix modalias_show return values) Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit) Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) Merging regmap/for-next (d929555edfba Merge remote-tracking branch 'regmap/topic/core' into regmap-next) Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (4a87d107bfc3 leds: lp5521/5523: Remove duplicate mutex) Merging driver-core/driver-core-next (2322392b020b kernfs: implement "trusted.*" xattr support) Merging tty/tty-next (dc1ccc48159d Linux 3.13-rc2) Merging usb/usb-next (a458677db6a9 usb: host: Remove superfluous name casts) Merging usb-gadget/next (989c78dd5630 usb: gadget: r8a66597-udc: convert to clk_prepare/unprepare) Merging staging/staging-next (877494a7e29c staging: lustre: reapply an older patch that was reverted) CONFLICT (content): Merge conflict in include/linux/hid-sensor-ids.h Merging char-misc/char-misc-next (10ee90743e99 mei: cleanup mei_irq_read_handler) Merging scsi/for-next (ef5cb624a9b2 Merge branch 'fixes' into for-next) Merging target-updates/for-next (86784c6bdeee iscsi-target: chap auth shouldn't match username with trailing garbage) Merging target-merge/for-next-merge (15c03dd4859a Linux 3.12-rc3) Merging writeback/writeback-for-next (a8855990e382 writeback: Do not sort b_io list only because of block device inode) Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) Merging pinctrl/for-next (7e0d0f8730c2 Merge branch 'devel' into for-next) Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) Merging gpio/for-next (40e3b642538b Merge branch 'devel' into for-next) Merging dma-mapping/dma-mapping-next (5e01dc7b26d9 Linux 3.12) Merging pwm/for-next (6ca142ad0d1b pwm: sysfs: Convert to use ATTRIBUTE_GROUPS macro) Merging dma-buf/for-next (19e8697ba45e dma-buf: Expose buffer size to userspace (v2)) Merging userns/for-next (41301ae78a99 vfs: Fix a regression in mounting proc) Merging ktest/for-next (298a0d1d5750 ktest: Add documentation of CLOSE_CONSOLE_SIGNAL) Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging clk/clk-next (cdf64eeeb0d7 clk: exynos5420: fix cpll clock register offsets) Merging random/dev (392a546dc836 random: add debugging code to detect early use of get_random_bytes()) Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.) Merging aio/master (ddb8c45ba151 aio: nullify aio->ring_pages after freeing it) Merging akpm-current/current (6e7ebeb1cb49 lib/decompress_unlz4.c: always set an error return code on failures) CONFLICT (content): Merge conflict in kernel/params.c CONFLICT (content): Merge conflict in arch/um/kernel/sysrq.c $ git checkout -b akpm remotes/origin/akpm/master Applying: mm: add strictlimit knob Merging akpm/master (a295bddb28bf mm: add strictlimit knob)
Attachment:
pgpTVsa9GfNGP.pgp
Description: PGP signature
