Hi all, I should know better than to take time off around -rc7 :-) Changes since 20130822: The f2fs tree gained a build failure so I used the version from next-20130822. The libata tree gained a build failure so I used the version from next-20130822. The pm tree gained a conflict against the powerpc tree. The net-next tree gained a conflict against the wireless tree. The wireless-next tree gained a conflict against the wireless tree. The regulator tree gained a conflict against the pm tree. The spi tree gained a build failure so I used the version from next-20130822. The driver-core tree lost its build failure. The scsi tree gained a conflict against the infiniband tree. The arm-soc tree gained conflicts against the usb, Linus' and pm trees. The clk tree gained a conflict against Linus' 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 (d8dfad3 Linux 3.11-rc7) Merging fixes/master (b3a3a9c Merge tag 'trace-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1) Merging arc-current/for-curr (c095ba7 Linux 3.11-rc4) Merging arm-current/fixes (e1f0203 Merge branch 'security-fixes' into fixes) Merging m68k-current/for-linus (ea077b1 m68k: Truncate base in do_div()) Merging metag-fixes/fixes (3b2f64d Linux 3.11-rc2) Merging powerpc-merge/merge (28e61cc powerpc/tm: Fix context switching TAR, PPR and DSCR SPRs) Merging sparc/master (63d4996 sparc64: Fix off by one in trampoline TLB mapping installation loop.) Merging net/master (dd5746b be2net: Check for POST state in suspend-resume sequence) Merging ipsec/master (844d487 xfrm: choose protocol family by skb protocol) Merging sound-current/for-linus (2ca320e ALSA: hda - Fix NULL dereference with CONFIG_SND_DYNAMIC_MINORS=n) Merging pci-current/for-linus (36dd1f3 PCI: mvebu: Disable prefetchable memory support in PCI-to-PCI bridge) Merging wireless/master (19c3616 ath9k: Enable PLL fix only for AR9340/AR9330) Merging driver-core.current/driver-core-linus (5ae90d8 Linux 3.11-rc3) 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 (ed06349 Input: xpad - add signature for Razer Onza Classic Edition) 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 drm-intel-fixes/drm-intel-fixes (2e6efdd drm/i915: ivb: fix edp voltage swing reg val) Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (47bd81d ARC: SMP enabled TLB flush) Merging arm/for-next (e28e0eb Merge branch 'asoc-force' 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 (5496887 arm64: Expand arm64 image header) 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 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 (a9b9d22 of/pci: Use of_pci_range_parser) Merging mips/mips-for-linux-next (0ab12c9 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 (afbcdd9 powerpc/wsp: Fix early debug build) 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 (6b169ac s390/kprobes: add support for compare and branch instructions) 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 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 (a36cd9c tile: make __write_once a synonym for __read_mostly) 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 (cbacd76 Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into next) Merging ceph/master (132a378 libceph: create_singlethread_workqueue() doesn't return ERR_PTRs) 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 (e9b81fc ext4: fix lost truncate due to race with writeback) Merging f2fs/dev (2e569fe f2fs: fix omitting to update inode page) $ git reset --hard HEAD^ Merging next-20130822 version of f2fs 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 (c7263bc fuse: readdirplus: cleanup) Merging gfs2/master (7286b31 GFS2: Take glock reference in examine_bucket()) 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 (6686390 NFS: remove incorrect "Lock reclaim failed!" warning.) Merging nfsd/nfsd-next (2f74f97 sunrpc: prepare NFS for 2038) 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 (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 (0d0ab12 xfs: check for underflow in xfs_iformat_fork()) CONFLICT (content): Merge conflict in fs/xfs/xfs_inode.c Merging vfs/for-next (d405be4 ext4: ->tmpfile() support) CONFLICT (content): Merge conflict in mm/shmem.c CONFLICT (content): Merge conflict in fs/ext4/namei.c CONFLICT (content): Merge conflict in fs/ceph/file.c Merging pci/next (07f2daa Merge branch 'pci/yijing-mps-v8' into next) Merging hid/for-next (9e212fe Merge branch 'for-3.12/upstream' into for-next) Merging i2c/i2c/for-next (e66ff0a i2c: imx: use exact SoC revision to document binding) Merging jdelvare-hwmon/master (d9d5701 hwmon: (emc6w201) Do not declare enum variable) Merging hwmon-staging/hwmon-next (25ec8a8 hwmon: (adt7462) ADT7462_REG_VOLT_MAX() should return 0) Merging v4l-dvb/master (e5c9146 Merge /home/v4l/v4l/patchwork) Merging kbuild/for-next (e7f855f 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 (e2c06a2 Merge branch 'for-3.12' into for-next) $ git reset --hard HEAD^ Merging next-20130822 version of libata Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block) Merging pm/linux-next (7a330a5 Merge branch 'pm-cpufreq') CONFLICT (content): Merge conflict in arch/powerpc/kernel/prom.c 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 (0dbe15f firewire: ohci: beautify some macro definitions) 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 (d2e8a83 Merge branch 'for-linus' into next) Merging dmaengine/next (e6a5fa6 ioatdma: silence GCC warnings) Merging net-next/master (b05930f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) CONFLICT (content): Merge conflict in net/mac80211/ibss.c Merging ipsec-next/master (0806ae4 xfrm: announce deleation of temporary SA) Merging wireless-next/master (6e956da rt2800: fix wrong TX power compensation) CONFLICT (content): Merge conflict in net/mac80211/ibss.c Merging bluetooth/master (2dea632 Bluetooth: Add SCO connection fallback) Merging infiniband/for-next (3e76458 Merge branches 'cxgb4', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next) Applying: cxgb4: fix up for bond_for_each_slave API change Merging mtd/master (e79265b mtd: ofpart: add compatible check for child nodes) Merging l2-mtd/master (bd2e8b1 mtd: ofpart: use for_each_child_of_node() macro) Merging crypto/master (a246968 hwrng: omap - reorder OMAP TRNG driver code) Merging drm/drm-next (291d284 Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c Merging drm-intel/for-linux-next (1c881e2 drm/i915: Adjust available RPS information through sysfs for vlv) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_dmabuf.c Merging drm-tegra/drm/for-next (ebae30b gpu: host1x: Rework CPU syncpoint increment) Merging sound/for-next (68538bf Merge tag 'asoc-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next) Merging sound-asoc/for-next (04fc6de Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next) Merging modules/modules-next (f4940ab kernel/params.c: use scnprintf() instead of sprintf()) Merging virtio/virtio-next (3b868a4 virtio: console: prevent use-after-free of port name in port unplug) Merging input/next (1ea4c16 Input: add driver for slidebar on Lenovo IdeaPad laptops) Merging input-mt/for-next (ad81f05 Linux 3.11-rc1) Merging cgroup/for-next (f34764b Merge branch 'for-3.12' into for-next) CONFLICT (content): Merge conflict in include/net/netprio_cgroup.h Merging block/for-next (3fe9649 Merge branch 'for-3.11/drivers' into for-next) Merging device-mapper/for-next (d1dca53 dm thin: always return -ENOSPC if no_free_space is set) 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 (5ad58b4 md/raid5: make release_stripe lockless) Merging mfd/master (828fa1e Merge tag 'mfd-lee-3.12-1' of git://git.linaro.org/people/ljones/mfd) Merging mfd-lj/for-mfd-next (8a105ca mfd: pcf50633-adc: Use devm_*() functions) Merging battery/master (f107ae1 power_supply: Replace strict_strtol() with kstrtol()) 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 (fd3cd7e OMAPDSS: HDMI: Fix AVI infoframe bug) Merging regulator/for-next (0854db5 Merge remote-tracking branch 'regulator/topic/tps65912' into regulator-next) CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq-cpu0.c Merging security/next (7320336 Merge branch 'smack-for-3.12' of git://git.gitorious.org/smack-next/kernel into ra-next) Merging selinux/master (2be4d74 Add SELinux policy capability for always checking packet and peer classes.) 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 (2c859fe watchdog: hpwdt: Patch to ignore auxilary iLO devices) 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 (a5d5507 vfio: use get_unused_fd_flags(0) instead of get_unused_fd()) 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 (9ed354b doc: filesystems : Fix typo in Documentations/filesystems) 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 Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) Merging devicetree/devicetree/next (245d964 of/platform: Staticize of_platform_device_create_pdata()) Merging dt-rh/for-next (8851b9f include: dt-binding: input: create a DT header defining key codes.) Merging spi/for-next (5e43f3f Merge remote-tracking branch 'spi/topic/xilinx' into spi-next) $ git reset --hard HEAD^ Merging next-20130822 version of spi Merging tip/auto-latest (4ad468d Merge branch 'x86/urgent') CONFLICT (content): Merge conflict in drivers/video/simplefb.c CONFLICT (content): Merge conflict in arch/x86/include/asm/processor.h Applying: simplefb: merge conflict fix 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 (aa915cd Merge branches 'doc.2013.08.19a', 'fixes.2013.08.18a', 'sysidle.2013.08.18b' and 'torture.2013.08.19b' 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 (cc2df20 KVM: x86: Update symbolic exit codes) 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 (20f7462 Merge remote-tracking branch 'cmadma/for-v3.12-cma-dma' into kvm-ppc-next) CONFLICT (content): Merge conflict in mm/Kconfig 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 (3807527 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 (4ed8a5d Merge branch 'for-3.12' into for-next) CONFLICT (content): Merge conflict in kernel/workqueue.c Merging drivers-x86/linux-next (41c8bd1 Revert "hp-wmi: Enable hotkeys on some systems") 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 (9eac05c 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 (6a1c59a leds-pca963x: Fix device tree parsing) Merging driver-core/driver-core-next (0d4260e HID: convert bus code to use dev_groups) CONFLICT (content): Merge conflict in net/core/net-sysfs.c Merging tty/tty-next (8316d04 serial: sirf: add DMA support using dmaengine APIs) CONFLICT (content): Merge conflict in include/uapi/linux/serial_core.h CONFLICT (content): Merge conflict in include/linux/of.h CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile Merging usb/usb-next (154547c USB: serial: clean up attribute permissions) CONFLICT (content): Merge conflict in include/linux/usb/usbnet.h Merging usb-gadget/next (aaeaae0 usb: dwc3: core: cope with NULL pdata) Merging staging/staging-next (e7f1c93 staging: dgnc: tty.c: edits var in init func for sparse) CONFLICT (content): Merge conflict in Documentation/driver-model/devres.txt Merging char-misc/char-misc-next (a84a322 vme: vme_vmivme7805.c: add missing __iomem annotation) Merging scsi/for-next (2c89360 Merge branch 'misc' into for-next) CONFLICT (content): Merge conflict in drivers/infiniband/ulp/iser/iser_initiator.c Merging target-updates/for-next (0b67e68 target: Enable global EXTENDED_COPY setup/release) 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 (4060446 pinctrl: imx: Fix compilation with DEBUG enabled) Merging vhost/linux-next (8c325ee vhost: wake up worker outside spin_lock) Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) 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 (655c4e7 gpio: pcf857x: Remove pdata argument to pcf857x_irq_domain_init()) Merging arm-soc/for-next (43783c8 Merge branch 'next/dt' into for-next) 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 arch/arm/mach-mvebu/platsmp.c CONFLICT (content): Merge conflict in arch/arm/boot/dts/tegra20-trimslice.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/tegra20-seaboard.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/omap5.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/am335x-evmsk.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/am335x-evm.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/am335x-bone.dts 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 (9c59be7 Merge branch 'ep93xx-devel' into ep93xx-for-next) Merging imx-mxs/for-next (82c16ff Merge branches 'mxs/soc' and 'mxs/dt' 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 (782371b 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 (552035a Merge branch 'boards3' 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 (43d2983 Merge branch 'v3.12-next/dt-exynos-2' into for-next) Merging tegra/for-next (dca9ac6 Merge branch for-3.12/defconfig into for-next) Merging dma-mapping/dma-mapping-next (f7d8f1e Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next) Merging pwm/for-next (984d131 ARM: pxa: make pwm driver module_platform_driver) Merging dma-buf/for-next (8bb495e Linux 3.10) Merging userns/for-next (aee1c13 proc: Restrict mounting the proc filesystem) 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 (bddbd13 Merge tag 'zynq-clk-for-3.12' of git://git.xilinx.com/linux-xlnx into clk-next) 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 (f30d704 aio: table lookup: verify ctx pointer) 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 (a31cfb9 mm: page_alloc: use vmstats for fair zone allocation batching fix) CONFLICT (content): Merge conflict in mm/shmem.c CONFLICT (content): Merge conflict in mm/filemap.c CONFLICT (content): Merge conflict in kernel/params.c CONFLICT (content): Merge conflict in fs/ext4/inode.c $ git am -3 ../patches/0001-Revert-drivers-block-brd.c-make-rd_size-static.patch Applying: Revert "drivers/block/brd.c: make 'rd_size' static" $ git checkout -b akpm remotes/origin/akpm/master Applying: revert "SELinux: do not handle seclabel as a special flag" 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: 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: mm: make lru_add_drain_all() selective 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 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. Merging akpm/master (40c4795 mm/Kconfig: add MMU dependency for MIGRATION.)
Attachment:
pgpP1uS7adXJj.pgp
Description: PGP signature
