From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752786AbaDWFFH (ORCPT ); Wed, 23 Apr 2014 01:05:07 -0400 Received: from ozlabs.org ([103.22.144.67]:54022 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752208AbaDWFFA (ORCPT ); Wed, 23 Apr 2014 01:05:00 -0400 Date: Wed, 23 Apr 2014 15:04:47 +1000 From: Stephen Rothwell To: Cc: Subject: linux-next: Tree for Apr 23 Message-Id: <20140423150447.cddff749a4f61e963ce0d4bd@canb.auug.org.au> X-Mailer: Sylpheed 3.4.1 (GTK+ 2.24.23; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Wed__23_Apr_2014_15_04_47_+1000_8y8WXPEzK/UXXvKl" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Wed__23_Apr_2014_15_04_47_+1000_8y8WXPEzK/UXXvKl Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, This tree still fails (more than usual) the powerpc allyesconfig build. Changes since 20140422: New tree: drm-panel The arm tree still produces quite a few build warnings. The powerpc tree still had its build failure. The vfs tree still had its build failure so I applied a fix patch. The mmc tree lost its build failure. The wireless-next tree gained a build failure for which I applied a patch. The audit tree lost its build failure. The akpm-current tree lost its build failure but gained another for which I applied a patch. The akpm tree lost a couple of patches that were applied elsewhere. Non-merge commits (relative to Linus' tree): 2170 2030 files changed, 72452 insertions(+), 44079 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 (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 214 trees (counting Linus' and 28 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. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (4d0fa8a0f012 Merge tag 'gpio-v3.15-2' of git://git.k= ernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.k= ernel.org/pub/scm/linux/kernel/git/broonie/regulator) Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1) Merging arc-current/for-curr (a798c10faf62 Linux 3.15-rc2) Merging arm-current/fixes (244b47838626 ARM: 8026/1: Fix emulation of multi= ply accumulate instructions) Merging m68k-current/for-linus (50be9eba831d m68k: Update defconfigs for v3= .14-rc1) Merging metag-fixes/fixes (0414855fdc4a Linux 3.14-rc5) Merging powerpc-merge/merge (cc4f265ad9a3 powerpc/powernv Adapt opal-elog a= nd opal-dump to new sysfs_remove_file_self) Merging sparc/master (a798c10faf62 Linux 3.15-rc2) Merging net/master (7b07bd4e5187 net: sxgbe: Added phy_found error path) Merging ipsec/master (a32452366b72 vti4: Don't count header length twice.) CONFLICT (content): Merge conflict in net/ipv4/ip_vti.c Merging sound-current/for-linus (8dc9abb93dde ALSA: hda/realtek - Add heads= et Mic support for Dell machine) Merging pci-current/for-linus (f5d3352b2751 PCI: tegra: Use new OF interrup= t mapping when possible) Merging wireless/master (c82552c5b0cb ath9k: add a recv budget) Merging driver-core.current/driver-core-linus (94f8cc0eea03 drivers/base/dd= .c incorrect pr_debug() parameters) Merging tty.current/tty-linus (12de375ec493 Revert "serial: 8250, disable "= too much work" messages") Merging usb.current/usb-linus (94d72f008909 uas: fix deadlocky memory alloc= ations) Merging staging.current/staging-linus (a798c10faf62 Linux 3.15-rc2) Merging char-misc.current/char-misc-linus (03367ef5ea81 Drivers: hv: vmbus:= Negotiate version 3.0 when running on ws2012r2 hosts) Merging input-current/for-linus (46a2986ebbe1 Input: synaptics - add min/ma= x quirk for ThinkPad T431s, L440, L540, S1 Yoga and X1) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" s= tripe) Merging crypto-current/master (eb4a5346e777 hwrng: bcm2835 - fix oops when = rng h/w is accessed during registration) Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (1f42e5dd5065 of: Add self test= for of_match_node()) Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter k= ernel symbols for arm) Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts be= fore cancelling delayed works) 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 drm-intel-fixes/for-linux-next-fixes (b6842feb63a2 drm/i915: Allow = user modes to exceed DVI 165MHz limit) Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for = nommu) Merging arc/for-next (134aeaed08c4 ARC: Fixed spelling errors within commen= ts) Merging arm/for-next (0b8eecaf8ad0 Merge branches 'fixes' and 'misc' into f= or-next) Merging arm-kvm-cpuresume/arm-kvm-cpuresume (91a3f6af430d arm: kernel: slee= p: restore HYP mode configuration in cpu_resume) Merging arm-perf/for-next/perf (c9eaa447e77e Linux 3.15-rc1) Merging arm-soc/for-next (2bf73dd61a84 Merge tag 'tags/cleanup2-3.15' of gi= t://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) Merging berlin/berlin/for-next (7726250ca801 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 (ae3e2c43933b Merge branch 'imx/dt' into for-next) Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging keystone/next (47fc77cc704e Merge branch 'for_3.15/fixes' into next) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have= standard 'qcom' prefix) Merging mvebu/for-next (8c801d6fc97c Merge branch 'mvebu/drivers-mbus_pci-f= ixes' into for-next) Merging renesas/next (3984ba10dddc Merge branches 'heads/cleanup-for-v3.16'= and 'heads/dt-for-v3.16' into devel) Merging samsung/for-next (c9eaa447e77e Linux 3.15-rc1) Merging tegra/for-next (628d56b42d35 Merge branch for-3.16/defconfig into f= or-next) Merging arm64/for-next/core (ebf81a938dad arm64: Fix DMA range invalidation= for cache line unaligned buffers) Merging blackfin/for-linus (c4a2c58d2095 blackfin: cleanup board files) Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by c= ache.h) Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) Merging ia64/next (e32634f5d57f pstore: Fix memory leak when decompress usi= ng big_oops_buf) Merging m68k/for-next (50be9eba831d m68k: Update defconfigs for v3.14-rc1) Merging m68knommu/for-next (2bf0787b4b42 m68k: fix a compiler warning when = building for DragonBall) Merging metag/for-next (2aca46ce1b5c sched: remove unused SCHED_INIT_NODE) Merging microblaze/next (a66a626538af microblaze: Use asm-generic/io.h) Merging mips/mips-for-linux-next (d061774ea0ba Merge branch '3.15-fixes' in= to mips-for-linux-next) 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 (455c6fdbd219 Linux 3.14) Merging powerpc/next (cd427485357c Merge remote-tracking branch 'scott/next= ' into next) Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock spe= cs) Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pc= i bridge device node for T4/B4) Merging s390/features (164739eff3f9 s390/pci: add some new arch specific pc= i attributes) Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://pe= ople.freedesktop.org/~airlied/linux) Merging tile/master (5eb0bdf84433 arch/tile: remove unused variable 'devcap= ') Merging uml/next (989e59fa41c5 um: Include generic barrier.h) CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXP= ERIMENTAL) Merging xtensa/for_next (cfe8255f0afc xtensa: xt2000: drop redundant sysmem= initialization) Merging btrfs/next (00fdf13a2e9f Btrfs: fix a crash of clone with inline ex= tents's split) Merging ceph/master (a30be7cb2ccb ceph: skip invalid dentry during dcache r= eaddir) Merging cifs/for-next (ebfc45ee7004 Merge git://git.kernel.org/pub/scm/linu= x/kernel/git/davem/net) 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 (9e78d14a9f64 Use %pd in eCryptFS) Merging ext3/for_next (01d8885785a6 reiserfs: fix race in readdir) Merging ext4/dev (26f9c9ac0a11 ext4: add fallocate mode blocking for debugg= ing purposes) Merging f2fs/dev (c600cc6e6906 f2fs: adjust free mem size to flush dentry b= locks) Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded o= bject to the fscache_object_list rb tree) Merging fuse/for-next (f3846266f593 fuse: fix "uninitialized variable" warn= ing) Merging gfs2/master (991deec8193a GFS2: quotas not being refreshed in gfs2_= adjust_quota) Merging jfs/jfs-next (24e4a0f3de21 fs/jfs/jfs_inode.c: atomically set inode= ->i_flags) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free = segment found) Merging nfs/linux-next (1f2edbe3fe21 NFS: Don't ignore suid/sgid bit change= s after a successful write) Merging nfsd/nfsd-next (06f9cc12caa8 nfsd4: don't create unnecessary mask a= cl) 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 (c9eaa447e77e Linux 3.15-rc1) Merging ubifs/linux-next (d56030ac25d3 UBI: block: Remove __initdata from u= biblock_param_ops) Merging xfs/for-next (7043507bfa1a Merge branch 'xfs-filestreams-lookup' in= to for-next) Merging file-private-locks/linux-next (ce40437a6043 locks: rename FL_FILE_P= VT and IS_FILE_PVT to use "*_OFDLCK" instead) Merging vfs/for-next (d73c7c209651 kill generic_file_splice_write()) Applying: vfs: using vfree requires including vmalloc.h Merging pci/next (c9eaa447e77e Linux 3.15-rc1) Merging hid/for-next (12e5706a47c2 Merge branch 'for-3.16/rmi4' into for-ne= xt) Merging i2c/i2c/for-next (9e897e13bd46 Merge branch 'for-linus' of git://gi= t.open-osd.org/linux-open-osd) Merging jdelvare-hwmon/master (c9eaa447e77e Linux 3.15-rc1) Merging hwmon-staging/hwmon-next (bd8f4a63c14a hwmon: (lm77) Convert to use= devm_hwmon_device_register_with_groups) Merging v4l-dvb/master (b40dfe97cc3a Merge branch 'v4l_for_linus' into to_n= ext) Merging kbuild/for-next (de71647f7af0 Merge branch 'kbuild/kbuild' into kbu= ild/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends b= y default settings) Merging libata/for-next (e248588eabd8 Merge branch 'for-3.16' into for-next) Merging pm/linux-next (869846f70bf8 Merge branch 'acpica-next' into linux-n= ext) Merging idle/next (23a299cd9378 Merge branches 'turbostat' and 'intel_idle'= into release) Merging apm/for-next (158204397034 apm-emulation: add hibernation APM event= s to support suspend2disk) Merging cpupowerutils/master (f16603386b38 cpupower tools: add install targ= et to the debug tools' makefiles) Merging thermal/next (9477165ec525 thermal: rcar-thermal: update thermal zo= ne only when temperature changes) Merging ieee1394/for-next (0ca49345b6f4 firewire: ohci: fix probe failure w= ith Agere/LSI controllers) Merging dlm/next (075f01775f53 dlm: use INFO for recovery messages) Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotl= b buffer is full' (v2)) Merging slave-dma/next (8cc3e30bea9a dmaengine: edma: Add DMA memcpy suppor= t) Merging dmaengine/next (b9bf6d2e84b7 dma: mv_xor: Flush descriptors before = activating a channel) Merging net-next/master (5a9d19ab76f9 Merge branch 'ndo_set_config') Merging ipsec-next/master (f1370cc4a01e xfrm: Remove useless secid field fr= om xfrm_audit.) Merging wireless-next/master (644aa4d62096 b43: remove list of IEEE 802.11 = devices) Merging bluetooth/master (d9064ec59f6d Bluetooth: btmrvl: Fix btmrvl_send_m= odule_cfg_cmd()) Merging infiniband/for-next (5ae2866f5264 Merge branches 'cxgb4', 'misc', '= mlx5' and 'qib' into for-next) Merging mtd/master (c9eaa447e77e Linux 3.15-rc1) Merging l2-mtd/master (be54f8f1c768 mtd: mtd_oobtest: generate consistent d= ata for verification) Merging crypto/master (f51f593b3eb1 crypto: omap-des - handle error of pm_r= untime_get_sync) CONFLICT (rename/delete): drivers/crypto/bfin_crc.h deleted in HEAD and ren= amed in crypto/master. Version crypto/master of drivers/crypto/bfin_crc.h l= eft in tree. CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig Merging drm/drm-next (c39b06951f1d DRM: armada: fix corruption while loadin= g cursors) Merging drm-panel/drm/panel/for-next (810e49d8978f drm/panel: add support f= or LG LD070WX3-SL01 panel) Merging drm-intel/for-linux-next (f68918de204f drm/i915: Include a little m= ore information about why ring init fails) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_context= .c Merging drm-tegra/drm/tegra/for-next (1ce91616a989 drm/tegra: hdmi - Add Te= gra124 support) Merging sound/for-next (38137a064199 ALSA: lx_core: Translate comments from= french to english) Merging sound-asoc/for-next (d2a9bb89829d Merge remote-tracking branches 'a= soc/topic/intel', 'asoc/topic/jz4740', 'asoc/topic/omap', 'asoc/topic/rt564= 0', 'asoc/topic/rt5651' and 'asoc/topic/sirf' into asoc-next) Merging modules/modules-next (22c9bcad859d staging: fix up speakup kobject = mode) Merging virtio/virtio-next (fc4324b4597c virtio-blk: base queue-depth on vi= rtqueue ringsize or module param) Merging input/next (1239128e349b Input: tc3589x-keypad - support probing fr= om device tree) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging block/for-next (35bfe60ae8ba Merge branch 'for-3.16/core' into for-= next) Merging device-mapper/for-next (ec052772958d Merge branch 'for-3.15' into f= or-next) 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 (865042c01637 mmc: Add realtek USB sdmmc host driver) Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) Merging slab/for-next (34bf6ef94a83 mm: slab/slub: use page->list consisten= tly instead of page->lru) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (e2f23b606b94 md: avoid oops on unload if some process = is in poll or select.) Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.li= naro.org/people/ljones/mfd) Merging mfd-lj/for-mfd-next (2d28ca731b9b mfd: wm5110: Correct default for = HEADPHONE_DETECT_1) Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dere= ference when there is no platform_data) 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 (a798c10faf62 Linux 3.15-rc2) Merging regulator/for-next (979b29716454 Merge remote-tracking branches 're= gulator/topic/arizona', 'regulator/topic/axp20', 'regulator/topic/of', 'reg= ulator/topic/pbias', 'regulator/topic/s2mps11', 'regulator/topic/s5m8767' a= nd 'regulator/topic/tps65217' into regulator-next) Merging security/next (fab71a90edda security: Convert use of typedef ctl_ta= ble to struct ctl_table) Merging selinux/next (6d32c850621b Merge tag 'v3.14' into next) Merging lblnet/next (d8ec26d7f828 Linux 3.13) Merging watchdog/master (c9eaa447e77e Linux 3.15-rc1) Merging iommu/next (57c343bad18f Merge branches 'iommu/fixes' and 'arm/omap= ' into next) Merging dwmw2-iommu/master (5ae0566a0fff iommu/vt-d: fix bug in matching PC= I devices with DRHD/RMRR descriptors) Merging vfio/next (4379d2ae1528 vfio: always select ANON_INODES) Merging osd/linux-next (f1f6630b53e7 MAINTAINERS: Update email address for = bhalevy) Merging jc_docs/docs-next (5c050fb96380 docs: update the development proces= s document) Merging trivial/for-next (c800bcd5f53f sparse: fix comment) Merging audit/master (66dde9dbae61 sparc: properly conditionalize use of TI= F_32BIT) CONFLICT (content): Merge conflict in kernel/audit.c CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart sysc= alls) Merging devicetree/devicetree/next (d88cf7d7b424 Merge remote-tracking bran= ch 'robh/for-next' into devicetree/next) Merging dt-rh/for-next (e7a62df8e8b4 of: Clean up of_update_property) Merging spi/for-next (b36c482da80a Merge remote-tracking branches 'spi/topi= c/pxa2xx', 'spi/topic/s3c24xx', 'spi/topic/sirf' and 'spi/topic/workqueue' = into spi-next) Merging tip/auto-latest (158d451df463 Merge branch 'x86/vdso') Merging clockevents/clockevents/next (09e15176ded1 clocksource: exynos_mct:= silence a static checker warning) Merging edac/linux_next (49856dc973cd sb_edac: mark MCE messages as KERN_DE= BUG) Merging edac-amd/for-next (c045ebdf6079 Merge branch 'edac-for-3.15' into f= or-next) Merging ftrace/for-next (6ea6215fe394 tracing/uprobes: Fix uprobe_cpu_buffe= r memory leak) Merging rcu/rcu/next (27397ab69d38 rcu: Variable name changed in tree_plugi= n.h and used in tree.c) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and = singlestep exceptions) Merging kvm/linux-next (0f689a33ad17 Merge branch 'for-linus' of git://git.= kernel.org/pub/scm/linux/kernel/git/s390/linux) Merging kvm-arm/kvm-arm-next (b73117c49364 Merge branch 'kvm-ppc-next' of g= it://github.com/agraf/linux-2.6 into kvm-queue) Merging kvm-ppc/kvm-ppc-next (7227fc066660 Merge branch 'kvm-ppchv-next' of= git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-next) 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 (0a25e113b480 Merge branch 'devel/for-linus-3.15= ' into linux-next) Merging percpu/for-next (4abee313c9a8 Merge branch 'for-3.16' into for-next) Merging workqueues/for-next (534a3fbb3f37 workqueue: simplify wq_update_unb= ound_numa() by jumping to use_dfl_pwq if the target cpumask equals wq's) Merging drivers-x86/linux-next (7a70906e55bf alienware-wmi: cover some scen= arios where memory allocations would fail) 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 (f624c7e5486b Merge remote-tracking branches 'regma= p/topic/le', 'regmap/topic/mmio', 'regmap/topic/rbtree' and 'regmap/topic/s= mbus' into regmap-next) Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (c73bcf7cca71 leds: 88pm860x: Fix missing refcount de= crement for parent of_node) Merging driver-core/driver-core-next (c9eaa447e77e Linux 3.15-rc1) Merging tty/tty-next (c9eaa447e77e Linux 3.15-rc1) Merging usb/usb-next (c9eaa447e77e Linux 3.15-rc1) Merging usb-gadget/next (041832565e40 usb: phy: mv-u3d: switch over to writ= el/readl) Merging staging/staging-next (ebb657babfa9 staging: comedi: ni_mio_common: = clarify the cmd->start_arg validation and use) Merging char-misc/char-misc-next (c9eaa447e77e Linux 3.15-rc1) Merging cgroup/for-next (79d719749d23 device_cgroup: rework device access c= heck and exception checking) Merging scsi/for-next (1a2184c0d747 [SCSI] More USB deadlock fixes) Merging target-updates/for-next (b076808051f2 ib_srpt: Use correct ib_sg_dm= a primitives) 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 (af797209aa01 Merge branch 'devel' into for-next) Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) Merging remoteproc/for-next (bd88acba5f98 remoteproc/ste_modem: staticize l= ocal symbols) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VI= RTIO) Merging gpio/for-next (bb2439c3d446 Merge branch 'devel' into for-next) Merging dma-mapping/dma-mapping-next (68efd7d2fb32 arm: dma-mapping: remove= order parameter from arm_iommu_create_mapping()) Merging pwm/for-next (2ae69a460413 pwm: pxa: Constify OF match table) Merging dma-buf/for-next (dcb99fd9b08c Linux 3.14-rc7) Merging userns/for-next (3efe1ac78e99 vfs: Block intuitively in the case of= BSD accounting files) CONFLICT (content): Merge conflict in fs/namespace.c CONFLICT (content): Merge conflict in fs/namei.c CONFLICT (content): Merge conflict in fs/dcache.c Merging ktest/for-next (62183dcac539 ktest: Set CLOSE_CONSOLE_SIGNAL in the= kvm.conf) 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 (31c2c4b8e911 clk: bcm281xx: don't use unnamed structs= or unions) Merging random/dev (7b878d4b48c4 random: Add arch_has_random[_seed]()) 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 sup= port.) Merging aio/master (d52a8f9ead60 fs/aio.c: Remove ctx parameter in kiocb_ca= ncel) Merging llvmlinux/for-next (752ac52c381b unwind_support) Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Pars= e device tree to setup idle states) Merging rd-docs/master (596d80c7ceb6 The sample wrapper currently fails on = some Java 7 .class files. This updates the wrapper to properly handle thos= e files.) Applying: mwifiex: using vmallog requires including vmalloc.h Merging akpm-current/current (7f6706aa1af1 lib/scatterlist: clean up useles= s architecture versions of scatterlist.h) Applying: hugetlb: ensure hugepage access is denied if hugepages are not su= pported -fix $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpio/gpio-zevio.c: fix build Applying: arm: convert use of typedef ctl_table to struct ctl_table Applying: ia64: convert use of typedef ctl_table to struct ctl_table Applying: tile: convert use of typedef ctl_table to struct ctl_table Applying: cdrom: convert use of typedef ctl_table to struct ctl_table Applying: random: convert use of typedef ctl_table to struct ctl_table Applying: parport: convert use of typedef ctl_table to struct ctl_table Applying: scsi: convert use of typedef ctl_table to struct ctl_table Applying: coda: convert use of typedef ctl_table to struct ctl_table Applying: fscache: convert use of typedef ctl_table to struct ctl_table Applying: lockd: convert use of typedef ctl_table to struct ctl_table Applying: nfs: convert use of typedef ctl_table to struct ctl_table Applying: inotify: convert use of typedef ctl_table to struct ctl_table Applying: ntfs: convert use of typedef ctl_table to struct ctl_table Applying: fs: convert use of typedef ctl_table to struct ctl_table Applying: key: convert use of typedef ctl_table to struct ctl_table Applying: ipc: convert use of typedef ctl_table to struct ctl_table Applying: sysctl: convert use of typedef ctl_table to struct ctl_table Applying: mm: convert use of typedef ctl_table to struct ctl_table Applying: mfd/rtc: s5m: do not allocate RTC I2C dummy and regmap for unsupp= orted chipsets Applying: mfd/rtc: sec/s5m: rename SEC* symbols to S5M Applying: rtc: s5m: remove undocumented time init on first boot Applying: rtc: s5m: use shorter time of register update Applying: rtc: s5m: support different register layout Applying: rtc: s5m: add support for S2MPS14 RTC Applying: rtc: s5m: consolidate two device type switch statements Applying: blackfin/ptrace: call find_vma with the mmap_sem held Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: arm: move arm_dma_limit to setup_dma_zone Applying: ufs: sb mutex merge + mutex_destroy Applying: mm: add strictlimit knob Merging akpm/master (7d865ea20ad9 mm: add strictlimit knob) --Signature=_Wed__23_Apr_2014_15_04_47_+1000_8y8WXPEzK/UXXvKl Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBCAAGBQJTV0n0AAoJEMDTa8Ir7ZwV4u4P/R4ChAGdZs6mtVk6v4gmMCir 7OeT9O4l9+yX7Ne2bRy9XQgi7HxC3VXsZCLEavlZOpMeG+yBYk/oBt7qXbRh3ixB AA81wASGxlTB+N6xYzi4GmfNPm9ZdyNONUuHoTYnmjHD+qiQpUFVvlbMFO/nJuUu YxeFVmpDA5R434qcM7bChlVzBKZehfNwqFCD+S0ZmKqdSsMsS0qKAWQ/lSGYQnVa ubPXYESfRftC65Pa7nH4dU5UTSelTiEIBSqRdLQ7F/XOoebtLj6+SwWHrsS4eYPR VoUJIrtCv8YX54XHzKJGk8hAKuHL+PRSHTwMarNgWfdzBkkaU40qisUN7FlBtzxQ NvW2ABQvnkaNKAaEif6orrHCm0p21oWE3KydsvXEbPKl3E4NljxD+o+vLOdW6KZp Ql05H1/KFKwwgULaV8WkE1/eopXK43QKtOTk1y0X3XG0rHeotNIBLrzZMglmGZtk auT1lSLXv5aVfz+huCWCJjBAM9AFMIm1v0MU0ZggXgXsHL6QJ8VPhwVj4GPhz5hg On7QkQ+9VhSxenwIr++7Qxu8PCiM3fXtfrOKi8YgneiCBkK7VY0GypzuQjTfo/FC B1vlrwloj20Udh8L/ZGRADk6aoddcVDhKEQMGXvTczGVpRTuE1aWoQWmA53NkdFs UyvAuUga710QLRBdpYDc =bVaQ -----END PGP SIGNATURE----- --Signature=_Wed__23_Apr_2014_15_04_47_+1000_8y8WXPEzK/UXXvKl--