diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 3709 |
1 files changed, 3709 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..ac963eb1fadf --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3709 @@ +$ date +Thursday 26 September 10:04:58 EST 2013 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at e288e93 Merge branch 'bcache' (bcache fixes from Kent Overstreet) +Merging origin/master (4b97280 Merge tag 'stable/for-linus-3.12-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip) +$ git merge origin/master +Updating e288e93..4b97280 +Fast-forward + CREDITS | 3 +- + Documentation/kernel-parameters.txt | 4 + + MAINTAINERS | 5 +- + arch/mips/include/asm/cpu-features.h | 2 +- + arch/mips/mm/dma-default.c | 12 +- + arch/powerpc/boot/Makefile | 4 +- + arch/powerpc/boot/epapr-wrapper.c | 9 + + arch/powerpc/boot/epapr.c | 4 +- + arch/powerpc/boot/of.c | 16 +- + arch/powerpc/boot/wrapper | 9 +- + arch/powerpc/include/asm/irq.h | 4 +- + arch/powerpc/include/asm/processor.h | 4 +- + arch/powerpc/kernel/asm-offsets.c | 3 +- + arch/powerpc/kernel/irq.c | 100 ++--- + arch/powerpc/kernel/misc_32.S | 25 +- + arch/powerpc/kernel/misc_64.S | 10 +- + arch/powerpc/kernel/process.c | 3 +- + arch/powerpc/kernel/prom_init.c | 21 + + arch/powerpc/lib/sstep.c | 3 +- + arch/powerpc/platforms/pseries/smp.c | 26 +- + arch/x86/include/asm/xen/page.h | 31 +- + arch/x86/kernel/cpu/perf_event.c | 10 +- + arch/x86/kernel/cpu/perf_event_intel.c | 1 + + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 10 +- + arch/x86/kernel/reboot.c | 18 +- + arch/x86/platform/efi/efi.c | 11 +- + arch/x86/xen/p2m.c | 10 +- + arch/x86/xen/spinlock.c | 26 +- + drivers/ata/sata_promise.c | 2 +- + drivers/block/cciss.c | 1 + + drivers/block/cpqarray.c | 1 + + drivers/char/tpm/xen-tpmfront.c | 36 -- + drivers/md/dm-io.c | 7 +- + drivers/md/dm-mpath.c | 18 +- + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm-snap.c | 5 +- + drivers/md/dm-stats.c | 23 +- + drivers/md/dm-thin.c | 14 +- + drivers/md/dm.c | 71 +++- + drivers/md/dm.h | 3 + + drivers/xen/balloon.c | 23 +- + fs/ocfs2/super.c | 2 +- + include/linux/device-mapper.h | 3 +- + include/linux/memcontrol.h | 55 +-- + include/linux/smp.h | 6 + + include/uapi/linux/perf_event.h | 15 +- + kernel/audit.c | 5 +- + kernel/events/core.c | 21 + + kernel/reboot.c | 9 +- + kernel/sched/fair.c | 9 +- + kernel/watchdog.c | 60 ++- + mm/memcontrol.c | 560 +++++++++++++++++++------- + mm/mlock.c | 1 + + mm/vmscan.c | 83 ++-- + scripts/checkpatch.pl | 4 +- + tools/lib/lk/debugfs.c | 1 - + tools/perf/arch/x86/util/tsc.c | 6 +- + tools/perf/builtin-inject.c | 2 - + tools/perf/builtin-report.c | 5 +- + tools/perf/builtin-script.c | 2 - + tools/perf/builtin-trace.c | 17 + + tools/perf/config/Makefile | 3 + + tools/perf/config/feature-tests.mak | 10 + + tools/perf/util/annotate.c | 2 +- + tools/perf/util/dwarf-aux.c | 19 + + tools/perf/util/dwarf-aux.h | 3 + + tools/perf/util/header.c | 41 +- + tools/perf/util/hist.c | 2 + + tools/perf/util/probe-finder.c | 12 +- + tools/perf/util/session.c | 9 +- + tools/perf/util/session.h | 4 + + tools/perf/util/symbol-elf.c | 16 + + tools/perf/util/trace-event-parse.c | 2 +- + 73 files changed, 1059 insertions(+), 520 deletions(-) + create mode 100644 arch/powerpc/boot/epapr-wrapper.c +Merging fixes/master (fa8218d Merge tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (272b98c Linux 3.12-rc1) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (40190c8 ARM: 7837/3: fix Thumb-2 bug in AES assembler code) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 3 +-- + arch/arm/crypto/aes-armv4.S | 6 +++--- + arch/arm/include/asm/uaccess.h | 7 +++++++ + arch/arm/kernel/entry-common.S | 4 ++-- + 4 files changed, 13 insertions(+), 7 deletions(-) +Merging m68k-current/for-linus (21e884b m68k/m68knommu: Implement __get_user_unaligned/__put_user_unaligned()) +$ git merge m68k-current/for-linus +Merge made by the 'recursive' strategy. + arch/m68k/include/asm/uaccess.h | 7 +++++++ + 1 file changed, 7 insertions(+) +Merging metag-fixes/fixes (3b2f64d Linux 3.11-rc2) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-merge/merge (dbe78b4 powerpc/pseries: Do not start secondaries in Open Firmware) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (4de9ad9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile) +$ git merge sparc/master +Already up-to-date. +Merging net/master (2811eba ipv6: udp packets following an UFO enqueued packet need also be handled by UFO) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/can/slcan.c | 139 ++++++++++------ + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 189 +++++++++++----------- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 24 +-- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 5 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 50 +++--- + drivers/net/ethernet/marvell/skge.c | 9 +- + drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 4 +- + drivers/net/ethernet/qlogic/qlge/qlge_mpi.c | 2 +- + drivers/net/ethernet/sfc/mcdi.c | 10 +- + drivers/net/slip/slip.c | 3 + + include/linux/kernel.h | 11 ++ + include/net/mrp.h | 1 + + lib/hexdump.c | 2 + + net/802/mrp.c | 27 ++++ + net/ipv4/raw.c | 4 +- + net/ipv4/udp.c | 2 +- + net/ipv6/ip6_output.c | 53 +++--- + net/ipv6/raw.c | 4 +- + net/ipv6/udp.c | 4 +- + net/lapb/lapb_timer.c | 1 + + 21 files changed, 324 insertions(+), 223 deletions(-) +Merging ipsec/master (cd808fc xfrm: Fix aevent generation for each received packet) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/xfrm4_policy.c | 1 + + net/ipv6/ah6.c | 3 +-- + net/ipv6/esp6.c | 3 +-- + net/ipv6/ipcomp6.c | 3 +-- + net/ipv6/xfrm6_policy.c | 1 + + net/key/af_key.c | 3 ++- + net/xfrm/xfrm_replay.c | 54 +++++++++++++++++++++++++------------------------ + net/xfrm/xfrm_user.c | 5 +++-- + 8 files changed, 38 insertions(+), 35 deletions(-) +Merging sound-current/for-linus (4028b6c ALSA: compress: Fix compress device unregister.) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/compress_offload.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging pci-current/for-linus (4a10c2a Linux 3.12-rc2) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (b75ff5e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge wireless/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (4a10c2a Linux 3.12-rc2) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (93a8d41 n_tty: Fix EOF push index when termios changes) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/n_tty.c | 3 +-- + drivers/tty/serial/pch_uart.c | 13 +++---------- + drivers/tty/serial/serial-tegra.c | 4 +++- + 3 files changed, 7 insertions(+), 13 deletions(-) +Merging usb.current/usb-linus (4a10c2a Linux 3.12-rc2) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (099326d staging: imx-drm: Fix probe failure) +$ git merge staging.current/staging-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 15 +++++++++++++-- + drivers/staging/imx-drm/imx-drm-core.c | 11 +++-------- + drivers/staging/lustre/lustre/obdecho/echo_client.c | 2 +- + drivers/staging/octeon-usb/cvmx-usb.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_mp.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 2 ++ + drivers/staging/vt6656/iwctl.c | 3 +++ + drivers/staging/vt6656/main_usb.c | 3 ++- + drivers/staging/vt6656/rxtx.c | 2 ++ + 11 files changed, 30 insertions(+), 16 deletions(-) +Merging char-misc.current/char-misc-linus (4a10c2a Linux 3.12-rc2) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (2f0d260 Input: i8042 - i8042_flush fix for a full 8042 buffer) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/keyboard/pxa27x_keypad.c | 11 +++++++++-- + drivers/input/serio/i8042.c | 23 ++++++++++++++--------- + 2 files changed, 23 insertions(+), 11 deletions(-) +Merging md-current/for-linus (f94c0b6 md/raid5: fix interaction of 'replace' and 'recovery'.) +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master (26052f9 crypto: crct10dif - Add fallback for broken initrds) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (64110c1 ide: sgiioc4: Staticize ioc4_ide_attach_one()) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging devicetree-current/devicetree/merge (cf9e236 of/irq: init struct resource to 0 in of_irq_to_resource()) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (6c2580c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata) +$ git merge mfd-fixes/master +Already up-to-date. +Merging vfio-fixes/for-linus (d24cdbf vfio-pci: Avoid deadlock on remove) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (67c72a1 drm/i915: preserve pipe A quirk in i9xx_set_pipeconf) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_gpu_error.c | 6 ++++-- + drivers/gpu/drm/i915/intel_display.c | 4 ++++ + drivers/gpu/drm/i915/intel_dp.c | 13 ++++++++++++- + drivers/gpu/drm/i915/intel_tv.c | 8 ++++++++ + 4 files changed, 28 insertions(+), 3 deletions(-) +Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (d8dfad3 Linux 3.11-rc7) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (87b8156 Merge branches 'devel-stable', 'fixes', 'misc' and 'mmci' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 26 ++ + arch/arm/common/Makefile | 2 + + arch/arm/common/bL_switcher.c | 606 +++++++++++++++++++++++++++++++++ + arch/arm/common/bL_switcher_dummy_if.c | 71 ++++ + arch/arm/include/asm/bL_switcher.h | 17 + + arch/arm/kernel/sleep.S | 26 +- + arch/arm/kernel/suspend.c | 8 +- + arch/arm/mm/mmap.c | 6 +- + drivers/irqchip/irq-gic.c | 108 +++++- + drivers/mmc/host/mmci.c | 78 ++++- + drivers/mmc/host/mmci.h | 4 - + include/linux/irqchip/arm-gic.h | 5 + + 12 files changed, 911 insertions(+), 46 deletions(-) + create mode 100644 arch/arm/common/bL_switcher.c + create mode 100644 arch/arm/common/bL_switcher_dummy_if.c + create mode 100644 arch/arm/include/asm/bL_switcher.h +Merging arm-perf/for-next/perf (32676c8 Merge branch 'perf/staging' into for-next/perf) +$ git merge arm-perf/for-next/perf +Auto-merging tools/perf/config/feature-tests.mak +Auto-merging tools/perf/config/Makefile +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cci.txt | 60 ++- + arch/arm/Kconfig | 2 + + arch/arm/include/uapi/asm/Kbuild | 1 + + arch/arm/include/uapi/asm/perf_regs.h | 23 + + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/perf_regs.c | 30 ++ + drivers/bus/arm-cci.c | 617 +++++++++++++++++++++++++- + tools/perf/arch/arm/Makefile | 3 + + tools/perf/arch/arm/include/perf_regs.h | 54 +++ + tools/perf/arch/arm/util/unwind.c | 48 ++ + tools/perf/config/Makefile | 9 +- + tools/perf/config/feature-tests.mak | 11 +- + tools/perf/util/unwind.c | 71 ++- + 13 files changed, 902 insertions(+), 28 deletions(-) + create mode 100644 arch/arm/include/uapi/asm/perf_regs.h + create mode 100644 arch/arm/kernel/perf_regs.c + create mode 100644 tools/perf/arch/arm/include/perf_regs.h + create mode 100644 tools/perf/arch/arm/util/unwind.c +Merging arm64/upstream (fc18047 arm64: use correct register width when retrieving ASID) +$ git merge arm64/upstream +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/uaccess.h | 10 ++++++---- + arch/arm64/mm/tlb.S | 2 +- + 2 files changed, 7 insertions(+), 5 deletions(-) +Merging blackfin/for-linus (08b67fa blackfin: Ignore generated uImages) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (1a81b94 c6x: remove unused parameter in Kconfig) +$ git merge c6x/for-linux-next +Merge made by the 'recursive' strategy. + arch/c6x/Kconfig | 4 ---- + 1 file changed, 4 deletions(-) +Merging cris/for-next (be8cb7f CRIS: drop unused Kconfig symbols) +$ git merge cris/for-next +Already up-to-date. +Merging h8300-remove/h8300-remove (e9783b0 Revert "drivers: parport: Kconfig: exclude h8300 for PARPORT_PC") +$ git merge h8300-remove/h8300-remove +Removing drivers/net/ethernet/8390/ne-h8300.c +Removing drivers/ide/ide-h8300.c +Removing arch/h8300/platform/h8s/ptrace_h8s.c +Removing arch/h8300/platform/h8s/irq.c +Removing arch/h8300/platform/h8s/generic/crt0_rom.S +Removing arch/h8300/platform/h8s/generic/crt0_ram.S +Removing arch/h8300/platform/h8s/generic/Makefile +Removing arch/h8300/platform/h8s/edosk2674/crt0_rom.S +Removing arch/h8300/platform/h8s/edosk2674/crt0_ram.S +Removing arch/h8300/platform/h8s/edosk2674/Makefile +Removing arch/h8300/platform/h8s/Makefile +Removing arch/h8300/platform/h8300h/ptrace_h8300h.c +Removing arch/h8300/platform/h8300h/irq.c +Removing arch/h8300/platform/h8300h/h8max/crt0_ram.S +Removing arch/h8300/platform/h8300h/h8max/Makefile +Removing arch/h8300/platform/h8300h/generic/crt0_rom.S +Removing arch/h8300/platform/h8300h/generic/crt0_ram.S +Removing arch/h8300/platform/h8300h/generic/Makefile +Removing arch/h8300/platform/h8300h/aki3068net/crt0_ram.S +Removing arch/h8300/platform/h8300h/aki3068net/Makefile +Removing arch/h8300/platform/h8300h/Makefile +Removing arch/h8300/mm/memory.c +Removing arch/h8300/mm/kmap.c +Removing arch/h8300/mm/init.c +Removing arch/h8300/mm/fault.c +Removing arch/h8300/mm/Makefile +Removing arch/h8300/lib/romfs.S +Removing arch/h8300/lib/memset.S +Removing arch/h8300/lib/memcpy.S +Removing arch/h8300/lib/checksum.c +Removing arch/h8300/lib/ashrdi3.c +Removing arch/h8300/lib/abs.S +Removing arch/h8300/lib/Makefile +Removing arch/h8300/kernel/vmlinux.lds.S +Removing arch/h8300/kernel/traps.c +Removing arch/h8300/kernel/timer/tpu.c +Removing arch/h8300/kernel/timer/timer8.c +Removing arch/h8300/kernel/timer/timer16.c +Removing arch/h8300/kernel/timer/itu.c +Removing arch/h8300/kernel/timer/Makefile +Removing arch/h8300/kernel/time.c +Removing arch/h8300/kernel/syscalls.S +Removing arch/h8300/kernel/sys_h8300.c +Removing arch/h8300/kernel/signal.c +Removing arch/h8300/kernel/setup.c +Removing arch/h8300/kernel/ptrace.c +Removing arch/h8300/kernel/process.c +Removing arch/h8300/kernel/module.c +Removing arch/h8300/kernel/irq.c +Removing arch/h8300/kernel/h8300_ksyms.c +Removing arch/h8300/kernel/gpio.c +Removing arch/h8300/kernel/entry.S +Removing arch/h8300/kernel/asm-offsets.c +Removing arch/h8300/kernel/Makefile +Removing arch/h8300/include/uapi/asm/unistd.h +Removing arch/h8300/include/uapi/asm/types.h +Removing arch/h8300/include/uapi/asm/termios.h +Removing arch/h8300/include/uapi/asm/termbits.h +Removing arch/h8300/include/uapi/asm/swab.h +Removing arch/h8300/include/uapi/asm/statfs.h +Removing arch/h8300/include/uapi/asm/stat.h +Removing arch/h8300/include/uapi/asm/sockios.h +Removing arch/h8300/include/uapi/asm/socket.h +Removing arch/h8300/include/uapi/asm/signal.h +Removing arch/h8300/include/uapi/asm/siginfo.h +Removing arch/h8300/include/uapi/asm/sigcontext.h +Removing arch/h8300/include/uapi/asm/shmbuf.h +Removing arch/h8300/include/uapi/asm/setup.h +Removing arch/h8300/include/uapi/asm/sembuf.h +Removing arch/h8300/include/uapi/asm/resource.h +Removing arch/h8300/include/uapi/asm/ptrace.h +Removing arch/h8300/include/uapi/asm/posix_types.h +Removing arch/h8300/include/uapi/asm/poll.h +Removing arch/h8300/include/uapi/asm/param.h +Removing arch/h8300/include/uapi/asm/msgbuf.h +Removing arch/h8300/include/uapi/asm/mman.h +Removing arch/h8300/include/uapi/asm/kvm_para.h +Removing arch/h8300/include/uapi/asm/ipcbuf.h +Removing arch/h8300/include/uapi/asm/ioctls.h +Removing arch/h8300/include/uapi/asm/ioctl.h +Removing arch/h8300/include/uapi/asm/fcntl.h +Removing arch/h8300/include/uapi/asm/errno.h +Removing arch/h8300/include/uapi/asm/byteorder.h +Removing arch/h8300/include/uapi/asm/bitsperlong.h +Removing arch/h8300/include/uapi/asm/auxvec.h +Removing arch/h8300/include/uapi/asm/Kbuild +Removing arch/h8300/include/asm/virtconvert.h +Removing arch/h8300/include/asm/user.h +Removing arch/h8300/include/asm/unistd.h +Removing arch/h8300/include/asm/unaligned.h +Removing arch/h8300/include/asm/ucontext.h +Removing arch/h8300/include/asm/uaccess.h +Removing arch/h8300/include/asm/types.h +Removing arch/h8300/include/asm/traps.h +Removing arch/h8300/include/asm/topology.h +Removing arch/h8300/include/asm/tlbflush.h +Removing arch/h8300/include/asm/tlb.h +Removing arch/h8300/include/asm/timex.h +Removing arch/h8300/include/asm/timer.h +Removing arch/h8300/include/asm/thread_info.h +Removing arch/h8300/include/asm/termios.h +Removing arch/h8300/include/asm/target_time.h +Removing arch/h8300/include/asm/switch_to.h +Removing arch/h8300/include/asm/string.h +Removing arch/h8300/include/asm/spinlock.h +Removing arch/h8300/include/asm/smp.h +Removing arch/h8300/include/asm/signal.h +Removing arch/h8300/include/asm/shmparam.h +Removing arch/h8300/include/asm/shm.h +Removing arch/h8300/include/asm/sh_bios.h +Removing arch/h8300/include/asm/segment.h +Removing arch/h8300/include/asm/sections.h +Removing arch/h8300/include/asm/scatterlist.h +Removing arch/h8300/include/asm/regs306x.h +Removing arch/h8300/include/asm/regs267x.h +Removing arch/h8300/include/asm/ptrace.h +Removing arch/h8300/include/asm/processor.h +Removing arch/h8300/include/asm/pgtable.h +Removing arch/h8300/include/asm/pgalloc.h +Removing arch/h8300/include/asm/percpu.h +Removing arch/h8300/include/asm/pci.h +Removing arch/h8300/include/asm/param.h +Removing arch/h8300/include/asm/page_offset.h +Removing arch/h8300/include/asm/page.h +Removing arch/h8300/include/asm/mutex.h +Removing arch/h8300/include/asm/mmu_context.h +Removing arch/h8300/include/asm/mc146818rtc.h +Removing arch/h8300/include/asm/local64.h +Removing arch/h8300/include/asm/local.h +Removing arch/h8300/include/asm/kmap_types.h +Removing arch/h8300/include/asm/kdebug.h +Removing arch/h8300/include/asm/irqflags.h +Removing arch/h8300/include/asm/irq_regs.h +Removing arch/h8300/include/asm/irq.h +Removing arch/h8300/include/asm/io.h +Removing arch/h8300/include/asm/hw_irq.h +Removing arch/h8300/include/asm/hardirq.h +Removing arch/h8300/include/asm/gpio-internal.h +Removing arch/h8300/include/asm/futex.h +Removing arch/h8300/include/asm/ftrace.h +Removing arch/h8300/include/asm/fpu.h +Removing arch/h8300/include/asm/flat.h +Removing arch/h8300/include/asm/fb.h +Removing arch/h8300/include/asm/emergency-restart.h +Removing arch/h8300/include/asm/elf.h +Removing arch/h8300/include/asm/dma.h +Removing arch/h8300/include/asm/div64.h +Removing arch/h8300/include/asm/device.h +Removing arch/h8300/include/asm/delay.h +Removing arch/h8300/include/asm/dbg.h +Removing arch/h8300/include/asm/current.h +Removing arch/h8300/include/asm/cputime.h +Removing arch/h8300/include/asm/cmpxchg.h +Removing arch/h8300/include/asm/checksum.h +Removing arch/h8300/include/asm/cacheflush.h +Removing arch/h8300/include/asm/cachectl.h +Removing arch/h8300/include/asm/cache.h +Removing arch/h8300/include/asm/bugs.h +Removing arch/h8300/include/asm/bug.h +Removing arch/h8300/include/asm/bootinfo.h +Removing arch/h8300/include/asm/bitops.h +Removing arch/h8300/include/asm/barrier.h +Removing arch/h8300/include/asm/atomic.h +Removing arch/h8300/include/asm/asm-offsets.h +Removing arch/h8300/include/asm/Kbuild +Removing arch/h8300/defconfig +Removing arch/h8300/boot/compressed/vmlinux.scr +Removing arch/h8300/boot/compressed/vmlinux.lds +Removing arch/h8300/boot/compressed/misc.c +Removing arch/h8300/boot/compressed/head.S +Removing arch/h8300/boot/compressed/Makefile +Removing arch/h8300/boot/Makefile +Removing arch/h8300/README +Removing arch/h8300/Makefile +Removing arch/h8300/Kconfig.ide +Removing arch/h8300/Kconfig.debug +Removing arch/h8300/Kconfig.cpu +Removing arch/h8300/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/scheduler/sched-arch.txt | 5 - + MAINTAINERS | 8 - + arch/h8300/Kconfig | 108 ---- + arch/h8300/Kconfig.cpu | 171 ------ + arch/h8300/Kconfig.debug | 68 --- + arch/h8300/Kconfig.ide | 44 -- + arch/h8300/Makefile | 71 --- + arch/h8300/README | 38 -- + arch/h8300/boot/Makefile | 22 - + arch/h8300/boot/compressed/Makefile | 37 -- + arch/h8300/boot/compressed/head.S | 47 -- + arch/h8300/boot/compressed/misc.c | 180 ------ + arch/h8300/boot/compressed/vmlinux.lds | 32 -- + arch/h8300/boot/compressed/vmlinux.scr | 9 - + arch/h8300/defconfig | 42 -- + arch/h8300/include/asm/Kbuild | 8 - + arch/h8300/include/asm/asm-offsets.h | 1 - + arch/h8300/include/asm/atomic.h | 146 ----- + arch/h8300/include/asm/barrier.h | 29 - + arch/h8300/include/asm/bitops.h | 211 ------- + arch/h8300/include/asm/bootinfo.h | 2 - + arch/h8300/include/asm/bug.h | 12 - + arch/h8300/include/asm/bugs.h | 16 - + arch/h8300/include/asm/cache.h | 13 - + arch/h8300/include/asm/cachectl.h | 14 - + arch/h8300/include/asm/cacheflush.h | 40 -- + arch/h8300/include/asm/checksum.h | 102 ---- + arch/h8300/include/asm/cmpxchg.h | 60 -- + arch/h8300/include/asm/cputime.h | 6 - + arch/h8300/include/asm/current.h | 25 - + arch/h8300/include/asm/dbg.h | 2 - + arch/h8300/include/asm/delay.h | 38 -- + arch/h8300/include/asm/device.h | 7 - + arch/h8300/include/asm/div64.h | 1 - + arch/h8300/include/asm/dma.h | 15 - + arch/h8300/include/asm/elf.h | 101 ---- + arch/h8300/include/asm/emergency-restart.h | 6 - + arch/h8300/include/asm/fb.h | 12 - + arch/h8300/include/asm/flat.h | 26 - + arch/h8300/include/asm/fpu.h | 1 - + arch/h8300/include/asm/ftrace.h | 1 - + arch/h8300/include/asm/futex.h | 6 - + arch/h8300/include/asm/gpio-internal.h | 52 -- + arch/h8300/include/asm/hardirq.h | 19 - + arch/h8300/include/asm/hw_irq.h | 1 - + arch/h8300/include/asm/io.h | 358 ------------ + arch/h8300/include/asm/irq.h | 49 -- + arch/h8300/include/asm/irq_regs.h | 1 - + arch/h8300/include/asm/irqflags.h | 43 -- + arch/h8300/include/asm/kdebug.h | 1 - + arch/h8300/include/asm/kmap_types.h | 6 - + arch/h8300/include/asm/local.h | 6 - + arch/h8300/include/asm/local64.h | 1 - + arch/h8300/include/asm/mc146818rtc.h | 9 - + arch/h8300/include/asm/mmu_context.h | 32 -- + arch/h8300/include/asm/mutex.h | 9 - + arch/h8300/include/asm/page.h | 78 --- + arch/h8300/include/asm/page_offset.h | 3 - + arch/h8300/include/asm/param.h | 9 - + arch/h8300/include/asm/pci.h | 19 - + arch/h8300/include/asm/percpu.h | 6 - + arch/h8300/include/asm/pgalloc.h | 8 - + arch/h8300/include/asm/pgtable.h | 73 --- + arch/h8300/include/asm/processor.h | 139 ----- + arch/h8300/include/asm/ptrace.h | 33 -- + arch/h8300/include/asm/regs267x.h | 336 ----------- + arch/h8300/include/asm/regs306x.h | 212 ------- + arch/h8300/include/asm/scatterlist.h | 6 - + arch/h8300/include/asm/sections.h | 6 - + arch/h8300/include/asm/segment.h | 49 -- + arch/h8300/include/asm/sh_bios.h | 29 - + arch/h8300/include/asm/shm.h | 31 - + arch/h8300/include/asm/shmparam.h | 6 - + arch/h8300/include/asm/signal.h | 24 - + arch/h8300/include/asm/smp.h | 1 - + arch/h8300/include/asm/spinlock.h | 6 - + arch/h8300/include/asm/string.h | 44 -- + arch/h8300/include/asm/switch_to.h | 50 -- + arch/h8300/include/asm/target_time.h | 4 - + arch/h8300/include/asm/termios.h | 50 -- + arch/h8300/include/asm/thread_info.h | 103 ---- + arch/h8300/include/asm/timer.h | 25 - + arch/h8300/include/asm/timex.h | 19 - + arch/h8300/include/asm/tlb.h | 8 - + arch/h8300/include/asm/tlbflush.h | 55 -- + arch/h8300/include/asm/topology.h | 6 - + arch/h8300/include/asm/traps.h | 37 -- + arch/h8300/include/asm/types.h | 9 - + arch/h8300/include/asm/uaccess.h | 163 ------ + arch/h8300/include/asm/ucontext.h | 12 - + arch/h8300/include/asm/unaligned.h | 11 - + arch/h8300/include/asm/unistd.h | 36 -- + arch/h8300/include/asm/user.h | 75 --- + arch/h8300/include/asm/virtconvert.h | 20 - + arch/h8300/include/uapi/asm/Kbuild | 34 -- + arch/h8300/include/uapi/asm/auxvec.h | 4 - + arch/h8300/include/uapi/asm/bitsperlong.h | 1 - + arch/h8300/include/uapi/asm/byteorder.h | 6 - + arch/h8300/include/uapi/asm/errno.h | 6 - + arch/h8300/include/uapi/asm/fcntl.h | 11 - + arch/h8300/include/uapi/asm/ioctl.h | 1 - + arch/h8300/include/uapi/asm/ioctls.h | 8 - + arch/h8300/include/uapi/asm/ipcbuf.h | 1 - + arch/h8300/include/uapi/asm/kvm_para.h | 1 - + arch/h8300/include/uapi/asm/mman.h | 1 - + arch/h8300/include/uapi/asm/msgbuf.h | 31 - + arch/h8300/include/uapi/asm/param.h | 16 - + arch/h8300/include/uapi/asm/poll.h | 11 - + arch/h8300/include/uapi/asm/posix_types.h | 26 - + arch/h8300/include/uapi/asm/ptrace.h | 44 -- + arch/h8300/include/uapi/asm/resource.h | 6 - + arch/h8300/include/uapi/asm/sembuf.h | 25 - + arch/h8300/include/uapi/asm/setup.h | 6 - + arch/h8300/include/uapi/asm/shmbuf.h | 42 -- + arch/h8300/include/uapi/asm/sigcontext.h | 18 - + arch/h8300/include/uapi/asm/siginfo.h | 6 - + arch/h8300/include/uapi/asm/signal.h | 115 ---- + arch/h8300/include/uapi/asm/socket.h | 79 --- + arch/h8300/include/uapi/asm/sockios.h | 13 - + arch/h8300/include/uapi/asm/stat.h | 78 --- + arch/h8300/include/uapi/asm/statfs.h | 6 - + arch/h8300/include/uapi/asm/swab.h | 10 - + arch/h8300/include/uapi/asm/termbits.h | 201 ------- + arch/h8300/include/uapi/asm/termios.h | 44 -- + arch/h8300/include/uapi/asm/types.h | 1 - + arch/h8300/include/uapi/asm/unistd.h | 330 ----------- + arch/h8300/kernel/Makefile | 12 - + arch/h8300/kernel/asm-offsets.c | 60 -- + arch/h8300/kernel/entry.S | 402 ------------- + arch/h8300/kernel/gpio.c | 178 ------ + arch/h8300/kernel/h8300_ksyms.c | 100 ---- + arch/h8300/kernel/irq.c | 165 ------ + arch/h8300/kernel/module.c | 75 --- + arch/h8300/kernel/process.c | 154 ----- + arch/h8300/kernel/ptrace.c | 168 ------ + arch/h8300/kernel/setup.c | 242 -------- + arch/h8300/kernel/signal.c | 444 --------------- + arch/h8300/kernel/sys_h8300.c | 48 -- + arch/h8300/kernel/syscalls.S | 338 ----------- + arch/h8300/kernel/time.c | 66 --- + arch/h8300/kernel/timer/Makefile | 6 - + arch/h8300/kernel/timer/itu.c | 82 --- + arch/h8300/kernel/timer/timer16.c | 77 --- + arch/h8300/kernel/timer/timer8.c | 102 ---- + arch/h8300/kernel/timer/tpu.c | 100 ---- + arch/h8300/kernel/traps.c | 166 ------ + arch/h8300/kernel/vmlinux.lds.S | 157 ------ + arch/h8300/lib/Makefile | 5 - + arch/h8300/lib/abs.S | 21 - + arch/h8300/lib/ashrdi3.c | 63 --- + arch/h8300/lib/checksum.c | 164 ------ + arch/h8300/lib/memcpy.S | 84 --- + arch/h8300/lib/memset.S | 61 -- + arch/h8300/lib/romfs.S | 57 -- + arch/h8300/mm/Makefile | 5 - + arch/h8300/mm/fault.c | 56 -- + arch/h8300/mm/init.c | 155 ----- + arch/h8300/mm/kmap.c | 58 -- + arch/h8300/mm/memory.c | 54 -- + arch/h8300/platform/h8300h/Makefile | 7 - + arch/h8300/platform/h8300h/aki3068net/Makefile | 5 - + arch/h8300/platform/h8300h/aki3068net/crt0_ram.S | 110 ---- + arch/h8300/platform/h8300h/generic/Makefile | 5 - + arch/h8300/platform/h8300h/generic/crt0_ram.S | 107 ---- + arch/h8300/platform/h8300h/generic/crt0_rom.S | 122 ---- + arch/h8300/platform/h8300h/h8max/Makefile | 5 - + arch/h8300/platform/h8300h/h8max/crt0_ram.S | 110 ---- + arch/h8300/platform/h8300h/irq.c | 82 --- + arch/h8300/platform/h8300h/ptrace_h8300h.c | 284 ---------- + arch/h8300/platform/h8s/Makefile | 7 - + arch/h8300/platform/h8s/edosk2674/Makefile | 5 - + arch/h8300/platform/h8s/edosk2674/crt0_ram.S | 130 ----- + arch/h8300/platform/h8s/edosk2674/crt0_rom.S | 186 ------ + arch/h8300/platform/h8s/generic/Makefile | 5 - + arch/h8300/platform/h8s/generic/crt0_ram.S | 127 ----- + arch/h8300/platform/h8s/generic/crt0_rom.S | 128 ----- + arch/h8300/platform/h8s/irq.c | 104 ---- + arch/h8300/platform/h8s/ptrace_h8s.c | 84 --- + drivers/ide/Kconfig | 7 - + drivers/ide/Makefile | 2 - + drivers/ide/ide-h8300.c | 109 ---- + drivers/net/Space.c | 3 +- + drivers/net/ethernet/8390/Kconfig | 7 - + drivers/net/ethernet/8390/Makefile | 1 - + drivers/net/ethernet/8390/ne-h8300.c | 684 ----------------------- + drivers/net/ethernet/smsc/smc9194.c | 24 - + drivers/parport/Kconfig | 2 +- + drivers/watchdog/Kconfig | 2 - + drivers/watchdog/Makefile | 2 - + fs/minix/Kconfig | 2 +- + include/linux/serial_sci.h | 2 +- + include/uapi/linux/audit.h | 1 - + include/uapi/linux/elf-em.h | 1 - + tools/testing/ktest/examples/crosstests.conf | 6 - + 194 files changed, 4 insertions(+), 11742 deletions(-) + delete mode 100644 arch/h8300/Kconfig + delete mode 100644 arch/h8300/Kconfig.cpu + delete mode 100644 arch/h8300/Kconfig.debug + delete mode 100644 arch/h8300/Kconfig.ide + delete mode 100644 arch/h8300/Makefile + delete mode 100644 arch/h8300/README + delete mode 100644 arch/h8300/boot/Makefile + delete mode 100644 arch/h8300/boot/compressed/Makefile + delete mode 100644 arch/h8300/boot/compressed/head.S + delete mode 100644 arch/h8300/boot/compressed/misc.c + delete mode 100644 arch/h8300/boot/compressed/vmlinux.lds + delete mode 100644 arch/h8300/boot/compressed/vmlinux.scr + delete mode 100644 arch/h8300/defconfig + delete mode 100644 arch/h8300/include/asm/Kbuild + delete mode 100644 arch/h8300/include/asm/asm-offsets.h + delete mode 100644 arch/h8300/include/asm/atomic.h + delete mode 100644 arch/h8300/include/asm/barrier.h + delete mode 100644 arch/h8300/include/asm/bitops.h + delete mode 100644 arch/h8300/include/asm/bootinfo.h + delete mode 100644 arch/h8300/include/asm/bug.h + delete mode 100644 arch/h8300/include/asm/bugs.h + delete mode 100644 arch/h8300/include/asm/cache.h + delete mode 100644 arch/h8300/include/asm/cachectl.h + delete mode 100644 arch/h8300/include/asm/cacheflush.h + delete mode 100644 arch/h8300/include/asm/checksum.h + delete mode 100644 arch/h8300/include/asm/cmpxchg.h + delete mode 100644 arch/h8300/include/asm/cputime.h + delete mode 100644 arch/h8300/include/asm/current.h + delete mode 100644 arch/h8300/include/asm/dbg.h + delete mode 100644 arch/h8300/include/asm/delay.h + delete mode 100644 arch/h8300/include/asm/device.h + delete mode 100644 arch/h8300/include/asm/div64.h + delete mode 100644 arch/h8300/include/asm/dma.h + delete mode 100644 arch/h8300/include/asm/elf.h + delete mode 100644 arch/h8300/include/asm/emergency-restart.h + delete mode 100644 arch/h8300/include/asm/fb.h + delete mode 100644 arch/h8300/include/asm/flat.h + delete mode 100644 arch/h8300/include/asm/fpu.h + delete mode 100644 arch/h8300/include/asm/ftrace.h + delete mode 100644 arch/h8300/include/asm/futex.h + delete mode 100644 arch/h8300/include/asm/gpio-internal.h + delete mode 100644 arch/h8300/include/asm/hardirq.h + delete mode 100644 arch/h8300/include/asm/hw_irq.h + delete mode 100644 arch/h8300/include/asm/io.h + delete mode 100644 arch/h8300/include/asm/irq.h + delete mode 100644 arch/h8300/include/asm/irq_regs.h + delete mode 100644 arch/h8300/include/asm/irqflags.h + delete mode 100644 arch/h8300/include/asm/kdebug.h + delete mode 100644 arch/h8300/include/asm/kmap_types.h + delete mode 100644 arch/h8300/include/asm/local.h + delete mode 100644 arch/h8300/include/asm/local64.h + delete mode 100644 arch/h8300/include/asm/mc146818rtc.h + delete mode 100644 arch/h8300/include/asm/mmu_context.h + delete mode 100644 arch/h8300/include/asm/mutex.h + delete mode 100644 arch/h8300/include/asm/page.h + delete mode 100644 arch/h8300/include/asm/page_offset.h + delete mode 100644 arch/h8300/include/asm/param.h + delete mode 100644 arch/h8300/include/asm/pci.h + delete mode 100644 arch/h8300/include/asm/percpu.h + delete mode 100644 arch/h8300/include/asm/pgalloc.h + delete mode 100644 arch/h8300/include/asm/pgtable.h + delete mode 100644 arch/h8300/include/asm/processor.h + delete mode 100644 arch/h8300/include/asm/ptrace.h + delete mode 100644 arch/h8300/include/asm/regs267x.h + delete mode 100644 arch/h8300/include/asm/regs306x.h + delete mode 100644 arch/h8300/include/asm/scatterlist.h + delete mode 100644 arch/h8300/include/asm/sections.h + delete mode 100644 arch/h8300/include/asm/segment.h + delete mode 100644 arch/h8300/include/asm/sh_bios.h + delete mode 100644 arch/h8300/include/asm/shm.h + delete mode 100644 arch/h8300/include/asm/shmparam.h + delete mode 100644 arch/h8300/include/asm/signal.h + delete mode 100644 arch/h8300/include/asm/smp.h + delete mode 100644 arch/h8300/include/asm/spinlock.h + delete mode 100644 arch/h8300/include/asm/string.h + delete mode 100644 arch/h8300/include/asm/switch_to.h + delete mode 100644 arch/h8300/include/asm/target_time.h + delete mode 100644 arch/h8300/include/asm/termios.h + delete mode 100644 arch/h8300/include/asm/thread_info.h + delete mode 100644 arch/h8300/include/asm/timer.h + delete mode 100644 arch/h8300/include/asm/timex.h + delete mode 100644 arch/h8300/include/asm/tlb.h + delete mode 100644 arch/h8300/include/asm/tlbflush.h + delete mode 100644 arch/h8300/include/asm/topology.h + delete mode 100644 arch/h8300/include/asm/traps.h + delete mode 100644 arch/h8300/include/asm/types.h + delete mode 100644 arch/h8300/include/asm/uaccess.h + delete mode 100644 arch/h8300/include/asm/ucontext.h + delete mode 100644 arch/h8300/include/asm/unaligned.h + delete mode 100644 arch/h8300/include/asm/unistd.h + delete mode 100644 arch/h8300/include/asm/user.h + delete mode 100644 arch/h8300/include/asm/virtconvert.h + delete mode 100644 arch/h8300/include/uapi/asm/Kbuild + delete mode 100644 arch/h8300/include/uapi/asm/auxvec.h + delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/h8300/include/uapi/asm/byteorder.h + delete mode 100644 arch/h8300/include/uapi/asm/errno.h + delete mode 100644 arch/h8300/include/uapi/asm/fcntl.h + delete mode 100644 arch/h8300/include/uapi/asm/ioctl.h + delete mode 100644 arch/h8300/include/uapi/asm/ioctls.h + delete mode 100644 arch/h8300/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/h8300/include/uapi/asm/kvm_para.h + delete mode 100644 arch/h8300/include/uapi/asm/mman.h + delete mode 100644 arch/h8300/include/uapi/asm/msgbuf.h + delete mode 100644 arch/h8300/include/uapi/asm/param.h + delete mode 100644 arch/h8300/include/uapi/asm/poll.h + delete mode 100644 arch/h8300/include/uapi/asm/posix_types.h + delete mode 100644 arch/h8300/include/uapi/asm/ptrace.h + delete mode 100644 arch/h8300/include/uapi/asm/resource.h + delete mode 100644 arch/h8300/include/uapi/asm/sembuf.h + delete mode 100644 arch/h8300/include/uapi/asm/setup.h + delete mode 100644 arch/h8300/include/uapi/asm/shmbuf.h + delete mode 100644 arch/h8300/include/uapi/asm/sigcontext.h + delete mode 100644 arch/h8300/include/uapi/asm/siginfo.h + delete mode 100644 arch/h8300/include/uapi/asm/signal.h + delete mode 100644 arch/h8300/include/uapi/asm/socket.h + delete mode 100644 arch/h8300/include/uapi/asm/sockios.h + delete mode 100644 arch/h8300/include/uapi/asm/stat.h + delete mode 100644 arch/h8300/include/uapi/asm/statfs.h + delete mode 100644 arch/h8300/include/uapi/asm/swab.h + delete mode 100644 arch/h8300/include/uapi/asm/termbits.h + delete mode 100644 arch/h8300/include/uapi/asm/termios.h + delete mode 100644 arch/h8300/include/uapi/asm/types.h + delete mode 100644 arch/h8300/include/uapi/asm/unistd.h + delete mode 100644 arch/h8300/kernel/Makefile + delete mode 100644 arch/h8300/kernel/asm-offsets.c + delete mode 100644 arch/h8300/kernel/entry.S + delete mode 100644 arch/h8300/kernel/gpio.c + delete mode 100644 arch/h8300/kernel/h8300_ksyms.c + delete mode 100644 arch/h8300/kernel/irq.c + delete mode 100644 arch/h8300/kernel/module.c + delete mode 100644 arch/h8300/kernel/process.c + delete mode 100644 arch/h8300/kernel/ptrace.c + delete mode 100644 arch/h8300/kernel/setup.c + delete mode 100644 arch/h8300/kernel/signal.c + delete mode 100644 arch/h8300/kernel/sys_h8300.c + delete mode 100644 arch/h8300/kernel/syscalls.S + delete mode 100644 arch/h8300/kernel/time.c + delete mode 100644 arch/h8300/kernel/timer/Makefile + delete mode 100644 arch/h8300/kernel/timer/itu.c + delete mode 100644 arch/h8300/kernel/timer/timer16.c + delete mode 100644 arch/h8300/kernel/timer/timer8.c + delete mode 100644 arch/h8300/kernel/timer/tpu.c + delete mode 100644 arch/h8300/kernel/traps.c + delete mode 100644 arch/h8300/kernel/vmlinux.lds.S + delete mode 100644 arch/h8300/lib/Makefile + delete mode 100644 arch/h8300/lib/abs.S + delete mode 100644 arch/h8300/lib/ashrdi3.c + delete mode 100644 arch/h8300/lib/checksum.c + delete mode 100644 arch/h8300/lib/memcpy.S + delete mode 100644 arch/h8300/lib/memset.S + delete mode 100644 arch/h8300/lib/romfs.S + delete mode 100644 arch/h8300/mm/Makefile + delete mode 100644 arch/h8300/mm/fault.c + delete mode 100644 arch/h8300/mm/init.c + delete mode 100644 arch/h8300/mm/kmap.c + delete mode 100644 arch/h8300/mm/memory.c + delete mode 100644 arch/h8300/platform/h8300h/Makefile + delete mode 100644 arch/h8300/platform/h8300h/aki3068net/Makefile + delete mode 100644 arch/h8300/platform/h8300h/aki3068net/crt0_ram.S + delete mode 100644 arch/h8300/platform/h8300h/generic/Makefile + delete mode 100644 arch/h8300/platform/h8300h/generic/crt0_ram.S + delete mode 100644 arch/h8300/platform/h8300h/generic/crt0_rom.S + delete mode 100644 arch/h8300/platform/h8300h/h8max/Makefile + delete mode 100644 arch/h8300/platform/h8300h/h8max/crt0_ram.S + delete mode 100644 arch/h8300/platform/h8300h/irq.c + delete mode 100644 arch/h8300/platform/h8300h/ptrace_h8300h.c + delete mode 100644 arch/h8300/platform/h8s/Makefile + delete mode 100644 arch/h8300/platform/h8s/edosk2674/Makefile + delete mode 100644 arch/h8300/platform/h8s/edosk2674/crt0_ram.S + delete mode 100644 arch/h8300/platform/h8s/edosk2674/crt0_rom.S + delete mode 100644 arch/h8300/platform/h8s/generic/Makefile + delete mode 100644 arch/h8300/platform/h8s/generic/crt0_ram.S + delete mode 100644 arch/h8300/platform/h8s/generic/crt0_rom.S + delete mode 100644 arch/h8300/platform/h8s/irq.c + delete mode 100644 arch/h8300/platform/h8s/ptrace_h8s.c + delete mode 100644 drivers/ide/ide-h8300.c + delete mode 100644 drivers/net/ethernet/8390/ne-h8300.c +Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (d37bbb3 Merge branch 'pstore' into next) +$ git merge ia64/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging m68k/for-next (21e884b m68k/m68knommu: Implement __get_user_unaligned/__put_user_unaligned()) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (272b98c Linux 3.12-rc1) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (b6ef916 irq-imgpdc: add ImgTec PDC irqchip driver) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (d5d04bb Bye, bye, WfW flag) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (425d32a Merge branch '3.12-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h +Removing arch/mips/cobalt/console.c +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 4 + + arch/mips/Kconfig.debug | 8 + + arch/mips/Makefile | 14 +- + arch/mips/alchemy/devboards/db1235.c | 2 +- + arch/mips/ath79/dev-common.c | 6 - + arch/mips/bcm47xx/Makefile | 1 + + arch/mips/bcm47xx/board.c | 309 +++++++++++++++++++++ + arch/mips/bcm47xx/nvram.c | 20 ++ + arch/mips/bcm47xx/prom.c | 27 +- + arch/mips/bcm47xx/setup.c | 2 + + arch/mips/bcm47xx/time.c | 23 ++ + arch/mips/boot/compressed/Makefile | 6 + + arch/mips/boot/compressed/decompress.c | 13 +- + arch/mips/boot/compressed/ld.script | 5 +- + arch/mips/cavium-octeon/setup.c | 4 +- + arch/mips/cobalt/Makefile | 1 - + arch/mips/cobalt/console.c | 20 -- + arch/mips/cobalt/setup.c | 3 + + arch/mips/dec/int-handler.S | 8 +- + arch/mips/dec/ioasic-irq.c | 43 ++- + arch/mips/dec/prom/call_o32.S | 2 +- + arch/mips/dec/prom/init.c | 2 +- + arch/mips/dec/prom/memory.c | 2 +- + arch/mips/dec/setup.c | 4 +- + arch/mips/include/asm/dec/ioasic.h | 2 - + arch/mips/include/asm/dec/ioasic_addrs.h | 2 +- + arch/mips/include/asm/dec/kn01.h | 12 +- + arch/mips/include/asm/dec/kn02ca.h | 2 +- + arch/mips/include/asm/dec/prom.h | 2 +- + .../include/asm/mach-ath79/ar933x_uart_platform.h | 18 -- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 110 ++++++++ + arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h | 2 + + .../include/asm/mach-cavium-octeon/dma-coherence.h | 12 - + .../include/asm/mach-dec/cpu-feature-overrides.h | 87 ++++++ + arch/mips/include/asm/mach-generic/dma-coherence.h | 10 - + arch/mips/include/asm/mach-ip27/dma-coherence.h | 10 - + arch/mips/include/asm/mach-ip32/dma-coherence.h | 11 - + arch/mips/include/asm/mach-jazz/dma-coherence.h | 10 - + .../mips/include/asm/mach-loongson/dma-coherence.h | 10 - + arch/mips/include/asm/mach-powertv/dma-coherence.h | 10 - + arch/mips/include/asm/mmu_context.h | 22 +- + arch/mips/include/asm/setup.h | 8 + + arch/mips/include/asm/stackframe.h | 24 +- + arch/mips/include/asm/thread_info.h | 33 ++- + arch/mips/kernel/Makefile | 1 + + arch/mips/kernel/cpu-probe.c | 28 +- + arch/mips/kernel/early_printk_8250.c | 66 +++++ + arch/mips/kernel/irq_cpu.c | 2 +- + arch/mips/kernel/module.c | 3 +- + arch/mips/kernel/setup.c | 11 +- + arch/mips/kernel/smp-bmips.c | 4 +- + arch/mips/kernel/smp.c | 1 - + arch/mips/lantiq/irq.c | 2 +- + arch/mips/lantiq/xway/sysctrl.c | 2 +- + arch/mips/mm/dma-default.c | 4 +- + arch/mips/mm/tlb-funcs.S | 2 - + arch/mips/mm/tlbex.c | 138 ++++----- + arch/mips/netlogic/common/smp.c | 2 +- + arch/mips/pci/pci-ar71xx.c | 3 - + arch/mips/pci/pci-ar724x.c | 9 - + arch/mips/pci/pci.c | 50 ++-- + arch/mips/ralink/clk.c | 2 +- + arch/mips/ralink/mt7620.c | 2 +- + arch/mips/ralink/of.c | 2 +- + arch/mips/ralink/rt305x.c | 2 +- + drivers/net/ethernet/amd/declance.c | 3 +- + 66 files changed, 927 insertions(+), 338 deletions(-) + create mode 100644 arch/mips/bcm47xx/board.c + delete mode 100644 arch/mips/cobalt/console.c + delete mode 100644 arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h + create mode 100644 arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h + create mode 100644 arch/mips/include/asm/mach-dec/cpu-feature-overrides.h + create mode 100644 arch/mips/kernel/early_printk_8250.c +Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) +$ git merge parisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (9f0f4fb parisc: add generic 32- and 64-bit defconfigs) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/configs/generic-32bit_defconfig | 340 +++++++++++++++++++++++++++ + arch/parisc/configs/generic-64bit_defconfig | 350 ++++++++++++++++++++++++++++ + 2 files changed, 690 insertions(+) + create mode 100644 arch/parisc/configs/generic-32bit_defconfig + create mode 100644 arch/parisc/configs/generic-64bit_defconfig +Merging powerpc/next (8d7551e Merge tag 'cris-for-3.12' of git://jni.nu/cris) +$ git merge powerpc/next +Already up-to-date. +Merging mpc5xxx/next (f2110cb dts: mpc512x: prepare for preprocessor support) +$ git merge mpc5xxx/next +Already up-to-date. +Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) +$ git merge galak/next +Already up-to-date. +Merging s390/features (04dead2 s390/uaccess: always run the kernel in home space) +$ git merge s390/features +Removing arch/s390/lib/uaccess_std.c +Removing arch/s390/kernel/bitmap.c +Merge made by the 'recursive' strategy. + Documentation/s390/s390dbf.txt | 10 + + arch/s390/Kconfig | 1 + + arch/s390/Makefile | 14 +- + arch/s390/include/asm/atomic.h | 186 +++++-- + arch/s390/include/asm/bitops.h | 1008 ++++++++++------------------------- + arch/s390/include/asm/debug.h | 5 + + arch/s390/include/asm/dis.h | 52 ++ + arch/s390/include/asm/mmu_context.h | 10 +- + arch/s390/include/asm/processor.h | 13 +- + arch/s390/include/asm/ptrace.h | 7 +- + arch/s390/include/asm/setup.h | 7 - + arch/s390/include/asm/uaccess.h | 18 +- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/bitmap.c | 54 -- + arch/s390/kernel/compat_signal.c | 8 +- + arch/s390/kernel/dis.c | 81 +-- + arch/s390/kernel/dumpstack.c | 1 + + arch/s390/kernel/head.S | 2 +- + arch/s390/kernel/ipl.c | 4 +- + arch/s390/kernel/kprobes.c | 19 +- + arch/s390/kernel/process.c | 2 +- + arch/s390/kernel/ptrace.c | 4 +- + arch/s390/kernel/runtime_instr.c | 2 - + arch/s390/kernel/setup.c | 59 +- + arch/s390/kernel/signal.c | 12 +- + arch/s390/kernel/smp.c | 6 +- + arch/s390/kernel/vdso.c | 9 +- + arch/s390/kernel/vtime.c | 2 +- + arch/s390/kvm/trace.h | 1 + + arch/s390/lib/Makefile | 2 +- + arch/s390/lib/find.c | 77 +++ + arch/s390/lib/uaccess_mvcos.c | 30 -- + arch/s390/lib/uaccess_pt.c | 2 - + arch/s390/lib/uaccess_std.c | 305 ----------- + arch/s390/mm/fault.c | 9 +- + arch/s390/mm/pgtable.c | 4 - + arch/s390/net/bpf_jit_comp.c | 2 +- + drivers/s390/block/scm_blk.h | 2 +- + drivers/s390/char/sclp_cmd.c | 8 +- + drivers/s390/char/tty3270.c | 2 +- + drivers/s390/cio/airq.c | 19 +- + drivers/s390/cio/eadm_sch.c | 2 +- + drivers/s390/cio/qdio_debug.h | 8 +- + drivers/s390/cio/qdio_main.c | 2 +- + drivers/s390/crypto/zcrypt_debug.h | 12 +- + drivers/s390/net/claw.h | 8 +- + drivers/s390/net/ctcm_dbug.c | 2 +- + drivers/s390/net/lcs.h | 8 +- + drivers/s390/net/netiucv.c | 8 +- + drivers/s390/net/qeth_core_main.c | 2 +- + drivers/s390/scsi/zfcp_dbf.h | 4 +- + 51 files changed, 692 insertions(+), 1425 deletions(-) + create mode 100644 arch/s390/include/asm/dis.h + delete mode 100644 arch/s390/kernel/bitmap.c + create mode 100644 arch/s390/lib/find.c + delete mode 100644 arch/s390/lib/uaccess_std.c +Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) +$ git merge sh/sh-latest +Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution. +Resolved 'drivers/tty/serial/sh-sci.c' using previous resolution. +Resolved 'include/linux/serial_sci.h' using previous resolution. +Auto-merging include/linux/serial_sci.h +CONFLICT (content): Merge conflict in include/linux/serial_sci.h +Auto-merging drivers/tty/serial/sh-sci.c +CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c +Auto-merging arch/sh/kernel/cpu/sh2a/Makefile +CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3f5f556] Merge remote-tracking branch 'sh/sh-latest' +$ git diff -M --stat --summary HEAD^.. + .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++ + arch/sh/include/asm/hw_breakpoint.h | 12 +- + arch/sh/include/cpu-common/cpu/ubc.h | 17 +++ + arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++ + arch/sh/kernel/cpu/sh2a/Makefile | 1 + + arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++ + arch/sh/kernel/hw_breakpoint.c | 8 ++ + drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++- + include/linux/serial_sci.h | 4 + + 9 files changed, 375 insertions(+), 15 deletions(-) + create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt + create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h + create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h + create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c +Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (e823acc tile: remove stray blank space) +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (8872366 xtensa: Fix broken allmodconfig build) +$ git merge xtensa/for_next +Already up-to-date. +Merging aio-direct/for-next (85f8fb7 tmpfs: add support for read_iter and write_iter) +$ git merge aio-direct/for-next +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging Documentation/filesystems/vfs.txt +Merge made by the 'recursive' strategy. + Documentation/filesystems/Locking | 6 +- + Documentation/filesystems/vfs.txt | 12 +- + drivers/block/loop.c | 148 ++++++++---- + drivers/char/raw.c | 4 +- + drivers/mtd/nand/nandsim.c | 4 +- + drivers/usb/gadget/storage_common.c | 4 +- + fs/9p/vfs_addr.c | 12 +- + fs/9p/vfs_file.c | 8 +- + fs/Makefile | 2 +- + fs/adfs/file.c | 4 +- + fs/affs/file.c | 4 +- + fs/afs/file.c | 4 +- + fs/afs/internal.h | 3 +- + fs/afs/write.c | 9 +- + fs/aio.c | 136 ++++++++++- + fs/bad_inode.c | 14 ++ + fs/bfs/file.c | 4 +- + fs/block_dev.c | 27 ++- + fs/btrfs/file.c | 42 ++-- + fs/btrfs/inode.c | 63 +++--- + fs/ceph/addr.c | 3 +- + fs/cifs/file.c | 4 +- + fs/direct-io.c | 223 +++++++++++++------ + fs/ecryptfs/file.c | 15 +- + fs/exofs/file.c | 4 +- + fs/ext2/file.c | 4 +- + fs/ext2/inode.c | 8 +- + fs/ext3/file.c | 4 +- + fs/ext3/inode.c | 15 +- + fs/ext4/ext4.h | 3 +- + fs/ext4/file.c | 34 +-- + fs/ext4/indirect.c | 16 +- + fs/ext4/inode.c | 23 +- + fs/f2fs/data.c | 4 +- + fs/f2fs/file.c | 4 +- + fs/fat/file.c | 4 +- + fs/fat/inode.c | 10 +- + fs/fuse/cuse.c | 10 +- + fs/fuse/file.c | 90 ++++---- + fs/fuse/fuse_i.h | 5 +- + fs/gfs2/aops.c | 7 +- + fs/gfs2/file.c | 21 +- + fs/hfs/inode.c | 11 +- + fs/hfsplus/inode.c | 10 +- + fs/hostfs/hostfs_kern.c | 4 +- + fs/hpfs/file.c | 4 +- + fs/internal.h | 4 + + fs/iov-iter.c | 411 ++++++++++++++++++++++++++++++++++ + fs/jffs2/file.c | 8 +- + fs/jfs/file.c | 4 +- + fs/jfs/inode.c | 7 +- + fs/logfs/file.c | 4 +- + fs/minix/file.c | 4 +- + fs/nfs/direct.c | 301 ++++++++++++++++--------- + fs/nfs/file.c | 33 ++- + fs/nfs/internal.h | 4 +- + fs/nfs/nfs4file.c | 4 +- + fs/nilfs2/file.c | 4 +- + fs/nilfs2/inode.c | 8 +- + fs/ocfs2/aops.c | 8 +- + fs/ocfs2/aops.h | 2 +- + fs/ocfs2/file.c | 55 ++--- + fs/ocfs2/ocfs2_trace.h | 6 +- + fs/omfs/file.c | 4 +- + fs/ramfs/file-mmu.c | 4 +- + fs/ramfs/file-nommu.c | 4 +- + fs/read_write.c | 78 +++++-- + fs/reiserfs/file.c | 4 +- + fs/reiserfs/inode.c | 7 +- + fs/romfs/mmap-nommu.c | 2 +- + fs/sysv/file.c | 4 +- + fs/ubifs/file.c | 12 +- + fs/udf/file.c | 13 +- + fs/udf/inode.c | 10 +- + fs/ufs/file.c | 4 +- + fs/xfs/xfs_aops.c | 13 +- + fs/xfs/xfs_file.c | 51 ++--- + include/linux/aio.h | 17 +- + include/linux/bio.h | 8 + + include/linux/blk_types.h | 2 - + include/linux/fs.h | 165 ++++++++++++-- + include/linux/nfs_fs.h | 13 +- + include/uapi/linux/aio_abi.h | 2 + + include/uapi/linux/loop.h | 1 + + mm/filemap.c | 433 ++++++++++++++---------------------- + mm/page_io.c | 15 +- + mm/shmem.c | 61 ++--- + 87 files changed, 1841 insertions(+), 1003 deletions(-) + create mode 100644 fs/iov-iter.c +Merging btrfs/next (d7396f0 Btrfs: optimize key searches in btrfs_search_slot) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (e6c9af8 ceph: implement readv/preadv for sync operation) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/cache.c | 3 + + fs/ceph/caps.c | 27 ++-- + fs/ceph/dir.c | 11 +- + fs/ceph/file.c | 437 ++++++++++++++++++++++++++++++++++++--------------- + fs/ceph/inode.c | 57 ++++++- + fs/ceph/mds_client.c | 55 +++++-- + fs/ceph/mds_client.h | 1 + + fs/ceph/super.c | 1 + + fs/ceph/super.h | 9 +- + 9 files changed, 436 insertions(+), 165 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at fc79cc4 Merge remote-tracking branch 'aio-direct/for-next' +Merging next-20130925 version of ceph +$ git merge -m next-20130925/ceph 9c89d62948c4740e379a7e0085dd8d7c1561f53f +Already up-to-date. +Merging cifs/for-next (74d290d [CIFS] Provide sane values for nlink) +$ git merge cifs/for-next +Auto-merging fs/cifs/file.c +Merge made by the 'recursive' strategy. + fs/cifs/cifsglob.h | 5 +--- + fs/cifs/cifssmb.c | 1 - + fs/cifs/file.c | 8 ++++++ + fs/cifs/fscache.c | 7 +++++ + fs/cifs/fscache.h | 13 +++++++++ + fs/cifs/inode.c | 45 +++++++++++++++++++++++++---- + fs/cifs/readdir.c | 3 ++ + fs/cifs/sess.c | 84 +----------------------------------------------------- + 8 files changed, 72 insertions(+), 94 deletions(-) +Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (3cc69b6 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (721a769 reiserfs: fix race with flush_used_journal_lists and flush_journal_list) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/reiserfs/journal.c | 67 +++------------------------------------------------ + fs/udf/ialloc.c | 16 ++++++------ + fs/udf/super.c | 64 ++++++++++++++++++++++++++++++------------------ + fs/udf/udf_sb.h | 2 +- + 4 files changed, 52 insertions(+), 97 deletions(-) +Merging ext4/dev (ad4eec6 ext4: allow specifying external journal by pathname mount option) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (2e5558f f2fs: account for orphan inodes during recovery) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/checkpoint.c | 2 ++ + fs/f2fs/f2fs.h | 4 ++-- + fs/f2fs/gc.c | 15 +++++++++------ + fs/f2fs/recovery.c | 24 +++++++++++++++++------- + fs/f2fs/segment.c | 4 +++- + fs/f2fs/segment.h | 2 ++ + fs/f2fs/xattr.c | 35 +++++++++++++++++++++++++---------- + 7 files changed, 60 insertions(+), 26 deletions(-) +Merging fscache/fscache (996a249 NFS: Use i_writecount to control whether to get an fscache cookie in nfs_open()) +$ git merge fscache/fscache +Auto-merging include/linux/nfs_fs.h +Auto-merging include/linux/fs.h +Auto-merging fs/nfs/nfs4file.c +Auto-merging fs/cifs/fscache.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/caching/netfs-api.txt | 73 +++++++-- + fs/9p/cache.c | 6 +- + fs/afs/cell.c | 2 +- + fs/afs/inode.c | 2 +- + fs/afs/vlocation.c | 3 +- + fs/afs/volume.c | 2 +- + fs/cachefiles/interface.c | 2 +- + fs/ceph/cache.c | 4 +- + fs/cifs/fscache.c | 8 +- + fs/fscache/cookie.c | 193 +++++++++++++++++------ + fs/fscache/fsdef.c | 1 + + fs/fscache/netfs.c | 1 + + fs/fscache/object.c | 7 +- + fs/fscache/page.c | 59 +++++-- + fs/nfs/dir.c | 2 +- + fs/nfs/fscache.c | 196 +++++++----------------- + fs/nfs/fscache.h | 18 +-- + fs/nfs/inode.c | 6 +- + fs/nfs/nfs4file.c | 2 +- + include/linux/fs.h | 5 + + include/linux/fscache-cache.h | 50 +++--- + include/linux/fscache.h | 113 ++++++++++++-- + include/linux/nfs_fs.h | 8 +- + 23 files changed, 462 insertions(+), 301 deletions(-) +Merging fuse/for-next (dd4726a vfs: introduce d_instantiate_no_diralias()) +$ git merge fuse/for-next +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/cuse.c +Merge made by the 'recursive' strategy. + Documentation/devices.txt | 1 + + fs/dcache.c | 26 ++++ + fs/fuse/cuse.c | 5 +- + fs/fuse/dir.c | 42 +----- + fs/fuse/file.c | 346 +++++++++++++++++++++++++++++++++++++++++---- + fs/fuse/fuse_i.h | 4 +- + fs/fuse/inode.c | 2 - + include/linux/dcache.h | 1 + + include/linux/miscdevice.h | 1 + + 9 files changed, 358 insertions(+), 70 deletions(-) +Merging gfs2/master (5ca1db4 GFS2: fix dentry leaks) +$ git merge gfs2/master +Auto-merging fs/gfs2/inode.c +Merge made by the 'recursive' strategy. + fs/gfs2/incore.h | 13 +++-- + fs/gfs2/inode.c | 30 +++++++----- + fs/gfs2/rgrp.c | 142 ++++++++++++++++++++++++++++++++++--------------------- + 3 files changed, 114 insertions(+), 71 deletions(-) +Merging jfs/jfs-next (8660998 jfs: fix error path in ialloc) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_inode.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) +$ git merge logfs/master +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (4a10c2a Linux 3.12-rc2) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (d4a5165 rpc: let xdr layer allocate gssproxy receieve pages) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging omfs/for-next (976d167 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (9e01242 Squashfs: add corruption check for type in squashfs_readdir()) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (50192ab fs/9p: avoid accessing utsname after namespace has been torn down) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (c23e9b7 UBIFS: remove invalid warn msg with tst_recovery enabled) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (566055d xfs: log recovery lsn ordering needs uuid check) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/xfs_buf_item.c | 1 + + fs/xfs/xfs_fs.h | 2 +- + fs/xfs/xfs_icache.c | 9 +++--- + fs/xfs/xfs_log_recover.c | 73 ++++++++++++++++++++++++++++++++++++++---------- + 4 files changed, 65 insertions(+), 20 deletions(-) +Merging vfs/for-next (dc03a60 do_remount(): pull touch_mnt_namespace() up) +$ git merge vfs/for-next +Resolved 'fs/nfs/direct.c' using previous resolution. +Resolved 'fs/nfs/file.c' using previous resolution. +Auto-merging include/linux/fs.h +Auto-merging fs/nfs/nfs4file.c +Auto-merging fs/nfs/file.c +CONFLICT (content): Merge conflict in fs/nfs/file.c +Auto-merging fs/nfs/direct.c +CONFLICT (content): Merge conflict in fs/nfs/direct.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/9p/vfs_file.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f5a4300] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/9p/cache.h | 12 +++++ + fs/9p/vfs_file.c | 2 - + fs/9p/vfs_inode.c | 6 --- + fs/9p/vfs_inode_dotl.c | 4 -- + fs/befs/linuxvfs.c | 61 +++++++++++----------- + fs/btrfs/ctree.h | 5 -- + fs/btrfs/ioctl.c | 8 +-- + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifsfs.h | 2 - + fs/cifs/link.c | 7 --- + fs/ecryptfs/dentry.c | 29 +++++----- + fs/ecryptfs/ecryptfs_kernel.h | 19 ++----- + fs/ecryptfs/inode.c | 16 ++---- + fs/ecryptfs/main.c | 3 +- + fs/gfs2/inode.c | 9 +--- + fs/libfs.c | 79 +++++++++++++++------------- + fs/namespace.c | 22 ++------ + fs/ncpfs/dir.c | 55 +++++++------------ + fs/ncpfs/file.c | 12 ++--- + fs/nfs/dir.c | 119 +++++++++++++++++------------------------- + fs/nfs/direct.c | 17 +++--- + fs/nfs/file.c | 117 +++++++++++++++-------------------------- + fs/nfs/namespace.c | 5 +- + fs/nfs/nfs3proc.c | 8 +-- + fs/nfs/nfs4file.c | 4 +- + fs/nfs/nfs4namespace.c | 7 ++- + fs/nfs/nfs4proc.c | 5 +- + fs/nfs/proc.c | 8 +-- + fs/nfs/unlink.c | 9 ++-- + fs/nfs/write.c | 6 +-- + fs/nfsd/nfs4recover.c | 12 ++--- + fs/nfsd/nfs4state.c | 15 +++--- + fs/nfsd/nfsfh.c | 28 +++++----- + fs/nfsd/nfsfh.h | 4 +- + fs/nfsd/vfs.c | 9 ++-- + fs/proc/self.c | 10 +--- + fs/ubifs/dir.c | 41 +++++++-------- + fs/ubifs/journal.c | 6 +-- + fs/ubifs/xattr.c | 16 +++--- + include/linux/fs.h | 1 + + net/sunrpc/rpc_pipe.c | 12 ++--- + 41 files changed, 332 insertions(+), 480 deletions(-) +Merging pci/next (63495ff Merge branch 'pci/yijing-pci_is_pcie-v2' into next) +$ git merge pci/next +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/eeh.c | 3 +- + arch/powerpc/sysdev/fsl_pci.c | 2 +- + arch/x86/pci/fixup.c | 18 +-- + drivers/acpi/apei/apei-base.c | 6 +- + drivers/acpi/bus.c | 18 +-- + drivers/acpi/pci_root.c | 246 +++++++++++++++++++++++---------------- + drivers/pci/hotplug/acpi_pcihp.c | 2 +- + drivers/pci/hotplug/shpchp.h | 2 +- + drivers/pci/probe.c | 3 +- + drivers/scsi/bfa/bfad.c | 53 ++------- + drivers/scsi/csiostor/csio_hw.c | 22 +--- + drivers/scsi/qla2xxx/qla_mr.c | 6 +- + include/linux/acpi.h | 81 ++++++------- + include/uapi/linux/pci_regs.h | 3 +- + 14 files changed, 232 insertions(+), 233 deletions(-) +Merging hid/for-next (ebd9995 Merge branch 'for-3.13/upstream' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 2 +- + drivers/hid/hid-elo.c | 35 ++++++++++++++++++++++++++++- + drivers/hid/hid-lenovo-tpkbd.c | 50 ++++++++++++------------------------------ + drivers/hid/hid-sony.c | 11 ++-------- + 4 files changed, 51 insertions(+), 47 deletions(-) +Merging i2c/i2c/for-next (272b98c Linux 3.12-rc1) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (e5c832d vfs: fix dentry RCU to refcounting possibly sleeping dput()) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (bf7ae49 hwmon: (jc42) fix coccinelle warnings) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/acpi_power_meter.c | 13 ++- + drivers/hwmon/adm1026.c | 6 +- + drivers/hwmon/adt7462.c | 5 +- + drivers/hwmon/asc7621.c | 12 +-- + drivers/hwmon/atxp1.c | 3 +- + drivers/hwmon/ds1621.c | 63 ++++--------- + drivers/hwmon/f71882fg.c | 1 - + drivers/hwmon/f75375s.c | 4 +- + drivers/hwmon/gpio-fan.c | 45 ++++------ + drivers/hwmon/hwmon.c | 185 +++++++++++++++++++++++++++++++++++---- + drivers/hwmon/ina209.c | 46 ++++------ + drivers/hwmon/ina2xx.c | 64 +++++--------- + drivers/hwmon/jc42.c | 62 +++++-------- + drivers/hwmon/lm73.c | 70 +++++---------- + drivers/hwmon/lm95234.c | 138 +++++++++++------------------ + drivers/hwmon/ltc4245.c | 78 +++++------------ + drivers/hwmon/ltc4261.c | 56 ++++-------- + drivers/hwmon/max16065.c | 124 +++++++++++--------------- + drivers/hwmon/max6642.c | 73 +++++---------- + drivers/hwmon/max6697.c | 55 ++++-------- + drivers/hwmon/mc13783-adc.c | 2 +- + drivers/hwmon/nct6775.c | 141 +++++++++-------------------- + drivers/hwmon/pmbus/pmbus_core.c | 22 ++--- + drivers/hwmon/tmp401.c | 89 ++++++------------- + include/linux/hwmon-vid.h | 2 +- + include/linux/hwmon.h | 10 +++ + 26 files changed, 578 insertions(+), 791 deletions(-) +Merging v4l-dvb/master (65f7d4a Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (1e1a5f4 Merge branch 'kbuild/kconfig' into kbuild/for-next) +$ git merge kbuild/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm') +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (5748aea pata_isapnp: Don't use invalid I/O ports) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/libahci.c | 7 ++++--- + drivers/ata/pata_isapnp.c | 2 +- + 2 files changed, 5 insertions(+), 4 deletions(-) +Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block) +$ git merge pstore/master +Already up-to-date. +Merging pm/linux-next (aaa8522 Merge branch 'acpi-fixes-next' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/acpi.h +Auto-merging drivers/pci/hotplug/acpi_pcihp.c +Merge made by the 'recursive' strategy. + arch/arm/mach-exynos/common.c | 11 + + arch/arm/mach-exynos/common.h | 1 + + arch/arm/mach-exynos/cpuidle.c | 14 +- + arch/arm/mach-exynos/mach-exynos4-dt.c | 2 + + arch/arm/mach-exynos/mach-exynos5-dt.c | 2 + + arch/ia64/kernel/acpi.c | 38 +- + arch/x86/Kconfig | 4 - + arch/x86/include/asm/acpi.h | 1 + + arch/x86/include/asm/mpspec.h | 2 +- + arch/x86/kernel/acpi/boot.c | 88 +---- + arch/x86/kernel/apic/apic.c | 8 +- + arch/x86/kernel/smpboot.c | 21 -- + arch/x86/kernel/topology.c | 9 +- + arch/x86/platform/olpc/olpc-xo15-sci.c | 9 +- + drivers/acpi/Kconfig | 3 +- + drivers/acpi/acpi_ipmi.c | 594 ++++++++++++++++++------------ + drivers/acpi/acpi_memhotplug.c | 2 +- + drivers/acpi/acpi_processor.c | 28 +- + drivers/acpi/acpica/acdebug.h | 5 +- + drivers/acpi/acpica/acevents.h | 6 +- + drivers/acpi/acpica/acglobal.h | 18 +- + drivers/acpi/acpica/aclocal.h | 8 + + drivers/acpi/acpica/acnamesp.h | 6 + + drivers/acpi/acpica/evgpeutil.c | 2 +- + drivers/acpi/acpica/evmisc.c | 14 +- + drivers/acpi/acpica/evregion.c | 23 +- + drivers/acpi/acpica/evsci.c | 78 +++- + drivers/acpi/acpica/evxface.c | 139 +++++++ + drivers/acpi/acpica/hwxface.c | 26 +- + drivers/acpi/acpica/nsaccess.c | 5 +- + drivers/acpi/acpica/nsdump.c | 134 +++++++ + drivers/acpi/acpica/nsxfeval.c | 8 + + drivers/acpi/acpica/tbinstal.c | 12 +- + drivers/acpi/acpica/tbprint.c | 12 +- + drivers/acpi/acpica/tbxfroot.c | 3 +- + drivers/acpi/acpica/utdebug.c | 2 +- + drivers/acpi/acpica/utglobal.c | 3 +- + drivers/acpi/button.c | 9 +- + drivers/acpi/dock.c | 6 +- + drivers/acpi/ec.c | 49 ++- + drivers/acpi/fan.c | 2 +- + drivers/acpi/numa.c | 4 +- + drivers/acpi/osl.c | 46 ++- + drivers/acpi/processor_core.c | 26 +- + drivers/acpi/processor_idle.c | 15 +- + drivers/acpi/scan.c | 2 +- + drivers/acpi/sysfs.c | 9 +- + drivers/base/cpu.c | 24 +- + drivers/cpufreq/acpi-cpufreq.c | 4 + + drivers/cpufreq/cpufreq.c | 3 + + drivers/cpufreq/exynos5440-cpufreq.c | 2 +- + drivers/cpufreq/pcc-cpufreq.c | 5 +- + drivers/gpio/gpiolib-acpi.c | 9 +- + drivers/gpu/drm/i915/intel_acpi.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +- + drivers/hid/i2c-hid/i2c-hid.c | 18 +- + drivers/idle/intel_idle.c | 16 +- + drivers/pci/hotplug/acpi_pcihp.c | 7 +- + drivers/pci/pci-acpi.c | 3 +- + drivers/platform/x86/eeepc-laptop.c | 8 +- + drivers/platform/x86/fujitsu-laptop.c | 44 +-- + drivers/platform/x86/intel-rst.c | 48 +-- + drivers/platform/x86/intel-smartconnect.c | 27 +- + drivers/platform/x86/intel_menlow.c | 8 +- + drivers/platform/x86/sony-laptop.c | 28 +- + drivers/platform/x86/topstar-laptop.c | 8 +- + drivers/platform/x86/toshiba_acpi.c | 44 +-- + drivers/platform/x86/wmi.c | 30 +- + drivers/pnp/pnpacpi/core.c | 11 +- + include/acpi/acexcep.h | 8 +- + include/acpi/acpixf.h | 15 +- + include/acpi/actypes.h | 8 + + include/acpi/platform/aclinux.h | 2 +- + include/acpi/processor.h | 3 + + include/linux/acpi.h | 2 +- + 75 files changed, 1119 insertions(+), 788 deletions(-) +Merging idle/next (d7b0a1b intel_idle: Support Intel Atom Processor C2000 Product Family) +$ git merge idle/next +Auto-merging drivers/idle/intel_idle.c +Merge made by the 'recursive' strategy. + arch/x86/include/uapi/asm/msr-index.h | 2 + + drivers/idle/intel_idle.c | 38 ++++++++- + tools/power/x86/turbostat/turbostat.c | 155 +++++++++++++++++++++++++--------- + 3 files changed, 153 insertions(+), 42 deletions(-) +Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) +$ git merge apm/for-next +Already up-to-date. +Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (74ae45a Merge branches 'x86_pkg_temp' and 'misc' of .git into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/Kconfig | 2 +- + drivers/thermal/x86_pkg_temp_thermal.c | 14 ++++++++------ + 2 files changed, 9 insertions(+), 7 deletions(-) +Merging ieee1394/for-next (db9ae8f firewire: ohci: Fix deadlock at bus reset) +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next (8930fa5 UBI: Fix invalidate_fastmap()) +$ git merge ubi/linux-next +Already up-to-date. +Merging dlm/next (c6ca7bc dlm: remove signal blocking) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (9be1d5a Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + drivers/dma/Kconfig | 1 + + drivers/dma/edma.c | 2 +- + drivers/dma/pl330.c | 10 ++-------- + drivers/dma/tegra20-apb-dma.c | 2 +- + 4 files changed, 5 insertions(+), 10 deletions(-) +Merging dmaengine/next (4a43f39 dmaengine: dma_sync_wait and dma_find_channel undefined) +$ git merge dmaengine/next +Already up-to-date. +Merging net-next/master (8ce4406 ipv6: do not allow ipv6 module to be removed) +$ git merge net-next/master +Auto-merging include/net/mrp.h +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +Auto-merging drivers/net/ethernet/amd/declance.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/cpsw-phy-sel.txt | 28 ++ + Documentation/ptp/testptp.c | 65 ++- + arch/arm/boot/dts/am33xx.dtsi | 6 + + drivers/net/can/mscan/mscan.h | 6 +- + drivers/net/can/softing/softing.h | 24 +- + drivers/net/ethernet/8390/8390.h | 40 +- + drivers/net/ethernet/adi/bfin_mac.h | 2 +- + drivers/net/ethernet/amd/7990.h | 12 +- + drivers/net/ethernet/amd/declance.c | 16 +- + drivers/net/ethernet/atheros/atl1c/atl1c.h | 6 +- + drivers/net/ethernet/atheros/atl1e/atl1e.h | 12 +- + drivers/net/ethernet/atheros/atlx/atl2.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 7 +- + drivers/net/ethernet/broadcom/cnic_if.h | 4 +- + drivers/net/ethernet/broadcom/tg3.c | 81 ++-- + drivers/net/ethernet/broadcom/tg3.h | 3 + + drivers/net/ethernet/brocade/bna/bnad.h | 43 +- + drivers/net/ethernet/chelsio/cxgb/common.h | 46 +-- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 11 +- + drivers/net/ethernet/emulex/benet/be.h | 24 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 238 ++++++----- + drivers/net/ethernet/freescale/gianfar.h | 26 +- + drivers/net/ethernet/sfc/ef10.c | 319 ++++++++++++++- + drivers/net/ethernet/sfc/ef10_regs.h | 1 + + drivers/net/ethernet/sfc/efx.h | 1 + + drivers/net/ethernet/sfc/ethtool.c | 5 +- + drivers/net/ethernet/sfc/io.h | 5 + + drivers/net/ethernet/sfc/net_driver.h | 7 + + drivers/net/ethernet/sfc/nic.c | 73 ++-- + drivers/net/ethernet/sfc/nic.h | 46 ++- + drivers/net/ethernet/sfc/rx.c | 90 +++-- + drivers/net/ethernet/sfc/tx.c | 419 +++++++++++++++---- + drivers/net/ethernet/ti/Kconfig | 8 + + drivers/net/ethernet/ti/Makefile | 1 + + drivers/net/ethernet/ti/cpsw-phy-sel.c | 161 ++++++++ + drivers/net/ethernet/ti/cpsw.c | 157 +++----- + drivers/net/ethernet/ti/cpsw.h | 2 + + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 39 +- + drivers/net/phy/micrel.c | 24 ++ + drivers/net/usb/cdc-phonet.c | 2 +- + include/net/bluetooth/bluetooth.h | 16 +- + include/net/bluetooth/hci_core.h | 23 +- + include/net/bluetooth/rfcomm.h | 4 +- + include/net/caif/caif_hsi.h | 2 +- + include/net/compat.h | 48 ++- + include/net/dcbevent.h | 6 +- + include/net/dn.h | 20 +- + include/net/dn_dev.h | 30 +- + include/net/dn_fib.h | 47 +-- + include/net/dn_neigh.h | 12 +- + include/net/dn_nsp.h | 49 +-- + include/net/dn_route.h | 13 +- + include/net/dst.h | 25 +- + include/net/esp.h | 2 +- + include/net/fib_rules.h | 17 +- + include/net/flow.h | 11 +- + include/net/flow_keys.h | 2 +- + include/net/garp.h | 27 +- + include/net/gen_stats.h | 51 ++- + include/net/genetlink.h | 26 +- + include/net/icmp.h | 10 +- + include/net/inet6_connection_sock.h | 32 +- + include/net/inet6_hashtables.h | 38 +- + include/net/inet_common.h | 48 +-- + include/net/inet_connection_sock.h | 79 ++-- + include/net/inet_hashtables.h | 72 ++-- + include/net/inet_sock.h | 4 +- + include/net/inet_timewait_sock.h | 37 +- + include/net/inetpeer.h | 12 +- + include/net/ip.h | 169 ++++---- + include/net/ip6_fib.h | 53 ++- + include/net/ip6_route.h | 98 ++--- + include/net/ip_fib.h | 61 ++- + include/net/ip_vs.h | 245 ++++++------ + include/net/ipv6.h | 268 ++++++------- + include/net/ipx.h | 12 +- + include/net/irda/ircomm_tty.h | 14 +- + include/net/irda/irda.h | 21 +- + include/net/irda/irlap_event.h | 2 +- + include/net/irda/irlap_frame.h | 4 +- + include/net/iw_handler.h | 38 +- + include/net/lapb.h | 52 +-- + include/net/llc.h | 50 +-- + include/net/llc_c_ac.h | 190 ++++----- + include/net/llc_c_ev.h | 207 ++++------ + include/net/llc_conn.h | 36 +- + include/net/llc_if.h | 7 +- + include/net/llc_pdu.h | 33 +- + include/net/llc_s_ac.h | 20 +- + include/net/llc_s_ev.h | 21 +- + include/net/llc_sap.h | 22 +- + include/net/mrp.h | 26 +- + include/net/ndisc.h | 61 ++- + include/net/net_namespace.h | 28 +- + include/net/netevent.h | 6 +- + include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 6 +- + include/net/netfilter/ipv4/nf_defrag_ipv4.h | 2 +- + include/net/netfilter/ipv6/nf_defrag_ipv6.h | 17 +- + include/net/netfilter/nf_conntrack.h | 69 ++-- + include/net/netfilter/nf_conntrack_acct.h | 12 +- + include/net/netfilter/nf_conntrack_core.h | 69 ++-- + include/net/netfilter/nf_conntrack_ecache.h | 22 +- + include/net/netfilter/nf_conntrack_extend.h | 2 +- + include/net/netfilter/nf_conntrack_helper.h | 40 +- + include/net/netfilter/nf_conntrack_l3proto.h | 16 +- + include/net/netfilter/nf_conntrack_l4proto.h | 32 +- + include/net/netfilter/nf_conntrack_seqadj.h | 30 +- + include/net/netfilter/nf_conntrack_synproxy.h | 28 +- + include/net/netfilter/nf_conntrack_timeout.h | 4 +- + include/net/netfilter/nf_conntrack_timestamp.h | 8 +- + include/net/netfilter/nf_nat.h | 10 +- + include/net/netfilter/nf_nat_core.h | 8 +- + include/net/netfilter/nf_nat_helper.h | 29 +- + include/net/netfilter/nf_nat_l3proto.h | 23 +- + include/net/netfilter/nf_nat_l4proto.h | 30 +- + include/net/netfilter/nf_queue.h | 2 +- + include/net/netfilter/xt_rateest.h | 4 +- + include/net/netlink.h | 63 ++- + include/net/netrom.h | 89 ++--- + include/net/p8022.h | 18 +- + include/net/ping.h | 4 +- + include/net/protocol.h | 24 +- + include/net/psnap.h | 4 +- + include/net/raw.h | 6 +- + include/net/rawv6.h | 3 +- + include/net/request_sock.h | 14 +- + include/net/rose.h | 114 +++--- + include/net/route.h | 53 +-- + include/net/rtnetlink.h | 40 +- + include/net/sch_generic.h | 11 +- + include/net/scm.h | 10 +- + include/net/sctp/sctp.h | 13 +- + include/net/secure_seq.h | 28 +- + include/net/sock.h | 223 +++++------ + include/net/stp.h | 4 +- + include/net/tcp.h | 442 +++++++++++---------- + include/net/udp.h | 94 ++--- + include/net/udplite.h | 6 +- + include/net/wext.h | 16 +- + include/net/wimax.h | 33 +- + include/net/x25.h | 141 +++---- + include/net/xfrm.h | 375 ++++++++--------- + include/uapi/linux/pkt_sched.h | 2 + + net/ethernet/eth.c | 6 +- + net/ipv4/syncookies.c | 53 +-- + net/ipv4/tcp_input.c | 84 ++-- + net/ipv6/af_inet6.c | 48 --- + net/ipv6/syncookies.c | 39 +- + net/sched/act_police.c | 4 +- + net/sched/sch_generic.c | 5 +- + net/sched/sch_htb.c | 17 +- + net/sched/sch_tbf.c | 4 +- + 152 files changed, 3875 insertions(+), 3247 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/cpsw-phy-sel.txt + create mode 100644 drivers/net/ethernet/ti/cpsw-phy-sel.c +Merging ipsec-next/master (aba8269 {ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode callback) +$ git merge ipsec-next/master +Resolved 'include/net/xfrm.h' using previous resolution. +Auto-merging net/xfrm/xfrm_state.c +Auto-merging net/ipv4/xfrm4_mode_tunnel.c +Auto-merging include/net/xfrm.h +CONFLICT (content): Merge conflict in include/net/xfrm.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ec448f8] Merge remote-tracking branch 'ipsec-next/master' +$ git diff -M --stat --summary HEAD^.. + include/net/xfrm.h | 10 +++++-- + net/ipv4/ip_vti.c | 67 +------------------------------------------- + net/ipv4/xfrm4_mode_tunnel.c | 16 +++++------ + net/xfrm/xfrm_state.c | 2 +- + 4 files changed, 18 insertions(+), 77 deletions(-) +Merging wireless-next/master (b75ff5e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (4375f10 Bluetooth: Add new mgmt_set_advertising command) +$ git merge bluetooth/master +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging include/net/bluetooth/bluetooth.h +Merge made by the 'recursive' strategy. + drivers/bluetooth/hci_vhci.c | 170 +++++++++++++++++------- + include/net/bluetooth/bluetooth.h | 1 + + include/net/bluetooth/hci.h | 9 +- + include/net/bluetooth/hci_core.h | 1 - + include/net/bluetooth/mgmt.h | 3 + + net/bluetooth/af_bluetooth.c | 41 ++++++ + net/bluetooth/hci_conn.c | 1 + + net/bluetooth/hci_core.c | 108 +++++++++++++--- + net/bluetooth/hci_event.c | 12 +- + net/bluetooth/hci_sock.c | 204 ++++++++++++++++++++++------- + net/bluetooth/l2cap_core.c | 68 ++++++---- + net/bluetooth/l2cap_sock.c | 10 +- + net/bluetooth/mgmt.c | 266 +++++++++++++++++++++++++++----------- + net/bluetooth/rfcomm/sock.c | 7 +- + 14 files changed, 681 insertions(+), 220 deletions(-) +Merging infiniband/for-next (82af24a Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (ef9a61b Merge tag 'for-linus-20130909' of git://git.infradead.org/linux-mtd) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (7a88659 mtd: nand: correct extemded param page error handling) +$ git merge l2-mtd/master +Auto-merging drivers/mtd/nand/nandsim.c +Merge made by the 'recursive' strategy. + drivers/mtd/devices/m25p80.c | 17 +++++++-- + drivers/mtd/devices/mtd_dataflash.c | 2 -- + drivers/mtd/lpddr/lpddr_cmds.c | 2 +- + drivers/mtd/nand/atmel_nand.c | 66 ++++++++-------------------------- + drivers/mtd/nand/denali.c | 2 +- + drivers/mtd/nand/docg4.c | 1 - + drivers/mtd/nand/fsl_elbc_nand.c | 2 -- + drivers/mtd/nand/fsl_ifc_nand.c | 2 -- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 8 ++--- + drivers/mtd/nand/lpc32xx_slc.c | 8 ----- + drivers/mtd/nand/nand_base.c | 41 +++++++++++---------- + drivers/mtd/nand/nand_bbt.c | 1 - + drivers/mtd/nand/nandsim.c | 2 +- + drivers/mtd/onenand/omap2.c | 22 ------------ + drivers/mtd/onenand/onenand_base.c | 17 ++++----- + include/linux/mtd/nand.h | 2 -- + include/linux/of_mtd.h | 21 ++++++++++- + 17 files changed, 85 insertions(+), 131 deletions(-) +Merging crypto/master (48e6dc1 crypto: dcp - Fix the path for releasing the resources) +$ git merge crypto/master +Auto-merging crypto/ablk_helper.c +Auto-merging crypto/Makefile +Merge made by the 'recursive' strategy. + arch/arm/mach-tegra/fuse.c | 10 - + arch/x86/crypto/Makefile | 3 +- + arch/x86/crypto/aesni-intel_glue.c | 2 +- + arch/x86/crypto/camellia_aesni_avx2_glue.c | 2 +- + arch/x86/crypto/camellia_aesni_avx_glue.c | 2 +- + arch/x86/crypto/cast5_avx_glue.c | 2 +- + arch/x86/crypto/cast6_avx_glue.c | 2 +- + arch/x86/crypto/serpent_avx2_glue.c | 2 +- + arch/x86/crypto/serpent_avx_glue.c | 2 +- + arch/x86/crypto/serpent_sse2_glue.c | 2 +- + arch/x86/crypto/sha256_ssse3_glue.c | 2 +- + arch/x86/crypto/twofish_avx_glue.c | 2 +- + arch/x86/include/asm/simd.h | 11 + + crypto/Kconfig | 23 +- + crypto/Makefile | 1 + + {arch/x86/crypto => crypto}/ablk_helper.c | 9 +- + crypto/ansi_cprng.c | 4 +- + drivers/char/hw_random/via-rng.c | 2 +- + drivers/crypto/caam/caamalg.c | 7 + + drivers/crypto/caam/caamhash.c | 7 + + drivers/crypto/caam/caamrng.c | 7 + + drivers/crypto/caam/ctrl.c | 400 ++++++++++++++++----- + drivers/crypto/caam/desc.h | 17 +- + drivers/crypto/caam/intern.h | 6 + + drivers/crypto/caam/regs.h | 14 +- + drivers/crypto/caam/sg_sw_sec4.h | 34 +- + drivers/crypto/dcp.c | 47 +-- + drivers/crypto/mv_cesa.c | 10 +- + drivers/crypto/omap-aes.c | 4 +- + drivers/crypto/tegra-aes.c | 26 +- + include/asm-generic/simd.h | 14 + + .../include/asm => include}/crypto/ablk_helper.h | 0 + 32 files changed, 479 insertions(+), 197 deletions(-) + create mode 100644 arch/x86/include/asm/simd.h + rename {arch/x86/crypto => crypto}/ablk_helper.c (97%) + create mode 100644 include/asm-generic/simd.h + rename {arch/x86/include/asm => include}/crypto/ablk_helper.h (100%) +Merging drm/drm-next (86a7e12 Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-intel/for-linux-next (75b6ef3 drm/i915/vlv: fix up broken precision in vlv_crtc_clock_get) +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_tv.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 770b475] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_crtc.c | 2 + + drivers/gpu/drm/i915/Makefile | 3 + + drivers/gpu/drm/i915/dvo.h | 11 - + drivers/gpu/drm/i915/i915_debugfs.c | 52 +- + drivers/gpu/drm/i915/i915_dma.c | 29 +- + drivers/gpu/drm/i915/i915_drv.c | 78 ++- + drivers/gpu/drm/i915/i915_drv.h | 180 ++++-- + drivers/gpu/drm/i915/i915_gem.c | 248 +++++--- + drivers/gpu/drm/i915/i915_gem_context.c | 50 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 50 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 423 ++++++++----- + drivers/gpu/drm/i915/i915_gem_gtt.c | 126 +++- + drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 6 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 29 +- + drivers/gpu/drm/i915/i915_irq.c | 133 ++-- + drivers/gpu/drm/i915/i915_reg.h | 493 +++++++++++++- + drivers/gpu/drm/i915/i915_suspend.c | 8 +- + drivers/gpu/drm/i915/i915_sysfs.c | 68 +- + drivers/gpu/drm/i915/i915_trace.h | 62 +- + drivers/gpu/drm/i915/intel_bios.c | 195 +++++- + drivers/gpu/drm/i915/intel_bios.h | 87 ++- + drivers/gpu/drm/i915/intel_crt.c | 43 +- + drivers/gpu/drm/i915/intel_ddi.c | 91 ++- + drivers/gpu/drm/i915/intel_display.c | 987 +++++++++++++++++------------ + drivers/gpu/drm/i915/intel_dp.c | 357 +++++++---- + drivers/gpu/drm/i915/intel_drv.h | 519 ++++++++------- + drivers/gpu/drm/i915/intel_dsi.c | 621 ++++++++++++++++++ + drivers/gpu/drm/i915/intel_dsi.h | 102 +++ + drivers/gpu/drm/i915/intel_dsi_cmd.c | 427 +++++++++++++ + drivers/gpu/drm/i915/intel_dsi_cmd.h | 109 ++++ + drivers/gpu/drm/i915/intel_dsi_pll.c | 317 +++++++++ + drivers/gpu/drm/i915/intel_dvo.c | 11 +- + drivers/gpu/drm/i915/intel_fb.c | 25 +- + drivers/gpu/drm/i915/intel_hdmi.c | 65 +- + drivers/gpu/drm/i915/intel_lvds.c | 15 +- + drivers/gpu/drm/i915/intel_opregion.c | 431 ++++++++++++- + drivers/gpu/drm/i915/intel_overlay.c | 9 +- + drivers/gpu/drm/i915/intel_panel.c | 186 +++--- + drivers/gpu/drm/i915/intel_pm.c | 338 ++++++---- + drivers/gpu/drm/i915/intel_ringbuffer.c | 71 ++- + drivers/gpu/drm/i915/intel_ringbuffer.h | 15 +- + drivers/gpu/drm/i915/intel_sdvo.c | 45 +- + drivers/gpu/drm/i915/intel_sideband.c | 74 ++- + drivers/gpu/drm/i915/intel_sprite.c | 12 +- + drivers/gpu/drm/i915/intel_tv.c | 12 +- + drivers/gpu/drm/i915/intel_uncore.c | 33 +- + include/uapi/drm/drm_mode.h | 2 + + include/uapi/drm/i915_drm.h | 8 +- + 49 files changed, 5528 insertions(+), 1732 deletions(-) + create mode 100644 drivers/gpu/drm/i915/intel_dsi.c + create mode 100644 drivers/gpu/drm/i915/intel_dsi.h + create mode 100644 drivers/gpu/drm/i915/intel_dsi_cmd.c + create mode 100644 drivers/gpu/drm/i915/intel_dsi_cmd.h + create mode 100644 drivers/gpu/drm/i915/intel_dsi_pll.c +Merging drm-tegra/drm/for-next (03da0e7 drm/tegra: Parse device tree earlier) +$ git merge drm-tegra/drm/for-next +Already up-to-date. +Merging sound/for-next (43cdd08 Merge branch 'for-linus' into for-next) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + sound/pci/asihpi/asihpi.c | 9 +++++++-- + sound/pci/au88x0/au88x0_synth.c | 29 ++++++++++------------------- + sound/pci/ctxfi/ctdaio.c | 4 ++-- + sound/pci/hda/patch_ca0132.c | 2 +- + sound/pci/rme9652/hdspm.c | 5 ----- + 5 files changed, 20 insertions(+), 29 deletions(-) +Merging sound-asoc/for-next (691c7e5 Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/tlv320aic3x.txt | 26 + + Documentation/sound/alsa/soc/DPCM.txt | 380 +++++++++++++ + Documentation/sound/alsa/soc/codec.txt | 46 +- + Documentation/sound/alsa/soc/dapm.txt | 71 ++- + Documentation/sound/alsa/soc/machine.txt | 6 +- + Documentation/sound/alsa/soc/platform.txt | 19 +- + drivers/base/regmap/internal.h | 3 + + drivers/base/regmap/regmap.c | 103 ++++ + drivers/mfd/mc13xxx-core.c | 5 - + drivers/mfd/mc13xxx-spi.c | 5 + + include/linux/mfd/mc13xxx.h | 7 + + include/linux/regmap.h | 13 + + include/sound/soc-dai.h | 3 + + include/sound/soc.h | 95 +--- + include/trace/events/asoc.h | 1 + + sound/soc/Makefile | 2 +- + sound/soc/blackfin/bf6xx-i2s.c | 1 + + sound/soc/codecs/88pm860x-codec.c | 78 +-- + sound/soc/codecs/88pm860x-codec.h | 117 ++-- + sound/soc/codecs/ab8500-codec.c | 85 +-- + sound/soc/codecs/ak4104.c | 11 +- + sound/soc/codecs/ak4642.c | 2 - + sound/soc/codecs/arizona.c | 23 +- + sound/soc/codecs/cq93vc.c | 46 +- + sound/soc/codecs/max98088.c | 624 +++++++++------------ + sound/soc/codecs/max98095.c | 470 ++++++---------- + sound/soc/codecs/max9850.c | 39 +- + sound/soc/codecs/mc13783.c | 59 +- + sound/soc/codecs/rt5640.c | 15 +- + sound/soc/codecs/tlv320aic23.c | 84 ++- + sound/soc/codecs/tlv320aic26.c | 139 +---- + sound/soc/codecs/tlv320aic26.h | 5 +- + sound/soc/codecs/tlv320aic3x.c | 233 ++++---- + sound/soc/codecs/twl6040.c | 4 +- + sound/soc/codecs/wm8400.c | 95 +--- + sound/soc/davinci/davinci-evm.c | 64 ++- + sound/soc/fsl/fsl_spdif.c | 18 +- + sound/soc/fsl/fsl_ssi.c | 20 +- + sound/soc/fsl/imx-sgtl5000.c | 12 +- + sound/soc/fsl/imx-spdif.c | 4 +- + sound/soc/fsl/imx-wm8962.c | 3 +- + sound/soc/kirkwood/kirkwood-dma.c | 4 +- + sound/soc/mid-x86/mfld_machine.c | 10 +- + sound/soc/mxs/mxs-saif.c | 12 +- + sound/soc/mxs/mxs-sgtl5000.c | 20 +- + sound/soc/omap/omap-mcpdm.c | 12 +- + sound/soc/omap/omap-twl4030.c | 5 +- + sound/soc/pxa/mmp-sspa.c | 5 +- + sound/soc/samsung/bells.c | 1 + + sound/soc/samsung/i2s.c | 14 +- + sound/soc/samsung/smdk_wm8994.c | 12 +- + sound/soc/sh/rcar/adg.c | 11 +- + sound/soc/sh/rcar/core.c | 45 -- + sound/soc/sh/rcar/gen.c | 261 +++++---- + sound/soc/sh/rcar/rsnd.h | 4 - + sound/soc/soc-cache.c | 263 ++------- + sound/soc/soc-core.c | 319 ++++++----- + sound/soc/soc-devres.c | 86 +++ + sound/soc/soc-io.c | 26 - + sound/soc/soc-utils.c | 6 +- + sound/soc/spear/spdif_in.c | 12 +- + sound/soc/spear/spdif_out.c | 14 +- + 62 files changed, 2067 insertions(+), 2111 deletions(-) + create mode 100644 Documentation/sound/alsa/soc/DPCM.txt + create mode 100644 sound/soc/soc-devres.c +Merging modules/modules-next (942e443 module: Fix mod->mkobj.kobj potentially freed too early) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (9e266ec virtio_pci: pm: Use CONFIG_PM_SLEEP instead of CONFIG_PM) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (9a35c41 Input: wacom - add support for three new Intuos Pro devices) +$ git merge input/next +Auto-merging drivers/input/serio/Kconfig +Merge made by the 'recursive' strategy. + drivers/input/misc/ad714x-spi.c | 1 - + drivers/input/misc/cobalt_btns.c | 2 - + drivers/input/misc/rb532_button.c | 1 - + drivers/input/misc/uinput.c | 26 +- + drivers/input/mouse/cypress_ps2.c | 2 +- + drivers/input/serio/Kconfig | 10 + + drivers/input/serio/Makefile | 1 + + drivers/input/serio/hyperv-keyboard.c | 437 +++++++++++++++++++++++++++++++ + drivers/input/tablet/wacom_sys.c | 39 +-- + drivers/input/tablet/wacom_wac.c | 114 ++++++-- + drivers/input/tablet/wacom_wac.h | 4 + + drivers/input/touchscreen/ad7877.c | 2 - + drivers/input/touchscreen/ad7879-spi.c | 1 - + drivers/input/touchscreen/cyttsp4_core.c | 2 - + drivers/input/touchscreen/htcpen.c | 2 - + drivers/input/touchscreen/tsc2005.c | 2 - + 16 files changed, 593 insertions(+), 53 deletions(-) + create mode 100644 drivers/input/serio/hyperv-keyboard.c +Merging input-mt/for-next (ad81f05 Linux 3.11-rc1) +$ git merge input-mt/for-next +Already up-to-date. +Merging cgroup/for-next (7dc1502 Merge branch 'for-3.13' into for-next) +$ git merge cgroup/for-next +Resolved 'mm/memcontrol.c' using previous resolution. +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c3e3ca4] Merge remote-tracking branch 'cgroup/for-next' +$ git diff -M --stat --summary HEAD^.. + include/linux/cgroup.h | 37 ------- + kernel/cgroup.c | 256 +------------------------------------------------ + mm/memcontrol.c | 66 ++++++++----- + 3 files changed, 44 insertions(+), 315 deletions(-) +Merging block/for-next (808854a Merge branch 'for-3.12/core' into for-next) +$ git merge block/for-next +Resolved 'drivers/md/bcache/bcache.h' using previous resolution. +Resolved 'drivers/md/bcache/bset.c' using previous resolution. +Resolved 'drivers/md/bcache/journal.c' using previous resolution. +Resolved 'drivers/md/bcache/request.c' using previous resolution. +Resolved 'drivers/md/bcache/writeback.c' using previous resolution. +Auto-merging drivers/md/bcache/writeback.c +CONFLICT (content): Merge conflict in drivers/md/bcache/writeback.c +Auto-merging drivers/md/bcache/util.h +Auto-merging drivers/md/bcache/util.c +Auto-merging drivers/md/bcache/sysfs.c +Auto-merging drivers/md/bcache/request.c +CONFLICT (content): Merge conflict in drivers/md/bcache/request.c +Auto-merging drivers/md/bcache/journal.c +CONFLICT (content): Merge conflict in drivers/md/bcache/journal.c +Auto-merging drivers/md/bcache/btree.c +Auto-merging drivers/md/bcache/bset.c +CONFLICT (content): Merge conflict in drivers/md/bcache/bset.c +Auto-merging drivers/md/bcache/bcache.h +CONFLICT (content): Merge conflict in drivers/md/bcache/bcache.h +Auto-merging drivers/block/loop.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1a3a1d0] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/block/Kconfig | 10 + + drivers/block/Makefile | 2 + + drivers/block/loop.c | 15 +- + drivers/block/mtip32xx/mtip32xx.c | 500 +-- + drivers/block/mtip32xx/mtip32xx.h | 18 +- + drivers/block/rsxx/core.c | 8 +- + drivers/block/rsxx/dma.c | 111 +- + drivers/block/rsxx/rsxx_priv.h | 9 +- + drivers/block/skd_main.c | 5817 +++++++++++++++++++++++++++++++++++ + drivers/block/skd_s1120.h | 354 +++ + drivers/block/xen-blkback/blkback.c | 3 +- + drivers/block/xen-blkfront.c | 44 +- + drivers/md/bcache/Kconfig | 11 +- + drivers/md/bcache/alloc.c | 383 ++- + drivers/md/bcache/bcache.h | 327 +- + drivers/md/bcache/bset.c | 289 +- + drivers/md/bcache/bset.h | 93 +- + drivers/md/bcache/btree.c | 1385 +++++---- + drivers/md/bcache/btree.h | 195 +- + drivers/md/bcache/closure.c | 25 +- + drivers/md/bcache/closure.h | 110 +- + drivers/md/bcache/debug.c | 170 +- + drivers/md/bcache/debug.h | 50 +- + drivers/md/bcache/journal.c | 290 +- + drivers/md/bcache/journal.h | 49 +- + drivers/md/bcache/movinggc.c | 85 +- + drivers/md/bcache/request.c | 1100 ++++--- + drivers/md/bcache/request.h | 43 +- + drivers/md/bcache/stats.c | 26 +- + drivers/md/bcache/stats.h | 13 +- + drivers/md/bcache/super.c | 190 +- + drivers/md/bcache/sysfs.c | 42 +- + drivers/md/bcache/trace.c | 1 - + drivers/md/bcache/util.c | 12 +- + drivers/md/bcache/util.h | 15 +- + drivers/md/bcache/writeback.c | 455 ++- + drivers/md/bcache/writeback.h | 47 +- + include/trace/events/bcache.h | 47 +- + include/uapi/linux/bcache.h | 373 +++ + 39 files changed, 9581 insertions(+), 3136 deletions(-) + create mode 100644 drivers/block/skd_main.c + create mode 100644 drivers/block/skd_s1120.h + create mode 100644 include/uapi/linux/bcache.h +Merging device-mapper/for-next (e860313 dm: add reserved_bio_based_ios module parameter) +$ git merge device-mapper/for-next +Already up-to-date. +Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (272b98c Linux 3.12-rc1) +$ git merge mmc/mmc-next +Already up-to-date. +Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging slab/for-next (23774a2 slab: Use correct GFP_DMA constant) +$ git merge slab/for-next +Already up-to-date. +Merging uclinux/for-next (6dbe51c Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (bfc90cb raid5: only wakeup necessary threads) +$ git merge md/for-next +Already up-to-date. +Merging mfd/master (9c31e88 Merge tag 'mfd-lee-3.12-2' of git://git.linaro.org/people/ljones/mfd) +$ git merge mfd/master +Already up-to-date. +Merging mfd-lj/for-mfd-next (0b67865 Merge branch 'mfd-asoc' into for-mfd-next) +$ git merge mfd-lj/for-mfd-next +Merge made by the 'recursive' strategy. + drivers/mfd/Kconfig | 10 ++ + drivers/mfd/Makefile | 1 + + drivers/mfd/aat2870-core.c | 2 +- + drivers/mfd/da9052-i2c.c | 12 +- + drivers/mfd/ezx-pcap.c | 8 +- + drivers/mfd/lpc_ich.c | 2 - + drivers/mfd/mc13xxx-i2c.c | 1 - + drivers/mfd/rts5249.c | 48 ++++++- + drivers/mfd/rtsx_pcr.c | 5 +- + drivers/mfd/sm501.c | 4 +- + drivers/mfd/stw481x.c | 250 ++++++++++++++++++++++++++++++++++ + drivers/mfd/ti-ssp.c | 1 - + drivers/mfd/ti_am335x_tscadc.c | 10 +- + drivers/mfd/timberdale.c | 6 +- + drivers/mfd/tps6586x.c | 18 ++- + drivers/mfd/twl6040.c | 10 +- + drivers/mfd/ucb1x00-core.c | 1 + + drivers/mfd/wm5110-tables.c | 36 ++++- + drivers/mfd/wm8994-core.c | 78 ----------- + include/linux/mfd/arizona/registers.h | 2 +- + include/linux/mfd/da9052/da9052.h | 20 ++- + include/linux/mfd/rtsx_pci.h | 53 +++++++ + include/linux/mfd/stw481x.h | 56 ++++++++ + include/linux/mfd/ti_am335x_tscadc.h | 20 ++- + include/linux/mfd/wm8994/core.h | 47 +++++-- + 25 files changed, 550 insertions(+), 151 deletions(-) + create mode 100644 drivers/mfd/stw481x.c + create mode 100644 include/linux/mfd/stw481x.h +Merging battery/master (db15e63 rx51_battery: Fix channel number when reading adc value) +$ git merge battery/master +Already up-to-date. +Merging fbdev/for-next (5e8be02 video: atmel_lcdfb: add device tree suport) +$ git merge fbdev/for-next +Auto-merging drivers/video/atmel_lcdfb.c +Auto-merging drivers/video/Kconfig +Auto-merging arch/avr32/mach-at32ap/at32ap700x.c +Auto-merging arch/avr32/boards/atngw100/mrmt.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/video/atmel,lcdc.txt | 75 +++++ + arch/arm/mach-at91/at91sam9261_devices.c | 6 +- + arch/arm/mach-at91/at91sam9263_devices.c | 6 +- + arch/arm/mach-at91/at91sam9g45_devices.c | 6 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 6 +- + arch/arm/mach-at91/board-sam9261ek.c | 10 +- + arch/arm/mach-at91/board-sam9263ek.c | 6 +- + arch/arm/mach-at91/board-sam9m10g45ek.c | 4 +- + arch/arm/mach-at91/board-sam9rlek.c | 6 +- + arch/arm/mach-at91/board.h | 4 +- + arch/avr32/boards/atngw100/evklcd10x.c | 8 +- + arch/avr32/boards/atngw100/mrmt.c | 4 +- + arch/avr32/boards/atstk1000/atstk1000.h | 2 +- + arch/avr32/boards/atstk1000/setup.c | 2 +- + arch/avr32/boards/favr-32/setup.c | 2 +- + arch/avr32/boards/hammerhead/setup.c | 2 +- + arch/avr32/boards/merisc/display.c | 2 +- + arch/avr32/boards/mimc200/setup.c | 4 +- + arch/avr32/mach-at32ap/at32ap700x.c | 8 +- + arch/avr32/mach-at32ap/include/mach/board.h | 4 +- + drivers/video/Kconfig | 2 + + drivers/video/atmel_lcdfb.c | 343 +++++++++++++++++---- + include/video/atmel_lcdc.h | 25 +- + 23 files changed, 402 insertions(+), 135 deletions(-) + create mode 100644 Documentation/devicetree/bindings/video/atmel,lcdc.txt +Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (da22fd5 Merge branches '3.13/fbdev-misc' and '3.13/hdmi-regs' into for-next) +$ git merge omap_dss2/for-next +Resolved 'drivers/video/atmel_lcdfb.c' using previous resolution. +Auto-merging drivers/video/atmel_lcdfb.c +CONFLICT (content): Merge conflict in drivers/video/atmel_lcdfb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2c1fdf8] Merge remote-tracking branch 'omap_dss2/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-mmp/ttc_dkb.c | 4 +- + drivers/video/amba-clcd.c | 2 +- + drivers/video/arkfb.c | 1 - + drivers/video/atmel_lcdfb.c | 4 +- + drivers/video/aty/aty128fb.c | 4 +- + drivers/video/aty/radeon_pm.c | 22 +++++----- + drivers/video/aty/radeonfb.h | 1 - + drivers/video/au1100fb.c | 2 +- + drivers/video/carminefb.c | 1 - + drivers/video/cirrusfb.c | 1 - + drivers/video/cyber2000fb.c | 5 --- + drivers/video/da8xx-fb.c | 4 +- + drivers/video/ep93xx-fb.c | 2 +- + drivers/video/geode/gx1fb_core.c | 1 - + drivers/video/geode/gxfb_core.c | 1 - + drivers/video/geode/lxfb_core.c | 1 - + drivers/video/grvga.c | 14 +----- + drivers/video/i740fb.c | 1 - + drivers/video/i810/i810_main.c | 1 - + drivers/video/imxfb.c | 6 +-- + drivers/video/intelfb/intelfbdrv.c | 2 - + drivers/video/kyro/fbdev.c | 1 - + drivers/video/matrox/matroxfb_maven.c | 14 +----- + drivers/video/mb862xx/mb862xxfbdrv.c | 1 - + drivers/video/mbx/mbxfb.c | 2 +- + drivers/video/mmp/fb/mmpfb.c | 34 +++++++++------ + drivers/video/mmp/hw/mmp_ctrl.c | 71 ++++++++++++++++++------------- + drivers/video/mmp/hw/mmp_ctrl.h | 5 +++ + drivers/video/mx3fb.c | 4 +- + drivers/video/neofb.c | 6 --- + drivers/video/nuc900fb.c | 6 +-- + drivers/video/omap/hwa742.c | 2 +- + drivers/video/omap/omapfb_main.c | 4 +- + drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 70 +++++++++++++++++++++++++----- + drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h | 65 +++++++++++++++++++++++++--- + drivers/video/pm2fb.c | 1 - + drivers/video/pm3fb.c | 1 - + drivers/video/pxa168fb.c | 6 +-- + drivers/video/pxafb.c | 16 +++---- + drivers/video/s1d13xxxfb.c | 12 +++--- + drivers/video/s3c-fb.c | 2 +- + drivers/video/s3c2410fb.c | 6 +-- + drivers/video/s3fb.c | 1 - + drivers/video/sa1100fb.c | 4 +- + drivers/video/savage/savagefb_driver.c | 6 --- + drivers/video/sh_mobile_hdmi.c | 6 +-- + drivers/video/simplefb.c | 4 +- + drivers/video/sis/sis_main.c | 4 -- + drivers/video/tdfxfb.c | 1 - + drivers/video/tmiofb.c | 10 ++--- + drivers/video/tridentfb.c | 1 - + drivers/video/vt8623fb.c | 1 - + drivers/video/w100fb.c | 2 +- + include/video/mmp_disp.h | 6 +++ + 54 files changed, 261 insertions(+), 194 deletions(-) +Merging regulator/for-next (5f6d777 Merge remote-tracking branch 'regulator/topic/tps6524x' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../bindings/regulator/as3722-regulator.txt | 91 ++ + .../devicetree/bindings/regulator/palmas-pmic.txt | 12 +- + .../devicetree/bindings/regulator/regulator.txt | 5 + + Documentation/driver-model/devres.txt | 1 + + drivers/regulator/88pm8607.c | 12 +- + drivers/regulator/Kconfig | 26 +- + drivers/regulator/Makefile | 4 +- + drivers/regulator/aat2870-regulator.c | 11 +- + drivers/regulator/ad5398.c | 19 +- + drivers/regulator/anatop-regulator.c | 3 +- + drivers/regulator/arizona-ldo1.c | 12 +- + drivers/regulator/arizona-micsupp.c | 14 +- + drivers/regulator/as3711-regulator.c | 22 +- + drivers/regulator/as3722-regulator.c | 917 +++++++++++++++++++++ + drivers/regulator/core.c | 328 +++----- + drivers/regulator/da903x.c | 11 +- + drivers/regulator/da9052-regulator.c | 14 +- + drivers/regulator/da9055-regulator.c | 24 +- + drivers/regulator/da9063-regulator.c | 4 +- + drivers/regulator/devres.c | 252 ++++++ + drivers/regulator/fan53555.c | 12 +- + drivers/regulator/fixed.c | 28 +- + drivers/regulator/internal.h | 38 + + drivers/regulator/isl6271a-regulator.c | 24 +- + drivers/regulator/max1586.c | 26 +- + drivers/regulator/max77686.c | 23 +- + drivers/regulator/max77693.c | 29 +- + drivers/regulator/max8649.c | 14 +- + drivers/regulator/max8660.c | 30 +- + drivers/regulator/max8907-regulator.c | 23 +- + drivers/regulator/max8973-regulator.c | 11 +- + drivers/regulator/max8997.c | 39 +- + drivers/regulator/max8998.c | 35 +- + drivers/regulator/mc13783-regulator.c | 25 +- + drivers/regulator/mc13892-regulator.c | 22 +- + drivers/regulator/of_regulator.c | 6 + + drivers/regulator/palmas-regulator.c | 220 ++++- + drivers/regulator/rc5t583-regulator.c | 22 +- + drivers/regulator/s2mps11.c | 23 +- + drivers/regulator/s5m8767.c | 24 +- + drivers/regulator/stw481x-vmmc.c | 110 +++ + drivers/regulator/ti-abb-regulator.c | 79 +- + drivers/regulator/tps51632-regulator.c | 11 +- + drivers/regulator/tps62360-regulator.c | 17 +- + drivers/regulator/tps65023-regulator.c | 22 +- + drivers/regulator/tps6507x-regulator.c | 23 +- + drivers/regulator/tps65090-regulator.c | 35 +- + drivers/regulator/tps65217-regulator.c | 26 +- + drivers/regulator/tps6524x-regulator.c | 1 - + drivers/regulator/tps6586x-regulator.c | 31 +- + drivers/regulator/tps65910-regulator.c | 23 +- + drivers/regulator/tps65912-regulator.c | 24 +- + drivers/regulator/tps80031-regulator.c | 30 +- + drivers/regulator/wm831x-dcdc.c | 118 +-- + drivers/regulator/wm831x-isink.c | 25 +- + drivers/regulator/wm831x-ldo.c | 67 +- + drivers/regulator/wm8350-regulator.c | 8 +- + drivers/regulator/wm8400-regulator.c | 13 +- + drivers/regulator/wm8994-regulator.c | 14 +- + include/linux/regulator/driver.h | 9 + + include/linux/regulator/machine.h | 7 +- + 61 files changed, 1944 insertions(+), 1205 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/as3722-regulator.txt + create mode 100644 drivers/regulator/as3722-regulator.c + create mode 100644 drivers/regulator/devres.c + create mode 100644 drivers/regulator/internal.h + create mode 100644 drivers/regulator/stw481x-vmmc.c +Merging security/next (5a5f2ac selinux: add Paul Moore as a SELinux maintainer) +$ git merge security/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + security/Makefile | 1 - + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging selinux/master (7a36283 selinux: add Paul Moore as a SELinux maintainer) +$ git merge selinux/master +Auto-merging security/selinux/include/xfrm.h +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/capability.c +Auto-merging include/linux/security.h +Merge made by the 'recursive' strategy. + include/linux/security.h | 26 ++- + security/capability.c | 15 +- + security/security.c | 13 +- + security/selinux/hooks.c | 146 +++++++----- + security/selinux/include/objsec.h | 4 +- + security/selinux/include/security.h | 13 +- + security/selinux/include/xfrm.h | 45 ++-- + security/selinux/netnode.c | 2 + + security/selinux/selinuxfs.c | 4 +- + security/selinux/ss/ebitmap.c | 20 +- + security/selinux/ss/ebitmap.h | 10 +- + security/selinux/ss/mls.c | 22 +- + security/selinux/ss/mls_types.h | 2 +- + security/selinux/ss/policydb.c | 3 +- + security/selinux/ss/services.c | 66 ++++-- + security/selinux/xfrm.c | 453 ++++++++++++++++-------------------- + 16 files changed, 448 insertions(+), 396 deletions(-) +Merging lblnet/master (07bc9dc Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) +$ git merge lblnet/master +Already up-to-date. +Merging watchdog/master (4a10c2a Linux 3.12-rc2) +$ git merge watchdog/master +Already up-to-date. +Merging dwmw2-iommu/master (e5d0c87 Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (6796ec4 Merge branches 'iommu/fixes', 'tracing', 'core' and 'arm/tegra' into next) +$ git merge iommu/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 ++ + drivers/iommu/Makefile | 1 + + drivers/iommu/arm-smmu.c | 13 ++-- + drivers/iommu/iommu-traces.c | 27 ++++++++ + drivers/iommu/iommu.c | 21 ++++-- + drivers/iommu/tegra-gart.c | 25 ++----- + drivers/iommu/tegra-smmu.c | 2 +- + include/linux/intel-iommu.h | 2 +- + include/linux/iommu.h | 2 + + include/trace/events/iommu.h | 162 +++++++++++++++++++++++++++++++++++++++++++ + 10 files changed, 230 insertions(+), 32 deletions(-) + create mode 100644 drivers/iommu/iommu-traces.c + create mode 100644 include/trace/events/iommu.h +Merging vfio/next (dac09b5 vfio: fix documentation) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (2e515bf Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/for-next (dcd6c92 Linux 3.3-rc1) +$ git merge audit/for-next +Already up-to-date. +Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (2bc552d of/platform: add error reporting to of_amba_device_create()) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (8851b9f include: dt-binding: input: create a DT header defining key codes.) +$ git merge dt-rh/for-next +Already up-to-date. +Merging spi/for-next (03010d5 Merge remote-tracking branch 'spi/topic/topcliff' into spi-next) +$ git merge spi/for-next +Auto-merging Documentation/driver-model/devres.txt +Merge made by the 'recursive' strategy. + Documentation/driver-model/devres.txt | 3 + + drivers/spi/Kconfig | 3 +- + drivers/spi/spi-altera.c | 2 +- + drivers/spi/spi-ath79.c | 2 +- + drivers/spi/spi-atmel.c | 41 ++++---- + drivers/spi/spi-au1550.c | 2 +- + drivers/spi/spi-bfin-sport.c | 27 ++--- + drivers/spi/spi-bfin5xx.c | 24 +++-- + drivers/spi/spi-bitbang.c | 12 ++- + drivers/spi/spi-butterfly.c | 2 +- + drivers/spi/spi-clps711x.c | 2 - + drivers/spi/spi-davinci.c | 13 ++- + drivers/spi/spi-dw-mmio.c | 5 +- + drivers/spi/spi-dw-pci.c | 1 - + drivers/spi/spi-efm32.c | 6 +- + drivers/spi/spi-fsl-dspi.c | 19 ++-- + drivers/spi/spi-gpio.c | 5 +- + drivers/spi/spi-imx.c | 2 +- + drivers/spi/spi-lm70llp.c | 2 +- + drivers/spi/spi-mpc512x-psc.c | 4 +- + drivers/spi/spi-nuc900.c | 3 +- + drivers/spi/spi-oc-tiny.c | 2 +- + drivers/spi/spi-pl022.c | 3 - + drivers/spi/spi-ppc4xx.c | 3 +- + drivers/spi/spi-pxa2xx.c | 11 +- + drivers/spi/spi-rspi.c | 183 ++++++++++++++++++++++++++-------- + drivers/spi/spi-s3c24xx.c | 4 +- + drivers/spi/spi-s3c64xx.c | 35 ++++--- + drivers/spi/spi-sh-sci.c | 2 +- + drivers/spi/spi-sirf.c | 2 +- + drivers/spi/spi-tegra114.c | 2 +- + drivers/spi/spi-tegra20-sflash.c | 2 +- + drivers/spi/spi-tegra20-slink.c | 2 +- + drivers/spi/spi-topcliff-pch.c | 4 +- + drivers/spi/spi-xilinx.c | 2 +- + drivers/spi/spi.c | 40 +++++++- + drivers/spi/spidev.c | 1 - + include/linux/spi/rspi.h | 2 + + include/linux/spi/spi.h | 2 + + 39 files changed, 314 insertions(+), 168 deletions(-) +Merging tip/auto-latest (d7b7593 Merge branch 'x86/uv') +$ git merge tip/auto-latest +Resolved 'kernel/reboot.c' using previous resolution. +Auto-merging kernel/reboot.c +CONFLICT (content): Merge conflict in kernel/reboot.c +Auto-merging arch/x86/kernel/reboot.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 85b519c] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + arch/metag/include/asm/topology.h | 2 + + arch/x86/include/asm/uaccess_64.h | 24 +- + arch/x86/include/asm/uv/uv.h | 10 + + arch/x86/include/asm/uv/uv_hub.h | 57 ++- + arch/x86/include/asm/uv/uv_mmrs.h | 31 ++ + arch/x86/kernel/apic/x2apic_uv_x.c | 70 +--- + arch/x86/kernel/cpu/perf_event.h | 5 + + arch/x86/kernel/cpu/perf_event_intel.c | 77 +++- + arch/x86/kernel/cpu/perf_event_intel_ds.c | 135 +++--- + arch/x86/kernel/i8259.c | 3 +- + arch/x86/kernel/reboot.c | 7 +- + arch/x86/mm/init.c | 23 +- + arch/x86/platform/uv/Makefile | 2 +- + arch/x86/platform/uv/uv_nmi.c | 666 ++++++++++++++++++++++++++++++ + drivers/rtc/interface.c | 13 +- + include/linux/clocksource.h | 2 + + include/linux/sched.h | 4 + + include/linux/sched/sysctl.h | 2 +- + include/linux/sched_clock.h | 2 + + include/linux/topology.h | 6 + + kernel/hung_task.c | 2 +- + kernel/sched/core.c | 10 +- + kernel/sched/fair.c | 217 ++++++---- + kernel/sched/sched.h | 4 + + kernel/sysctl.c | 5 +- + kernel/time/clocksource.c | 46 ++- + kernel/time/ntp.c | 3 +- + kernel/time/sched_clock.c | 111 ++--- + 28 files changed, 1210 insertions(+), 329 deletions(-) + create mode 100644 arch/x86/platform/uv/uv_nmi.c +Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (75a9551 cpc925_edac: Use proper array termination) +$ git merge edac-amd/for-next +Already up-to-date. +Merging ftrace/for-next (a0a5a05 ftrace/rcu: Do not trace debug_lockdep_rcu_enabled()) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (3ec367f Merge branch 'idle.2013.09.23a' into HEAD) +$ git merge rcu/rcu/next +Auto-merging net/ipv6/ip6_tunnel.c +Auto-merging kernel/sched/core.c +Auto-merging drivers/net/bonding/bond_main.c +Auto-merging drivers/net/bonding/bond_alb.c +Merge made by the 'recursive' strategy. + Documentation/RCU/checklist.txt | 2 +- + Documentation/RCU/stallwarn.txt | 22 ++-- + Documentation/kernel-per-CPU-kthreads.txt | 17 ++- + drivers/net/bonding/bond_alb.c | 3 +- + drivers/net/bonding/bond_main.c | 8 +- + include/linux/rculist.h | 23 +++- + include/linux/rcupdate.h | 36 ++++-- + include/linux/rcutiny.h | 17 +++ + include/linux/rcutree.h | 2 + + include/trace/events/rcu.h | 80 ++++++++++--- + kernel/lockdep.c | 4 +- + kernel/notifier.c | 2 +- + kernel/rcu.h | 7 ++ + kernel/rcupdate.c | 4 +- + kernel/rcutiny.c | 29 +++-- + kernel/rcutree.c | 189 ++++++++++++++++++++++-------- + kernel/rcutree.h | 2 + + kernel/rcutree_plugin.h | 80 +++++++++---- + kernel/sched/core.c | 10 +- + net/bridge/br_mdb.c | 2 +- + net/bridge/br_multicast.c | 4 +- + net/decnet/dn_route.c | 5 +- + net/ipv4/ip_sockglue.c | 2 +- + net/ipv6/ip6_gre.c | 2 +- + net/ipv6/ip6_tunnel.c | 2 +- + net/ipv6/sit.c | 2 +- + net/mac80211/sta_info.c | 4 +- + net/wireless/scan.c | 14 +-- + 28 files changed, 413 insertions(+), 161 deletions(-) +Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (6a3f95a KVM: s390: Intercept SCK instruction) +$ git merge kvm/linux-next +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/cpuid.txt | 7 +++ + Documentation/virtual/kvm/locking.txt | 11 +++++ + arch/s390/include/asm/kvm_host.h | 1 - + arch/s390/kvm/diag.c | 4 +- + arch/s390/kvm/gaccess.h | 21 +++++--- + arch/s390/kvm/intercept.c | 6 --- + arch/s390/kvm/interrupt.c | 3 ++ + arch/s390/kvm/kvm-s390.c | 91 +++++++++++++++++++++++------------ + arch/s390/kvm/kvm-s390.h | 9 ++-- + arch/s390/kvm/priv.c | 61 +++++++++++++++++++++++ + arch/x86/kvm/vmx.c | 30 +++++++++--- + include/linux/kvm_host.h | 1 - + virt/kvm/async_pf.c | 5 +- + 13 files changed, 185 insertions(+), 65 deletions(-) +Merging kvm-arm/kvm-arm-next (1fe40f6 ARM: KVM: Add newlines to panic strings) +$ git merge kvm-arm/kvm-arm-next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (6b9e4fa Merge tag 'kvm-arm-for-3.12' of git://git.linaro.org/people/cdall/linux-kvm-arm into queue) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging oprofile/for-next (f722406 Linux 3.10-rc1) +$ git merge oprofile/for-next +Already up-to-date. +Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work) +$ git merge fw-nohz/nohz/next +Already up-to-date. +Merging xen-tip/linux-next (5efadb4 Merge branch 'stable/for-linus-3.12' into linux-next) +$ git merge xen-tip/linux-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging percpu/for-next (f851c8d percpu: fix bootmem error handling in pcpu_page_first_chunk()) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + mm/percpu.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging workqueues/for-next (016564d workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues) +$ git merge workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 41 ++++++++++++++++++++++++++++++++--------- + 1 file changed, 32 insertions(+), 9 deletions(-) +Merging drivers-x86/linux-next (5c07eae platform/x86: panasonic-laptop: reuse module_acpi_driver) +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (dfa6f4c Merge remote-tracking branch 'regmap/topic/range' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + include/linux/regmap.h | 2 ++ + 1 file changed, 2 insertions(+) +Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (271c111 leds: dac124s085: Remove redundant spi_set_drvdata) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/leds-lp55xx.txt | 10 +++++++--- + drivers/leds/leds-blinkm.c | 3 --- + drivers/leds/leds-dac124s085.c | 3 --- + drivers/leds/leds-lp55xx-common.c | 3 +++ + include/linux/platform_data/leds-lp55xx.h | 1 + + 5 files changed, 11 insertions(+), 9 deletions(-) +Merging driver-core/driver-core-next (4a10c2a Linux 3.12-rc2) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (4a10c2a Linux 3.12-rc2) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (c04ee4b Revert "Revert "USB: EHCI: support running URB giveback in tasklet context"") +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/core/devio.c | 6 +- + drivers/usb/core/hcd.c | 14 ++- + drivers/usb/core/hub.c | 11 ++- + drivers/usb/core/usb.h | 1 + + drivers/usb/host/ehci-fsl.c | 4 +- + drivers/usb/host/ehci-grlib.c | 2 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ehci-mv.c | 2 +- + drivers/usb/host/ehci-octeon.c | 2 +- + drivers/usb/host/ehci-pmcmsp.c | 2 +- + drivers/usb/host/ehci-ppc-of.c | 2 +- + drivers/usb/host/ehci-ps3.c | 2 +- + drivers/usb/host/ehci-q.c | 5 -- + drivers/usb/host/ehci-sched.c | 180 +++++++++++++++++++++++--------------- + drivers/usb/host/ehci-sead3.c | 2 +- + drivers/usb/host/ehci-sh.c | 2 +- + drivers/usb/host/ehci-tilegx.c | 2 +- + drivers/usb/host/ehci-w90x900.c | 2 +- + drivers/usb/host/ehci-xilinx-of.c | 2 +- + drivers/usb/host/ehci.h | 1 + + include/linux/usb.h | 2 +- + include/linux/usb/hcd.h | 7 ++ + 22 files changed, 155 insertions(+), 100 deletions(-) +Merging usb-gadget/next (272b98c Linux 3.12-rc1) +$ git merge usb-gadget/next +Already up-to-date. +Merging staging/staging-next (d78b140 staging: imx-drm: imx-ldb: Staticize of_get_data_mapping()) +$ git merge staging/staging-next +Auto-merging include/linux/mfd/ti_am335x_tscadc.h +Auto-merging drivers/staging/vt6656/rxtx.c +Auto-merging drivers/staging/vt6656/iwctl.c +Auto-merging drivers/staging/rtl8192u/r819xU_cmdpkt.c +Auto-merging drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 11 + + .../devicetree/bindings/iio/light/gp2ap020a00f.txt | 21 + + MAINTAINERS | 4 +- + drivers/iio/accel/bma180.c | 7 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 7 +- + drivers/iio/accel/st_accel_core.c | 30 +- + drivers/iio/adc/Kconfig | 11 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7266.c | 13 +- + drivers/iio/adc/ad7298.c | 10 +- + drivers/iio/adc/ad7476.c | 9 +- + drivers/iio/adc/ad7887.c | 10 +- + drivers/iio/adc/ad7923.c | 10 +- + drivers/iio/adc/ad_sigma_delta.c | 6 +- + drivers/iio/adc/at91_adc.c | 10 +- + drivers/iio/adc/max1363.c | 15 +- + drivers/iio/adc/mcp3422.c | 409 +++++ + drivers/iio/adc/ti_am335x_adc.c | 223 ++- + drivers/iio/buffer_cb.c | 8 +- + drivers/iio/common/st_sensors/st_sensors_buffer.c | 7 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 70 +- + drivers/iio/dac/ad5064.c | 3 +- + drivers/iio/dac/ad5380.c | 4 +- + drivers/iio/dac/ad5446.c | 3 +- + drivers/iio/dac/ad5504.c | 4 +- + drivers/iio/dac/ad5624r_spi.c | 4 +- + drivers/iio/dac/ad5686.c | 4 +- + drivers/iio/dac/ad5755.c | 1 + + drivers/iio/dac/ad5791.c | 5 +- + drivers/iio/dac/ad7303.c | 1 + + drivers/iio/dac/mcp4725.c | 3 +- + drivers/iio/frequency/adf4350.c | 1 + + drivers/iio/gyro/adis16130.c | 2 - + drivers/iio/gyro/adis16260.c | 1 - + drivers/iio/gyro/adxrs450.c | 1 - + drivers/iio/gyro/hid-sensor-gyro-3d.c | 7 +- + drivers/iio/gyro/itg3200_buffer.c | 5 +- + drivers/iio/gyro/st_gyro_core.c | 30 +- + drivers/iio/iio_core.h | 2 +- + drivers/iio/imu/adis16400_buffer.c | 9 +- + drivers/iio/imu/adis_buffer.c | 9 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 6 +- + drivers/iio/industrialio-buffer.c | 60 +- + drivers/iio/industrialio-core.c | 180 ++- + drivers/iio/industrialio-event.c | 2 +- + drivers/iio/kfifo_buf.c | 5 +- + drivers/iio/light/Kconfig | 32 + + drivers/iio/light/Makefile | 3 + + drivers/iio/light/adjd_s311.c | 77 +- + drivers/iio/light/gp2ap020a00f.c | 1617 ++++++++++++++++++++ + drivers/iio/light/hid-sensor-als.c | 7 +- + drivers/iio/light/tcs3472.c | 367 +++++ + drivers/iio/light/tsl4531.c | 258 ++++ + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 7 +- + drivers/iio/magnetometer/st_magn_core.c | 31 +- + drivers/iio/pressure/st_pressure.h | 1 + + drivers/iio/pressure/st_pressure_core.c | 268 +++- + drivers/iio/pressure/st_pressure_i2c.c | 1 + + drivers/iio/temperature/tmp006.c | 57 +- + drivers/input/touchscreen/ti_am335x_tsc.c | 12 +- + drivers/staging/android/Kconfig | 7 +- + drivers/staging/android/alarm-dev.c | 8 +- + drivers/staging/android/ashmem.c | 137 +- + drivers/staging/android/binder.c | 9 +- + drivers/staging/android/timed_output.h | 4 +- + drivers/staging/bcm/InterfaceMisc.c | 2 +- + drivers/staging/bcm/PHSModule.c | 12 +- + drivers/staging/bcm/nvm.c | 12 +- + drivers/staging/comedi/comedidev.h | 9 +- + drivers/staging/comedi/drivers.c | 29 + + drivers/staging/comedi/drivers/8255.c | 25 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 2 - + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 7 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 17 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 7 +- + drivers/staging/comedi/drivers/addi_apci_1516.c | 8 +- + drivers/staging/comedi/drivers/addi_apci_16xx.c | 11 +- + drivers/staging/comedi/drivers/addi_apci_2032.c | 8 +- + drivers/staging/comedi/drivers/addi_apci_2200.c | 8 +- + drivers/staging/comedi/drivers/addi_apci_3120.c | 2 - + drivers/staging/comedi/drivers/addi_apci_3501.c | 8 +- + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 17 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 137 +- + drivers/staging/comedi/drivers/adl_pci7x3x.c | 13 +- + drivers/staging/comedi/drivers/adl_pci9111.c | 9 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 11 +- + drivers/staging/comedi/drivers/adq12b.c | 32 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 16 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 13 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 33 +- + drivers/staging/comedi/drivers/aio_iiro_16.c | 4 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 33 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 17 +- + drivers/staging/comedi/drivers/amplc_pci263.c | 17 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 9 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 25 +- + drivers/staging/comedi/drivers/comedi_parport.c | 380 +++-- + drivers/staging/comedi/drivers/contec_pci_dio.c | 12 +- + drivers/staging/comedi/drivers/das08.c | 46 +- + drivers/staging/comedi/drivers/das08.h | 1 - + drivers/staging/comedi/drivers/das16.c | 9 +- + drivers/staging/comedi/drivers/das16m1.c | 22 +- + drivers/staging/comedi/drivers/das1800.c | 22 +- + drivers/staging/comedi/drivers/das800.c | 6 +- + drivers/staging/comedi/drivers/dmm32at.c | 70 +- + drivers/staging/comedi/drivers/dt2801.c | 18 +- + drivers/staging/comedi/drivers/dt2811.c | 8 +- + drivers/staging/comedi/drivers/dt2817.c | 51 +- + drivers/staging/comedi/drivers/dt282x.c | 10 +- + drivers/staging/comedi/drivers/dt3000.c | 9 +- + drivers/staging/comedi/drivers/dt9812.c | 9 +- + drivers/staging/comedi/drivers/dyna_pci10xx.c | 20 +- + drivers/staging/comedi/drivers/icp_multi.c | 14 +- + drivers/staging/comedi/drivers/ii_pci20kc.c | 7 +- + drivers/staging/comedi/drivers/me4000.c | 25 +- + drivers/staging/comedi/drivers/me_daq.c | 9 +- + drivers/staging/comedi/drivers/multiq3.c | 8 +- + drivers/staging/comedi/drivers/ni_6527.c | 22 +- + drivers/staging/comedi/drivers/ni_660x.c | 1 - + drivers/staging/comedi/drivers/ni_670x.c | 11 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 7 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 8 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 9 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 19 +- + drivers/staging/comedi/drivers/ni_labpc.c | 10 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 45 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 9 +- + drivers/staging/comedi/drivers/pcl711.c | 671 ++++---- + drivers/staging/comedi/drivers/pcl726.c | 19 +- + drivers/staging/comedi/drivers/pcl730.c | 13 +- + drivers/staging/comedi/drivers/pcl812.c | 11 +- + drivers/staging/comedi/drivers/pcl818.c | 18 +- + drivers/staging/comedi/drivers/pcmad.c | 8 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 8 +- + drivers/staging/comedi/drivers/rtd520.c | 8 +- + drivers/staging/comedi/drivers/rti800.c | 8 +- + drivers/staging/comedi/drivers/s526.c | 9 +- + drivers/staging/comedi/drivers/s626.c | 13 +- + drivers/staging/comedi/drivers/skel.c | 46 +- + drivers/staging/comedi/drivers/ssv_dnp.c | 48 +- + drivers/staging/comedi/drivers/usbdux.c | 6 +- + drivers/staging/comedi/drivers/usbduxsigma.c | 6 +- + drivers/staging/comedi/drivers/vmk80xx.c | 35 +- + drivers/staging/crystalhd/crystalhd_hw.c | 8 +- + drivers/staging/dgap/Makefile | 2 - + drivers/staging/dgap/dgap_downld.h | 2 +- + drivers/staging/dgap/dgap_driver.c | 13 +- + drivers/staging/dgap/dgap_driver.h | 5 +- + drivers/staging/dgap/dgap_fep5.h | 2 +- + drivers/staging/dgap/dgap_kcompat.h | 29 - + drivers/staging/dgap/dgap_parse.c | 10 +- + drivers/staging/dgap/dgap_sysfs.c | 22 +- + drivers/staging/dgap/dgap_tty.c | 34 +- + drivers/staging/dgap/digi.h | 4 +- + drivers/staging/dgap/downld.c | 4 +- + drivers/staging/dgnc/dgnc_cls.c | 22 +- + drivers/staging/dgnc/dgnc_driver.c | 138 +- + drivers/staging/dgnc/dgnc_driver.h | 12 +- + drivers/staging/dgnc/dgnc_kcompat.h | 24 - + drivers/staging/dgnc/dgnc_mgmt.c | 22 +- + drivers/staging/dgnc/dgnc_neo.c | 30 +- + drivers/staging/dgnc/dgnc_neo.h | 2 +- + drivers/staging/dgnc/dgnc_sysfs.c | 166 +- + drivers/staging/dgnc/dgnc_sysfs.h | 6 +- + drivers/staging/dgnc/dgnc_tty.c | 311 ++-- + drivers/staging/dgnc/dgnc_tty.h | 6 +- + drivers/staging/dgnc/digi.h | 4 +- + drivers/staging/dgrp/dgrp_sysfs.c | 30 +- + drivers/staging/dwc2/TODO | 33 + + drivers/staging/dwc2/core.c | 27 +- + drivers/staging/dwc2/core.h | 7 + + drivers/staging/dwc2/hcd.c | 54 +- + drivers/staging/dwc2/hcd.h | 3 + + drivers/staging/dwc2/hcd_ddma.c | 13 +- + drivers/staging/dwc2/hcd_intr.c | 29 +- + drivers/staging/dwc2/hcd_queue.c | 203 ++- + drivers/staging/dwc2/pci.c | 1 + + drivers/staging/et131x/Module.symvers | 0 + drivers/staging/et131x/README | 7 +- + drivers/staging/et131x/et131x.c | 17 +- + drivers/staging/fwserial/fwserial.c | 3 +- + drivers/staging/iio/accel/lis3l02dq_ring.c | 6 +- + drivers/staging/iio/accel/sca3000_core.c | 8 +- + drivers/staging/iio/accel/sca3000_ring.c | 4 +- + drivers/staging/iio/adc/ad7192.c | 15 +- + drivers/staging/iio/adc/ad7280a.c | 11 +- + drivers/staging/iio/adc/ad7291.c | 27 +- + drivers/staging/iio/adc/ad7606_core.c | 26 +- + drivers/staging/iio/adc/ad7606_ring.c | 8 +- + drivers/staging/iio/adc/ad7780.c | 28 +- + drivers/staging/iio/adc/ad7816.c | 59 +- + drivers/staging/iio/adc/ad799x_core.c | 16 +- + drivers/staging/iio/adc/ad799x_ring.c | 10 +- + drivers/staging/iio/adc/lpc32xx_adc.c | 49 +- + drivers/staging/iio/adc/mxs-lradc.c | 19 +- + drivers/staging/iio/addac/adt7316.c | 86 +- + drivers/staging/iio/frequency/ad5930.c | 16 +- + drivers/staging/iio/frequency/ad9832.c | 36 +- + drivers/staging/iio/frequency/ad9834.c | 33 +- + drivers/staging/iio/frequency/ad9850.c | 16 +- + drivers/staging/iio/frequency/ad9852.c | 17 +- + drivers/staging/iio/frequency/ad9910.c | 16 +- + drivers/staging/iio/frequency/ad9951.c | 17 +- + drivers/staging/iio/iio_simple_dummy.c | 16 + + drivers/staging/iio/iio_simple_dummy_buffer.c | 7 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 32 +- + drivers/staging/iio/light/isl29018.c | 18 +- + drivers/staging/iio/light/tsl2583.c | 48 +- + drivers/staging/iio/light/tsl2x7x_core.c | 48 +- + drivers/staging/iio/magnetometer/hmc5843.c | 26 +- + drivers/staging/iio/meter/ade7753.c | 31 +- + drivers/staging/iio/meter/ade7754.c | 31 +- + drivers/staging/iio/meter/ade7758_core.c | 32 +- + drivers/staging/iio/meter/ade7758_ring.c | 6 +- + drivers/staging/iio/meter/ade7759.c | 30 +- + drivers/staging/iio/meter/ade7854-i2c.c | 4 +- + drivers/staging/iio/meter/ade7854-spi.c | 4 +- + drivers/staging/iio/meter/ade7854.c | 22 +- + drivers/staging/iio/resolver/ad2s1200.c | 28 +- + drivers/staging/iio/resolver/ad2s1210.c | 34 +- + drivers/staging/iio/resolver/ad2s90.c | 16 +- + drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 23 +- + .../staging/iio/trigger/iio-trig-periodic-rtc.c | 4 +- + drivers/staging/imx-drm/imx-ldb.c | 2 +- + drivers/staging/lustre/lustre/Kconfig | 2 +- + drivers/staging/lustre/lustre/libcfs/hash.c | 2 +- + .../lustre/lustre/libcfs/linux/linux-curproc.c | 2 +- + drivers/staging/lustre/lustre/libcfs/prng.c | 4 +- + drivers/staging/lustre/lustre/llite/dir.c | 2 +- + drivers/staging/lustre/lustre/llite/file.c | 6 +- + drivers/staging/lustre/lustre/llite/llite_close.c | 2 +- + drivers/staging/lustre/lustre/llite/statahead.c | 2 +- + drivers/staging/lustre/lustre/lvfs/fsfilt.c | 12 +- + drivers/staging/lustre/lustre/lvfs/lvfs_lib.c | 5 +- + drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 62 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +- + drivers/staging/netlogic/xlr_net.h | 2 +- + drivers/staging/octeon/ethernet-rx.c | 4 +- + drivers/staging/octeon/ethernet-tx.c | 2 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 2 +- + drivers/staging/quickstart/quickstart.c | 4 - + drivers/staging/rtl8187se/r8180_core.c | 3 +- + drivers/staging/rtl8188eu/core/rtw_br_ext.c | 3 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 23 +- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 7 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 26 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 7 +- + drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 423 ----- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 4 +- + drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 96 +- + drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 2 +- + drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h | 2 - + drivers/staging/rtl8188eu/include/odm.h | 4 +- + drivers/staging/rtl8188eu/include/odm_HWConfig.h | 4 +- + drivers/staging/rtl8188eu/include/rtw_recv.h | 2 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 11 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 3 +- + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 6 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- + drivers/staging/rtl8192e/dot11d.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 18 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - + drivers/staging/rtl8192e/rtllib_rx.c | 13 +- + drivers/staging/rtl8192u/r8190_rtl8256.h | 4 - + drivers/staging/rtl8192u/r8192U.h | 4 - + drivers/staging/rtl8192u/r8192U_dm.c | 278 +--- + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 99 -- + drivers/staging/rtl8192u/r819xU_cmdpkt.h | 2 - + drivers/staging/rtl8192u/r819xU_firmware.c | 23 +- + drivers/staging/rtl8192u/r819xU_phy.c | 6 - + drivers/staging/rtl8712/usb_intf.c | 16 +- + drivers/staging/silicom/bpctl_mod.c | 188 +-- + drivers/staging/slicoss/slicoss.c | 6 +- + drivers/staging/sm7xxfb/sm7xxfb.c | 1 - + drivers/staging/speakup/Kconfig | 4 + + drivers/staging/speakup/kobjects.c | 72 +- + drivers/staging/usbip/stub_dev.c | 26 +- + drivers/staging/usbip/stub_main.c | 4 +- + drivers/staging/usbip/userspace/configure.ac | 1 - + drivers/staging/usbip/userspace/doc/usbip.8 | 8 +- + drivers/staging/usbip/userspace/doc/usbipd.8 | 27 +- + .../staging/usbip/userspace/src/usbip_network.c | 16 + + .../staging/usbip/userspace/src/usbip_network.h | 1 + + drivers/staging/usbip/userspace/src/usbipd.c | 69 +- + drivers/staging/usbip/vhci_hcd.c | 10 +- + drivers/staging/vt6655/bssdb.c | 11 +- + drivers/staging/vt6655/device_main.c | 4 - + drivers/staging/vt6655/dpc.c | 7 +- + drivers/staging/vt6655/iwctl.c | 6 +- + drivers/staging/vt6655/key.c | 10 +- + drivers/staging/vt6655/vntwifi.c | 22 - + drivers/staging/vt6655/wcmd.c | 2 +- + drivers/staging/vt6655/wctl.c | 8 +- + drivers/staging/vt6655/wmgr.c | 3 +- + drivers/staging/vt6655/wpactl.c | 2 +- + drivers/staging/vt6656/bssdb.c | 12 +- + drivers/staging/vt6656/channel.c | 2 +- + drivers/staging/vt6656/desc.h | 9 - + drivers/staging/vt6656/dpc.c | 13 +- + drivers/staging/vt6656/hostap.c | 2 +- + drivers/staging/vt6656/iwctl.c | 8 +- + drivers/staging/vt6656/key.c | 10 +- + drivers/staging/vt6656/rxtx.c | 69 +- + drivers/staging/vt6656/rxtx.h | 12 +- + drivers/staging/vt6656/wctl.c | 7 +- + drivers/staging/vt6656/wmgr.c | 6 +- + drivers/staging/vt6656/wpactl.c | 2 +- + drivers/staging/winbond/mto.c | 7 +- + drivers/staging/winbond/mto.h | 8 +- + drivers/staging/winbond/phy_calibration.c | 58 +- + drivers/staging/winbond/reg.c | 16 +- + drivers/staging/winbond/wb35tx.c | 2 +- + drivers/staging/wlan-ng/cfg80211.c | 6 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 90 +- + drivers/staging/xgifb/XGI_main_26.c | 1 - + include/linux/iio/buffer.h | 31 +- + include/linux/iio/common/st_sensors.h | 1 + + include/linux/iio/consumer.h | 2 +- + include/linux/iio/iio.h | 35 +- + include/linux/iio/sysfs.h | 15 + + include/linux/mfd/ti_am335x_tscadc.h | 9 + + 322 files changed, 6382 insertions(+), 4592 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/light/gp2ap020a00f.txt + create mode 100644 drivers/iio/adc/mcp3422.c + create mode 100644 drivers/iio/light/gp2ap020a00f.c + create mode 100644 drivers/iio/light/tcs3472.c + create mode 100644 drivers/iio/light/tsl4531.c + create mode 100644 drivers/staging/dwc2/TODO + create mode 100644 drivers/staging/et131x/Module.symvers +Merging char-misc/char-misc-next (4a10c2a Linux 3.12-rc2) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging scsi/for-next (fc85799 [SCSI] fnic: fnic Driver Tuneables Exposed through CLI) +$ git merge scsi/for-next +Already up-to-date. +Merging target-updates/for-next (2999ee7 target/iscsi: Bump versions to v4.1.0) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (d4e4ab8 Linux 3.11-rc5) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation) +$ git merge bcon/master +Resolved 'drivers/block/Kconfig' using previous resolution. +Auto-merging kernel/printk/printk.c +Auto-merging init/do_mounts.c +Auto-merging include/linux/mount.h +Auto-merging include/linux/console.h +Auto-merging drivers/net/netconsole.c +Auto-merging drivers/block/Makefile +Auto-merging drivers/block/Kconfig +CONFLICT (content): Merge conflict in drivers/block/Kconfig +Auto-merging block/partitions/check.h +Auto-merging block/partitions/check.c +Auto-merging block/partitions/Makefile +Auto-merging Documentation/networking/netconsole.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 37892c3] Merge remote-tracking branch 'bcon/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/blockconsole.txt | 94 ++++ + Documentation/block/blockconsole/bcon_tail | 82 ++++ + Documentation/block/blockconsole/mkblockconsole | 29 ++ + Documentation/networking/netconsole.txt | 16 +- + block/partitions/Makefile | 1 + + block/partitions/blockconsole.c | 22 + + block/partitions/check.c | 3 + + block/partitions/check.h | 3 + + drivers/block/Kconfig | 6 + + drivers/block/Makefile | 1 + + drivers/block/blockconsole.c | 618 ++++++++++++++++++++++++ + drivers/net/netconsole.c | 2 +- + include/linux/blockconsole.h | 7 + + include/linux/console.h | 1 + + include/linux/mount.h | 2 +- + init/do_mounts.c | 2 +- + kernel/printk/printk.c | 5 +- + 17 files changed, 885 insertions(+), 9 deletions(-) + create mode 100644 Documentation/block/blockconsole.txt + create mode 100755 Documentation/block/blockconsole/bcon_tail + create mode 100755 Documentation/block/blockconsole/mkblockconsole + create mode 100644 block/partitions/blockconsole.c + create mode 100644 drivers/block/blockconsole.c + create mode 100644 include/linux/blockconsole.h +Merging writeback/writeback-for-next (a885599 writeback: Do not sort b_io list only because of block device inode) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (cfa8b3f Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + arch/blackfin/Kconfig | 11 + + arch/blackfin/include/asm/gpio.h | 157 +-- + arch/blackfin/include/asm/portmux.h | 19 +- + arch/blackfin/kernel/Makefile | 3 +- + arch/blackfin/mach-bf548/include/mach/portmux.h | 2 - + arch/blackfin/mach-bf609/include/mach/portmux.h | 2 - + drivers/pinctrl/Kconfig | 18 + + drivers/pinctrl/Makefile | 3 + + drivers/pinctrl/pinconf.c | 4 +- + drivers/pinctrl/pinctrl-adi2-bf54x.c | 592 ++++++++++++ + drivers/pinctrl/pinctrl-adi2-bf60x.c | 521 ++++++++++ + drivers/pinctrl/pinctrl-adi2.c | 1183 +++++++++++++++++++++++ + drivers/pinctrl/pinctrl-adi2.h | 75 ++ + drivers/pinctrl/pinctrl-tegra114.c | 5 +- + include/linux/platform_data/pinctrl-adi2.h | 40 + + 15 files changed, 2486 insertions(+), 149 deletions(-) + create mode 100644 drivers/pinctrl/pinctrl-adi2-bf54x.c + create mode 100644 drivers/pinctrl/pinctrl-adi2-bf60x.c + create mode 100644 drivers/pinctrl/pinctrl-adi2.c + create mode 100644 drivers/pinctrl/pinctrl-adi2.h + create mode 100644 include/linux/platform_data/pinctrl-adi2.h +Merging vhost/linux-next (d3d665a vhost-scsi: whitespace tweak) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (63f57cd gpio: pcf857x: Add OF support) +$ git merge gpio/for-next +Auto-merging drivers/gpio/gpio-iop.c +Removing arch/arm/mach-iop33x/include/mach/gpio.h +Removing arch/arm/mach-iop32x/include/mach/gpio.h +Removing arch/arm/include/asm/hardware/iop3xx-gpio.h +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-bcm-kona.txt | 52 ++ + .../devicetree/bindings/gpio/gpio-pcf857x.txt | 71 +++ + arch/arm/Kconfig | 4 +- + arch/arm/include/asm/hardware/iop3xx-gpio.h | 75 --- + arch/arm/include/asm/hardware/iop3xx.h | 12 - + arch/arm/mach-iop32x/em7210.c | 2 + + arch/arm/mach-iop32x/glantank.c | 2 + + arch/arm/mach-iop32x/gpio-iop32x.h | 10 + + arch/arm/mach-iop32x/include/mach/gpio.h | 6 - + arch/arm/mach-iop32x/include/mach/iop32x.h | 1 - + arch/arm/mach-iop32x/iq31244.c | 2 + + arch/arm/mach-iop32x/iq80321.c | 2 + + arch/arm/mach-iop32x/n2100.c | 47 +- + arch/arm/mach-iop33x/include/mach/gpio.h | 6 - + arch/arm/mach-iop33x/include/mach/iop33x.h | 1 - + arch/arm/mach-iop33x/iq80331.c | 7 + + arch/arm/mach-iop33x/iq80332.c | 7 + + arch/arm/plat-iop/Makefile | 2 - + drivers/gpio/Kconfig | 19 +- + drivers/gpio/Makefile | 2 + + drivers/gpio/gpio-74x164.c | 5 +- + drivers/gpio/gpio-arizona.c | 1 + + drivers/gpio/gpio-bcm-kona.c | 640 +++++++++++++++++++++ + drivers/gpio/gpio-bt8xx.c | 2 - + drivers/gpio/gpio-em.c | 1 + + .../arm/plat-iop/gpio.c => drivers/gpio/gpio-iop.c | 67 ++- + drivers/gpio/gpio-mc33880.c | 3 - + drivers/gpio/gpio-palmas.c | 104 ++-- + drivers/gpio/gpio-pca953x.c | 11 - + drivers/gpio/gpio-pcf857x.c | 105 ++-- + drivers/gpio/gpiolib.c | 145 +++-- + 31 files changed, 1133 insertions(+), 281 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-pcf857x.txt + delete mode 100644 arch/arm/include/asm/hardware/iop3xx-gpio.h + create mode 100644 arch/arm/mach-iop32x/gpio-iop32x.h + delete mode 100644 arch/arm/mach-iop32x/include/mach/gpio.h + delete mode 100644 arch/arm/mach-iop33x/include/mach/gpio.h + create mode 100644 drivers/gpio/gpio-bcm-kona.c + rename arch/arm/plat-iop/gpio.c => drivers/gpio/gpio-iop.c (56%) +Merging arm-soc/for-next (55a9e7c Merge tag 'davinci-fixes-for-v3.12-rc2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-xp.dtsi | 11 +++++++++++ + arch/arm/boot/dts/kirkwood.dtsi | 3 ++- + arch/arm/mach-davinci/board-dm365-evm.c | 2 +- + arch/arm/mach-davinci/include/mach/serial.h | 4 ++-- + arch/arm/mach-mvebu/coherency.c | 8 +++++++- + arch/arm/mach-mvebu/pmsu.c | 1 + + arch/arm/mach-mvebu/system-controller.c | 1 + + drivers/bus/mvebu-mbus.c | 6 +++++- + 8 files changed, 30 insertions(+), 6 deletions(-) +Merging bcm2835/for-next (7d13205 Linux 3.10-rc6) +$ git merge bcm2835/for-next +Already up-to-date. +Merging cortex/for-next (3ad87ac ARM: ARMv7-M: Fix name of NVIC handler function) +$ git merge cortex/for-next +Merge made by the 'recursive' strategy. +Merging ep93xx/ep93xx-for-next (6868a89 Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Auto-merging arch/arm/mach-ep93xx/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/mach-ep93xx/Kconfig | 1 + + arch/arm/mach-ep93xx/core.c | 108 ++++++++++++++++++++++++++- + arch/arm/mach-ep93xx/include/mach/platform.h | 3 +- + 3 files changed, 110 insertions(+), 2 deletions(-) +Merging imx-mxs/for-next (9e6b28e Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/imx6q-clock.txt | 1 + + .../bindings/pinctrl/fsl,mxs-pinctrl.txt | 859 +-------------------- + arch/arm/Kconfig.debug | 8 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/imx23-evk.dts | 16 +- + arch/arm/boot/dts/imx23-olinuxino.dts | 18 +- + arch/arm/boot/dts/imx23-pinfunc.h | 333 ++++++++ + arch/arm/boot/dts/imx23-stmp378x_devb.dts | 12 +- + arch/arm/boot/dts/imx23.dtsi | 221 +++--- + arch/arm/boot/dts/imx28-apf28.dts | 2 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 36 +- + arch/arm/boot/dts/imx28-apx4devkit.dts | 60 +- + arch/arm/boot/dts/imx28-cfa10036.dts | 26 +- + arch/arm/boot/dts/imx28-cfa10037.dts | 18 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 156 ++-- + arch/arm/boot/dts/imx28-cfa10055.dts | 80 +- + arch/arm/boot/dts/imx28-cfa10056.dts | 38 +- + arch/arm/boot/dts/imx28-cfa10057.dts | 66 +- + arch/arm/boot/dts/imx28-cfa10058.dts | 24 +- + arch/arm/boot/dts/imx28-evk.dts | 59 +- + arch/arm/boot/dts/imx28-m28evk.dts | 28 +- + arch/arm/boot/dts/imx28-pinfunc.h | 506 ++++++++++++ + arch/arm/boot/dts/imx28-sps1.dts | 14 +- + arch/arm/boot/dts/imx28-tx28.dts | 703 +++++++++++++++-- + arch/arm/boot/dts/imx28.dtsi | 589 +++++++------- + arch/arm/boot/dts/imx51-babbage.dts | 4 +- + arch/arm/boot/dts/imx51.dtsi | 23 + + arch/arm/boot/dts/imx53-qsb.dts | 3 +- + arch/arm/boot/dts/imx6q-pinfunc.h | 4 +- + arch/arm/boot/dts/imx6q-sabrelite.dts | 103 ++- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 + + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 21 + + arch/arm/boot/dts/imx6qdl.dtsi | 51 ++ + arch/arm/boot/dts/imx6sl-evk.dts | 39 + + arch/arm/boot/dts/imx6sl.dtsi | 84 +- + arch/arm/boot/dts/mxs-pinfunc.h | 31 + + arch/arm/boot/dts/vf610-cosmic.dts | 47 ++ + arch/arm/boot/dts/vf610-twr.dts | 17 + + arch/arm/boot/dts/vf610.dtsi | 12 + + arch/arm/include/debug/vf.S | 26 + + arch/arm/mach-imx/Kconfig | 2 +- + arch/arm/mach-imx/clk-imx6q.c | 9 +- + arch/arm/mach-imx/epit.c | 2 +- + arch/arm/mach-imx/mach-armadillo5x0.c | 3 +- + arch/arm/mach-imx/mach-imx6sl.c | 21 + + arch/arm/mach-imx/mach-mx31_3ds.c | 2 +- + arch/arm/mach-imx/mach-pcm037.c | 3 +- + arch/arm/mach-imx/mx31lilly-db.c | 3 +- + arch/arm/mach-imx/time.c | 2 +- + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 5 + + 51 files changed, 2697 insertions(+), 1701 deletions(-) + create mode 100644 arch/arm/boot/dts/imx23-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx28-pinfunc.h + create mode 100644 arch/arm/boot/dts/mxs-pinfunc.h + create mode 100644 arch/arm/boot/dts/vf610-cosmic.dts + create mode 100644 arch/arm/include/debug/vf.S +Merging ixp4xx/next (19f949f Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging msm/for-next (8fb0bf1 Merge branch 'for-3.12/msm-cleanup2' into for-next) +$ git merge msm/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (67f6928 Merge branch 'mvebu/dove_pcie-mbus-dt' into for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/armada-370-xp-mpic.txt | 3 + + .../devicetree/bindings/pci/mvebu-pci.txt | 10 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/armada-370-xp.dtsi | 3 +- + arch/arm/boot/dts/armada-370.dtsi | 9 + + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 1 + + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 1 + + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 1 + + arch/arm/boot/dts/armada-xp.dtsi | 10 + + arch/arm/boot/dts/dove-cm-a510.dts | 2 +- + arch/arm/boot/dts/dove-cubox.dts | 2 +- + arch/arm/boot/dts/dove-d2plug.dts | 2 +- + arch/arm/boot/dts/dove-d3plug.dts | 103 ++ + arch/arm/boot/dts/dove-dove-db.dts | 2 +- + arch/arm/boot/dts/dove.dtsi | 1009 +++++++++++--------- + arch/arm/mach-dove/board-dt.c | 39 +- + drivers/irqchip/irq-armada-370-xp.c | 202 +++- + drivers/pci/host/Kconfig | 2 +- + drivers/pci/host/pci-mvebu.c | 121 ++- + 19 files changed, 969 insertions(+), 554 deletions(-) + create mode 100644 arch/arm/boot/dts/dove-d3plug.dts +Merging renesas/next (1730b36 Merge branch 'heads/boards' into next) +$ git merge renesas/next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 17 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 72 ++++ + arch/arm/boot/dts/r8a73a4.dtsi | 6 +- + .../boot/dts/r8a7740-armadillo800eva-reference.dts | 19 ++ + arch/arm/boot/dts/r8a7778.dtsi | 1 - + arch/arm/boot/dts/r8a7779.dtsi | 1 - + arch/arm/boot/dts/r8a7790.dtsi | 58 +++- + arch/arm/boot/dts/r8a7791-koelsch.dts | 32 ++ + arch/arm/boot/dts/r8a7791.dtsi | 41 +++ + arch/arm/boot/dts/sh73a0.dtsi | 6 +- + arch/arm/configs/bockw_defconfig | 4 + + arch/arm/configs/koelsch_defconfig | 54 +++ + arch/arm/configs/lager_defconfig | 2 + + arch/arm/configs/marzen_defconfig | 2 + + arch/arm/mach-shmobile/Kconfig | 13 + + arch/arm/mach-shmobile/Makefile | 4 + + arch/arm/mach-shmobile/Makefile.boot | 1 + + arch/arm/mach-shmobile/board-ape6evm-reference.c | 2 +- + arch/arm/mach-shmobile/board-ape6evm.c | 57 +++- + arch/arm/mach-shmobile/board-armadillo800eva.c | 5 +- + arch/arm/mach-shmobile/board-bockw.c | 370 ++++++++++++++++++++- + arch/arm/mach-shmobile/board-koelsch.c | 44 +++ + arch/arm/mach-shmobile/board-kzm9g.c | 1 + + arch/arm/mach-shmobile/board-lager-reference.c | 3 +- + arch/arm/mach-shmobile/board-lager.c | 112 ++++++- + arch/arm/mach-shmobile/board-marzen.c | 72 ++++ + arch/arm/mach-shmobile/clock-r8a7778.c | 44 ++- + arch/arm/mach-shmobile/clock-r8a7779.c | 2 +- + arch/arm/mach-shmobile/clock-r8a7790.c | 12 +- + arch/arm/mach-shmobile/clock-r8a7791.c | 237 +++++++++++++ + arch/arm/mach-shmobile/headsmp.S | 3 + + arch/arm/mach-shmobile/include/mach/common.h | 12 +- + arch/arm/mach-shmobile/include/mach/r8a73a4.h | 2 +- + arch/arm/mach-shmobile/include/mach/r8a7778.h | 2 + + arch/arm/mach-shmobile/include/mach/r8a7790.h | 3 +- + arch/arm/mach-shmobile/include/mach/r8a7791.h | 8 + + arch/arm/mach-shmobile/platsmp-apmu.c | 195 +++++++++++ + arch/arm/mach-shmobile/platsmp-scu.c | 30 +- + arch/arm/mach-shmobile/platsmp.c | 22 +- + arch/arm/mach-shmobile/setup-r8a73a4.c | 4 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 37 ++- + arch/arm/mach-shmobile/setup-r8a7790.c | 26 +- + arch/arm/mach-shmobile/setup-r8a7791.c | 149 +++++++++ + arch/arm/mach-shmobile/smp-emev2.c | 6 - + arch/arm/mach-shmobile/smp-r8a7779.c | 4 - + arch/arm/mach-shmobile/smp-r8a7790.c | 67 ++++ + arch/arm/mach-shmobile/smp-sh73a0.c | 14 +- + drivers/clocksource/em_sti.c | 2 +- + drivers/gpio/gpio-rcar.c | 7 +- + drivers/mmc/host/sh_mobile_sdhi.c | 16 +- + 51 files changed, 1759 insertions(+), 145 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a7791-koelsch.dts + create mode 100644 arch/arm/boot/dts/r8a7791.dtsi + create mode 100644 arch/arm/configs/koelsch_defconfig + create mode 100644 arch/arm/mach-shmobile/board-koelsch.c + create mode 100644 arch/arm/mach-shmobile/clock-r8a7791.c + create mode 100644 arch/arm/mach-shmobile/include/mach/r8a7791.h + create mode 100644 arch/arm/mach-shmobile/platsmp-apmu.c + create mode 100644 arch/arm/mach-shmobile/setup-r8a7791.c + create mode 100644 arch/arm/mach-shmobile/smp-r8a7790.c +Merging samsung/for-next (28ca23d Merge branch 'v3.13-next/dt-s3c64xx' into for-next) +$ git merge samsung/for-next +Removing arch/arm/mach-s3c64xx/clock.c +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/vic.txt | 12 + + arch/arm/Kconfig | 2 +- + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/s3c6400.dtsi | 41 + + arch/arm/boot/dts/s3c6410-mini6410.dts | 228 +++++ + arch/arm/boot/dts/s3c6410-smdk6410.dts | 103 +++ + arch/arm/boot/dts/s3c6410.dtsi | 57 ++ + arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 687 ++++++++++++++++ + arch/arm/boot/dts/s3c64xx.dtsi | 199 +++++ + arch/arm/mach-s3c64xx/Kconfig | 16 + + arch/arm/mach-s3c64xx/Makefile | 3 +- + arch/arm/mach-s3c64xx/clock.c | 1007 ----------------------- + arch/arm/mach-s3c64xx/common.c | 33 +- + arch/arm/mach-s3c64xx/common.h | 12 +- + arch/arm/mach-s3c64xx/dma.c | 13 +- + arch/arm/mach-s3c64xx/include/mach/regs-clock.h | 132 +-- + arch/arm/mach-s3c64xx/irq-pm.c | 9 + + arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +- + arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- + arch/arm/mach-s3c64xx/mach-hmt.c | 2 +- + arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- + arch/arm/mach-s3c64xx/mach-ncp.c | 2 +- + arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 85 ++ + arch/arm/mach-s3c64xx/mach-smartq.c | 11 +- + arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- + arch/arm/mach-s3c64xx/pm.c | 21 - + arch/arm/mach-s3c64xx/s3c6400.c | 15 +- + arch/arm/mach-s3c64xx/s3c6410.c | 16 +- + arch/arm/plat-samsung/include/plat/cpu.h | 4 + + arch/arm/plat-samsung/include/plat/uncompress.h | 2 + + arch/arm/plat-samsung/init.c | 12 +- + drivers/clk/samsung/Makefile | 2 - + drivers/gpio/gpio-samsung.c | 34 +- + drivers/irqchip/irq-vic.c | 7 +- + drivers/usb/host/ohci-s3c2410.c | 8 +- + 36 files changed, 1552 insertions(+), 1235 deletions(-) + create mode 100644 arch/arm/boot/dts/s3c6400.dtsi + create mode 100644 arch/arm/boot/dts/s3c6410-mini6410.dts + create mode 100644 arch/arm/boot/dts/s3c6410-smdk6410.dts + create mode 100644 arch/arm/boot/dts/s3c6410.dtsi + create mode 100644 arch/arm/boot/dts/s3c64xx-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/s3c64xx.dtsi + delete mode 100644 arch/arm/mach-s3c64xx/clock.c + create mode 100644 arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c +Merging tegra/for-next (2b6d21a Merge branch for-3.13/maintainers into for-next) +$ git merge tegra/for-next +Removing arch/arm/mach-tegra/gpio-names.h +Auto-merging arch/arm/mach-tegra/fuse.c +Removing arch/arm/mach-tegra/common.c +Removing arch/arm/mach-tegra/board-paz00.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 62 ++++++++- + arch/arm/boot/dts/tegra114-dalmore.dts | 22 ++- + arch/arm/configs/tegra_defconfig | 4 + + arch/arm/mach-tegra/Makefile | 1 - + arch/arm/mach-tegra/board-paz00.c | 5 +- + arch/arm/mach-tegra/board-paz00.h | 25 ---- + arch/arm/mach-tegra/board.h | 12 -- + arch/arm/mach-tegra/common.c | 115 --------------- + arch/arm/mach-tegra/fuse.c | 56 +++++++- + arch/arm/mach-tegra/gpio-names.h | 247 --------------------------------- + arch/arm/mach-tegra/iomap.h | 152 -------------------- + arch/arm/mach-tegra/irammap.h | 6 + + arch/arm/mach-tegra/pm.c | 8 +- + arch/arm/mach-tegra/pm.h | 3 - + arch/arm/mach-tegra/pmc.c | 50 ++++--- + arch/arm/mach-tegra/pmc.h | 5 + + arch/arm/mach-tegra/reset.c | 2 +- + arch/arm/mach-tegra/sleep-tegra20.S | 5 +- + arch/arm/mach-tegra/sleep-tegra30.S | 5 +- + arch/arm/mach-tegra/tegra.c | 79 ++++++++++- + 20 files changed, 268 insertions(+), 596 deletions(-) + delete mode 100644 arch/arm/mach-tegra/board-paz00.h + delete mode 100644 arch/arm/mach-tegra/common.c + delete mode 100644 arch/arm/mach-tegra/gpio-names.h +Merging dma-mapping/dma-mapping-next (d5d04bb Bye, bye, WfW flag) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (ceb12f9 pwm: atmel-tcb: fix max time computation for slow clk source) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/pwm/pwm-atmel-tcb.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging dma-buf/for-next (19e8697 dma-buf: Expose buffer size to userspace (v2)) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (c7b96ac userns: Kill nsown_capable it makes the wrong thing easy) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (12d29886 clk: only call get_parent if there is one) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (45ee64e random: adjust the generator polynomials in the mixing function slightly) +$ git merge random/dev +Resolved 'init/main.c' using previous resolution. +Auto-merging init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merging include/linux/timex.h +Auto-merging drivers/char/random.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5d22546] Merge remote-tracking branch 'random/dev' +$ git diff -M --stat --summary HEAD^.. + drivers/char/random.c | 459 ++++++++++++++++++++++++++---------------- + include/linux/random.h | 1 + + include/linux/timex.h | 14 ++ + include/trace/events/random.h | 33 ++- + init/main.c | 2 + + 5 files changed, 340 insertions(+), 169 deletions(-) +Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging arm64-hugepages/for-next/hugepages (af07484 ARM64: mm: THP support.) +$ git merge arm64-hugepages/for-next/hugepages +Already up-to-date. +Merging aio/master (d9b2c87 aio: rcu_read_lock protection for new rcu_dereference calls) +$ git merge aio/master +Already up-to-date. +Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6) +Merging akpm-current/current (736b0d3 ipc/util.c: remove unnecessary work pending test) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'mm/memcontrol.c' +Auto-merging scripts/checkpatch.pl +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging mm/filemap.c +Auto-merging kernel/watchdog.c +Auto-merging kernel/time/sched_clock.c +Auto-merging kernel/sysctl.c +Auto-merging ipc/util.c +Removing include/linux/platform_data/lm3630_bl.h +Auto-merging fs/ocfs2/super.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/fat/inode.c +Auto-merging fs/fat/file.c +Removing drivers/video/backlight/lm3630_bl.c +Auto-merging drivers/input/touchscreen/cyttsp4_core.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_acpi.c +Auto-merging block/genhd.c +Auto-merging Makefile +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'mm/memcontrol.c'. +[master 14d026c] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/DMA-attributes.txt | 6 +- + Documentation/backlight/lp855x-driver.txt | 5 +- + .../devicetree/bindings/video/backlight/lp855x.txt | 29 +- + Documentation/gcov.txt | 4 + + MAINTAINERS | 2 +- + Makefile | 6 + + arch/ia64/mm/init.c | 4 +- + arch/metag/kernel/dma.c | 4 +- + arch/metag/mm/init.c | 2 +- + arch/microblaze/mm/consistent.c | 7 +- + arch/powerpc/mm/dma-noncoherent.c | 4 +- + arch/powerpc/mm/hugetlbpage.c | 2 - + arch/powerpc/mm/numa.c | 3 +- + arch/sh/kernel/process_64.c | 4 +- + arch/sh/mm/init.c | 2 +- + arch/x86/include/asm/pgtable-2level.h | 100 ++-- + arch/x86/mm/srat.c | 6 +- + block/genhd.c | 2 +- + drivers/cdrom/gdrom.c | 4 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 8 + + drivers/gpu/drm/nouveau/nouveau_acpi.c | 5 + + drivers/infiniband/core/cm.c | 5 +- + drivers/input/touchscreen/cyttsp4_core.c | 3 +- + drivers/iommu/omap-iopgtable.h | 2 +- + drivers/misc/ti-st/st_core.c | 2 +- + drivers/net/irda/donauboe.c | 15 +- + drivers/pcmcia/pd6729.c | 13 +- + drivers/pcmcia/yenta_socket.c | 16 +- + drivers/rtc/rtc-at91rm9200.c | 28 +- + drivers/rtc/rtc-cmos.c | 1 - + drivers/rtc/rtc-ds1307.c | 6 +- + drivers/rtc/rtc-hid-sensor-time.c | 7 + + drivers/rtc/rtc-isl1208.c | 42 +- + drivers/rtc/rtc-max6900.c | 9 +- + drivers/rtc/rtc-mrst.c | 2 - + drivers/rtc/rtc-sirfsoc.c | 25 +- + drivers/rtc/rtc-vr41xx.c | 4 +- + drivers/rtc/rtc-vt8500.c | 2 +- + drivers/scsi/a100u2w.c | 12 +- + drivers/scsi/dc395x.c | 24 +- + drivers/scsi/dmx3191d.c | 13 +- + drivers/scsi/hpsa.c | 1 - + drivers/scsi/initio.c | 13 +- + drivers/scsi/mvumi.c | 20 +- + drivers/video/acornfb.c | 4 +- + drivers/video/backlight/88pm860x_bl.c | 2 +- + drivers/video/backlight/Kconfig | 10 +- + drivers/video/backlight/Makefile | 2 +- + drivers/video/backlight/aat2870_bl.c | 2 +- + drivers/video/backlight/adp5520_bl.c | 2 +- + drivers/video/backlight/adp8860_bl.c | 6 +- + drivers/video/backlight/adp8870_bl.c | 6 +- + drivers/video/backlight/ams369fg06.c | 2 +- + drivers/video/backlight/atmel-pwm-bl.c | 2 +- + drivers/video/backlight/bd6107.c | 2 +- + drivers/video/backlight/corgi_lcd.c | 2 +- + drivers/video/backlight/da903x_bl.c | 2 +- + drivers/video/backlight/generic_bl.c | 2 +- + drivers/video/backlight/gpio_backlight.c | 3 +- + drivers/video/backlight/ili9320.c | 2 +- + drivers/video/backlight/kb3886_bl.c | 2 +- + drivers/video/backlight/l4f00242t03.c | 6 +- + drivers/video/backlight/ld9040.c | 2 +- + drivers/video/backlight/ld9040_gamma.h | 4 +- + drivers/video/backlight/lm3533_bl.c | 2 +- + drivers/video/backlight/lm3630_bl.c | 475 ----------------- + drivers/video/backlight/lm3630a_bl.c | 483 ++++++++++++++++++ + drivers/video/backlight/lm3639_bl.c | 13 +- + drivers/video/backlight/lms283gf05.c | 4 +- + drivers/video/backlight/lms501kf03.c | 2 +- + drivers/video/backlight/lp855x_bl.c | 21 +- + drivers/video/backlight/lp8788_bl.c | 2 +- + drivers/video/backlight/lv5207lp.c | 2 +- + drivers/video/backlight/omap1_bl.c | 2 +- + drivers/video/backlight/pcf50633-backlight.c | 2 +- + drivers/video/backlight/platform_lcd.c | 2 +- + drivers/video/backlight/pwm_bl.c | 2 +- + drivers/video/backlight/s6e63m0.c | 2 +- + drivers/video/backlight/tdo24m.c | 2 +- + drivers/video/backlight/tosa_bl.c | 2 +- + drivers/video/backlight/tps65217_bl.c | 5 +- + drivers/video/backlight/wm831x_bl.c | 8 +- + drivers/w1/masters/ds1wm.c | 12 +- + drivers/w1/masters/w1-gpio.c | 10 +- + fs/anon_inodes.c | 10 +- + fs/autofs4/autofs_i.h | 4 +- + fs/autofs4/dev-ioctl.c | 16 +- + fs/autofs4/inode.c | 33 +- + fs/autofs4/waitq.c | 16 +- + fs/binfmt_elf.c | 51 +- + fs/cramfs/Kconfig | 5 +- + fs/fat/cache.c | 16 +- + fs/fat/file.c | 85 ++++ + fs/fat/inode.c | 74 ++- + fs/nilfs2/page.c | 2 + + fs/nilfs2/segment.c | 11 +- + fs/ocfs2/alloc.c | 4 +- + fs/ocfs2/aops.c | 5 +- + fs/ocfs2/buffer_head_io.c | 4 +- + fs/ocfs2/cluster/heartbeat.c | 40 +- + fs/ocfs2/cluster/masklog.h | 3 +- + fs/ocfs2/dir.c | 12 +- + fs/ocfs2/dlm/dlmmaster.c | 8 +- + fs/ocfs2/dlm/dlmrecovery.c | 7 + + fs/ocfs2/file.c | 65 ++- + fs/ocfs2/journal.h | 3 +- + fs/ocfs2/move_extents.c | 3 +- + fs/ocfs2/namei.c | 14 +- + fs/ocfs2/refcounttree.c | 20 +- + fs/ocfs2/suballoc.c | 4 +- + fs/ocfs2/super.c | 4 +- + fs/ocfs2/xattr.c | 28 +- + fs/proc/kcore.c | 3 +- + include/asm-generic/vmlinux.lds.h | 1 + + include/linux/compat.h | 4 +- + include/linux/crc64_ecma.h | 56 +++ + include/linux/irqreturn.h | 2 +- + include/linux/memory_hotplug.h | 8 +- + include/linux/of_irq.h | 20 +- + include/linux/oom.h | 5 + + include/linux/page-flags.h | 4 +- + include/linux/platform_data/lm3630_bl.h | 57 --- + include/linux/platform_data/lm3630a_bl.h | 65 +++ + include/linux/platform_data/lp855x.h | 19 + + include/linux/syscalls.h | 4 +- + ipc/util.c | 4 +- + kernel/cpu.c | 29 +- + kernel/delayacct.c | 7 - + kernel/gcov/Kconfig | 30 ++ + kernel/gcov/Makefile | 32 +- + kernel/gcov/base.c | 32 +- + kernel/gcov/fs.c | 45 +- + kernel/gcov/gcc_3_4.c | 115 +++++ + kernel/gcov/gcc_4_7.c | 560 +++++++++++++++++++++ + kernel/gcov/gcov.h | 65 +-- + kernel/module.c | 3 + + kernel/pid.c | 5 + + kernel/sysctl.c | 5 +- + kernel/taskstats.c | 8 +- + kernel/time/sched_clock.c | 4 + + kernel/time/tick-common.c | 15 + + kernel/timer.c | 5 +- + kernel/watchdog.c | 10 +- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++++++++++ + lib/debugobjects.c | 2 +- + lib/vsprintf.c | 2 + + mm/bootmem.c | 2 +- + mm/compaction.c | 14 +- + mm/filemap.c | 2 + + mm/huge_memory.c | 11 +- + mm/ksm.c | 4 +- + mm/madvise.c | 4 +- + mm/memcontrol.c | 9 +- + mm/memory-failure.c | 36 +- + mm/memory.c | 2 - + mm/memory_hotplug.c | 31 +- + mm/nobootmem.c | 25 +- + mm/page_alloc.c | 10 +- + mm/readahead.c | 5 +- + mm/swap_state.c | 63 ++- + mm/vmalloc.c | 33 +- + scripts/checkpatch.pl | 28 +- + scripts/mod/modpost.c | 15 +- + scripts/sortextable.c | 24 + + scripts/sortextable.h | 26 +- + sound/soc/atmel/atmel-pcm.c | 2 +- + 170 files changed, 2752 insertions(+), 1314 deletions(-) + delete mode 100644 drivers/video/backlight/lm3630_bl.c + create mode 100644 drivers/video/backlight/lm3630a_bl.c + create mode 100644 include/linux/crc64_ecma.h + delete mode 100644 include/linux/platform_data/lm3630_bl.h + create mode 100644 include/linux/platform_data/lm3630a_bl.h + create mode 100644 kernel/gcov/gcc_4_7.c + create mode 100644 lib/crc64_ecma.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: nouveau: fix build eror when VGA_SWITCHEROO is not enabled +Applying: mm: drop actor argument of do_generic_file_read() +Applying: mm-drop-actor-argument-of-do_generic_file_read-fix +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 1a4c0a9...4141583 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (4141583 mm-drop-actor-argument-of-do_generic_file_read-fix) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/gpu/drm/nouveau/nouveau_acpi.c | 1 + + mm/filemap.c | 10 +++++----- + 2 files changed, 6 insertions(+), 5 deletions(-) |