Hi all,
Changes since 20130702:
The powerpc tree lost its build failure.
The device-mapper tree gained a conflict against the md tree.
The net-next tree gained a build failure for which I cherry-picked an
upcoming fix.
The trivial tree gained conflicts against the btrfs and Linus' trees.
The xen-two tree gained a conflict against the tip tree.
The akpm tree lost some patches that turned up elsewhere.
The cpuinit tree lost a patch that turned up elsewhere.
----------------------------------------------------------------------------
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 228 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.
--
Cheers,
Stephen Rothwell [email protected]
$ git checkout master
$ git reset --hard stable
Merging origin/master (7c6809f Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging fixes/master (8177a9d lseek(fd, n, SEEK_END) does *not* go to eof - n)
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 (baadb8f ARC: warn on improper stack unwind FDE entries)
Merging arm-current/fixes (3e0a07f ARM: 7773/1: PJ4B: Add support for errata 4742)
Merging m68k-current/for-linus (767bcb4 Merge branch 'exotic-arch-fixes' into for-next)
Merging powerpc-merge/merge (ea461ab powerpc/eeh: Fix fetching bus for single-dev-PE)
Merging sparc/master (c069114 mn10300: Fix include dependency in irqflags.h et al.)
Merging net/master (8bb495e Linux 3.10)
Merging ipsec/master (01cb71d net_sched: restore "overhead xxx" handling)
Merging sound-current/for-linus (05843c0 ALSA: hda - Add Dell SSID to support Headset Mic recording)
Merging pci-current/for-linus (65694c5 x86/PCI: Map PCI setup data with ioremap() so it can be in highmem)
Merging wireless/master (57bf744 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
Merging driver-core.current/driver-core-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
Merging tty.current/tty-linus (9e895ac Linux 3.10-rc7)
Merging usb.current/usb-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
Merging staging.current/staging-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
Merging char-misc.current/char-misc-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
Merging input-current/for-linus (27eb2c4 Merge branch 'next' into for-linus)
Merging md-current/for-linus (78eaa0d md/raid10: fix two bugs affecting RAID10 reshape.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (939e177 crypto: algboss - Hold ref count on larval)
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 (d94ea3f irqchip: Return -EPERM for reserved IRQs)
Merging devicetree-current/devicetree/merge (706b78f dtc: ensure #line directives don't consume data from the next line)
Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error)
Merging gpio-current/gpio/merge (397eada gpio/omap: don't use linear domain mapping for OMAP1)
Merging rr-fixes/fixes (6407d75 virtio_console: fix uapi header)
Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata)
Merging vfio-fixes/for-linus (7d13205 Linux 3.10-rc6)
Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (723e2b8 ARC: [TB10x] Updates for irqchip driver)
Merging arm/for-next (df56077 Merge branch 'devel-stable' into for-next)
CONFLICT (content): Merge conflict in arch/arm/include/asm/glue-proc.h
Merging arm-perf/for-next/perf (642bd4e perf: ARM: Record the user-mode PC in the call chain.)
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 (add/add): Merge conflict in drivers/clocksource/cadence_ttc_timer.c
CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
CONFLICT (add/add): Merge conflict in arch/arm/mach-zynq/slcr.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-zynq/platsmp.c
CONFLICT (content): Merge conflict in arch/arm/mach-zynq/common.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
CONFLICT (content): Merge conflict in arch/arm/boot/dts/zynq-zc702.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/zynq-7000.dtsi
Merging arm64/upstream (aa729dc Merge branch 'for-next/hugepages' of git://git.linaro.org/people/stevecapper/linux into upstream-hugepages)
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
Merging blackfin/blackfin-linus (5ae89ee bfin cache: dcplb map: add 16M dcplb map for BF60x)
Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore)
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 (27d7181 Merge branch 'pstore' into next)
Merging m68k/for-next (767bcb4 Merge branch 'exotic-arch-fixes' into for-next)
Merging m68knommu/for-next (e4aa937 Linux 3.10-rc3)
Merging metag/for-next (04b8b49 metag: move EXPORT_SYMBOLs in libs to metag_ksyms.c)
Merging microblaze/next (c421cee microblaze: Enable KGDB in defconfig)
Merging mips/mips-for-linux-next (075a8d5 Merge branch '3.10-fixes' into mips-for-linux-next)
Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS)
Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging parisc-hd/for-next (c069114 mn10300: Fix include dependency in irqflags.h et al.)
Merging powerpc/next (1d8b368 pstore: Add hsize argument in write_buf call of pstore_ftrace_call)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (dd0120d powerpc/mpc512x: enable USB support in defconfig)
Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
Merging s390/features (5ea34a0 s390/dasd: Fail all requests when DASD_FLAG_ABORTIO is set)
Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux)
Merging tile/master (317ddd2 Linux 3.10-rc5)
Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (72b4a6b xtensa: ccount based sched_clock)
Merging btrfs/next (cbacd76 Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into next)
Merging ceph/master (bf09339 ceph: Reconstruct the func ceph_reserve_caps.)
Merging cifs/for-next (7ac0feb cifs: fill TRANS2_QUERY_FILE_INFO ByteCount fields)
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 (0df5ed6 eCryptfs: Make extent and scatterlist crypt function parameters similar)
Merging ext3/for_next (7ea2177 quota: Convert use of typedef ctl_table to struct ctl_table)
Merging ext4/dev (6ae06ff ext4: optimize starting extent in ext4_ext_rm_leaf())
Merging f2fs/dev (42daabf Merge tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging fscache/fscache (bcd7351 Merge tag 'fscache-20130702' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs)
Merging fuse/for-next (e5c5f05 fuse: fix alignment in short read optimization for async_dio)
Merging gfs2/master (a01aedf GFS2: Reserve journal space for quota change in do_grow)
Merging jfs/jfs-next (eb8630d jfs: Update jfs_error)
Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (959d921 Merge branch 'labeled-nfs' into linux-next)
Merging nfsd/nfsd-next (0bebc63 sunrpc: Don't schedule an upcall on a replaced cache entry.)
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 (59b3e32 fs/9p: Remove the unused variable "err" in v9fs_vfs_getattr())
Merging ubifs/linux-next (c1be5a5 Linux 3.9)
Merging xfs/for-next (83e782e xfs: Remove incore use of XFS_OQUOTA_ENFD and XFS_OQUOTA_CHKD)
CONFLICT (content): Merge conflict in fs/xfs/xfs_log_recover.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_log_cil.c
Merging vfs/for-next (d405be4 ext4: ->tmpfile() support)
Merging pci/next (a0f75f9 Merge branch 'pci/misc' into next)
CONFLICT (content): Merge conflict in include/linux/aer.h
CONFLICT (content): Merge conflict in drivers/pci/probe.c
CONFLICT (content): Merge conflict in drivers/acpi/pci_root.c
CONFLICT (content): Merge conflict in arch/ia64/sn/kernel/io_init.c
Merging hid/for-next (1e974b6 HID: wacom: Intuos4 battery charging changes)
Merging i2c/i2c/for-next (e0b9b7b i2c: Kontron PLD i2c bus driver)
Merging jdelvare-hwmon/master (1aaf6d3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging hwmon-staging/hwmon-next (a50d9a4 hwmon: (ds1621) Fix temperature rounding operations)
Merging v4l-dvb/master (17a6961 Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (8641c8f Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
Merging libata/for-next (930ed52 Merge branch 'for-3.11' into for-next)
Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block)
Merging pm/linux-next (dab9b86 cpufreq: Fix serialization of frequency transitions)
CONFLICT (content): Merge conflict in kernel/futex.c
CONFLICT (content): Merge conflict in include/linux/device.h
CONFLICT (content): Merge conflict in drivers/base/memory.c
CONFLICT (content): Merge conflict in drivers/base/cpu.c
CONFLICT (content): Merge conflict in MAINTAINERS
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 fixes-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 (9d1968f Merge branch 'cpu-package-thermal' of .git into next)
CONFLICT (content): Merge conflict in drivers/thermal/ti-soc-thermal/ti-thermal-common.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt
Merging ieee1394/for-next (bcabcfd firewire: remove support of fw_driver.driver.probe and .remove methods)
Merging ubi/linux-next (83ff59a UBI: support ubi_num on mtd.ubi command line)
Merging dlm/next (cfa805f dlm: Avoid LVB truncation)
Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
Merging slave-dma/next (469fd0d DMA: shdma: add DT support)
Merging dmaengine/next (41ef2d5 Linux 3.9-rc7)
Merging net-next/master (23a3647 ip_tunnels: Use skb-len to PMTU check.)
CONFLICT (content): Merge conflict in fs/select.c
CONFLICT (content): Merge conflict in drivers/staging/silicom/bpctl_mod.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/renesas/sh_eth.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec_main.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7778.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7740.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-mxs.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun4i-a10.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/am335x-evmsk.dts
Merging ipsec-next/master (0289094 af_key: constify lookup tables)
Merging wireless-next/master (0f817ed ath10k: minimally handle new channel width enumeration values)
Merging bluetooth/master (2237c82 Bluetooth: Add support for Atheros [0cf3:e003])
Merging infiniband/for-next (669d6a2 Merge branches 'af_ib', 'cxgb4', 'misc', 'ocrdma', 'qib' and 'srp' into for-next)
Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd)
Merging l2-mtd/master (fb1585b mtd: nand: omap2: clean-up BCHx_HW and BCHx_SW ECC configurations in device_probe)
Merging crypto/master (02c0241 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto)
Merging drm/drm-next (77ef8bb drm: make drm_mm_init() return void)
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_vm.c
Merging drm-intel/for-linux-next (446f8d8 drm/i915: Don't try to tear down the stolen drm_mm if it's not there)
Merging drm-tegra/drm/for-next (ebae30b gpu: host1x: Rework CPU syncpoint increment)
Merging sound/for-next (066624c ALSA: usb-audio: Add Audio Advantage Micro II)
Merging sound-asoc/for-next (8762849 Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus)
Merging modules/modules-next (54041d8 modules: don't fail to load on unknown parameters.)
Merging virtio/virtio-next (0d69a65 tools/lguest: real barriers.)
Merging input/next (67bf12c Input: cyttsp4 - SPI driver for Cypress TMA4XX touchscreen devices)
Merging input-mt/for-next (257867d Input: MT - Specify that ABS_MT_SLOT must have a minimum of 0)
Merging cgroup/for-next (9109d44 Merge branch 'for-3.11' into for-next)
Merging block/for-next (442ee57 Merge branch 'for-3.11/drivers' into for-next)
CONFLICT (content): Merge conflict in include/linux/cgroup.h
Merging device-mapper/master (09d88ee dm-switch is a new target that maps IO to underlying block devices efficiently when there are a large number of fixed-sized address regions but there is no simple pattern to allow for a compact mapping representation such as dm-stripe.)
CONFLICT (content): Merge conflict in drivers/md/dm-raid.c
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
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 (058f426 mmc: sdhci-pci: add another device id)
Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command)
Merging slab/for-next (c55d728 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (6dbe51c Linux 3.9-rc1)
Merging md/for-next (6d670f0 raid5: make release_stripe lockless)
Merging mfd/master (25f311f mfd: sec: Provide max_register to regmap)
CONFLICT (content): Merge conflict in include/linux/mfd/davinci_voicecodec.h
CONFLICT (modify/delete): arch/arm/mach-exynos/mach-universal_c210.c deleted in HEAD and modified in mfd/master. Version mfd/master of arch/arm/mach-exynos/mach-universal_c210.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/boot/dts/am33xx.dtsi
$ git rm -f arch/arm/mach-exynos/mach-universal_c210.c
Merging battery/master (5a6c220 charger-manager: Fix regulator_get() return check)
Merging fbdev/for-next (19fd744 Merge tag 'fbdev-3.11-2' of git://gitorious.org/linux-omap-dss2/linux into fbdev/for-next)
CONFLICT (content): Merge conflict in drivers/video/of_display_timing.c
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning)
Merging regulator/for-next (70083c4 Merge remote-tracking branch 'regulator/topic/tps62360' into regulator-next)
Merging security/next (572e5b0 tpm/tpm_i2c_infineon: Remove unused header file)
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
Merging lblnet/master (5bfd379 selinux: remove the BUG_ON() from selinux_skb_xfrm_sid())
Merging watchdog/master (5a94250 Watchdog: fix clearing of the watchdog interrupt)
Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
Merging iommu/next (01ce784 Merge branches 'x86/vt-d', 'arm/omap', 'core', 'x86/amd' and 'arm/smmu' into next)
CONFLICT (content): Merge conflict in drivers/iommu/Kconfig
Merging vfio/next (8d38ef1 vfio/type1: Fix leak on error path)
Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (83a35e3 treewide: relase -> release)
CONFLICT (content): Merge conflict in kernel/irq/generic-chip.c
CONFLICT (content): Merge conflict in fs/btrfs/free-space-cache.c
CONFLICT (content): Merge conflict in drivers/video/omap2/displays/panel-n8x0.c
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 prescence of IMC_DDRIO device)
Merging edac-amd/for-next (aad19e5 EDAC, MCE, AMD: Add an MCE signature for new Fam15h models)
Merging devicetree/devicetree/next (ba166e9 of: remove CONFIG_OF_DEVICE)
CONFLICT (content): Merge conflict in include/linux/platform_device.h
CONFLICT (content): Merge conflict in drivers/usb/chipidea/Makefile
Merging dt-rh/for-next (d683b96 Linux 3.10-rc4)
Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration)
Merging spi-mb/for-next (ed89355 Merge remote-tracking branch 'spi/topic/xilinx' into spi-next)
Merging tip/auto-latest (6bc8853 Merge branch 'x86/uv')
CONFLICT (content): Merge conflict in drivers/clocksource/dw_apb_timer_of.c
CONFLICT (content): Merge conflict in arch/arm/mach-u300/timer.c
CONFLICT (content): Merge conflict in arch/arm/mach-integrator/integrator_ap.c
CONFLICT (content): Merge conflict in arch/arm/kernel/Makefile
Merging ftrace/for-next (7b85af6 tracing: Get trace_array ref counts when accessing trace files)
Merging rcu/rcu/next (be77f87 Merge branches 'cbnum.2013.06.10a', 'doc.2013.06.10a', 'fixes.2013.06.10a', 'srcu.2013.06.10a' and 'tiny.2013.06.10a' into HEAD)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (a3ff5fb KVM: PPC: Ignore PIR writes)
CONFLICT (content): Merge conflict in arch/s390/include/asm/pgtable.h
Merging kvm-arm/kvm-arm-next (8bd4ffd ARM: kvm: don't include drivers/virtio/Kconfig)
Merging kvm-ppc/kvm-ppc-next (a3ff5fb KVM: PPC: Ignore PIR writes)
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 (21f3c04 Merge branch 'stable/for-linus-3.11' into linux-next)
CONFLICT (content): Merge conflict in arch/x86/xen/time.c
Merging xen-arm/linux-next (cc611b5 xen/arm and xen/arm64: implement HYPERVISOR_tmem_op)
Merging percpu/for-next (a424445 percpu-refcount: use RCU-sched insted of normal RCU)
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 Ideapad Z580)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (7bc8c4c Merge remote-tracking branch 'regmap/topic/field' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (cf3b1c2 leds: mc13783: Fix "uninitialized variable" warning)
Merging driver-core/driver-core-next (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
Merging tty/tty-next (828c6a1 Revert "serial: 8250_pci: add support for another kind of NetMos Technology PCI 9835 Multi-I/O Controller")
Merging usb/usb-next (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
Merging usb-gadget/next (b1fd6cb usb: dwc3: omap: Adds dwc3_omap_readl/writel wrappers)
Merging staging/staging-next (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
Merging char-misc/char-misc-next (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
Merging scsi/for-next (082af1e Merge branch 'misc' into for-next)
Merging target-updates/for-next (46c8d77 iser-target: Add vendor_err debug output)
Merging target-merge/for-next-merge (317ddd2 Linux 3.10-rc5)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6734092 isci: add a couple __iomem annotations)
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 (5b81d55 pinctrl: remove bindings for pinconf options needing more thought)
CONFLICT (content): Merge conflict in drivers/pinctrl/Makefile
CONFLICT (content): Merge conflict in drivers/net/ethernet/ti/davinci_mdio.c
Merging vhost/linux-next (f722406 Linux 3.10-rc1)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO)
Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO)
Merging irqdomain/irqdomain/next (798f0fd irq: fix checkpatch error)
CONFLICT (content): Merge conflict in kernel/irq/irqdomain.c
Merging gpio/gpio/next (644c8df gpio: sx150x: convert to use devm_* functions)
Merging gpio-lw/for-next (69acf2e Merge branch 'merge' into for-next)
Merging arm-soc/for-next (1b487ce Merge branch 'fixes' into for-next)
Merging bcm2835/for-next (7d13205 Linux 3.10-rc6)
Merging cortex/for-next (3ad87ac ARM: ARMv7-M: Fix name of NVIC handler function)
Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (0fe2ea9 Merge branches 'mxs/dt', 'imx/weim', 'imx/soc', 'imx/fixes' and 'imx/dt' into for-next)
Merging ixp4xx/next (19f949f Linux 3.8)
Merging msm/for-next (d701eda ARM: dts: msm: Fix merge resolution)
Merging mvebu/for-next (04864c6 Merge branch 'mvebu/regmap' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/kirkwood-6281.dtsi
Merging renesas/next (38f4c6a Merge branch 'heads/phy-rcar-usb' into next)
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/r8a7778.h
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7778.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig
Merging samsung/for-next (65ef7e0 Merge tag 'soc-exynos5420-2' into for-next)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging tegra/for-next (7d13205 Linux 3.10-rc6)
Merging dma-mapping/dma-mapping-next (1e3d09b ARM: dma: Drop __GFP_COMP for iommu dma memory allocations)
Merging pwm/for-next (b388f15 pwm: pwm-tiehrpwm: Use clk_enable/disable instead clk_prepare/unprepare.)
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 filesystem)
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.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging clk/clk-next (45e3ec3 clk: tegra: fix ifdef for tegra_periph_reset_assert inline)
CONFLICT (content): Merge conflict in drivers/clk/tegra/clk-tegra114.c
Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock)
Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging arm64-hugepages/for-next/hugepages (af07484 ARM64: mm: THP support.)
Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
Merging akpm-current/current (dd55271 drivers/dma/pl330.c: fix locking in pl330_free_chan_resources())
$ git checkout -b akpm remotes/origin/akpm/master
Applying: slab: fix init_lock_keys
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=' option to work for efi platform
Applying: audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record
Applying: kernel/auditfilter.c: fixing build warning
Applying: kernel/auditfilter.c: fix leak in audit_add_rule() error path
Applying: audit: Fix decimal constant description
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/video/acornfb.c: remove dead code
Applying: cyber2000fb: avoid palette corruption at higher clocks
Applying: fanotify: info leak in copy_event_to_user()
Applying: fanotify: fix races when adding/removing marks
Applying: fanotify: put duplicate code for adding vfsmount/inode marks into an own function
Applying: dnotify: replace dnotify_mark_mutex with mark mutex of dnotify_group
Applying: inotify: fix race when adding a new watch
Applying: fsnotify: update comments concerning locking scheme
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: include/linux/interrupt.h: add dummy irq_set_irq_wake() for "!GENERIC_HARDIRQS"
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_timer_schedule()
Applying: posix_timers: fix racy timer delta caching on task exit
Applying: hrtimer: one more expiry time overflow check in hrtimer_interrupt
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/mtd/chips/gen_probe.c: refactor call to request_module()
Applying: configfs: use capped length for ->store_attribute()
Applying: drivers/net/ethernet/ibm/ehea/ehea_main.c: add alias entry for portN properties
Applying: mISDN: add support for group membership check
Applying: drivers/atm/he.c: convert to module_pci_driver
Applying: isdn: clean up debug format string usage
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: ocfs2: remove unecessary variable needs_checkpoint
Applying: ocfs2: fix mutex_unlock and possible memory leak in ocfs2_remove_btree_range
Applying: fs/ocfs2/journal.h: add bits_wanted while calculating credits in ocfs2_calc_extend_credits
Applying: fs/ocfs2/cluster/tcp.c: free sc->sc_page in sc_kref_release()
Applying: ocfs2: xattr: remove useless free space checking
Applying: ocfs2-xattr-remove-useless-free-space-checking-fix
Applying: ocfs2: should call ocfs2_journal_access_di() before ocfs2_delete_entry() in ocfs2_orphan_del()
Applying: ocfs2: dlmlock_master() should return DLM_NORMAL after adding lock to blocked list
Applying: ocfs2: need rollback when journal_access failed in ocfs2_orphan_add()
Applying: ocfs2: rework transaction rollback in ocfs2_relink_block_group()
Applying: ocfs2-rework-transaction-rollback-in-ocfs2_relink_block_group-fix
Applying: ocfs2: fix readonly issue in ocfs2_unlink()
Applying: ocfs2-fix-readonly-issue-in-ocfs2_unlink-fix
Applying: ocfs2-fix-readonly-issue-in-ocfs2_unlink-fix-2
Applying: ocfs2: llseek requires ocfs2 inode lock for the file in SEEK_END
Applying: ocfs2: fix issue that ocfs2_setattr() does not deal with new_i_size==i_size
Applying: ocfs2-fix-issue-that-ocfs2_setattr-does-not-deal-with-new_i_size==i_size-v2
Applying: ocfs2: xattr: fix inlined xattr reflink
Applying: ocfs2: submit disk heartbeat bio using WRITE_SYNC
Applying: ocfs2: consolidate o2hb_global_hearbeat_mode_set() naming convention
Applying: ocfs2: fix a comments typo at o2quo_hb_still_up()
Applying: ocfs2: adjust switch_case syntax at o2net_state_change()
Applying: ocfs2-adjust-switch_case-syntax-at-o2net_state_change-fix
Applying: ocfs2: fix NULL pointer dereference when traversing o2hb_all_regions
Applying: include/linux/sched.h: don't use task->pid/tgid in same_thread_group/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: do not pass disk names as format strings
Applying: block: restore /proc/partitions to not display non-partitionable removable devices
Applying: fs/file_table.c:fput(): add comment
Applying: fput: turn "list_head delayed_fput_list" into llist_head
Applying: llist: fix/simplify llist_add() and llist_add_batch()
Applying: llist: llist_add() can use llist_add_batch()
Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
Applying: crypto: sanitize argument for format string
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, 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: non-swapcache pages in end_swap_bio_read()
Applying: mm-remove-compressed-copy-from-zram-in-memory-fix-2-fix
Applying: swap: add a simple detector for inappropriate swapin readahead
Applying: swap: swapin_nr_pages() can be static
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_SHIFT
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 ->high
Applying: mm/page_alloc: insert memory barriers to allow async update of pcp 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 barriers instead of stop_machine()
Applying: mm/page_alloc: when handling percpu_pagelist_fraction, don't unneedly recalulate high
Applying: mm/page_alloc: factor setup_pageset() into pageset_init() and pageset_set_batch()
Applying: mm/page_alloc: relocate comment to be directly above code it refers to.
Applying: mm/page_alloc: factor zone_pageset_init() out of setup_zone_pageset()
Applying: mm/page_alloc: in zone_pcp_update(), uze zone_pageset_init()
Applying: mm/page_alloc: rename setup_pagelist_highmark() to match naming of pageset_set_batch()
Applying: mm/page_alloc: don't re-init pageset in zone_pcp_update()
Applying: mm: vmscan: limit the number of pages kswapd reclaims at each priority
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 encountered, not priority
Applying: mm: vmscan: block kswapd if it is encountering pages under writeback
Applying: mm-vmscan-block-kswapd-if-it-is-encountering-pages-under-writeback-fix
Applying: mm-vmscan-block-kswapd-if-it-is-encountering-pages-under-writeback-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 processed
Applying: mm: vmscan: set zone flags before blocking
Applying: mm: vmscan: move direct reclaim wait_iff_congested into shrink_list
Applying: mm: vmscan: treat pages marked for immediate reclaim as zone congestion
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 size of vmcore objects
Applying: vmcore: support mmap() on /proc/vmcore
Applying: vmcore-support-mmap-on-proc-vmcore-fix
Applying: vmcore: disable mmap_vmcore() if CONFIG_MMU is not defined
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 pagevec drain time
Applying: mm: activate !PageLRU pages on mark_page_accessed if page is on local 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_lru
Applying: mm: Clear page active before releasing pages
Applying: mm/vmscan.c: 'lru' may be used without initialized after the patch "3abf380..." in next-20130607 tree
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() has done
Applying: mm/memory-failure.c: fix memory leak in successful soft offlining
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: mm-tune-vm_committed_as-percpu_counter-batching-size-fix
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 warnings
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->managed_pages
Applying: mm-use-a-dedicated-lock-to-protect-totalram_pages-and-zone-managed_pages-fix
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-correctly-update-zone-managed_pages-fix-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 of slots
Applying: vmlinux.lds: add comments for global variables and clean up useless 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 mem_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_init()
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_init()
Applying: mm/AVR32: prepare for removing num_physpages and simplify mem_init()
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_init()
Applying: mm/hexagon: prepare for removing num_physpages and simplify mem_init()
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_init()
Applying: mm/microblaze: prepare for removing num_physpages and simplify mem_init()
Applying: mm, arch: fix two errors in calling mem_init_print_info()
Applying: mm/MIPS: prepare for removing num_physpages and simplify mem_init()
Applying: mm/mn10300: prepare for removing num_physpages and simplify mem_init()
Applying: mm/openrisc: prepare for removing num_physpages and simplify mem_init()
Applying: mm/PARISC: prepare for removing num_physpages and simplify mem_init()
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_init()
Applying: mm/SH: prepare for removing num_physpages and simplify mem_init()
Applying: mm/SPARC: prepare for removing num_physpages and simplify mem_init()
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_init()
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, vmalloc: only call setup_vmalloc_vm() only in __get_vm_area_node()
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: 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: mm: new shrinker API
Applying: shrinker: convert superblock shrinkers to new API
Applying: shrinker-convert-superblock-shrinkers-to-new-api-fix
Applying: list: add a new LRU list type
Applying: inode: convert inode lru list to generic lru list code.
Applying: inode: move inode to a different list inside lock
Applying: dcache: convert to use new lru list infrastructure
Applying: list_lru: per-node list infrastructure
Applying: list_lru: per-node list infrastructure fix
Applying: list_lru: per-node API
Applying: list_lru: remove special case function list_lru_dispose_all.
Applying: shrinker: add node awareness
Applying: vmscan: per-node deferred work
Applying: fs: convert inode and dentry shrinking to be node aware
Applying: xfs: convert buftarg LRU to generic code
Applying: xfs-convert-buftarg-lru-to-generic-code-fix
Applying: xfs: rework buffer dispose list tracking
Applying: xfs: convert dquot cache lru to list_lru
Applying: xfs-convert-dquot-cache-lru-to-list_lru-fix
Applying: fs: convert fs shrinkers to new scan/count API
Applying: fs-convert-fs-shrinkers-to-new-scan-count-api-fix
Applying: UBIFS: signedness bug in ubifs_shrink_count()
Applying: drivers: convert shrinkers to new count/scan API
Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix
Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix-2
Applying: i915: bail out earlier when shrinker cannot acquire mutex
Applying: shrinker: convert remaining shrinkers to count/scan API
Applying: shrinker-convert-remaining-shrinkers-to-count-scan-api-fix
Applying: hugepage: convert huge zero page shrinker to new shrinker API
Applying: hugepage-convert-huge-zero-page-shrinker-to-new-shrinker-api-fix
Applying: shrinker: Kill old ->shrink API.
Applying: shrinker-kill-old-shrink-api-fix
Applying: list_lru: dynamically adjust node arrays
Applying: super: fix for destroy lrus
Applying: mm: mremap: validate input before taking lock
Applying: memcg: clean up memcg->nodeinfo
Applying: mm: invoke oom-killer from remaining unconverted page fault handlers
Applying: mm: remove duplicated call of get_pfn_range_for_nid
Applying: mm-remove-duplicated-call-of-get_pfn_range_for_nid-v2
Applying: mm-remove-duplicated-call-of-get_pfn_range_for_nid-v2-fix
Applying: mm/vmalloc.c: unbreak __vunmap()
Applying: mm/vmalloc.c: remove dead code in vb_alloc
Applying: mm/vmalloc.c: remove unused purge_fragmented_blocks_thiscpu
Applying: mm/vmalloc.c: remove alloc_map from vmap_block
Applying: mm/vmalloc.c: emit the failure message before return
Applying: mm/vmalloc.c: rename VM_UNLIST to VM_UNINITIALIZED
Applying: mm/vmalloc.c: check VM_UNINITIALIZED flag in s_show instead of show_numa_info
Applying: memcg: also test for skip accounting at the page allocation level
Applying: memcg: do not account memory used for cache creation
Applying: include/linux/gfp.h: fix the comment for GFP_ZONE_TABLE
Applying: zbud: add to mm/
Applying: zswap: init under_reclaim
Applying: zswap: add to mm/
Applying: zswap: fix Kconfig to depend on CRYPTO=y
Applying: zswap: add documentation
Applying: MAINTAINERS: add zswap and zbud maintainer
Applying: mm/page_alloc.c: remove zone_type argument of build_zonelists_node
Applying: mm: remove unused functions is_{normal_idx, normal, dma32, dma}
Applying: mm/page_alloc.c: remove unlikely() from the current_order test
Applying: vfree: don't schedule free_work() if llist_add() returns false
Applying: mm: remove unused __put_page()
Applying: mm/sparse.c: put clear_hwpoisoned_pages within CONFIG_MEMORY_HOTREMOVE
Applying: fs/fs-writeback.c: : make wb_do_writeback() as static
Applying: mm/writeback: remove wb_reason_name
Applying: mm/writeback: don't check force_wait to handle bdi->work_list
Applying: mm/writeback: commit reason of WB_REASON_FORKER_THREAD mismatch name
Applying: mm/page_alloc: fix doc for numa_zonelist_order
Applying: mm/thp: fix doc for transparent huge zero page
Applying: mm/pgtable: don't accumulate addr during pgd prepopulate pmd
Applying: mm: remove unused VM_<READfoo> macros and expand other in-place
Applying: mm/vmalloc.c: fix an overflow bug in alloc_vmap_area()
Applying: page migration: fix wrong comment in address_space_operations.migratepage()
Applying: mm/memblock.c: fix wrong comment in __next_free_mem_range()
Applying: mm/memory_hotplug.c: fix a comment typo in register_page_bootmem_info_node()
Applying: mm: vmscan: do not continue scanning if reclaim was aborted for compaction
Applying: mm: vmscan: do not scale writeback pages when deciding whether to set ZONE_WRITEBACK
Applying: hugetlb: properly account rss
Applying: mmap: allow MAP_HUGETLB for hugetlbfs files v2
Applying: Revert "memcg: avoid dangling reference count in creation failure"
Applying: memcg, kmem: fix reference count handling on the error path
Applying: memcg: use css_get() in sock_update_memcg()
Applying: memcg: don't use mem_cgroup_get() when creating a kmemcg cache
Applying: memcg: use css_get/put when charging/uncharging kmem
Applying: memcg-use-css_get-put-when-charging-uncharging-kmem-fix
Applying: memcg: use css_get/put for swap memcg
Applying: memcg: don't need to get a reference to the parent
Applying: memcg: kill memcg refcnt
Applying: memcg: don't need to free memcg via RCU or workqueue
Applying: include/linux/mmzone.h: cleanups
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: drivers: avoid format string in dev_set_name
Applying: drivers: avoid format strings in names passed to alloc_workqueue()
Applying: drivers: avoid parsing names as kthread_run() format strings
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: kernel/sys.c:do_sysinfo(): use get_monotonic_boottime()
Applying: dmi: add support for exact DMI matches in addition to substring matching
Applying: drm/i915: quirk away phantom LVDS on Intel's D510MO mainboard
Applying: drm/i915: quirk away phantom LVDS on Intel's D525MW mainboard
Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq
Applying: drivers/dma: remove unused support for MEMSET operations
Applying: drivers-dma-remove-unused-support-for-memset-operations-v3
Applying: drivers-dma-remove-unused-support-for-memset-operations-v3-fix
Applying: drivers/misc/sgi-gru/grufault.c: fix a sanity test in gru_set_context_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: backlight: add CONFIG_PM_SLEEP to suspend/resume functions
Applying: radeon: remove redundant __list_for_each definition from mkregtable.c
Applying: ipw2200: convert __list_for_each usage to list_for_each
Applying: list: remove __list_for_each()
Applying: lib/percpu_counter.c: __this_cpu_write() doesn't need to be protected by spinlock
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 = kmalloc(sizeof(*p)...
Applying: checkpatch: remove quote from CamelCase test
Applying: checkpatch: improve network block comment test and message
Applying: checkpatch: warn when networking block comment lines don't start with *
Applying: checkpatch: warn on comparisons to jiffies
Applying: checkpatch: warn on comparisons to get_jiffies_64()
Applying: checkpatch: reduce false positive rate of "complex macros"
Applying: checkpatch: add a placeholder to check blank lines before declarations
Applying: checkpatch: don't warn on blank lines before/after braces as often
Applying: checkpatch: add a --strict test for comparison to true/false
Applying: checkpatch: improve "no space after cast" test
Applying: checkpatch: create an EXPERIMENTAL --fix option to correct patches
Applying: checkpatch: move test for space before semicolon after operator spacing
Applying: checkpatch: ignore SI unit CamelCase variants like "_uV"
Applying: checkpatch: ignore existing CamelCase uses from include/...
Applying: checkpatch: allow longer logging function names
Applying: checkpatch: cache last camelcase hash as .checkpatch-camelcase.<commit>
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 <linux/uaccess.h>
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 <linux/io.h> instead of <asm/io.h>
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 <linux/io.h> instead of <asm/io.h>
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 attributes.
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/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/rtc-twl.c: ensure IRQ is wakeup enabled
Applying: drivers/rtc/rtc-cmos.c: work around bios clearing rtc control
Applying: drivers/rtc/rtc-twl.c: fix rtc_reg_map initialization
Applying: drivers/rtc/rtc-twl.c: cleanup with module_platform_driver() conversion
Applying: drivers/rtc/interface.c: return -EBUSY, not -EACCES when device is busy
Applying: drivers/rtc/rtc-pcf2123.c: replace strict_strtoul() with kstrtoul()
Applying: drivers/rtc/class: convert from Legacy pm ops to dev_pm_ops
Applying: drivers/rtc/rtc-palmas.c: init wakeup before device register
Applying: nilfs2: implement calculation of free inodes count
Applying: ] nilfs2: use atomic64_t type for inodes_count and blocks_count fields 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 function
Applying: docbook: add futexes to kernel-locking docbook
Applying: ptrace/x86: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace/powerpc: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace/arm: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace/sh: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
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: signals: eventpoll: do not use sigprocmask()
Applying: signals: eventpoll: set ->saved_sigmask at the start
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: fs/exec.c:de_thread(): use change_pid() rather than detach_pid/attach_pid
Applying: move-exit_task_namespaces-outside-of-exit_notify-fix
Applying: exit.c: unexport __set_special_pids()
Applying: fs/proc/uptime.c:uptime_proc_show(): use get_monotonic_boottime()
Applying: fs/proc/kcore.c: using strlcpy() instead of strncpy()
Applying: fork: reorder permissions when violating number of processes limits
Applying: kernel/fork.c:copy_process(): unify CLONE_THREAD-or-thread_group_leader code
Applying: kernel/fork.c:copy_process(): don't add the uninitialized child to thread/task/pid lists
Applying: kernel/fork.c:copy_process(): consolidate the lockless CLONE_THREAD checks
Applying: fs/exec.c: do_execve_common(): use current_user()
Applying: fs/exec.c:de_thread: mt-exec should update ->real_start_time
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: restore rcu locking in 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,msq: fix race in msgrcv(2)
Applying: ipc: remove unused functions
Applying: ipc/util.c, ipc_rcu_alloc: cacheline align allocation
Applying: ipc-utilc-ipc_rcu_alloc-cacheline-align-allocation-checkpatch-fixes
Applying: ipc/sem.c: cacheline align the semaphore structures
Applying: ipc/sem: separate wait-for-zero and alter tasks into seperate queues
Applying: ipc/sem.c: scan complex wait-for-zero after undefined updates
Applying: ipc/sem.c: always use only one queue for alter operations
Applying: ipc/sem.c: replace shared sem_otime with per-semaphore value
Applying: ipc/sem.c: rename try_atomic_semop() to perform_atomic_semop(), docu 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_PARTITION entry
Applying: partitions/msdos: enumerate also AIX LVM partitions
Applying: rapidio/switches: remove tsi500 driver
Applying: drivers/rapidio/rio-scan.c: make functions static
Applying: rapidio: convert switch drivers to modules
Applying: rapidio/rionet: rework driver initialization and removal
Applying: rapidio: update enumerator registration mechanism
Applying: rapidio/tsi721: convert to modular mport driver
Applying: rapidio: add modular build option for the subsystem core
Applying: rapidio: add udev notification
Applying: rapidio: documentation update
Applying: kernel/pid.c: move statement
Applying: nbd: remove bogus BUG_ON in NBD_CLEAR_QUE
Applying: nbd: correct disconnect behavior
Applying: aoe: perform I/O completions in parallel
Applying: aoe: update copyright date
Applying: aoe: update internal version number to v83
Applying: Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
Applying: documentation-accounting-getdelaysc-avoid-strncpy-in-accounting-tool-fix
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 test mode
Applying: drivers-w1-slaves-w1_ds2408c-add-magic-sequence-to-disable-p0-test-mode-fix
Applying: relay: fix timer madness
Applying: aio: fix wrong comment in aio_complete()
Applying: kernel/resource.c: remove the unneeded assignment in function __find_resource
Applying: selftests: exit 1 on failure
Applying: self-test: fix make clean
Applying: selftests: add hugetlbfstest
Applying: selftests: add .gitignore for vm
Applying: selftests: fix clean target in kcmp Makefile
Applying: selftests: add .gitignore for kcmp
Applying: tools/testing/selftests: don't assume the x bit is set on scripts
Applying: reboot: remove -stable friendly PF_THREAD_BOUND define
Applying: reboot: move shutdown/reboot related functions to kernel/reboot.c
Applying: reboot: checkpatch.pl the new kernel/reboot.c file
Applying: reboot: x86: prepare reboot_mode for moving to generic kernel code
Applying: reboot: unicore32: prepare reboot_mode for moving to generic kernel code
Applying: reboot: arm: remove unused restart_mode fields from some arm subarchs
Applying: reboot: arm: prepare reboot_mode for moving to generic kernel code
Applying: reboot: arm: change reboot_mode to use enum reboot_mode
Applying: reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix
Applying: reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix-fix
Applying: reboot: move arch/x86 reboot= handling to generic kernel
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: drivers/iio/inkern.c: fix iio_convert_raw_to_processed_unlocked()
Applying: lib/scatterlist: factor out sg_miter_get_next_page() from sg_miter_next()
Applying: lib/scatterlist: introduce sg_pcopy_from_buffer() and sg_pcopy_to_buffer()
Applying: crypto: talitos: use sg_pcopy_to_buffer()
Applying: scsi_debug: fix do_device_access() with wrap around range
Applying: lib/scatterlist: error handling in __sg_alloc_table()
Applying: scripts/sortextable.c: fix building on non-Linux systems
Applying: staging/lustre/ldlm: convert to shrinkers to count/scan API
Applying: staging/lustre/obdclass: convert lu_object shrinker to count/scan API
Applying: staging/lustre/ptlrpc: convert to new shrinker API
Applying: staging/lustre/libcfs: cleanup linux-mem.h
Applying: staging/lustre: replace num_physpages with totalram_pages
Merging akpm/master (ab95290 staging/lustre: replace num_physpages with totalram_pages)
$ git checkout -b cpuinit remotes/origin/cpuinit/master
Applying: init.h: remove __cpuinit sections from the kernel
Applying: modpost: remove all traces of cpuinit/cpuexit sections
Applying: alpha: delete __cpuinit usage from all users
Applying: parisc: delete __cpuinit usage from all users
Applying: MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code
Applying: arm: delete __cpuinit/__CPUINIT usage from all ARM users
Applying: sparc: delete __cpuinit/__CPUINIT usage from all users
Applying: arm64: delete __cpuinit usage from all users
Applying: blackfin: delete __cpuinit usage from all blackfin files
Applying: s390: delete __cpuinit usage from all s390 files
Applying: sh: delete __cpuinit usage from all sh files
Applying: tile: delete __cpuinit usage from all tile files
Applying: metag: delete __cpuinit usage from all metag files
Applying: cris: delete __cpuinit usage from all cris files
Applying: frv: delete __cpuinit usage from all frv files
Applying: hexagon: delete __cpuinit usage from all hexagon files
Applying: m32r: delete __cpuinit usage from all m32r files
Applying: openrisc: delete __cpuinit usage from all openrisc files
Applying: xtensa: delete __cpuinit usage from all xtensa files
Applying: score: delete __cpuinit usage from all score files
Applying: x86: delete __cpuinit usage from all x86 files
Applying: clocksource+irqchip: delete __cpuinit usage from all related files
Applying: cpufreq: delete __cpuinit usage from all cpufreq files
Applying: hwmon: delete __cpuinit usage from all hwmon files
Applying: acpi: delete __cpuinit usage from all acpi files
Applying: net: delete __cpuinit usage from all net files
Applying: rcu: delete __cpuinit usage from all rcu files
Applying: kernel: delete __cpuinit usage from all core kernel files
Applying: drivers: delete __cpuinit usage from all remaining drivers files
Applying: block: delete __cpuinit usage from all block files
Merging cpuinit/master (cb91cd7 block: delete __cpuinit usage from all block files)
Applying: net: lls fix build with allnoconfig
On Wed, Jul 03, 2013 at 06:06:20PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20130702:
>
> The powerpc tree lost its build failure.
>
> The device-mapper tree gained a conflict against the md tree.
>
> The net-next tree gained a build failure for which I cherry-picked an
> upcoming fix.
>
> The trivial tree gained conflicts against the btrfs and Linus' trees.
>
> The xen-two tree gained a conflict against the tip tree.
>
> The akpm tree lost some patches that turned up elsewhere.
>
> The cpuinit tree lost a patch that turned up elsewhere.
>
> ----------------------------------------------------------------------------
>
Hi,
Today's linux-next appears to introduce some BUGs when running the libhugetlbfs
testsuite (under both ARM64 and x86_64):
[ 94.320661] BUG: Bad rss-counter state mm:ffff880119461040 idx:1 val:-512
[ 94.330346] BUG: Bad rss-counter state mm:ffff880119460680 idx:1 val:-2560
[ 94.341746] BUG: Bad rss-counter state mm:ffff880119460d00 idx:1 val:-512
[ 94.347518] BUG: Bad rss-counter state mm:ffff880119460d00 idx:1 val:-512
[ 94.415203] BUG: Bad rss-counter state mm:ffff8801194f9040 idx:1 val:-1024
I've bisected this to commit:
commit 446313e3e4e7274c4d1e449d107fab6c041ec59c
hugetlb: properly account rss
The bad counter values I get are all negative.
To reproduce this, just run through the latest libhugetlbfs test suite, these
warnings appear pretty much immediately. (I set aside 200 huge pages first):
http://libhugetlbfs.sourceforge.net/
Reverting this commit allows the test suite to run without problems.
Cheers,
--
Steve
On Wed, 3 July 2013 12:25:41 +0100, Steve Capper wrote:
>
> Today's linux-next appears to introduce some BUGs when running the libhugetlbfs
> testsuite (under both ARM64 and x86_64):
>
> [ 94.320661] BUG: Bad rss-counter state mm:ffff880119461040 idx:1 val:-512
> [ 94.330346] BUG: Bad rss-counter state mm:ffff880119460680 idx:1 val:-2560
> [ 94.341746] BUG: Bad rss-counter state mm:ffff880119460d00 idx:1 val:-512
> [ 94.347518] BUG: Bad rss-counter state mm:ffff880119460d00 idx:1 val:-512
> [ 94.415203] BUG: Bad rss-counter state mm:ffff8801194f9040 idx:1 val:-1024
>
> I've bisected this to commit:
> commit 446313e3e4e7274c4d1e449d107fab6c041ec59c
> hugetlb: properly account rss
>
> The bad counter values I get are all negative.
>
> To reproduce this, just run through the latest libhugetlbfs test suite, these
> warnings appear pretty much immediately. (I set aside 200 huge pages first):
> http://libhugetlbfs.sourceforge.net/
>
> Reverting this commit allows the test suite to run without problems.
Thank you, I will have a look. For the interim, dropping this patch
from -mm seems the best approach.
Jörn
--
Geld macht nicht glücklich.
Glück macht nicht satt.
Hi Jörn,
On Wed, 3 Jul 2013 10:48:03 -0400 Jörn Engel <[email protected]> wrote:
>
> On Wed, 3 July 2013 12:25:41 +0100, Steve Capper wrote:
> >
> > Today's linux-next appears to introduce some BUGs when running the libhugetlbfs
> > testsuite (under both ARM64 and x86_64):
> >
> > [ 94.320661] BUG: Bad rss-counter state mm:ffff880119461040 idx:1 val:-512
> > [ 94.330346] BUG: Bad rss-counter state mm:ffff880119460680 idx:1 val:-2560
> > [ 94.341746] BUG: Bad rss-counter state mm:ffff880119460d00 idx:1 val:-512
> > [ 94.347518] BUG: Bad rss-counter state mm:ffff880119460d00 idx:1 val:-512
> > [ 94.415203] BUG: Bad rss-counter state mm:ffff8801194f9040 idx:1 val:-1024
> >
> > I've bisected this to commit:
> > commit 446313e3e4e7274c4d1e449d107fab6c041ec59c
> > hugetlb: properly account rss
> >
> > The bad counter values I get are all negative.
> >
> > To reproduce this, just run through the latest libhugetlbfs test suite, these
> > warnings appear pretty much immediately. (I set aside 200 huge pages first):
> > http://libhugetlbfs.sourceforge.net/
> >
> > Reverting this commit allows the test suite to run without problems.
>
> Thank you, I will have a look. For the interim, dropping this patch
> from -mm seems the best approach.
OK, I have dropped that from the akpm tree in linux-next today.
--
Cheers,
Stephen Rothwell [email protected]