Hi all, Please do not add any code for v3.13 to your linux-next included branches until after v3.12-rc1 is released. Changes since 20130904: The arm tree lost its build failure. The h8300-remove tree gained a conflict against the net tree. The vfs tree gained conflicts against the aio-direct and Linus' trees. The net-next tree gained conflict against Linus' tree. The drm tree lost its build failure. The akpm tree gained a conflict against the vfs tree. ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 222 trees (counting Linus' and 30 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 (816434e Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging fixes/master (fa8218d Merge tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap) Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1) Merging arc-current/for-curr (26f8136 Kconfig.debug: Add FRAME_POINTER anti-dependency for ARC) Merging arm-current/fixes (e1f0203 Merge branch 'security-fixes' into fixes) Merging m68k-current/for-linus (5549005 m68k/atari: ARAnyM - Always use physical addresses in NatFeat calls) Merging metag-fixes/fixes (3b2f64d Linux 3.11-rc2) Merging powerpc-merge/merge (d220980 powerpc/hvsi: Increase handshake timeout from 200ms to 400ms.) Merging sparc/master (63d4996 sparc64: Fix off by one in trampoline TLB mapping installation loop.) Merging net/master (d2779e9 sh_eth: fix napi_{en|dis}able() calls racing against interrupts) Merging ipsec/master (302a50b xfrm: Fix potential null pointer dereference in xdst_queue_output) Merging sound-current/for-linus (b054087 ALSA: hda - Re-setup HDMI pin and audio infoframe on stream switches) Merging pci-current/for-linus (a923874 Merge tag 'pci-v3.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) Merging wireless/master (19c3616 ath9k: Enable PLL fix only for AR9340/AR9330) Merging driver-core.current/driver-core-linus (816434e Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging tty.current/tty-linus (c095ba7 Linux 3.11-rc4) Merging usb.current/usb-linus (d347404 USB: OHCI: fix build error related to ohci_suspend/resume) Merging staging.current/staging-linus (d8dfad3 Linux 3.11-rc7) Merging char-misc.current/char-misc-linus (b36f4be Linux 3.11-rc6) Merging input-current/for-linus (fa46c79 Input: i8042 - disable the driver on ARC platforms) Merging md-current/for-linus (f94c0b6 md/raid5: fix interaction of 'replace' and 'recovery'.) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (e70308e Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework") Merging ide/master (6d128e1 Revert "Makefile: Fix install error with make -j option") Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) Merging devicetree-current/devicetree/merge (cf9e236 of/irq: init struct resource to 0 in of_irq_to_resource()) Merging rr-fixes/fixes (6c2580c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32) Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata) Merging vfio-fixes/for-linus (d24cdbf vfio-pci: Avoid deadlock on remove) Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (d8dfad3 Linux 3.11-rc7) Merging arm/for-next (48440c9 Merge branch 'devel-stable' into for-next) Merging arm-perf/for-next/perf (ad81f05 Linux 3.11-rc1) Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) Merging arm64/upstream (d50240a arm64: mm: permit use of tagged pointers at EL0) Merging blackfin/for-linus (eb043d3 smp: blackfin: fix check error, using atomic_ops to handle atomic_t type) Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore) Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file) CONFLICT (content): Merge conflict in arch/cris/arch-v32/drivers/Kconfig Merging h8300-remove/h8300-remove (b307c32 fs/minix: Drop dependency on H8300) CONFLICT (content): Merge conflict in drivers/net/ethernet/8390/Kconfig Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) Merging ia64/next (174a9a0 Merge branch 'misc-3.12' into next) Merging m68k/for-next (5549005 m68k/atari: ARAnyM - Always use physical addresses in NatFeat calls) Merging m68knommu/for-next (c065edd m68k: remove 16 unused boards in Kconfig.machine) Merging metag/for-next (b6ef916 irq-imgpdc: add ImgTec PDC irqchip driver) Merging microblaze/next (54ea21f microblaze: Show message when reset gpio is not present) Merging mips/mips-for-linux-next (4d85419 Merge branch '3.11-fixes' into mips-for-linux-next) Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS) Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) Merging parisc-hd/for-next (9f0f4fb parisc: add generic 32- and 64-bit defconfigs) Merging powerpc/next (83c93e2 powerpc/pseries: Move lparcfg.c to platforms/pseries) CONFLICT (content): Merge conflict in arch/powerpc/kernel/prom.c Merging 4xx/next (2074b1d powerpc: Fix irq distribution) Merging mpc5xxx/next (f2110cb dts: mpc512x: prepare for preprocessor support) Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) Merging s390/features (82003c3 s390/irq: rework irq subclass handling) Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) CONFLICT (content): Merge conflict in include/linux/serial_sci.h CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) Merging tile/master (b40f451 tile PCI RC: make default consistent DMA mask 32-bit) CONFLICT (content): Merge conflict in include/uapi/linux/serial_core.h CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) Merging xtensa/for_next (3b2f64d Linux 3.11-rc2) Merging aio-direct/for-next (b080082 tmpfs: add support for read_iter and write_iter) Merging btrfs/next (d7396f0 Btrfs: optimize key searches in btrfs_search_slot) Merging ceph/master (c354557 rbd: fix null dereference in dout) Merging cifs/for-next (de09ae6 cifs: Move and expand MAX_SERVER_SIZE definition) 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 (07bc9dc Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) Merging ext3/for_next (97a2847 Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeffm/linux-reiserfs into for_next_testing) Merging ext4/dev (ad4eec6 ext4: allow specifying external journal by pathname mount option) Merging f2fs/dev (222cbdc f2fs: avoid an overflow during utilization calculation) Merging fscache/fscache (bcd7351 Merge tag 'fscache-20130702' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) Merging fuse/for-next (05726ac fuse: use list_for_each_entry() for list traversing) Merging gfs2/master (068213f GFS2: Remove unnecessary memory barrier) Merging jfs/jfs-next (4451244 jfs: fix readdir cookie incompatibility with NFSv4) Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) Merging nfs/linux-next (40b5ea0 SUNRPC: Add tracepoints to help debug socket connection issues) Merging nfsd/nfsd-next (11d2a16 svcrpc: remove unused rq_resused) Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) Merging omfs/for-next (976d167 Linux 3.1-rc9) Merging squashfs/master (28d7b56 Squashfs: sanity check information from disk) Merging v9fs/for-next (50192ab fs/9p: avoid accessing utsname after namespace has been torn down) Merging ubifs/linux-next (c23e9b7 UBIFS: remove invalid warn msg with tst_recovery enabled) Merging xfs/for-next (1d03c6f xfs: XFS_MOUNT_QUOTA_ALL needed by userspace) CONFLICT (content): Merge conflict in fs/xfs/xfs_log_recover.c CONFLICT (content): Merge conflict in fs/xfs/xfs_inode.c Merging vfs/for-next (02afc27 direct-io: Handle O_(D)SYNC AIO) CONFLICT (content): Merge conflict in fs/direct-io.c CONFLICT (content): Merge conflict in fs/dcache.c CONFLICT (content): Merge conflict in fs/block_dev.c Merging pci/next (a923874 Merge tag 'pci-v3.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) Merging hid/for-next (63d291f Merge branch 'for-3.12/sensor-hub' into for-next) Merging i2c/i2c/for-next (b720423 i2c: rcar: add rcar-H2 support) Merging jdelvare-hwmon/master (8384216 hwmon: (emc6w201) Do not declare enum variable) Merging hwmon-staging/hwmon-next (f060c65 hwmon: (htu21) Add Measurement Specialties HTU21D support) Merging v4l-dvb/master (d6cd75e Merge branch 'patchwork' into to_next) CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c Merging kbuild/for-next (b020bae Merge branch 'kbuild/kconfig' into kbuild/for-next) Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm') Merging libata/for-next (062728a Merge branch 'for-3.12' into for-next) Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block) Merging pm/linux-next (c3053a6 Merge branch 'pm-cpuidle-next' into linux-next) Merging idle/next (5c99726b Merge branch 'fspin' into next) Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) Merging thermal/next (f61d5b4d Merge branch 'fixes' of .git into next) Merging ieee1394/for-next (db9ae8f firewire: ohci: Fix deadlock at bus reset) Merging ubi/linux-next (8930fa5 UBI: Fix invalidate_fastmap()) Merging dlm/next (c6ca7bc dlm: remove signal blocking) CONFLICT (content): Merge conflict in fs/dlm/user.c Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers) Merging slave-dma/next (71af442 Merge branch 'for-linus' into next) CONFLICT (content): Merge conflict in drivers/dma/Makefile Merging dmaengine/next (e6a5fa6 ioatdma: silence GCC warnings) Merging net-next/master (f212781 net: ipv6: mld: document force_mld_version in ip-sysctl.txt) CONFLICT (content): Merge conflict in net/ipv6/sit.c CONFLICT (content): Merge conflict in net/core/net-sysfs.c CONFLICT (content): Merge conflict in net/bridge/br_multicast.c CONFLICT (content): Merge conflict in include/net/netprio_cgroup.h CONFLICT (content): Merge conflict in include/linux/usb/usbnet.h CONFLICT (content): Merge conflict in drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c Merging ipsec-next/master (aba8269 {ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode callback) CONFLICT (content): Merge conflict in include/net/xfrm.h Merging wireless-next/master (076f0d2 cw1200: When debug is enabled, display all wakeup conditions for the wait_event_interruptible_timeout() call.) Merging bluetooth/master (5a30d1f Bluetooth: Use devname:vhci module alias for virtual HCI driver) Merging infiniband/for-next (82af24a Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next) CONFLICT (content): Merge conflict in drivers/infiniband/ulp/iser/iser_initiator.c Applying: cxgb4: fix up for bond_for_each_slave API change Merging mtd/master (6c3b889 mtd: chips: Add support for PMC SPI Flash chips in m25p80.c) Merging l2-mtd/master (f3b3914 of_mtd: Add no-op stubs to support CONFIG_OF=n) Merging crypto/master (ff6f83f hwrng: via - Add MODULE_DEVICE_TABLE) Merging drm/drm-next (3b28802 drm/tda998x: BUG() on invalid audio format) CONFLICT (content): Merge conflict in sound/pci/hda/hda_intel.c Merging drm-intel/for-linux-next (56e4966 drm/i915: fix i9xx_crtc_clock_get for multiplied pixels) Merging drm-tegra/drm/for-next (03da0e7 drm/tegra: Parse device tree earlier) Merging sound/for-next (b054087 ALSA: hda - Re-setup HDMI pin and audio infoframe on stream switches) Merging sound-asoc/for-next (84c89a9 Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus) Merging modules/modules-next (942e443 module: Fix mod->mkobj.kobj potentially freed too early) Merging virtio/virtio-next (3b868a4 virtio: console: prevent use-after-free of port name in port unplug) Merging input/next (52764fe Input: add SYN_MAX and SYN_CNT constants) Merging input-mt/for-next (ad81f05 Linux 3.11-rc1) Merging cgroup/for-next (66c144c Merge branch 'for-3.11-fixes' into for-next) Merging block/for-next (3fe9649 Merge branch 'for-3.11/drivers' into for-next) Merging device-mapper/for-next (769ba72d dm ioctl: cleanup error handling in table_load) 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 (490104a mmc: esdhc: add support to get voltage from device-tree) Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command) Merging slab/for-next (9de1bc8 mm, slab_common: add 'unlikely' to size check of kmalloc_slab()) Merging uclinux/for-next (6dbe51c Linux 3.9-rc1) Merging md/for-next (bfc90cb raid5: only wakeup necessary threads) CONFLICT (content): Merge conflict in lib/raid6/test/Makefile CONFLICT (content): Merge conflict in lib/raid6/Makefile Merging mfd/master (9c31e88 Merge tag 'mfd-lee-3.12-2' of git://git.linaro.org/people/ljones/mfd) Merging mfd-lj/for-mfd-next (02a0bf6 mfd: ucb1x00-core: Rewrite ucb1x00_add_dev()) Merging battery/master (db15e63 rx51_battery: Fix channel number when reading adc value) Merging fbdev/for-next (5e8be02 video: atmel_lcdfb: add device tree suport) Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) Merging omap_dss2/for-next (6f001cc Merge branch '3.12/dss-legacy-removal' into for-next) CONFLICT (content): Merge conflict in drivers/video/simplefb.c Applying: simplefb: merge conflict fix Merging regulator/for-next (0f42823 Merge remote-tracking branch 'regulator/fix/palmas' into regulator-linus) Merging security/next (7320336 Merge branch 'smack-for-3.12' of git://git.gitorious.org/smack-next/kernel into ra-next) Merging selinux/master (0b4bdb3 Revert "SELinux: do not handle seclabel as a special flag") CONFLICT (content): Merge conflict in security/selinux/hooks.c Merging lblnet/master (07bc9dc Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) Merging watchdog/master (f9a67f3 watchdog: s3c2410_wdt: simplify use of devm_ioremap_resource) Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage) Merging iommu/next (f098cc4 Merge branches 'arm/exynos', 'ppc/pamu', 'arm/smmu', 'x86/amd' and 'iommu/fixes' into next) Merging vfio/next (17638db vfio-pci: Test for extended config space) Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error) Merging jc_docs/docs-next (5c050fb docs: update the development process document) Merging trivial/for-next (f8ea61e6 doc: Documentation/cputopology.txt fix typo) CONFLICT (content): Merge conflict in kernel/workqueue.c CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/mvm/time-event.c CONFLICT (content): Merge conflict in drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c CONFLICT (content): Merge conflict in drivers/crypto/ux500/hash/hash_core.c CONFLICT (content): Merge conflict in Documentation/driver-model/devres.txt Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) Merging devicetree/devicetree/next (109b623 of: Feed entire flattened device tree into the random pool) CONFLICT (content): Merge conflict in include/linux/of.h Merging dt-rh/for-next (8851b9f include: dt-binding: input: create a DT header defining key codes.) Merging spi/for-next (75c501e Merge remote-tracking branch 'spi/fix/pxa' into spi-linus) Merging tip/auto-latest (6eeb541 Merge branch 'x86/spinlocks') Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device) Merging edac-amd/for-next (75a9551 cpc925_edac: Use proper array termination) Merging ftrace/for-next (fc30f13 Merge branch 'trace/ftrace/core-tpstring' into trace/for-next) Merging rcu/rcu/next (25f27ce Merge branches 'doc.2013.08.19a', 'fixes.2013.08.20a', 'sysidle.2013.08.31a' and 'torture.2013.08.20a' into HEAD) Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (6b9e4fa Merge tag 'kvm-arm-for-3.12' of git://git.linaro.org/people/cdall/linux-kvm-arm into queue) Applying: s390: fix tlb_gather_mmu fallout Merging kvm-arm/kvm-arm-next (8bd4ffd ARM: kvm: don't include drivers/virtio/Kconfig) Merging kvm-ppc/kvm-ppc-next (bf550fc Merge remote-tracking branch 'origin/next' into kvm-ppc-next) Merging oprofile/for-next (f722406 Linux 3.10-rc1) Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work) Merging xen-tip/linux-next (32d70ed4 Merge branch 'stable/for-linus-3.12' into linux-next) Merging percpu/for-next (abec1a8 percpu: Make __verify_pcu_ptr handle per cpu pointers to arrays) Merging workqueues/for-next (5f6b2bb Merge branch 'for-3.11-fixes' into for-next) Merging drivers-x86/linux-next (62ae852 platform/x86: panasonic-laptop: reuse module_acpi_driver) CONFLICT (content): Merge conflict in net/mac80211/ibss.c CONFLICT (content): Merge conflict in net/ipv6/sit.c CONFLICT (content): Merge conflict in net/bridge/br_private.h CONFLICT (content): Merge conflict in net/bridge/br_multicast.c CONFLICT (content): Merge conflict in include/net/xfrm.h CONFLICT (content): Merge conflict in drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c 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 (365c9ee Merge remote-tracking branch 'regmap/topic/sparse' into regmap-next) Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (61abeba leds: wm831x-status: Request a REG resource) Merging driver-core/driver-core-next (816434e Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging tty/tty-next (2d1d3f3 hvc_xen: Remove unnecessary __GFP_ZERO from kzalloc) Merging usb/usb-next (b9a1048 usbcore: fix incorrect type in assignment in descriptors_changed()) Merging usb-gadget/next (0f2aa8c usb: musb: ux500: Add check for NULL board data) Merging staging/staging-next (91121c1 staging: dwc2: make dwc2_core_params documentation more complete) Merging char-misc/char-misc-next (3cc1f95 drivers: uio: Kconfig: add MMU dependancy for UIO) Merging scsi/for-next (1f962eb [SCSI] sg: push file descriptor list locking down to per-device locking) Merging target-updates/for-next (62b62d6 target: remove unused including <linux/version.h>) Merging target-merge/for-next-merge (d4e4ab8 Linux 3.11-rc5) Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) Merging isci/all (6734092 isci: add a couple __iomem annotations) Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation) CONFLICT (content): Merge conflict in drivers/block/Kconfig Merging tmem/linux-next (8f0d816 Linux 3.7-rc3) Merging writeback/writeback-for-next (8bb495e Linux 3.10) Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) Merging pinctrl/for-next (c9e3b2d pinctrl: sunxi: Fix off-by-one for valid offset range checking) Merging vhost/linux-next (8c325ee vhost: wake up worker outside spin_lock) Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO) Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO) Merging gpio/for-next (be1a4b1 gpio: improve error path in gpiolib) Merging arm-soc/for-next (ca59147 ARM: next: added back arm-soc-for-next-contents.txt) CONFLICT (content): Merge conflict in drivers/pci/host/Makefile CONFLICT (modify/delete): drivers/leds/leds-renesas-tpu.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/leds/leds-renesas-tpu.c left in tree. CONFLICT (content): Merge conflict in drivers/cpuidle/Makefile CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7779.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7778.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/r8a7779.h CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/r8a7778.h CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-marzen.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/platsmp.c CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug $ git rm -f drivers/leds/leds-renesas-tpu.c Merging bcm2835/for-next (7d13205 Linux 3.10-rc6) Merging cortex/for-next (3ad87ac ARM: ARMv7-M: Fix name of NVIC handler function) Merging ep93xx/ep93xx-for-next (6868a89 Merge branch 'ep93xx-fixes' into ep93xx-for-next) Merging imx-mxs/for-next (9445012 Merge branches 'imx/fixes-3.12', 'imx/soc-3.13' and 'imx/dt-3.13' into for-next) Merging ixp4xx/next (19f949f Linux 3.8) Merging msm/for-next (8fb0bf1 Merge branch 'for-3.12/msm-cleanup2' into for-next) Merging mvebu/for-next (e3cd46e Merge branch 'mvebu/dove_pcie-mbus-dt' into for-next) CONFLICT (content): Merge conflict in drivers/pci/host/pci-mvebu.c CONFLICT (content): Merge conflict in drivers/pci/host/Kconfig Merging renesas/next (8b7ea09 Merge branch 'fixes3-for-v3.12' into next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7790.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a73a4.dtsi Merging samsung/for-next (84b6f2e Merge branch 'v3.11-samsung-fixes-2' into for-next) Merging tegra/for-next (d8dfad3 Linux 3.11-rc7) Merging dma-mapping/dma-mapping-next (10bcdfb ARM: init: add support for reserved memory defined by device tree) CONFLICT (content): Merge conflict in mm/Kconfig CONFLICT (content): Merge conflict in drivers/base/dma-contiguous.c Merging pwm/for-next (1e185c7 pwm: pxa: Use module_platform_driver) Merging dma-buf/for-next (6e46645 Linux 3.11) Merging userns/for-next (c7b96ac userns: Kill nsown_capable it makes the wrong thing easy) Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines) Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging clk/clk-next (b05c683 clk: Move symbol export to proper location) CONFLICT (content): Merge conflict in drivers/clk/zynq/clkc.c Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock) Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) Merging arm64-hugepages/for-next/hugepages (af07484 ARM64: mm: THP support.) Merging ptr-ret/PTR_RET (ad151d5 GFS2: Replace PTR_RET with PTR_ERR_OR_ZERO) CONFLICT (modify/delete): drivers/staging/zcache/zcache-main.c deleted in HEAD and modified in ptr-ret/PTR_RET. Version ptr-ret/PTR_RET of drivers/staging/zcache/zcache-main.c left in tree. $ git rm -f drivers/staging/zcache/zcache-main.c Merging aio/master (77d30b1 aio: fix rcu sparse warnings introduced by ioctx table lookup patch) CONFLICT (content): Merge conflict in fs/nfs/direct.c CONFLICT (content): Merge conflict in fs/block_dev.c Applying: aio: semantic fixup Applying: aio: another semantic merge fix Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6) Merging akpm-current/current (ea8adca mm-page-writebackc-add-strictlimit-feature-fix) CONFLICT (content): Merge conflict in kernel/fork.c Applying: fat: fix up for lockref changes $ git checkout -b akpm remotes/origin/akpm/master Applying: memcg: remove redundant code in mem_cgroup_force_empty_write() Applying: memcg, vmscan: integrate soft reclaim tighter with zone shrinking code Applying: memcg: get rid of soft-limit tree infrastructure Applying: vmscan, memcg: do softlimit reclaim also for targeted reclaim Applying: memcg: enhance memcg iterator to support predicates Applying: mm: fix memcg-less page reclaim Applying: memcg: track children in soft limit excess to improve soft limit Applying: memcg, vmscan: do not attempt soft limit reclaim if it would not scan anything Applying: memcg: track all children over limit in the root Applying: memcg, vmscan: do not fall into reclaim-all pass too quickly Applying: memcg: trivial cleanups Applying: arch: mm: remove obsolete init OOM protection Applying: arch: mm: do not invoke OOM killer on kernel fault OOM Applying: arch: mm: pass userspace fault flag to generic fault handler Applying: x86: finish user fault error path with fatal signal Applying: mm: memcg: enable memcg OOM killer only for user faults Applying: mm: memcg: rework and document OOM waiting and wakeup Applying: mm: memcg: do not trap chargers with full callstack on OOM Applying: memcg: correct RESOURCE_MAX to ULLONG_MAX Applying: memcg: rename RESOURCE_MAX to RES_COUNTER_MAX Applying: memcg: avoid overflow caused by PAGE_ALIGN Applying: memcg: reduce function dereference Applying: memcg: remove MEMCG_NR_FILE_MAPPED Applying: memcg: check for proper lock held in mem_cgroup_update_page_stat Applying: memcg: add per cgroup writeback pages accounting Applying: memcg: document cgroup dirty/writeback memory statistics Applying: mm: make lru_add_drain_all() selective Applying: truncate: drop 'oldsize' truncate_pagecache() parameter Applying: mm: drop actor argument of do_generic_file_read() Applying: mm-drop-actor-argument-of-do_generic_file_read-fix Applying: thp: account anon transparent huge pages into NR_ANON_PAGES Applying: mm: cleanup add_to_page_cache_locked() Applying: thp: move maybe_pmd_mkwrite() out of mk_huge_pmd() Applying: thp: do_huge_pmd_anonymous_page() cleanup Applying: thp: consolidate code between handle_mm_fault() and do_huge_pmd_anonymous_page() Applying: mm, thp: count thp_fault_fallback anytime thp fault fails Applying: kernel: replace strict_strto*() with kstrto*() Applying: fs: bump inode and dentry counters to long Applying: super: fix calculation of shrinkable objects for small numbers Applying: dcache: convert dentry_stat.nr_unused to per-cpu counters Applying: dentry: move to per-sb LRU locks Applying: dcache: remove dentries from LRU before putting on dispose list Applying: mm: new shrinker API Applying: shrinker: convert superblock shrinkers to new API Applying: shrinker-convert-superblock-shrinkers-to-new-api-fix Applying: list: add a new LRU list type Applying: inode: convert inode lru list to generic lru list code. Applying: inode: move inode to a different list inside lock Applying: dcache: convert to use new lru list infrastructure CONFLICT (content): Merge conflict in include/linux/fs.h Applying: list_lru: per-node list infrastructure Applying: list_lru: per-node list infrastructure fix Applying: list_lru: fix broken LRU_RETRY behaviour Applying: list_lru: per-node API Applying: list_lru: remove special case function list_lru_dispose_all. Applying: shrinker: add node awareness Applying: vmscan: per-node deferred work Applying: fs: convert inode and dentry shrinking to be node aware Applying: xfs: convert buftarg LRU to generic code Applying: xfs-convert-buftarg-lru-to-generic-code-fix Applying: xfs: rework buffer dispose list tracking Applying: xfs: convert dquot cache lru to list_lru Applying: xfs-convert-dquot-cache-lru-to-list_lru-fix Applying: xfs: fix dquot isolation hang Applying: fs: convert fs shrinkers to new scan/count API Applying: fs-convert-fs-shrinkers-to-new-scan-count-api-fix Applying: UBIFS: signedness bug in ubifs_shrink_count() Applying: fs-convert-fs-shrinkers-to-new-scan-count-api-fix-fix-2 Applying: drivers: convert shrinkers to new count/scan API Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix-2 Applying: i915: bail out earlier when shrinker cannot acquire mutex Applying: shrinker: convert remaining shrinkers to count/scan API Applying: shrinker-convert-remaining-shrinkers-to-count-scan-api-fix Applying: hugepage: convert huge zero page shrinker to new shrinker API Applying: hugepage-convert-huge-zero-page-shrinker-to-new-shrinker-api-fix Applying: shrinker: Kill old ->shrink API. Applying: shrinker-kill-old-shrink-api-fix Applying: list_lru: dynamically adjust node arrays Applying: super: fix for destroy lrus Applying: staging/lustre/ldlm: convert to shrinkers to count/scan API Applying: staging/lustre/obdclass: convert lu_object shrinker to count/scan API Applying: staging/lustre/ptlrpc: convert to new shrinker API Applying: staging/lustre/libcfs: cleanup linux-mem.h Applying: mm/Kconfig: add MMU dependency for MIGRATION. Applying: dcache: fix up for lockref changes Merging akpm/master (88394e0 dcache: fix up for lockref changes)
Attachment:
pgpLfXxtHpN2K.pgp
Description: PGP signature
