Hi all, Do not add stuff destined for v3.8 to your linux-next included branches until after v3.7-rc1 is released. Changes since 201201008: Conflicts are migrating as trees are merged by Linus. ---------------------------------------------------------------------------- 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 203 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 (f5a246e Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound) 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 (b1e0d8b kbuild: Fix gcc -x syntax) Merging arm-current/fixes (8ef102c ARM: 7548/1: include linux/sched.h in syscall.h) Merging m68k-current/for-linus (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR) Merging powerpc-merge/merge (636802e powerpc: Don't use __put_user() in patch_instruction) Merging sparc/master (2863bc5 Revert strace hiccups fix.) Merging net/master (7c41c42 vxlan: fix more sparse warnings) 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 (c3e7724 mac80211: use ieee80211_free_txskb to fix possible skb leaks) Merging driver-core.current/driver-core-linus (5698bd7 Linux 3.6-rc6) Merging tty.current/tty-linus (b70936d tty: serial: sccnxp: Fix bug with unterminated platform_id list) Merging usb.current/usb-linus (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm) 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 (dde3ada Merge branch 'next' into for-linus) 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 (c9f97a2 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 asm-generic/master (c37d615 Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic) Merging arm/for-next (f537d06 Merge branch 'devel-stable' into for-next) CONFLICT (content): Merge conflict in arch/arm/kernel/smp.c Merging arm-perf/for-next/perf (b90c4b9 Merge branch 'hw-breakpoint' into for-next/perf) CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c CONFLICT (modify/delete): arch/arm/mach-tegra/devices.c deleted in HEAD and modified in arm-perf/for-next/perf. Version arm-perf/for-next/perf of arch/arm/mach-tegra/devices.c left in tree. CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c CONFLICT (modify/delete): arch/arm/mach-bcmring/arch.c deleted in HEAD and modified in arm-perf/for-next/perf. Version arm-perf/for-next/perf of arch/arm/mach-bcmring/arch.c left in tree. CONFLICT (content): Merge conflict in arch/arm/kernel/hw_breakpoint.c $ git rm -f arch/arm/mach-tegra/devices.c arch/arm/mach-bcmring/arch.c Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) Merging arm64/upstream (6916fd0 arm64: Enable interrupts before calling do_notify_resume()) Merging blackfin/for-linus (6594b98 Blackfin: smp: add smp_mb() to keep coherency) Merging c6x/for-linux-next (2e919f7 c6x: remove c6x signal.h) Merging cris/for-next (d75d806 CRIS: Remove VCS simulator specific code) Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal) Merging ia64/next (f68301f UAPI: (Scripted) Disintegrate arch/ia64/include/asm) CONFLICT (content): Merge conflict in arch/ia64/include/asm/Kbuild 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 (94fda49 Revert "microblaze_mmu_v2: Update signal returning address") Merging mips/mips-for-linux-next (382fc33 Merge branch 'master' of git://dev.phrozen.org/mips-next into mips-for-linux-next) CONFLICT (content): Merge conflict in drivers/pinctrl/Makefile CONFLICT (content): Merge conflict in drivers/net/ethernet/octeon/octeon_mgmt.c CONFLICT (content): Merge conflict in arch/mips/include/asm/octeon/octeon-model.h 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 (c4af434 s390/zcrypt: remove duplicated include from zcrypt_pcixcc.c) Merging sh/sh-latest (16d74eb sh: pfc: Fix up GPIO mux type reconfig case.) Merging sparc-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc) 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 (ded389d xtensa: Add missing RCU idle APIs on idle loop) Merging btrfs/next (0b2d449 btrfs: move inline function code to header file) Merging ceph/master (6285bc2 ceph: avoid 32-bit page index overflow) Merging cifs/for-next (72bd481 cifs: reinstate the forcegid option) 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 (c278531 ext4: fix ext4_flush_completed_IO wait semantics) Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig) Merging gfs2/master (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm) 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 (f4f381e NFSv4.1: pNFS has no business touching the slot table wait queue...) Merging nfsd/nfsd-next (0d22f68 nfsd4: don't allow reclaims of expired clients) 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 (2bd2c19 MAX_LFS_FILESIZE should be a loff_t) Merging pci/next (78c8f84 Merge branch 'pci/yinghai-misc' into next) Merging powerpc/next (d900bd7 powerpc/iommu: Fix multiple issues with IOMMU pools code) Merging 4xx/next (2074b1d powerpc: Fix irq distribution) Merging mpc5xxx/next (f3ac712 powerpc/pcm030: add pcm030-audio-fabric to dts) Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write) Merging hid/for-next (0b82411 Merge branch 'hidraw' into for-next) CONFLICT (content): Merge conflict in drivers/hid/hid-multitouch.c Merging quilt/i2c (d43b716 Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild) Merging i2c-embedded/i2c-embedded/for-next (62885f5 MXS: Implement DMA support into mxs-i2c) CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c Merging quilt/jdelvare-hwmon (e086be6 hwmon: Drop needless includes of <linux/delay.h>) Merging hwmon-staging/hwmon-next (967d7fe hwmon: (ads7828) driver cleanup) Merging v4l-dvb/master (7da79d8 Merge /home/v4l/v4l/patchwork) CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/da8xx.h Merging kbuild/for-next (f1748a9 Merge branch 'kbuild/rc-fixes' into kbuild/for-next) Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm') Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI) Merging infiniband/for-next (56040f0 Merge branches 'cma', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next) Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case) Merging acpi/next (558dc6f Merge branch 'upstream' into next) CONFLICT (content): Merge conflict in include/acpi/acpixf.h 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) CONFLICT (content): Merge conflict in drivers/thermal/thermal_sys.c CONFLICT (content): Merge conflict in drivers/staging/omap-thermal/omap-thermal-common.c Applying: thermal: fix for for MAX_ID_MASK to MAX_IDR_MASK rename Merging ieee1394/for-next (4d50c44 firewire: addendum to address handler RCU conversion) Merging ubi/linux-next (76ac66e UBI: Wire-up fastmap) Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from user) Merging scsi/for-next (1d4329f [SCSI] lpfc 8.3.35: Update lpfc version for 8.3.35 driver release) Merging target-updates/for-next (cf0eb28 iscsi-target: Bump defaults for nopin_timeout + nopin_response_timeout values) 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 (d0fc905 dma: tegra: fix interrupt name issue with apb dma.) CONFLICT (content): Merge conflict in drivers/spi/spi-davinci.c CONFLICT (content): Merge conflict in drivers/mmc/host/davinci_mmc.c CONFLICT (content): Merge conflict in drivers/dma/mmp_tdma.c 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 (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc) Merging wireless-next/master (5160b46 ath9k: Fix BTCOEX weight initialization) Merging bluetooth/master (8936fa6 Bluetooth: L2CAP: Fix using default Flush Timeout for EFS) Merging mtd/master (e2d3a35 mtd: nand: detect Samsung K9GBG08U0A, K9GAG08U0F ID) CONFLICT (content): Merge conflict in drivers/mtd/nand/orion_nand.c CONFLICT (modify/delete): drivers/mtd/nand/nand_bcm_umi.h deleted in mtd/master and modified in HEAD. Version HEAD of drivers/mtd/nand/nand_bcm_umi.h left in tree. CONFLICT (modify/delete): drivers/mtd/nand/bcm_umi_nand.c deleted in mtd/master and modified in HEAD. Version HEAD 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 arch/arm/mach-imx/clk-imx51-imx53.c CONFLICT (modify/delete): arch/arm/configs/bcmring_defconfig deleted in HEAD and modified in mtd/master. Version mtd/master of arch/arm/configs/bcmring_defconfig left in tree. CONFLICT (content): Merge conflict in MAINTAINERS $ git rm -f arch/arm/configs/bcmring_defconfig drivers/mtd/nand/bcm_umi_nand.c drivers/mtd/nand/nand_bcm_umi.h Merging l2-mtd/master (35c241d mtd: onenand: Make flexonenand_set_boundary static) Merging crypto/master (c9f97a2 crypto: x86/glue_helper - fix storing of new IV in CBC encryption) Merging drm/drm-next (1f31c69 Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next) Merging sound/for-next (5c2e4e0 ALSA: hda - make Cirrus codec use generic unsol event handler) Merging sound-asoc/for-next (a1b98e1 ASoC: wm2200: Fix non-inverted OUT2 mute control) Merging modules/modules-next (3a7989c X.509: Fix indefinite length element skip error handling) CONFLICT (content): Merge conflict in init/Kconfig CONFLICT (content): Merge conflict in arch/xtensa/Kconfig CONFLICT (content): Merge conflict in arch/x86/um/Kconfig CONFLICT (content): Merge conflict in arch/x86/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/Kconfig CONFLICT (content): Merge conflict in Makefile Merging virtio/virtio-next (d43b716 Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild) Merging input/next (7f8d4ca Input: extend the number of event (and other) devices) 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) CONFLICT (content): Merge conflict in init/Kconfig Merging quilt/device-mapper (24d047b Use the recently-added bio front_pad field to allocate struct dm_target_io.) CONFLICT (content): Merge conflict in drivers/md/dm.c CONFLICT (content): Merge conflict in drivers/md/dm-thin.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 (a1487fb mmc: rtsx_pci_sdmmc: Add realtek pcie sdmmc host driver) CONFLICT (content): Merge conflict in drivers/mmc/host/omap.c CONFLICT (content): Merge conflict in drivers/mmc/host/davinci_mmc.c Merging kgdb/kgdb-next (08f9553 tty/console: fix warnings in drivers/tty/serial/kgdboc.c) Merging slab/for-next (e2087be Merge branch 'slab/tracing' into slab/for-linus) Merging uclinux/for-next (a0d271c Linux 3.6) 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 (74d8378 ARM: dts: Enable 88pm860x pmic) Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes) Merging fbdev/fbdev-next (ebe9f7b video: exynos_mipi_dsi: Remove unnecessary NULL check) 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 HEAD and modified in fbdev/fbdev-next. Version fbdev/fbdev-next of drivers/video/epson1355fb.c left in tree. CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-real6410.c CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-mini6410.c $ git rm -f drivers/video/epson1355fb.c 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) CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dispc.c CONFLICT (content): Merge conflict in drivers/video/omap2/displays/panel-taal.c CONFLICT (content): Merge conflict in drivers/video/omap/lcd_ams_delta.c 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) 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 (0094872 Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next) Merging vfio/next (f448d31 vfio: Fix PCI INTx disable consistency) Merging osd/linux-next (7f8d145 pnfs_osd_xdr: Remove unused #include from pnfs_osd_xdr.h) Merging jc_docs/docs-next (5c050fb docs: update the development process document) Merging trivial/for-next (9c33c51 doc: fix old config name of kprobetrace) Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging pm/linux-next (df5a2a1 Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394) 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 (36165f5 MAINTAINERS: add scripts/dtc under Devicetree maintainers) Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices) Merging spi-mb/spi-next (43e37b0 spi: tsc2005: delete soon-obsolete e-mail address) Merging tip/auto-latest (6b90cb2 Merge branch 'sched/urgent') 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 (3d11df7 KVM: s390: Fix vcpu_load handling in interrupt code) Merging kvm-ppc/kvm-ppc-next (2c4eb8b KVM: PPC: Move mtspr/mfspr emulation into own functions) 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 (8825f04 Merge branch 'stable/for-linus-3.7' into linux-next) Applying: The Xen tree tries to add a line to arch/arm/mach-vexpress/Makefile.boot that has been removed by the following commit in Linus' master: 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) 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()) Merging tty/tty-next (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm) Merging usb/usb-next (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm) Merging staging/staging-next (e187895 staging: comedi: jr3_pci: fix iomem dereference) Merging char-misc/char-misc-next (5dc2db0 drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init) 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 (e1b2dc7 pinctrl: add bcm2835 driver) 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 (ed26d19 remoteproc: fix (again) the virtio-related build breakage) 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 (901acf5 gpio: pcf857x: select IRQ_DOMAIN) Merging arm-soc/for-next (fdb1cd7 Merge branch 'fixes' into for-next) 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 (a0d271c Linux 3.6) Merging renesas/next (b681273 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 Merging tegra/for-next (979570e Linux 3.6-rc7) Merging kvmtool/master (da22ea8 kvm tools: Do setup_fdt() later, get powerpc to boot again) Merging dma-mapping/dma-mapping-next (461b6f0 Merge branch 'next-cleanup' into for-v3.7) Merging pwm/for-next (85f8879 pwm: dt: Fix description of second PWM cell) Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment()) Merging userns/for-next (5545730 userns: Properly print bluetooth socket uids) Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements) Merging signal/for-next (12f79be alpha: don't open-code trace_report_syscall_{enter,exit}) CONFLICT (content): Merge conflict in fs/exec.c CONFLICT (content): Merge conflict in arch/xtensa/include/asm/Kbuild 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/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/mn10300/Kconfig CONFLICT (content): Merge conflict in arch/microblaze/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/m68k/Kconfig CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/ia64/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/frv/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/avr32/include/asm/Kbuild 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: fs/debugsfs: remove unnecessary inode->i_private initialization Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call Applying: timeconst.pl: remove deprecated defined(@array) Applying: time: don't inline EXPORT_SYMBOL functions Applying: compiler-gcc4.h: correct verion check for __compiletime_error Applying: h8300: select generic atomic64_t support Applying: readahead: fault retry breaks mmap file read random detection 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 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() Applying: mempolicy-fix-a-memory-corruption-by-refcount-imbalance-in-alloc_pages_vma-v2 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: 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: score: select generic atomic64_t support 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/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: 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: ipc/sem.c: alternatives to preempt_disable() Applying: prio_tree: fix fs/block_dev.c for removal of prio_tree Applying: fs/block_dev.c:set_blocksize(): use mapping_mapped() Merging akpm/master (2ad4dcc fs/block_dev.c:set_blocksize(): use mapping_mapped())
Attachment:
pgpw36HOtd2sH.pgp
Description: PGP signature
