Hi all, Changes since 20150109: The usb-gadget-fixes tree gained a conflict against the usb.current tree. The net-next tree gained a build failure for which I reverted a commit. The pinctrl tree gained a build failure so I used the version from next-20150109. The akpm tree lost a few patches that turned up elsewhere. Non-merge commits (relative to Linus' tree): 2202 2272 files changed, 69868 insertions(+), 38441 deletions(-) ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64 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 (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 234 trees (counting Linus' and 32 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx $ git checkout master $ git reset --hard stable Merging origin/master (eaa27f34e91a linux 3.19-rc4) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (a16c5f99a28c kbuild: Fix removal of the debian/ directory) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (1e3479225acb ARM: 8275/1: mm: fix PMD_SECT_RDONLY undeclared compile error) Merging m68k-current/for-linus (f27bd5bfeda5 m68k: Wire up execveat) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk) Merging powerpc-merge-mpe/fixes (1be6f10f6f9c Revert "powerpc: Secondary CPUs must set cpu_callin_map after setting active and online") Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.) Merging net/master (0c8185944a12 net: fec: fix NULL pointer dereference in fec_enet_timeout_work) Merging ipsec/master (f855691975bb xfrm6: Fix the nexthdr offset in _decode_session6.) Merging sound-current/for-linus (92cb46584e10 ALSA: fireworks: fix an endianness bug for transaction length) Merging pci-current/for-linus (97bf6af1f928 Linux 3.19-rc1) Merging wireless-drivers/master (c702674f99e6 Merge tag 'iwlwifi-for-kalle-2015-01-05' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (72392ed0eb6f kernfs: Fix kernfs_name_compare) Merging tty.current/tty-linus (31ec77aca72e serial: samsung: Add the support for Exynos5433 SoC) Merging usb.current/usb-linus (9c9d82492b73 usb: phy: Fix deferred probing) Merging usb-gadget-fixes/fixes (5fb694f96e7c usb: gadget: udc: atmel: fix possible oops when unloading module) CONFLICT (content): Merge conflict in drivers/usb/phy/phy.c Merging usb-serial-fixes/usb-linus (32a4bf2e81ec USB: console: fix potential use after free) Merging staging.current/staging-linus (8ecb55b849b7 Merge tag 'iio-fixes-for-3.19a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) Merging char-misc.current/char-misc-linus (7b7c54914f73 mcb: mcb-pci: Only remap the 1st 0x200 bytes of BAR 0) Merging input-current/for-linus (9333caeaeae4 Input: I8042 - add Acer Aspire 7738 to the nomux list) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (0b8c960cf6de crypto: sha-mb - Add avx2_supported check.) Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (094cb98179f1 of/fdt: memblock_reserve /memreserve/ regions in the case of partial overlap) Merging rr-fixes/fixes (574732c73d15 param: initialize store function to NULL if not available.) Merging vfio-fixes/for-linus (7c2e211f3c95 vfio-pci: Fix the check on pci device type in vfio_pci_probe()) Merging kselftest-fixes/fixes (f5db310d77ef selftests/vm: fix link error for transhuge-stress test) Merging drm-intel-fixes/for-linux-next-fixes (e3e6efcd638d drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES) Merging asm-generic/master (cb61f6769b88 ARM64: use GENERIC_PCI_IOMAP) Merging arc/for-next (5840adceb962 arc: Remove unused prepare_to_copy()) Merging arm/for-next (1e3479225acb ARM: 8275/1: mm: fix PMD_SECT_RDONLY undeclared compile error) Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1) Merging arm-soc/for-next (eec9908b4c8e Merge branch 'fixes' into for-next) Merging bcm2835/for-next (b2776bf7149b Linux 3.18) Merging berlin/berlin/for-next (8553bf8fd181 Merge branch 'berlin/dt' into berlin/for-next) Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) Merging imx-mxs/for-next (bc8127e027df Merge branch 'imx/defconfig' into for-next) Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) Merging mvebu/for-next (82e1ad0bcd24 Merge branch 'mvebu/dt' into mvebu/for-next) Merging omap/for-next (c99e7d84d810 Merge branch 'omap-for-v3.20/defconfig' into for-next) Merging omap-pending/for-next (99d076b74745 MAINTAINERS: add maintainer for OMAP hwmod data) Merging renesas/next (57816675569d Merge branch 'heads/dt-for-v3.20' into next) Merging samsung/for-next (4ac72232f810 Merge branch 'samsung-fixes' into for-next) Merging sunxi/sunxi/for-next (1363ad23197b Merge branches 'sunxi/dt-for-3.20', 'sunxi/clocks-for-3.20' and 'sunxi/defconfig-for-3.20' into sunxi/for-next) Merging tegra/for-next (4fd40ac71480 Merge branch for-3.20/soc into for-next) Merging arm64/for-next/core (fb59d007a0e4 arm64: mm: dump: don't skip final region) Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) Merging cris/for-next (21bd887cd7c4 CRISv32: Remove last remnants of ETRAX_SPI_MMC_BOARD) Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) Merging ia64/next (0fd2468fd035 Merge branch 'misc-3.19' into next) Merging m68k/for-next (2e874d178c9e m68k/mac: Fix scsi_type for Mac LC and similar models) Merging m68knommu/for-next (9ebaf8bb9107 arch: m68k: 68360: config: Remove unused function) Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) Merging microblaze/next (132d5dfc0469 microblaze: whitespace fix) Merging mips/mips-for-linux-next (a682437a894d Merge branch '3.19-fixes' into mips-for-linux-next) Merging nios2/nios2-next (1b0f44923e18 nios2: Use preempt_schedule_irq) Merging openrisc/for-upstream (548dafe880ad 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 (b2776bf7149b Linux 3.18) Merging powerpc/next (d557b09800da powerpc/mm/thp: Use tlbiel if possible) Merging powerpc-mpe/next (9a4fc4eaf111 powerpc/kvm: Create proper names for the kvm_host_state PMU fields) Merging fsl/next (76f3e2929bb6 powerpc/config: Enable memory driver) Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) Merging s390/features (d97d929f06d0 s390: move cacheinfo sysfs to generic cacheinfo infrastructure) Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging tile/master (c47b15c4928c arch/tile: update MAINTAINERS email to EZchip) Merging uml/next (989e59fa41c5 um: Include generic barrier.h) CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization) Merging btrfs/next (1edb647bb954 Btrfs: remove non-sense btrfs_error_discard_extent() function) Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default) CONFLICT (content): Merge conflict in net/ceph/auth_x.c CONFLICT (content): Merge conflict in fs/ceph/super.h CONFLICT (content): Merge conflict in fs/ceph/super.c CONFLICT (content): Merge conflict in fs/ceph/snap.c Merging cifs/for-next (0891605dd763 Initialize salt value for negotiate context) 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 (942080643bce eCryptfs: Remove buggy and unnecessary write in file name decode routine) Merging ext3/for_next (e4a93be6cb28 isofs: Fix bug in the way to check if the year is a leap year) Merging ext4/dev (4033d19d28ab ext4: add optimization for the lazytime mount option) Merging f2fs/dev (ebb0d36e21a0 f2fs: pids_lock can be static) Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.) CONFLICT (content): Merge conflict in fs/fscache/object.c Merging fuse/for-next (9759bd518994 fuse: add memory barrier to INIT) Merging gfs2/master (8f6cb409f016 GFS2: Eliminate __gfs2_glock_remove_from_lru) Merging jfs/jfs-next (e1f1fe798d2f jfs: get rid of homegrown endianness helpers) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) Merging nfs/linux-next (4e379d36c050 NFSv4: Remove incorrect check in can_open_delegated()) Merging nfsd/nfsd-next (0ec016e3e02f nfsd4: tweak rd_dircount accounting) Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) Merging overlayfs/overlayfs-next (4330397e4e8a ovl: discard independent cursor in readdir()) Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) Merging ubifs/linux-next (f38aed975c0c UBI: Fix invalid vfree()) Merging xfs/for-next (ad7df6e858ef Merge branch 'xfs-sb-logging-rework' into for-next) Merging file-locks/linux-next (50b80aaa6589 locks: keep a count of locks on the flctx lists) Merging vfs/for-next (88174fd2c8fb kill d_validate()) Merging pci/next (75f30c3d9949 Merge branches 'pci/host-keystone', 'pci/host-layerscape', 'pci/host-rcar' and 'pci/host-tegra' into next) Merging hid/for-next (c27320a55b83 Merge branch 'for-3.20/logitech' into for-next) Merging i2c/i2c/for-next (523c5b89640e i2c: Remove support for legacy PM) Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro) Merging hwmon-staging/hwmon-next (c2681f7fc9ee hwmon: (ina2xx) implement update_interval attribute for ina226) Merging v4l-dvb/master (2ea3258b238c Merge branch 'patchwork' into to_next) Merging kbuild/for-next (5ea04a1a0860 Merge branch 'kbuild/kbuild' into kbuild/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) Merging libata/for-next (ca7cb2093715 Merge branch 'for-3.20' into for-next) Merging pm/linux-next (794c3a0a9380 Merge branches 'acpi-pm', 'acpi-processor' and 'acpi-video') Merging idle/next (f7c0e22f2d14 Merge branch 'turbostat' into release) CONFLICT (content): Merge conflict in arch/x86/include/uapi/asm/msr-index.h Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) Merging thermal/next (783f0e5a024e Merge branches 'for-rc', 'int340x-enhancement' and 'int3406-thermal' of .git into next) Merging thermal-soc/next (9477e18dd5d6 Documentation: thermal: document of_cpufreq_cooling_register()) Merging ieee1394/for-next (d737d7da8e7e firewire: sbp2: replace card lock by target lock) Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks) Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) Merging slave-dma/next (3e8ec65e62df Merge branch 'topic/rcar' into next) Merging net-next/master (fb57720daf6e Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge) $ git am -3 ../patches/0001-Revert-doc-fix-the-compile-error-of-txtimestamp.c.patch Applying: Revert "doc: fix the compile error of txtimestamp.c" Merging ipsec-next/master (fbe68ee87522 vti6: Add a lookup method for tunnels with wildcard endpoints.) Merging wireless-drivers-next/master (350b193ebd50 Merge ath-next from ath.git) Merging bluetooth/master (bc6efeeeb5a2 ieee802154: 6lowpan: fix Makefile entry) Merging infiniband/for-next (a7cfef21e3d0 Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'mlx4', 'ocrdma', 'odp' and 'srp' into for-next) Merging mtd/master (97bf6af1f928 Linux 3.19-rc1) Merging l2-mtd/master (6958024ad5cd mtd: map_rom: Support UBI on ROM) Merging crypto/master (8155330aad47 lib: memzero_explicit: add comment for its usage) Merging drm/drm-next (adc31849b27f Merge tag 'drm-intel-next-2014-12-19' of git://anongit.freedesktop.org/drm-intel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_runtime_pm.c Merging drm-panel/drm/panel/for-next (54cbc4e298ea drm/mipi-dsi: Avoid potential NULL pointer dereference) Merging drm-intel/for-linux-next (985850bd1456 drm/i915: remove unused power_well/get_cdclk_freq api) Merging drm-tegra/drm/tegra/for-next (7e0180e3570c drm/tegra: gem: Check before freeing CMA memory) Merging drm-misc/topic/core-stuff (b710d754bd4f drm: Make drm_read() more robust against multithreaded races) Merging sound/for-next (12c243b833c2 ALSA: fm801: remove FSF address) Merging sound-asoc/for-next (41debc82537a Merge remote-tracking branch 'asoc/topic/xtfpga' into asoc-next) Merging modules/modules-next (97bf6af1f928 Linux 3.19-rc1) Merging virtio/virtio-next (97bf6af1f928 Linux 3.19-rc1) Merging input/next (f17effbe8916 MAINTAINERS: add info for e3x0-button driver) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging block/for-next (177ccd2f8f39 Merge branch 'for-3.20/drivers' into for-next) Merging device-mapper/for-next (af66c8489d6d dm table: train hybrid target type detection to select blk-mq if appropriate) 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 (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) Merging mmc-uh/next (60000f69a57a mmc: Add SDIO function devicetree subnode parsing) Merging kgdb/kgdb-next (c7d9ebf81c45 kdb: Fix off by one error in kdb_cpu()) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (f851b60db0fd md: Check MD_RECOVERY_RUNNING as well as ->sync_thread.) Merging mfd/for-mfd-next (a3b63979f8a3 mfd: rtsx: Add func to split u32 into register) Merging backlight/for-backlight-next (3d6969a641d0 MAINTAINERS: Remove my name from Backlight subsystem) Merging battery/master (02088e3ed79f power: reset: augment versatile driver for integrator) 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 (574d54112fda Merge branches '3.19/omapdss' and '3.19/simplefb' into for-next) Merging regulator/for-next (2de4cd54a7a1 Merge remote-tracking branches 'regulator/topic/rk808', 'regulator/topic/rt5033' and 'regulator/topic/tps65023' into regulator-next) Merging security/next (b2d1965dcea1 Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next) Merging integrity/next (63a0eb7891bd ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met) Merging selinux/next (566075875a84 selinux: Remove unused function avc_sidcmp()) Merging lblnet/next (d8ec26d7f828 Linux 3.13) Merging watchdog/master (e0c3e00f4045 watchdog: drop owner assignment from platform_drivers) Merging iommu/next (2c0ee8b85aae iommu/rockchip: Drop owner assignment from platform_drivers) Merging dwmw2-iommu/master (1860e379875d Linux 3.15) Merging vfio/next (5e9f36c59a48 drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU) Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) Merging jc_docs/docs-next (174236285cf8 Merge branch 'doc/sp-update' into docs-next) Merging trivial/for-next (231821d4c3fa dynamic_debug: fix comment) Merging audit/next (0f7e94ee40d0 Merge branch 'next' into upstream for v3.19) Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) Merging devicetree/devicetree/next (c46ca3c8310b of: Delete unnecessary check before calling "of_node_put()") Merging dt-rh/for-next (a0e27f51ba8a documentation: pinctrl bindings: Fix trivial typo 'abitrary') Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings) Merging spi/for-next (52052f9b7ea1 Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/qup', 'spi/topic/sirf' and 'spi/topic/st-ssc' into spi-next) Merging tip/auto-latest (caa523dc2242 Merge branch 'x86/urgent') Merging clockevents/clockevents/next (b0ad5917960c ARM/ARM64: arch-timer: fix arch_timer_probed logic) Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks) Merging edac-amd/for-next (ae9b56e3996d EDAC, synps: Add EDAC support for zynq ddr ecc controller) Merging irqchip/irqchip/for-next (91d117921216 irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type) Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) Merging ftrace/for-next (d716ff71dd12 tracing: Remove taking of trace_types_lock in pipe files) Merging rcu/rcu/next (7de789ec4f91 Merge branches 'doc.2015.01.07a', 'fixes.2015.01.11a', 'preempt.2015.01.06a', 'srcu.2015.01.06a', 'stall.2015.01.06a' and 'torture.2015.01.11a' into HEAD) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (bab5bb398273 kvm: x86: Remove kvm_make_request from lapic.c) Merging kvm-arm/next (bab5bb398273 kvm: x86: Remove kvm_make_request from lapic.c) Merging kvm-ppc/kvm-ppc-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD) 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 (2e917175e1ef xen: Speed up set_phys_to_machine() by using read-only mappings) Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying()) Merging workqueues/for-next (9da7dae94fb8 workqueue.h: remove loops of single statement macros) Merging drivers-x86/for-next (200db647112d platform/x86/acerhdf: Still depends on THERMAL) Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) Merging regmap/for-next (270ded427d7b Merge remote-tracking branch 'regmap/topic/core' into regmap-next) Merging hsi/for-next (67e9a2ce6e07 hsi: nokia-modem: fix uninitialized device pointer) Merging leds/for-next (7f95adda052d leds: Use setup_timer) Merging ipmi/for-next (1421c935df15 ipmi: Fix compile warning with tv_usec) Merging driver-core/driver-core-next (b7392d2247cf Linux 3.19-rc2) Merging tty/tty-next (b7392d2247cf Linux 3.19-rc2) Merging usb/usb-next (b7392d2247cf Linux 3.19-rc2) Merging usb-gadget/next (b1940cd21c0f Linux 3.19-rc3) Merging usb-serial/usb-next (b7392d2247cf Linux 3.19-rc2) Merging staging/staging-next (b7392d2247cf Linux 3.19-rc2) Merging char-misc/char-misc-next (b7392d2247cf Linux 3.19-rc2) Merging cgroup/for-next (f3ba53802eff cgroup: add dummy css_put() for !CONFIG_CGROUPS) Merging scsi/for-next (0000709efc66 Merge branch 'misc' into for-next) Merging target-updates/for-next (97bf6af1f928 Linux 3.19-rc1) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) Merging pinctrl/for-next (b42180a041eb Merge branch 'devel' into for-next) $ git reset --hard HEAD^ Merging next-20150109 version of pinctrl Merging vhost/linux-next (c6c856d33dda virtio_pci: drop virtio_config dependency) Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) Merging gpio/for-next (9c5e7b941de1 Merge branch 'devel' into for-next) Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition) Merging pwm/for-next (39e046f2c1dd pwm: atmel-hlcdc: add at91sam9x5 and sama5d3 errata handling) Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning) Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests) Merging ktest/for-next (17150fef4ab1 ktest: Add back "tail -1" to kernelrelease make) 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 (f1e9203e2366 clk: samsung: Fix Exynos 5420 pinctrl setup and clock disable failure due to domain being gated) Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0) Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) Merging documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-utils URL) Merging kselftest/next (97bf6af1f928 Linux 3.19-rc1) Merging y2038/y2038 (45446a99cef6 staging: media: lirc: Replace timeval with ktime_t in lirc_parallel.c) CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-usb/ft1000_debug.c CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c Merging luto-misc/next (d4812e169de4 x86, mce: Get rid of TIF_MCE_NOTIFY and associated mce tricks) Merging access_once/linux-next (29bde09065b7 next: sh: Fix compile error) Merging livepatching/for-next (99590ba565a2 livepatch: fix deferred module patching order) Merging akpm-current/current (1d9e76e2eb3f fs/affs/file.c: replace if/BUG by BUG_ON) CONFLICT (content): Merge conflict in mm/memory.c $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpio/gpio-zevio.c: fix build Applying: dt-bindings: use isil prefix for Intersil Applying: rtc: isl12022: deprecate use of isl in compatible string for isil Applying: rtc: isl12057: deprecate use of isl in compatible string for isil Applying: staging: iio: isl29028: deprecate use of isl in compatible string for isil Applying: arm: dts: zynq: update isl9305 compatible string to use isil vendor prefix Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob Merging akpm/master (415f7f4d10bf mm: add strictlimit knob)
Attachment:
pgp9V6cQS1XVD.pgp
Description: OpenPGP digital signature
