From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: Tree for Jun 6 Date: Thu, 6 Jun 2013 17:44:33 +1000 Message-ID: <20130606174433.26839817165cc08f9962e91c@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Thu__6_Jun_2013_17_44_33_+1000_cPM.xQ1PZ4EWAj8r" Return-path: Received: from haggis.pcug.org.au ([203.10.76.10]:36595 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752911Ab3FFHoi (ORCPT ); Thu, 6 Jun 2013 03:44:38 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: linux-next@vger.kernel.org Cc: linux-kernel@vger.kernel.org --Signature=_Thu__6_Jun_2013_17_44_33_+1000_cPM.xQ1PZ4EWAj8r Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, There will be no linux-next releases next week. This tree will have run time problems for 32 bit networking apps on 64 bit kernels due to commit 1be374a0518a ("net: Block MSG_CMSG_COMPAT in send(m)msg and recv(m)msg") which I was going to revert, but forgot, sorry. Changes since 20130605: The kvm tree gained a conflict against the s390 tree. The staging tree lost its build failure. The msm tree still has its build failure. The mvebu tree gained a conflict against the imx-mxs tree. The akpm tree gained 3 build failures for which I reverted 2 commits and applied a fix patch. ---------------------------------------------------------------------------- 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 227 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 (4d3797d Merge git://git.kernel.org/pub/scm/linux/ker= nel/git/davem/net) 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 (42a0940 Merge branch 'yem-kconfig-rc-fixes= ' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes) Merging arc-current/for-curr (ce3f808 ARC: [plat-arcfpga] Fix build breakag= e when !CONFIG_ARC_SERIAL) Merging arm-current/fixes (f27d6e1 ARM: 7729/1: vfp: ensure VFP_arch is non= -zero when VFP is not supported) Merging m68k-current/for-linus (fd90c0d input: cros_ec_keyb_clear_keyboard(= ) depends on CONFIG_PM_SLEEP) Merging powerpc-merge/merge (badec11 powerpc/cputable: Fix typo on P7+ cput= able entry) 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 (4d3797d Merge git://git.kernel.org/pub/scm/linux/kernel= /git/davem/net) Merging ipsec/master (01cb71d net_sched: restore "overhead xxx" handling) Merging sound-current/for-linus (11e7064 ALSA: usb-audio - Fix invalid volu= me resolution on Logitech HD webcam c270) Merging pci-current/for-linus (65694c5 x86/PCI: Map PCI setup data with ior= emap() so it can be in highmem) Merging wireless/master (cee6dfa Revert "ath9k_hw: Update rx gain initval t= o improve rx sensitivity") Merging driver-core.current/driver-core-linus (e4aa937 Linux 3.10-rc3) Merging tty.current/tty-linus (317a684 Revert "serial: 8250: Make SERIAL_82= 50_RUNTIME_UARTS work correctly") Merging usb.current/usb-linus (f448803 USB: serial: fix TIOCMIWAIT return v= alue) Merging staging.current/staging-linus (1f89b8f Merge tag 'iio-fixes-for-3.1= 0b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging= -linus) Merging char-misc.current/char-misc-linus (e4aa937 Linux 3.10-rc3) Merging input-current/for-linus (3bd1f7e Input: wacom - fix a typo for Cint= iq 22HDT) 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 (68be0b1 crypto: sahara - fix building as mod= ule) 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 (c44cd9e irqdomain: export irq_do= main_add_simple) Merging devicetree-current/devicetree/merge (2c302eb kbuild: make sure we c= lean up DTB temporary files) CONFLICT (content): Merge conflict in scripts/Makefile.lib 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 (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver w= ork without pdata) Merging vfio-fixes/for-linus (9a6aa27 vfio: fix crash on rmmod) Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (46e9bab ARC: Use kconfig helper IS_ENABLED() to get r= id of defines.h) Merging arm/for-next (b59c112 Merge branches 'devel-stable', 'fixes', 'misc= ' and 'mmci' into for-next) Merging arm-perf/for-next/perf (e4aa937 Linux 3.10-rc3) 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 (6427ae7 arm64: Provide default implementation for d= ma_{alloc,free}_attrs) 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) CONFLICT (content): Merge conflict in arch/cris/arch-v32/drivers/Kconfig Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference = to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) Merging ia64/next (326f413 Merge branch 'misc-3.11' into next) Merging m68k/for-next (6b4ed65 m68k/math-emu: unsigned issue, 'unsigned lon= g' will never be less than zero) Merging m68knommu/for-next (e4aa937 Linux 3.10-rc3) Merging metag/for-next (164c013 metag: defconfigs: increase log buffer 8KiB= =3D> 128KiB) Merging microblaze/next (62bc82a microblaze: Use static inline functions in= cacheflush.h) Merging mips/mips-for-linux-next (f678219 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 (f1a86f7 parisc: fix kernel BUG at arch/parisc/i= nclude/asm/mmzone.h:50 (part 2)) Merging powerpc/next (519fe2e Merge branch 'leds-fixes-3.10' of git://git.k= ernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) Merging 4xx/next (2074b1d powerpc: Fix irq distribution) Merging mpc5xxx/next (a4f4124 powerpc/mpc512x: initialize board restart ear= lier) Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bri= dge device node for T4/B4) Merging s390/features (9995872 s390/pci: sysfs remove strlen) 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 (0756a12 xtensa: tell git to ignore copied zlib sou= rce files) Merging btrfs/next (667e7d9 Btrfs: allow superblock mismatch from older mkf= s) Merging ceph/testing (19bb6a8 libceph: print more info for short message he= ader) Merging cifs/for-next (82bae91 cifs: break out lanman NEGOTIATE handling in= to separate function) 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 (6fd99d3 eCryptfs: Cocci spatch "memdup.spatch") Merging ext3/for_next (e162b2f jbd: use kmem_cache_zalloc instead of kmem_c= ache_alloc/memset) Merging ext4/dev (74039f2 ext4: remove ext4_ioend_wait()) Merging f2fs/dev (83d5d6f f2fs: cover cp_file information with ilock) Merging fscache/fscache (bbd645c FS-Cache: Don't use spin_is_locked() in as= sertions) Merging fuse/for-next (e5c5f05 fuse: fix alignment in short read optimizati= on for async_dio) Merging gfs2/master (edd2e9a GFS2: Remove no-op wrapper function) Merging jfs/jfs-next (eb8630d jfs: Update jfs_error) Merging logfs/master (3394661 Fix the call to BUG() caused by no free segme= nt found) Merging nfs/linux-next (b739a5d Merge branch 'labeled-nfs' into linux-next) Merging nfsd/nfsd-next (1a9357f nfsd: avoid undefined signed overflow) 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 (7a0d932 fs/9p: xattr: add trusted and security names= paces) Merging ubifs/linux-next (c1be5a5 Linux 3.9) Merging xfs/for-next (5c87d4b xfs: increase number of ACL entries for V5 su= perblocks) Merging vfs/for-next (ac3e3c5 don't bother with deferred freeing of fdtable= s) Merging pci/next (bb4bac9 Merge branch 'pci/jiang-iov-fixes' into next) CONFLICT (content): Merge conflict in drivers/acpi/pci_root.c Merging hid/for-next (3a60eb9 Merge branch 'for-3.11/upstream' into for-nex= t) 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 (de9eea0 hwmon: (ds1621) Remove detect fun= ction) Merging v4l-dvb/master (f6b831f Merge /home/v4l/v4l/patchwork) Merging kbuild/for-next (ed55317 Merge branch 'kbuild/rc-fixes' into kbuild= /for-next) Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set= to 'y' not 'm') Merging libata/for-next (17039ef Merge branch 'for-3.10-fixes' into for-nex= t) Merging infiniband/for-next (c9a2433 Merge branches 'iser' and 'qib' into f= or-next) Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block) Merging pm/linux-next (01adc9f Merge branch 'pm-assorted-next' into linux-n= ext) 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 (fa91ac6 Merge branch 'for-rc' of .git into next) Merging ieee1394/for-next (6fe9efb firewire: ohci: dump_stack() for PHY reg= s read/write failures) Merging ubi/linux-next (584d462 UBI: fastmap break out of used PEB search) 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 (002edf2 Merge branch 'misc' into for-next) Merging target-updates/for-next (c778879 Linux 3.10-rc2) Merging target-merge/for-next-merge (c778879 Linux 3.10-rc2) 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 (c403614 Merge branch 'for-linus' into next) Merging dmaengine/next (41ef2d5 Linux 3.9-rc7) Merging net-next/master (11a164a net: sun4i-emac: Staticize local symbols) Merging ipsec-next/master (5865fc1 tg3: remove redundant pm init code) Merging wireless-next/master (99e9494 brcmsmac: Reduce log spam in heavy tx= , make err print in debug) CONFLICT (content): Merge conflict in net/mac80211/iface.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/debug.c Merging bluetooth/master (cd60aab Bluetooth: Add missing reset_resume dev_p= m_ops) CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.inf= radead.org/linux-mtd) Merging l2-mtd/master (449e74c mtd: tests: don't print error messages when = out-of-memory) Merging crypto/master (beca35d hwrng: nomadik - use clk_prepare_enable()) Merging drm/drm-next (328a471 drm_modes: videomode: add doubleclk flag) Merging drm-intel/for-linux-next (ef1b460 drm/i915: set default value for c= onfig->pixel_multiplier) Merging drm-tegra/drm/for-next (5ddfe3d gpu: host1x: Rework CPU syncpoint i= ncrement) Merging sound/for-next (2c38d99 ALSA: hda/via - Use standard snd_hda_shutup= _pins()) Merging sound-asoc/for-next (9416d27 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 (fc4f314 Input: add TI-Nspire keypad support) Merging input-mt/for-next (194664e Input: MT - handle semi-mt devices in co= re) Merging cgroup/for-next (b90726d Merge branch 'for-3.11-cpuset' into for-ne= xt) Merging block/for-next (f4d5f94 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 (0e74823 mmc: sdhci: Add size for caller in init+regis= ter) 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 (57d5b9c Merge tag 'mfd-arizona-v3.10-rc2' of git://git.= kernel.org/pub/scm/linux/kernel/git/broonie/misc) CONFLICT (content): Merge conflict in drivers/mfd/intel_msic.c Merging battery/master (dccab60 pm2301_charger: Fix module alias prefix) Merging fbdev/for-next (09bb64a video: imxfb: Add DT support) 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 (fc64601 Merge remote-tracking branch 'regulator= /topic/lp872x' into regulator-next) Merging security/next (e2fa3d7 tpm: fix regression caused by section type c= onflict of tpm_dev_release() in ppc builds) Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409) Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) Merging watchdog/master (64da82b watchdog: core: don't try to stop device i= f not running) 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 (3655b22 Merge tag 'stable/for-linus-3.10-rc3-tag' of git= ://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen) 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 (6d1ee2c Documentation/arm/IXP4xx fix a typo) CONFLICT (content): Merge conflict in Documentation/networking/netlink_mmap= .txt 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 (d595c00 Merge remote-tracking branch 'spi/topic/xi= linx' into spi-next) Merging tip/auto-latest (e4aa937 Linux 3.10-rc3) Merging ftrace/for-next (4c69e6e tracepoints: Prevent null probe from being= added) Merging rcu/rcu/next (557c3de Merge commit '14ffcff86dc36fad827ef8350d847da= ee56e63e4' into HEAD) 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 (e47a5f5 KVM: x86 emulator: convert XADD to fastop) CONFLICT (content): Merge conflict in arch/s390/include/asm/pgtable.h Merging kvm-arm/kvm-arm-next (a1b02cb fixup! ARM: KVM: Allow host virt time= r irq to be different from guest timer virt irq) 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 (e592f8d Merge branch 'stable/for-linus-3.10' in= to linux-next) Merging xen-arm/linux-next (3a88558 xen/arm: account for stolen ticks) Merging percpu/for-next (c1ae6e9 percpu-refcount: Don't use silly cmpxchg()) 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 (af844ea 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 (1940194 leds: renesas-tpu: cleanup a small type issu= e) Merging driver-core/driver-core-next (ddf1f06 firmware loader: fix build fa= ilure with !CONFIG_FW_LOADER_USER_HELPER) CONFLICT (content): Merge conflict in drivers/base/cpu.c Merging tty/tty-next (e943f58 stallion: final cleanup) Merging usb/usb-next (0c967e7 USB: serial: pl2303 works at 500kbps) Merging usb-gadget/next (2d22b42 usb: phy: registering Tegra USB PHY as pla= tform driver) Merging staging/staging-next (f2c3d80 staging: rtl8192u: replace macro rx_h= al_is_cck_rate() in r8192U_core.c) CONFLICT (content): Merge conflict in drivers/staging/silicom/bpctl_mod.c Applying: staging/lustre: fix for invalidatepage() API change Merging char-misc/char-misc-next (4cd5773 net: core: move mac_pton() to lib= /net_utils.c) 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 (f264441 Merge branch 'devel' into for-next) Merging vhost/linux-next (f722406 Linux 3.10-rc1) 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 (644c8df gpio: sx150x: convert to use devm_* funct= ions) Merging mailbox/dbx500-prcmu-mailbox (c497eba mailbox: fix invalid use of s= izeof in mailbox_msg_send()) Merging arm-soc/for-next (050a8ef Merge branch 'next/soc' into for-next) Merging bcm2835/for-next (0f1d8f7 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 (81426b7 Merge branch 'imx/dt' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-mxs.c Merging ixp4xx/next (19f949f Linux 3.8) Merging msm/for-next (d39b156 Merge branch 'msm-fix' into for-next) Applying: restore dependency on ARCH_MSM to GPIO_MSM_V2 Merging mvebu/for-next (17a7f09 Merge branch 'mvebu/regmap' into for-next) CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug Merging renesas/next (6f8474b Merge branches 'heads/defconfig', 'heads/boar= ds', 'heads/dt', 'heads/intc-external-irq' and 'heads/boards-marzen-fixes' = into next) Merging samsung/for-next (924fd92 Revert "ARM: SAMSUNG: don't check resourc= e with devm_ioremap_resource") Merging tegra/for-next (034e80e Merge branch 'for-3.11/defconfig' into for-= next) Merging dma-mapping/dma-mapping-next (c1be5a5 Linux 3.9) Merging pwm/for-next (e792714 pwm: mxs: Let device core handle pinctrl) Merging dma-buf/for-next (844ce9f Merge tag 'mmc-fixes-for-3.10-rc5' of git= ://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc) 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 (061cec9 clk: tegra: Use common of_clk_init function) 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 (4d3797d Merge git://git.kernel.org/pub/scm/li= nux/kernel/git/davem/net) $ git checkout -b akpm remotes/origin/akpm/master 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-v11 Applying: reboot: rigrate shutdown/reboot to boot cpu Applying: migrate-shutdown-reboot-to-boot-cpu-v11 Applying: kmsg: honor dmesg_restrict sysctl on /dev/kmsg Applying: kmsg-honor-dmesg_restrict-sysctl-on-dev-kmsg-fix Applying: lib/mpi/mpicoder.c: looping issue, need stop when equal to zero, = found by 'EXTRA_FLAGS=3D-W'. Applying: ocfs2: ocfs2_prep_new_orphaned_file() should return ret Applying: memcg: don't initialize kmem-cache destroying work for root caches Applying: drivers/rtc/rtc-tps6586x.c: device wakeup flags correction Applying: drivers/rtc/rtc-cmos.c: fix accidentally enabling rtc channel Applying: drivers-rtc-rtc-cmosc-fix-accidentally-enabling-rtc-channel-fix Applying: audit: wait_for_auditd() should use TASK_UNINTERRUPTIBLE Applying: cciss: fix broken mutex usage in ioctl Applying: drivers/rtc/rtc-twl.c: fix missing device_init_wakeup() when boot= ed with device tree Applying: swap: avoid read_swap_cache_async() race to deadlock while waitin= g on discard I/O completion Applying: fs/ocfs2/namei.c: remove unecessary ERROR when removing non-empty= directory Applying: rtc-at91rm9200: add match-table compile guard Applying: rtc-at91rm9200: add configuration support Applying: rtc-at91rm9200: refactor interrupt-register handling Applying: rtc-at91rm9200: add shadow interrupt mask Applying: rtc-at91rm9200: use shadow IMR on at91sam9x5 Applying: aio: fix io_destroy() regression by using call_rcu() Applying: drivers/misc/sgi-gru/grufile.c: fix info leak in gru_get_config_i= nfo() Applying: mm/page_alloc.c: fix watermark check in __zone_watermark_ok() Applying: mm: migration: add migrate_entry_wait_huge() Applying: drivers/base/cpu.c: fix maxcpus boot option Applying: drivers-base-cpuc-fix-maxcpus-boot-option-fix Applying: kernel/audit_tree.c:audit_add_tree_rule(): protect `rule' from ki= ll_rules() Applying: frontswap: fix incorrect zeroing and allocation size for frontswa= p_map Applying: mm: memcontrol: fix lockless reclaim hierarchy iterator Applying: drivers/platform/x86/intel_ips.c: convert to module_pci_driver 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: kernel/auditfilter.c: fixing build warning Applying: kernel/auditfilter.c: fix leak in audit_add_rule() error path Applying: drivers/pcmcia/pd6729.c: convert to module_pci_driver Applying: drivers/pcmcia/yenta_socket.c: convert to module_pci_driver Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in = progress Applying: drm/cirrus: correct register values for 16bpp Applying: drm/nouveau: make vga_switcheroo code depend on VGA_SWITCHEROO Applying: drivers/media/pci/mantis/mantis_cards.c: convert to module_pci_dr= iver Applying: drivers/media/pci/dm1105/dm1105.c: convert to module_pci_driver Applying: drivers/media/pci/mantis/hopper_cards.c: convert to module_pci_dr= iver Applying: drivers/media/pci/pluto2/pluto2.c: convert to module_pci_driver Applying: drivers/media/pci/pt1/pt1.c: convert to module_pci_driver Applying: drivers/video/smscufx.c: use NULL instead of 0 Applying: drivers/video/udlfb.c: use NULL instead of 0 Applying: drivers/video/udlfb.c: make local symbol static Applying: drivers/video/imxfb.c: make local symbols static Applying: drivers/video/acornfb.c: remove dead code Applying: cyber2000fb: avoid palette corruption at higher clocks Applying: drivers/iommu/msm_iommu_dev.c: fix leak and clean up error paths Applying: drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix 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: kernel/timer.c: fix jiffies wrap behavior of round_jiffies*() Applying: drivers/infiniband/core/cm.c: convert to using idr_alloc_cyclic() Applying: drivers/ide/delkin_cb.c: convert to module_pci_driver Applying: drivers/mfd/lpc_ich.c: convert to module_pci_driver Applying: drivers/mtd/chips/gen_probe.c: refactor call to request_module() Applying: configfs: use capped length for ->store_attribute() Applying: ipvs: change type of netns_ipvs->sysctl_sync_qlen_max Applying: drivers/net/ethernet/ibm/ehea/ehea_main.c: add alias entry for po= rtN properties Applying: mISDN: add support for group membership check Applying: drivers/atm/he.c: convert to module_pci_driver Applying: drivers/ptp/ptp_pch.c: convert to module_pci_driver Applying: fs/ocfs2/dlm/dlmrecovery.c: remove duplicate declarations Applying: fs/ocfs2/dlm/dlmrecovery.c:dlm_request_all_locks(): ret should be= int instead of enum Applying: ocfs2: should not use le32_add_cpu to set ocfs2_dinode i_flags Applying: ocfs2: add missing dlm_put() in dlm_begin_reco_handler() Applying: softirq: use _RET_IP_ Applying: include/linux/sched.h: don't use task->pid/tgid in same_thread_gr= oup/has_group_leader_pid Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros Applying: lglock: update lockdep annotations to report recursive local locks Applying: drivers/scsi/a100u2w.c: convert to module_pci_driver Applying: drivers/scsi/dc395x.c: convert to module_pci_driver Applying: drivers/scsi/dmx3191d.c: convert to module_pci_driver Applying: drivers/scsi/initio.c: convert to module_pci_driver Applying: drivers/scsi/mvumi.c: convert to module_pci_driver Applying: drivers/net/irda/donauboe.c: convert to module_pci_driver Applying: drivers/cdrom/gdrom.c: fix device number leak Applying: block/compat_ioctl.c: do not leak info to user-space Applying: drivers/cdrom/cdrom.c: use kzalloc() for failing hardware 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: soft-dirty: call mmu notifiers when write-protecting ptes 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: swap: add a simple detector for inappropriate swapin readahead Applying: mm: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT Applying: ncpfs: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHI= FT Applying: uio: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT Applying: mm/page_alloc: factor out setting of pcp->high and pcp->batch Applying: mm/page_alloc: prevent concurrent updaters of pcp ->batch and ->h= igh Applying: mm/page_alloc: insert memory barriers to allow async update of pc= p batch and high Applying: mm/page_alloc: protect pcp->batch accesses with ACCESS_ONCE Applying: mm/page_alloc: convert zone_pcp_update() to rely on memory barrie= rs instead of stop_machine() Applying: mm/page_alloc: when handling percpu_pagelist_fraction, don't unne= edly recalulate high Applying: mm/page_alloc: factor setup_pageset() into pageset_init() and pag= eset_set_batch() Applying: mm/page_alloc: relocate comment to be directly above code it refe= rs to. Applying: mm/page_alloc: factor zone_pageset_init() out of setup_zone_pages= et() Applying: mm/page_alloc: in zone_pcp_update(), uze zone_pageset_init() Applying: mm/page_alloc: rename setup_pagelist_highmark() to match naming o= f pageset_set_batch() Applying: mm/THP: add pmd args to pgtable deposit and withdraw APIs Applying: mm/THP: withdraw the pgtable after pmdp related operations Applying: mm/THP: don't use HPAGE_SHIFT in transparent hugepage code Applying: mm/THP: deposit the transpare huge pgtable before set_pmd Applying: mm: vmscan: limit the number of pages kswapd reclaims at each pri= ority Applying: mm: vmscan: obey proportional scanning requirements for kswapd Applying: mm: vmscan: flatten kswapd priority loop Applying: mm: vmscan: decide whether to compact the pgdat based on reclaim = progress Applying: mm: vmscan: do not allow kswapd to scan at maximum priority Applying: mm: vmscan: have kswapd writeback pages based on dirty pages enco= untered, not priority Applying: mm: vmscan: block kswapd if it is encountering pages under writeb= ack Applying: mm-vmscan-block-kswapd-if-it-is-encountering-pages-under-writebac= k-fix Applying: mm-vmscan-block-kswapd-if-it-is-encountering-pages-under-writebac= k-fix-2 Applying: mm: vmscan: check if kswapd should writepage once per pgdat scan Applying: mm: vmscan: move logic from balance_pgdat() to kswapd_shrink_zone= () Applying: mm: vmscan: stall page reclaim and writeback pages based on dirty= /writepage pages encountered Applying: mm: vmscan: stall page reclaim after a list of pages have been pr= ocessed Applying: mm: vmscan: set zone flags before blocking Applying: mm: vmscan: move direct reclaim wait_iff_congested into shrink_li= st Applying: mm: vmscan: treat pages marked for immediate reclaim as zone cong= estion Applying: mm: vmscan: take page buffers dirty and locked state into account Applying: fs: nfs: inform the VM about pages being committed or unstable Applying: mm: fix comment referring to non-existent size_seqlock, change to= span_seqlock Applying: mmzone: note that node_size_lock should be manipulated via pgdat_= resize_lock() Applying: memory_hotplug: use pgdat_resize_lock() in online_pages() Applying: memory_hotplug: use pgdat_resize_lock() in __offline_pages() Applying: memory_hotplug-use-pgdat_resize_lock-in-__offline_pages-fix Applying: include/linux/mm.h: add PAGE_ALIGNED() helper Applying: vmcore: clean up read_vmcore() Applying: vmcore: allocate buffer for ELF headers on page-size alignment Applying: vmcore-allocate-buffer-for-elf-headers-on-page-size-alignment-fix Applying: vmcore: treat memory chunks referenced by PT_LOAD program header = entries in page-size boundary in vmcore_list Applying: vmalloc: make find_vm_area check in range Applying: vmalloc: introduce remap_vmalloc_range_partial Applying: vmalloc-introduce-remap_vmalloc_range_partial-fix Applying: vmcore: allocate ELF note segment in the 2nd kernel vmalloc memory Applying: vmcore-allocate-elf-note-segment-in-the-2nd-kernel-vmalloc-memory= -fix Applying: vmcore: allow user process to remap ELF note segment buffer Applying: vmcore-allow-user-process-to-remap-elf-note-segment-buffer-fix Applying: vmcore: calculate vmcore file size from buffer size and total siz= e of vmcore objects Applying: vmcore: support mmap() on /proc/vmcore Applying: vmcore-support-mmap-on-proc-vmcore-fix Applying: memcg: update TODO list in Documentation Applying: mm: add tracepoints for LRU activation and insertions Applying: mm: pagevec: defer deciding which LRU to add a page to until page= vec drain time Applying: mm: activate !PageLRU pages on mark_page_accessed if page is on l= ocal pagevec Applying: mm: remove lru parameter from __pagevec_lru_add and remove parts = of pagevec API Applying: mm: remove lru parameter from __lru_cache_add and lru_cache_add_l= ru Applying: mm/page_alloc.c: add additional checking and return value for the= 'table->data' Applying: mm/nommu.c: add additional check for vread() just like vwrite() h= as done Applying: mm/memory-failure.c: fix memory leak in successful soft offlining Applying: mm: remove duplicated call to get_pfn_range_for_nid() Applying: mm/memory_hotplug.c: change normal message to use pr_debug Applying: mm/memory-hotplug: fix lowmem count overflow when offline pages Applying: mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages-fix Applying: mm/pageblock: remove get/set_pageblock_flags Applying: mm/hugetlb: remove hugetlb_prefault Applying: mm/hugetlb: use already existing interface huge_page_shift Applying: mm: tune vm_committed_as percpu_counter batching size Applying: swap: discard while swapping only if SWAP_FLAG_DISCARD_PAGES Applying: swap-discard-while-swapping-only-if-swap_flag_discard_pages-fix Applying: mm: change signature of free_reserved_area() to fix building warn= ings Applying: mm: enhance free_reserved_area() to support poisoning memory with= zero Applying: mm/ARM64: kill poison_init_mem() Applying: mm/x86: use free_reserved_area() to simplify code Applying: mm/tile: use common help functions to free reserved pages Applying: mm: fix some trivial typos in comments Applying: mm: use managed_pages to calculate default zonelist order Applying: mm: accurately calculate zone->managed_pages for highmem zones Applying: mm: use a dedicated lock to protect totalram_pages and zone->mana= ged_pages Applying: mm: make __free_pages_bootmem() only available at boot time Applying: mm: correctly update zone->managed_pages Applying: mm-correctly-update-zone-managed_pages-fix Applying: mm-correctly-update-zone-managed_pages-fix-fix Applying: mm: concentrate modification of totalram_pages into the mm core Applying: mm: report available pages as "MemTotal" for each NUMA node Applying: memcg: Kconfig info update Applying: mm: Fix the TLB range flushed when __tlb_remove_page() runs out o= f slots Applying: vmlinux.lds: add comments for global variables and clean up usele= ss declarations Applying: avr32: normalize global variables exported by vmlinux.lds Applying: c6x: normalize global variables exported by vmlinux.lds Applying: h8300: normalize global variables exported by vmlinux.lds Applying: score: normalize global variables exported by vmlinux.lds Applying: tile: normalize global variables exported by vmlinux.lds Applying: UML: normalize global variables exported by vmlinux.lds Applying: mm: introduce helper function mem_init_print_info() to simplify m= em_init() Applying: mm: use totalram_pages instead of num_physpages at runtime Applying: mm/hotplug: prepare for removing num_physpages Applying: mm/alpha: prepare for removing num_physpages and simplify mem_ini= t() Applying: mm/ARC: prepare for removing num_physpages and simplify mem_init() Applying: mm/ARM: prepare for removing num_physpages and simplify mem_init() Applying: mm/ARM64: prepare for removing num_physpages and simplify mem_ini= t() Applying: mm/AVR32: prepare for removing num_physpages and simplify mem_ini= t() Applying: mm/blackfin: prepare for removing num_physpages and simplify mem_= init() Applying: mm/c6x: prepare for removing num_physpages and simplify mem_init() Applying: mm/cris: prepare for removing num_physpages and simplify mem_init= () Applying: mm/frv: prepare for removing num_physpages and simplify mem_init() Applying: mm/h8300: prepare for removing num_physpages and simplify mem_ini= t() Applying: mm/hexagon: prepare for removing num_physpages and simplify mem_i= nit() Applying: mm/IA64: prepare for removing num_physpages and simplify mem_init= () Applying: mm/m32r: prepare for removing num_physpages and simplify mem_init= () Applying: mm/m68k: prepare for removing num_physpages and simplify mem_init= () Applying: mm/metag: prepare for removing num_physpages and simplify mem_ini= t() Applying: mm/microblaze: prepare for removing num_physpages and simplify me= m_init() Applying: mm/MIPS: prepare for removing num_physpages and simplify mem_init= () Applying: mm/mn10300: prepare for removing num_physpages and simplify mem_i= nit() Applying: mm/openrisc: prepare for removing num_physpages and simplify mem_= init() Applying: mm/PARISC: prepare for removing num_physpages and simplify mem_in= it() Applying: mm/ppc: prepare for removing num_physpages and simplify mem_init() Applying: mm/s390: prepare for removing num_physpages and simplify mem_init= () Applying: mm/score: prepare for removing num_physpages and simplify mem_ini= t() Applying: mm/SH: prepare for removing num_physpages and simplify mem_init() Applying: mm/SPARC: prepare for removing num_physpages and simplify mem_ini= t() Applying: mm/tile: prepare for removing num_physpages and simplify mem_init= () Applying: mm/um: prepare for removing num_physpages and simplify mem_init() Applying: mm/unicore32: prepare for removing num_physpages and simplify mem= _init() Applying: mm/x86: prepare for removing num_physpages and simplify mem_init() Applying: mm/xtensa: prepare for removing num_physpages and simplify mem_in= it() Applying: mm: kill global variable num_physpages Applying: mm: introduce helper function set_max_mapnr() Applying: mm/AVR32: prepare for killing free_all_bootmem_node() Applying: mm/IA64: prepare for killing free_all_bootmem_node() Applying: mm/m32r: prepare for killing free_all_bootmem_node() Applying: mm/m68k: prepare for killing free_all_bootmem_node() Applying: mm/metag: prepare for killing free_all_bootmem_node() Applying: mm/MIPS: prepare for killing free_all_bootmem_node() Applying: mm/PARISC: prepare for killing free_all_bootmem_node() Applying: mm/PPC: prepare for killing free_all_bootmem_node() Applying: mm/SH: prepare for killing free_all_bootmem_node() Applying: mm: kill free_all_bootmem_node() Applying: mm/alpha: unify mem_init() for both UMA and NUMA architectures Applying: mm/m68k: fix build warning of unused variable Applying: mm/ALPHA: clean up unused VALID_PAGE() Applying: mm/ARM: fix stale comment about VALID_PAGE() Applying: mm/CRIS: clean up unused VALID_PAGE() Applying: mm/microblaze: clean up unused VALID_PAGE() Applying: mm/unicore32: fix stale comment about VALID_PAGE() Applying: sparsemem: add BUILD_BUG_ON when sizeof mem_section is non-power-= of-2 Applying: documentation: update address_space_operations Applying: documentation: document the is_dirty_writeback aops callback Applying: mm: tlb_fast_mode check missing in tlb_finish_mmu() Applying: fs/fs-writeback.c: : make wb_do_writeback() as static Applying: mm, vmalloc: only call setup_vmalloc_vm() only in __get_vm_area_n= ode() Applying: mm, vmalloc: call setup_vmalloc_vm() instead of insert_vmalloc_vm= () Applying: mm, vmalloc: remove insert_vmalloc_vm() Applying: mm, vmalloc: use clamp() to simplify code Applying: memcg: debugging facility to access dangling memcgs Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix Applying: mm: memcontrol: factor out reclaim iterator loading and updating Applying: fs: bump inode and dentry counters to long Applying: super: fix calculation of shrinkable objects for small numbers Applying: dcache: convert dentry_stat.nr_unused to per-cpu counters Applying: dentry: move to per-sb LRU locks Applying: dcache: remove dentries from LRU before putting on dispose list Applying: dcache-remove-dentries-from-lru-before-putting-on-dispose-list-fix Applying: mm: new shrinker API Applying: shrinker: convert superblock shrinkers to new API Applying: list: add a new LRU list type Applying: inode: convert inode lru list to generic lru list code Applying: dcache: convert to use new lru list infrastructure Applying: list_lru: per-node list infrastructure Applying: shrinker: add node awareness Applying: vmscan: per-node deferred work Applying: list_lru: per-node API Applying: fs: convert inode and dentry shrinking to be node aware Applying: xfs: convert buftarg LRU to generic code Applying: xfs: rework buffer dispose list tracking Applying: xfs: convert dquot cache lru to list_lru Applying: fs: convert fs shrinkers to new scan/count API Applying: drivers: convert shrinkers to new count/scan API Applying: i915: bail out earlier when shrinker cannot acquire mutex Applying: shrinker: convert remaining shrinkers to count/scan API Applying: hugepage: convert huge zero page shrinker to new shrinker API Applying: shrinker: Kill old ->shrink API Applying: vmscan: also shrink slab in memcg pressure Applying: memcg,list_lru: duplicate LRUs upon kmemcg creation Applying: lru: add an element to a memcg list Applying: list_lru: per-memcg walks Applying: memcg: per-memcg kmem shrinking Applying: memcg: scan cache objects hierarchically Applying: vmscan: take at least one pass with shrinkers Applying: super: targeted memcg reclaim Applying: memcg: move initialization to memcg creation Applying: vmpressure: in-kernel notifications Applying: memcg: reap dead memcgs upon global memory pressure 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: mm: add vm event counters for balloon pages compaction Applying: arch/frv/kernel/traps.c: using vsnprintf() instead of vsprintf() Applying: arch/frv/kernel/setup.c: use strncmp() instead of memcmp() Applying: err.h: IS_ERR() can accept __user pointers Applying: clean up scary strncpy(dst, src, strlen(src)) uses Applying: clean-up-scary-strncpydst-src-strlensrc-uses-fix 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: kernel/sys.c: sys_reboot(): fix malformed panic message Applying: smp: Give WARN()ing when calling smp_call_function_many()/single(= ) in serving irq Applying: drivers/misc/sgi-gru/grufault.c: fix a sanity test in gru_set_con= text_option() Applying: MAINTAINERS: fix tape driver file mappings 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: backlight: add devm_backlight_device_{register,unregister}() Applying: lcd: add devm_lcd_device_{register,unregister}() Applying: MAINTAINERS: add Backlight subsystem co-maintainer Applying: backlight: convert from legacy pm ops to dev_pm_ops Applying: rbtree: remove unneeded include Applying: rbtree-remove-unneeded-include-fix Applying: checkpatch: change CamelCase test and make it --strict Applying: checkpatch: warn when using gcc's binary constant ("0b") extension Applying: checkpatch: add --strict preference for p =3D kmalloc(sizeof(*p).= .. Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting Applying: init: remove permanent string buffer from do_one_initcall() Applying: insert missing space in printk line of root_delay Applying: kprobes: handle empty/invalid input to debugfs "enabled" file 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: drivers/rtc/rtc-rv3029c2.c: fix disabling AIE irq Applying: drivers/rtc/rtc-m48t86.c: remove empty function Applying: drivers/rtc/rtc-tile.c: remove empty function Applying: drivers/rtc/rtc-nuc900.c: remove empty function Applying: drivers/rtc/rtc-msm6242.c: remove empty function Applying: drivers/rtc/rtc-max8998.c: remove empty function Applying: drivers/rtc/rtc-max8925.c: remove empty function Applying: drivers/rtc/rtc-ls1x.c: remove empty function Applying: drivers/rtc/rtc-lp8788.c: remove empty function Applying: drivers/rtc/rtc-ds1302.c: remove empty function Applying: drivers/rtc/rtc-dm355evm.c: remove empty function Applying: drivers/rtc/rtc-da9055.c: remove empty function Applying: drivers/rtc/rtc-da9052.c: remove empty function Applying: drivers/rtc/rtc-bq4802.c: remove empty function Applying: drivers/rtc/rtc-au1xxx.c: remove empty function Applying: drivers/rtc/rtc-ab3100.c: remove empty function Applying: rtc: rtc-hid-sensor-time: allow full years (16bit) in HID reports Applying: rtc: rtc-hid-sensor-time: allow 16 and 32 bit values for all attr= ibutes. Applying: rtc: rtc-hid-sensor-time: add option hctosys to set time at boot Applying: rtc: rtc-hid-sensor-time: add support for milliseconds Applying: rtc: add ability to push out an existing wakealarm using sysfs Applying: drivers/rtc/rtc-vr41xx.c: fix error return code in rtc_probe() Applying: rtc: rtc-ds1307: use devm_*() functions Applying: rtc: rtc-jz4740: use devm_*() functions Applying: rtc: rtc-mpc5121: use devm_*() functions Applying: rtc: rtc-m48t59: use devm_*() functions Applying: rtc: rtc-pm8xxx: use devm_*() functions Applying: rtc: rtc-pxa: use devm_*() functions Applying: rtc: rtc-rx8025: use devm_*() functions Applying: rtc: rtc-sh: use devm_*() functions Applying: rtc: rtc-coh901331: use platform_{get,set}_drvdata() Applying: rtc: rtc-rc5t583: use platform_{get,set}_drvdata() Applying: drivers/rtc/rtc-bq32k.c: remove empty function Applying: drivers/rtc/rtc-ds1216.c: remove empty function Applying: drivers/rtc/rtc-ds1286.c: remove empty function Applying: drivers/rtc/rtc-ds1672.c: remove empty function Applying: drivers/rtc/rtc-ds3234.c: remove empty function Applying: drivers/rtc/rtc-ds1390.c: remove empty function Applying: drivers/rtc/rtc-efi.c: remove empty function Applying: drivers/rtc/rtc-em3027.c: remove empty function Applying: drivers/rtc/rtc-fm3130.c: remove empty function Applying: drivers/rtc/rtc-isl12022.c: remove empty function Applying: drivers/rtc/rtc-m41t93.c: remove empty function Applying: drivers/rtc/rtc-m48t35.c: remove empty function Applying: drivers/rtc/rtc-generic.c: remove empty function Applying: drivers/rtc/rtc-m41t94.c: remove empty function Applying: drivers/rtc/rtc-max6902.c: remove empty function Applying: drivers/rtc/rtc-max6900.c: remove empty function Applying: drivers/rtc/rtc-max8907.c: remove empty function Applying: drivers/rtc/rtc-max77686.c: remove empty function Applying: drivers/rtc/rtc-max8997.c: remove empty function Applying: drivers/rtc/rtc-pcf8523.c: remove empty function Applying: drivers/rtc/rtc-pcf8563.c: remove empty function Applying: drivers/rtc/rtc-pcf8583.c: remove empty function Applying: drivers/rtc/rtc-ps3.c: remove empty function Applying: drivers/rtc/rtc-rs5c313.c: remove empty function Applying: drivers/rtc/rtc-rv3029c2.c: remove empty function Applying: drivers/rtc/rtc-rx4581.c: remove empty function Applying: drivers/rtc/rtc-rs5c348.c: remove empty function Applying: drivers/rtc/rtc-rx8581.c: remove empty function Applying: drivers/rtc/rtc-snvs.c: remove empty function Applying: drivers/rtc/rtc-starfire.c: remove empty function Applying: drivers/rtc/rtc-sun4v.c: remove empty function Applying: drivers/rtc/rtc-tps80031.c: remove empty function Applying: drivers/rtc/rtc-wm831x.c: remove empty function Applying: drivers/mfd/ab8500-core.c: add device for new rtc version on ab85= 40 cut2 Applying: drivers/rtc/rtc-ab8500.c: add second resolution to rtc driver Applying: drivers/rtc/rtc-ds1302.c: handle write protection Applying: drivers/rtc/rtc-mpc5121.c: use platform_{get,set}_drvdata() Applying: drivers/rtc/rtc-da9052.c: use PTR_RET() Applying: drivers/rtc/rtc-isl12022.c: use PTR_RET() Applying: drivers/rtc/rtc-m48t35.c: use PTR_RET() Applying: drivers/rtc/rtc-pcf8563.c: use PTR_RET() Applying: drivers/rtc/rtc-pcf8583.c: use PTR_RET() Applying: drivers/rtc/class: convert from Legacy pm ops to dev_pm_ops Applying: drivers/rtc/rtc-twl.c: ensure IRQ is wakeup enabled Applying: drivers/rtc/rtc-cmos.c: work around bios clearing rtc control Applying: minix: bug widening a binary "not" operation Applying: nilfs2: implement calculation of free inodes count Applying: ] nilfs2: use atomic64_t type for inodes_count and blocks_count f= ields in nilfs_root struct Applying: fs/fat: use fat_msg() to replace printk() in __fat_fs_error() Applying: fat: additions to support fat_fallocate Applying: fat-additions-to-support-fat_fallocate-fix Applying: Documentation/CodingStyle: allow multiple return statements per f= unction Applying: ptrace/x86: revert "hw_breakpoints: Fix racy access to ptrace bre= akpoints" Applying: ptrace/powerpc: revert "hw_breakpoints: Fix racy access to ptrace= breakpoints" Applying: ptrace/arm: revert "hw_breakpoints: Fix racy access to ptrace bre= akpoints" Applying: ptrace/sh: revert "hw_breakpoints: Fix racy access to ptrace brea= kpoints" Applying: ptrace: revert "Prepare to fix racy accesses on task breakpoints" Applying: ptrace/x86: simplify the "disable" logic in ptrace_write_dr7() Applying: ptrace/x86: dont delay "disable" till second pass in ptrace_write= _dr7() Applying: ptrace/x86: introduce ptrace_register_breakpoint() Applying: ptrace/x86: ptrace_write_dr7() should create bp if !disabled Applying: ptrace/x86: cleanup ptrace_set_debugreg() Applying: ptrace: PTRACE_DETACH should do flush_ptrace_hw_breakpoint(child) Applying: ptrace/x86: flush_ptrace_hw_breakpoint() shoule clear the virtual= debug registers Applying: x86: kill TIF_DEBUG Applying: ptrace: add ability to get/set signal-blocked mask Applying: ptrace-add-ability-to-get-set-signal-blocked-mask-fix Applying: usermodehelper: kill the sub_info->path[0] check Applying: coredump: format_corename() can leak cn->corename Applying: coredump: introduce cn_vprintf() Applying: coredump: cn_vprintf() has no reason to call vsnprintf() twice Applying: coredump: kill cn_escape(), introduce cn_esc_printf() Applying: coredump: kill call_count, add core_name_size Applying: coredump: '% at the end' shouldn't bypass core_uses_pid logic Applying: coredump: avoid the uninitialized cn->corename if core_pattern is= empty Applying: fork: reorder permissions when violating number of processes limi= ts Applying: fs/exec.c: do_execve_common(): use current_user() Applying: /dev/oldmem: Remove the interface Applying: dev-oldmem-remove-the-interface-fix Applying: Documentation/kdump/kdump.txt: remove /dev/oldmem description Applying: mips: remove savemaxmem parameter setup Applying: powerpc: Remove savemaxmem parameter setup Applying: ia64: remove setting for saved_max_pfn Applying: s390: remove setting for saved_max_pfn Applying: idr: print a stack dump after ida_remove warning Applying: idr-print-a-stack-dump-after-ida_remove-warning-fix Applying: ipc/shmc.c: eliminate ugly 80-col tricks Applying: ipc: move rcu lock out of ipc_addid Applying: ipc: introduce ipc object locking helpers Applying: ipc: close open coded spin lock calls Applying: ipc: move locking out of ipcctl_pre_down_nolock Applying: ipc,msg: shorten critical region in msgctl_down Applying: ipc,msg: introduce msgctl_nolock Applying: ipc,msg: introduce lockless functions to obtain the ipc object Applying: ipc,msg: make msgctl_nolock lockless Applying: ipc,msg: shorten critical region in msgsnd Applying: ipc,msg: shorten critical region in msgrcv Applying: ipc: remove unused functions Applying: ipc/sem: seperate wait-for-zero and alter tasks into seperate que= ues Applying: ipc/sem.c: Always use only one queue for alter operations. Applying: ipc/sem.c: rename try_atomic_semop() to perform_atomic_semop(), d= ocu update Applying: mwave: fix info leak in mwave_ioctl() Applying: partitions/msdos.c: end-of-line whitespace and semicolon cleanup Applying: partitions: add aix lvm partition support files Applying: partitions-add-aix-lvm-partition-support-files-v2 Applying: partitions-add-aix-lvm-partition-support-files-checkpatch-fixes Applying: partitions-add-aix-lvm-partition-support-files: compile aix.c if = configured Applying: partitions-add-aix-lvm-partition-support-files: add the AIX_PARTI= TION entry Applying: partitions/msdos: enumerate also AIX LVM partitions Applying: rapidio/switches: remove tsi500 driver Applying: drivers/parport/share.c: use kzalloc Applying: drivers/pps/clients/pps-gpio.c: convert to devm_* helpers Applying: drivers/pps/clients/pps-gpio.c: convert to module_platform_driver Applying: pps-gpio: add device-tree binding and support Applying: drivers/memstick/host/jmb38x_ms: convert to module_pci_driver Applying: drivers/memstick/host/r592.c: convert to module_pci_driver 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: kernel/resource.c: remove the unneeded assignment in function __f= ind_resource 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 Merging akpm/master (67d4b52 scripts/sortextable.c: fix building on non-Lin= ux systems) [master 1cd52fd] Revert "drivers/rtc/class: convert from Legacy pm ops to d= ev_pm_ops" Applying: lru: memcontrol.h does not need mm.h [master 68ad92f] Revert "mm: remove duplicated call to get_pfn_range_for_ni= d()" --Signature=_Thu__6_Jun_2013_17_44_33_+1000_cPM.xQ1PZ4EWAj8r Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQIcBAEBCAAGBQJRsD3hAAoJEECxmPOUX5FETTwP/iXHUcpL+57Fp46YdNfynF68 aKx5MRd4XPOzeCHlgoYDckkG2MRaWJrmD2LteLDjkIMD97ByMw1QZNuzuTqJb2Id 8OLuCzMeQAKN0ISuSSbsorajGLzz8hunrWjXNbziQZO2Yg7QZeXesdE3g9FRprvH 15z8YD1YB48Ghl5Z7HvhZ2NOkFBRMnqdnMkV8H46NOydXgfkKobXV32gfQ/Ac8O3 b+Kl1kHOoNvia1tMMcNLFTJ3UTjA+sjAdDMQswRXzVsfuOCKVzhEqmlNw3PeclGA QPml3KYDCG+/0ICOU/RIzAssLZpJjnk/c8T5NTN9Gl+L4ERD1wK4/Exp7veDUJO6 UwfYprApRtS5ZpL1o0Ruujaqbuuhrf++ZX/ukiCjDT+J8IEz6+Jc8jatSTCqlQTH ixGYvhst9gJL34ZDra3boAjBV11dg+M89e/YZQK7o7sL97B4/kExACrdG1pNMtq/ /NiwN9xnOBFbAnUHrewYUavw9Ru/VuiNAAtLxUlXIGRx+0VZJ6d7pTX+Jp2OEQ7p AhrgHEXYkfdf61K9InBwadwc8jIkaFs3wKQVjBhU2oExmTpv3i/iLcjm6TDgMugE eYU17Su8uLvlfZUs0rN/8Yjj59vMoqXduxGUyV5OptmoR+5PNtY3cE5wZ1665oJC zoDiAmbp9EiFIcn+FG9Q =a5qC -----END PGP SIGNATURE----- --Signature=_Thu__6_Jun_2013_17_44_33_+1000_cPM.xQ1PZ4EWAj8r--