Hi all, Please do not add anything to linux-next included branches/series that is destined for v3.7 until after v3.6-rc1 is released. Reminder: do not rebase your branches before asking Linus to pull them ... Changes since 20120723: The nfs tree lost its conflict. The device-mapper tree lost its conflicts. The tty tree still has its build failures for which I have disabled 2 staging drivers and applied a patch. I have still reverted 3 commits from the signal tree at the request of the arm maintainer. ---------------------------------------------------------------------------- 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 197 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 (0ec4f43 locks: fix checking of fcntl_setlease argument) 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 (f8f5701 Linux 3.5-rc1) Merging arm-current/fixes (ff081e0 ARM: 7457/1: smp: Fix suspicious RCU originating from cpu_die()) Merging m68k-current/for-linus (1525e06 m68k/apollo: Rename "timer" to "apollo_timer") Merging powerpc-merge/merge (50fb31c tty/hvc_opal: Fix debug function name) Merging sparc/master (d55de60 sparc64: remove unused function straddles_64bit_va_hole()) Merging net/master (3e4b945 Merge tag 'md-3.5-fixes' of git://neil.brown.name/md) Merging sound-current/for-linus (c1b623d Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next) Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) Merging wireless/master (8a70e7f NFC: NCI module license 'unspecified' taints kernel) Merging driver-core.current/driver-core-linus (84a1caf Linux 3.5-rc7) Merging tty.current/tty-linus (84a1caf Linux 3.5-rc7) Merging usb.current/usb-linus (84a1caf Linux 3.5-rc7) Merging staging.current/staging-linus (6887a41 Linux 3.5-rc5) Merging char-misc.current/char-misc-linus (84a1caf Linux 3.5-rc7) Merging input-current/for-linus (e76b8ee Input: xpad - add Andamiro Pump It Up pad) 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 (c475c06 hwrng: atmel-rng - fix data valid check) Merging ide/master (39a50b4 Merge branch 'hfsplus') 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 (dea2ea3 Merge branches 'audit', 'delay', 'dmaengine', 'fixes', 'misc' and 'sta2x11' into for-next) Merging arm-perf/for-next/perf (dee8c1b ARM: perf: remove arm_perf_pmu_ids global enumeration) Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers) Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) Merging blackfin/for-linus (c98eee6 bf60x: fix build warning) Merging c6x/for-linux-next (b9b8722 C6X: clean up compiler warning) 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 (e9c31b3 debug: Do not permit CONFIG_DEBUG_STACK_USAGE=y on IA64 or PARISC) Merging m68k/for-next (1525e06 m68k/apollo: Rename "timer" to "apollo_timer") Merging m68knommu/for-next (b1f7735 m68k: allow PCI bus to be enabled for ColdFire m54xx CPUs) Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd) Merging mips/mips-for-linux-next (9ee6689 Merge branch 'next/netlogic' into mips-for-linux-next) Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic syscall) Merging parisc/for-next (4c01acc [PARISC] fix code to find libgcc) Merging powerpc/next (574ce79 powerpc/mpic: Create a revmap with enough entries for IPIs and timers) 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 (9082d70 powerpc/85xx: P3041DS - change espi input-clock from 40MHz to 35MHz) Merging s390/features (27f6b41 s390/vtimer: rework virtual timer interface) Merging sh/sh-latest (9ff561f Merge branch 'common/pinctrl' into sh-latest) Merging sparc-next/master (31a6710 Fix blocking allocations called very early during bootup) Merging tile/master (f6d2ce0 tile: updates to pci root complex from community feedback) Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler) Merging ceph/master (26ce171 libceph: fix NULL dereference in reset_connection()) CONFLICT (content): Merge conflict in net/ceph/osd_client.c CONFLICT (content): Merge conflict in net/ceph/messenger.c Merging cifs/for-next (762a420 cifs: rename cifs_sign_smb2 to cifs_sign_smbv) 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 (5f5b331 eCryptfs: check for eCryptfs cipher support at mount) Merging ext3/for_next (0143fc5 udf: avoid info leak on export) Merging ext4/dev (03179fe ext4: undo ext4_calc_metadata_amount if we fail to claim space) Merging fuse/for-next (f3840dc fuse: add missing INIT flag descriptions) Merging gfs2/master (15e1c96 GFS2: Eliminate 64-bit divides) Merging logfs/master (9f0bbd8 logfs: query block device for number of pages to send with bio) Merging nfs/linux-next (4886e15 Merge branch 'nfs-for-3.6' into linux-next) Merging nfsd/nfsd-next (200724a SUNRPC/cache: fix reporting of expired cache entries in 'content' file.) Merging ocfs2/linux-next (2dfd060 aio: make kiocb->private NUll in init_sync_kiocb()) 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 (5fcb08b 9p: BUG before corrupting memory) Merging ubifs/linux-next (7074e5e UBIFS: remove invalid reference to list iterator variable) Merging xfs/for-next (824c313 xfs: remove xfs_ialloc_find_free) CONFLICT (content): Merge conflict in fs/xfs/xfs_log_priv.h CONFLICT (content): Merge conflict in fs/xfs/xfs_log.c CONFLICT (content): Merge conflict in fs/xfs/xfs_buf.c Merging vfs/for-next (8cae6f7 ext4: switch EXT4_IOC_RESIZE_FS to mnt_want_write_file()) Merging pci/next (63b96f7 Merge branch 'pci/yinghai-pciehp-unused' into next) Merging hid/for-next (6a2ef9e Merge branch 'upstream' into for-next) Merging quilt/i2c (d41b9d8 i2c-omap: Add support for I2C_M_STOP message flag) Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap) CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c Merging i2c-embedded/i2c-embedded/for-next (b61d157 I2C: MV64XYZ: Add Device Tree support) Merging quilt/jdelvare-hwmon (3eae00e hwmon: struct x86_cpu_id arrays can be __initconst) Merging hwmon-staging/hwmon-next (e30bca1 hwmon: (applesmc) Ignore some temperature registers) Merging v4l-dvb/master (07c4a1e Merge /home/v4l/v4l/patchwork) CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Applying: Use a named union in struct v4l2_ioctl_info Merging kbuild/for-next (3cd44c2 Merge branches 'kbuild/kconfig' and 'kbuild/misc' into kbuild/for-next) Merging kconfig/for-next (4503379 localmodconfig: Add debug environment variable LOCALMODCONFIG_DEBUG) Merging libata/NEXT (ee32108 libata-acpi: add missing inlines in libata.h) Applying: libata-acpi: fix up for acpi_pm_device_sleep_state API change Merging infiniband/for-next (4c1bee0 Merge branch 'qib' into for-next) Merging acpi/next (aa1ef40 Merge branch 'turbostat-v2' into next) CONFLICT (content): Merge conflict in drivers/pci/pci-acpi.c Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules) 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 ieee1394/for-next (e3cbd92 firewire: core: document is_local sysfs attribute) Merging ubi/linux-next (87e773c UBI: harmonize the update of ubi->beb_rsvd_pebs) Merging dlm/next (96006ea dlm: fix missing dir remove) Merging scsi/for-next (b49951e [SCSI] isci: implement suspend/resume support) CONFLICT (content): Merge conflict in include/scsi/scsi_device.h CONFLICT (content): Merge conflict in drivers/ata/libata-core.c Merging target-updates/for-next (bf6932f iscsi-target: Drop bogus struct file usage for iSCSI/SCTP) Merging target-merge/for-next-merge (5061731 tcm_vhost: Initial merge for vhost level target fabric driver) 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 (6343325 dmaengine: Cleanup logging messages) CONFLICT (content): Merge conflict in drivers/mmc/host/sh_mmcif.c CONFLICT (content): Merge conflict in drivers/dma/Makefile CONFLICT (content): Merge conflict in drivers/dma/Kconfig Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops) Merging net-next/master (fe3edf4 ipv4: Remove all RTCF_DIRECTSRC handliing.) CONFLICT (content): Merge conflict in include/linux/mlx4/device.h CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx4/main.c Merging wireless-next/master (36eb22e libertas: firmware.c: remove duplicated include) Merging bluetooth/master (500b07f Bluetooth: Fix processing A2MP chan in security_cfm) Merging mtd/master (4800399 mtd: m25p80: Add support for serial flash STM/Micron N25Q032) Merging l2-mtd/master (cd0a30d mtd: m25p80: Fix the Spansion chip detection) Merging crypto/master (a434788 crypto: twofish-avx - remove useless instruction) Merging drm/drm-next (e6b0b6a Merge tag 'v3.5-rc7' into drm-next) CONFLICT (content): Merge conflict in include/linux/pci_regs.h Merging sound/for-next (c1b623d Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next) Merging sound-asoc/for-next (b8edf3e ASoC: wm8994: Ensure there are enough BCLKs for four channels) Merging quilt/rr (befbe03 cpumask: cpulist_parse() comments correction) Merging input/next (07b8481 Input: add MELFAS mms114 touchscreen driver) Merging input-mt/for-next (c45361a Revert "Input: atmel_mxt_ts - warn if sysfs could not be created") Merging cgroup/for-next (4b2ebf0 Merge branch 'for-3.6' into for-next) Merging block/for-next (f45d342 Merge branch 'for-linus' into for-next) Merging quilt/device-mapper (1a3c859 Introduce dm_pool_abort_metadata to abort the current metadata transaction. Generally this will only be called when bad things are happening and dm-thin is trying to roll back to a good state for read-only mode.) 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 (30b87c6 mmc: sdhci-dove: Prepare for common clock framework) Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()) Merging slab/for-next (44a8bde slob: Fix early boot kernel crash) Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**") Merging md/for-next (cd853a6 md: avoid taking the mutex on some ioctls.) Merging mfd/for-next (9247135 mfd: Matches should be NULL when populate anatop child devices) CONFLICT (modify/delete): include/linux/mfd/s5m87xx/s5m-core.h deleted in mfd/for-next and modified in HEAD. Version HEAD of include/linux/mfd/s5m87xx/s5m-core.h left in tree. CONFLICT (content): Merge conflict in drivers/regulator/s5m8767.c CONFLICT (content): Merge conflict in drivers/mfd/mc13xxx-spi.c $ git rm -f include/linux/mfd/s5m87xx/s5m-core.h Merging battery/master (ecc2edd olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteries) Applying: ACPI-Thermal: fix for an API change Merging fbdev/fbdev-next (6fcdbc0 s3fb: Add Virge/MX (86C260)) 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) CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dispc.c CONFLICT (content): Merge conflict in drivers/video/omap2/dss/core.c Merging regulator/for-next (3384fb9 Merge branch 'regulator-drivers' into regulator-next) Merging security/next (6637284 Smack: Maintainer Record) Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409) Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) Merging watchdog/master (6508cc6 watchdog: orion_wdt: Convert driver to watchdog core) Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) Merging iommu/next (395e51f Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next) Merging vfio/next (7d279b2 vfio: Add PCI device driver) Merging osd/linux-next (a7fdf6a exofs: stop using s_dirt) Merging jc_docs/docs-next (5c050fb docs: update the development process document) Merging trivial/for-next (f902831 Documentation: Add newline at end-of-file to files lacking one) Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging pm/linux-next (26ba678 Merge branch 'master' into linux-next) Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl) Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls) 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 (e95d8aa of: mtd: nuke useless const qualifier) Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices) Merging spi-mb/spi-next (8ceffa7 spi/orion: remove uneeded spi_info) Merging tip/auto-latest (c6953be Merge branch 'x86/platform') CONFLICT (content): Merge conflict in mm/slub.c CONFLICT (content): Merge conflict in mm/slab.c CONFLICT (content): Merge conflict in kernel/fork.c Merging rcu/rcu/next (5cf05ad rcu: Fix broken strings in RCU's source code.) 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 (1a577b7 KVM: fix race with level interrupts) CONFLICT (content): Merge conflict in arch/s390/kvm/sigp.c CONFLICT (add/add): Merge conflict in arch/s390/include/asm/sigp.h CONFLICT (content): Merge conflict in arch/powerpc/kvm/booke_interrupts.S CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt Merging kvm-ppc/kvm-ppc-next (1ee245b KVM: PPC: Critical interrupt emulation support) CONFLICT (content): Merge conflict in arch/powerpc/kvm/booke_interrupts.S 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 (64b0a47 Merge commit 'v3.5-rc7' 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 (6fec10a workqueue: fix spurious CPU locality WARN from process_one_work()) Merging drivers-x86/linux-next (3fc1ae3 ACER: Add support for accelerometer sensor) 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 (38e2319 Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next) Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (7dc2c574 leds/leds-s3c24xx: use devm_gpio_request) Merging driver-core/driver-core-next (6791457 printk: Export struct log size and member offsets through vmcoreinfo) Merging tty/tty-next (373f5ae pcmcia,synclink_cs: fix termios port I missed) Applying: disable SERIAL_IPOCTAL broken by tty updates Applying: disable USB_SERIAL_QUATECH2 broken by tty update Applying: tty: fix up usb serial console for termios change. Merging usb/usb-next (e387ef5 usb: Add USB_QUIRK_RESET_RESUME for all Logitech UVC webcams) CONFLICT (content): Merge conflict in include/scsi/scsi_device.h Merging staging/staging-next (419e926 staging: csr: delete a bunch of unused library functions) CONFLICT (content): Merge conflict in drivers/staging/gdm72xx/netlink_k.c CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/s626.h Merging char-misc/char-misc-next (6078188 mei: use module_pci_driver) Merging tmem/linux-next (78821b2 Merge branch 'stable/for-linus-3.6' into linux-next) Merging writeback/writeback-for-next (331cbde writeback: Fix some comment errors) CONFLICT (content): Merge conflict in fs/sync.c 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 (8b8b091 pinctrl: Add one-register-per-pin type device tree based pinctrl driver) Merging moduleh/for-sfr (6b16351 Linux 3.5-rc4) Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support) CONFLICT (content): Merge conflict in drivers/net/tun.c Merging kmap_atomic/kmap_atomic (1e86b03 pipe: remove KM_USER0 from comments) 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) CONFLICT (content): Merge conflict in drivers/remoteproc/remoteproc_core.c Merging irqdomain/irqdomain/next (94f036a irqdomain: eliminate slow-path revmap lookups) Merging gpio/gpio/next (3e11f7b gpio/generic: initialize basic_mmio_gpio shadow variables properly) Merging gpio-lw/for-next (4fbb002 gpio: of_get_named_gpio_flags() return -EPROBE_DEFER if GPIO not yet available) Merging arm-soc/for-next (61a6aba arm-soc: describe individual branches) CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-nomadik.c CONFLICT (content): Merge conflict in drivers/gpio/gpio-mxc.c CONFLICT (content): Merge conflict in arch/arm/mach-imx/clk-imx6q.c Merging ep93xx/ep93xx-for-next (9b6a359 Merge branch 'ep93xx-fixes' into ep93xx-for-next) Merging renesas/next (45c7a01 Merge branch 'renesas-marzen' into renesas-board) Merging s5p/for-next (6701bca Merge branch 'next/board-samsung-3' into for-next) Merging tegra/for-next (a04ef1f Merge branch 'for-3.6/defconfig' into for-next) Merging kvmtool/master (8598de5 kvm tools, powerpc: Use MMU info for ibm,slb-size) Merging dma-mapping/dma-mapping-next (471e588 ARM: dma-mapping: fix build break on no-MMU platform) Merging pwm/for-next (d295b12 pwm: fix used-uninitialized warning in pwm_get()) CONFLICT (content): Merge conflict in drivers/pwm/pwm-samsung.c CONFLICT (content): Merge conflict in arch/arm/plat-samsung/Makefile CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-dt-tegra30.c CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-dt-tegra20.c Merging dma-buf/for-next (ca24a14 Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm) Merging userns/for-next (491fa9e userns: Allow the usernamespace support to build after the removal of usbfs) Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS) Merging signal/from-sfr (2e117f2 Revert "arm: pull all work_pending logics into C function") CONFLICT (content): Merge conflict in arch/powerpc/kernel/entry_64.S CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h Merging clk/clk-next (137f8a7 clk: fix compile for OF && !COMMON_CLK) CONFLICT (content): Merge conflict in drivers/clk/Makefile Merging random/dev (b423700 random: final removal of IRQF_SAMPLE_RANDOM) CONFLICT (content): Merge conflict in drivers/usb/gadget/omap_udc.c CONFLICT (content): Merge conflict in drivers/mfd/ab3100-core.c Merging scsi-post-merge/merge-base:master () $ git checkout akpm Applying: mm: fix wrong argument of migrate_huge_pages() in soft_offline_huge_page() Applying: pcdp: use early_ioremap/early_iounmap to access pcdp table Applying: cciss: fix incorrect scsi status reporting 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: arch/x86/include/asm/spinlock.h: fix comment Applying: arch/x86/kernel/cpu/perf_event_intel_uncore.h: make UNCORE_PMU_HRTIMER_INTERVAL 64-bit 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: prctl: remove redunant assignment of "error" to zero Applying: timeconst.pl: remove deprecated defined(@array) Applying: time: don't inline EXPORT_SYMBOL functions Applying: thermal: fix potential out-of-bounds memory access Applying: thermal: add Renesas R-Car thermal sensor support 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: ocfs2: use find_last_bit() Applying: ocfs2: use bitmap_weight() 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: fs/xattr.c:getxattr(): improve handling of allocation failures Applying: fs: make dumpable=2 require fully qualified path Applying: coredump: warn about unsafe suid_dumpable / core_pattern combo Applying: xtensa/mm/fault.c: port OOM changes to do_page_fault Applying: mm/slab: remove duplicate check Applying: slab: do not call compound_head() in page_get_cache() Applying: vmalloc: walk vmap_areas by sorted list instead of rb_next() Applying: mm: make vb_alloc() more foolproof Applying: mm-make-vb_alloc-more-foolproof-fix Applying: memcg: rename MEM_CGROUP_STAT_SWAPOUT as MEM_CGROUP_STAT_SWAP Applying: memcg: rename MEM_CGROUP_CHARGE_TYPE_MAPPED as MEM_CGROUP_CHARGE_TYPE_ANON Applying: memcg: remove MEM_CGROUP_CHARGE_TYPE_FORCE Applying: swap: allow swap readahead to be merged Applying: documentation: update how page-cluster affects swap I/O Applying: mm: account the total_vm in the vm_stat_account() Applying: mm/buddy: cleanup on should_fail_alloc_page Applying: mm: prepare for removal of obsolete /proc/sys/vm/nr_pdflush_threads Applying: hugetlb: rename max_hstate to hugetlb_max_hstate Applying: hugetlb: don't use ERR_PTR with VM_FAULT* values Applying: hugetlb: add an inline helper for finding hstate index Applying: hugetlb: use mmu_gather instead of a temporary linked list for accumulating pages Applying: hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb Applying: hugetlb: simplify migrate_huge_page() Applying: hugetlb: add a list for tracking in-use HugeTLB pages Applying: hugetlb: make some static variables global Applying: hugeltb: mark hugelb_max_hstate __read_mostly Applying: mm/hugetlb: add new HugeTLB cgroup Applying: mm-hugetlb-add-new-hugetlb-cgroup-fix Applying: mm-hugetlb-add-new-hugetlb-cgroup-fix-fix Applying: hugetlb/cgroup: remove unnecessary NULL checks Applying: hugetlb/cgroup: Mark root_h_cgroup static Applying: hugetlb/cgroup: add the cgroup pointer to page lru Applying: hugetlb/cgroup: add charge/uncharge routines for hugetlb cgroup Applying: hugetlb/cgroup: Remove unnecessary NULL checks Applying: mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge Applying: hugetlb/cgroup: add support for cgroup removal Applying: hugetlb/cgroup: add hugetlb cgroup control files Applying: hugetlb-cgroup-add-hugetlb-cgroup-control-files-fix Applying: hugetlb-cgroup-add-hugetlb-cgroup-control-files-fix-fix Applying: hugetlb/cgroup: migrate hugetlb cgroup info from oldpage to new page during migration Applying: hugetlb/cgroup: add HugeTLB controller documentation Applying: hugetlb: move all the in use pages to active list Applying: hugetlb/cgroup: assign the page hugetlb cgroup when we move the page to active list. Applying: hugetlb/cgroup: remove exclude and wakeup rmdir calls from migrate Applying: mm, oom: do not schedule if current has been killed Applying: mm/memblock.c:memblock_double_array(): cosmetic cleanups Applying: memcg: remove check for signal_pending() during rmdir() Applying: memcg: clean up force_empty_list() return value check Applying: memcg: mem_cgroup_move_parent() doesn't need gfp_mask Applying: memcg: make mem_cgroup_force_empty_list() return bool Applying: memcg-make-mem_cgroup_force_empty_list-return-bool-fix Applying: mm/compaction: cleanup on compaction_deferred Applying: mm, fadvise: don't return -EINVAL when filesystem cannot implement fadvise() Applying: mm-fadvise-dont-return-einval-when-filesystem-cannot-implement-fadvise-checkpatch-fixes Applying: mm: clear pages_scanned only if draining a pcp adds pages to the buddy allocator again Applying: mm, oom: fix potential killing of thread that is disabled from oom killing Applying: mm, oom: replace some information in tasklist dump Applying: mm: do not use page_count() without a page pin Applying: mm: clean up __count_immobile_pages() Applying: memcg: rename config variables Applying: memcg-rename-config-variables-fix Applying: memcg-rename-config-variables-fix-fix Applying: mm: remove unused LRU_ALL_EVICTABLE Applying: memcg: fix bad behavior in use_hierarchy file Applying: memcg: rename mem_control_xxx to memcg_xxx Applying: mm: have order > 0 compaction start off where it left Applying: mm-have-order-0-compaction-start-off-where-it-left-checkpatch-fixes Applying: mm: have order > 0 compaction start off where it left Applying: mm-have-order-0-compaction-start-off-where-it-left-v3-typo Applying: mm: CONFIG_HAVE_MEMBLOCK_NODE -> CONFIG_HAVE_MEMBLOCK_NODE_MAP Applying: vmscan: remove obsolete shrink_control comment Applying: mm/memory.c:print_vma_addr(): call up_read(&mm->mmap_sem) directly Applying: mm: setup pageblock_order before it's used by sparsemem Applying: mm/memcg: complete documentation for tcp memcg files Applying: mm/memcg: mem_cgroup_relize_xxx_limit can guarantee memcg->res.limit <= memcg->memsw.limit Applying: mm/memcg: replace inexistence move_lock_page_cgroup() by move_lock_mem_cgroup() in comment Applying: mm/hotplug: correctly setup fallback zonelists when creating new pgdat Applying: mm/hotplug: correctly add new zone to all other nodes' zone lists Applying: mm/hotplug: free zone->pageset when a zone becomes empty Applying: mm/hotplug: mark memory hotplug code in page_alloc.c as __meminit Applying: mm, oom: move declaration for mem_cgroup_out_of_memory to oom.h Applying: mm, oom: introduce helper function to process threads during scan Applying: mm, memcg: introduce own oom handler to iterate only over its own threads Applying: mm, oom: reduce dependency on tasklist_lock Applying: mm, oom: reduce dependency on tasklist_lock: fix Applying: mm, memcg: move all oom handling to memcontrol.c Applying: mm: factor out memory isolate functions Applying: mm: fix free page check in zone_watermark_ok() Applying: memory-hotplug: fix kswapd looping forever problem Applying: memory-hotplug-fix-kswapd-looping-forever-problem-fix Applying: memory-hotplug-fix-kswapd-looping-forever-problem-fix-fix Applying: mm: sl[au]b: add knowledge of PFMEMALLOC reserve pages Applying: mm: slub: optimise the SLUB fast path to avoid pfmemalloc checks Applying: mm: introduce __GFP_MEMALLOC to allow access to emergency reserves Applying: mm: allow PF_MEMALLOC from softirq context Applying: mm: only set page->pfmemalloc when ALLOC_NO_WATERMARKS was used Applying: mm: ignore mempolicies when using ALLOC_NO_WATERMARK Applying: net: introduce sk_gfp_atomic() to allow addition of GFP flags depending on the individual socket Applying: netvm: allow the use of __GFP_MEMALLOC by specific sockets Applying: netvm: allow skb allocation to use PFMEMALLOC reserves Applying: netvm: propagate page->pfmemalloc to skb Applying: netvm: propagate page->pfmemalloc from skb_alloc_page to skb Applying: netvm-propagate-page-pfmemalloc-from-skb_alloc_page-to-skb-fix Applying: netvm: set PF_MEMALLOC as appropriate during SKB processing Applying: mm: micro-optimise slab to avoid a function call Applying: nbd: set SOCK_MEMALLOC for access to PFMEMALLOC reserves Applying: mm: throttle direct reclaimers if PF_MEMALLOC reserves are low and swap is backed by network storage Applying: mm: account for the number of times direct reclaimers get throttled Applying: netvm: prevent a stream-specific deadlock Applying: selinux: tag avc cache alloc as non-critical Applying: mm: methods for teaching filesystems about PG_swapcache pages Applying: mm: add support for a filesystem to activate swap files and use direct_IO for writing swap pages Applying: mm: swap: implement generic handler for swap_activate Applying: mm: add get_kernel_page[s] for pinning of kernel addresses for I/O Applying: mm: add support for direct_IO to highmem pages Applying: nfs: teach the NFS client how to treat PG_swapcache pages Applying: nfs: disable data cache revalidation for swapfiles Applying: nfs: enable swap on NFS Applying: nfs: prevent page allocator recursions with swap over NFS. Applying: swapfile: avoid dereferencing bd_disk during swap_entry_free for network storage Applying: mm: memcg: fix compaction/migration failing due to memcg limits Applying: mm-memcg-fix-compaction-migration-failing-due-to-memcg-limits-checkpatch-fixes Applying: mm: swapfile: clean up unuse_pte race handling Applying: mm: memcg: push down PageSwapCache check into uncharge entry functions Applying: mm: memcg: only check for PageSwapCache when uncharging anon Applying: mm: memcg: move swapin charge functions above callsites Applying: mm: memcg: remove unneeded shmem charge type Applying: mm: memcg: remove needless !mm fixup to init_mm when charging Applying: mm: memcg: split swapin charge function into private and public part Applying: mm: memcg: only check swap cache pages for repeated charging Applying: mm: memcg: only check anon swapin page charges for swap cache Applying: mm: mmu_notifier: fix freed page still mapped in secondary MMU Applying: memcg: prevent OOM with too many dirty pages Applying: memcg: further prevent OOM with too many dirty pages Applying: memcg: add mem_cgroup_from_css() helper Applying: memcg-add-mem_cgroup_from_css-helper-fix Applying: shmem: provide vm_ops when also providing a mem policy Applying: tmpfs: interleave the starting node of /dev/shmem Applying: frv: kill used but uninitialized variable Applying: alpha: remove mysterious if zero-ed out includes Applying: avr32/mm/fault.c: port OOM changes to do_page_fault Applying: avr32-mm-faultc-port-oom-changes-to-do_page_fault-fix Applying: clk: add non CONFIG_HAVE_CLK routines Applying: clk: remove redundant depends on from drivers/Kconfig Applying: i2c/i2c-pxa: remove conditional compilation of clk code Applying: usb/marvell: remove conditional compilation of clk code Applying: usb/musb: remove conditional compilation of clk code Applying: ata/pata_arasan: remove conditional compilation of clk code Applying: net/c_can: remove conditional compilation of clk code Applying: net/stmmac: remove conditional compilation of clk code Applying: gadget/m66592: remove conditional compilation of clk code Applying: gadget/r8a66597: remove conditional compilation of clk code Applying: usb/host/r8a66597: remove conditional compilation of clk code Applying: arch/arm/mach-netx/fb.c: reuse dummy clk routines for CONFIG_HAVE_CLK=n Applying: clk: validate pointer in __clk_disable() Applying: panic: fix a possible deadlock in panic() Applying: NMI watchdog: fix for lockup detector breakage on resume Applying: kernel/sys.c: avoid argv_free(NULL) Applying: kmsg: /dev/kmsg - properly return possible copy_from_user() failure Applying: printk: add generic functions to find KERN_<LEVEL> headers Applying: printk-add-generic-functions-to-find-kern_level-headers-fix Applying: printk: add kern_levels.h to make KERN_<LEVEL> available for asm use Applying: arch: remove direct definitions of KERN_<LEVEL> uses Applying: btrfs: use printk_get_level and printk_skip_level, add __printf, fix fallout Applying: btrfs-use-printk_get_level-and-printk_skip_level-add-__printf-fix-fallout-fix Applying: btrfs-use-printk_get_level-and-printk_skip_level-add-__printf-fix-fallout-checkpatch-fixes Applying: sound: use printk_get_level and printk_skip_level Applying: printk: convert the format for KERN_<LEVEL> to a 2 byte pattern Applying: printk: only look for prefix levels in kernel messages Applying: printk: remove the now unnecessary "C" annotation for KERN_CONT Applying: vsprintf: add %pMR for Bluetooth MAC address Applying: Documentation/printk-formats.txt: add description for %pMR Applying: lib/vsprintf.c: remind people to update Documentation/printk-formats.txt when adding printk formats Applying: lib/vsprintf.c: kptr_restrict: fix pK-error in SysRq show-all-timers(Q) Applying: MAINTAINERS: update EXYNOS DP DRIVER F: patterns Applying: drivers/video/backlight/atmel-pwm-bl.c: use devm_ functions Applying: drivers/video/backlight/ot200_bl.c: use devm_ functions Applying: drivers/video/backlight/lm3533_bl.c: use devm_ functions Applying: backlight: atmel-pwm-bl: use devm_gpio_request() Applying: backlight: ot200_bl: use devm_gpio_request() Applying: backlight: tosa_lcd: use devm_gpio_request() Applying: backlight: tosa_bl: use devm_gpio_request() Applying: backlight: lms283gf05: use devm_gpio_request() Applying: backlight: corgi_lcd: use devm_gpio_request() Applying: backlight: l4f00242t03: export and use devm_gpio_request_one() Applying: backlight: move register definitions from header to source Applying: backlight: move lp855x header into platform_data directory Applying: string: introduce memweight() Applying: string-introduce-memweight-fix Applying: string: fix build error caused by memweight() introduction Applying: qnx4fs: use memweight() Applying: dm: use memweight() Applying: affs: use memweight() Applying: video/uvc: use memweight() Applying: ocfs2: use memweight() Applying: ext2: use memweight() Applying: ext3: use memweight() Applying: ext4: use memweight() 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: 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: 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: atomic64_test: simplify the #ifdef for atomic64_dec_if_positive() test Applying: checkpatch: Update alignment check Applying: checkpatch: test for non-standard signatures Applying: checkpatch: check usleep_range() arguments Applying: checkpatch: Add acheck for use of sizeof without parenthesis Applying: checkpatch-add-check-for-use-of-sizeof-without-parenthesis-v2 Applying: checkpatch: add checks for do {} while (0) macro misuses Applying: nsproxy: move free_nsproxy() out of do_exit() path Applying: drivers/message/i2o/i2o_proc.c: the pointer returned from chtostr() points to an array which is no longer valid Applying: drivers/rtc/rtc-coh901331.c: use clk_prepare/unprepare Applying: drivers/rtc/rtc-coh901331.c: use devm allocation Applying: rtc: pl031: encapsulate per-vendor ops Applying: rtc: pl031: use per-vendor variables for special init Applying: rtc: pl031: fix up IRQ flags Applying: drivers/rtc/rtc-ab8500.c: use UIE emulation Applying: drivers-rtc-rtc-ab8500c-use-uie-emulation-checkpatch-fixes Applying: drivers/rtc/rtc-ab8500.c: remove fix for AB8500 ED version Applying: drivers/rtc/rtc-r9701.c: avoid second call to rtc_valid_tm() Applying: drivers/rtc/rtc-r9701.c: check that r9701_set_datetime() succeeded Applying: drivers/rtc/rtc-s3c.c: replace #include header files from asm/* to linux/* Applying: rtc/mc13xxx: use MODULE_DEVICE_TABLE instead of MODULE_ALIAS Applying: rtc/mc13xxx: add support for the rtc in the mc34708 pmic Applying: rtc/rtc-88pm80x: assign ret only when rtc_register_driver fails Applying: rtc/rtc-88pm80x: remove unneed devm_kfree Applying: rtc/rtc-da9052: remove unneed devm_kfree call Applying: nilfs2: add omitted comment for ns_mount_state field of the_nilfs structure Applying: nilfs2: remove references to long gone super operations Applying: nilfs2: fix timing issue between rmcp and chcp ioctls Applying: nilfs2: fix deadlock issue between chcp and thaw ioctls Applying: nilfs2: add omitted comments for structures in nilfs2_fs.h Applying: nilfs2: add omitted comments for different structures in driver implementation Applying: hfsplus: use -ENOMEM when kzalloc() fails Applying: fat: accessors for msdos_dir_entry 'start' fields Applying: fat: Refactor shortname parsing Applying: fat (exportfs): move NFS support code Applying: fat (exportfs): fix dentry reconnection Applying: kernel/kmod.c: document call_usermodehelper_fns() a bit Applying: kmod: avoid deadlock from recursive kmod call Applying: coredump: fix wrong comments on core limits of pipe coredump case Applying: fork: use vma_pages() to simplify the code Applying: fork-use-vma_pages-to-simplify-the-code-fix Applying: revert "sched: Fix fork() error path to not crash" Applying: fork: fix error handling in dup_task() Applying: kdump: append newline to the last lien of vmcoreinfo note Applying: ipc: add COMPAT_SHMLBA support Applying: ipc: allow compat IPC version field parsing if !ARCH_WANT_OLD_COMPAT_IPC Applying: ipc: compat: use signed size_t types for msgsnd and msgrcv Applying: ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION Applying: ipc/sem.c: alternatives to preempt_disable() Applying: sysctl: suppress kmemleak messages Applying: pps: return PTR_ERR on error in device_create Applying: fs: cachefiles: add support for large files in filesystem caching Applying: include/linux/aio.h: cpp->C conversions Applying: resource: make sure requested range is included in the root range Applying: c/r: fcntl: add F_GETOWNER_UIDS option Applying: fault-injection: notifier error injection Applying: notifier error injection documentation Applying: cpu: rewrite cpu-notifier-error-inject module Applying: PM: PM notifier error injection module Applying: memory: memory notifier error injection module Applying: notifier error injection: fix copy-and-paste error in Kconfig help Applying: powerpc: pSeries reconfig notifier error injection module Applying: fault-injection: add selftests for cpu and memory hotplug Applying: fault-injection: add tool to run command with failslab or fail_page_alloc Applying: fault-injection: mention failcmd.sh tool in document Applying: lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table() Merging quilt/akpm (8f3aa59 lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table())
Attachment:
pgp5cYJBiPpXq.pgp
Description: PGP signature
