From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: Tree for May 21 Date: Tue, 21 May 2013 15:03:32 +1000 Message-ID: <20130521150332.e788ca350ef8ddcde76bed0a@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Tue__21_May_2013_15_03_32_+1000_/PVqdC92Yn0DZAIa" Return-path: Received: from haggis.pcug.org.au ([203.10.76.10]:50294 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751399Ab3EUFDn (ORCPT ); Tue, 21 May 2013 01:03:43 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: linux-next@vger.kernel.org Cc: linux-kernel@vger.kernel.org --Signature=_Tue__21_May_2013_15_03_32_+1000_/PVqdC92Yn0DZAIa Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20130520: The rr-fixes tree lost its build failure. The crypto tree gained a build failure so I used the version from next-20130520. The drm-intel tree gained a conflict against Linus' tree. The tty tree gained a build failure so I used the version from next-20130520. The akpm tree gained conflicts against the net-next tree. ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 226 trees (counting Linus' and 31 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do. Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (c778879 Linux 3.10-rc2) Merging fixes/master (0279b3c Merge branch 'sched-urgent-for-linus' of git:= //git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging kbuild-current/rc-fixes (f66ba56 package: Makefile: unbreak binrpm-= pkg target) Merging arc-current/for-curr (81ec684 ARC: [mm] change semantics of __sync_= icache_dcache() to inv d$ lines) Merging arm-current/fixes (6eabb33 ARM: 7720/1: ARM v6/v7 cmpxchg64 shouldn= 't clear upper 32 bits of the old/new value) Merging m68k-current/for-linus (f722406 Linux 3.10-rc1) Merging powerpc-merge/merge (e34166a powerpc: Set show_unhandled_signals to= 1 by default) Merging sparc/master (de9c9f8 Merge tag 'remoteproc-3.10' of git://git.kern= el.org/pub/scm/linux/kernel/git/ohad/remoteproc) Merging net/master (3ccfc1b Merge branch 'for-davem' of git://git.kernel.or= g/pub/scm/linux/kernel/git/linville/wireless) Merging ipsec/master (da241ef Merge git://git.kernel.org/pub/scm/linux/kern= el/git/davem/net) Merging sound-current/for-linus (e6135fe ALSA: usb-audio: proc: use found s= yncmaxsize to determine feedback format) Merging pci-current/for-linus (f3f0117 Revert "x86/pci/mrst: Use configurat= ion mechanism 1 for 00:00.0, 00:02.0, 00:03.0") Merging wireless/master (6bb4880 ath9k: fix draining aggregation tid buffer= s) Merging driver-core.current/driver-core-linus (f722406 Linux 3.10-rc1) Merging tty.current/tty-linus (dab73b4 TTY: Fix tty miss restart after we t= urn off flow-control) Merging usb.current/usb-linus (2a0ebf8 USB: cxacru: potential underflow in = cxacru_cm_get_array()) CONFLICT (content): Merge conflict in drivers/usb/host/ohci-nxp.c Merging staging.current/staging-linus (8bb3e55 staging: ramster: add how-to= document) Merging char-misc.current/char-misc-linus (221ba15 Char: lp, protect LPGETS= TATUS with port_mutex) Merging input-current/for-linus (f0aacea Input: wacom - add a few new styli= for Cintiq series) Merging md-current/for-linus (32f9f57 MD: ignore discard request for hard d= isks of hybid raid1/raid10 array) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_l= og_d_path prefix) Merging crypto-current/master (286233e crypto: caam - fix inconsistent asso= c dma mapping direction) Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe()) Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros = to inline functions) Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6) Merging devicetree-current/devicetree/merge (ab28698 of: define struct devi= ce in of_platform.h if !OF_DEVICE and !OF_ADDRESS) Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error) Merging gpio-current/gpio/merge (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check= _available() return what callers expect) Merging rr-fixes/fixes (6407d75 virtio_console: fix uapi header) Merging mfd-fixes/master (e9d7b4b mfd: db8500-prcmu: Update stored DSI PLL = divider value) Merging vfio-fixes/for-linus (904c680 vfio-pci: Fix possible integer overfl= ow) Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (fd5c9c3 ARC: Trim arcregs.h) Merging arm/for-next (47aa03d Merge branches 'fixes', 'misc' and 'mmci' int= o for-next) Merging arm-perf/for-next/perf (ab87304 Merge branches 'perf/fixes' and 'hw= -breakpoint' into for-next/perf) Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) Merging xilinx/arm-next (64e3fd3 arm: zynq: Add support for pmu) CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c CONFLICT (content): Merge conflict in drivers/clocksource/Makefile CONFLICT (add/add): Merge conflict in arch/arm/mach-zynq/platsmp.c CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/v2m.c CONFLICT (content): Merge conflict in arch/arm/mach-spear/spear13xx.c CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c CONFLICT (content): Merge conflict in arch/arm/mach-highbank/highbank.c Merging arm64/upstream (3126976 arm64: debug: fix mdscr.ss check when enabl= ing debug exceptions) Merging blackfin/blackfin-linus (5ae89ee bfin cache: dcplb map: add 16M dcp= lb map for BF60x) Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_re= store) Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic = file) Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference = to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) Merging ia64/next (797f6a6 Add size restriction to the kdump documentation) Merging m68k/for-next (f722406 Linux 3.10-rc1) Merging m68knommu/for-next (2842e5b0 m68knommu: enable Timer on coldfire 53= 2x) Merging metag/for-next (164c013 metag: defconfigs: increase log buffer 8KiB= =3D> 128KiB) Merging microblaze/next (972be32 microblaze: Initialize temp variable to re= move compilation warning) Merging mips/mips-for-linux-next (f4ef27f Merge branch '3.10-fixes' into mi= ps-for-linux-next) Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS) Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parame= ter from do_execve() in hpux_execve()) Merging parisc-hd/for-next (1c92ce8 parisc: use arch_spinlock_t instead of = raw_spinlock_t in irqstacks) Merging powerpc/next (674825d Merge tag 'fixes-for-3.10-rc2-tag' of git://g= it.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen) Merging 4xx/next (2074b1d powerpc: Fix irq distribution) Merging mpc5xxx/next (fdeaf0e powerpc/512x: add ifm ac14xx board) Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bri= dge device node for T4/B4) Merging s390/features (ba54229 s390/cio: add channel ID sysfs attribute) Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/se= rial-of' into sh-latest) CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of gi= t://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) Merging tile/master (9fc1894 arch/tile: Fix syscall return value passed to = tracepoint) Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIME= NTAL) Merging xtensa/for_next (51fc41a xtensa: fix fast_store_prohibited _PAGE_WR= ITABLE_BIT test) Merging btrfs/next (667e7d9 Btrfs: allow superblock mismatch from older mkf= s) Merging ceph/testing (cb53a7e rbd: drop original request earlier for existe= nce check) Merging cifs/for-next (c2b93e0 cifs: only set ops for inodes in I_NEW state) Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.= kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) Merging ecryptfs/next (f6161aa Linux 3.9-rc2) Merging ext3/for_next (e162b2f jbd: use kmem_cache_zalloc instead of kmem_c= ache_alloc/memset) Merging ext4/dev (e2555fd jbd,jbd2: fix oops in jbd2_journal_put_journal_he= ad()) Merging f2fs/dev (3333169 f2fs: don't do checkpoint if error is occurred) Merging fuse/for-next (bee6c30 fuse: update inode size and invalidate attri= butes on fallocate) Merging gfs2/master (315debd GFS2: fix DLM depends to fix build errors) Merging jfs/jfs-next (73aaa22 jfs: fix a couple races) Merging logfs/master (3394661 Fix the call to BUG() caused by no free segme= nt found) Merging nfs/linux-next (bf845da NFSv4.1: Enable state protection) Merging nfsd/nfsd-next (ba4e55b nfsd4: fix compile in !CONFIG_NFSD_V4_SECUR= ITY_LABEL case) Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) Merging omfs/for-next (976d167 Linux 3.1-rc9) Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for = block_size and block_log match) Merging v9fs/for-next (c1be5a5 Linux 3.9) Merging ubifs/linux-next (c1be5a5 Linux 3.9) Merging xfs/for-next (e461fcb xfs: remote attribute lookups require the val= ue length) Merging vfs/for-next (ac3e3c5 don't bother with deferred freeing of fdtable= s) Merging pci/next (f722406 Linux 3.10-rc1) Merging hid/for-next (09dd14b Merge branch 'for-3.11/multitouch' into for-n= ext) Merging i2c/i2c/for-next (e9b526f i2c: suppress lockdep warning on delete_d= evice) Merging jdelvare-hwmon/master (1aaf6d3 Merge git://git.kernel.org/pub/scm/l= inux/kernel/git/davem/net) Merging hwmon-staging/hwmon-next (21d2302 hwmon: (ds1621) Add ds1631 chip s= upport to ds1621 driver and documentation) Merging v4l-dvb/master (1d62caa Merge /home/v4l/v4l/patchwork) Merging kbuild/for-next (9639217 Merge branch 'kbuild/kbuild' into kbuild/f= or-next) Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set= to 'y' not 'm') Merging libata/for-next (d3f0718 Merge branch 'for-3.10-fixes' into for-nex= t) Merging infiniband/for-next (f1258ea Merge branches 'misc' and 'mlx4' into = for-next) Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block) Merging pm/linux-next (fe4ae24 Merge branch 'pnp-next' into linux-next) Merging idle/next (5c99726b Merge branch 'fspin' into next) Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.= org/pub/scm/linux/kernel/git/jikos/apm) Merging cpuidle/cpuidle-next (817c876 Merge branch 'pm-fixes-next' into fix= es-next) CONFLICT (content): Merge conflict in drivers/base/power/qos.c CONFLICT (content): Merge conflict in drivers/acpi/processor_driver.c Merging cpupowerutils/master (f166033 cpupower tools: add install target to= the debug tools' makefiles) Merging thermal/next (3a9d1f1 Thermal: core: Ask .get_trip_temp() to regist= er thermal zone device.) Merging ieee1394/for-next (6fe9efb firewire: ohci: dump_stack() for PHY reg= s read/write failures) Merging ubi/linux-next (1557b9e UBI: do not abort init when ubi.mtd devices= cannot be found) Merging dlm/next (9000831 dlm: avoid unnecessary posix unlock) Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce s= ince there are no external consumers) Merging scsi/for-next (222ab59 [SCSI] ipr: Avoid target_destroy accessing m= emory after it was freed) Merging target-updates/for-next (04b59ba tcm_vhost: Enable VIRTIO_SCSI_F_HO= TPLUG) Merging target-merge/for-next-merge (b8d26b3 iser-target: Add iSCSI Extensi= ons for RDMA (iSER) target driver) Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) Merging isci/all (6734092 isci: add a couple __iomem annotations) Merging slave-dma/next (9562f83 DMA: AT91: Get residual bytes in dma buffer) Merging dmaengine/next (41ef2d5 Linux 3.9-rc7) Merging net-next/master (5ea94e7 phy: add phy_mac_interrupt() to use with P= HY_IGNORE_INTERRUPT) Merging ipsec-next/master (05600a7 xfrm_user: constify netlink dispatch tab= le) Merging wireless-next/master (f722406 Linux 3.10-rc1) Merging bluetooth/master (102cbbe Bluetooth: hidp: using strlcpy instead of= strncpy, also beautify code.) Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.inf= radead.org/linux-mtd) Merging l2-mtd/master (fc228fa mtd: increase max OOB size to 744) Merging crypto/master (52188b6 crypto: sahara - remove dependency on EXPERI= MENTAL) $ git reset --hard HEAD^ Merging 20130520 version of crypto Merging drm/drm-next (e9ced8e drm/radeon: restore nomodeset operation (v2)) Merging drm-intel/for-linux-next (98304ad drm/i915: add support for dvo Chr= ontel 7010B) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h Merging sound/for-next (e44007e ALSA: hda - add PCI IDs for Intel BayTrail) Merging sound-asoc/for-next (43eadff Merge remote-tracking branch 'asoc/top= ic/x86' into asoc-next) Merging modules/modules-next (06df44e modpost.c: Add .text.unlikely to TEXT= _SECTIONS) Merging virtio/virtio-next (b3087e4 virtio: remove virtqueue_add_buf().) Merging input/next (d520145 Input: w90p910_keypad - remove redundant platfo= rm_set_drvdata()) Merging input-mt/for-next (194664e Input: MT - handle semi-mt devices in co= re) Merging cgroup/for-next (e691100 Merge branch 'for-3.11' into for-next) Merging block/for-next (3ba25f6 Merge branch 'for-linus' into for-next) Merging device-mapper/master (11531a4 Fix detection of the need to resize t= he dm thin metadata device.) Merging embedded/master (4744b43 embedded: fix vc_translate operator preced= ence) Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage) Merging mmc/mmc-next (f722406 Linux 3.10-rc1) Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command) Merging slab/for-next (8a965b3 mm, slab_common: Fix bootstrap creation of k= malloc caches) Merging uclinux/for-next (6dbe51c Linux 3.9-rc1) Merging md/for-next (ae59b84 dm-raid: silence compiler warning on rebuilds_= per_group.) Merging mfd/master (43d61ee MAINTAINERS: Add Lee Jones as the MFD co-mainta= iner) CONFLICT (content): Merge conflict in drivers/mfd/intel_msic.c Merging battery/master (237a1b0 lp8788-charger: Fix kconfig dependency) Merging fbdev/fbdev-next (a49f0d1 Linux 3.8-rc1) Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in s= et_par) Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning) Merging regulator/for-next (645a7e3 Merge remote-tracking branch 'regulator= /topic/lp872x' into regulator-next) Merging security/next (4726e8f security: clarify cap_inode_getsecctx descri= ption) Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409) Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) Merging watchdog/master (f722406 Linux 3.10-rc1) Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables befor= e creating superpage) Merging iommu/next (0c4513b Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/= amd', 'ppc/pamu', 'core' and 'arm/tegra' into next) Merging vfio/next (664e938 vfio: Set container device mode) Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on rea= d error) Merging jc_docs/docs-next (5c050fb docs: update the development process doc= ument) Merging trivial/for-next (071361d mm: Convert print_symbol to %pSR) Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescen= ce of IMC_DDRIO device) Merging edac-amd/for-next (9713fae EDAC: Merge mci.mem_is_per_rank with mci= .csbased) Merging devicetree/devicetree/next (3132f62 Merge branch 'for-next' of git:= //sources.calxeda.com/kernel/linux into HEAD) Merging dt-rh/for-next (a2b9ea7 Documentation/devicetree: make semantic of = initrd-end more explicit) Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the defaul= t pin configuration) Merging spi-mb/for-next (df25c59 Merge remote-tracking branch 'spi/topic/si= rf' into spi-next) Merging tip/auto-latest (57e87c1 Merge branch 'timers/urgent') Merging ftrace/for-next (4c69e6e tracepoints: Prevent null probe from being= added) Merging rcu/rcu/next (4573e86 rcu: Switch to exedited grace periods for sus= pend as well as hibernation) Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc= _show) Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singl= estep exceptions) Merging kvm/linux-next (f722406 Linux 3.10-rc1) Merging kvm-arm/kvm-arm-next (b8022d7 arm: kvm: arch_timer: use symbolic co= nstants) CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c CONFLICT (content): Merge conflict in arch/arm/include/asm/kvm_host.h Merging kvm-ppc/kvm-ppc-next (5975a2e KVM: PPC: Book3S: Add API for in-kern= el XICS emulation) Merging oprofile/for-next (f722406 Linux 3.10-rc1) Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work) Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/= kernel/git/steve/gfs2-3.0-fixes) Merging xen-two/linux-next (f722406 Linux 3.10-rc1) Merging xen-arm/linux-next (3cc8e40 xen/arm: rename xen_secondary_init and = run it on every online cpu) Merging percpu/for-next (a1b2a55 percpu: add documentation on this_cpu oper= ations) Merging workqueues/for-next (bbe2a23 Merge branch 'for-3.10-fixes' into for= -next) Merging drivers-x86/linux-next (a1ec56e Add support for fan button on Ideap= ad Z580) Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into h= wpoison) Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may g= o away) Merging regmap/for-next (3615b6e Merge remote-tracking branch 'regmap/topic= /debugfs' into regmap-next) Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (e34bc3c leds: leds-gpio: Let device core handle pinc= trl) Merging driver-core/driver-core-next (5240d58 sysfs: kill sysfs_sb declarat= ion in fs/sysfs/inode.c.) Merging tty/tty-next (4898e64 tty: Add timed, writer-prioritized rw semapho= re) $ git reset --hard HEAD^ Merging 20130520 version of tty Merging usb/usb-next (d6bec48 usb: host: fusbh200-hcd: Staticize local symb= ols) Merging usb-gadget/next (added5f ARM: mxs_defconfig: add CONFIG_USB_PHY) Merging staging/staging-next (596b3dd Staging: Fixes string split across li= nes in zram) CONFLICT (content): Merge conflict in drivers/staging/nvec/nvec_kbd.c Merging char-misc/char-misc-next (e7d87ca misc: ep93xx_pwm: remove unnecess= ary platform_set_drvdata()) Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation) CONFLICT (content): Merge conflict in drivers/block/Kconfig Merging tmem/linux-next (8f0d816 Linux 3.7-rc3) Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in = bdi_position_ratio()) Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt= boot interface) Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) Merging pinctrl/for-next (e5182b8 Merge branch 'devel' into for-next) Merging vhost/linux-next (0107b9b x86: uaccess s/might_sleep/might_fault/) CONFLICT (content): Merge conflict in drivers/vhost/test.c Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplemen= t memblock allocation using reverse free area iterator) Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies f= or VIRTIO) Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO) Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple do= main first_irq) Merging gpio/gpio/next (08ffb22 gpio: grgpio: Add irq support) Merging gpio-lw/for-next (cfb1089 gpio: Don't override the error code in pr= obe error handling) Merging gen-gpio/for_next (f4c5405 gpio: update gpio Chinese documentation) Merging mailbox/dbx500-prcmu-mailbox (c497eba mailbox: fix invalid use of s= izeof in mailbox_msg_send()) Merging arm-soc/for-next (a0cdbee Merge branch 'fixes' into for-next) Merging bcm2835/for-next (ee8056f Merge branch 'for-3.11/defconfig' into fo= r-next) Merging cortex/for-next (6fae9cd ARM: ARMv7-M: implement read_cpuid_ext) Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep= 93xx-for-next) Merging imx-mxs/for-next (c15431e Merge branch 'imx/dt' into for-next) Merging ixp4xx/next (19f949f Linux 3.8) Merging msm/for-next (1df357a Merge branch 'msm-defconfig' into for-next) Merging mvebu/for-next (a6a3067 Merge branch 'mvebu/seb_clk' into for-next) Merging renesas/next (c482a65 Merge branch 'heads/soc-sh73a0' into next) CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/Kconfig CONFLICT (modify/delete): drivers/leds/leds-renesas-tpu.c deleted in renesa= s/next and modified in HEAD. Version HEAD of drivers/leds/leds-renesas-tpu.= c left in tree. CONFLICT (content): Merge conflict in drivers/leds/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7740.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-lager.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-armadill= o800eva.c $ git rm -f drivers/leds/leds-renesas-tpu.c Merging samsung/for-next (924fd92 Revert "ARM: SAMSUNG: don't check resourc= e with devm_ioremap_resource") Merging tegra/for-next (091b28c Merge branch 'for-3.11/defconfig' into for-= next) Merging dma-mapping/dma-mapping-next (c1be5a5 Linux 3.9) Merging pwm/for-next (c71a985 MAINTAINERS: Update PWM subsystem entry) Merging dma-buf/for-next (b89e356 dma-buf: Add debugfs support) Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesyste= m) Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different= machines) Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kern= el.org/pub/scm/linux/kernel/git/viro/vfs) Merging clk/clk-next (fa079b9 clk: sun5i: Add compatibles for Allwinner A13) Merging random/dev (b980955 random: fix locking dependency with the tasklis= t_lock) Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression spee= dup on ARM by using unaligned access) Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.or= g/sfrench/cifs-2.6) Merging akpm-current/current (e0fd9af Merge tag 'rdma-for-linus' of git://g= it.kernel.org/pub/scm/linux/kernel/git/roland/infiniband) $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/block/xsysace.c: fix id with missing port-number Applying: rapidio: make enumeration/discovery configurable Applying: rapidio: add enumeration/discovery start from user space Applying: rapidio: documentation update for enumeration changes Applying: fat: fix possible overflow for fat_clusters Applying: wait: fix false timeouts when using wait_event_timeout() Applying: mm: mmu_notifier: re-fix freed page still mapped in secondary MMU Applying: mm-mmu_notifier-re-fix-freed-page-still-mapped-in-secondary-mmu-f= ix Applying: ocfs2: unlock rw lock if inode lock failed Applying: drivers/video: implement a simple framebuffer driver Applying: mm: memcg: remove incorrect VM_BUG_ON for swap cache pages in unc= harge Applying: hfs: avoid crash in hfs_bnode_create Applying: CPU hotplug: provide a generic helper to disable/enable CPU hotpl= ug Applying: cpu-hotplug-provide-a-generic-helper-to-disable-enable-cpu-hotplu= g-fix Applying: cpu-hotplug-provide-a-generic-helper-to-disable-enable-cpu-hotplu= g-fix-fix Applying: reboot: rigrate shutdown/reboot to boot cpu Applying: shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugep= age-size-fix Applying: rapidio/tsi721: fix bug in MSI interrupt handling Applying: mm compaction: fix of improper cache flush in migration code Applying: kernel/audit_tree.c:audit_add_tree_rule(): protect `rule' from ki= ll_rules() Applying: ipcsem-fix-semctl-getzcnt-fix Applying: ipcsem-fix-semctl-getncnt-fix Applying: MAINTAINERS: update Hyper-V file list Applying: kmsg: honor dmesg_restrict sysctl on /dev/kmsg Applying: kmsg-honor-dmesg_restrict-sysctl-on-dev-kmsg-fix Applying: drivers/char/random.c: fix priming of last_data Applying: random: fix accounting race condition with lockless irq entropy_c= ount update Applying: sound/soc/codecs/si476x.c: don't use 0bNNN Applying: x86: make 'mem=3D' option to work for efi platform Applying: audit: fix mq_open and mq_unlink to add the MQ root as a hidden p= arent audit_names record Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in = progress Applying: cyber2000fb: avoid palette corruption at higher clocks Applying: posix_cpu_timer: consolidate expiry time type Applying: posix_cpu_timers: consolidate timer list cleanups Applying: posix_cpu_timers: consolidate expired timers check Applying: selftests: add basic posix timers selftests Applying: posix-timers: correctly get dying task time sample in posix_cpu_t= imer_schedule() Applying: posix_timers: Fix racy timer delta caching on task exit Applying: drivers/infiniband/core/cm.c: convert to using idr_alloc_cyclic() Applying: configfs: use capped length for ->store_attribute() Applying: ipvs: change type of netns_ipvs->sysctl_sync_qlen_max Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros Applying: lglock: update lockdep annotations to report recursive local locks Applying: block: restore /proc/partitions to not display non-partitionable = removable devices Applying: watchdog: trigger all-cpu backtrace when locked up and going to p= anic Applying: clear_refs: sanitize accepted commands declaration Applying: clear_refs: introduce private struct for mm_walk Applying: pagemap: introduce pagemap_entry_t without pmshift bits Applying: pagemap-introduce-pagemap_entry_t-without-pmshift-bits-v4 Applying: mm: soft-dirty bits for user memory changes tracking Applying: pagemap: prepare to reuse constant bits with page-shift Applying: mm/thp: use the correct function when updating access flags Applying: mm, memcg: don't take task_lock in task_in_mem_cgroup Applying: mm: remove free_area_cache Applying: mm: remove compressed copy from zram in-memory Applying: mm-remove-compressed-copy-from-zram-in-memory-fix Applying: mm/page_alloc.c: fix watermark check in __zone_watermark_ok() Applying: include/linux/mmzone.h: cleanups Applying: include-linux-mmzoneh-cleanups-fix Applying: mm: memmap_init_zone() performance improvement Applying: drop_caches: add some documentation and info message Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() = with NULL dev Applying: mm/dmapool.c: fix null dev in dma_pool_create() Applying: memcg: debugging facility to access dangling memcgs Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix Applying: mm: add vm event counters for balloon pages compaction Applying: err.h: IS_ERR() can accept __user pointers Applying: dump_stack: serialize the output from dump_stack() Applying: dump_stack-serialize-the-output-from-dump_stack-fix Applying: panic: add cpu/pid to warn_slowpath_common in WARNING printk()s Applying: panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix Applying: smp: Give WARN()ing when calling smp_call_function_many()/single(= ) in serving irq Applying: backlight: atmel-pwm-bl: remove unnecessary platform_set_drvdata() Applying: backlight: ep93xx: remove unnecessary platform_set_drvdata() Applying: backlight: lp8788: remove unnecessary platform_set_drvdata() Applying: backlight: pcf50633: remove unnecessary platform_set_drvdata() Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask Applying: lib/bitmap.c: speed up bitmap_find_free_region Applying: lib-bitmapc-speed-up-bitmap_find_free_region-fix Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting Applying: init: remove permanent string buffer from do_one_initcall() Applying: autofs4: allow autofs to work outside the initial PID namespace Applying: autofs4: translate pids to the right namespace for the daemon Applying: rtc: rtc-88pm80x: remove unnecessary platform_set_drvdata() Applying: drivers/rtc/rtc-v3020.c: remove redundant goto Applying: drivers/rtc/interface.c: fix checkpatch errors Applying: drivers/rtc/rtc-at32ap700x.c: fix checkpatch error Applying: drivers/rtc/rtc-at91rm9200.c: include Applying: drivers/rtc/rtc-cmos.c: fix whitespace related errors Applying: drivers/rtc/rtc-davinci.c: fix whitespace warning Applying: drivers/rtc/rtc-ds1305.c: add missing braces around sizeof Applying: drivers/rtc/rtc-ds1374.c: fix spacing related issues Applying: drivers/rtc/rtc-ds1511.c: fix issues related to spaces and braces Applying: drivers/rtc/rtc-ds3234.c: fix whitespace issue Applying: drivers/rtc/rtc-fm3130.c: fix whitespace related issue Applying: drivers/rtc/rtc-m41t80.c: fix spacing related issue Applying: drivers/rtc/rtc-max6902.c: remove unwanted spaces Applying: drivers/rtc/rtc-max77686.c: remove space before semicolon Applying: drivers/rtc/rtc-max8997.c: remove space before semicolon Applying: drivers/rtc/rtc-mpc5121.c: remove space before tab Applying: drivers/rtc/rtc-msm6242.c: use pr_warn Applying: drivers/rtc/rtc-mxc.c: fix checkpatch error Applying: drivers/rtc/rtc-omap.c: include instead of Applying: drivers/rtc/rtc-pcf2123.c: remove space before tabs Applying: drivers/rtc/rtc-pcf8583.c: move assignment outside if condition Applying: drivers/rtc/rtc-rs5c313.c: include instead of Applying: drivers/rtc/rtc-rs5c313.c: fix spacing related issues Applying: drivers/rtc/rtc-v3020.c: fix spacing issues Applying: drivers/rtc/rtc-vr41xx.c: fix spacing issues Applying: drivers/rtc/rtc-x1205.c: fix checkpatch issues Applying: rtc: rtc-88pm860x: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ab3100: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ab8500: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-at32ap700x: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-at91rm9200: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-at91sam9: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-au1xxx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-bfin: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-bq4802: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-coh901331: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-da9052: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-da9055: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-davinci: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-dm355evm: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ds1302: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ep93xx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-jz4740: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-lp8788: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-lpc32xx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ls1x: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-m48t59: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-max8925: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-max8998: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-mc13xxx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-msm6242: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-mxc: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-nuc900: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-pcap: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-pm8xxx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-s3c: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-sa1100: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-sh: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-spear: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-stmp3xxx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-twl: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-vr41xx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-vt8500: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-m48t86: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-puv3: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-rp5c01: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-tile: remove unnecessary platform_set_drvdata() Applying: reiserfs: fix deadlock with nfs racing on create/lookup Applying: fat: additions to support fat_fallocate Applying: fat-additions-to-support-fat_fallocate-fix Applying: idr: print a stack dump after ida_remove warning Applying: idr-print-a-stack-dump-after-ida_remove-warning-fix Applying: mwave: fix info leak in mwave_ioctl() Applying: rapidio/switches: remove tsi500 driver Applying: drivers/parport/share.c: use kzalloc Applying: drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 t= est mode Applying: drivers-w1-slaves-w1_ds2408c-add-magic-sequence-to-disable-p0-tes= t-mode-fix Applying: relay: fix timer madness Applying: aio: reqs_active -> reqs_available Applying: aio: percpu reqs_available Applying: generic dynamic per cpu refcounting Applying: aio: percpu ioctx refcount Applying: aio: use xchg() instead of completion_lock Applying: block: prep work for batch completion Applying: block-prep-work-for-batch-completion-fix-2 Applying: block-prep-work-for-batch-completion-fix-3 Applying: block-prep-work-for-batch-completion-fix-3-fix Applying: block-prep-work-for-batch-completion-fix-99 Applying: block-aio-batch-completion-for-bios-kiocbs-fix Applying: block, aio: batch completion for bios/kiocbs Applying: virtio-blk: convert to batch completion Applying: mtip32xx: convert to batch completion Applying: aio: fix kioctx not being freed after cancellation at exit time Applying: lib: add weak clz/ctz functions Applying: decompressor: add LZ4 decompressor module Applying: lib: add support for LZ4-compressed kernel Applying: kbuild: fix for updated LZ4 tool with the new streaming format Applying: arm: add support for LZ4-compressed kernel Applying: arm: Remove enforced Os flag for LZ4 decompressor Applying: x86: add support for LZ4-compressed kernel Applying: x86, doc: Add LZ4 magic number for the new compression Applying: lib: add lz4 compressor module Applying: lib-add-lz4-compressor-module-fix Applying: crypto: add lz4 Cryptographic API Applying: crypto-add-lz4-cryptographic-api-fix Applying: scripts/sortextable.c: fix building on non-Linux systems Applying: seccomp: add generic code for jitted seccomp filters. Applying: ARM: net: bpf_jit: make code generation less dependent on struct = sk_filter. CONFLICT (content): Merge conflict in arch/arm/net/bpf_jit_32.c Applying: ARM: bpf_jit: seccomp filtering: fixup merge conflict Applying: ARM: net: bpf_jit: add support for jitted seccomp filters. Applying: bpf: add comments explaining the schedule_work() operation CONFLICT (content): Merge conflict in arch/powerpc/net/bpf_jit_comp.c CONFLICT (content): Merge conflict in arch/arm/net/bpf_jit_32.c Merging akpm/master (d996882 bpf: add comments explaining the schedule_work= () operation) --Signature=_Tue__21_May_2013_15_03_32_+1000_/PVqdC92Yn0DZAIa Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJRmwAkAAoJEECxmPOUX5FEjh4QAIFxiUTu0L5tnJ/VSmW34EQN 7mjzIWRIKAGZmp2UT+S0YC59i0ktBaBE5mK5Kmhpq+nX7jKE96TQNOkoufFBRmu6 wLF21cBSNFrUG00yX/YL55KZngCWSQeAy52pkdOTrM6XbuGu9Aeh5ZT9JdLeLth7 s1Cb8xiZ18gNR4ATM43ZwafHzk1evfdliJumFVuOBf3kykQsy5XXXPmZjNdubSfJ i50YXl9C+KjJQ9H9acO4jEeGEVPE+zNGsugSUCDaqtTkFX5ZvgxYVMhzVoiRLi6n hXrPmouQmOmu/7QW9WaivD9JHLphJbpKvUVByNMS25fSm1jHB6ulTPPS4R1EzS6R pUt4qqk1YA2yvs7UpwpbCR69uK4cTpmWvnutlwJG+uInNEdXS9ljRZ6CYP3gd+FF 9S6LHJwVSygc0G5zv/LI7BmOFeP1lIjyVPW47vWS3odbWTTt9Qf7aAGBeeg4Pnk5 d5qfhdxmn+G1dzN00bNJ1hBimwp1Pk75ZQnLsr2neTcurekuFuKF1cPy6APDMMD2 R0iP9O08O4Qu3ryIOs1Sn0qnC0URn+rO54chgarV9GDBLM3qo4MTC2HFIFqHlVir k2oq71S2ydnIs4HBAbebYOnrFq/NZrcYGVH4dHcM9wtYiwXoIuc60uIh76HuRqhy ABM/cjoYb9S2fVE2jgr1 =Yey9 -----END PGP SIGNATURE----- --Signature=_Tue__21_May_2013_15_03_32_+1000_/PVqdC92Yn0DZAIa--