linux-next: Tree for Oct 1

[Stephen Rothwell]

Hi all,

Changes since 201209028:

New tree: btrfs

Dropped tree: btrfs (build problem)

The mips tree gained a conflict against Linus' tree.

The btrfs tree gained a build failure so I dropped it.

The net-next tree lost most of its conflicts and its build failure.

The akpm tree lost several patches that turned up elsewhere and gained
conflicts against Linus' tree and the tip tree.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 200 trees (counting Linus' and 26 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                    sfr@xxxxxxxxxxxxxxxx

$ git checkout master
$ git reset --hard stable
Merging origin/master (a0d271c Linux 3.6)
Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
Merging kbuild-current/rc-fixes (fe04ddf kbuild: Do not package /boot and /lib in make tar-pkg)
Merging arm-current/fixes (7253b85 ARM: 7541/1: Add ARM ERRATA 775420 workaround)
Merging m68k-current/for-linus (3be7184 m68k: Add missing RCU idle APIs on idle loop)
Merging powerpc-merge/merge (636802e powerpc: Don't use __put_user() in patch_instruction)
Merging sparc/master (1b62ca7 sparc64: Fix return value of Niagara-2 memcpy.)
Merging net/master (a0d271c Linux 3.6)
Merging sound-current/for-linus (5d037f9 Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled)
Merging wireless/master (a7be50b iwlwifi: don't double free the interrupt in failure path)
Merging driver-core.current/driver-core-linus (5698bd7 Linux 3.6-rc6)
Merging tty.current/tty-linus (5698bd7 Linux 3.6-rc6)
Merging usb.current/usb-linus (0d00dc2 USB: Fix race condition when removing host controllers)
Merging staging.current/staging-linus (5698bd7 Linux 3.6-rc6)
Merging char-misc.current/char-misc-linus (fea7a08 Linux 3.6-rc3)
Merging input-current/for-linus (5e056ef Input: wacom - mark Intuos5 pad as in-prox when touching buttons)
Merging md-current/for-linus (80b4812 md/raid10: fix "enough" function for detecting if array is failed.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (298b973 crypto: x86/glue_helper - fix storing of new IV in CBC encryption)
Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
Merging arm/for-next (f537d06 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (b90c4b9 Merge branch 'hw-breakpoint' into for-next/perf)
CONFLICT (content): Merge conflict in arch/arm/kernel/hw_breakpoint.c
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging arm64/upstream (27aa55c arm64: ptrace: remove obsolete ptrace request numbers from user headers)
Merging blackfin/for-linus (6895f97 kbuild: add symbol prefix arg to kallsyms)
Merging c6x/for-linux-next (11ef4cf syscalls: add __NR_kcmp syscall to generic unistd.h)
Merging cris/for-next (2608747 CRIS: Remove VCS simulator specific code)
Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
Merging ia64/next (39c9a4a [IA64] xen: Fix return value check in xencomm_vtop())
Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
Merging m68knommu/for-next (a255172 m68knommu: fix inconsistent formating in ColdFire 5407 definitions)
Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd)
Merging mips/mips-for-linux-next (cf3736e Merge branch 'next/p3/trace' into mips-for-linux-next)
CONFLICT (content): Merge conflict in drivers/net/ethernet/octeon/octeon_mgmt.c
Merging openrisc/for-upstream (4c8faa4 openrisc: mask interrupts in irq_mask_ack function)
Merging parisc/for-next (5b24c42 [PARISC] fix personality flag check in copy_thread())
Merging s390/features (c397031 s390: update defconfig)
Merging sh/sh-latest (16d74eb sh: pfc: Fix up GPIO mux type reconfig case.)
Merging sparc-next/master (42a4172 sparc64: Fix trailing whitespace in NG4 memcpy.)
Merging tile/master (e70cf54 tile: gxio iorpc numbering change for TRIO interface)
Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler)
Merging xtensa/for_next (1c6b4c6 xtensa: add missing symbol exports)
Merging btrfs/next (2fcfff2 Btrfs: do not async metadata csumming in certain situations)
$ git reset --hard HEAD^
Merging ceph/master (5ce765a libceph: only kunmap kmapped pages)
Merging cifs/for-next (c052e2b cifs: obtain file access during backup intent lookup (resend))
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 (0d7614f Linux 3.6-rc1)
Merging ext3/for_next (09e05d4 jbd: Fix assertion failure in commit code due to lacking transaction credits)
Merging ext4/dev (0704375 ext4: fix mtime update in nodelalloc mode)
Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig)
Merging gfs2/master (2216db7 GFS2: Write out dirty inode metadata in delayed deletes)
Merging jfs/jfs-next (84f4141 jfs: Fix do_div precision in commit b40c2e66)
Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
Merging nfs/linux-next (b2b13b5 NFSv4.1: nfs4_proc_layoutreturn must always drop the plh_block_lgets count)
Merging nfsd/nfsd-next (fac7a17 nfsd4: cast readlink() bug argument)
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 (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
Merging ubifs/linux-next (3668b70 UBIFS: print less)
Merging xfs/for-next (2ea0392 xfs: Make inode32 a remountable option)
Merging vfs/for-next (49de614 MAX_LFS_FILESIZE should be a loff_t)
Merging pci/next (78c8f84 Merge branch 'pci/yinghai-misc' into next)
Merging powerpc/next (7844663 powerpc/eeh: Don't release eeh_mutex in eeh_phb_pe_get)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (9d9fd88 powerpc/mpc52xx_lpbfifo: optionally defer fifo transfer start)
Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
Merging hid/for-next (45654be Merge branch 'logitech' into for-next)
Merging quilt/i2c (e50c6d3 i2c-parport: i2c_parport_irq can be static)
Merging i2c-embedded/i2c-embedded/for-next (2bdbfa9 i2c: davinci: preparation for switch to common clock framework)
Merging quilt/jdelvare-hwmon (46e486e hwmon: Update Alexey Fisher's name)
Merging hwmon-staging/hwmon-next (592758b hwmon: (mcp3021) Add MCP3221 support)
Merging v4l-dvb/master (0421fb6 Merge /home/v4l/v4l/patchwork)
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Merging kbuild/for-next (ea8fafa Merge branches 'kbuild/rc-fixes', 'kbuild/kbuild' and 'kbuild/kconfig' into kbuild/for-next)
Merging kconfig/for-next (45f4c81 localmodconfig: Use my variable for loop in streamline_config.pl)
Merging libata/NEXT (633de4c [libata] export ata_dev_set_feature())
Merging infiniband/for-next (198b18d Merge branch 'mlx4-sriov' into for-next)
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx4/mlx4.h
Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
Merging acpi/next (0a72714 Merge branch 'intel_idle' into next)
Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
CONFLICT (content): Merge conflict in include/linux/cpuidle.h
CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (4b69a04 thermal: user_space: Add missing static storage class specifiers)
Merging ieee1394/for-next (4d50c44 firewire: addendum to address handler RCU conversion)
Merging ubi/linux-next (55393ba UBI: fix trivial typo 'it' => 'is')
Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from user)
Merging scsi/for-next (3da4202 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_nx.c
CONFLICT (content): Merge conflict in drivers/scsi/ipr.c
Merging target-updates/for-next (a0c0e03 iscsi-target: Change iscsi_target_seq_pdu_list.c to honor MaxXmitDataSegmentLength)
Merging target-merge/for-next-merge (d987569 Linux 3.6-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 (fed2574 dw_dmac: introduce software emulation of LLP transfers)
Applying: DMA: PL330: Fix build error (on linux-next-20120924)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (a248afd Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next)
CONFLICT (content): Merge conflict in net/socket.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/pci.c
Applying: net: cope with sock_alloc_file() API change
Merging wireless-next/master (5160b46 ath9k: Fix BTCOEX weight initialization)
Merging bluetooth/master (9cb23dd Bluetooth: btmrvl: Fix skb buffer overflow)
Merging mtd/master (e2d3a35 mtd: nand: detect Samsung K9GBG08U0A, K9GAG08U0F ID)
Merging l2-mtd/master (e2d3a35 mtd: nand: detect Samsung K9GBG08U0A, K9GAG08U0F ID)
Merging crypto/master (200429c crypto: cast5/avx - fix storing of new IV in CBC encryption)
CONFLICT (content): Merge conflict in crypto/Kconfig
Merging drm/drm-next (7facf16 Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sdvo.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c
Applying: drm/i915: HDMI: update for API change
Merging sound/for-next (b7ef37d ARM: SAMSUNG: dma-ops: Fix dmaengine_prep_dma_cyclic() parameter list)
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Merging sound-asoc/for-next (fbe18b4 Merge branch 'for-3.7' into asoc-next)
Merging quilt/rr (1cd1027 virtio-blk: Disable callback in virtblk_done())
CONFLICT (content): Merge conflict in arch/xtensa/Kconfig
CONFLICT (content): Merge conflict in arch/x86/um/Kconfig
Merging input/next (fb4f552 Input: hgpk - use %*ph to dump small buffer)
Merging input-mt/for-next (51c80b7 Input: bcm5974 - Convert to MT-B)
Merging cgroup/for-next (c0a93e2 Merge branch 'for-3.7-hierarchy' into for-next)
Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-next)
Merging quilt/device-mapper (c6ff74d Use the recently-added bio front_pad field to allocate struct dm_target_io.)
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 (0f59ede mmc: sdhci-spear: Add clk_{un}prepare() support)
Merging kgdb/kgdb-next (08f9553 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
Merging slab/for-next (2f5f5d8 Merge branch 'slab/tracing' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (c0c6d3f md: writing to sync_action should clear the read-auto state.)
CONFLICT (content): Merge conflict in fs/bio.c
CONFLICT (content): Merge conflict in drivers/md/raid0.c
Merging mfd/for-next (2896434 mfd: DA9055 core driver)
CONFLICT (content): Merge conflict in drivers/regulator/anatop-regulator.c
CONFLICT (content): Merge conflict in drivers/mfd/tps65217.c
CONFLICT (content): Merge conflict in drivers/mfd/tc3589x.c
CONFLICT (content): Merge conflict in drivers/mfd/max8925-core.c
CONFLICT (content): Merge conflict in drivers/mfd/88pm860x-core.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/regulator/tps6586x.txt
Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
CONFLICT (content): Merge conflict in include/linux/mfd/88pm860x.h
Merging fbdev/fbdev-next (ebe9f7b video: exynos_mipi_dsi: Remove unnecessary NULL check)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h)
Merging regulator/for-next (6a2027a Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/regulator/tps6586x.txt
Merging security/next (bf53083 Merge tag 'v3.6-rc7' into next)
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (f119536 Merge branches 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next)
Merging vfio/next (b68e7fa vfio: Fix virqfd release race)
Merging osd/linux-next (b8017d2 exofs: check for allocation failure in uri_store())
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (9c33c51 doc: fix old config name of kprobetrace)
CONFLICT (content): Merge conflict in drivers/video/backlight/88pm860x_bl.c
CONFLICT (content): Merge conflict in drivers/scsi/ipr.c
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (1ac9af7 Merge branch 'master' into linux-next)
Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
CONFLICT (content): Merge conflict in kernel/audit_tree.c
Merging edac/linux_next (cfe5031 edac: edac_mc no longer deals with kobjects directly)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
CONFLICT (content): Merge conflict in Documentation/edac.txt
Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
Merging dt-rh/for-next (ee67016 of: i2c: add support for wakeup-source property)
Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
Merging spi-mb/spi-next (f4b81dd Merge branches 'spi-drivers' and 'spi-mxs' into spi-next)
Merging tip/auto-latest (79a280a Merge branch 'linus')
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/s390/Kconfig
CONFLICT (content): Merge conflict in arch/Kconfig
Merging rcu/rcu/next (593d100 Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b)
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 kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
Merging kvm/linux-next (1e08ec4 KVM: optimize apic interrupt delivery)
CONFLICT (content): Merge conflict in arch/x86/kvm/i8259.c
CONFLICT (content): Merge conflict in arch/s390/include/asm/processor.h
Merging kvm-ppc/kvm-ppc-next (96e82b6 KVM: PPC: Book3S HV: Provide a way for userspace to get/set per-vCPU areas)
Merging oprofile/for-next (61bccf1 oprofile: Remove 'WQ on CPUx, prefer CPUy' warning)
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 (89d0307 Merge branch 'stable/for-linus-3.7' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging workqueues/for-next (2b0f620 Merge branch 'for-3.7' into for-next)
CONFLICT (content): Merge conflict in drivers/video/omap2/displays/panel-taal.c
CONFLICT (content): Merge conflict in drivers/thermal/thermal_sys.c
CONFLICT (content): Merge conflict in drivers/isdn/mISDN/hwchannel.c
CONFLICT (modify/delete): drivers/hid/hid-picolcd.c deleted in HEAD and modified in workqueues/for-next. Version workqueues/for-next of drivers/hid/hid-picolcd.c left in tree.
$ git rm -f drivers/hid/hid-picolcd.c
Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
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 (613dac3 Merge remote-tracking branches 'regmap/topic/cache' and 'regmap/topic/irq' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (2f73c39 leds: add output driver configuration for pca9633 led driver)
Merging driver-core/driver-core-next (e0f21e6 memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl())
Applying: extcon: adc_jack: update for INIT_DELAYED_WORK_DEFERRABLE name change
Merging tty/tty-next (0c57dfc tty/serial: Add kgdb_nmi driver)
CONFLICT (content): Merge conflict in drivers/tty/serial/omap-serial.c
Merging usb/usb-next (70c048a USB: ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc)
CONFLICT (content): Merge conflict in drivers/usb/serial/mos7840.c
CONFLICT (content): Merge conflict in drivers/usb/serial/mos7720.c
CONFLICT (content): Merge conflict in drivers/usb/serial/kl5kusb105.c
CONFLICT (content): Merge conflict in drivers/usb/serial/io_ti.c
CONFLICT (content): Merge conflict in drivers/usb/serial/io_edgeport.c
CONFLICT (content): Merge conflict in drivers/usb/serial/digi_acceleport.c
CONFLICT (content): Merge conflict in drivers/usb/core/usb-acpi.c
Applying: usb-acpi: Comply with the ACPI API change after usb tree merge
Merging staging/staging-next (e187895 staging: comedi: jr3_pci: fix iomem dereference)
CONFLICT (content): Merge conflict in drivers/staging/serqt_usb2/serqt_usb2.c
CONFLICT (content): Merge conflict in drivers/staging/omap-thermal/omap-thermal-common.c
CONFLICT (content): Merge conflict in drivers/staging/ipack/devices/ipoctal.c
CONFLICT (content): Merge conflict in drivers/staging/android/binder.c
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
Merging char-misc/char-misc-next (5dc2db0 drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init)
CONFLICT (content): Merge conflict in drivers/char/pcmcia/synclink_cs.c
Merging tmem/linux-next (a728d5e Merge commit 'v3.6-rc6' into linux-next)
Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
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 (2fe3954 pinctrl: clarify idle vs sleep states)
Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
CONFLICT (content): Merge conflict in drivers/net/tun.c
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (bec109a remoteproc: return -EFAULT on copy_from_user failure)
Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging gpio-lw/for-next (790b520 gpio: adnp: dt: Reference generic interrupt binding)
Merging arm-soc/for-next (492e2fd added draft of branch descriptions)
CONFLICT (modify/delete): sound/soc/omap/overo.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of sound/soc/omap/overo.c left in tree.
CONFLICT (modify/delete): sound/soc/omap/omap3evm.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of sound/soc/omap/omap3evm.c left in tree.
CONFLICT (modify/delete): sound/soc/omap/omap3beagle.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of sound/soc/omap/omap3beagle.c left in tree.
CONFLICT (content): Merge conflict in sound/soc/omap/omap-pcm.c
CONFLICT (content): Merge conflict in sound/soc/omap/omap-mcbsp.c
CONFLICT (modify/delete): sound/soc/omap/igep0020.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of sound/soc/omap/igep0020.c left in tree.
CONFLICT (content): Merge conflict in drivers/w1/masters/omap_hdq.c
CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dispc.c
CONFLICT (content): Merge conflict in drivers/video/omap/lcd_ams_delta.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdp_hw.h
CONFLICT (content): Merge conflict in drivers/video/msm/mdp.c
CONFLICT (content): Merge conflict in drivers/video/msm/mddi.c
CONFLICT (modify/delete): drivers/video/epson1355fb.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/video/epson1355fb.c left in tree.
CONFLICT (content): Merge conflict in drivers/usb/host/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/tidspbridge/core/wdt.c
CONFLICT (content): Merge conflict in drivers/spi/spi-davinci.c
CONFLICT (content): Merge conflict in drivers/pinctrl/Makefile
CONFLICT (content): Merge conflict in drivers/mtd/nand/orion_nand.c
CONFLICT (modify/delete): drivers/mtd/nand/nand_bcm_umi.h deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of drivers/mtd/nand/nand_bcm_umi.h left in tree.
CONFLICT (modify/delete): drivers/mtd/nand/bcm_umi_nand.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of drivers/mtd/nand/bcm_umi_nand.c left in tree.
CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig
CONFLICT (content): Merge conflict in drivers/mmc/host/omap.c
CONFLICT (content): Merge conflict in drivers/mmc/host/davinci_mmc.c
CONFLICT (content): Merge conflict in drivers/mfd/db8500-prcmu.c
CONFLICT (content): Merge conflict in drivers/input/keyboard/omap-keypad.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
CONFLICT (content): Merge conflict in drivers/dma/mmp_tdma.c
CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
CONFLICT (modify/delete): arch/arm/mach-vt8500/wm8505_7in.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-vt8500/wm8505_7in.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-vt8500/devices.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-vt8500/devices.h left in tree.
CONFLICT (modify/delete): arch/arm/mach-vt8500/devices.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-vt8500/devices.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-vt8500/devices-wm8505.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-vt8500/devices-wm8505.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-vt8500/devices-vt8500.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-vt8500/devices-vt8500.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-vt8500/bv07.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-vt8500/bv07.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
CONFLICT (modify/delete): arch/arm/mach-tegra/devices.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-tegra/devices.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/common.h
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-real6410.c
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-mini6410.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51-peripherals.c
CONFLICT (content): Merge conflict in arch/arm/mach-integrator/integrator_cp.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/clk-imx51-imx53.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/da8xx.h
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm365.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/davinci.h
CONFLICT (modify/delete): arch/arm/mach-bcmring/arch.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-bcmring/arch.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/kernel/smp.c
CONFLICT (content): Merge conflict in arch/arm/include/asm/timex.h
CONFLICT (modify/delete): arch/arm/configs/bcmring_defconfig deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/configs/bcmring_defconfig left in tree.
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/usb/platform-uhci.txt
$ git rm -f sound/soc/omap/igep0020.c sound/soc/omap/omap3beagle.c sound/soc/omap/omap3evm.c sound/soc/omap/overo.c
$ git rm -f arch/arm/mach-tegra/devices.c
$ git rm -f drivers/mtd/nand/bcm_umi_nand.c drivers/mtd/nand/nand_bcm_umi.h
$ git rm -f arch/arm/mach-vt8500/bv07.c arch/arm/mach-vt8500/devices-vt8500.c arch/arm/mach-vt8500/devices-wm8505.c arch/arm/mach-vt8500/devices.c arch/arm/mach-vt8500/devices.h arch/arm/mach-vt8500/wm8505_7in.c
$ git rm -f arch/arm/configs/bcmring_defconfig arch/arm/mach-bcmring/arch.c
$ git rm -f drivers/video/epson1355fb.c
Merging ep93xx/ep93xx-for-next (70f0f7c Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging ixp4xx/next (2346020 IXP4xx: map CPU config registers within VMALLOC region.)
CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/common.c
Merging msm/for-next (fe3a47b ARM: msm: Allow 8960 and 8660 to compile together)
CONFLICT (rename/delete): arch/arm/mach-vt8500/include/mach/restart.h deleted in msm/for-next and renamed in HEAD. Version HEAD of arch/arm/mach-vt8500/include/mach/restart.h left in tree.
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/common.h
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/board-dt-8960.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/board-dt-8660.c
Merging renesas/next (918ffa3 Merge branch 'heads/boards' into next)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging samsung/for-next (59e65fd Merge branch 'next/dt-samsung-new' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/clock-exynos5.c
Applying: ARM: fix up for movemment of dtb targets
CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile
Merging tegra/for-next (979570e Linux 3.6-rc7)
Merging kvmtool/master (5a337ac kvm tools: don't exit on debug ioport write)
Merging dma-mapping/dma-mapping-next (8aa8bee Merge branch 'next-cleanup' into HEAD)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/highbank.dts
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/ata/ahci-platform.txt
Merging pwm/for-next (72004bd pwm: Add Ingenic JZ4740 support)
Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
Merging userns/for-next (72235465 userns: Convert the ufs filesystem to use kuid/kgid where appropriate)
CONFLICT (content): Merge conflict in security/integrity/ima/ima_policy.c
CONFLICT (content): Merge conflict in kernel/auditsc.c
CONFLICT (content): Merge conflict in kernel/audit.c
CONFLICT (content): Merge conflict in init/Kconfig
CONFLICT (content): Merge conflict in fs/ubifs/debug.c
Applying: audit: fix up for pid to portid change
Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
Merging signal/for-next (3af7cae alpha: don't open-code trace_report_syscall_{enter,exit})
CONFLICT (content): Merge conflict in fs/exec.c
CONFLICT (content): Merge conflict in arch/x86/kernel/signal.c
CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/um/kernel/exec.c
CONFLICT (content): Merge conflict in arch/s390/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/mn10300/Kconfig
CONFLICT (content): Merge conflict in arch/m68k/Kconfig
CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/c6x/Kconfig
CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/alpha/Kconfig
Merging clk/clk-next (494bfec clk: add of_clk_src_onecell_get() support)
Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf())
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: CRIS: Fix I/O macros
Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
Applying: vfs: d_obtain_alias() needs to use "/" as default name.
Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
Applying: acpi_memhotplug.c: remove memory info from list before freeing it
Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: x86 numa: don't check if node is NUMA_NO_NODE
Applying: arch/x86/tools/insn_sanity.c: identify source of messages
Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
Applying: audit.h: replace defines with C stubs
Applying: audith-replace-defines-with-c-stubs-fix
Applying: mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it
Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
Applying: drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma channel message
Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
Applying: gpu/drm/ttm: use copy_highpage
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: time: don't inline EXPORT_SYMBOL functions
Applying: kbuild: make: fix if_changed when command contains backslashes
Applying: compiler-gcc4.h: correct verion check for __compiletime_error
Applying: h8300: select generic atomic64_t support
Applying: unicore32: select generic atomic64_t support
Applying: rapidio/rionet: fix multicast packet transmit logic
Applying: readahead: fault retry breaks mmap file read random detection
Applying: drivers/scsi/atp870u.c: fix bad use of udelay
Applying: cciss: cleanup bitops usage
Applying: cciss: use check_signature()
Applying: block: store partition_meta_info.uuid as a string
Applying: init: reduce PARTUUID min length to 1 from 36
Applying: block: partition: msdos: provide UUIDs for partitions
Applying: drbd: use copy_highpage
Applying: vfs: increment iversion when a file is truncated
Applying: fs: change return values from -EACCES to -EPERM
Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
Applying: mm/page_alloc.c: remove duplicate check
Applying: mm: remove __GFP_NO_KSWAPD
Applying: x86, pat: remove the dependency on 'vm_pgoff' in track/untrack pfn vma routines
Applying: x86, pat: separate the pfn attribute tracking for remap_pfn_range and vm_insert_pfn
Applying: x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix
Applying: mm, x86, pat: rework linear pfn-mmap tracking
Applying: mm: introduce arch-specific vma flag VM_ARCH_1
Applying: mm: kill vma flag VM_INSERTPAGE
Applying: mm: kill vma flag VM_CAN_NONLINEAR
Applying: mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
Applying: mm: kill vma flag VM_EXECUTABLE and mm->num_exe_file_vmas
Applying: mm: prepare VM_DONTDUMP for using in drivers
Applying: mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
CONFLICT (content): Merge conflict in drivers/mtd/mtdchar.c
Applying: mm-kill-vma-flag-vm_reserved-and-mm-reserved_vm-counter-fix
Applying: mm: fix nonuniform page status when writing new file with small buffer
Applying: mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix
Applying: mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix-fix
Applying: mm/mmap.c: replace find_vma_prepare() with clearer find_vma_links()
Applying: mm-mmapc-replace-find_vma_prepare-with-clearer-find_vma_links fix
Applying: mm: compaction: update comment in try_to_compact_pages
Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction based on failures
Applying: mm-vmscan-scale-number-of-pages-reclaimed-by-reclaim-compaction-based-on-failures-fix
Applying: mm: compaction: capture a suitable high-order page immediately when it is made available
Applying: Revert "mm: mempolicy: Let vma_merge and vma_split handle vma->vm_policy linkages"
Applying: mempolicy: remove mempolicy sharing
Applying: mempolicy: fix a race in shared_policy_replace()
Applying: mempolicy: fix refcount leak in mpol_set_shared_policy()
Applying: mempolicy: fix a memory corruption by refcount imbalance in alloc_pages_vma()
CONFLICT (content): Merge conflict in mm/mempolicy.c
Applying: mempolicy-fix-a-memory-corruption-by-refcount-imbalance-in-alloc_pages_vma-v2
CONFLICT (content): Merge conflict in mm/mempolicy.c
Applying: mm: mmu_notifier: fix inconsistent memory between secondary MMU and host
Applying: mm-mmu_notifier-fix-inconsistent-memory-between-secondary-mmu-and-host-fix
Applying: mm: mmu_notifier: have mmu_notifiers use a global SRCU so they may safely schedule
Applying: mm/mmu_notifier: init notifier if necessary
Applying: mm/mmu_notifier: init notifier if necessary
Applying: mm/vmscan: fix error number for failed kthread
Applying: oom: remove deprecated oom_adj
Applying: mm: hugetlb: add arch hook for clearing page flags before entering pool
Applying: mm: adjust final #endif position in mm/internal.h
Applying: thp: fix the count of THP_COLLAPSE_ALLOC
Applying: thp: remove unnecessary check in start_khugepaged
Applying: thp: move khugepaged_mutex out of khugepaged
Applying: thp: remove unnecessary khugepaged_thread check
Applying: thp: remove wake_up_interruptible in the exit path
Applying: thp: remove some code depend on CONFIG_NUMA
Applying: thp: merge page pre-alloc in khugepaged_loop into khugepaged_do_scan
Applying: thp: release page in page pre-alloc path
Applying: thp: introduce khugepaged_prealloc_page and khugepaged_alloc_page
Applying: thp: remove khugepaged_loop
Applying: thp: use khugepaged_enabled to remove duplicate code
Applying: thp: remove unnecessary set_recommended_min_free_kbytes
Applying: mm: fix potential anon_vma locking issue in mprotect()
Applying: thp, x86: introduce HAVE_ARCH_TRANSPARENT_HUGEPAGE
Applying: thp: remove assumptions on pgtable_t type
Applying: thp: introduce pmdp_invalidate()
Applying: thp: make MADV_HUGEPAGE check for mm->def_flags
Applying: thp, s390: thp splitting backend for s390
Applying: thp, s390: thp pagetable pre-allocation for s390
Applying: thp, s390: disable thp for kvm host on s390
Applying: thp, s390: architecture backend for thp on s390
Applying: thp, s390: add missing earlyclobber to inline assembly
Applying: ipc/mqueue: remove unnecessary rb_init_node() calls
Applying: rbtree: reference Documentation/rbtree.txt for usage instructions
Applying: rbtree: empty nodes have no color
Applying: rbtree-empty-nodes-have-no-color-fix
Applying: rbtree: fix incorrect rbtree node insertion in fs/proc/proc_sysctl.c
Applying: rbtree: move some implementation details from rbtree.h to rbtree.c
Applying: rbtree: fix jffs2 build issue due to renamed __rb_parent_color field
Applying: rbtree: performance and correctness test
Applying: rbtree-performance-and-correctness-test-fix
Applying: rbtree: break out of rb_insert_color loop after tree rotation
Applying: rbtree: adjust root color in rb_insert_color() only when necessary
Applying: rbtree: low level optimizations in rb_insert_color()
Applying: rbtree: adjust node color in __rb_erase_color() only when necessary
Applying: perf tools: fix build for another rbtree.c change
Applying: rbtree: optimize case selection logic in __rb_erase_color()
Applying: rbtree: low level optimizations in __rb_erase_color()
Applying: rbtree: coding style adjustments
Applying: rbtree: optimize fetching of sibling node
Applying: rbtree test: fix sparse warning about 64-bit constant
Applying: rbtree: add __rb_change_child() helper function
Applying: rbtree: place easiest case first in rb_erase()
Applying: rbtree: handle 1-child recoloring in rb_erase() instead of rb_erase_color()
Applying: rbtree: low level optimizations in rb_erase()
Applying: rbtree: augmented rbtree test
Applying: rbtree: faster augmented rbtree manipulation
Applying: rbtree: remove prior augmented rbtree implementation
Applying: rbtree: add RB_DECLARE_CALLBACKS() macro
Applying: rbtree: add prio tree and interval tree tests
Applying: mm: replace vma prio_tree with an interval tree
Applying: kmemleak: use rbtree instead of prio tree
Applying: prio_tree: remove
Applying: rbtree: move augmented rbtree functionality to rbtree_augmented.h
Applying: mm: interval tree updates
Applying: mm anon rmap: remove anon_vma_moveto_tail
Applying: mm anon rmap: replace same_anon_vma linked list with an interval tree.
Applying: mm rmap: remove vma_address check for address inside vma
Applying: mm: add CONFIG_DEBUG_VM_RB build option
Applying: mm anon rmap: in mremap, set the new vma's position before anon_vma_clone()
Applying: mm: avoid taking rmap locks in move_ptes()
Applying: memory-hotplug: build zonelists when offlining pages
Applying: mm: mmu_notifier: make the mmu_notifier srcu static
Applying: mm: cma: discard clean pages during contiguous allocation instead of migration
Applying: mm-cma-discard-clean-pages-during-contiguous-allocation-instead-of-migration-fix
Applying: mm-cma-discard-clean-pages-during-contiguous-allocation-instead-of-migration-fix-fix
Applying: mm: fix tracing in free_pcppages_bulk()
Applying: mm-fix-tracing-in-free_pcppages_bulk-fix
Applying: cma: fix counting of isolated pages
Applying: cma: count free CMA pages
Applying: cma-count-free-cma-pages-fix
Applying: cma: fix watermark checking
Applying: cma: fix watermark checking cleanup
Applying: mm: page_alloc: use get_freepage_migratetype() instead of page_private()
Applying: mm: remain migratetype in freed page
Applying: memory-hotplug: bug fix race between isolation and allocation
Applying: memory-hotplug: fix pages missed by race rather than failing
Applying: memory-hotplug-fix-pages-missed-by-race-rather-than-failng-fix
Applying: atomic: implement generic atomic_dec_if_positive()
Applying: atomic-implement-generic-atomic_dec_if_positive-fix
Applying: swap: add a simple detector for inappropriate swapin readahead
Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
Applying: mm/memblock: reduce overhead in binary search
Applying: mm/memblock: use existing interface to set nid
Applying: mm/memblock: cleanup early_node_map[] related comments
Applying: mm: compaction: abort compaction loop if lock is contended or run too long
Applying: mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix
Applying: mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix-2
Applying: mm: compaction: move fatal signal check out of compact_checklock_irqsave
Applying: mm: compaction: Update try_to_compact_pages()kerneldoc comment
Applying: mm: compaction: acquire the zone->lru_lock as late as possible
Applying: mm-compaction-acquire-the-zone-lru_lock-as-late-as-possible-fix
Applying: mm-compaction-acquire-the-zone-lru_lock-as-late-as-possible-fix-fix
Applying: mm: compaction: acquire the zone->lock as late as possible
Applying: mm: compaction: iron out isolate_freepages_block() and isolate_freepages_range()
Applying: Revert "mm: have order > 0 compaction start off where it left"
Applying: mm: compaction: cache if a pageblock was scanned and no pages were isolated
Applying: mm-compaction-cache-if-a-pageblock-was-scanned-and-no-pages-were-isolated-fix
Applying: mm: compaction: cache if a pageblock was scanned and no pages were isolated -fix2
Applying: mm: compaction: Restart compaction from near where it left off
Applying: mm: compaction: Restart compaction from near where it left off -fix
Applying: mm: compaction: clear PG_migrate_skip based on compaction and reclaim activity
Applying: mm/hugetlb.c: remove duplicate inclusion of header file
Applying: mm/page_alloc: refactor out __alloc_contig_migrate_alloc()
Applying: mm-page_alloc-refactor-out-__alloc_contig_migrate_alloc-checkpatch-fixes
Applying: memory-hotplug: don't replace lowmem pages with highmem
Applying: thp: khugepaged_prealloc_page() forgot to reset the page alloc indicator
Applying: mm: thp: fix the pmd_clear() arguments in pmdp_get_and_clear()
Applying: mm: thp: fix the update_mmu_cache() last argument passing in mm/huge_memory.c
Applying: mm: enable CONFIG_COMPACTION by default
Applying: mm: fix-up zone present pages
Applying: memcg: trivial fixes for Documentation/cgroups/memory.txt
Applying: memcg: cleanup kmem tcp ifdefs
Applying: memcg: move mem_cgroup_is_root upwards
Applying: mm: fix invalidate_complete_page2() lock ordering
Applying: mm: remove vma arg from page_evictable
Applying: mm: use clear_page_mlock() in page_remove_rmap()
Applying: mm: remove free_page_mlock
Applying: mm, numa: reclaim from all nodes within reclaim distance
Applying: mm-numa-reclaim-from-all-nodes-within-reclaim-distance-fix
Applying: mm, numa: reclaim from all nodes within reclaim distance fix fix
Applying: memory.txt: remove stray information
Applying: mm: thp: fix pmd_present for split_huge_page and PROT_NONE with THP
Applying: hugetlb: do not use vma_hugecache_offset() for vma_prio_tree_foreach
Applying: mm: move all mmu notifier invocations to be done outside the PT lock
Applying: mm: wrap calls to set_pte_at_notify with invalidate_range_start and invalidate_range_end
Applying: mm: call invalidate_range_end in do_wp_page even for zero pages
Applying: Revert 0def08e3 because check_range can't fail in migrate_to_node with
Applying: mm: enhance comment and bug check
Applying: memory-hotplug: fix zone stat mismatch
Applying: mm: remove unevictable_pgs_mlockfreed
Applying: KSM: numa awareness sysfs knob
Applying: mm/memory.c: fix typo in comment
Applying: fs/fs-writeback.c: remove unneccesary parameter of __writeback_single_inode()
Applying: kpageflags: fix wrong KPF_THP on non-huge compound pages
Applying: CMA: migrate mlocked pages
Applying: cma: decrease cc.nr_migratepages after reclaiming pagelist
Applying: sections: disable const sections for PA-RISC v2
Applying: sections: fix section conflicts in arch/arm/
Applying: sections: fix section conflicts in arch/frv
Applying: sections: fix section conflicts in arch/h8300
Applying: sections-fix-section-conflicts-in-arch-h8300-checkpatch-fixes
Applying: sections: fix section conflicts in arch/ia64
Applying: sections: fix section conflicts in arch/mips
Applying: sections: fix section conflicts in arch/powerpc
Applying: sections: fix section conflicts in arch/score
Applying: sections: fix section conflicts in arch/sh
Applying: sections-fix-section-conflicts-in-arch-sh-fix
Applying: sections: fix section conflicts in arch/x86
Applying: sections: fix section conflicts in drivers/atm
Applying: sections: fix section conflicts in drivers/char
Applying: sections: fix section conflicts in drivers/ide
Applying: sections: fix section conflicts in drivers/macintosh
Applying: sections-fix-section-conflicts-in-drivers-macintosh-checkpatch-fixes
Applying: sections: fix section conflicts in drivers/mfd
Applying: sections: fix section conflicts in drivers/mmc
Applying: sections: fix section conflicts in drivers/net
Applying: sections: fix section conflicts in drivers/net/hamradio
Applying: sections: fix section conflicts in drivers/net/wan
Applying: sections: fix section conflicts in drivers/platform/x86
Applying: sections: fix section conflicts in drivers/scsi
Applying: sections: fix section conflicts in drivers/video
Applying: sections: fix section conflicts in mm/percpu.c
Applying: sections: fix section conflicts in net/can
Applying: sections: fix section conflicts in net
Applying: sections: fix section conflicts in sound
Applying: sections: fix const sections for crc32 table
Applying: sectons-fix-const-sections-for-crc32-table-checkpatch-fixes
Applying: frv: kill used but uninitialized variable
Applying: score: select generic atomic64_t support
Applying: cross-arch: don't corrupt personality flags upon exec()
Applying: tile: fix personality bits handling upon exec()
Applying: kernel/sys.c: call disable_nonboot_cpus() in kernel_restart()
Applying: poweroff: fix bug in orderly_poweroff()
Applying: lib: vsprintf: optimize division by 10 for small integers
Applying: lib: vsprintf: optimize division by 10000
Applying: lib: vsprintf: optimize put_dec_trunc8()
Applying: lib-vsprintf-optimize-put_dec_trunc8-fix
Applying: lib: vsprintf: fix broken comments
Applying: lib/vsprintf: update documentation to cover all of %p[Mm][FR]
Applying: MAINTAINERS: update gpio subsystem file list
Applying: MAINTAINERS: add defconfig file to IMX section
Applying: MAINTAINERS: Update gianfar_ptp after renaming
Applying: MAINTAINERS: fix indentation for Viresh Kumar
Applying: drivers/video/backlight/da9052_bl.c: use usleep_range() instead of msleep() for small sleeps
Applying: drivers/video/backlight/ltv350qv.c: use usleep_range() instead of msleep() for small sleeps
Applying: drivers/video/backlight/kb3886_bl.c: use usleep_range() instead of msleep() for small sleeps
Applying: backlight: lp855x: add FAST bit description for LP8556
Applying: backlight: add Backlight driver for lm3630 chip
Applying: backlight-add-backlight-driver-for-lm3630-chip-fix
Applying: backlight: add new lm3639 backlight driver
Applying: backlight-add-new-lm3639-backlight-driver-fix
Applying: backlight-add-new-lm3639-backlight-driver-fix-2
Applying: backlight: remove ProGear driver
Applying: drivers/video/backlight/da9052_bl.c: drop devm_kfree of devm_kzalloc'd data
Applying: drivers/video/backlight/platform_lcd.c: add support for device tree based probe
Applying: backlight-platform-lcd-add-support-for-device-tree-based-probe-fix
Applying: pwm_backlight: add device tree support for Low Threshold Brightness
Applying: pwm_backlight-add-device-tree-support-for-low-threshold-brightness-fix
Applying: drivers/net/ethernet/sfc: use standard __{clear,set}_bit_le() functions
Applying: drivers/net/ethernet/dec/tulip: Use standard __set_bit_le() function
Applying: bitops: introduce generic {clear,set}_bit_le()
Applying: powerpc: bitops: introduce {clear,set}_bit_le()
Applying: kvm: replace test_and_set_bit_le() in mark_page_dirty_in_slot() with set_bit_le()
Applying: idr: rename MAX_LEVEL to MAX_IDR_LEVEL
Applying: idr-rename-max_level-to-max_idr_level-fix
Applying: idr-rename-max_level-to-max_idr_level-fix-fix-2
Applying: idr-rename-max_level-to-max_idr_level-fix-fix-2-fix
Applying: idr-rename-max_level-to-max_idr_level-fix-3
Applying: lib/parser.c: avoid overflow in match_number()
Applying: lib-parserc-avoid-overflow-in-match_number-fix
Applying: lib/Kconfig.debug: adjust hard-lockup related Kconfig options
Applying: lib/gcd.c: prevent possible div by 0
Applying: genalloc: make it possible to use a custom allocation algorithm
Applying: lib/spinlock_debug: avoid livelock in do_raw_spin_lock()
Applying: lib-spinlock_debug-avoid-livelock-in-do_raw_spin_lock-fix
Applying: lib/vsprintf.c: improve standard conformance of sscanf()
Applying: lib/plist.c: make plist test announcements KERN_DEBUG
Applying: scatterlist: atomic sg_mapping_iter() no longer needs disabled IRQs
Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
Applying: checkpatch: check utf-8 content from a commit log when it's missing from charset
Applying: checkpatch: update suggested printk conversions
Applying: checkpatch: check networking specific block comment style
Applying: CodingStyle: add networking specific block comment style
Applying: epoll: support for disabling items, and a self-test app
Applying: binfmt_elf: Uninitialized variable
Applying: drivers/rtc/rtc-isl1208.c: add support for the ISL1218
Applying: rtc-proc: permit the /proc/driver/rtc device to use other devices
Applying: rtc: add Dallas DS2404 driver
Applying: rtc-add-dallas-ds2404-driver-fix
Applying: rtc: snvs: add Freescale rtc-snvs driver
Applying: rtc: snvs: change timeout to use a fixed number of loop
Applying: rtc: recycle id when unloading a rtc driver
Applying: drivers/rtc/rtc-at91sam9.c: use module_platform_driver() macro
Applying: rtc: tps65910: add RTC driver for TPS65910 PMIC RTC
Applying: rtc: tps65910: change RTC driver name as per mfd
Applying: rtc: add MAX8907 RTC driver
Applying: rtc: kconfig: remove unnecessary dependencies.
Applying: drivers/rtc/rtc-jz4740.c: fix IRQ error check
Applying: drivers/rtc/rtc-spear.c: fix several error checks
Applying: rtc: rc5t583: add ricoh rc5t583 RTC driver
Applying: drivers/rtc/rtc-coh901331.c: use clk_prepare_enable() and clk_disable_unprepare()
Applying: rtc: rtc-mxc: adapt to the new i.mx clock framework
Applying: rtc: rtc-mxc: convert to module_platform_driver
Applying: rtc_sysfs_show_hctosys(): display 0 if resume failed
Applying: rtc_sysfs_show_hctosys-return-0-if-resume-failed-fix
Applying: rtc_sysfs_show_hctosys-return-0-if-resume-failed-fix-fix
Applying: drivers/rtc/rtc-s3c.c: fix return value in s3c_rtc_probe()
Applying: drivers/rtc/rtc-ds1672.c: convert struct i2c_msg initialization to C99 format
Applying: drivers/rtc/rtc-x1205.c: convert struct i2c_msg initialization to C99 format
Applying: drivers/rtc/rtc-s35390a.c: convert struct i2c_msg initialization to C99 format
Applying: drivers/rtc/rtc-rs5c372.c: convert struct i2c_msg initialization to C99 format
Applying: drivers/rtc/rtc-pcf8563.c: convert struct i2c_msg initialization to C99 format
Applying: drivers/rtc/rtc-isl1208.c: convert struct i2c_msg initialization to C99 format
Applying: drivers/rtc/rtc-em3027.c: convert struct i2c_msg initialization to C99 format
Applying: rtc: kconfig: fix up dependency for ab8500
Applying: drivers/rtc/rtc-tps65910.c: use platform_get_irq() to get RTC irq details
Applying: drivers/rtc/rtc-m41t80.c: remove disabled alarm functionality
Applying: drivers/rtc/rtc-s35390a.c: add wakealarm support for rtc-s35390A rtc chip
Applying: hfsplus: add on-disk layout declarations related to attributes tree
Applying: hfsplus: add functionality of manipulating by records in attributes tree
Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
Applying: hfsplus: add support of manipulation by attributes file
Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
Applying: hfsplus: code style fixes - reworked support of extended attributes
Applying: fat: use accessor function for msdos_dir_entry 'start'
Applying: fat (exportfs): move NFS support code
Applying: fat (exportfs): fix dentry reconnection
Applying: fs/fat: fix a checkpatch issue in namei_msdos.c
Applying: fs/fat: fix some checkpatch issues in fat.h
Applying: fs/fat: chang indentation of some comments in fat.h
Applying: fs/fat: fix two checkpatch issues in cache.c
Applying: fs/fat: fix some small checkpatch issues in dir.c
Applying: fs/fat: fix all other checkpatch issues in dir.c
Applying: fs-fat-fix-all-other-checkpatch-issues-in-dirc-fix
Applying: fs/fat: fix checkpatch issues in fatent.c
Applying: fat: no need to reset EOF in ent_put for FAT32
Applying: fat: simplify writeback_inode()
Applying: fat-simplify-writeback_inode-checkpatch-fixes
Applying: fat-simplify-writeback_inode-checkpatch-fixes-fix
Applying: device_cgroup: add "deny_all" in dev_cgroup structure
Applying: device_cgroup: introduce dev_whitelist_clean()
Applying: device_cgroup: convert device_cgroup internally to policy + exceptions
Applying: device_cgroup: rename whitelist to exception list
Applying: coredump: make core dump functionality optional
Applying: fs: amended coredump-related sysctl functions
Applying: coredump-make-core-dump-functionality-optional-fix-fix
Applying: coredump: update coredump-related headers
Applying: coredump: add support for %d=__get_dumpable() in core name
Applying: coredump-add-support-for-%d=__get_dumpable-in-core-name-fix
Applying: coredump: use SUID_DUMPABLE_ENABLED rather than hardcoded 1
Applying: coredump-use-suid_dumpable_enabled-rather-than-hardcoded-1-checkpatch-fixes
Applying: coredump: pass siginfo_t* to do_coredump() and below, not merely signr
Applying: compat: move compat_siginfo_t definition to asm/compat.h
Applying: coredump: add a new elf note with siginfo of the signal
Applying: coredump: extend core dump note section to contain file names of mapped files
Applying: proc: return -ENOMEM when inode allocation failed
Applying: proc: no need to initialize proc_inode->fd in proc_get_inode()
Applying: proc: use kzalloc instead of kmalloc and memset
Applying: proc-use-kzalloc-instead-of-kmalloc-and-memset-fix
Applying: proc_sysctl.c: use BUG_ON instead of BUG
Applying: fs/proc/root.c: use NULL instead of 0 for pointer
Applying: kdump: remove unneeded include
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: rapidio/tsi721: modify mport name assignment
Applying: rapidio: fix kerneldoc warnings after DMA support was added
Applying: drivers/rapidio/devices/tsi721.c: fix error return code
Applying: rapidio: add inbound memory mapping interface
Applying: rapidio/tsi721: add inbound memory mapping callbacks
Applying: rapidio: apply RX/TX enable to active switch ports only
Applying: nbd: add set flags ioctl
Applying: nbd: handle discard requests
Applying: aoe: for performance support larger packet payloads
Applying: aoe: kernel thread handles I/O completions for simple locking
Applying: aoe: cleanup an allocation a bit
Applying: aoe: become I/O request queue handler for increased user control
Applying: aoe: use a kernel thread for transmissions
Applying: aoe: use packets that work with the smallest-MTU local interface
Applying: aoe: failover remote interface based on aoe_deadsecs parameter
Applying: aoe: do revalidation steps in order
Applying: aoe: disallow unsupported AoE minor addresses
Applying: aoe: associate frames with the AoE storage target
Applying: aoe: increase net_device reference count while using it
Applying: aoe: remove unused code and add cosmetic improvements
Applying: aoe: update internal version number to 49
Applying: aoe: update copyright year in touched files
Applying: aoe: update documentation with new URL and VM settings reference
Applying: taskstats: cgroupstats_user_cmd() may leak on error
Applying: kernel/resource.c: fix stack overflow in __reserve_region_with_split()
Applying: lib/decompress.c add __init to decompress_method and data
Merging akpm/master (14049c3 lib/decompress.c add __init to decompress_method and data)
Applying: prio_tree: fix fs/block_dev.c for removal of prio_tree

Attachment: pgp00000.pgp
Description: PGP signature