Hi all, Please do *not* add any v3.14 material to linux-next until after v3.13-rc1 is released. [A bit of a mess today :-(] Changes since 20131107: Removed tree: aio-direct (at maintainer request, being reworked) Dropped tree: userns (too difficult conflict) The vfs tree lost its build failure but gained a conflict against Linus' tree. The tip tree gained a conflict against the net-next tree. The target-updates tree gained a conflict against Linus' tree. The userns tree gained conflicts against the vfs tree and a build failure caused by merge issues, so I dropped it for today. The akpm-current tree gained conflicts against the vfs and tip trees. The akpm tree gained a conflict against the (removal of the) aio-direct 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 and a multi_v7_defconfig for arm. 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. I am currently merging 209 trees (counting Linus' and 29 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 (8efdf2b75940 Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6) Merging fixes/master (fa8218def1b1 Merge tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap) Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux) Merging arc-current/for-curr (737d5b980be8 ARC: [plat-arcfpga] defconfig update) Merging arm-current/fixes (6ecf830e5029 ARM: 7880/1: Clear the IT state independent of the Thumb-2 mode) Merging m68k-current/for-linus (55490050df0f m68k/atari: ARAnyM - Always use physical addresses in NatFeat calls) Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) Merging powerpc-merge/merge (8b5ede69d24d powerpc/irq: Don't switch to irq stack from softirq stack) Merging sparc/master (6d15ee492809 Merge git://git.kernel.org/pub/scm/virt/kvm/kvm) Merging net/master (be408cd3e1fe Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging ipsec/master (be408cd3e1fe Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging sound-current/for-linus (3b70a67da0be ALSA: hda_intel: ratelimit "spurious response" message) Merging pci-current/for-linus (67d470e0e171 Revert "x86/PCI: MMCONFIG: Check earlier for MMCONFIG region at address zero") Merging wireless/master (8ce9beac4661 drivers: net: wireless: b43: Fix possible NULL ptr dereference) Merging driver-core.current/driver-core-linus (31d141e3a666 Linux 3.12-rc6) Merging tty.current/tty-linus (6e757ad2c92c tty/serial: at91: fix uart/usart selection for older products) Merging usb.current/usb-linus (e1466ad5b1ae USB: serial: ftdi_sio: add id for Z3X Box device) Merging staging.current/staging-linus (31d141e3a666 Linux 3.12-rc6) Merging char-misc.current/char-misc-linus (31d141e3a666 Linux 3.12-rc6) Merging input-current/for-linus (5beea882e641 Input: ALPS - add support for model found on Dell XT2) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (f262f0f5cad0 crypto: s390 - Fix aes-cbc IV corruption) Merging ide/master (64110c16e012 ide: sgiioc4: Staticize ioc4_ide_attach_one()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions) Merging devicetree-current/devicetree/merge (1931ee143b0a Revert "drivers: of: add initialization code for dma reserved memory") Merging rr-fixes/fixes (f6537f2f0eba scripts/kallsyms: filter symbols not in kernel address space) Merging mfd-fixes/master (d0e639c9e06d Linux 3.12-rc4) Merging vfio-fixes/for-linus (d93b3ac0edb8 VFIO: vfio_iommu_type1: fix bug caused by break in nested loop) Merging drm-intel-fixes/for-linux-next-fixes (1fbc0d789d12 drm/i915: Fix the PPT fdi lane bifurcate state handling on ivb) Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (72decceef59d ARC: [TB10x] Updates for GPIO and pinctrl) Merging arm/for-next (466d7422cdb4 Merge branches 'mmci' and 'sa11x0' into for-next) CONFLICT (content): Merge conflict in drivers/usb/musb/davinci.c Merging arm-perf/for-next/perf (15c03dd4859a Linux 3.12-rc3) Merging arm-soc/for-next (c1b35c610b89 Merge branch 'next/dt' into for-next) CONFLICT (content): Merge conflict in drivers/clk/clk-nomadik.c CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Kconfig CONFLICT (content): Merge conflict in arch/arm/boot/dts/omap3-evm.dts Merging bcm2835/for-next (7d132055814e Linux 3.10-rc6) Merging cortex-m/for-next (797d602db128 ARM: new platform for Energy Micro's EFM32 Cortex-M3 SoCs) Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) Merging imx-mxs/for-next (deb07cd30f8a Merge branches 'imx/fixes-3.13', 'imx/soc-3.14' and 'imx/dt-3.14' into for-next) Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) Merging mvebu/for-next (b91cf40516e0 Merge branch 'mvebu/dt' into for-next) Merging renesas/next (597472bb771b Merge branch 'heads/clock' into next) Merging samsung/for-next (d2287944920d Merge branch 'v3.13-next/samsung' into for-next) Merging tegra/for-next (1ebd0d6a0589 Merge branch for-3.13/maintainers into for-next) Merging arm64/upstream (67317c268956 ARM64: /proc/interrupts: display IPIs of online CPUs only) Merging blackfin/for-linus (08b67faa23fd blackfin: Ignore generated uImages) Merging c6x/for-linux-next (b2c32b32a212 c6x: remove unused COMMON_CLKDEV Kconfig parameter) CONFLICT (content): Merge conflict in arch/arm/Kconfig Merging cris/for-next (be8cb7f42ab9 CRIS: drop unused Kconfig symbols) Merging h8300-remove/h8300-remove (b400126add8f CREDITS: Add Yoshinori Sato for h8300) Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) Merging ia64/next (959f58544b7f Linux 3.12-rc7) Merging m68k/for-next (77a42796786c m68k: Remove deprecated IRQF_DISABLED) Merging m68knommu/for-next (959f58544b7f Linux 3.12-rc7) Merging metag/for-next (95281171a713 metag: handle low level kicks directly) Merging microblaze/next (7f15a256b556 microblaze: Calculate kernel pad automatically) Merging mips/mips-for-linux-next (723ff7943249 MIPS: remove duplicate define) Merging openrisc/for-upstream (56aea88df7b3 openrisc: Refactor 16-bit constant relocation) Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) Merging parisc-hd/for-next (dce0ce46ca9a parisc: add generic 32- and 64-bit defconfigs) Merging powerpc/next (0c4888ef1d8a powerpc: Fix fatal SLB miss when restoring PPR) Merging mpc5xxx/next (7e198197ec87 powerpc/mpc512x: remove unnecessary #if) Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) Merging s390/features (de9587a2f54d s390/scm_blk: fix endless loop for requests != REQ_TYPE_FS) Merging sh/sh-latest (37284bd93103 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 (f8ce1faf5595 Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) Merging tile/master (e823acc0a9e3 tile: remove stray blank space) Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL) Merging xtensa/for_next (8872366df396 xtensa: Fix broken allmodconfig build) Merging btrfs/next (d7396f07358a Btrfs: optimize key searches in btrfs_search_slot) Merging ceph/master (53d028160f1a ceph: implement readv/preadv for sync operation) Merging cifs/for-next (7b463bb6e8c4 SMB2/SMB3 Copy offload support (refcopy) phase 1) Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) Merging ecryptfs/next (959f58544b7f Linux 3.12-rc7) Merging ext3/for_next (7ba3ec5749dd ext2: Fix fs corruption in ext2_get_xip_mem()) Merging ext4/dev (efbed4dc5857 ext4: add ratelimiting to ext4 messages) Merging f2fs/dev (3b03f72445ba f2fs: avoid to use a NULL point in destroy_segment_manager) Merging fscache/fscache (f1fe29b4a02d NFS: Use i_writecount to control whether to get an fscache cookie in nfs_open()) Merging fuse/for-next (ce128de6260f fuse: writepages: protect secondary requests from fuse file release) Merging gfs2/master (2147dbfd059e GFS2: Use generic list_lru for quota) Merging jfs/jfs-next (8660998608cf jfs: fix error path in ialloc) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) Merging nfs/linux-next (fab99ebe39fe NFSv4.2: Remove redundant checks in nfs_setsecurity+nfs4_label_init_security) Merging nfsd/nfsd-next (3378b7f40d79 nfsd4: fix discarded security labels on setattr) Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) Merging squashfs/master (6c11c05c79b2 Squashfs: Directly decompress into the page cache for file data) Merging v9fs/for-next (94876b5bb6a8 9P: introduction of a new cache=mmap model.) Merging ubifs/linux-next (58a4e23703b2 UBIFS: correct data corruption range) Merging xfs/for-next (359d992bcd39 xfs: simplify kmem_{zone_}zalloc) CONFLICT (content): Merge conflict in fs/xfs/xfs_dir2_sf.c CONFLICT (content): Merge conflict in fs/xfs/xfs_dir2_readdir.c CONFLICT (content): Merge conflict in fs/xfs/xfs_dir2_block.c CONFLICT (content): Merge conflict in fs/xfs/xfs_da_format.h Merging vfs/for-next (f2aa163e175e locks: break delegations on any attribute modification) CONFLICT (content): Merge conflict in fs/nfsd/nfsfh.c CONFLICT (content): Merge conflict in fs/9p/vfs_inode_dotl.c CONFLICT (content): Merge conflict in fs/9p/vfs_inode.c CONFLICT (content): Merge conflict in fs/9p/vfs_file.c CONFLICT (content): Merge conflict in drivers/usb/core/file.c Merging pci/next (eaaeb1cb3331 Merge branch 'pci/misc' into next) CONFLICT (content): Merge conflict in drivers/pci/pci.c CONFLICT (content): Merge conflict in drivers/pci/pci-sysfs.c CONFLICT (content): Merge conflict in drivers/pci/pci-driver.c Merging hid/for-next (bdae615c84bb Merge branch 'for-3.13/roccat' into for-next) Merging i2c/i2c/for-next (8a73cd4cfa15 i2c: exynos5: add High Speed I2C controller driver) Merging jdelvare-hwmon/master (0f07c1dd7545 hwmon: (lm90) Add support for TI TMP451) Merging hwmon-staging/hwmon-next (26336c8a36c0 hwmon: (w83793) Clean up a signedness issue) Merging v4l-dvb/master (5c52a0f259af Merge branch 'build_fixes' into to_next) Merging kbuild/for-next (37d1c5fc2dd8 Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next) Merging kconfig/for-next (4eae518d4b01 localmodconfig: Fix localyesconfig to set to 'y' not 'm') Merging libata/for-next (1ca953d5f992 Merge branch 'for-3.13' into for-next) Merging pstore/master (bd08ec33b5c2 pstore/ram: Restore ecc information block) Merging pm/linux-next (5f0c23f999b7 Merge branch 'fixes' into linux-next) CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c CONFLICT (content): Merge conflict in drivers/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-omap2/opp.c CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c Merging idle/next (d7b0a1b0b9b1 intel_idle: Support Intel Atom Processor C2000 Product Family) Merging apm/for-next (fb9d78aca709 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) Merging thermal/next (86e0a0bdf81c Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next) Merging ieee1394/for-next (db9ae8fec7b1 firewire: ohci: Fix deadlock at bus reset) Merging ubi/linux-next (ae0d14695566 UBI: Add some asserts to ubi_attach_fastmap()) Merging dlm/next (a97f4a66d8ee dlm: Avoid that dlm_release_lockspace() incorrectly returns -EBUSY) Merging swiotlb/linux-next (af51a9f1848f swiotlb: Do not export swiotlb_bounce since there are no external consumers) Merging slave-dma/next (6b327a028f09 Merge branch 'for-linus' into next) Merging dmaengine/next (4a43f394a082 dmaengine: dma_sync_wait and dma_find_channel undefined) Merging net-next/master (b0db7b0c21a0 phy: Add MOXA MDIO driver) CONFLICT (content): Merge conflict in include/linux/netdevice.h CONFLICT (modify/delete): arch/h8300/include/uapi/asm/socket.h deleted in HEAD and modified in net-next/master. Version net-next/master of arch/h8300/include/uapi/asm/socket.h left in tree. $ git rm -f arch/h8300/include/uapi/asm/socket.h Merging ipsec-next/master (9bb8ca86075f virtio-net: switch to use XPS to choose txq) Merging wireless-next/master (3c57e865cfb2 ath9k: enable DFS for IBSS mode) Merging bluetooth/master (7def68012f47 Bluetooth: ath3k: Add support for a new AR3012 device) Merging infiniband/for-next (a78fc816b361 Merge branches 'cma', 'ipoib', 'misc', 'mlx5', 'ocrdma', 'qib' and 'srp' into for-next) Merging mtd/master (d255c59aab2a Merge tag 'for-linus-20131025' of git://git.infradead.org/linux-mtd) Merging l2-mtd/master (edaf4d4aad61 mtd: gpmi: Use devm_kzalloc()) Merging crypto/master (f262f0f5cad0 crypto: s390 - Fix aes-cbc IV corruption) Merging drm/drm-next (212c444baa4e Merge branch 'ttm-next-3.13' of git://people.freedesktop.org/~thomash/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_connectors.c CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/atombios_encoders.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_crt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c CONFLICT (content): Merge conflict in MAINTAINERS Applying: drm/i915: Resolve interaction with drm-fixes tree Merging drm-intel/for-linux-next (07bf139b9060 drm/i915/vlv: use per-pipe backlight controls v2) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_panel.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c Merging drm-tegra/drm/for-next (977386a04bae drm/tegra: Reserve syncpoint base for gr3d) Merging sound/for-next (3b70a67da0be ALSA: hda_intel: ratelimit "spurious response" message) Merging sound-asoc/for-next (75addb2f787d Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus) Merging modules/modules-next (b6568b1a19ad modpost: fix bogus 'exported twice' warnings.) Merging virtio/virtio-next (cdd77e87eae5 x86, asmlinkage, lguest: Pass in globals into assembler statement) Merging input/next (c6d81bd7237b Input: add driver for Neonode zForce based touchscreens) Merging input-mt/for-next (ad81f0545ef0 Linux 3.11-rc1) Merging cgroup/for-next (0d60e6cd793e Merge branch 'for-3.13' into for-next) CONFLICT (content): Merge conflict in mm/memcontrol.c Merging block/for-next (a3ebc9060e66 Merge branch 'for-3.13/drivers' into for-next) CONFLICT (content): Merge conflict in fs/f2fs/segment.c CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/lloop.c CONFLICT (content): Merge conflict in drivers/md/raid5.c Merging device-mapper/for-next (a45a864e6ca2 MAINTAINERS: add reference to device-mapper's linux-dm.git tree) Applying: dm_cache: fix up for bvec iterator abstraction Applying: device-mapper: fixup for api changes Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence) Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3) Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage) Merging mmc/mmc-next (4d22378221bd mmc: core: Add MMC_CAP_RUNTIME_RESUME to resume at runtime_resume) CONFLICT (content): Merge conflict in drivers/mmc/host/mvsdio.c Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) Merging slab/for-next (139f3f1863de Merge branch 'slab/struct-page' into for-next) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (555c28a5b0c1 raid1: Add some macros to make code clearly.) Merging mfd/master (5e90169c5a02 mfd: lpc_ich: Add Device IDs for Intel Wildcat Point-LP PCH) CONFLICT (content): Merge conflict in sound/soc/codecs/mc13783.c Merging mfd-lj/for-mfd-next (6bfd1e63de34 mfd: lpc_sch: Ignore resource conflicts when adding mfd cells) Merging battery/master (588bd5918bac power_supply: Fix documentation for TEMP_*ALERT* properties) Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) Applying: video: xilinxfb: Fix for "Use standard variable name convention" Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) Merging omap_dss2/for-next (8623ec220b9c omapdss: Add new panel driver for Topolly td028ttec1 LCD.) Merging regulator/for-next (4445d0094e75 Merge remote-tracking branch 'regulator/topic/tps65910' into regulator-next) Merging security/next (217091dd7a7a ima: define '_ima' as a builtin 'trusted' keyring) CONFLICT (content): Merge conflict in crypto/Makefile Merging selinux/master (5e01dc7b26d9 Linux 3.12) Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) Merging watchdog/master (85818df94ffa watchdog: pcwd_usb: overflow in usb_pcwd_send_command()) Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) Merging iommu/next (e6ca48d995e4 Merge branches 'iommu/fixes', 'tracing', 'core', 'arm/tegra' and 'x86/vt-d' into next) Merging vfio/next (15c03dd4859a Linux 3.12-rc3) Merging osd/linux-next (861d66601acd exofs: don't leak io_state and pages on read error) Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) Merging trivial/for-next (2bb9936beac2 doc: usb: Fix typo in Documentation/usb/gadget_configs.txt) CONFLICT (content): Merge conflict in net/netfilter/xt_set.c Merging audit/master (9175c9d2aed5 audit: fix type of sessionid in audit_set_loginuid()) CONFLICT (content): Merge conflict in fs/exec.c Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) Merging devicetree/devicetree/next (355e62f5ad12 of/irq: Fix potential buffer overflow) CONFLICT (content): Merge conflict in drivers/pci/host/pci-mvebu.c CONFLICT (content): Merge conflict in drivers/crypto/caam/jr.c CONFLICT (content): Merge conflict in arch/arm/mach-integrator/pci_v3.c Merging dt-rh/for-next (74dac2ed699c of: irq: Fix interrupt-map entry matching) CONFLICT (content): Merge conflict in arch/powerpc/include/asm/prom.h CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt Merging spi/for-next (f8ce25620cdc Merge remote-tracking branch 'spi/topic/wr' into spi-next) CONFLICT (content): Merge conflict in drivers/spi/spi.c Merging tip/auto-latest (04e387210855 Merge branch 'x86/uaccess') CONFLICT (modify/delete): tools/perf/config/feature-tests.mak deleted in tip/auto-latest and modified in HEAD. Version HEAD of tools/perf/config/feature-tests.mak left in tree. CONFLICT (content): Merge conflict in tools/perf/config/Makefile CONFLICT (content): Merge conflict in include/linux/wait.h CONFLICT (content): Merge conflict in include/linux/acpi.h CONFLICT (content): Merge conflict in drivers/net/virtio_net.c CONFLICT (modify/delete): arch/h8300/include/asm/Kbuild deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/h8300/include/asm/Kbuild left in tree. $ git rm -f arch/h8300/include/asm/Kbuild $ git rm -f tools/perf/config/feature-tests.mak Applying: tip: extra fixes for perf changes Merging edac/linux_next (de4772c62148 edac: sb_edac.c should not require prescence of IMC_DDRIO device) Merging edac-amd/for-next (c3e511e4c4d9 amd64_edac: Remove superfluous condition check.) Merging ftrace/for-next (20b72e76c42b Merge branch 'trace/ftrace/core' into trace/for-next) Merging rcu/rcu/next (4102adab9189 rcu: Move RCU-related source code to kernel/rcu directory) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (1b2ca42267fe kvm, cpuid: Fix sparse warning) CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c CONFLICT (content): Merge conflict in arch/powerpc/kernel/ptrace.c CONFLICT (content): Merge conflict in arch/powerpc/include/asm/processor.h Merging kvm-arm/kvm-arm-next (79c648806f90 arm/arm64: KVM: PSCI: use MPIDR to identify a target CPU) CONFLICT (content): Merge conflict in arch/arm/kvm/reset.c Merging kvm-ppc/kvm-ppc-next (a78b55d1c021 kvm: powerpc: book3s: drop is_hv_enabled) Merging oprofile/for-next (9b415b3a3c4e edac, highbank: Moving error injection to sysfs for edac) Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) Merging xen-tip/linux-next (11367bd961ea Merge remote-tracking branch 'stefano/swiotlb-linux-next-20131106' into linux-next) CONFLICT (content): Merge conflict in arch/arm/include/asm/dma-mapping.h Merging percpu/for-next (90f2492cf9c8 x86: remove this_cpu_xor() implementation) Merging workqueues/for-next (016564d41b35 workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues) Merging drivers-x86/linux-next (5c07eae979df platform/x86: panasonic-laptop: reuse module_acpi_driver) Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) Merging regmap/for-next (04bc9ac163a2 Merge remote-tracking branch 'regmap/topic/spmi' into regmap-next) Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (30dae2f98612 leds: lp55xx: handle enable pin in driver) CONFLICT (content): Merge conflict in include/linux/of.h CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500.c Merging driver-core/driver-core-next (0cae60f91494 sysfs: rename sysfs_assoc_lock and explain what it's about) Merging tty/tty-next (80d8611dd076 serial: omap: fix missing comma) Merging usb/usb-next (7d49f0bac41e USB: Maintainers change for usb serial drivers) Merging usb-gadget/next (80d7d8a768cd usb: phy: twl6030-usb: Include linux/of.h header) Merging staging/staging-next (ed5d6ca0038f staging: drm/imx: fix return value check in ipu_add_subdevice_pdata()) Merging char-misc/char-misc-next (425792266a40 misc: mic: Fixes for randconfig build errors and warnings.) Applying: Intel MIC Host Driver: fix for sysfs_get_dirent API change Merging scsi/for-next (2aee240c68ed Merge branch 'misc' into for-next) Merging target-updates/for-next (4a9a6c8d538e target: Drop left-over se_lun->lun_cmd_list shutdown code) CONFLICT (content): Merge conflict in lib/percpu-refcount.c Merging target-merge/for-next-merge (15c03dd4859a Linux 3.12-rc3) Merging writeback/writeback-for-next (a8855990e382 writeback: Do not sort b_io list only because of block device inode) Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) Merging pinctrl/for-next (9da8312048ed pinctrl: imx50: add pinctrl support code for the IMX50 SoC) Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) Merging gpio/for-next (afb3690c3cbd gpio: bcm-kona: add missing .owner to struct gpio_chip) CONFLICT (content): Merge conflict in arch/arm/Kconfig Merging dma-mapping/dma-mapping-next (0df651a0740c Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) Merging pwm/for-next (702e304f198f Documentation/pwm: Fix trivial typos) CONFLICT (modify/delete): arch/arm/mach-omap2/board-zoom-peripherals.c deleted in HEAD and modified in pwm/for-next. Version pwm/for-next of arch/arm/mach-omap2/board-zoom-peripherals.c left in tree. $ git rm -f arch/arm/mach-omap2/board-zoom-peripherals.c Merging dma-buf/for-next (19e8697ba45e dma-buf: Expose buffer size to userspace (v2)) Merging userns/for-next (40216baa0101 vfs: Lazily remove mounts on unlinked files and directories. v2) CONFLICT (content): Merge conflict in fs/namespace.c CONFLICT (content): Merge conflict in fs/namei.c CONFLICT (content): Merge conflict in fs/mount.h CONFLICT (content): Merge conflict in fs/fuse/dir.c CONFLICT (content): Merge conflict in fs/dcache.c Applying: vfs: merge fixup for __lookup_mnt() API change $ git reset --hard HEAD^ Merging ktest/for-next (df5f7c66013c ktest: Reset grub menu cache with different machines) Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging clk/clk-next (f61027426a5b clk: of: helper for determining number of parent clocks) CONFLICT (content): Merge conflict in drivers/clk/Makefile Merging random/dev (392a546dc836 random: add debugging code to detect early use of get_random_bytes()) CONFLICT (content): Merge conflict in drivers/char/random.c Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.) Merging aio/master (13fd8a5dc3cf Merge branch 'aio-fix' of http://evilpiepirate.org/git/linux-bcache) Merging akpm-current/current (7c5598d4c874 scripts/bloat-o-meter: use .startswith rather than fragile slicing) CONFLICT (content): Merge conflict in scripts/bloat-o-meter CONFLICT (content): Merge conflict in kernel/Makefile CONFLICT (content): Merge conflict in include/linux/lglock.h CONFLICT (content): Merge conflict in fs/autofs4/inode.c CONFLICT (content): Merge conflict in fs/anon_inodes.c CONFLICT (content): Merge conflict in arch/x86/mm/init.c Applying: lglock: fixup for code movement $ git checkout -b akpm remotes/origin/akpm/master Applying: mm: drop actor argument of do_generic_file_read() CONFLICT (content): Merge conflict in mm/filemap.c Applying: mm: avoid increase sizeof(struct page) due to split page table lock Applying: mm: rename USE_SPLIT_PTLOCKS to USE_SPLIT_PTE_PTLOCKS Applying: mm: convert mm->nr_ptes to atomic_long_t Applying: mm: introduce api for split page table lock for PMD level Applying: mm, thp: change pmd_trans_huge_lock() to return taken lock Applying: mm, thp: move ptl taking inside page_check_address_pmd() Applying: mm, thp: do not access mm->pmd_huge_pte directly Applying: mm, hugetlb: convert hugetlbfs to use split pmd lock Applying: mm-hugetlb-convert-hugetlbfs-to-use-split-pmd-lock-checkpatch-fixes Applying: mm: convert the rest to new page table lock api Applying: mm: implement split page table lock for PMD level Applying: x86, mm: enable split page table lock for PMD level Applying: x86-mm-enable-split-page-table-lock-for-pmd-level-checkpatch-fixes Applying: x86: add missed pgtable_pmd_page_ctor/dtor calls for preallocated pmds Applying: cris: fix potential NULL-pointer dereference Applying: m32r: fix potential NULL-pointer dereference Applying: xtensa: fix potential NULL-pointer dereference Applying: mm: allow pgtable_page_ctor() to fail Applying: microblaze: add missing pgtable_page_ctor/dtor calls Applying: mn10300: add missing pgtable_page_ctor/dtor calls Applying: openrisc: add missing pgtable_page_ctor/dtor calls Applying: alpha: handle pgtable_page_ctor() fail Applying: arc: handle pgtable_page_ctor() fail Applying: arm: handle pgtable_page_ctor() fail Applying: arm64: handle pgtable_page_ctor() fail Applying: avr32: handle pgtable_page_ctor() fail Applying: cris: handle pgtable_page_ctor() fail Applying: frv: handle pgtable_page_ctor() fail Applying: hexagon: handle pgtable_page_ctor() fail Applying: ia64: handle pgtable_page_ctor() fail Applying: m32r: handle pgtable_page_ctor() fail Applying: m68k: handle pgtable_page_ctor() fail Applying: m68k-handle-pgtable_page_ctor-fail-fix Applying: m68k-handle-pgtable_page_ctor-fail-fix-fix Applying: metag: handle pgtable_page_ctor() fail Applying: mips: handle pgtable_page_ctor() fail Applying: parisc: handle pgtable_page_ctor() fail Applying: powerpc: handle pgtable_page_ctor() fail Applying: s390: handle pgtable_page_ctor() fail Applying: score: handle pgtable_page_ctor() fail Applying: sh: handle pgtable_page_ctor() fail Applying: sparc: handle pgtable_page_ctor() fail Applying: tile: handle pgtable_page_ctor() fail Applying: um: handle pgtable_page_ctor() fail Applying: unicore32: handle pgtable_page_ctor() fail Applying: x86: handle pgtable_page_ctor() fail Applying: xtensa: handle pgtable_page_ctor() fail Applying: iommu/arm-smmu: handle pgtable_page_ctor() fail Applying: xtensa: use buddy allocator for PTE table Applying: mm: dynamically allocate page->ptl if it cannot be embedded to struct page Applying: seq_file: introduce seq_setwidth() and seq_pad() Applying: seq_file: remove "%n" usage from seq_file users Applying: vsprintf: ignore %n again Applying: drivers/rtc/rtc-hid-sensor-time.c: use dev_get_platdata() Applying: drivers/rtc/rtc-hid-sensor-time.c: enable HID input processing early Applying: sched: replace INIT_COMPLETION with reinit_completion Applying: tree-wide: use reinit_completion instead of INIT_COMPLETION Applying: tree-wide-use-reinit_completion-instead-of-init_completion-fix Applying: sched: remove INIT_COMPLETION Applying: drivers/w1/masters/w1-gpio.c: use dev_get_platdata() Applying: scripts/tags.sh: remove obsolete __devinit[const|data] Applying: revert "softirq: Add support for triggering softirq work on softirqs" Applying: kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS Applying: kernel: provide a __smp_call_function_single stub for !CONFIG_SMP Applying: kernel-provide-a-__smp_call_function_single-stub-for-config_smp-fix Applying: kernel: fix generic_exec_single indentation Applying: llists: move llist_reverse_order from raid5 to llist.c Applying: llists-move-llist_reverse_order-from-raid5-to-llistc-fix Applying: kernel: use lockless list for smp_call_function_single Applying: blk-mq: use __smp_call_function_single directly Applying: sound/core/memalloc.c: use gen_pool_dma_alloc() to allocate iram buffer Applying: kfifo: kfifo_copy_{to,from}_user: fix copied bytes calculation Applying: kfifo API type safety Applying: kfifo-api-type-safety-checkpatch-fixes Merging akpm/master (42ed94cb6f02 kfifo-api-type-safety-checkpatch-fixes)
Attachment:
pgpk6TnxQH_3o.pgp
Description: PGP signature
