Hi all, Changes since 20120824: The pci tree gained conflicts against Linus' tree. The v4l-dvb tree gained a conflict against the arm tree. The ubi tree lost its build failure. The scsi tree lost its conflict. The drm tree lost its build failure and conflicts. The sound tree lost its build failure. The net-next tree gained a build failure for which I reverted a merge (3 commits). The rcu tree lost a conflict. The kvm tree lost its build failure. The kvm-ppc tree gained a conflict against the kvm tree. The char-misc tree lost its conflict. The arm-soc tree gained a conflict against the arm-current tree. I have gone back to using the signal tree as supplied by the maintiner. ---------------------------------------------------------------------------- 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 196 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@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (5b716ac Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.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 (6c7080a firmware: fix directory creation rule matching with make 3.82) Merging arm-current/fixes (36418c5 ARM: 7499/1: mm: Fix vmalloc overlap check for !HIGHMEM) Merging m68k-current/for-linus (3be7184 m68k: Add missing RCU idle APIs on idle loop) Merging powerpc-merge/merge (2c39bf4 Revert "powerpc: Update g5_defconfig") Merging sparc/master (6dab7ed Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm) Merging net/master (9fef768 mISDN: fix possible memory leak in hfcmulti_init()) Merging sound-current/for-linus (2e4a263 ALSA: snd-usb: fix cross-interface streaming devices) Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled) Merging wireless/master (c6b6eed Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) Merging driver-core.current/driver-core-linus (fea7a08 Linux 3.6-rc3) Merging tty.current/tty-linus (fea7a08 Linux 3.6-rc3) Merging usb.current/usb-linus (fea7a08 Linux 3.6-rc3) Merging staging.current/staging-linus (fea7a08 Linux 3.6-rc3) Merging char-misc.current/char-misc-linus (fea7a08 Linux 3.6-rc3) Merging input-current/for-linus (6f4d038 Input: wacom - add support for EMR on Cintiq 24HD touch) Merging md-current/for-linus (58e94ae md/raid1: close some possible races on write errors during resync) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (ce026cb crypto: caam - fix possible deadlock condition) 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 (17a962a Merge branches 'fixes' and 'misc' 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 blackfin/for-linus (719154c bf60x: fix build warning) Merging c6x/for-linux-next (01ddd9a C6X: select GENERIC_ATOMIC64) 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 (a119365 [IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts) Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR) Merging m68knommu/for-next (c4d1911 m68k: drop unused parts of 68VZ328 Makefile) Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd) Merging mips/mips-for-linux-next (84733d1 Merge branch 'next/p1/for-linus' into mips-for-linux-next) Merging openrisc/for-upstream (807607f openrisc: delay: fix handling of counter overflow) Merging parisc/for-next (5b24c42 [PARISC] fix personality flag check in copy_thread()) Merging powerpc/next (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging 4xx/next (2074b1d powerpc: Fix irq distribution) Merging mpc5xxx/next (4d2f4e1 powerpc: Option FB_FSL_DIU is not really optional for mpc512x) Merging galak/next (087979d powerpc/8544ds: add partition table for norflash) Merging s390/features (3fb5f82 s390: update defconfig) Merging sh/sh-latest (d4b7c5d sh: intc: Fix up multi-evt irq association.) Merging sparc-next/master (699871b sparc64: Fix bugs in unrolled 256-bit loops.) Merging tile/master (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler) Merging xtensa/for_next (499d9ec xtensa: ISS: exit simulator in case of halt or panic) Merging ceph/master (1fe5e99 rbd: create rbd_refresh_helper()) Merging cifs/for-next (ea7b488 CIFS: Fix cifs_do_create error hadnling) 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 (378b8e1 udf: add writepages support for udf) Merging ext4/dev (8a2f846 ext4: remove duplicated declarations in inode.c) Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig) Merging gfs2/master (667314b GFS2: Stop block extents at the end of bitmaps) Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf()) Merging nfs/linux-next (0866004 NFSv3: Ensure that do_proc_get_root() reports errors correctly) Merging nfsd/nfsd-next (21179d8 knfsd: don't allocate file_locks on the stack) 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 (4cbe5a5 Linux 3.6-rc4) Merging ubifs/linux-next (3668b70 UBIFS: print less) Merging xfs/for-next (b686d1f xfs: xfs_seek_hole() refinement with hole searching from page cache for unwritten extents) Merging vfs/for-next (61a1384 fanotify: sanitize failure exits in copy_event_to_user()) Merging pci/next (7bf79d8 Merge branch 'pci/bjorn-cleanup-remove' into next) CONFLICT (content): Merge conflict in drivers/rapidio/devices/tsi721.c CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c Merging hid/for-next (a610835 Merge branch 'upstream' into for-next) Merging quilt/i2c (0e27487 i2c: Convert struct i2c_msg initialization to C99 format) Merging i2c-embedded/i2c-embedded/for-next (c7751af ARM: davinci: i2c: add OF support) Merging quilt/jdelvare-hwmon (4ac1223 hwmon: (coretemp) Use get_online_cpus to avoid races involving CPU hotplug) Merging hwmon-staging/hwmon-next (3d4bdfd hwmon: (sht15) remove multiple driver registration) Merging v4l-dvb/master (624bfcc Merge /home/v4l/v4l/patchwork) CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c Merging kbuild/for-next (c781288 Merge branches 'kbuild/kbuild', 'kbuild/kconfig' and 'kbuild/misc' into kbuild/for-next) Merging kconfig/for-next (45f4c81 localmodconfig: Use my variable for loop in streamline_config.pl) Merging libata/NEXT (1b26d29 [libata] scsi: implement MODE SELECT command) Merging infiniband/for-next (fea7a08 Linux 3.6-rc3) Merging pstore/master (b4a871b pstore/ram: Add missing platform_device_unregister) Merging acpi/next (9d0b01a Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie' into base) 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 (449488c thermal: Fix potential NULL pointer accesses) Merging ieee1394/for-next (e3cbd92 firewire: core: document is_local sysfs attribute) Merging ubi/linux-next (7b23500 UBI: load after UBI mtd device drivers) Merging dlm/next (9c5bef5 dlm: cleanup send_to_sock routine) Merging scsi/for-next (fec178b Merge branch 'misc' into for-next) Merging target-updates/for-next (5b04ecc target: Drop se_subsystem_api->[write_cache,fua_write]_emulated flags) 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 (b5f1433 spi: davici - make davinci select edma) Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops) Merging net-next/master (684bad1 tcp: use PRR to reduce cwin in CWR state) Merging wireless-next/master (a4881cc Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next) Merging bluetooth/master (7cfeb86 Bluetooth: Use GFP_KERNEL in read_index_list) Merging mtd/master (2361f73 Merge tag 'v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux) Merging l2-mtd/master (ea9d312 mtd: cmdlinepart: minor cleanups) Merging crypto/master (e763eb6 crypto: talitos - add IPsec ESN support) Merging drm/drm-next (85f9e50 drm/i915: move i915_get_extra_insdone out of CONFIG_DEBUG_FS block) Merging sound/for-next (c05fce5 ALSA: USB: Support for (original) Xbox Communicator) Merging sound-asoc/for-next (ba846b3 Merge branch 'for-3.7' into asoc-next) Merging quilt/rr (4e15ac6 virtio-blk: Add REQ_FLUSH and REQ_FUA support to bio path) CONFLICT (content): Merge conflict in arch/xtensa/Kconfig CONFLICT (content): Merge conflict in arch/s390/Kconfig CONFLICT (content): Merge conflict in arch/mips/kernel/module.c CONFLICT (content): Merge conflict in arch/alpha/Kconfig Merging input/next (bd68dfe Input: s3c2410_ts - make s3c_ts_pmops const) Merging input-mt/for-next (4cbe5a5 Linux 3.6-rc4) Merging cgroup/for-next (4b2ebf0 Merge branch 'for-3.6' into for-next) Merging block/for-next (79df9b4 Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-linus) Merging quilt/device-mapper (057d040 Overflow checking in dm-verity was not sufficient. It would check overflow if sector_t was smaller than long long but not if sector_t and long long have the same size. This patch implements proper overflow checking.) 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 (1ad48b6 mmc: via-sdmmc: Use module_pci_driver) Merging kgdb/kgdb-next (15d7ea0 kgdboc: Accept either kbd or kdb to activate the vga + keyboard kdb shell) Merging slab/for-next (01ff108 Merge branch 'slab/urgent' into for-next) Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**") Merging md/for-next (eef0978 md: avoid taking the mutex on some ioctls.) Merging mfd/for-next (092369e mfd: lpc_ich: Fix a 3.5 kernel regression for iTCO_wdt driver) Merging battery/master (2815b78 power_supply: Add new power supply properties CHARGE_CURRENT/VOLTAGE_MAX) Merging fbdev/fbdev-next (75435c7 video: exynos_dp: move setting analog parameter and interrupt to after sw reset) Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) Merging omap_dss2/for-next (974a658 Merge "Apply LCD manager related parameters" from Archit) Merging regulator/for-next (6250ed8 Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/drivers' and 'regulator/topic/tol' into regulator-next) Merging security/next (f84fdff driver: add PPI support in tpm driver) Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409) Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) Merging watchdog/master (318e151 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) Merging iommu/next (6f286cc Merge branches 'iommu/fixes' and 'arm/tegra' into next) Merging vfio/next (d987569 Linux 3.6-rc2) 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 (4907cb7 treewide: fix comment/printk/variable typos) Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging pm/linux-next (4609919 Merge branch 'pm-sleep-next' into linux-next) Merging apm/for-next (f07bb36 x86, apm: Make on_cpu0() use workqueue instead of work_on_cpu()) Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls) CONFLICT (content): Merge conflict in kernel/audit_tree.c Merging edac/linux_next (a92cdec Merge branch 'devel' into next) 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 (5d61b16 of: Allow busses with #size-cells=0) Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices) Merging spi-mb/spi-next (1d045dd Merge branch 'spi-mxs' into spi-next) Merging tip/auto-latest (433ed0e Merge branch 'tools/kvm') CONFLICT (content): Merge conflict in arch/Kconfig Merging rcu/rcu/next (17da987 Merge branches 'bigrt.2012.08.28a', 'doctorture.2012.08.28a', 'fixes.2012.08.28a', 'hotplug.2012.08.28a' and 'idle.2012.08.24a' into HEAD) CONFLICT (content): Merge conflict in kernel/rcutree_plugin.h CONFLICT (content): Merge conflict in kernel/rcutree.h CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/Kconfig 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 (9a78197 KVM: x86: remove unused variable from kvm_task_switch()) CONFLICT (content): Merge conflict in arch/s390/include/asm/processor.h Merging kvm-ppc/kvm-ppc-next (e9908a4 KVM: PPC: BookE: Support FPU on non-hv systems) CONFLICT (content): Merge conflict in include/linux/kvm.h CONFLICT (content): Merge conflict in arch/powerpc/kvm/e500_tlb.c CONFLICT (content): Merge conflict in arch/powerpc/include/asm/kvm_ppc.h Merging oprofile/for-next (c16fa4f Linux 3.3) 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 (7b124e0 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 (136b572 workqueue: deprecate __cancel_delayed_work()) 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 (973713e classmate-laptop: always call input_sync() after input_report_switch()) 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 (c7700f9 Merge tag 'topic/domain' into regmap-next) Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (53dcb2d leds: triggers: send uevent when changing triggers) Merging driver-core/driver-core-next (82aceae debugfs: more tightly restrict default mount mode) Merging tty/tty-next (e372dc6 Merge 3.6-rc3 into tty-next) Merging usb/usb-next (a7bdf7f Merge v3.6-rc3 into usb-next) Merging staging/staging-next (8f8b77b Merge 3.6-rc3 into staging-next) Merging char-misc/char-misc-next (7da59d2 Merge v3.6-rc3 into 'char-misc-next') Merging tmem/linux-next (15773b6 Merge branch 'stable/for-linus-3.6' into linux-next) Merging writeback/writeback-for-next (7034ed1 backing-dev: use kstrto* in preference to simple_strtoul) 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 (5ee9093 Merge branch 'devel' into for-next) 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 (6bb697b MAINTAINERS: add remoteproc's git) 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 (0ecb589 Merge branch 'devel' into for-next) Merging arm-soc/for-next (6486a93 Merge branch 'next/drivers' into for-next) CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c Merging ep93xx/ep93xx-for-next (fbad878 Merge branch 'ep93xx-cleanup' into ep93xx-for-next) Merging renesas/next (37ee191 Merge branches 'armadillo800eva', 'marzen', 'kzm9g', 'kzm9g-gpio', 'soc-core', 'r8a7740', 'fixes' and 'ag5evm' into next) Merging samsung/for-next (c1f9bee Merge branch 'next/board-samsung' into for-next) Merging tegra/for-next (f109140 Merge branch 'for-3.7/defconfig' into for-next) Merging kvmtool/master (ecd036b kvm tools: add HOME env var to hostfs) Merging dma-mapping/dma-mapping-next (02af08b Merge branch 'next-cleanup' into HEAD) Merging pwm/for-next (c5d0b8a pwm: add devm_pwm_get() and devm_pwm_put()) Merging dma-buf/for-next (42a579a Merge branches 'timers-urgent-for-linus' and 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging userns/for-next (898132a ipv6: move dereference after check in fl_free()) Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS) Merging signal/for-next (fed65c8 alpha: don't open-code trace_report_syscall_{enter,exit}) CONFLICT (content): Merge conflict in arch/x86/kernel/signal.c 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 Merging clk/clk-next (f9a6aa4 clk: convert ARM RealView to common clk) Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf()) Merging scsi-post-merge/merge-base:master () $ git checkout akpm 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: mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it 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: timeconst.pl: remove deprecated defined(@array) Applying: time: don't inline EXPORT_SYMBOL functions Applying: thermal: add generic cpufreq cooling implementation Applying: hwmon: exynos4: move thermal sensor driver to driver/thermal directory Applying: thermal: exynos5: add exynos5 thermal sensor driver support Applying: thermal: exynos: register the tmu sensor with the kernel thermal layer Applying: ARM: exynos: add thermal sensor driver platform data support Applying: drivers/scsi/atp870u.c: fix bad use of udelay Applying: vfs: increment iversion when a file is truncated Applying: fs: push rcu_barrier() from deactivate_locked_super() to filesystems Applying: mm/slab: remove duplicate check Applying: mm: remove __GFP_NO_KSWAPD Applying: mm: remove __GFP_NO_KSWAPD fixes Applying: remove-__gfp_no_kswapd-fixes-fix 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: frv: kill used but uninitialized variable 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: 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: rb_erase updates and comments Applying: rbtree: optimize fetching of sibling node 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: fat (exportfs): move NFS support code Applying: fat (exportfs): fix dentry reconnection Applying: ipc/sem.c: alternatives to preempt_disable() Merging akpm/master (d0d0486 ipc/sem.c: alternatives to preempt_disable()) [master 0894c76] Revert "Merge branch 'tcp_fastopen_server'"