From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753466AbaLUK2U (ORCPT ); Sun, 21 Dec 2014 05:28:20 -0500 Received: from ozlabs.org ([103.22.144.67]:55866 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751111AbaLUK2K (ORCPT ); Sun, 21 Dec 2014 05:28:10 -0500 Date: Sun, 21 Dec 2014 21:28:00 +1100 From: Stephen Rothwell To: linux-next@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: linux-next: Tree for Dec 21 Message-ID: <20141221212800.701e85b7@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/nVcDIP1d30Cz1qoks=OEqf."; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/nVcDIP1d30Cz1qoks=OEqf. Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, There will only be intermittent releases of linux-next between now and Jan 5. Changes since 20141219: The idle tree gained a conflict against Linus' tree. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 375 445 files changed, 10391 insertions(+), 5133 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 231 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. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (97bf6af1f928 Linux 3.19-rc1) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux= /kernel/git/davem/net) Merging kbuild-current/rc-fixes (f114040e3ea6 Linux 3.18-rc1) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (3f4aa45ceea5 ARM: 8226/1: cacheflush: get rid of= restarting block) Merging m68k-current/for-linus (f0b99a643e96 m68k/mm: Eliminate memset afte= r alloc_bootmem_pages) 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 (b2776bf7149b Linux 3.18) Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm= () needs to disable interrupts.) Merging net/master (02d6a746c3f0 Merge branch 'for-upstream' of git://git.k= ernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging ipsec/master (f855691975bb xfrm6: Fix the nexthdr offset in _decode= _session6.) Merging sound-current/for-linus (d70a1b9893f8 ALSA: usb-audio: extend KEF X= 300A FU 10 tweak to Arcam rPAC) Merging pci-current/for-linus (5106787a9e08 PCI: tegra: Use physical range = for I/O mapping) Merging wireless/master (9a1dce3a0591 rtlwifi: rtl8192ce: Set fw_ready flag) Merging driver-core.current/driver-core-linus (2dbfca5a1819 Merge branch 'f= or-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-le= ds) Merging tty.current/tty-linus (2dbfca5a1819 Merge branch 'for-next' of git:= //git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) Merging usb.current/usb-linus (2dbfca5a1819 Merge branch 'for-next' of git:= //git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) Merging usb-gadget-fixes/fixes (520fe7633692 usb: dwc3: ep0: fix for dead c= ode) Merging usb-serial-fixes/usb-linus (009d0431c391 Linux 3.18-rc7) Merging staging.current/staging-linus (2dbfca5a1819 Merge branch 'for-next'= of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) Merging char-misc.current/char-misc-linus (67e2c3883828 Merge branch 'next'= of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) Merging input-current/for-linus (6d32af019a45 Merge branch 'next' into for-= linus) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" s= tripe) Merging crypto-current/master (8606813a6c89 crypto: tcrypt - Allow speed te= sting of arbitrary hash functions) Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/k= ernel/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 (3438cf549d2f param: fix crash on bad kernel argumen= ts) Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu= /fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fo= r-linus) Merging kselftest-fixes/fixes (3ce51050fadd selftest: size: Add size test f= or Linux kernel) Merging drm-intel-fixes/for-linux-next-fixes (b0616c5306b3 drm/i915: Unlock= panel even when LVDS is disabled) Merging asm-generic/master (cb61f6769b88 ARM64: use GENERIC_PCI_IOMAP) Merging arc/for-next (7a70bf797a58 ARC: rename default defconfig) Merging arm/for-next (e9f2d6d66037 Merge branch 'devel-stable' into for-nex= t) Merging arm-perf/for-next/perf (cac7f2429872 Linux 3.18-rc2) Merging arm-soc/for-next (d6ad36913083 clocksource: arch_timer: Only use th= e virtual counter (CNTVCT) on arm64) Merging bcm2835/for-next (b2776bf7149b Linux 3.18) Merging berlin/berlin/for-next (91bcb334bf0b Merge branch 'berlin/dt' into = berlin/for-next) Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend suppo= rt) Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' in= to ep93xx-for-next) Merging imx-mxs/for-next (8a73e870fc56 Merge tag 'imx-dt-3.19' into for-nex= t) 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 (9993917cbc99 Merge branch 'mvebu/dt-usb_phy' into m= vebu/for-next) Merging renesas/next (f180b3e0dbd9 Merge branch 'heads/soc-fixes-for-v3.19'= into next) Merging samsung/for-next (9db7d78aca2c Merge branch 'v3.19-next/dt-samsung-= 3' into for-next) CONFLICT (content): Merge conflict in arch/arm64/Kconfig Merging sunxi/sunxi/for-next (ad01dbad5626 Merge branch 'sunxi/clocks-for-3= .19' into sunxi/for-next) Merging tegra/for-next (fa047e01365d Merge branch for-3.19/soc into for-nex= t) Merging arm64/for-next/core (fb59d007a0e4 arm64: mm: dump: don't skip final= region) Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unus= ed CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by c= ache.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 d= ebug traps) Merging ia64/next (0fd2468fd035 Merge branch 'misc-3.19' into next) Merging m68k/for-next (f0b99a643e96 m68k/mm: Eliminate memset after alloc_b= ootmem_pages) Merging m68knommu/for-next (0259650b4cf7 m68knommu: fix irq handler types i= n 68360/commproc.c) Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) Merging microblaze/next (3a8e3265179b microblaze: Fix mmap for cache cohere= nt memory) Merging mips/mips-for-linux-next (28320df4899b Merge branch '3.19-fixes' in= to mips-for-linux-next) Merging nios2/nios2-next (f1f2eac9124b nios2/uaccess: fix sparse errors) Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() sign= al_setup_done()) Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs p= arameter from do_execve() in hpux_execve()) Merging parisc-hd/for-next (aa47b141a43a parisc: fix out-of-register compil= er error in ldcw inline assembler function) Merging powerpc/next (d557b09800da powerpc/mm/thp: Use tlbiel if possible) Merging powerpc-mpe/next (d70a54e2d085 powerpc/powernv: Ignore smt-enabled = on Power8 and later) Merging fsl/next (76f3e2929bb6 powerpc/config: Enable memory driver) Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hu= gepage invalidate) Merging s390/features (fa0d0b064d55 s390/signal: add sys_sigreturn and sys_= rt_sigreturn declarations) Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://g= it.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging tile/master (c47b15c4928c arch/tile: update MAINTAINERS email to EZ= chip) 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_CPUFRE= Q config option) Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization) Merging btrfs/next (1edb647bb954 Btrfs: remove non-sense btrfs_error_discar= d_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 (e44cac3a7848 [SMB31] Initialize salt value for negot= iate 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 (f54e18f1b831 isofs: Fix infinite looping over CE ent= ries) Merging ext4/dev (50db71abc529 ext4: ext4_da_convert_inline_data_to_extent = drop locked page after error) Merging f2fs/dev (635aee1fefef f2fs: avoid to ra unneeded blocks in recover= flow) Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevec= s.) CONFLICT (content): Merge conflict in fs/fscache/object.c Merging fuse/for-next (1c68271cf1bf fuse: use file_inode() in fuse_file_fal= locate()) Merging gfs2/master (ec7d879c4576 GFS2: gfs2_atomic_open(): simplify the us= e of finish_no_open()) Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to ks= tr) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free = segment found) Merging nfs/linux-next (388f0c776781 sunrpc: add a debugfs rpc_xprt directo= ry with an info file in it) Merging nfsd/nfsd-next (3c0aeb6da065 nfsd: fi_delegees doesn't need to be a= n atomic_t) Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) Merging overlayfs/overlayfs-next (2b7a8f36f092 ovl: add testsuite to docs) Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configu= ration 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 (6044e4386cd5 Merge branch 'xfs-misc-fixes-for-3.19-2'= into for-next) Merging file-locks/linux-next (1b2b32dcdb3d locks: fix fcntl_setlease/getle= ase return when !CONFIG_FILE_LOCKING) Merging vfs/for-next (e3bb504efd91 [regression] chunk lost from bd9b51) Merging pci/next (149792795d2b Merge branch 'pci/msi' into next) Merging hid/for-next (b104d8ba2a44 Merge branch 'for-3.20/logitech' into fo= r-next) Merging i2c/i2c/for-next (fe07adec730d i2c: sh_mobile: fix uninitialized va= r when debug is enabled) Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to = use ATTRIBUTE_GROUPS macro) Merging hwmon-staging/hwmon-next (907a6d582459 hwmon: (tmp401) Detect TMP43= 5 on all addresses it supports) Merging v4l-dvb/master (2ea3258b238c Merge branch 'patchwork' into to_next) Merging kbuild/for-next (657eeca39128 Merge branch 'kbuild/misc' into kbuil= d/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends b= y default settings) Merging libata/for-next (d325a876e2b3 Merge branch 'for-3.18-fixes' into fo= r-next) Merging pm/linux-next (464ed18ebdb6 PM: Eliminate CONFIG_PM_RUNTIME) 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 targ= et to the debug tools' makefiles) Merging thermal/next (2707dbd09a85 Merge branches 'thermal-core-fix', 'ther= mal-soc' and 'thermal-int340x' into next) Merging thermal-soc/next (d8c3cd75e77d Merge branch 'work-fixes' into work-= next) Merging ieee1394/for-next (d737d7da8e7e firewire: sbp2: replace card lock b= y target lock) Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks) Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is inva= lid) Merging slave-dma/next (9a0a47f5e620 Merge branch 'for-linus' into next) Merging net-next/master (f96fe225677b Merge git://git.kernel.org/pub/scm/li= nux/kernel/git/davem/net) Merging ipsec-next/master (fbe68ee87522 vti6: Add a lookup method for tunne= ls with wildcard endpoints.) Merging wireless-next/master (81c412600f94 Merge branch 'master' of git://g= it.kernel.org/pub/scm/linux/kernel/git/linville/wireless) Merging bluetooth/master (72e4a6bd0220 Bluetooth: Remove duplicate constant= for RFCOMM PSM) Merging infiniband/for-next (a7cfef21e3d0 Merge branches 'core', 'cxgb4', '= ipoib', 'iser', 'mlx4', 'ocrdma', 'odp' and 'srp' into for-next) Merging mtd/master (d6666be6f0c4 Merge tag 'for-linus-20141215' of git://gi= t.infradead.org/linux-mtd) Merging l2-mtd/master (68f29815034e mtd: tests: abort torturetest on erase = errors) Merging crypto/master (8606813a6c89 crypto: tcrypt - Allow speed testing of= arbitrary hash functions) Merging drm/drm-next (4e0cd6811562 drm: sti: fix module compilation issue) Merging drm-panel/drm/panel/for-next (54cbc4e298ea drm/mipi-dsi: Avoid pote= ntial NULL pointer dereference) Merging drm-intel/for-linux-next (5d77d9c5e177 drm/i915: add missing rpm re= f to i915_gem_pwrite_ioctl) Merging drm-tegra/drm/tegra/for-next (7e0180e3570c drm/tegra: gem: Check be= fore freeing CMA memory) Merging drm-misc/topic/core-stuff (6cadd306033e drm/fb-helper: Propagate er= rors from initial config failure) Merging sound/for-next (d70a1b9893f8 ALSA: usb-audio: extend KEF X300A FU 1= 0 tweak to Arcam rPAC) Merging sound-asoc/for-next (1affeb608ed9 Merge remote-tracking branches 'a= soc/topic/dwc' and 'asoc/topic/wm8750' into asoc-next) Merging modules/modules-next (b0a65b0cccd4 param: do not set store func wit= hout write perm) Merging virtio/virtio-next (c91c2a63913b mic/host: initial virtio 1.0 suppo= rt) CONFLICT (content): Merge conflict in drivers/virtio/virtio_pci_common.c Merging input/next (dd9ce1902bbb Input: add regulator haptic driver) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging block/for-next (e248d2ba0082 Merge branch 'for-3.19/drivers' into f= or-next) Merging device-mapper/for-next (5164bece1673 dm: fix missed error code if .= end_io isn't implemented by target_type) Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator p= recedence) Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware()= , v3) Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usa= ge) Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and rem= ove the card_tasklet) Merging mmc-uh/next (d790be3863b2 Merge tag 'modules-next-for-linus' of git= ://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) Merging kgdb/kgdb-next (0f16996cf2ed kernel/debug/debug_core.c: Logging cle= an-up) 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 int= o register) Merging backlight/for-backlight-next (3d6969a641d0 MAINTAINERS: Remove my n= ame 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 (1b475231d95e Merge remote-tracking branch 'regu= lator/topic/rk808' into regulator-next) Merging security/next (b2d1965dcea1 Merge branch 'next' of git://git.infrad= ead.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 (00fec2a10b51 selinux: Remove security_ops extern) Merging lblnet/next (d8ec26d7f828 Linux 3.13) Merging watchdog/master (2193e69bf650 watchdog: imx2_wdt: Fix the argument = of watchdog_active()) CONFLICT (content): Merge conflict in drivers/watchdog/imx2_wdt.c Merging iommu/next (76771c938e95 Merge branches 'arm/omap', 'arm/msm', 'arm= /rockchip', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' int= o next) Merging dwmw2-iommu/master (1860e379875d Linux 3.15) Merging vfio/next (5e9f36c59a48 drivers/vfio: allow type-1 IOMMU instantiat= ion on top of an ARM SMMU) Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentat= ion) Merging jc_docs/docs-next (9b64c09bb960 kobject: grammar fix) Merging trivial/for-next (078014dd3698 intel_ips: fix a type in error messa= ge) Merging audit/next (0288d7183c41 audit: convert status version to a feature= bitmap) Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart sysc= alls) Merging devicetree/devicetree/next (c46ca3c8310b of: Delete unnecessary che= ck before calling "of_node_put()") Merging dt-rh/for-next (a0e27f51ba8a documentation: pinctrl bindings: Fix t= rivial typo 'abitrary') Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bin= dings) Merging spi/for-next (bcfc4f40182c Merge remote-tracking branches 'spi/topi= c/falcon' and 'spi/topic/inline' into spi-next) Merging tip/auto-latest (aa0f6b220f8a Merge branch 'x86/urgent') Merging clockevents/clockevents/next (b0ad5917960c ARM/ARM64: arch-timer: f= ix arch_timer_probed logic) Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of= banks) Merging edac-amd/for-next (50872ccd8786 EDAC, MCE, AMD: Correct formatting = of decoded text) Merging irqchip/irqchip/for-next (5cc8f658723f Merge branch 'irqchip/irqdom= ain-arm' into irqchip/for-next) Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) Merging ftrace/for-next (0daa2302968c tracing: Add tp_printk cmdline to hav= e tracepoints go to printk()) Merging rcu/rcu/next (3cd05fcfa269 Merge tag 'v3.18-rc6' into HEAD) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and = singlestep exceptions) Merging kvm/linux-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git= ://github.com/agraf/linux-2.6 into HEAD) Merging kvm-arm/next (05971120fca4 arm/arm64: KVM: Require in-kernel vgic f= or the arch timers) Merging kvm-ppc/kvm-ppc-next (476ce5ef09b2 KVM: PPC: Book3S: Enable in-kern= el XICS emulation by default) Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_wor= k) Merging xen-tip/linux-next (2e917175e1ef xen: Speed up set_phys_to_machine(= ) by using read-only mappings) Applying: arm: introduce is_device_dma_coherent merge fix Merging percpu/for-next (bfaa047a9415 Merge branch 'for-3.18-fixes' into fo= r-next) Merging workqueues/for-next (008847f66c38 workqueue: allow rescuer thread t= o do more work.) Merging drivers-x86/for-next (200db647112d platform/x86/acerhdf: Still depe= nds on THERMAL) Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_la= ptop - 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 (d95dc9e38810 HSI: nokia-modem: fix error handling of = irq_of_parse_and_map) Merging leds/for-next (2969bb18f889 leds: lp8860: Fix module dependency) Merging ipmi/for-next (98e0721c20db ipmi: Fix compile issue with isspace()) Merging driver-core/driver-core-next (2dbfca5a1819 Merge branch 'for-next' = of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) Merging tty/tty-next (2dbfca5a1819 Merge branch 'for-next' of git://git.ker= nel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) Merging usb/usb-next (2dbfca5a1819 Merge branch 'for-next' of git://git.ker= nel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) Merging usb-gadget/next (ebf3992061db usb: musb: Use IS_ENABLED for tusb601= 0) Merging usb-serial/usb-next (e7181d005e84 USB: qcserial: Add support for HP= lt4112 LTE/HSPA+ Gobi 4G Modem) Merging staging/staging-next (2dbfca5a1819 Merge branch 'for-next' of git:/= /git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) Merging char-misc/char-misc-next (67e2c3883828 Merge branch 'next' of git:/= /git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) Merging cgroup/for-next (eeecbd197151 cgroup: implement cgroup_get_e_css()) Merging scsi/for-next (49f096fcbaec Merge remote-tracking branch 'scsi-queu= e/drivers-for-3.19' into for-next) Merging target-updates/for-next (ae450e246e85 target: Allow AllRegistrants = to re-RESERVE existing reservation) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corr= uption on NFS) Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS ent= ries) Merging pinctrl/for-next (96dfdff694ae pinctrl: rockchip: Fix enable/disabl= e/mask/unmask) Merging vhost/linux-next (5ff16110c637 virtio_pci: restore module attribute= s) Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings ar= e small) Merging gpio/for-next (170680abd1eb gpio: mcp23s08: fix up compilation erro= r) 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 sam= a5d3 errata handling) Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldo= c warning) Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remo= unt tests) Merging ktest/for-next (17150fef4ab1 ktest: Add back "tail -1" to kernelrel= ease 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 se= tup and clock disable failure due to domain being gated) Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to cl= ear 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 timeou= t=3D0) Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack r= egister variable for percpu) Merging documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-= utils URL) Merging kselftest/next (0df1f2487d2f Linux 3.18-rc3) Merging y2038/y2038 (45446a99cef6 staging: media: lirc: Replace timeval wit= h 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/ft1= 000_debug.c CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-pcmcia/= ft1000_hw.c Merging luto-misc/next (6ce4436c9cbe Merge tag 'please-pull-morepstore' of = git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux) Merging access_once/linux-next (5de72a2247ac s390/kvm: REPLACE barrier fixu= p with READ_ONCE) Applying: x86/xen/p2m: Replace ACCESS_ONCE with READ_ONCE Merging akpm-current/current (350b61c87ab5 metag: Align thread_info::superv= isor_stack) CONFLICT (modify/delete): mm/fremap.c deleted in akpm-current/current and m= odified in HEAD. Version HEAD of mm/fremap.c left in tree. CONFLICT (content): Merge conflict in fs/ocfs2/aops.c $ git rm -f mm/fremap.c $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpio/gpio-zevio.c: fix build Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob Merging akpm/master (9242687a4602 mm: add strictlimit knob) --Sig_/nVcDIP1d30Cz1qoks=OEqf. Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUlqC2AAoJEMDTa8Ir7ZwVf/IP/0EdvcxAjtJjzIwJ7QuGtzwB 12jTco1MTlRI3HrpabYBjKFpJ5C67M5SiLr110VgPndU2KaMW26oQrg3NRQ65dhi G1aIHFxGnW4M5FzBQqLT9ZoPGNvV0PfToAeuDm6m41x7YiGRIT3R3zqW39O0C9Ue /5opMox8jdVsC68fzcMB7PJMbRy3ylPBqDR3Dg20Eqvl8vpb97Dh8aOLv3VFTG/Z 30c/mNimymtGxbMLb987sQH4DVDBH07nusBBMGJLah7j6r4r4ci8ACo9/mhcJLDh GNanCjHQRFtjVB2Tx3Y62STCcGfFxjl67X2U3rvvHWyWGA+86yAGq/UnLFgX9rQs 2W5oWwb42FC9wz9hkQt41tI11zekB9IWzLq/+RkYXDtT6r3QmwjVSNyQkit0PjIc PKKUyWVoB6vGvCZVJ+gF0Ke8AWHNyVFJHtbXxqjPJzphNludr6ZaAMIzfdlK3yXV Q7e0xcb34ceoMbnrrNL84TwGytfAq1SPwF+bL0CnLRohbQG+CVyTQEfziaowoPUt B70FM70glQZmz6Hr6Y8H17z2fybLbGog/q7fEmu8Nj2aZcGqLNsgq1QKE8ijtHJC YC/HNUswXhwS+P2tkA4dSKZV9rVsb1VEI2dqcii4vF4ZnMjMBEx+Qy//W60uoY5+ bg7BiisleChWXydyobN+ =cPbx -----END PGP SIGNATURE----- --Sig_/nVcDIP1d30Cz1qoks=OEqf.--