| $ date |
| Wednesday 5 August 09:41:31 AEST 2015 |
| $ git checkout master |
| Already on 'master' |
| $ git reset --hard stable |
| HEAD is now at 7e884479bf50 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client |
| Merging origin/master (6c84461c0cb0 Merge tag 'pci-v4.2-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) |
| $ git merge origin/master |
| Updating 7e884479bf50..6c84461c0cb0 |
| Fast-forward |
| Makefile | 9 +++++-- |
| drivers/gpu/drm/drm_atomic_helper.c | 18 +++++++++----- |
| drivers/gpu/drm/drm_dp_mst_topology.c | 1 - |
| drivers/gpu/drm/i915/intel_dp_mst.c | 11 +++++++++ |
| drivers/i2c/busses/i2c-bfin-twi.c | 4 ++-- |
| drivers/i2c/busses/i2c-omap.c | 11 +++++++++ |
| drivers/i2c/i2c-core.c | 24 +++++++++++++------ |
| drivers/i2c/i2c-slave-eeprom.c | 6 ----- |
| drivers/misc/eeprom/at24.c | 3 --- |
| drivers/xen/balloon.c | 15 ++++++------ |
| drivers/xen/events/events_base.c | 10 ++++---- |
| drivers/xen/events/events_fifo.c | 45 +++++++++++++++++++++++++++++++---- |
| drivers/xen/events/events_internal.h | 7 ++++++ |
| drivers/xen/gntdev.c | 2 ++ |
| include/drm/drm_crtc_helper.h | 3 +++ |
| include/uapi/linux/pci_regs.h | 1 + |
| 16 files changed, 126 insertions(+), 44 deletions(-) |
| Merging fixes/master (c7e9ad7da219 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) |
| $ git merge fixes/master |
| Already up-to-date. |
| Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) |
| $ git merge kbuild-current/rc-fixes |
| Already up-to-date. |
| Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) |
| $ git merge arc-current/for-curr |
| Already up-to-date. |
| Merging arm-current/fixes (3473f26592c1 ARM: 8405/1: VDSO: fix regression with toolchains lacking ld.bfd executable) |
| $ git merge arm-current/fixes |
| Merge made by the 'recursive' strategy. |
| arch/arm/vdso/Makefile | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| Merging m68k-current/for-linus (1214c525484c m68k: Use for_each_sg()) |
| $ git merge m68k-current/for-linus |
| Already up-to-date. |
| Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) |
| $ git merge metag-fixes/fixes |
| Already up-to-date. |
| Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) |
| $ git merge mips-fixes/mips-fixes |
| Already up-to-date. |
| Merging powerpc-fixes/fixes (b8d65e9662b1 powerpc/eeh-powernv: Fix unbalanced IRQ warning) |
| $ git merge powerpc-fixes/fixes |
| Already up-to-date. |
| Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) |
| $ git merge powerpc-merge-mpe/fixes |
| Already up-to-date. |
| Merging sparc/master (4a10a91756ef Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit) |
| $ git merge sparc/master |
| Already up-to-date. |
| Merging net/master (2475b22526d7 xen-netback: Allocate fraglist early to avoid complex rollback) |
| $ git merge net/master |
| Merge made by the 'recursive' strategy. |
| drivers/net/ethernet/3com/3c59x.c | 17 +++++----- |
| drivers/net/ethernet/rocker/rocker.c | 1 + |
| drivers/net/xen-netback/netback.c | 61 +++++++++++++++++++----------------- |
| net/ipv4/udp.c | 13 ++++++-- |
| net/openvswitch/actions.c | 16 +++++++--- |
| net/rds/info.c | 2 +- |
| net/sched/act_mirred.c | 2 ++ |
| net/sched/sch_fq_codel.c | 22 +++++++++++-- |
| 8 files changed, 86 insertions(+), 48 deletions(-) |
| Merging ipsec/master (158cd4af8ded packet: missing dev_put() in packet_do_bind()) |
| $ git merge ipsec/master |
| Already up-to-date. |
| Merging sound-current/for-linus (5d942ce63c8f ALSA: HDA: Dont check return for snd_hdac_chip_readl) |
| $ git merge sound-current/for-linus |
| Merge made by the 'recursive' strategy. |
| sound/hda/ext/hdac_ext_controller.c | 6 ------ |
| sound/hda/ext/hdac_ext_stream.c | 2 +- |
| sound/pci/oxygen/oxygen_mixer.c | 2 +- |
| 3 files changed, 2 insertions(+), 8 deletions(-) |
| Merging pci-current/for-linus (c9ddbac9c891 PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition) |
| $ git merge pci-current/for-linus |
| Already up-to-date. |
| Merging wireless-drivers/master (741e3b9902d1 rtlwifi: rtl8723be: Add module parameter for MSI interrupts) |
| $ git merge wireless-drivers/master |
| Merge made by the 'recursive' strategy. |
| drivers/net/wireless/b43/tables_nphy.c | 2 +- |
| drivers/net/wireless/iwlwifi/mvm/scan.c | 2 +- |
| drivers/net/wireless/iwlwifi/pcie/trans.c | 22 +++++++++++++++++++--- |
| drivers/net/wireless/iwlwifi/pcie/tx.c | 15 +++++++++++++-- |
| drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 8 +++++++- |
| drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 4 ++++ |
| drivers/net/wireless/rtlwifi/core.c | 7 +++++-- |
| drivers/net/wireless/rtlwifi/rtl8723be/sw.c | 1 + |
| 8 files changed, 51 insertions(+), 10 deletions(-) |
| Merging driver-core.current/driver-core-linus (cbfe8fa6cd67 Linux 4.2-rc4) |
| $ git merge driver-core.current/driver-core-linus |
| Already up-to-date. |
| Merging tty.current/tty-linus (cbfe8fa6cd67 Linux 4.2-rc4) |
| $ git merge tty.current/tty-linus |
| Already up-to-date. |
| Merging usb.current/usb-linus (ffe5adcb7661 drivers/usb: Delete XHCI command timer if necessary) |
| $ git merge usb.current/usb-linus |
| Merge made by the 'recursive' strategy. |
| drivers/usb/chipidea/core.c | 13 ++++++++++++- |
| drivers/usb/chipidea/host.c | 7 +++++-- |
| drivers/usb/chipidea/host.h | 6 ++++++ |
| drivers/usb/gadget/function/f_hid.c | 4 ++++ |
| drivers/usb/gadget/function/f_printer.c | 10 +++++++++- |
| drivers/usb/gadget/function/f_uac2.c | 4 ++-- |
| drivers/usb/gadget/udc/bdc/bdc_ep.c | 2 +- |
| drivers/usb/gadget/udc/udc-core.c | 1 + |
| drivers/usb/host/xhci-mem.c | 3 ++- |
| drivers/usb/host/xhci-ring.c | 2 +- |
| drivers/usb/serial/option.c | 2 ++ |
| drivers/usb/serial/qcserial.c | 2 +- |
| drivers/usb/serial/sierra.c | 1 + |
| 13 files changed, 47 insertions(+), 10 deletions(-) |
| Merging usb-gadget-fixes/fixes (c93e64e91248 usb: udc: core: add device_del() call to error pathway) |
| $ git merge usb-gadget-fixes/fixes |
| Already up-to-date. |
| Merging usb-serial-fixes/usb-linus (74472233233f USB: sierra: add 1199:68AB device ID) |
| $ git merge usb-serial-fixes/usb-linus |
| Already up-to-date. |
| Merging staging.current/staging-linus (1f17124006b6 staging: vt6655: vnt_bss_info_changed check conf->beacon_rate is not NULL) |
| $ git merge staging.current/staging-linus |
| Merge made by the 'recursive' strategy. |
| drivers/staging/comedi/drivers/das1800.c | 1 + |
| drivers/staging/vt6655/device_main.c | 5 +++-- |
| 2 files changed, 4 insertions(+), 2 deletions(-) |
| Merging char-misc.current/char-misc-linus (eaf7e98d43c1 Merge tag 'extcon-fixes-for-4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus) |
| $ git merge char-misc.current/char-misc-linus |
| Merge made by the 'recursive' strategy. |
| drivers/extcon/extcon-palmas.c | 13 --------- |
| drivers/extcon/extcon.c | 61 ++++++++++++++++++++++++++++++------------ |
| 2 files changed, 44 insertions(+), 30 deletions(-) |
| Merging input-current/for-linus (073e570d7c2c Input: alps - only Dell laptops have separate button bits for v2 dualpoint sticks) |
| $ git merge input-current/for-linus |
| Auto-merging Documentation/input/alps.txt |
| Merge made by the 'recursive' strategy. |
| Documentation/input/alps.txt | 6 ++++-- |
| drivers/input/joystick/turbografx.c | 2 +- |
| drivers/input/misc/axp20x-pek.c | 1 + |
| drivers/input/mouse/alps.c | 8 ++++++-- |
| 4 files changed, 12 insertions(+), 5 deletions(-) |
| Merging crypto-current/master (17fb874dee09 hwrng: core - correct error check of kthread_run call) |
| $ git merge crypto-current/master |
| Already up-to-date. |
| Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) |
| $ git merge ide/master |
| Already up-to-date. |
| Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) |
| $ git merge devicetree-current/devicetree/merge |
| Already up-to-date. |
| Merging rr-fixes/fixes (fe0d34d242fa module: weaken locking assertion for oops path.) |
| $ git merge rr-fixes/fixes |
| Already up-to-date. |
| Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue) |
| $ git merge vfio-fixes/for-linus |
| Already up-to-date. |
| Merging kselftest-fixes/fixes (fee50f3c8427 selftests/futex: Fix futex_cmp_requeue_pi() error handling) |
| $ git merge kselftest-fixes/fixes |
| Already up-to-date. |
| Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) |
| $ git merge backlight-fixes/for-backlight-fixes |
| Already up-to-date. |
| Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) |
| $ git merge ftrace-fixes/for-next-urgent |
| Already up-to-date. |
| Merging drm-intel-fixes/for-linux-next-fixes (5eb3e5a5e11d drm/i915: Declare the swizzling unknown for L-shaped configurations) |
| $ git merge drm-intel-fixes/for-linux-next-fixes |
| Already up-to-date. |
| Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic) |
| $ git merge asm-generic/master |
| Already up-to-date. |
| Merging arc/for-next (b89aa12c1774 ARCv2: spinlock/rwlock: Reset retry delay when starting a new spin-wait cycle) |
| $ git merge arc/for-next |
| Merge made by the 'recursive' strategy. |
| arch/arc/Kconfig | 13 +- |
| arch/arc/Makefile | 10 +- |
| arch/arc/include/asm/arcregs.h | 7 +- |
| arch/arc/include/asm/atomic.h | 79 +++-- |
| arch/arc/include/asm/spinlock.h | 539 +++++++++++++++++++++++++++++++++- |
| arch/arc/include/asm/spinlock_types.h | 2 + |
| arch/arc/kernel/setup.c | 12 +- |
| arch/arc/kernel/time.c | 40 +-- |
| arch/arc/lib/memcpy-archs.S | 2 +- |
| arch/arc/lib/memset-archs.S | 43 ++- |
| arch/arc/plat-axs10x/axs10x.c | 15 + |
| 11 files changed, 683 insertions(+), 79 deletions(-) |
| Merging arm/for-next (aaaccce1d440 Merge branch 'devel-stable' into for-next) |
| $ git merge arm/for-next |
| Resolved 'arch/arm/include/asm/Kbuild' using previous resolution. |
| Auto-merging include/linux/perf/arm_pmu.h |
| Auto-merging drivers/perf/arm_pmu.c |
| Removing arch/arm/mach-omap2/include/mach/barriers.h |
| Auto-merging arch/arm/mach-omap2/Kconfig |
| Auto-merging arch/arm/include/asm/Kbuild |
| CONFLICT (content): Merge conflict in arch/arm/include/asm/Kbuild |
| Auto-merging MAINTAINERS |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master f7d89b4c201d] Merge remote-tracking branch 'arm/for-next' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/devicetree/bindings/arm/l2cc.txt | 6 + |
| Documentation/devicetree/bindings/arm/pmu.txt | 12 +- |
| MAINTAINERS | 6 +- |
| arch/arm/Kconfig | 8 +- |
| arch/arm/common/mcpm_platsmp.c | 12 +- |
| arch/arm/include/asm/Kbuild | 1 - |
| arch/arm/include/asm/barrier.h | 13 +- |
| arch/arm/include/asm/cacheflush.h | 4 - |
| arch/arm/include/asm/glue-cache.h | 2 - |
| arch/arm/include/asm/irq.h | 5 + |
| arch/arm/include/asm/outercache.h | 17 --- |
| arch/arm/include/asm/smp.h | 1 + |
| arch/arm/include/asm/smp_plat.h | 9 ++ |
| arch/arm/include/asm/switch_to.h | 5 +- |
| arch/arm/kernel/Makefile | 3 +- |
| arch/arm/kernel/irq.c | 1 + |
| arch/arm/kernel/perf_event_v6.c | 2 +- |
| arch/arm/kernel/perf_event_v7.c | 2 +- |
| arch/arm/kernel/perf_event_xscale.c | 2 +- |
| arch/arm/kernel/setup.c | 2 +- |
| arch/arm/kernel/smp.c | 33 ++++- |
| arch/arm/kernel/traps.c | 4 + |
| arch/arm/mach-mmp/pm-pxa910.c | 1 + |
| arch/arm/mach-omap2/Kconfig | 7 + |
| arch/arm/mach-omap2/common.c | 1 + |
| arch/arm/mach-omap2/common.h | 9 ++ |
| arch/arm/mach-omap2/include/mach/barriers.h | 33 ----- |
| arch/arm/mach-omap2/io.c | 2 + |
| arch/arm/mach-omap2/omap4-common.c | 121 +++++++++++++++ |
| arch/arm/mach-omap2/sleep44xx.S | 8 +- |
| arch/arm/mach-prima2/pm.c | 1 + |
| arch/arm/mach-shmobile/common.h | 2 +- |
| arch/arm/mach-shmobile/platsmp.c | 4 +- |
| arch/arm/mach-shmobile/smp-r8a7790.c | 2 +- |
| arch/arm/mach-shmobile/smp-r8a7791.c | 2 +- |
| arch/arm/mach-shmobile/smp-sh73a0.c | 2 +- |
| arch/arm/mach-ux500/cache-l2x0.c | 1 + |
| arch/arm/mach-ux500/cpu-db8500.c | 2 +- |
| arch/arm/mm/Kconfig | 4 + |
| arch/arm/mm/cache-l2x0.c | 5 + |
| arch/arm/mm/dma-mapping.c | 22 +-- |
| arch/arm/mm/dma.h | 32 ++++ |
| arch/arm/mm/flush.c | 15 ++ |
| arch/x86/kernel/apic/hw_nmi.c | 133 +---------------- |
| drivers/Kconfig | 2 + |
| drivers/Makefile | 1 + |
| drivers/irqchip/irq-gic.c | 59 +++++++- |
| drivers/pcmcia/pxa2xx_base.c | 17 +-- |
| drivers/pcmcia/sa1100_generic.c | 2 - |
| drivers/pcmcia/sa1111_generic.c | 14 +- |
| drivers/pcmcia/sa11xx_base.c | 17 +-- |
| drivers/pcmcia/soc_common.h | 1 - |
| drivers/perf/Kconfig | 15 ++ |
| drivers/perf/Makefile | 1 + |
| .../kernel/perf_event.c => drivers/perf/arm_pmu.c | 69 ++++++--- |
| include/linux/irqchip/arm-gic.h | 2 + |
| include/linux/nmi.h | 6 + |
| .../asm/pmu.h => include/linux/perf/arm_pmu.h | 4 +- |
| lib/Makefile | 2 +- |
| lib/nmi_backtrace.c | 162 +++++++++++++++++++++ |
| 60 files changed, 630 insertions(+), 303 deletions(-) |
| delete mode 100644 arch/arm/mach-omap2/include/mach/barriers.h |
| create mode 100644 arch/arm/mm/dma.h |
| create mode 100644 drivers/perf/Kconfig |
| create mode 100644 drivers/perf/Makefile |
| rename arch/arm/kernel/perf_event.c => drivers/perf/arm_pmu.c (94%) |
| rename arch/arm/include/asm/pmu.h => include/linux/perf/arm_pmu.h (98%) |
| create mode 100644 lib/nmi_backtrace.c |
| Merging arm-perf/for-next/perf (fa8ad7889d83 arm: perf: factor arm_pmu core out to drivers) |
| $ git merge arm-perf/for-next/perf |
| Already up-to-date. |
| Merging arm-soc/for-next (653fc59e16ae Merge branch 'fixes' into for-next) |
| $ git merge arm-soc/for-next |
| Auto-merging arch/arm/mach-shmobile/smp-sh73a0.c |
| Auto-merging arch/arm/mach-shmobile/smp-r8a7790.c |
| Removing arch/arm/mach-shmobile/r8a7740.h |
| Removing arch/arm/mach-shmobile/pm-sh73a0.c |
| Removing arch/arm/mach-shmobile/pm-r8a7740.c |
| Removing arch/arm/mach-shmobile/intc-sh73a0.c |
| Removing arch/arm/mach-shmobile/include/mach/zboot_macros.h |
| Removing arch/arm/mach-shmobile/include/mach/zboot.h |
| Removing arch/arm/mach-shmobile/include/mach/head-kzm9g.txt |
| Removing arch/arm/mach-shmobile/dma-register.h |
| Removing arch/arm/mach-shmobile/clock-sh73a0.c |
| Removing arch/arm/mach-shmobile/clock-r8a7740.c |
| Removing arch/arm/mach-shmobile/board-kzm9g.c |
| Removing arch/arm/mach-shmobile/board-armadillo800eva.c |
| Auto-merging arch/arm/mach-omap2/io.c |
| Auto-merging arch/arm/mach-omap2/common.h |
| Removing arch/arm/mach-omap2/board-omap3pandora.c |
| Removing arch/arm/mach-omap2/board-omap3logic.c |
| Auto-merging arch/arm/mach-omap2/Kconfig |
| Removing arch/arm/mach-bcm/bcm63xx_headsmp.S |
| Removing arch/arm/configs/marzen_defconfig |
| Removing arch/arm/configs/kzm9g_defconfig |
| Removing arch/arm/configs/armadillo800eva_defconfig |
| Auto-merging arch/arm/boot/dts/dra72-evm.dts |
| Removing arch/arm/boot/compressed/head-shmobile.S |
| Auto-merging arch/arm/Kconfig |
| Auto-merging MAINTAINERS |
| Merge made by the 'recursive' strategy. |
| Documentation/devicetree/bindings/arm/bcm/ns2.txt | 9 + |
| .../devicetree/bindings/arm/marvell,kirkwood.txt | 2 + |
| Documentation/devicetree/bindings/arm/mediatek.txt | 13 +- |
| .../bindings/arm/mediatek/mediatek,sysirq.txt | 4 +- |
| .../devicetree/bindings/arm/omap/omap.txt | 3 + |
| Documentation/devicetree/bindings/arm/rockchip.txt | 20 + |
| .../bindings/clock/rockchip,rk3368-cru.txt | 61 + |
| .../devicetree/bindings/clock/st/st,clkgen-pll.txt | 4 +- |
| .../bindings/memory-controllers/arm,pl172.txt | 125 ++ |
| .../devicetree/bindings/serial/mtk-uart.txt | 6 +- |
| .../devicetree/bindings/soc/mediatek/scpsys.txt | 41 + |
| .../bindings/timer/mediatek,mtk-timer.txt | 6 +- |
| .../devicetree/bindings/vendor-prefixes.txt | 2 + |
| MAINTAINERS | 5 +- |
| arch/arm/Kconfig | 11 +- |
| arch/arm/arm-soc-for-next-contents.txt | 138 ++ |
| arch/arm/boot/compressed/Makefile | 4 - |
| arch/arm/boot/compressed/head-shmobile.S | 71 - |
| arch/arm/boot/dts/Makefile | 28 +- |
| arch/arm/boot/dts/am335x-boneblack.dts | 20 +- |
| arch/arm/boot/dts/am335x-evm.dts | 69 +- |
| arch/arm/boot/dts/am335x-evmsk.dts | 62 +- |
| arch/arm/boot/dts/am335x-phycore-som.dtsi | 368 ++++++ |
| arch/arm/boot/dts/am335x-wega-rdk.dts | 22 + |
| arch/arm/boot/dts/am335x-wega.dtsi | 151 +++ |
| arch/arm/boot/dts/am33xx.dtsi | 17 +- |
| arch/arm/boot/dts/am4372.dtsi | 15 + |
| arch/arm/boot/dts/am437x-gp-evm.dts | 109 +- |
| arch/arm/boot/dts/am437x-sk-evm.dts | 45 +- |
| arch/arm/boot/dts/am43x-epos-evm.dts | 130 +- |
| arch/arm/boot/dts/armada-375.dtsi | 4 + |
| arch/arm/boot/dts/armada-388-gp.dts | 12 +- |
| arch/arm/boot/dts/armada-38x.dtsi | 8 +- |
| arch/arm/boot/dts/armada-39x.dtsi | 8 +- |
| arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 89 +- |
| arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 + |
| arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 + |
| arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 14 +- |
| arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 4 + |
| arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 + |
| arch/arm/boot/dts/cros-ec-sbs.dtsi | 52 + |
| arch/arm/boot/dts/cx92755.dtsi | 7 + |
| arch/arm/boot/dts/cx92755_equinox.dts | 3 +- |
| arch/arm/boot/dts/dm8148-evm.dts | 28 + |
| arch/arm/boot/dts/dm8148-t410.dts | 28 + |
| arch/arm/boot/dts/dm814x-clocks.dtsi | 109 ++ |
| arch/arm/boot/dts/dm814x.dtsi | 333 +++++ |
| arch/arm/boot/dts/dm816x.dtsi | 2 +- |
| arch/arm/boot/dts/dra7.dtsi | 57 +- |
| arch/arm/boot/dts/dra72-evm.dts | 10 +- |
| arch/arm/boot/dts/emev2-kzm9d.dts | 8 + |
| arch/arm/boot/dts/emev2.dtsi | 48 + |
| arch/arm/boot/dts/kirkwood-lswvl.dts | 301 +++++ |
| arch/arm/boot/dts/kirkwood-lswxl.dts | 301 +++++ |
| arch/arm/boot/dts/lpc18xx.dtsi | 235 +++- |
| arch/arm/boot/dts/lpc4337-ciaa.dts | 187 +++ |
| arch/arm/boot/dts/lpc4350-hitex-eval.dts | 4 - |
| arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 214 +++ |
| arch/arm/boot/dts/mt6580-evbp1.dts | 38 + |
| arch/arm/boot/dts/mt6580.dtsi | 116 ++ |
| arch/arm/boot/dts/mt8135-evbp1.dts | 193 +++ |
| arch/arm/boot/dts/mt8135.dtsi | 58 +- |
| arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 12 +- |
| arch/arm/boot/dts/omap3-overo-base.dtsi | 55 + |
| arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 3 +- |
| arch/arm/boot/dts/omap3-overo-palo35-common.dtsi | 53 + |
| arch/arm/boot/dts/omap3-overo-palo35.dts | 37 + |
| arch/arm/boot/dts/omap3-overo-storm-palo35.dts | 37 + |
| arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts | 21 + |
| arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi | 65 + |
| arch/arm/boot/dts/omap3-overo-tobiduo.dts | 21 + |
| arch/arm/boot/dts/omap3-overo.dtsi | 4 - |
| arch/arm/boot/dts/omap3-pandora-1ghz.dts | 2 +- |
| arch/arm/boot/dts/omap3-pandora-600mhz.dts | 2 +- |
| arch/arm/boot/dts/omap3-pandora-common.dtsi | 54 +- |
| arch/arm/boot/dts/omap5-uevm.dts | 7 + |
| arch/arm/boot/dts/pxa27x.dtsi | 36 + |
| arch/arm/boot/dts/pxa2xx.dtsi | 4 + |
| arch/arm/boot/dts/pxa3xx.dtsi | 52 + |
| arch/arm/boot/dts/r8a73a4.dtsi | 2 +- |
| arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 13 + |
| arch/arm/boot/dts/r8a7779.dtsi | 5 +- |
| arch/arm/boot/dts/r8a7790-lager.dts | 4 +- |
| arch/arm/boot/dts/r8a7790.dtsi | 45 +- |
| arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +- |
| arch/arm/boot/dts/r8a7791.dtsi | 25 +- |
| arch/arm/boot/dts/r8a7793-gose.dts | 63 + |
| arch/arm/boot/dts/r8a7793.dtsi | 367 ++++++ |
| arch/arm/boot/dts/r8a7794.dtsi | 2 +- |
| arch/arm/boot/dts/rk3066a-bqcurie2.dts | 1 + |
| arch/arm/boot/dts/rk3066a-marsboard.dts | 1 + |
| arch/arm/boot/dts/rk3066a-rayeager.dts | 1 + |
| arch/arm/boot/dts/rk3188-radxarock.dts | 1 + |
| arch/arm/boot/dts/rk3288-evb.dtsi | 1 + |
| arch/arm/boot/dts/rk3288-firefly.dtsi | 3 + |
| arch/arm/boot/dts/rk3288-popmetal.dts | 1 + |
| arch/arm/boot/dts/rk3288-r89.dts | 413 ++++++ |
| arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 232 ++++ |
| arch/arm/boot/dts/rk3288-veyron-jerry.dts | 197 +++ |
| arch/arm/boot/dts/rk3288-veyron-pinky.dts | 128 ++ |
| arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 122 ++ |
| arch/arm/boot/dts/rk3288-veyron.dtsi | 563 ++++++++ |
| arch/arm/boot/dts/rk3288.dtsi | 11 +- |
| arch/arm/boot/dts/socfpga.dtsi | 45 +- |
| arch/arm/boot/dts/socfpga_arria10.dtsi | 5 + |
| arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 3 +- |
| arch/arm/boot/dts/socfpga_arria5_socdk.dts | 3 +- |
| arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 111 ++ |
| arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 3 +- |
| arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 3 +- |
| arch/arm/boot/dts/stih407-clock.dtsi | 4 +- |
| arch/arm/boot/dts/stih407-family.dtsi | 45 + |
| arch/arm/boot/dts/stih407-pinctrl.dtsi | 200 +++ |
| arch/arm/boot/dts/stih407.dtsi | 28 - |
| arch/arm/boot/dts/stih410-clock.dtsi | 4 +- |
| arch/arm/boot/dts/stih410.dtsi | 12 + |
| arch/arm/boot/dts/stih418-clock.dtsi | 4 +- |
| arch/arm/boot/dts/stih418.dtsi | 4 + |
| arch/arm/boot/dts/stm32429i-eval.dts | 75 ++ |
| arch/arm/boot/dts/stm32f429-disco.dts | 8 +- |
| arch/arm/boot/dts/stm32f429.dtsi | 79 +- |
| arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts | 29 +- |
| arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 85 ++ |
| arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts | 29 +- |
| arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 76 ++ |
| arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts | 36 +- |
| arch/arm/boot/dts/uniphier-ph1-sld3.dtsi | 61 + |
| arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts | 33 +- |
| arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 85 ++ |
| arch/arm/boot/dts/uniphier-pinctrl.dtsi | 85 ++ |
| arch/arm/common/it8152.c | 2 +- |
| arch/arm/common/locomo.c | 2 +- |
| arch/arm/common/sa1111.c | 4 +- |
| arch/arm/configs/armadillo800eva_defconfig | 162 --- |
| arch/arm/configs/ep93xx_defconfig | 29 +- |
| arch/arm/configs/kzm9g_defconfig | 154 --- |
| arch/arm/configs/marzen_defconfig | 124 -- |
| arch/arm/configs/multi_v7_defconfig | 8 + |
| arch/arm/configs/mvebu_v7_defconfig | 4 + |
| arch/arm/configs/omap2plus_defconfig | 10 + |
| arch/arm/configs/prima2_defconfig | 12 +- |
| arch/arm/configs/shmobile_defconfig | 2 + |
| arch/arm/kernel/psci.c | 2 +- |
| arch/arm/kernel/smp_twd.c | 48 +- |
| arch/arm/mach-at91/at91rm9200.c | 2 +- |
| arch/arm/mach-at91/at91sam9.c | 6 +- |
| arch/arm/mach-at91/pm.c | 2 +- |
| arch/arm/mach-at91/sama5.c | 4 +- |
| arch/arm/mach-bcm/Makefile | 4 +- |
| arch/arm/mach-bcm/bcm63xx_headsmp.S | 23 - |
| arch/arm/mach-bcm/bcm63xx_smp.c | 4 +- |
| arch/arm/mach-bcm/bcm63xx_smp.h | 1 - |
| arch/arm/mach-bcm/bcm_5301x.c | 2 +- |
| arch/arm/mach-bcm/bcm_kona_smc.c | 2 +- |
| arch/arm/mach-clps711x/board-autcpu12.c | 2 +- |
| arch/arm/mach-cns3xxx/core.c | 59 +- |
| arch/arm/mach-davinci/cp_intc.c | 2 +- |
| arch/arm/mach-davinci/da850.c | 4 +- |
| arch/arm/mach-davinci/da8xx-dt.c | 4 +- |
| arch/arm/mach-davinci/time.c | 54 +- |
| arch/arm/mach-digicolor/digicolor.c | 2 +- |
| arch/arm/mach-dove/irq.c | 2 +- |
| arch/arm/mach-ebsa110/core.c | 2 +- |
| arch/arm/mach-ep93xx/Kconfig | 54 - |
| arch/arm/mach-ep93xx/Makefile | 2 +- |
| arch/arm/mach-ep93xx/Makefile.boot | 15 +- |
| arch/arm/mach-ep93xx/core.c | 116 +- |
| arch/arm/mach-ep93xx/simone.c | 1 + |
| arch/arm/mach-ep93xx/timer-ep93xx.c | 140 ++ |
| arch/arm/mach-ep93xx/vision_ep9307.c | 61 +- |
| arch/arm/mach-footbridge/common.c | 2 +- |
| arch/arm/mach-footbridge/dc21285-timer.c | 48 +- |
| arch/arm/mach-footbridge/isa-irq.c | 8 +- |
| arch/arm/mach-gemini/gpio.c | 2 +- |
| arch/arm/mach-gemini/irq.c | 2 +- |
| arch/arm/mach-gemini/time.c | 69 +- |
| arch/arm/mach-imx/3ds_debugboard.c | 2 +- |
| arch/arm/mach-imx/epit.c | 67 +- |
| arch/arm/mach-imx/mach-imx7d.c | 2 +- |
| arch/arm/mach-imx/mach-mx31ads.c | 2 +- |
| arch/arm/mach-iop13xx/irq.c | 2 +- |
| arch/arm/mach-iop32x/irq.c | 2 +- |
| arch/arm/mach-iop33x/irq.c | 2 +- |
| arch/arm/mach-ixp4xx/common.c | 70 +- |
| arch/arm/mach-ks8695/irq.c | 2 +- |
| arch/arm/mach-ks8695/time.c | 43 +- |
| arch/arm/mach-lpc32xx/irq.c | 2 +- |
| arch/arm/mach-lpc32xx/phy3250.c | 4 +- |
| arch/arm/mach-lpc32xx/timer.c | 40 +- |
| arch/arm/mach-mediatek/Kconfig | 1 + |
| arch/arm/mach-mmp/mmp-dt.c | 4 +- |
| arch/arm/mach-mmp/mmp2-dt.c | 2 +- |
| arch/arm/mach-mmp/time.c | 29 +- |
| arch/arm/mach-mvebu/pmsu.c | 4 +- |
| arch/arm/mach-mxs/mach-mxs.c | 4 +- |
| arch/arm/mach-netx/generic.c | 2 +- |
| arch/arm/mach-netx/time.c | 61 +- |
| arch/arm/mach-omap1/fpga.c | 2 +- |
| arch/arm/mach-omap1/irq.c | 2 +- |
| arch/arm/mach-omap1/time.c | 35 +- |
| arch/arm/mach-omap1/timer32k.c | 33 +- |
| arch/arm/mach-omap2/Kconfig | 20 - |
| arch/arm/mach-omap2/Makefile | 6 +- |
| arch/arm/mach-omap2/board-generic.c | 6 +- |
| arch/arm/mach-omap2/board-omap3logic.c | 249 ---- |
| arch/arm/mach-omap2/board-omap3pandora.c | 633 --------- |
| arch/arm/mach-omap2/clockdomain.h | 3 +- |
| arch/arm/mach-omap2/clockdomains7xx_data.c | 2 +- |
| arch/arm/mach-omap2/clockdomains81xx_data.c | 23 +- |
| arch/arm/mach-omap2/common.h | 1 + |
| arch/arm/mach-omap2/control.c | 1 + |
| arch/arm/mach-omap2/io.c | 70 +- |
| arch/arm/mach-omap2/iomap.h | 63 + |
| arch/arm/mach-omap2/omap-iommu.c | 13 +- |
| arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +- |
| arch/arm/mach-omap2/omap3-restart.c | 1 + |
| arch/arm/mach-omap2/omap4-restart.c | 1 + |
| arch/arm/mach-omap2/omap54xx.h | 8 + |
| arch/arm/mach-omap2/omap_hwmod.c | 16 +- |
| arch/arm/mach-omap2/omap_hwmod.h | 7 +- |
| arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +- |
| arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 2 +- |
| arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 571 +++++--- |
| arch/arm/mach-omap2/pdata-quirks.c | 163 ++- |
| arch/arm/mach-omap2/powerdomains3xxx_data.c | 122 +- |
| arch/arm/mach-omap2/prcm-common.h | 8 + |
| arch/arm/mach-omap2/prcm43xx.h | 7 + |
| arch/arm/mach-omap2/prm44xx.c | 61 +- |
| arch/arm/mach-omap2/prm_common.c | 3 +- |
| arch/arm/mach-omap2/timer.c | 66 +- |
| arch/arm/mach-omap2/vc.c | 2 +- |
| arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 +- |
| arch/arm/mach-omap2/voltagedomains44xx_data.c | 2 +- |
| arch/arm/mach-omap2/voltagedomains54xx_data.c | 2 +- |
| arch/arm/mach-orion5x/dns323-setup.c | 4 +- |
| arch/arm/mach-orion5x/tsx09-common.c | 4 +- |
| arch/arm/mach-pxa/balloon3.c | 2 +- |
| arch/arm/mach-pxa/devices.c | 37 + |
| arch/arm/mach-pxa/irq.c | 1 - |
| arch/arm/mach-pxa/lpd270.c | 2 +- |
| arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- |
| arch/arm/mach-pxa/pxa-dt.c | 4 +- |
| arch/arm/mach-pxa/pxa25x.c | 1 + |
| arch/arm/mach-pxa/pxa27x.c | 1 + |
| arch/arm/mach-pxa/pxa3xx.c | 3 +- |
| arch/arm/mach-pxa/sharpsl_pm.c | 6 +- |
| arch/arm/mach-pxa/tosa-bt.c | 15 +- |
| arch/arm/mach-pxa/viper.c | 2 +- |
| arch/arm/mach-pxa/zeus.c | 2 +- |
| arch/arm/mach-realview/realview-dt.c | 2 +- |
| arch/arm/mach-rockchip/platsmp.c | 56 +- |
| arch/arm/mach-rockchip/pm.c | 45 +- |
| arch/arm/mach-rockchip/pm.h | 7 - |
| arch/arm/mach-rpc/ecard.c | 2 +- |
| arch/arm/mach-rpc/irq.c | 16 +- |
| arch/arm/mach-s3c24xx/bast-irq.c | 2 +- |
| arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 2 +- |
| arch/arm/mach-s3c64xx/common.c | 2 +- |
| arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 2 +- |
| arch/arm/mach-sa1100/neponset.c | 4 +- |
| arch/arm/mach-shmobile/Kconfig | 38 +- |
| arch/arm/mach-shmobile/Makefile | 10 +- |
| arch/arm/mach-shmobile/Makefile.boot | 2 - |
| arch/arm/mach-shmobile/board-armadillo800eva.c | 1365 -------------------- |
| arch/arm/mach-shmobile/board-bockw-reference.c | 2 +- |
| arch/arm/mach-shmobile/board-bockw.c | 2 +- |
| arch/arm/mach-shmobile/board-kzm9g.c | 916 ------------- |
| arch/arm/mach-shmobile/board-marzen-reference.c | 2 +- |
| arch/arm/mach-shmobile/board-marzen.c | 2 +- |
| arch/arm/mach-shmobile/clock-r8a7740.c | 675 ---------- |
| arch/arm/mach-shmobile/clock-sh73a0.c | 752 ----------- |
| arch/arm/mach-shmobile/dma-register.h | 84 -- |
| arch/arm/mach-shmobile/include/mach/head-kzm9g.txt | 410 ------ |
| arch/arm/mach-shmobile/include/mach/zboot.h | 19 - |
| arch/arm/mach-shmobile/include/mach/zboot_macros.h | 108 -- |
| arch/arm/mach-shmobile/intc-sh73a0.c | 337 ----- |
| arch/arm/mach-shmobile/platsmp-apmu.c | 4 +- |
| arch/arm/mach-shmobile/pm-r8a7740.c | 129 -- |
| arch/arm/mach-shmobile/pm-r8a7779.c | 4 +- |
| arch/arm/mach-shmobile/pm-rcar.c | 105 +- |
| arch/arm/mach-shmobile/pm-rcar.h | 12 +- |
| arch/arm/mach-shmobile/pm-rmobile.c | 49 +- |
| arch/arm/mach-shmobile/pm-rmobile.h | 30 - |
| arch/arm/mach-shmobile/pm-sh73a0.c | 32 - |
| arch/arm/mach-shmobile/r8a7740.h | 58 - |
| arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 3 +- |
| arch/arm/mach-shmobile/setup-r7s72100.c | 2 +- |
| arch/arm/mach-shmobile/setup-r8a73a4.c | 2 +- |
| arch/arm/mach-shmobile/setup-r8a7740.c | 680 +--------- |
| arch/arm/mach-shmobile/setup-r8a7778.c | 2 +- |
| arch/arm/mach-shmobile/setup-r8a7779.c | 2 +- |
| arch/arm/mach-shmobile/setup-r8a7791.c | 2 +- |
| arch/arm/mach-shmobile/setup-r8a7793.c | 33 + |
| arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 - |
| arch/arm/mach-shmobile/setup-sh73a0.c | 741 +---------- |
| arch/arm/mach-shmobile/sh73a0.h | 83 -- |
| arch/arm/mach-shmobile/smp-r8a7779.c | 12 +- |
| arch/arm/mach-shmobile/smp-r8a7790.c | 4 +- |
| arch/arm/mach-shmobile/smp-sh73a0.c | 8 - |
| arch/arm/mach-shmobile/timer.c | 12 - |
| arch/arm/mach-socfpga/core.h | 1 + |
| arch/arm/mach-socfpga/platsmp.c | 13 + |
| arch/arm/mach-socfpga/socfpga.c | 26 + |
| arch/arm/mach-spear/time.c | 91 +- |
| arch/arm/mach-sti/board-dt.c | 2 +- |
| arch/arm/mach-sti/headsmp.S | 1 + |
| arch/arm/mach-sti/platsmp.c | 57 +- |
| arch/arm/mach-sti/smp.h | 2 + |
| arch/arm/mach-w90x900/irq.c | 2 +- |
| arch/arm/mach-w90x900/time.c | 51 +- |
| arch/arm/mach-zx/Kconfig | 1 + |
| arch/arm/mach-zx/Makefile | 2 +- |
| arch/arm/mach-zx/zx296702-pm-domain.c | 202 +++ |
| arch/arm/mach-zx/zx296702.c | 2 +- |
| arch/arm/plat-iop/time.c | 70 +- |
| arch/arm/plat-orion/time.c | 93 +- |
| arch/arm/plat-pxa/dma.c | 22 +- |
| arch/arm/plat-pxa/include/plat/dma.h | 15 + |
| arch/arm64/Kconfig | 105 +- |
| arch/arm64/Kconfig.platforms | 119 ++ |
| arch/arm64/boot/dts/Makefile | 2 + |
| arch/arm64/boot/dts/broadcom/Makefile | 5 + |
| arch/arm64/boot/dts/broadcom/ns2-svk.dts | 59 + |
| arch/arm64/boot/dts/broadcom/ns2.dtsi | 118 ++ |
| arch/arm64/boot/dts/mediatek/Makefile | 1 + |
| arch/arm64/boot/dts/mediatek/mt6795-evb.dts | 41 + |
| arch/arm64/boot/dts/mediatek/mt6795.dtsi | 162 +++ |
| arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 353 +++++ |
| arch/arm64/boot/dts/mediatek/mt8173.dtsi | 327 ++++- |
| arch/arm64/boot/dts/rockchip/Makefile | 5 + |
| arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 354 +++++ |
| arch/arm64/boot/dts/rockchip/rk3368.dtsi | 900 +++++++++++++ |
| arch/arm64/boot/dts/sprd/sc9836.dtsi | 99 +- |
| arch/arm64/configs/defconfig | 3 + |
| drivers/clk/rockchip/Makefile | 2 + |
| drivers/clk/rockchip/clk-inverter.c | 116 ++ |
| drivers/clk/rockchip/clk-mmc-phase.c | 6 +- |
| drivers/clk/rockchip/clk-rk3188.c | 9 +- |
| drivers/clk/rockchip/clk-rk3288.c | 13 +- |
| drivers/clk/rockchip/clk-rk3368.c | 881 +++++++++++++ |
| drivers/clk/rockchip/clk.c | 7 + |
| drivers/clk/rockchip/clk.h | 72 +- |
| drivers/clk/ti/Makefile | 2 +- |
| drivers/clk/ti/clk-814x.c | 31 + |
| drivers/clk/ti/clk-816x.c | 2 +- |
| drivers/irqchip/irq-sa11x0.c | 1 - |
| drivers/memory/Kconfig | 8 + |
| drivers/memory/Makefile | 1 + |
| drivers/memory/pl172.c | 301 +++++ |
| drivers/pci/host/Kconfig | 4 +- |
| drivers/pci/host/pcie-iproc.c | 27 +- |
| drivers/pci/host/pcie-iproc.h | 4 +- |
| drivers/soc/mediatek/Kconfig | 19 + |
| drivers/soc/mediatek/Makefile | 2 + |
| drivers/soc/mediatek/mtk-infracfg.c | 91 ++ |
| drivers/soc/mediatek/mtk-pmic-wrap.c | 1 - |
| drivers/soc/mediatek/mtk-scpsys.c | 487 +++++++ |
| include/dt-bindings/clock/r8a7790-clock.h | 3 + |
| include/dt-bindings/clock/r8a7791-clock.h | 2 + |
| include/dt-bindings/clock/r8a7793-clock.h | 164 +++ |
| include/dt-bindings/clock/rk3066a-cru.h | 5 + |
| include/dt-bindings/clock/rk3188-cru-common.h | 5 + |
| include/dt-bindings/clock/rk3188-cru.h | 5 + |
| include/dt-bindings/clock/rk3288-cru.h | 5 + |
| include/dt-bindings/clock/rk3368-cru.h | 384 ++++++ |
| include/dt-bindings/pinctrl/dra.h | 20 + |
| include/dt-bindings/power/mt8173-power.h | 15 + |
| include/linux/clk/ti.h | 3 +- |
| include/linux/soc/mediatek/infracfg.h | 26 + |
| 369 files changed, 15025 insertions(+), 9654 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/arm/bcm/ns2.txt |
| create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.txt |
| create mode 100644 Documentation/devicetree/bindings/memory-controllers/arm,pl172.txt |
| create mode 100644 Documentation/devicetree/bindings/soc/mediatek/scpsys.txt |
| create mode 100644 arch/arm/arm-soc-for-next-contents.txt |
| delete mode 100644 arch/arm/boot/compressed/head-shmobile.S |
| create mode 100644 arch/arm/boot/dts/am335x-phycore-som.dtsi |
| create mode 100644 arch/arm/boot/dts/am335x-wega-rdk.dts |
| create mode 100644 arch/arm/boot/dts/am335x-wega.dtsi |
| create mode 100644 arch/arm/boot/dts/cros-ec-sbs.dtsi |
| create mode 100644 arch/arm/boot/dts/dm8148-evm.dts |
| create mode 100644 arch/arm/boot/dts/dm8148-t410.dts |
| create mode 100644 arch/arm/boot/dts/dm814x-clocks.dtsi |
| create mode 100644 arch/arm/boot/dts/dm814x.dtsi |
| create mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts |
| create mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts |
| create mode 100644 arch/arm/boot/dts/lpc4337-ciaa.dts |
| create mode 100644 arch/arm/boot/dts/mt6580-evbp1.dts |
| create mode 100644 arch/arm/boot/dts/mt6580.dtsi |
| create mode 100644 arch/arm/boot/dts/omap3-overo-palo35-common.dtsi |
| create mode 100644 arch/arm/boot/dts/omap3-overo-palo35.dts |
| create mode 100644 arch/arm/boot/dts/omap3-overo-storm-palo35.dts |
| create mode 100644 arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts |
| create mode 100644 arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi |
| create mode 100644 arch/arm/boot/dts/omap3-overo-tobiduo.dts |
| create mode 100644 arch/arm/boot/dts/r8a7793-gose.dts |
| create mode 100644 arch/arm/boot/dts/r8a7793.dtsi |
| create mode 100644 arch/arm/boot/dts/rk3288-r89.dts |
| create mode 100644 arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi |
| create mode 100644 arch/arm/boot/dts/rk3288-veyron-jerry.dts |
| create mode 100644 arch/arm/boot/dts/rk3288-veyron-pinky.dts |
| create mode 100644 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi |
| create mode 100644 arch/arm/boot/dts/rk3288-veyron.dtsi |
| create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts |
| create mode 100644 arch/arm/boot/dts/stm32429i-eval.dts |
| create mode 100644 arch/arm/boot/dts/uniphier-pinctrl.dtsi |
| delete mode 100644 arch/arm/configs/armadillo800eva_defconfig |
| delete mode 100644 arch/arm/configs/kzm9g_defconfig |
| delete mode 100644 arch/arm/configs/marzen_defconfig |
| delete mode 100644 arch/arm/mach-bcm/bcm63xx_headsmp.S |
| create mode 100644 arch/arm/mach-ep93xx/timer-ep93xx.c |
| delete mode 100644 arch/arm/mach-omap2/board-omap3logic.c |
| delete mode 100644 arch/arm/mach-omap2/board-omap3pandora.c |
| delete mode 100644 arch/arm/mach-shmobile/board-armadillo800eva.c |
| delete mode 100644 arch/arm/mach-shmobile/board-kzm9g.c |
| delete mode 100644 arch/arm/mach-shmobile/clock-r8a7740.c |
| delete mode 100644 arch/arm/mach-shmobile/clock-sh73a0.c |
| delete mode 100644 arch/arm/mach-shmobile/dma-register.h |
| delete mode 100644 arch/arm/mach-shmobile/include/mach/head-kzm9g.txt |
| delete mode 100644 arch/arm/mach-shmobile/include/mach/zboot.h |
| delete mode 100644 arch/arm/mach-shmobile/include/mach/zboot_macros.h |
| delete mode 100644 arch/arm/mach-shmobile/intc-sh73a0.c |
| delete mode 100644 arch/arm/mach-shmobile/pm-r8a7740.c |
| delete mode 100644 arch/arm/mach-shmobile/pm-sh73a0.c |
| delete mode 100644 arch/arm/mach-shmobile/r8a7740.h |
| create mode 100644 arch/arm/mach-shmobile/setup-r8a7793.c |
| create mode 100644 arch/arm/mach-zx/zx296702-pm-domain.c |
| create mode 100644 arch/arm64/Kconfig.platforms |
| create mode 100644 arch/arm64/boot/dts/broadcom/Makefile |
| create mode 100644 arch/arm64/boot/dts/broadcom/ns2-svk.dts |
| create mode 100644 arch/arm64/boot/dts/broadcom/ns2.dtsi |
| create mode 100644 arch/arm64/boot/dts/mediatek/mt6795-evb.dts |
| create mode 100644 arch/arm64/boot/dts/mediatek/mt6795.dtsi |
| create mode 100644 arch/arm64/boot/dts/rockchip/Makefile |
| create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-r88.dts |
| create mode 100644 arch/arm64/boot/dts/rockchip/rk3368.dtsi |
| create mode 100644 drivers/clk/rockchip/clk-inverter.c |
| create mode 100644 drivers/clk/rockchip/clk-rk3368.c |
| create mode 100644 drivers/clk/ti/clk-814x.c |
| create mode 100644 drivers/memory/pl172.c |
| create mode 100644 drivers/soc/mediatek/mtk-infracfg.c |
| create mode 100644 drivers/soc/mediatek/mtk-scpsys.c |
| create mode 100644 include/dt-bindings/clock/r8a7793-clock.h |
| create mode 100644 include/dt-bindings/clock/rk3368-cru.h |
| create mode 100644 include/dt-bindings/power/mt8173-power.h |
| create mode 100644 include/linux/soc/mediatek/infracfg.h |
| Merging at91/at91-next (253ebd4df402 Merge branch 'at91-4.3-defconfig' into at91-next) |
| $ git merge at91/at91-next |
| Resolved 'arch/arm/mach-at91/sama5.c' using previous resolution. |
| Auto-merging arch/arm/mach-at91/sama5.c |
| CONFLICT (content): Merge conflict in arch/arm/mach-at91/sama5.c |
| Auto-merging arch/arm/boot/dts/Makefile |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 27f4ba295681] Merge remote-tracking branch 'at91/at91-next' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/arm/Atmel/README | 5 + |
| .../devicetree/bindings/arm/atmel-at91.txt | 2 + |
| arch/arm/Kconfig.debug | 6 + |
| arch/arm/boot/dts/Makefile | 1 + |
| arch/arm/boot/dts/at91-sama5d2_xplained.dts | 134 +++ |
| arch/arm/boot/dts/at91-sama5d4_xplained.dts | 9 + |
| arch/arm/boot/dts/at91-sama5d4ek.dts | 9 + |
| arch/arm/boot/dts/at91sam9g45.dtsi | 48 +- |
| arch/arm/boot/dts/at91sam9m10g45ek.dts | 47 ++ |
| arch/arm/boot/dts/sama5d2.dtsi | 925 +++++++++++++++++++++ |
| arch/arm/boot/dts/sama5d3.dtsi | 2 +- |
| arch/arm/boot/dts/sama5d4.dtsi | 13 +- |
| arch/arm/configs/at91_dt_defconfig | 6 + |
| arch/arm/include/debug/at91.S | 5 +- |
| arch/arm/mach-at91/Kconfig | 12 + |
| arch/arm/mach-at91/sama5.c | 3 + |
| arch/arm/mach-at91/soc.h | 3 + |
| 17 files changed, 1198 insertions(+), 32 deletions(-) |
| create mode 100644 arch/arm/boot/dts/at91-sama5d2_xplained.dts |
| create mode 100644 arch/arm/boot/dts/sama5d2.dtsi |
| Merging bcm2835/for-next (b2776bf7149b Linux 3.18) |
| $ git merge bcm2835/for-next |
| Already up-to-date. |
| Merging berlin/berlin/for-next (d770e558e219 Linux 4.2-rc1) |
| $ git merge berlin/berlin/for-next |
| Already up-to-date. |
| Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) |
| $ git merge cortex-m/for-next |
| Merge made by the 'recursive' strategy. |
| Merging imx-mxs/for-next (45aa2ab9a4e0 Merge branch 'imx/defconfig' into for-next) |
| $ git merge imx-mxs/for-next |
| Resolved 'arch/arm/boot/dts/imx6qdl-gw52xx.dtsi' using previous resolution. |
| Resolved 'arch/arm/boot/dts/imx6qdl-gw53xx.dtsi' using previous resolution. |
| Resolved 'arch/arm/boot/dts/imx6qdl-gw54xx.dtsi' using previous resolution. |
| Auto-merging arch/arm/boot/dts/imx6qdl-sabresd.dtsi |
| Auto-merging arch/arm/boot/dts/imx6qdl-sabrelite.dtsi |
| Auto-merging arch/arm/boot/dts/imx6qdl-sabreauto.dtsi |
| Auto-merging arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi |
| Auto-merging arch/arm/boot/dts/imx6qdl-gw54xx.dtsi |
| CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw54xx.dtsi |
| Auto-merging arch/arm/boot/dts/imx6qdl-gw53xx.dtsi |
| CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw53xx.dtsi |
| Auto-merging arch/arm/boot/dts/imx6qdl-gw52xx.dtsi |
| CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw52xx.dtsi |
| Auto-merging arch/arm/boot/dts/imx53-qsb-common.dtsi |
| Auto-merging arch/arm/boot/dts/Makefile |
| Auto-merging arch/arm/Kconfig.debug |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 01f1772a22e4] Merge remote-tracking branch 'imx-mxs/for-next' |
| $ git diff -M --stat --summary HEAD^.. |
| .../devicetree/bindings/clock/imx6ul-clock.txt | 13 + |
| .../devicetree/bindings/crypto/fsl-sec4.txt | 91 +- |
| .../devicetree/bindings/input/snvs-pwrkey.txt | 1 + |
| .../bindings/pinctrl/fsl,imx6ul-pinctrl.txt | 36 + |
| arch/arm/Kconfig.debug | 9 + |
| arch/arm/boot/dts/Makefile | 2 + |
| arch/arm/boot/dts/imx53-qsb-common.dtsi | 5 +- |
| arch/arm/boot/dts/imx53-qsrb.dts | 14 +- |
| arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 1 - |
| arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 35 +- |
| arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 35 +- |
| arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 34 +- |
| arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 1 - |
| arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 1 - |
| arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 39 + |
| arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 137 +++ |
| arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 39 + |
| arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 7 + |
| arch/arm/boot/dts/imx6qdl.dtsi | 52 +- |
| arch/arm/boot/dts/imx6sl-warp.dts | 32 +- |
| arch/arm/boot/dts/imx6sl.dtsi | 21 +- |
| arch/arm/boot/dts/imx6sx.dtsi | 28 +- |
| arch/arm/boot/dts/imx6ul-14x14-evk.dts | 314 +++++++ |
| arch/arm/boot/dts/imx6ul-pinfunc.h | 938 +++++++++++++++++++++ |
| arch/arm/boot/dts/imx6ul.dtsi | 647 ++++++++++++++ |
| arch/arm/boot/dts/imx7d.dtsi | 234 +++++ |
| arch/arm/boot/dts/ls1021a-qds.dts | 69 ++ |
| arch/arm/boot/dts/ls1021a-twr.dts | 61 ++ |
| arch/arm/boot/dts/ls1021a.dtsi | 18 +- |
| arch/arm/boot/dts/vfxxx.dtsi | 81 +- |
| arch/arm/configs/imx_v6_v7_defconfig | 31 +- |
| arch/arm/include/debug/imx-uart.h | 13 + |
| arch/arm/mach-imx/Kconfig | 8 + |
| arch/arm/mach-imx/Makefile | 1 + |
| arch/arm/mach-imx/cpu.c | 3 + |
| arch/arm/mach-imx/mach-imx6ul.c | 43 + |
| arch/arm/mach-imx/mxc.h | 6 + |
| drivers/clk/imx/Makefile | 1 + |
| drivers/clk/imx/clk-imx6q.c | 4 + |
| drivers/clk/imx/clk-imx6ul.c | 432 ++++++++++ |
| drivers/input/keyboard/Kconfig | 11 + |
| drivers/input/keyboard/Makefile | 1 + |
| drivers/input/keyboard/snvs_pwrkey.c | 227 +++++ |
| drivers/rtc/Kconfig | 1 + |
| drivers/rtc/rtc-snvs.c | 132 +-- |
| include/dt-bindings/clock/imx6ul-clock.h | 240 ++++++ |
| 46 files changed, 3975 insertions(+), 174 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/clock/imx6ul-clock.txt |
| create mode 100644 Documentation/devicetree/bindings/input/snvs-pwrkey.txt |
| create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6ul-pinctrl.txt |
| create mode 100644 arch/arm/boot/dts/imx6ul-14x14-evk.dts |
| create mode 100644 arch/arm/boot/dts/imx6ul-pinfunc.h |
| create mode 100644 arch/arm/boot/dts/imx6ul.dtsi |
| create mode 100644 arch/arm/mach-imx/mach-imx6ul.c |
| create mode 100644 drivers/clk/imx/clk-imx6ul.c |
| create mode 100644 drivers/input/keyboard/snvs_pwrkey.c |
| create mode 100644 include/dt-bindings/clock/imx6ul-clock.h |
| Merging keystone/next (a6ba4234e474 ARM: dts: k2l: fix the netcp range size) |
| $ git merge keystone/next |
| Merge made by the 'recursive' strategy. |
| Merging mvebu/for-next (494104693e86 Merge tag 'v4.2-rc1-dove-pmu' into mvebu/for-next) |
| $ git merge mvebu/for-next |
| Auto-merging arch/arm/boot/dts/Makefile |
| Merge made by the 'recursive' strategy. |
| arch/arm/boot/dts/Makefile | 1 + |
| arch/arm/boot/dts/dove.dtsi | 604 ++++++++++++----------- |
| arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 273 ++++++++++ |
| arch/arm/configs/orion5x_defconfig | 3 + |
| arch/arm/mach-mvebu/Kconfig | 1 + |
| arch/arm/mach-mvebu/coherency.c | 29 +- |
| arch/arm/mach-mvebu/common.h | 4 +- |
| arch/arm/mach-mvebu/dove.c | 2 + |
| arch/arm/mach-mvebu/pm-board.c | 30 +- |
| arch/arm/mach-mvebu/pm.c | 79 ++- |
| drivers/soc/Makefile | 1 + |
| drivers/soc/dove/Makefile | 1 + |
| drivers/soc/dove/pmu.c | 412 ++++++++++++++++ |
| include/linux/soc/dove/pmu.h | 6 + |
| 14 files changed, 1121 insertions(+), 325 deletions(-) |
| create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts |
| create mode 100644 drivers/soc/dove/Makefile |
| create mode 100644 drivers/soc/dove/pmu.c |
| create mode 100644 include/linux/soc/dove/pmu.h |
| Merging omap/for-next (a0ea0dda273a Merge tag 'omap-for-v4.3/dt-dm814x' into for-next) |
| $ git merge omap/for-next |
| Already up-to-date! |
| Merge made by the 'recursive' strategy. |
| Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) |
| $ git merge omap-pending/for-next |
| Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution. |
| Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution. |
| Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c |
| CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c |
| Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c |
| CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 929bec7cfc56] Merge remote-tracking branch 'omap-pending/for-next' |
| $ git diff -M --stat --summary HEAD^.. |
| Merging qcom/qcom/for-next (ca8c78b44e67 ARM: dts: ifc6410: add inforce LVDS panel support) |
| $ git merge qcom/qcom/for-next |
| Merge made by the 'recursive' strategy. |
| .../devicetree/bindings/soc/qcom,smd-rpm.txt | 117 ++ |
| .../devicetree/bindings/soc/qcom/qcom,smd.txt | 79 ++ |
| arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 56 + |
| arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 162 +++ |
| arch/arm/boot/dts/qcom-apq8064.dtsi | 178 ++- |
| arch/arm/boot/dts/qcom-msm8660.dtsi | 11 +- |
| arch/arm/boot/dts/qcom-msm8960-cdp.dts | 302 +++++ |
| arch/arm/boot/dts/qcom-msm8960.dtsi | 49 +- |
| arch/arm/boot/dts/qcom-msm8974.dtsi | 32 + |
| arch/arm/configs/qcom_defconfig | 3 + |
| .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 34 +- |
| arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi | 14 +- |
| arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 51 + |
| arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 430 +++++++ |
| arch/arm64/boot/dts/qcom/msm8916.dtsi | 227 +++- |
| drivers/soc/qcom/Kconfig | 31 + |
| drivers/soc/qcom/Makefile | 3 + |
| drivers/soc/qcom/smd-rpm.c | 244 ++++ |
| drivers/soc/qcom/smd.c | 1319 ++++++++++++++++++++ |
| drivers/soc/qcom/smem.c | 775 ++++++++++++ |
| include/linux/soc/qcom/smd-rpm.h | 35 + |
| include/linux/soc/qcom/smd.h | 46 + |
| include/linux/soc/qcom/smem.h | 11 + |
| 23 files changed, 4139 insertions(+), 70 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/soc/qcom,smd-rpm.txt |
| create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt |
| create mode 100644 arch/arm64/boot/dts/qcom/msm8916-pins.dtsi |
| create mode 100644 drivers/soc/qcom/smd-rpm.c |
| create mode 100644 drivers/soc/qcom/smd.c |
| create mode 100644 drivers/soc/qcom/smem.c |
| create mode 100644 include/linux/soc/qcom/smd-rpm.h |
| create mode 100644 include/linux/soc/qcom/smd.h |
| create mode 100644 include/linux/soc/qcom/smem.h |
| Merging renesas/next (6732214dadce Merge branch 'heads/cpg-mstp-clock-domain-for-v4.3' into next) |
| $ git merge renesas/next |
| Resolved 'arch/arm/mach-shmobile/setup-r8a7779.c' using previous resolution. |
| Auto-merging arch/arm/mach-shmobile/setup-r8a7779.c |
| CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7779.c |
| Removing arch/arm/mach-shmobile/clock-r8a7779.c |
| CONFLICT (modify/delete): arch/arm/mach-shmobile/board-marzen.c deleted in renesas/next and modified in HEAD. Version HEAD of arch/arm/mach-shmobile/board-marzen.c left in tree. |
| CONFLICT (modify/delete): arch/arm/mach-shmobile/board-marzen-reference.c deleted in renesas/next and modified in HEAD. Version HEAD of arch/arm/mach-shmobile/board-marzen-reference.c left in tree. |
| Auto-merging arch/arm/boot/dts/Makefile |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git rm -f arch/arm/mach-shmobile/board-marzen-reference.c arch/arm/mach-shmobile/board-marzen.c |
| arch/arm/mach-shmobile/board-marzen-reference.c: needs merge |
| arch/arm/mach-shmobile/board-marzen.c: needs merge |
| rm 'arch/arm/mach-shmobile/board-marzen-reference.c' |
| rm 'arch/arm/mach-shmobile/board-marzen.c' |
| $ git commit -v -a |
| [master f9072ce5e43f] Merge remote-tracking branch 'renesas/next' |
| $ git diff -M --stat --summary HEAD^.. |
| .../bindings/clock/renesas,r8a7778-cpg-clocks.txt | 29 +- |
| .../bindings/clock/renesas,r8a7779-cpg-clocks.txt | 30 +- |
| .../clock/renesas,rcar-gen2-cpg-clocks.txt | 26 +- |
| .../bindings/clock/renesas,rz-cpg-clocks.txt | 29 +- |
| arch/arm/boot/dts/Makefile | 4 +- |
| arch/arm/boot/dts/r7s72100.dtsi | 19 + |
| arch/arm/boot/dts/r8a7778.dtsi | 22 + |
| arch/arm/boot/dts/r8a7779.dtsi | 23 + |
| arch/arm/boot/dts/r8a7790.dtsi | 93 ++- |
| arch/arm/boot/dts/r8a7791.dtsi | 95 ++- |
| arch/arm/boot/dts/r8a7793.dtsi | 7 + |
| arch/arm/boot/dts/r8a7794-silk.dts | 102 +++ |
| arch/arm/boot/dts/r8a7794.dtsi | 46 ++ |
| arch/arm/configs/shmobile_defconfig | 1 + |
| arch/arm/mach-shmobile/Kconfig | 16 +- |
| arch/arm/mach-shmobile/Makefile | 6 +- |
| arch/arm/mach-shmobile/Makefile.boot | 1 - |
| arch/arm/mach-shmobile/board-marzen-reference.c | 56 -- |
| arch/arm/mach-shmobile/board-marzen.c | 347 ----------- |
| arch/arm/mach-shmobile/clock-r8a7779.c | 271 -------- |
| arch/arm/mach-shmobile/pm-rmobile.c | 35 +- |
| arch/arm/mach-shmobile/r8a7779.h | 19 - |
| arch/arm/mach-shmobile/setup-r8a7779.c | 681 +-------------------- |
| arch/arm/mach-shmobile/smp-r8a7779.c | 9 - |
| drivers/clk/shmobile/clk-mstp.c | 91 +++ |
| drivers/clk/shmobile/clk-r8a7778.c | 2 + |
| drivers/clk/shmobile/clk-r8a7779.c | 2 + |
| drivers/clk/shmobile/clk-rcar-gen2.c | 2 + |
| drivers/clk/shmobile/clk-rz.c | 3 + |
| drivers/sh/pm_runtime.c | 19 +- |
| include/linux/clk/shmobile.h | 12 + |
| 31 files changed, 633 insertions(+), 1465 deletions(-) |
| create mode 100644 arch/arm/boot/dts/r8a7794-silk.dts |
| delete mode 100644 arch/arm/mach-shmobile/board-marzen-reference.c |
| delete mode 100644 arch/arm/mach-shmobile/board-marzen.c |
| delete mode 100644 arch/arm/mach-shmobile/clock-r8a7779.c |
| Merging rpi/for-rpi-next (50b674b89355 Merge branches 'for-rpi-next-soc' and 'for-rpi-next-dt' into for-rpi-next) |
| $ git merge rpi/for-rpi-next |
| Already up-to-date! |
| Merge made by the 'recursive' strategy. |
| Merging samsung/for-next (366c21fdd7b1 Merge branch 'v4.3-next/dt64-samsung' into for-next) |
| $ git merge samsung/for-next |
| Removing drivers/cpufreq/exynos5250-cpufreq.c |
| Removing arch/arm/plat-samsung/include/plat/keypad-core.h |
| Auto-merging arch/arm/mach-s3c64xx/watchdog-reset.h |
| Auto-merging arch/arm/mach-s3c64xx/regs-usb-hsotg-phy.h |
| Auto-merging arch/arm/mach-s3c64xx/onenand-core.h |
| Auto-merging arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c |
| Auto-merging arch/arm/mach-s3c64xx/irq-uart.h |
| Auto-merging arch/arm/mach-s3c64xx/dev-backlight.c |
| Auto-merging arch/arm/mach-s3c64xx/common.c |
| Auto-merging arch/arm/mach-s3c64xx/backlight.h |
| Auto-merging arch/arm/mach-s3c64xx/ata-core.h |
| Auto-merging arch/arm/mach-s3c24xx/nand-core.h |
| Auto-merging arch/arm/mach-s3c24xx/fb-core.h |
| Auto-merging arch/arm/mach-exynos/regs-srom.h |
| Auto-merging arch/arm/configs/multi_v7_defconfig |
| Merge made by the 'recursive' strategy. |
| .../devicetree/bindings/arm/samsung/pmu.txt | 1 + |
| arch/arm/boot/dts/exynos3250-monk.dts | 19 + |
| arch/arm/boot/dts/exynos3250-rinato.dts | 21 +- |
| arch/arm/boot/dts/exynos3250.dtsi | 16 + |
| arch/arm/boot/dts/exynos4210-universal_c210.dts | 620 ++++---- |
| arch/arm/boot/dts/exynos4412-trats2.dts | 3 + |
| arch/arm/boot/dts/exynos5250-arndale.dts | 4 + |
| arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 1600 ++++++++++---------- |
| arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 + |
| arch/arm/boot/dts/exynos5250-snow.dts | 5 + |
| arch/arm/boot/dts/exynos5250-spring.dts | 4 + |
| arch/arm/boot/dts/exynos5250.dtsi | 25 +- |
| arch/arm/boot/dts/exynos5410-smdk5410.dts | 6 +- |
| arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 1411 +++++++++-------- |
| arch/arm/boot/dts/exynos5420.dtsi | 3 +- |
| arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi | 59 + |
| arch/arm/boot/dts/exynos5422-cpus.dtsi | 81 + |
| arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 47 + |
| arch/arm/configs/exynos_defconfig | 3 + |
| arch/arm/configs/multi_v7_defconfig | 5 +- |
| arch/arm/mach-exynos/Kconfig | 5 + |
| arch/arm/mach-exynos/Makefile | 2 + |
| arch/arm/mach-exynos/common.h | 6 + |
| arch/arm/mach-exynos/exynos.c | 2 + |
| arch/arm/mach-exynos/firmware.c | 2 - |
| arch/arm/mach-exynos/platsmp.c | 2 +- |
| arch/arm/mach-exynos/pmu.c | 3 +- |
| .../include/plat => mach-exynos}/regs-srom.h | 3 +- |
| .../{plat-samsung => mach-exynos}/s5p-dev-mfc.c | 0 |
| arch/arm/mach-exynos/suspend.c | 8 +- |
| arch/arm/mach-s3c24xx/Kconfig | 5 + |
| arch/arm/mach-s3c24xx/Makefile | 1 + |
| .../include/plat => mach-s3c24xx}/fb-core.h | 2 - |
| .../include/plat => mach-s3c24xx}/nand-core.h | 3 +- |
| arch/arm/mach-s3c24xx/s3c2412.c | 2 +- |
| arch/arm/mach-s3c24xx/s3c2416.c | 6 +- |
| arch/arm/mach-s3c24xx/s3c2443.c | 7 +- |
| arch/arm/mach-s3c24xx/s3c244x.c | 2 +- |
| .../{plat-samsung => mach-s3c24xx}/setup-camif.c | 0 |
| .../include/plat => mach-s3c24xx}/spi-core.h | 0 |
| arch/arm/mach-s3c64xx/Kconfig | 6 + |
| arch/arm/mach-s3c64xx/Makefile | 2 + |
| .../include/plat => mach-s3c64xx}/ata-core.h | 3 +- |
| .../include/plat => mach-s3c64xx}/backlight.h | 3 +- |
| arch/arm/mach-s3c64xx/common.c | 4 +- |
| .../{plat-samsung => mach-s3c64xx}/dev-backlight.c | 6 +- |
| .../include/plat => mach-s3c64xx}/irq-uart.h | 3 +- |
| arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 3 +- |
| arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- |
| .../include/plat => mach-s3c64xx}/onenand-core.h | 2 - |
| .../plat => mach-s3c64xx}/regs-usb-hsotg-phy.h | 3 +- |
| arch/arm/mach-s3c64xx/s3c6400.c | 2 +- |
| arch/arm/mach-s3c64xx/s3c6410.c | 4 +- |
| arch/arm/mach-s3c64xx/setup-usb-phy.c | 2 +- |
| .../include/plat => mach-s3c64xx}/watchdog-reset.h | 3 +- |
| arch/arm/plat-samsung/Kconfig | 17 - |
| arch/arm/plat-samsung/Makefile | 5 - |
| arch/arm/plat-samsung/include/plat/keypad-core.h | 31 - |
| arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 698 +++++++++ |
| .../dts/exynos/exynos5433-tmu-sensor-conf.dtsi | 22 + |
| arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi | 231 +++ |
| arch/arm64/boot/dts/exynos/exynos5433.dtsi | 931 ++++++++++++ |
| drivers/clk/samsung/clk-exynos3250.c | 32 +- |
| drivers/clk/samsung/clk-exynos5250.c | 31 + |
| drivers/cpufreq/Kconfig.arm | 11 - |
| drivers/cpufreq/Makefile | 1 - |
| drivers/cpufreq/exynos-cpufreq.c | 3 - |
| drivers/cpufreq/exynos-cpufreq.h | 17 - |
| drivers/cpufreq/exynos5250-cpufreq.c | 210 --- |
| include/dt-bindings/clock/exynos3250.h | 1 + |
| include/dt-bindings/clock/exynos5250.h | 1 + |
| 71 files changed, 4118 insertions(+), 2170 deletions(-) |
| create mode 100644 arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi |
| create mode 100644 arch/arm/boot/dts/exynos5422-cpus.dtsi |
| rename arch/arm/{plat-samsung/include/plat => mach-exynos}/regs-srom.h (96%) |
| rename arch/arm/{plat-samsung => mach-exynos}/s5p-dev-mfc.c (100%) |
| rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx}/fb-core.h (93%) |
| rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx}/nand-core.h (93%) |
| rename arch/arm/{plat-samsung => mach-s3c24xx}/setup-camif.c (100%) |
| rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx}/spi-core.h (100%) |
| rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/ata-core.h (92%) |
| rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/backlight.h (92%) |
| rename arch/arm/{plat-samsung => mach-s3c64xx}/dev-backlight.c (98%) |
| rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/irq-uart.h (90%) |
| rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/onenand-core.h (95%) |
| rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/regs-usb-hsotg-phy.h (96%) |
| rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/watchdog-reset.h (91%) |
| delete mode 100644 arch/arm/plat-samsung/include/plat/keypad-core.h |
| create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi |
| create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi |
| create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi |
| create mode 100644 arch/arm64/boot/dts/exynos/exynos5433.dtsi |
| delete mode 100644 drivers/cpufreq/exynos5250-cpufreq.c |
| Merging samsung-krzk/for-next (897a9be55b6f Merge branch 'samsung-fixes' into for-next) |
| $ git merge samsung-krzk/for-next |
| Resolved 'arch/arm/mach-exynos/suspend.c' using previous resolution. |
| Auto-merging arch/arm/mach-exynos/suspend.c |
| CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c |
| Auto-merging arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi |
| CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| Recorded resolution for 'arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi'. |
| [master 4109f182bb89] Merge remote-tracking branch 'samsung-krzk/for-next' |
| $ git diff -M --stat --summary HEAD^.. |
| arch/arm/mach-exynos/pm_domains.c | 3 +-- |
| drivers/cpufreq/exynos-cpufreq.c | 6 ++++-- |
| drivers/video/fbdev/s3c-fb.c | 2 +- |
| 3 files changed, 6 insertions(+), 5 deletions(-) |
| Merging sunxi/sunxi/for-next (9d73c13a139c Merge branches 'sunxi/dt-for-4.3' and 'sunxi/defconfig-for-4.3' into sunxi/for-next) |
| $ git merge sunxi/sunxi/for-next |
| Auto-merging arch/arm/configs/multi_v7_defconfig |
| Auto-merging arch/arm/boot/dts/Makefile |
| Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt |
| Merge made by the 'recursive' strategy. |
| .../devicetree/bindings/vendor-prefixes.txt | 1 + |
| arch/arm/boot/dts/Makefile | 2 + |
| arch/arm/boot/dts/axp152.dtsi | 49 +++++ |
| arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 15 ++ |
| arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 34 ++++ |
| arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 19 ++ |
| .../boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 202 +++++++++++++++++++++ |
| arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 15 ++ |
| arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 32 ++++ |
| arch/arm/boot/dts/sun4i-a10.dtsi | 16 +- |
| arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 37 +++- |
| arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 58 ++++++ |
| arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 37 ++++ |
| arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 29 ++- |
| arch/arm/boot/dts/sun5i.dtsi | 16 +- |
| arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 5 + |
| arch/arm/boot/dts/sun6i-a31.dtsi | 16 +- |
| arch/arm/boot/dts/sun6i-a31s-cs908.dts | 5 + |
| arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 56 ++++-- |
| arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 2 +- |
| arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 32 ++++ |
| arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 32 ++++ |
| arch/arm/boot/dts/sun7i-a20.dtsi | 16 +- |
| arch/arm/boot/dts/sun8i-a23-a33.dtsi | 25 ++- |
| arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 9 + |
| arch/arm/boot/dts/sun8i-a23.dtsi | 33 ++++ |
| arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts | 17 ++ |
| arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts | 133 ++++++++++++++ |
| arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 13 ++ |
| arch/arm/boot/dts/sun8i-a33.dtsi | 33 ++++ |
| arch/arm/boot/dts/sunxi-common-regulators.dtsi | 2 + |
| arch/arm/configs/multi_v7_defconfig | 5 + |
| arch/arm/configs/sunxi_defconfig | 10 +- |
| 33 files changed, 976 insertions(+), 30 deletions(-) |
| create mode 100644 arch/arm/boot/dts/axp152.dtsi |
| create mode 100644 arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts |
| create mode 100644 arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts |
| Merging tegra/for-next (66a41f4ac17e Merge branch for-4.3/defconfig into for-next) |
| $ git merge tegra/for-next |
| Auto-merging drivers/cpufreq/Makefile |
| Auto-merging drivers/cpufreq/Kconfig.arm |
| Merge made by the 'recursive' strategy. |
| .../bindings/clock/nvidia,tegra124-dfll.txt | 79 + |
| .../bindings/cpufreq/tegra124-cpufreq.txt | 44 + |
| .../bindings/sound/nvidia,tegra30-hda.txt | 8 +- |
| arch/arm/boot/dts/tegra124-jetson-tk1.dts | 25 +- |
| arch/arm/boot/dts/tegra124-venice2.dts | 10 +- |
| arch/arm/boot/dts/tegra124.dtsi | 49 + |
| arch/arm/configs/tegra_defconfig | 4 + |
| arch/arm/mach-tegra/Kconfig | 1 + |
| arch/arm/mach-tegra/iomap.h | 3 - |
| drivers/clk/tegra/Makefile | 3 + |
| drivers/clk/tegra/clk-dfll.c | 1755 ++++++++++++++++++++ |
| drivers/clk/tegra/clk-dfll.h | 54 + |
| drivers/clk/tegra/clk-tegra-super-gen4.c | 4 +- |
| drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 166 ++ |
| drivers/clk/tegra/clk-tegra124.c | 82 + |
| drivers/clk/tegra/clk.c | 39 +- |
| drivers/clk/tegra/clk.h | 3 + |
| drivers/clk/tegra/cvb.c | 140 ++ |
| drivers/clk/tegra/cvb.h | 67 + |
| drivers/cpufreq/Kconfig.arm | 13 +- |
| drivers/cpufreq/Makefile | 3 +- |
| drivers/cpufreq/tegra124-cpufreq.c | 214 +++ |
| .../cpufreq/{tegra-cpufreq.c => tegra20-cpufreq.c} | 0 |
| drivers/memory/tegra/tegra124-emc.c | 42 +- |
| drivers/soc/tegra/common.c | 2 + |
| drivers/soc/tegra/fuse/Makefile | 2 + |
| drivers/soc/tegra/fuse/fuse-tegra.c | 257 ++- |
| drivers/soc/tegra/fuse/fuse-tegra20.c | 175 +- |
| drivers/soc/tegra/fuse/fuse-tegra30.c | 232 +-- |
| drivers/soc/tegra/fuse/fuse.h | 95 +- |
| drivers/soc/tegra/fuse/speedo-tegra114.c | 22 +- |
| drivers/soc/tegra/fuse/speedo-tegra124.c | 26 +- |
| drivers/soc/tegra/fuse/speedo-tegra20.c | 28 +- |
| drivers/soc/tegra/fuse/speedo-tegra210.c | 184 ++ |
| drivers/soc/tegra/fuse/speedo-tegra30.c | 48 +- |
| drivers/soc/tegra/fuse/tegra-apbmisc.c | 76 +- |
| drivers/soc/tegra/pmc.c | 108 +- |
| include/dt-bindings/reset/tegra124-car.h | 12 + |
| include/soc/tegra/fuse.h | 6 +- |
| include/soc/tegra/pmc.h | 5 + |
| 40 files changed, 3624 insertions(+), 462 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.txt |
| create mode 100644 Documentation/devicetree/bindings/cpufreq/tegra124-cpufreq.txt |
| create mode 100644 drivers/clk/tegra/clk-dfll.c |
| create mode 100644 drivers/clk/tegra/clk-dfll.h |
| create mode 100644 drivers/clk/tegra/clk-tegra124-dfll-fcpu.c |
| create mode 100644 drivers/clk/tegra/cvb.c |
| create mode 100644 drivers/clk/tegra/cvb.h |
| create mode 100644 drivers/cpufreq/tegra124-cpufreq.c |
| rename drivers/cpufreq/{tegra-cpufreq.c => tegra20-cpufreq.c} (100%) |
| create mode 100644 drivers/soc/tegra/fuse/speedo-tegra210.c |
| create mode 100644 include/dt-bindings/reset/tegra124-car.h |
| Merging arm64/for-next/core (97942c2862d7 arm64: dma-mapping: Simplify pgprot handling) |
| $ git merge arm64/for-next/core |
| Auto-merging arch/arm64/Kconfig |
| Auto-merging arch/arc/include/asm/atomic.h |
| Merge made by the 'recursive' strategy. |
| Documentation/arm64/booting.txt | 11 +- |
| arch/alpha/include/asm/atomic.h | 42 ++-- |
| arch/arc/include/asm/atomic.h | 8 +- |
| arch/arm/include/asm/atomic.h | 14 ++ |
| arch/arm64/Kconfig | 82 +++++-- |
| arch/arm64/Makefile | 18 +- |
| arch/arm64/boot/Makefile | 12 + |
| arch/arm64/include/asm/alternative.h | 78 ++++++- |
| arch/arm64/include/asm/assembler.h | 14 -- |
| arch/arm64/include/asm/atomic.h | 265 +++++----------------- |
| arch/arm64/include/asm/atomic_ll_sc.h | 247 ++++++++++++++++++++ |
| arch/arm64/include/asm/atomic_lse.h | 391 ++++++++++++++++++++++++++++++++ |
| arch/arm64/include/asm/barrier.h | 24 -- |
| arch/arm64/include/asm/bug.h | 64 ++++++ |
| arch/arm64/include/asm/cmpxchg.h | 192 ++++++---------- |
| arch/arm64/include/asm/cpufeature.h | 18 +- |
| arch/arm64/include/asm/cputype.h | 3 - |
| arch/arm64/include/asm/debug-monitors.h | 44 ++-- |
| arch/arm64/include/asm/esr.h | 9 + |
| arch/arm64/include/asm/futex.h | 10 + |
| arch/arm64/include/asm/hardirq.h | 4 - |
| arch/arm64/include/asm/hugetlb.h | 4 - |
| arch/arm64/include/asm/irq_work.h | 11 - |
| arch/arm64/include/asm/lse.h | 53 +++++ |
| arch/arm64/include/asm/mmu.h | 1 - |
| arch/arm64/include/asm/percpu.h | 8 - |
| arch/arm64/include/asm/perf_event.h | 2 +- |
| arch/arm64/include/asm/pgtable-hwdef.h | 3 + |
| arch/arm64/include/asm/pgtable.h | 167 +++++++++++++- |
| arch/arm64/include/asm/processor.h | 2 + |
| arch/arm64/include/asm/ptrace.h | 4 - |
| arch/arm64/include/asm/smp.h | 4 - |
| arch/arm64/include/asm/smp_plat.h | 2 - |
| arch/arm64/include/asm/spinlock.h | 147 +++++++++--- |
| arch/arm64/include/asm/spinlock_types.h | 2 + |
| arch/arm64/include/asm/sysreg.h | 40 +++- |
| arch/arm64/include/asm/tlb.h | 7 +- |
| arch/arm64/include/asm/tlbflush.h | 76 +++---- |
| arch/arm64/include/asm/topology.h | 9 - |
| arch/arm64/include/asm/uaccess.h | 11 + |
| arch/arm64/include/uapi/asm/hwcap.h | 1 + |
| arch/arm64/include/uapi/asm/ptrace.h | 1 + |
| arch/arm64/kernel/Makefile | 6 +- |
| arch/arm64/kernel/alternative.c | 29 ++- |
| arch/arm64/kernel/armv8_deprecated.c | 19 +- |
| arch/arm64/kernel/cpu_ops.c | 2 - |
| arch/arm64/kernel/cpufeature.c | 53 ++++- |
| arch/arm64/kernel/debug-monitors.c | 4 +- |
| arch/arm64/kernel/efi-stub.c | 41 +++- |
| arch/arm64/kernel/entry.S | 29 ++- |
| arch/arm64/kernel/head.S | 7 - |
| arch/arm64/kernel/hw_breakpoint.c | 6 +- |
| arch/arm64/kernel/insn.c | 5 +- |
| arch/arm64/kernel/irq.c | 2 - |
| arch/arm64/kernel/kgdb.c | 12 +- |
| arch/arm64/kernel/pci.c | 13 ++ |
| arch/arm64/kernel/perf_callchain.c | 196 ++++++++++++++++ |
| arch/arm64/kernel/perf_event.c | 310 ++----------------------- |
| arch/arm64/kernel/psci.c | 5 - |
| arch/arm64/kernel/ptrace.c | 92 +++++++- |
| arch/arm64/kernel/setup.c | 85 +++---- |
| arch/arm64/kernel/sleep.S | 6 - |
| arch/arm64/kernel/smp.c | 15 +- |
| arch/arm64/kernel/time.c | 2 - |
| arch/arm64/kernel/topology.c | 2 +- |
| arch/arm64/kernel/traps.c | 94 ++++++-- |
| arch/arm64/kvm/hyp.S | 12 +- |
| arch/arm64/lib/Makefile | 13 ++ |
| arch/arm64/lib/atomic_ll_sc.c | 3 + |
| arch/arm64/lib/bitops.S | 45 ++-- |
| arch/arm64/lib/clear_user.S | 8 + |
| arch/arm64/lib/copy_from_user.S | 25 +- |
| arch/arm64/lib/copy_in_user.S | 25 +- |
| arch/arm64/lib/copy_to_user.S | 25 +- |
| arch/arm64/mm/cache.S | 7 +- |
| arch/arm64/mm/context.c | 16 -- |
| arch/arm64/mm/dma-mapping.c | 33 +-- |
| arch/arm64/mm/fault.c | 28 ++- |
| arch/arm64/mm/flush.c | 4 - |
| arch/arm64/mm/hugetlbpage.c | 4 - |
| arch/arm64/mm/init.c | 4 +- |
| arch/arm64/mm/mmu.c | 13 +- |
| arch/arm64/mm/proc.S | 17 +- |
| arch/avr32/include/asm/atomic.h | 12 + |
| arch/blackfin/include/asm/atomic.h | 16 +- |
| arch/blackfin/kernel/bfin_ksyms.c | 7 +- |
| arch/blackfin/mach-bf561/atomic.S | 30 +-- |
| arch/blackfin/mach-common/smp.c | 2 +- |
| arch/frv/include/asm/atomic.h | 107 ++++----- |
| arch/frv/include/asm/atomic_defs.h | 172 ++++++++++++++ |
| arch/frv/include/asm/bitops.h | 99 +------- |
| arch/frv/kernel/dma.c | 6 +- |
| arch/frv/kernel/frv_ksyms.c | 5 - |
| arch/frv/lib/Makefile | 2 +- |
| arch/frv/lib/atomic-lib.c | 7 + |
| arch/frv/lib/atomic-ops.S | 110 --------- |
| arch/frv/lib/atomic64-ops.S | 94 -------- |
| arch/h8300/include/asm/atomic.h | 137 +++-------- |
| arch/hexagon/include/asm/atomic.h | 4 + |
| arch/ia64/include/asm/atomic.h | 24 +- |
| arch/m32r/include/asm/atomic.h | 45 +--- |
| arch/m32r/kernel/smp.c | 4 +- |
| arch/m68k/include/asm/atomic.h | 14 +- |
| arch/metag/include/asm/atomic_lnkget.h | 38 +--- |
| arch/metag/include/asm/atomic_lock1.h | 23 +- |
| arch/mips/include/asm/atomic.h | 7 + |
| arch/mn10300/include/asm/atomic.h | 71 +----- |
| arch/mn10300/mm/tlb-smp.c | 2 +- |
| arch/parisc/include/asm/atomic.h | 7 + |
| arch/powerpc/include/asm/atomic.h | 7 + |
| arch/powerpc/kernel/misc_32.S | 19 -- |
| arch/s390/include/asm/atomic.h | 41 ++-- |
| arch/s390/kernel/time.c | 4 +- |
| arch/s390/kvm/interrupt.c | 30 +-- |
| arch/s390/kvm/kvm-s390.c | 32 +-- |
| arch/sh/include/asm/atomic-grb.h | 43 +--- |
| arch/sh/include/asm/atomic-irq.h | 21 +- |
| arch/sh/include/asm/atomic-llsc.h | 31 +-- |
| arch/sparc/include/asm/atomic_32.h | 4 +- |
| arch/sparc/include/asm/atomic_64.h | 4 + |
| arch/sparc/lib/atomic32.c | 22 +- |
| arch/sparc/lib/atomic_64.S | 6 + |
| arch/sparc/lib/ksyms.c | 3 + |
| arch/tile/include/asm/atomic_32.h | 28 +++ |
| arch/tile/include/asm/atomic_64.h | 40 ++++ |
| arch/tile/lib/atomic_32.c | 23 ++ |
| arch/tile/lib/atomic_asm_32.S | 4 + |
| arch/x86/include/asm/atomic.h | 25 +- |
| arch/x86/include/asm/atomic64_32.h | 14 ++ |
| arch/x86/include/asm/atomic64_64.h | 15 ++ |
| arch/xtensa/include/asm/atomic.h | 73 +----- |
| drivers/gpu/drm/i915/i915_drv.c | 2 +- |
| drivers/gpu/drm/i915/i915_gem.c | 2 +- |
| drivers/gpu/drm/i915/i915_irq.c | 4 +- |
| drivers/s390/scsi/zfcp_aux.c | 2 +- |
| drivers/s390/scsi/zfcp_erp.c | 62 ++--- |
| drivers/s390/scsi/zfcp_fc.c | 8 +- |
| drivers/s390/scsi/zfcp_fsf.c | 26 +-- |
| drivers/s390/scsi/zfcp_qdio.c | 14 +- |
| include/asm-generic/atomic.h | 11 +- |
| include/asm-generic/atomic64.h | 4 + |
| include/linux/atomic.h | 38 ++-- |
| lib/atomic64.c | 3 + |
| lib/atomic64_test.c | 68 ++++-- |
| 144 files changed, 3075 insertions(+), 2125 deletions(-) |
| create mode 100644 arch/arm64/include/asm/atomic_ll_sc.h |
| create mode 100644 arch/arm64/include/asm/atomic_lse.h |
| create mode 100644 arch/arm64/include/asm/bug.h |
| create mode 100644 arch/arm64/include/asm/lse.h |
| create mode 100644 arch/arm64/kernel/perf_callchain.c |
| create mode 100644 arch/arm64/lib/atomic_ll_sc.c |
| create mode 100644 arch/frv/include/asm/atomic_defs.h |
| create mode 100644 arch/frv/lib/atomic-lib.c |
| Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) |
| $ git merge blackfin/for-linus |
| Already up-to-date. |
| Merging c6x/for-linux-next (960a2741d5fd c67: irq: Use __handle_domain_irq()) |
| $ git merge c6x/for-linux-next |
| Merge made by the 'recursive' strategy. |
| arch/c6x/Kconfig | 1 + |
| arch/c6x/kernel/irq.c | 13 ++----------- |
| 2 files changed, 3 insertions(+), 11 deletions(-) |
| Merging cris/for-next (1e4d6e13d050 cris: don't use module_init for non-modular core eeprom.c code) |
| $ git merge cris/for-next |
| Resolved 'arch/cris/include/asm/Kbuild' using previous resolution. |
| Removing arch/cris/include/uapi/asm/types.h |
| Removing arch/cris/include/uapi/asm/statfs.h |
| Removing arch/cris/include/uapi/asm/sockios.h |
| Removing arch/cris/include/uapi/asm/socket.h |
| Removing arch/cris/include/uapi/asm/siginfo.h |
| Removing arch/cris/include/uapi/asm/shmbuf.h |
| Removing arch/cris/include/uapi/asm/sembuf.h |
| Removing arch/cris/include/uapi/asm/resource.h |
| Removing arch/cris/include/uapi/asm/poll.h |
| Removing arch/cris/include/uapi/asm/msgbuf.h |
| Removing arch/cris/include/uapi/asm/mman.h |
| Removing arch/cris/include/uapi/asm/kvm_para.h |
| Removing arch/cris/include/uapi/asm/ipcbuf.h |
| Removing arch/cris/include/uapi/asm/ioctl.h |
| Removing arch/cris/include/uapi/asm/fcntl.h |
| Removing arch/cris/include/uapi/asm/errno.h |
| Auto-merging arch/cris/include/uapi/asm/elf_v32.h |
| Auto-merging arch/cris/include/uapi/asm/elf_v10.h |
| Auto-merging arch/cris/include/uapi/asm/elf.h |
| Removing arch/cris/include/uapi/asm/bitsperlong.h |
| Removing arch/cris/include/uapi/asm/auxvec.h |
| Removing arch/cris/include/asm/types.h |
| Auto-merging arch/cris/include/asm/Kbuild |
| CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild |
| Removing arch/cris/arch-v10/lib/old_checksum.c |
| Removing arch/cris/arch-v10/lib/dmacopy.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 99a40d00b67f] Merge remote-tracking branch 'cris/for-next' |
| $ git diff -M --stat --summary HEAD^.. |
| arch/cris/Kconfig | 12 +++ |
| arch/cris/arch-v10/kernel/entry.S | 8 ++ |
| arch/cris/arch-v10/lib/dmacopy.c | 42 ---------- |
| arch/cris/arch-v10/lib/old_checksum.c | 86 -------------------- |
| arch/cris/arch-v32/drivers/Kconfig | 16 ++-- |
| arch/cris/arch-v32/drivers/axisflashmap.c | 9 ++- |
| arch/cris/arch-v32/drivers/mach-a3/gpio.c | 4 +- |
| arch/cris/arch-v32/drivers/mach-fs/gpio.c | 3 +- |
| arch/cris/arch-v32/kernel/entry.S | 19 +++++ |
| arch/cris/arch-v32/kernel/process.c | 4 +- |
| arch/cris/arch-v32/kernel/signal.c | 1 - |
| arch/cris/arch-v32/mach-fs/pinmux.c | 8 +- |
| arch/cris/configs/artpec_3_defconfig | 5 +- |
| arch/cris/configs/etraxfs_defconfig | 1 + |
| arch/cris/include/arch-v32/arch/bug.h | 11 ++- |
| arch/cris/include/arch-v32/arch/irqflags.h | 2 +- |
| arch/cris/include/asm/Kbuild | 17 ++++ |
| arch/cris/include/asm/mmu_context.h | 9 ++- |
| arch/cris/include/asm/stacktrace.h | 8 ++ |
| arch/cris/include/asm/types.h | 12 --- |
| arch/cris/include/asm/unistd.h | 2 +- |
| arch/cris/include/uapi/asm/Kbuild | 5 ++ |
| arch/cris/include/uapi/asm/auxvec.h | 4 - |
| arch/cris/include/uapi/asm/bitsperlong.h | 1 - |
| arch/cris/include/{ => uapi}/asm/elf.h | 9 ++- |
| .../{arch-v10/arch/elf.h => uapi/asm/elf_v10.h} | 5 +- |
| .../{arch-v32/arch/elf.h => uapi/asm/elf_v32.h} | 5 +- |
| arch/cris/include/uapi/asm/errno.h | 6 -- |
| arch/cris/include/uapi/asm/fcntl.h | 1 - |
| arch/cris/include/uapi/asm/ioctl.h | 1 - |
| arch/cris/include/uapi/asm/ipcbuf.h | 1 - |
| arch/cris/include/uapi/asm/kvm_para.h | 1 - |
| arch/cris/include/uapi/asm/mman.h | 1 - |
| arch/cris/include/uapi/asm/msgbuf.h | 33 -------- |
| arch/cris/include/uapi/asm/poll.h | 1 - |
| arch/cris/include/uapi/asm/ptrace.h | 6 +- |
| .../arch/ptrace.h => uapi/asm/ptrace_v10.h} | 0 |
| .../arch/ptrace.h => uapi/asm/ptrace_v32.h} | 0 |
| arch/cris/include/uapi/asm/resource.h | 6 -- |
| arch/cris/include/uapi/asm/sembuf.h | 25 ------ |
| arch/cris/include/uapi/asm/shmbuf.h | 42 ---------- |
| arch/cris/include/uapi/asm/siginfo.h | 6 -- |
| arch/cris/include/uapi/asm/socket.h | 92 ---------------------- |
| arch/cris/include/uapi/asm/sockios.h | 13 --- |
| arch/cris/include/uapi/asm/statfs.h | 6 -- |
| arch/cris/include/uapi/asm/types.h | 1 - |
| arch/cris/include/uapi/asm/unistd.h | 8 ++ |
| arch/cris/kernel/Makefile | 1 + |
| arch/cris/kernel/irq.c | 6 +- |
| arch/cris/kernel/stacktrace.c | 76 ++++++++++++++++++ |
| 50 files changed, 220 insertions(+), 421 deletions(-) |
| delete mode 100644 arch/cris/arch-v10/lib/dmacopy.c |
| delete mode 100644 arch/cris/arch-v10/lib/old_checksum.c |
| create mode 100644 arch/cris/include/asm/stacktrace.h |
| delete mode 100644 arch/cris/include/asm/types.h |
| delete mode 100644 arch/cris/include/uapi/asm/auxvec.h |
| delete mode 100644 arch/cris/include/uapi/asm/bitsperlong.h |
| rename arch/cris/include/{ => uapi}/asm/elf.h (95%) |
| rename arch/cris/include/{arch-v10/arch/elf.h => uapi/asm/elf_v10.h} (98%) |
| rename arch/cris/include/{arch-v32/arch/elf.h => uapi/asm/elf_v32.h} (98%) |
| delete mode 100644 arch/cris/include/uapi/asm/errno.h |
| delete mode 100644 arch/cris/include/uapi/asm/fcntl.h |
| delete mode 100644 arch/cris/include/uapi/asm/ioctl.h |
| delete mode 100644 arch/cris/include/uapi/asm/ipcbuf.h |
| delete mode 100644 arch/cris/include/uapi/asm/kvm_para.h |
| delete mode 100644 arch/cris/include/uapi/asm/mman.h |
| delete mode 100644 arch/cris/include/uapi/asm/msgbuf.h |
| delete mode 100644 arch/cris/include/uapi/asm/poll.h |
| rename arch/cris/include/{arch-v10/arch/ptrace.h => uapi/asm/ptrace_v10.h} (100%) |
| rename arch/cris/include/{arch-v32/arch/ptrace.h => uapi/asm/ptrace_v32.h} (100%) |
| delete mode 100644 arch/cris/include/uapi/asm/resource.h |
| delete mode 100644 arch/cris/include/uapi/asm/sembuf.h |
| delete mode 100644 arch/cris/include/uapi/asm/shmbuf.h |
| delete mode 100644 arch/cris/include/uapi/asm/siginfo.h |
| delete mode 100644 arch/cris/include/uapi/asm/socket.h |
| delete mode 100644 arch/cris/include/uapi/asm/sockios.h |
| delete mode 100644 arch/cris/include/uapi/asm/statfs.h |
| delete mode 100644 arch/cris/include/uapi/asm/types.h |
| create mode 100644 arch/cris/kernel/stacktrace.c |
| Merging h8300/h8300-next (99bcfda85f66 Revert "asm-generic: {get,put}_user ptr argument evaluate only 1 time") |
| $ git merge h8300/h8300-next |
| Merge made by the 'recursive' strategy. |
| Documentation/devicetree/bindings/clock/renesas,h8300-div-clock.txt | 2 +- |
| drivers/clk/h8300/clk-h8s2678.c | 1 + |
| 2 files changed, 2 insertions(+), 1 deletion(-) |
| Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) |
| $ git merge hexagon/linux-next |
| Already up-to-date. |
| Merging ia64/next (ae40b7e28752 Merge branch 'misc-4.2' into next) |
| $ git merge ia64/next |
| Already up-to-date! |
| Merge made by the 'recursive' strategy. |
| Merging m68k/for-next (1214c525484c m68k: Use for_each_sg()) |
| $ git merge m68k/for-next |
| Already up-to-date. |
| Merging m68knommu/for-next (3738e41b32e9 m68k/coldfire/pit: Migrate to new 'set-state' interface) |
| $ git merge m68knommu/for-next |
| Merge made by the 'recursive' strategy. |
| arch/m68k/coldfire/pit.c | 66 ++++++++++++++++++++++-------------------------- |
| 1 file changed, 30 insertions(+), 36 deletions(-) |
| Merging metag/for-next (3fe6942f0486 Documentation/features/vm: Meta2 is capable of THP) |
| $ git merge metag/for-next |
| Merge made by the 'recursive' strategy. |
| Documentation/features/vm/THP/arch-support.txt | 2 +- |
| arch/metag/kernel/irq.c | 10 ++++++---- |
| 2 files changed, 7 insertions(+), 5 deletions(-) |
| Merging microblaze/next (c4fa9a6ae285 microblaze/PCI: Remove unnecessary struct pci_dev declaration) |
| $ git merge microblaze/next |
| Already up-to-date. |
| Merging mips/mips-for-linux-next (1853ad00dae5 Merge branch '4.2-fixes' into mips-for-linux-next) |
| $ git merge mips/mips-for-linux-next |
| Auto-merging drivers/gpio/gpio-ath79.c |
| Removing arch/mips/include/asm/mach-pistachio/gpio.h |
| Removing arch/mips/include/asm/mach-loongson64/gpio.h |
| Removing arch/mips/include/asm/mach-lantiq/gpio.h |
| Removing arch/mips/include/asm/mach-generic/gpio.h |
| Removing arch/mips/include/asm/mach-cavium-octeon/gpio.h |
| Removing arch/mips/include/asm/mach-bcm63xx/gpio.h |
| Removing arch/mips/include/asm/mach-bcm47xx/gpio.h |
| Removing arch/mips/include/asm/mach-au1x00/gpio.h |
| Removing arch/mips/include/asm/mach-ath79/gpio.h |
| Removing arch/mips/include/asm/mach-ath25/gpio.h |
| Removing arch/mips/include/asm/mach-ar7/gpio.h |
| Removing arch/mips/include/asm/gpio.h |
| Removing arch/mips/include/asm/debug.h |
| Merge made by the 'recursive' strategy. |
| .../features/debug/uprobes/arch-support.txt | 2 +- |
| Documentation/sysrq.txt | 1 + |
| arch/mips/Kconfig | 22 +- |
| arch/mips/Kconfig.debug | 9 - |
| arch/mips/alchemy/Kconfig | 7 - |
| arch/mips/alchemy/board-gpr.c | 1 + |
| arch/mips/alchemy/board-mtx1.c | 1 + |
| arch/mips/alchemy/common/Makefile | 7 +- |
| arch/mips/alchemy/common/irq.c | 4 +- |
| arch/mips/alchemy/common/time.c | 6 - |
| arch/mips/alchemy/devboards/bcsr.c | 6 +- |
| arch/mips/alchemy/devboards/db1000.c | 1 + |
| arch/mips/alchemy/devboards/db1300.c | 1 + |
| arch/mips/alchemy/devboards/db1550.c | 1 + |
| arch/mips/alchemy/devboards/pm.c | 2 +- |
| arch/mips/ar7/gpio.c | 5 +- |
| arch/mips/ar7/platform.c | 1 - |
| arch/mips/ar7/setup.c | 1 - |
| arch/mips/ath79/Makefile | 2 +- |
| arch/mips/ath79/common.h | 3 - |
| arch/mips/ath79/irq.c | 19 +- |
| arch/mips/ath79/setup.c | 1 + |
| arch/mips/bcm63xx/irq.c | 6 +- |
| arch/mips/cavium-octeon/octeon-irq.c | 36 +- |
| arch/mips/cavium-octeon/smp.c | 2 +- |
| arch/mips/include/asm/Kbuild | 1 - |
| arch/mips/include/asm/abi.h | 4 + |
| arch/mips/include/asm/asmmacro.h | 114 ++++++ |
| arch/mips/include/asm/cdmm.h | 4 +- |
| arch/mips/include/asm/cevt-r4k.h | 1 - |
| arch/mips/include/asm/cpu-features.h | 4 + |
| arch/mips/include/asm/cpu-type.h | 4 + |
| arch/mips/include/asm/cpu.h | 3 + |
| arch/mips/include/asm/debug.h | 48 --- |
| arch/mips/include/asm/elf.h | 4 +- |
| arch/mips/include/asm/gpio.h | 6 - |
| arch/mips/include/asm/irq.h | 2 +- |
| arch/mips/include/asm/kdebug.h | 3 +- |
| arch/mips/include/asm/linkage.h | 1 - |
| arch/mips/include/asm/maar.h | 2 +- |
| arch/mips/include/asm/mach-ar7/ar7.h | 4 + |
| arch/mips/include/asm/mach-ar7/gpio.h | 41 -- |
| arch/mips/include/asm/mach-ath25/gpio.h | 16 - |
| arch/mips/include/asm/mach-ath79/gpio.h | 26 -- |
| arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 148 +------ |
| arch/mips/include/asm/mach-au1x00/gpio.h | 86 ---- |
| arch/mips/include/asm/mach-bcm47xx/gpio.h | 17 - |
| arch/mips/include/asm/mach-bcm63xx/gpio.h | 15 - |
| arch/mips/include/asm/mach-cavium-octeon/gpio.h | 21 - |
| arch/mips/include/asm/mach-generic/gpio.h | 21 - |
| arch/mips/include/asm/mach-jz4740/gpio.h | 2 - |
| arch/mips/include/asm/mach-lantiq/gpio.h | 13 - |
| arch/mips/include/asm/mach-loongson64/gpio.h | 36 -- |
| arch/mips/include/asm/mach-pistachio/gpio.h | 21 - |
| arch/mips/include/asm/mach-rc32434/gpio.h | 12 - |
| arch/mips/include/asm/mips-cm.h | 97 ++++- |
| arch/mips/include/asm/mips-cpc.h | 10 - |
| arch/mips/include/asm/mipsregs.h | 60 +-- |
| arch/mips/include/asm/msa.h | 80 ++++ |
| arch/mips/include/asm/pgtable-bits.h | 2 +- |
| arch/mips/include/asm/pgtable.h | 2 + |
| arch/mips/include/asm/processor.h | 2 + |
| arch/mips/include/asm/ptrace.h | 80 ++++ |
| arch/mips/include/asm/signal.h | 3 + |
| arch/mips/include/asm/smp.h | 2 - |
| arch/mips/include/asm/spinlock.h | 5 + |
| arch/mips/include/asm/switch_to.h | 48 ++- |
| arch/mips/include/asm/thread_info.h | 5 +- |
| arch/mips/include/asm/time.h | 4 +- |
| arch/mips/include/asm/tlbdebug.h | 1 + |
| arch/mips/include/asm/uprobes.h | 57 +++ |
| arch/mips/include/asm/vpe.h | 2 +- |
| arch/mips/include/uapi/asm/break.h | 2 + |
| arch/mips/include/uapi/asm/hwcap.h | 8 + |
| arch/mips/include/uapi/asm/inst.h | 31 +- |
| arch/mips/include/uapi/asm/sigcontext.h | 12 + |
| arch/mips/include/uapi/asm/ucontext.h | 65 +++ |
| arch/mips/jazz/irq.c | 7 - |
| arch/mips/jz4740/gpio.c | 24 +- |
| arch/mips/jz4740/time.c | 46 ++- |
| arch/mips/kernel/Makefile | 1 + |
| arch/mips/kernel/asm-offsets.c | 12 +- |
| arch/mips/kernel/cevt-bcm1480.c | 44 +-- |
| arch/mips/kernel/cevt-ds1287.c | 37 +- |
| arch/mips/kernel/cevt-gt641xx.c | 57 ++- |
| arch/mips/kernel/cevt-r4k.c | 18 +- |
| arch/mips/kernel/cevt-sb1250.c | 45 +-- |
| arch/mips/kernel/cevt-txx9.c | 81 ++-- |
| arch/mips/kernel/cpu-probe.c | 56 ++- |
| arch/mips/kernel/idle.c | 1 + |
| arch/mips/kernel/mips-cm.c | 257 +++++++++++- |
| arch/mips/kernel/mips-cpc.c | 11 +- |
| arch/mips/kernel/mips-mt-fpaff.c | 5 +- |
| arch/mips/kernel/perf_event_mipsxx.c | 13 +- |
| arch/mips/kernel/pm-cps.c | 2 + |
| arch/mips/kernel/prom.c | 2 +- |
| arch/mips/kernel/ptrace.c | 88 +++++ |
| arch/mips/kernel/r4k_fpu.S | 436 ++++++++++++--------- |
| arch/mips/kernel/signal-common.h | 9 + |
| arch/mips/kernel/signal.c | 433 +++++++++++++++----- |
| arch/mips/kernel/signal32.c | 207 +--------- |
| arch/mips/kernel/signal_n32.c | 6 +- |
| arch/mips/kernel/smp-bmips.c | 4 +- |
| arch/mips/kernel/smp.c | 10 - |
| arch/mips/kernel/spram.c | 1 + |
| arch/mips/kernel/sysrq.c | 14 +- |
| arch/mips/kernel/time.c | 9 +- |
| arch/mips/kernel/traps.c | 70 ++-- |
| arch/mips/kernel/unaligned.c | 76 +++- |
| arch/mips/kernel/uprobes.c | 335 ++++++++++++++++ |
| arch/mips/kernel/vpe.c | 7 +- |
| arch/mips/lantiq/irq.c | 3 +- |
| arch/mips/lasat/sysctl.c | 2 +- |
| arch/mips/lib/dump_tlb.c | 45 ++- |
| arch/mips/lib/r3k_dump_tlb.c | 11 + |
| arch/mips/loongson32/common/time.c | 57 +-- |
| arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c | 46 +-- |
| arch/mips/loongson64/loongson-3/hpet.c | 116 +++--- |
| arch/mips/loongson64/loongson-3/smp.c | 7 +- |
| arch/mips/math-emu/cp1emu.c | 29 +- |
| arch/mips/math-emu/ieee754int.h | 8 +- |
| arch/mips/math-emu/me-debugfs.c | 2 +- |
| arch/mips/mm/c-r4k.c | 1 + |
| arch/mips/mm/cache.c | 8 +- |
| arch/mips/mm/dma-default.c | 35 ++ |
| arch/mips/mm/fault.c | 11 +- |
| arch/mips/mm/init.c | 36 +- |
| arch/mips/mm/sc-mips.c | 42 ++ |
| arch/mips/mm/tlb-r3k.c | 2 +- |
| arch/mips/mti-malta/malta-init.c | 7 + |
| arch/mips/mti-malta/malta-int.c | 114 +----- |
| arch/mips/mti-malta/malta-memory.c | 25 -- |
| arch/mips/mti-malta/malta-time.c | 16 +- |
| arch/mips/mti-sead3/sead3-time.c | 1 + |
| arch/mips/netlogic/common/smp.c | 8 +- |
| arch/mips/oprofile/common.c | 1 + |
| arch/mips/oprofile/op_model_mipsxx.c | 12 +- |
| arch/mips/paravirt/paravirt-smp.c | 2 +- |
| arch/mips/pci/ops-emma2rh.c | 6 +- |
| arch/mips/pci/pci-ar71xx.c | 4 +- |
| arch/mips/pci/pci-ar724x.c | 4 +- |
| arch/mips/pci/pci-lantiq.c | 1 - |
| arch/mips/pci/pci-rt3883.c | 7 +- |
| arch/mips/pistachio/time.c | 1 + |
| arch/mips/pmcs-msp71xx/msp_irq_cic.c | 3 +- |
| arch/mips/pmcs-msp71xx/msp_smp.c | 2 +- |
| arch/mips/ralink/cevt-rt3352.c | 59 +-- |
| arch/mips/ralink/irq.c | 1 + |
| arch/mips/rb532/devices.c | 1 + |
| arch/mips/rb532/gpio.c | 6 + |
| arch/mips/sgi-ip27/ip27-irq.c | 8 +- |
| arch/mips/sgi-ip27/ip27-timer.c | 7 - |
| arch/mips/sibyte/bcm1480/smp.c | 9 +- |
| arch/mips/sibyte/common/bus_watcher.c | 2 +- |
| arch/mips/sibyte/sb1250/smp.c | 7 +- |
| arch/mips/sni/time.c | 49 +-- |
| arch/mips/txx9/generic/setup.c | 16 - |
| drivers/ata/pata_rb532_cf.c | 3 +- |
| drivers/bus/mips_cdmm.c | 14 +- |
| drivers/cpufreq/loongson2_cpufreq.c | 2 +- |
| drivers/gpio/Makefile | 1 + |
| .../mips/ath79/gpio.c => drivers/gpio/gpio-ath79.c | 75 ---- |
| drivers/input/misc/rb532_button.c | 1 + |
| drivers/irqchip/irq-mips-gic.c | 144 ++++--- |
| drivers/net/ethernet/ti/cpmac.c | 2 + |
| drivers/tty/mips_ejtag_fdc.c | 9 +- |
| include/linux/irqchip/mips-gic.h | 14 +- |
| 167 files changed, 3009 insertions(+), 1925 deletions(-) |
| delete mode 100644 arch/mips/include/asm/debug.h |
| delete mode 100644 arch/mips/include/asm/gpio.h |
| delete mode 100644 arch/mips/include/asm/mach-ar7/gpio.h |
| delete mode 100644 arch/mips/include/asm/mach-ath25/gpio.h |
| delete mode 100644 arch/mips/include/asm/mach-ath79/gpio.h |
| delete mode 100644 arch/mips/include/asm/mach-au1x00/gpio.h |
| delete mode 100644 arch/mips/include/asm/mach-bcm47xx/gpio.h |
| delete mode 100644 arch/mips/include/asm/mach-bcm63xx/gpio.h |
| delete mode 100644 arch/mips/include/asm/mach-cavium-octeon/gpio.h |
| delete mode 100644 arch/mips/include/asm/mach-generic/gpio.h |
| delete mode 100644 arch/mips/include/asm/mach-lantiq/gpio.h |
| delete mode 100644 arch/mips/include/asm/mach-loongson64/gpio.h |
| delete mode 100644 arch/mips/include/asm/mach-pistachio/gpio.h |
| create mode 100644 arch/mips/include/asm/uprobes.h |
| create mode 100644 arch/mips/include/uapi/asm/hwcap.h |
| create mode 100644 arch/mips/include/uapi/asm/ucontext.h |
| create mode 100644 arch/mips/kernel/uprobes.c |
| rename arch/mips/ath79/gpio.c => drivers/gpio/gpio-ath79.c (78%) |
| Merging nios2/nios2-next (a8955cc3a504 nios2: check number of timer instances) |
| $ git merge nios2/nios2-next |
| Already up-to-date. |
| Merging parisc-hd/for-next (9d37e6679dfd Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) |
| $ git merge parisc-hd/for-next |
| Already up-to-date. |
| Merging powerpc/next (5d83c2b37d43 selftests/seccomp: Add powerpc support) |
| $ git merge powerpc/next |
| Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c |
| Auto-merging arch/powerpc/platforms/powernv/eeh-powernv.c |
| Merge made by the 'recursive' strategy. |
| arch/powerpc/Kconfig | 5 + |
| arch/powerpc/include/asm/archrandom.h | 28 ++--- |
| arch/powerpc/include/asm/compat.h | 7 ++ |
| arch/powerpc/include/asm/device.h | 15 ++- |
| arch/powerpc/include/asm/dma-mapping.h | 14 +-- |
| arch/powerpc/include/asm/iommu.h | 31 +++++- |
| arch/powerpc/include/asm/machdep.h | 2 +- |
| arch/powerpc/include/asm/opal-api.h | 40 +++++++ |
| arch/powerpc/include/asm/opal.h | 3 +- |
| arch/powerpc/include/asm/processor.h | 1 - |
| arch/powerpc/include/asm/reg.h | 3 +- |
| arch/powerpc/include/asm/rtas.h | 1 + |
| arch/powerpc/include/asm/syscall.h | 54 +++++---- |
| arch/powerpc/include/uapi/asm/errno.h | 2 - |
| arch/powerpc/include/uapi/asm/sigcontext.h | 4 +- |
| arch/powerpc/kernel/dma-iommu.c | 2 +- |
| arch/powerpc/kernel/dma-swiotlb.c | 4 +- |
| arch/powerpc/kernel/dma.c | 111 ++++++++++++++++--- |
| arch/powerpc/kernel/entry_32.S | 7 +- |
| arch/powerpc/kernel/entry_64.S | 28 +++-- |
| arch/powerpc/kernel/process.c | 14 +-- |
| arch/powerpc/kernel/prom_init.c | 25 +++-- |
| arch/powerpc/kernel/ptrace.c | 89 +++++++++++++-- |
| arch/powerpc/kernel/rtas.c | 25 ++++- |
| arch/powerpc/kernel/signal_32.c | 5 + |
| arch/powerpc/kernel/signal_64.c | 21 +++- |
| arch/powerpc/oprofile/op_model_power4.c | 4 +- |
| arch/powerpc/perf/core-book3s.c | 4 +- |
| arch/powerpc/perf/hv-24x7.c | 24 ++-- |
| arch/powerpc/platforms/powernv/eeh-powernv.c | 12 +- |
| arch/powerpc/platforms/powernv/opal-power.c | 147 ++++++++++++++++++++++--- |
| arch/powerpc/platforms/powernv/opal-wrappers.S | 1 + |
| arch/powerpc/platforms/powernv/pci-ioda.c | 134 +++++++++------------- |
| arch/powerpc/platforms/powernv/pci.h | 5 +- |
| arch/powerpc/platforms/powernv/rng.c | 2 +- |
| arch/powerpc/platforms/pseries/iommu.c | 3 +- |
| arch/powerpc/platforms/pseries/ras.c | 3 +- |
| arch/powerpc/platforms/pseries/rng.c | 2 +- |
| arch/powerpc/sysdev/dart_iommu.c | 16 +-- |
| drivers/misc/cxl/irq.c | 32 +++--- |
| drivers/misc/cxl/main.c | 1 + |
| drivers/misc/cxl/native.c | 10 +- |
| drivers/misc/cxl/pci.c | 11 +- |
| drivers/misc/cxl/trace.h | 10 +- |
| tools/testing/selftests/seccomp/seccomp_bpf.c | 15 ++- |
| 45 files changed, 678 insertions(+), 299 deletions(-) |
| Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) |
| $ git merge powerpc-mpe/next |
| Already up-to-date. |
| Merging fsl/next (f1b3b4450dcb powerpc/85xx: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760) |
| $ git merge fsl/next |
| Already up-to-date. |
| Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) |
| $ git merge mpc5xxx/next |
| Already up-to-date. |
| Merging s390/features (8578531dea96 s390/vtime: limit MT scaling value updates) |
| $ git merge s390/features |
| Auto-merging arch/s390/kvm/kvm-s390.c |
| Removing arch/s390/kernel/sclp.S |
| Auto-merging MAINTAINERS |
| Merge made by the 'recursive' strategy. |
| MAINTAINERS | 6 - |
| arch/s390/Kbuild | 1 + |
| arch/s390/Kconfig | 75 ++++ |
| arch/s390/Makefile | 2 + |
| arch/s390/configs/default_defconfig | 2 + |
| arch/s390/configs/gcov_defconfig | 2 + |
| arch/s390/configs/performance_defconfig | 3 + |
| arch/s390/crypto/aes_s390.c | 3 +- |
| arch/s390/crypto/des_s390.c | 3 +- |
| arch/s390/crypto/ghash_s390.c | 3 +- |
| arch/s390/crypto/prng.c | 4 +- |
| arch/s390/crypto/sha1_s390.c | 3 +- |
| arch/s390/crypto/sha256_s390.c | 3 +- |
| arch/s390/crypto/sha512_s390.c | 3 +- |
| arch/s390/include/asm/cpufeature.h | 29 ++ |
| arch/s390/include/asm/ctl_reg.h | 2 + |
| arch/s390/include/asm/fpu-internal.h | 110 ++++++ |
| arch/s390/include/asm/kvm_host.h | 6 +- |
| arch/s390/include/asm/linkage.h | 22 ++ |
| arch/s390/include/asm/mmzone.h | 16 + |
| arch/s390/include/asm/numa.h | 35 ++ |
| arch/s390/include/asm/pci.h | 22 +- |
| arch/s390/include/asm/pgtable.h | 13 + |
| arch/s390/include/asm/processor.h | 36 +- |
| arch/s390/include/asm/sclp.h | 2 +- |
| arch/s390/include/asm/switch_to.h | 135 +------ |
| arch/s390/include/asm/topology.h | 39 ++ |
| arch/s390/include/asm/unistd.h | 29 +- |
| arch/s390/include/asm/vx-insn.h | 480 +++++++++++++++++++++++++ |
| arch/s390/include/uapi/asm/unistd.h | 10 +- |
| arch/s390/kernel/Makefile | 11 + |
| arch/s390/kernel/asm-offsets.c | 3 + |
| arch/s390/kernel/compat_signal.c | 48 +-- |
| arch/s390/kernel/entry.S | 614 +++++++++++++++++++++++--------- |
| arch/s390/kernel/head.S | 1 + |
| arch/s390/kernel/nmi.c | 9 +- |
| arch/s390/kernel/perf_cpum_sf.c | 9 +- |
| arch/s390/kernel/process.c | 52 ++- |
| arch/s390/kernel/processor.c | 9 + |
| arch/s390/kernel/ptrace.c | 174 ++++----- |
| arch/s390/kernel/s390_ksyms.c | 3 + |
| arch/s390/kernel/sclp.S | 355 ------------------ |
| arch/s390/kernel/sclp.c | 160 +++++++++ |
| arch/s390/kernel/setup.c | 4 +- |
| arch/s390/kernel/signal.c | 47 +-- |
| arch/s390/kernel/smp.c | 4 +- |
| arch/s390/kernel/syscalls.S | 10 +- |
| arch/s390/kernel/topology.c | 21 +- |
| arch/s390/kernel/traps.c | 34 +- |
| arch/s390/kernel/vtime.c | 11 +- |
| arch/s390/kvm/kvm-s390.c | 130 +++++-- |
| arch/s390/mm/gup.c | 10 + |
| arch/s390/mm/init.c | 40 +-- |
| arch/s390/numa/Makefile | 3 + |
| arch/s390/numa/mode_emu.c | 511 ++++++++++++++++++++++++++ |
| arch/s390/numa/numa.c | 184 ++++++++++ |
| arch/s390/numa/numa_mode.h | 24 ++ |
| arch/s390/numa/toptree.c | 342 ++++++++++++++++++ |
| arch/s390/numa/toptree.h | 60 ++++ |
| arch/s390/pci/pci.c | 34 +- |
| arch/s390/pci/pci_dma.c | 8 +- |
| arch/s390/pci/pci_event.c | 12 +- |
| arch/s390/pci/pci_sysfs.c | 17 +- |
| drivers/s390/char/sclp.c | 6 +- |
| drivers/s390/char/sclp_cmd.c | 18 +- |
| drivers/s390/cio/chsc.c | 165 ++++++--- |
| drivers/s390/cio/device_ops.c | 2 +- |
| include/linux/cpufeature.h | 7 +- |
| 68 files changed, 3184 insertions(+), 1067 deletions(-) |
| create mode 100644 arch/s390/include/asm/cpufeature.h |
| create mode 100644 arch/s390/include/asm/fpu-internal.h |
| create mode 100644 arch/s390/include/asm/mmzone.h |
| create mode 100644 arch/s390/include/asm/numa.h |
| create mode 100644 arch/s390/include/asm/vx-insn.h |
| delete mode 100644 arch/s390/kernel/sclp.S |
| create mode 100644 arch/s390/kernel/sclp.c |
| create mode 100644 arch/s390/numa/Makefile |
| create mode 100644 arch/s390/numa/mode_emu.c |
| create mode 100644 arch/s390/numa/numa.c |
| create mode 100644 arch/s390/numa/numa_mode.h |
| create mode 100644 arch/s390/numa/toptree.c |
| create mode 100644 arch/s390/numa/toptree.h |
| Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) |
| $ git merge sparc-next/master |
| Already up-to-date. |
| Merging tile/master (232ff5eb2bf3 tile: Remove finish_arch_switch) |
| $ git merge tile/master |
| Merge made by the 'recursive' strategy. |
| .../seccomp/seccomp-filter/arch-support.txt | 2 +- |
| arch/tile/Kconfig | 17 +++++++++++++ |
| arch/tile/include/asm/Kbuild | 1 + |
| arch/tile/include/asm/elf.h | 4 +--- |
| arch/tile/include/asm/switch_to.h | 8 +++---- |
| arch/tile/include/asm/syscall.h | 28 +++++++++++++++++++++- |
| arch/tile/kernel/intvec_32.S | 1 + |
| arch/tile/kernel/intvec_64.S | 1 + |
| arch/tile/kernel/process.c | 5 ++++ |
| arch/tile/kernel/ptrace.c | 3 +++ |
| arch/tile/kernel/time.c | 8 ++++--- |
| include/uapi/linux/audit.h | 3 +++ |
| include/uapi/linux/elf-em.h | 2 ++ |
| 13 files changed, 70 insertions(+), 13 deletions(-) |
| Merging uml/linux-next (46acfb806813 um: Fix out-of-tree build) |
| $ git merge uml/linux-next |
| Merge made by the 'recursive' strategy. |
| arch/um/Makefile | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) |
| $ git merge unicore32/unicore32 |
| Already up-to-date. |
| Merging xtensa/for_next (1203b34261e4 xtensa: fix threadptr reload on return to userspace) |
| $ git merge xtensa/for_next |
| Merge made by the 'recursive' strategy. |
| arch/xtensa/kernel/entry.S | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| Merging btrfs/next (5a5003df98d5 btrfs: delayed-ref: double free in btrfs_add_delayed_tree_ref()) |
| $ git merge btrfs/next |
| Already up-to-date. |
| Merging ceph/master (64c1797a9371 libceph: Remove spurious kunmap() of the zero page) |
| $ git merge ceph/master |
| Merge made by the 'recursive' strategy. |
| Merging cifs/for-next (6468ffb3e9da cifs: Fix use-after-free on mid_q_entry) |
| $ git merge cifs/for-next |
| Merge made by the 'recursive' strategy. |
| fs/cifs/cifs_ioctl.h | 42 ++++++++++++++++++++++++++++++++++++++++++ |
| fs/cifs/cifsfs.h | 2 +- |
| fs/cifs/cifspdu.h | 14 ++++++++++++++ |
| fs/cifs/cifssmb.c | 7 +++++++ |
| fs/cifs/ioctl.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ |
| fs/cifs/smb2pdu.c | 7 +++++++ |
| fs/cifs/transport.c | 2 ++ |
| 7 files changed, 115 insertions(+), 7 deletions(-) |
| create mode 100644 fs/cifs/cifs_ioctl.h |
| Merging ecryptfs/next (6d65261a09ad eCryptfs: don't pass fs-specific ioctl commands through) |
| $ git merge ecryptfs/next |
| Already up-to-date. |
| Merging ext3/for_next (926631c2012d ext4: memory leak on error in ext4_symlink()) |
| $ git merge ext3/for_next |
| Removing include/trace/events/jbd.h |
| Removing include/trace/events/ext3.h |
| Removing include/linux/jbd_common.h |
| Removing include/linux/jbd.h |
| Removing fs/jbd/transaction.c |
| Removing fs/jbd/revoke.c |
| Removing fs/jbd/recovery.c |
| Removing fs/jbd/journal.c |
| Removing fs/jbd/commit.c |
| Removing fs/jbd/checkpoint.c |
| Removing fs/jbd/Makefile |
| Removing fs/jbd/Kconfig |
| Removing fs/ext3/xattr_user.c |
| Removing fs/ext3/xattr_trusted.c |
| Removing fs/ext3/xattr_security.c |
| Removing fs/ext3/xattr.h |
| Removing fs/ext3/xattr.c |
| Removing fs/ext3/symlink.c |
| Removing fs/ext3/super.c |
| Removing fs/ext3/resize.c |
| Removing fs/ext3/namei.h |
| Removing fs/ext3/namei.c |
| Removing fs/ext3/ioctl.c |
| Removing fs/ext3/inode.c |
| Removing fs/ext3/ialloc.c |
| Removing fs/ext3/hash.c |
| Removing fs/ext3/fsync.c |
| Removing fs/ext3/file.c |
| Removing fs/ext3/ext3_jbd.c |
| Removing fs/ext3/ext3.h |
| Removing fs/ext3/dir.c |
| Removing fs/ext3/bitmap.c |
| Removing fs/ext3/balloc.c |
| Removing fs/ext3/acl.h |
| Removing fs/ext3/acl.c |
| Removing fs/ext3/Makefile |
| Removing fs/ext3/Kconfig |
| Auto-merging MAINTAINERS |
| Merge made by the 'recursive' strategy. |
| Documentation/DocBook/filesystems.tmpl | 178 +- |
| Documentation/filesystems/ext2.txt | 4 +- |
| Documentation/filesystems/ext3.txt | 209 +- |
| Documentation/filesystems/vfs.txt | 2 +- |
| MAINTAINERS | 18 +- |
| block/bounce.c | 31 +- |
| fs/Kconfig | 5 +- |
| fs/Makefile | 2 - |
| fs/ext2/ialloc.c | 5 +- |
| fs/ext2/inode.c | 7 +- |
| fs/ext2/namei.c | 46 +- |
| fs/ext3/Kconfig | 89 - |
| fs/ext3/Makefile | 12 - |
| fs/ext3/acl.c | 281 --- |
| fs/ext3/acl.h | 72 - |
| fs/ext3/balloc.c | 2158 ------------------- |
| fs/ext3/bitmap.c | 20 - |
| fs/ext3/dir.c | 537 ----- |
| fs/ext3/ext3.h | 1332 ------------ |
| fs/ext3/ext3_jbd.c | 59 - |
| fs/ext3/file.c | 79 - |
| fs/ext3/fsync.c | 109 - |
| fs/ext3/hash.c | 206 -- |
| fs/ext3/ialloc.c | 706 ------- |
| fs/ext3/inode.c | 3574 -------------------------------- |
| fs/ext3/ioctl.c | 327 --- |
| fs/ext3/namei.c | 2586 ----------------------- |
| fs/ext3/namei.h | 27 - |
| fs/ext3/resize.c | 1117 ---------- |
| fs/ext3/super.c | 3165 ---------------------------- |
| fs/ext3/symlink.c | 46 - |
| fs/ext3/xattr.c | 1330 ------------ |
| fs/ext3/xattr.h | 136 -- |
| fs/ext3/xattr_security.c | 78 - |
| fs/ext3/xattr_trusted.c | 54 - |
| fs/ext3/xattr_user.c | 58 - |
| fs/ext4/Kconfig | 54 +- |
| fs/ext4/ialloc.c | 6 +- |
| fs/ext4/inode.c | 7 +- |
| fs/ext4/namei.c | 63 +- |
| fs/ext4/super.c | 14 +- |
| fs/jbd/Kconfig | 30 - |
| fs/jbd/Makefile | 7 - |
| fs/jbd/checkpoint.c | 782 ------- |
| fs/jbd/commit.c | 1021 --------- |
| fs/jbd/journal.c | 2145 ------------------- |
| fs/jbd/recovery.c | 594 ------ |
| fs/jbd/revoke.c | 733 ------- |
| fs/jbd/transaction.c | 2237 -------------------- |
| fs/jfs/file.c | 7 +- |
| fs/jfs/jfs_inode.c | 4 +- |
| fs/jfs/namei.c | 54 +- |
| fs/ocfs2/file.c | 22 +- |
| fs/ocfs2/namei.c | 59 +- |
| fs/ocfs2/quota_local.c | 4 +- |
| fs/ocfs2/refcounttree.c | 5 +- |
| fs/quota/dquot.c | 88 +- |
| fs/reiserfs/inode.c | 7 +- |
| fs/reiserfs/namei.c | 63 +- |
| include/linux/blk_types.h | 5 +- |
| include/linux/jbd.h | 1047 ---------- |
| include/linux/jbd2.h | 41 +- |
| include/linux/jbd_common.h | 46 - |
| include/linux/quotaops.h | 5 +- |
| include/trace/events/ext3.h | 866 -------- |
| include/trace/events/jbd.h | 194 -- |
| mm/Kconfig | 8 +- |
| 67 files changed, 498 insertions(+), 28385 deletions(-) |
| delete mode 100644 fs/ext3/Kconfig |
| delete mode 100644 fs/ext3/Makefile |
| delete mode 100644 fs/ext3/acl.c |
| delete mode 100644 fs/ext3/acl.h |
| delete mode 100644 fs/ext3/balloc.c |
| delete mode 100644 fs/ext3/bitmap.c |
| delete mode 100644 fs/ext3/dir.c |
| delete mode 100644 fs/ext3/ext3.h |
| delete mode 100644 fs/ext3/ext3_jbd.c |
| delete mode 100644 fs/ext3/file.c |
| delete mode 100644 fs/ext3/fsync.c |
| delete mode 100644 fs/ext3/hash.c |
| delete mode 100644 fs/ext3/ialloc.c |
| delete mode 100644 fs/ext3/inode.c |
| delete mode 100644 fs/ext3/ioctl.c |
| delete mode 100644 fs/ext3/namei.c |
| delete mode 100644 fs/ext3/namei.h |
| delete mode 100644 fs/ext3/resize.c |
| delete mode 100644 fs/ext3/super.c |
| delete mode 100644 fs/ext3/symlink.c |
| delete mode 100644 fs/ext3/xattr.c |
| delete mode 100644 fs/ext3/xattr.h |
| delete mode 100644 fs/ext3/xattr_security.c |
| delete mode 100644 fs/ext3/xattr_trusted.c |
| delete mode 100644 fs/ext3/xattr_user.c |
| delete mode 100644 fs/jbd/Kconfig |
| delete mode 100644 fs/jbd/Makefile |
| delete mode 100644 fs/jbd/checkpoint.c |
| delete mode 100644 fs/jbd/commit.c |
| delete mode 100644 fs/jbd/journal.c |
| delete mode 100644 fs/jbd/recovery.c |
| delete mode 100644 fs/jbd/revoke.c |
| delete mode 100644 fs/jbd/transaction.c |
| delete mode 100644 include/linux/jbd.h |
| delete mode 100644 include/linux/jbd_common.h |
| delete mode 100644 include/trace/events/ext3.h |
| delete mode 100644 include/trace/events/jbd.h |
| Merging ext4/dev (6d3ec14d703c jbd2: limit number of reserved credits) |
| $ git merge ext4/dev |
| Auto-merging include/linux/jbd2.h |
| Auto-merging fs/ext4/super.c |
| Auto-merging fs/ext4/inode.c |
| Merge made by the 'recursive' strategy. |
| fs/ext4/crypto_fname.c | 5 +++- |
| fs/ext4/crypto_key.c | 4 ++- |
| fs/ext4/crypto_policy.c | 17 ++++++++++-- |
| fs/ext4/ext4.h | 2 +- |
| fs/ext4/inode.c | 8 ++++++ |
| fs/ext4/page-io.c | 8 ++++-- |
| fs/ext4/super.c | 11 +++++--- |
| fs/jbd2/checkpoint.c | 39 ++++++++++++++++++++++---- |
| fs/jbd2/commit.c | 2 +- |
| fs/jbd2/journal.c | 13 +++++++-- |
| fs/jbd2/transaction.c | 74 +++++++++++++++++++++++++++++++++++++++---------- |
| include/linux/jbd2.h | 3 +- |
| 12 files changed, 150 insertions(+), 36 deletions(-) |
| Merging f2fs/dev (0145e822619c f2fs: handle error cases in commit_inmem_pages) |
| $ git merge f2fs/dev |
| Auto-merging MAINTAINERS |
| Merge made by the 'recursive' strategy. |
| Documentation/filesystems/f2fs.txt | 4 +- |
| MAINTAINERS | 1 + |
| fs/f2fs/Makefile | 1 + |
| fs/f2fs/checkpoint.c | 18 +- |
| fs/f2fs/crypto_key.c | 3 +- |
| fs/f2fs/data.c | 870 ++++++++----------------------------- |
| fs/f2fs/debug.c | 11 +- |
| fs/f2fs/extent_cache.c | 719 ++++++++++++++++++++++++++++++ |
| fs/f2fs/f2fs.h | 83 +++- |
| fs/f2fs/file.c | 92 +++- |
| fs/f2fs/gc.c | 17 +- |
| fs/f2fs/gc.h | 6 + |
| fs/f2fs/inline.c | 3 +- |
| fs/f2fs/inode.c | 45 +- |
| fs/f2fs/namei.c | 16 +- |
| fs/f2fs/node.c | 29 +- |
| fs/f2fs/segment.c | 21 +- |
| fs/f2fs/shrinker.c | 125 ++++++ |
| fs/f2fs/super.c | 52 ++- |
| fs/f2fs/xattr.c | 5 +- |
| include/trace/events/f2fs.h | 12 +- |
| 21 files changed, 1321 insertions(+), 812 deletions(-) |
| create mode 100644 fs/f2fs/extent_cache.c |
| create mode 100644 fs/f2fs/shrinker.c |
| Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) |
| $ git merge fscache/fscache |
| Merge made by the 'recursive' strategy. |
| fs/fscache/netfs.c | 38 ++++++++++++++++++-------------------- |
| 1 file changed, 18 insertions(+), 20 deletions(-) |
| Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry) |
| $ git merge fuse/for-next |
| Already up-to-date. |
| Merging gfs2/for-next (ea79f0ec7a38 GFS2: Make ht_parms static) |
| $ git merge gfs2/for-next |
| Merge made by the 'recursive' strategy. |
| fs/gfs2/glock.c | 304 ++++++++++++++++++++------------------------------- |
| fs/gfs2/glops.c | 38 ++++--- |
| fs/gfs2/incore.h | 13 ++- |
| fs/gfs2/lock_dlm.c | 10 +- |
| fs/gfs2/lops.c | 6 +- |
| fs/gfs2/meta_io.c | 6 +- |
| fs/gfs2/meta_io.h | 2 +- |
| fs/gfs2/quota.c | 22 ++-- |
| fs/gfs2/rgrp.c | 2 +- |
| fs/gfs2/trace_gfs2.h | 18 +-- |
| fs/gfs2/trans.c | 4 +- |
| 11 files changed, 181 insertions(+), 244 deletions(-) |
| Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock) |
| $ git merge jfs/jfs-next |
| Already up-to-date. |
| Merging nfs/linux-next (bd0ad0e63a22 NFSv4.1/pnfs: Fix atomicity of commit list updates) |
| $ git merge nfs/linux-next |
| Merge made by the 'recursive' strategy. |
| fs/nfs/internal.h | 13 +++++++++---- |
| fs/nfs/pnfs_nfs.c | 5 +++-- |
| fs/nfs/write.c | 29 ++++++++++++++++++++++++----- |
| 3 files changed, 36 insertions(+), 11 deletions(-) |
| Merging nfsd/nfsd-next (a629590c1855 nfsd: allow the file cache expire time to be tunable) |
| $ git merge nfsd/nfsd-next |
| Auto-merging fs/namei.c |
| Merge made by the 'recursive' strategy. |
| Documentation/filesystems/nfs/nfs-rdma.txt | 16 +- |
| fs/lockd/svc.c | 7 +- |
| fs/namei.c | 74 ++++++ |
| fs/nfs/callback.c | 6 +- |
| fs/nfsd/Makefile | 3 +- |
| fs/nfsd/export.c | 87 ++------ |
| fs/nfsd/export.h | 1 + |
| fs/nfsd/filecache.c | 348 +++++++++++++++++++++++++++++ |
| fs/nfsd/filecache.h | 47 ++++ |
| fs/nfsd/idmap.h | 4 +- |
| fs/nfsd/netns.h | 1 + |
| fs/nfsd/nfs2acl.c | 10 +- |
| fs/nfsd/nfs3acl.c | 4 +- |
| fs/nfsd/nfs3proc.c | 2 +- |
| fs/nfsd/nfs3xdr.c | 2 +- |
| fs/nfsd/nfs4acl.c | 4 +- |
| fs/nfsd/nfs4callback.c | 122 +++++++--- |
| fs/nfsd/nfs4idmap.c | 3 - |
| fs/nfsd/nfs4layouts.c | 1 + |
| fs/nfsd/nfs4proc.c | 10 +- |
| fs/nfsd/nfs4recover.c | 12 +- |
| fs/nfsd/nfs4state.c | 128 ++++------- |
| fs/nfsd/nfs4xdr.c | 19 +- |
| fs/nfsd/nfsd.h | 1 + |
| fs/nfsd/nfsproc.c | 2 +- |
| fs/nfsd/nfssvc.c | 39 +++- |
| fs/nfsd/state.h | 2 +- |
| fs/nfsd/vfs.c | 79 +++---- |
| fs/nfsd/vfs.h | 2 +- |
| include/linux/namei.h | 1 + |
| include/linux/sunrpc/cache.h | 10 +- |
| include/linux/sunrpc/svc.h | 68 ++++-- |
| include/linux/sunrpc/svc_rdma.h | 84 +------ |
| include/linux/sunrpc/svc_xprt.h | 1 + |
| include/uapi/linux/nfsacl.h | 1 + |
| net/sunrpc/cache.c | 106 ++++----- |
| net/sunrpc/svc.c | 113 +++++----- |
| net/sunrpc/svc_xprt.c | 10 +- |
| net/sunrpc/xprtrdma/svc_rdma_sendto.c | 83 ++++++- |
| net/sunrpc/xprtrdma/svc_rdma_transport.c | 35 +-- |
| 40 files changed, 1006 insertions(+), 542 deletions(-) |
| create mode 100644 fs/nfsd/filecache.c |
| create mode 100644 fs/nfsd/filecache.h |
| Merging orangefs/for-next (613de4c48dab Orangefs: large integer implicitly truncated to unsigned type) |
| $ git merge orangefs/for-next |
| Auto-merging fs/Makefile |
| Auto-merging fs/Kconfig |
| Merge made by the 'recursive' strategy. |
| Documentation/ABI/stable/sysfs-fs-orangefs | 87 ++ |
| Documentation/filesystems/orangefs.txt | 137 +++ |
| fs/Kconfig | 1 + |
| fs/Makefile | 1 + |
| fs/orangefs/Kconfig | 6 + |
| fs/orangefs/Makefile | 10 + |
| fs/orangefs/acl.c | 175 +++ |
| fs/orangefs/dcache.c | 142 +++ |
| fs/orangefs/devpvfs2-req.c | 1004 ++++++++++++++++ |
| fs/orangefs/dir.c | 378 ++++++ |
| fs/orangefs/downcall.h | 138 +++ |
| fs/orangefs/file.c | 1016 ++++++++++++++++ |
| fs/orangefs/inode.c | 469 ++++++++ |
| fs/orangefs/namei.c | 473 ++++++++ |
| fs/orangefs/protocol.h | 672 +++++++++++ |
| fs/orangefs/pvfs2-bufmap.c | 974 +++++++++++++++ |
| fs/orangefs/pvfs2-bufmap.h | 76 ++ |
| fs/orangefs/pvfs2-cache.c | 260 ++++ |
| fs/orangefs/pvfs2-debug.h | 290 +++++ |
| fs/orangefs/pvfs2-debugfs.c | 458 +++++++ |
| fs/orangefs/pvfs2-debugfs.h | 3 + |
| fs/orangefs/pvfs2-dev-proto.h | 102 ++ |
| fs/orangefs/pvfs2-kernel.h | 864 ++++++++++++++ |
| fs/orangefs/pvfs2-mod.c | 315 +++++ |
| fs/orangefs/pvfs2-sysfs.c | 1787 ++++++++++++++++++++++++++++ |
| fs/orangefs/pvfs2-sysfs.h | 2 + |
| fs/orangefs/pvfs2-utils.c | 1130 ++++++++++++++++++ |
| fs/orangefs/super.c | 558 +++++++++ |
| fs/orangefs/symlink.c | 31 + |
| fs/orangefs/upcall.h | 255 ++++ |
| fs/orangefs/waitqueue.c | 529 ++++++++ |
| fs/orangefs/xattr.c | 530 +++++++++ |
| 32 files changed, 12873 insertions(+) |
| create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs |
| create mode 100644 Documentation/filesystems/orangefs.txt |
| create mode 100644 fs/orangefs/Kconfig |
| create mode 100644 fs/orangefs/Makefile |
| create mode 100644 fs/orangefs/acl.c |
| create mode 100644 fs/orangefs/dcache.c |
| create mode 100644 fs/orangefs/devpvfs2-req.c |
| create mode 100644 fs/orangefs/dir.c |
| create mode 100644 fs/orangefs/downcall.h |
| create mode 100644 fs/orangefs/file.c |
| create mode 100644 fs/orangefs/inode.c |
| create mode 100644 fs/orangefs/namei.c |
| create mode 100644 fs/orangefs/protocol.h |
| create mode 100644 fs/orangefs/pvfs2-bufmap.c |
| create mode 100644 fs/orangefs/pvfs2-bufmap.h |
| create mode 100644 fs/orangefs/pvfs2-cache.c |
| create mode 100644 fs/orangefs/pvfs2-debug.h |
| create mode 100644 fs/orangefs/pvfs2-debugfs.c |
| create mode 100644 fs/orangefs/pvfs2-debugfs.h |
| create mode 100644 fs/orangefs/pvfs2-dev-proto.h |
| create mode 100644 fs/orangefs/pvfs2-kernel.h |
| create mode 100644 fs/orangefs/pvfs2-mod.c |
| create mode 100644 fs/orangefs/pvfs2-sysfs.c |
| create mode 100644 fs/orangefs/pvfs2-sysfs.h |
| create mode 100644 fs/orangefs/pvfs2-utils.c |
| create mode 100644 fs/orangefs/super.c |
| create mode 100644 fs/orangefs/symlink.c |
| create mode 100644 fs/orangefs/upcall.h |
| create mode 100644 fs/orangefs/waitqueue.c |
| create mode 100644 fs/orangefs/xattr.c |
| Merging overlayfs/overlayfs-next (cdb672795876 ovl: lookup whiteouts outside iterate_dir()) |
| $ git merge overlayfs/overlayfs-next |
| Already up-to-date. |
| Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) |
| $ git merge squashfs/master |
| Already up-to-date. |
| Merging v9fs/for-next (3d99e3fe13d4 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile) |
| $ git merge v9fs/for-next |
| Already up-to-date. |
| Merging ubifs/linux-next (669d3d123395 UBI: Remove unnecessary `\') |
| $ git merge ubifs/linux-next |
| Already up-to-date. |
| Merging xfs/for-next (5461ad99cab9 Merge branch 'xfs-meta-uuid' into for-next) |
| $ git merge xfs/for-next |
| Merge made by the 'recursive' strategy. |
| fs/xfs/Makefile | 2 +- |
| fs/xfs/libxfs/xfs_alloc.c | 4 +-- |
| fs/xfs/libxfs/xfs_alloc_btree.c | 4 +-- |
| fs/xfs/libxfs/xfs_attr_leaf.c | 4 +-- |
| fs/xfs/libxfs/xfs_attr_remote.c | 9 +++---- |
| fs/xfs/{ => libxfs}/xfs_bit.c | 0 |
| fs/xfs/libxfs/xfs_bmap_btree.c | 5 ++-- |
| fs/xfs/libxfs/xfs_btree.c | 10 +++++--- |
| fs/xfs/libxfs/xfs_da_btree.c | 8 +++--- |
| fs/xfs/libxfs/xfs_dir2.c | 33 ++++++++++++------------- |
| fs/xfs/libxfs/xfs_dir2_block.c | 4 +-- |
| fs/xfs/libxfs/xfs_dir2_data.c | 4 +-- |
| fs/xfs/libxfs/xfs_dir2_leaf.c | 4 +-- |
| fs/xfs/libxfs/xfs_dir2_node.c | 7 +++--- |
| fs/xfs/libxfs/xfs_dquot_buf.c | 4 +-- |
| fs/xfs/libxfs/xfs_format.h | 22 ++++++++++++++--- |
| fs/xfs/libxfs/xfs_ialloc.c | 5 ++-- |
| fs/xfs/libxfs/xfs_ialloc_btree.c | 2 +- |
| fs/xfs/libxfs/xfs_inode_buf.c | 4 +-- |
| fs/xfs/libxfs/xfs_sb.c | 24 ++++++++++++++---- |
| fs/xfs/libxfs/xfs_symlink_remote.c | 4 +-- |
| fs/xfs/xfs_buf.c | 5 ++-- |
| fs/xfs/xfs_inode.c | 10 ++------ |
| fs/xfs/xfs_log.c | 50 +++++++++++++++++++------------------- |
| fs/xfs/xfs_log_cil.c | 8 +++++- |
| fs/xfs/xfs_log_recover.c | 36 ++++++++++++++++++++++----- |
| fs/xfs/xfs_symlink.c | 2 +- |
| 27 files changed, 164 insertions(+), 110 deletions(-) |
| rename fs/xfs/{ => libxfs}/xfs_bit.c (100%) |
| Merging file-locks/linux-next (ee296d7c5709 locks: inline posix_lock_file_wait and flock_lock_file_wait) |
| $ git merge file-locks/linux-next |
| Already up-to-date. |
| Merging vfs/for-next (0f1db7dee200 9p: cope with bogus responses from server in p9_client_{read,write}) |
| $ git merge vfs/for-next |
| Already up-to-date. |
| Merging pci/next (bc0195aad0da Linux 4.2-rc2) |
| $ git merge pci/next |
| Already up-to-date. |
| Merging hid/for-next (386f6da56c13 Merge branch 'for-4.2/upstream-fixes-devm-fixed' into for-next) |
| $ git merge hid/for-next |
| Auto-merging drivers/hid/hid-ids.h |
| Auto-merging drivers/hid/hid-core.c |
| Merge made by the 'recursive' strategy. |
| drivers/hid/Kconfig | 1 + |
| drivers/hid/hid-chicony.c | 26 ++++++ |
| drivers/hid/hid-core.c | 28 ++++++- |
| drivers/hid/hid-cp2112.c | 107 +++++++++++++++++------ |
| drivers/hid/hid-ids.h | 14 +++- |
| drivers/hid/hid-input.c | 12 ++- |
| drivers/hid/hid-lg.c | 2 + |
| drivers/hid/hid-microsoft.c | 6 +- |
| drivers/hid/hid-multitouch.c | 8 ++ |
| drivers/hid/hid-picolcd_backlight.c | 3 +- |
| drivers/hid/hid-picolcd_cir.c | 3 +- |
| drivers/hid/hid-picolcd_lcd.c | 3 +- |
| drivers/hid/hid-rmi.c | 163 ++++++++++++++++++++++++++++++++---- |
| drivers/hid/hid-sensor-hub.c | 3 + |
| drivers/hid/hid-sony.c | 22 ++++- |
| drivers/hid/hid-uclogic.c | 2 +- |
| drivers/hid/i2c-hid/i2c-hid.c | 6 +- |
| drivers/hid/usbhid/hid-core.c | 3 +- |
| drivers/hid/usbhid/hid-quirks.c | 3 +- |
| drivers/hid/wacom_sys.c | 88 +++++++------------ |
| drivers/hid/wacom_wac.c | 99 ++++++++++++++++++++-- |
| drivers/hid/wacom_wac.h | 7 +- |
| 22 files changed, 475 insertions(+), 134 deletions(-) |
| Merging i2c/i2c/for-next (cdb7677d7f6b Merge branch 'i2c/for-current' into i2c/for-next) |
| $ git merge i2c/i2c/for-next |
| Merge made by the 'recursive' strategy. |
| .../devicetree/bindings/i2c/i2c-cadence.txt | 6 +- |
| .../devicetree/bindings/i2c/i2c-emev2.txt | 22 + |
| .../devicetree/bindings/i2c/trivial-devices.txt | 2 + |
| Documentation/i2c/busses/i2c-parport | 1 + |
| drivers/clk/shmobile/clk-emev2.c | 6 + |
| drivers/i2c/busses/Kconfig | 7 + |
| drivers/i2c/busses/Makefile | 1 + |
| drivers/i2c/busses/i2c-cadence.c | 68 ++- |
| drivers/i2c/busses/i2c-designware-pcidrv.c | 4 +- |
| drivers/i2c/busses/i2c-emev2.c | 332 ++++++++++++ |
| drivers/i2c/busses/i2c-omap.c | 600 ++++++++++----------- |
| drivers/i2c/busses/i2c-parport.c | 25 +- |
| drivers/i2c/busses/i2c-parport.h | 8 + |
| drivers/i2c/busses/i2c-pxa.c | 112 ++-- |
| drivers/i2c/busses/i2c-tegra.c | 52 +- |
| drivers/i2c/busses/i2c-xiic.c | 74 ++- |
| 16 files changed, 889 insertions(+), 431 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/i2c/i2c-emev2.txt |
| create mode 100644 drivers/i2c/busses/i2c-emev2.c |
| Merging jdelvare-hwmon/master (902fd32b7711 hwmon: (k10temp) Remove duplicate pci-id define) |
| $ git merge jdelvare-hwmon/master |
| Merge made by the 'recursive' strategy. |
| drivers/hwmon/k10temp.c | 1 - |
| 1 file changed, 1 deletion(-) |
| Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) |
| $ git merge dmi/master |
| Already up-to-date. |
| Merging hwmon-staging/hwmon-next (24b3068be684 hwmon: (nct7802) Add auto_point attributes) |
| $ git merge hwmon-staging/hwmon-next |
| Merge made by the 'recursive' strategy. |
| Documentation/devicetree/bindings/hwmon/lm70.txt | 21 ++ |
| Documentation/hwmon/adm1275 | 40 +-- |
| Documentation/hwmon/nct7802 | 3 +- |
| drivers/hwmon/dell-smm-hwmon.c | 18 +- |
| drivers/hwmon/f71882fg.c | 176 +++++++++-- |
| drivers/hwmon/g762.c | 2 +- |
| drivers/hwmon/lm70.c | 34 ++- |
| drivers/hwmon/nct7802.c | 317 +++++++++++++++++++- |
| drivers/hwmon/nct7904.c | 1 + |
| drivers/hwmon/pmbus/Kconfig | 4 +- |
| drivers/hwmon/pmbus/adm1275.c | 358 ++++++++++++++++------- |
| drivers/hwmon/pmbus/ltc2978.c | 2 +- |
| drivers/hwmon/pmbus/pmbus.h | 53 ++-- |
| drivers/hwmon/pmbus/pmbus_core.c | 10 +- |
| 14 files changed, 844 insertions(+), 195 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/hwmon/lm70.txt |
| Merging v4l-dvb/master (5bab86243d94 [media] media/pci/cobalt: fix Kconfig and build when SND is not enabled) |
| $ git merge v4l-dvb/master |
| Merge made by the 'recursive' strategy. |
| drivers/media/dvb-frontends/Kconfig | 2 +- |
| drivers/media/pci/cobalt/Kconfig | 1 + |
| 2 files changed, 2 insertions(+), 1 deletion(-) |
| Merging kbuild/for-next (31d61069530b Merge branch 'kbuild/kconfig' into kbuild/for-next) |
| $ git merge kbuild/for-next |
| Auto-merging lib/Kconfig.debug |
| Auto-merging init/Kconfig |
| Auto-merging arch/x86/Kconfig |
| Auto-merging Makefile |
| Merge made by the 'recursive' strategy. |
| .gitignore | 4 + |
| Documentation/lto-build | 173 ++++++++++++++++++++++++++++ |
| Makefile | 19 ++- |
| arch/x86/Kconfig | 2 +- |
| init/Kconfig | 73 ++++++++++++ |
| kernel/gcov/Kconfig | 2 +- |
| lib/Kconfig.debug | 2 +- |
| scripts/Makefile.lto | 84 ++++++++++++++ |
| scripts/Makefile.modpost | 7 +- |
| scripts/coccinelle/api/pm_runtime.cocci | 2 +- |
| scripts/coccinelle/api/simple_open.cocci | 4 +- |
| scripts/coccinelle/api/vma_pages.cocci | 60 ++++++++++ |
| scripts/coccinelle/misc/ifaddr.cocci | 3 +- |
| scripts/coccinelle/misc/irqf_oneshot.cocci | 7 +- |
| scripts/coccinelle/misc/returnvar.cocci | 2 +- |
| scripts/coccinelle/misc/semicolon.cocci | 2 +- |
| scripts/coccinelle/misc/simple_return.cocci | 2 +- |
| scripts/link-vmlinux.sh | 2 +- |
| scripts/package/Makefile | 8 +- |
| scripts/package/builddeb | 31 +++-- |
| scripts/package/mkspec | 4 +- |
| 21 files changed, 459 insertions(+), 34 deletions(-) |
| create mode 100644 Documentation/lto-build |
| create mode 100644 scripts/Makefile.lto |
| create mode 100644 scripts/coccinelle/api/vma_pages.cocci |
| Merging kconfig/for-next (b953c0d234bc Linux 4.1) |
| $ git merge kconfig/for-next |
| Already up-to-date. |
| Merging libata/for-next (3a95a0528f73 Merge branch 'for-4.2-fixes' into for-next) |
| $ git merge libata/for-next |
| Auto-merging drivers/scsi/scsi_error.c |
| Merge made by the 'recursive' strategy. |
| drivers/ata/ahci_brcmstb.c | 2 + |
| drivers/ata/libata-core.c | 24 ++--------- |
| drivers/ata/libata-eh.c | 105 +-------------------------------------------- |
| drivers/ata/libata-scsi.c | 21 +-------- |
| drivers/ata/libata.h | 6 +-- |
| drivers/ata/sata_rcar.c | 4 -- |
| drivers/scsi/scsi_error.c | 31 ------------- |
| include/linux/ata.h | 18 -------- |
| include/scsi/scsi_eh.h | 1 - |
| 9 files changed, 10 insertions(+), 202 deletions(-) |
| Merging pm/linux-next (3e64a6e1d98f Merge branch 'pm-cpufreq' into linux-next) |
| $ git merge pm/linux-next |
| Auto-merging arch/powerpc/include/asm/opal-api.h |
| Merge made by the 'recursive' strategy. |
| .../devicetree/bindings/power/power_domain.txt | 2 +- |
| Documentation/power/devices.txt | 7 + |
| Documentation/power/runtime_pm.txt | 4 - |
| arch/powerpc/include/asm/opal-api.h | 12 + |
| drivers/acpi/Makefile | 2 +- |
| drivers/acpi/ac.c | 4 - |
| drivers/acpi/acpi_ipmi.c | 4 - |
| drivers/acpi/acpi_memhotplug.c | 5 - |
| drivers/acpi/acpi_pad.c | 4 - |
| drivers/acpi/acpi_processor.c | 2 +- |
| drivers/acpi/acpi_video.c | 4 - |
| drivers/acpi/acpica/Makefile | 2 + |
| drivers/acpi/acpica/acdebug.h | 19 + |
| drivers/acpi/acpica/acdispat.h | 8 + |
| drivers/acpi/acpica/acglobal.h | 3 +- |
| drivers/acpi/acpica/acinterp.h | 22 + |
| drivers/acpi/acpica/aclocal.h | 11 +- |
| drivers/acpi/acpica/acmacros.h | 9 + |
| drivers/acpi/acpica/acnamesp.h | 13 +- |
| drivers/acpi/acpica/acobject.h | 1 + |
| drivers/acpi/acpica/acparser.h | 4 +- |
| drivers/acpi/acpica/acstruct.h | 2 +- |
| drivers/acpi/acpica/acutils.h | 23 +- |
| drivers/acpi/acpica/dsargs.c | 4 +- |
| drivers/acpi/acpica/dsdebug.c | 231 ++++++ |
| drivers/acpi/acpica/dsmethod.c | 35 +- |
| drivers/acpi/acpica/dswload.c | 2 +- |
| drivers/acpi/acpica/dswload2.c | 2 +- |
| drivers/acpi/acpica/excreate.c | 1 + |
| drivers/acpi/acpica/exdebug.c | 324 ++++++++ |
| drivers/acpi/acpica/exdump.c | 5 +- |
| drivers/acpi/acpica/nsnames.c | 275 ++++--- |
| drivers/acpi/acpica/nsparse.c | 42 +- |
| drivers/acpi/acpica/nsutils.c | 2 +- |
| drivers/acpi/acpica/nsxfname.c | 8 +- |
| drivers/acpi/acpica/psargs.c | 26 +- |
| drivers/acpi/acpica/psloop.c | 18 +- |
| drivers/acpi/acpica/psobject.c | 17 +- |
| drivers/acpi/acpica/psparse.c | 14 +- |
| drivers/acpi/acpica/psutils.c | 8 +- |
| drivers/acpi/acpica/psxface.c | 123 +-- |
| drivers/acpi/acpica/rscreate.c | 3 +- |
| drivers/acpi/acpica/utdebug.c | 31 +- |
| drivers/acpi/acpica/utdelete.c | 3 + |
| drivers/acpi/acpica/utinit.c | 2 - |
| drivers/acpi/acpica/utmisc.c | 2 +- |
| drivers/acpi/acpica/utnonansi.c | 380 +++++++++ |
| drivers/acpi/acpica/utstring.c | 342 -------- |
| drivers/acpi/apei/apei-base.c | 4 - |
| drivers/acpi/apei/einj.c | 4 - |
| drivers/acpi/apei/erst-dbg.c | 4 - |
| drivers/acpi/apei/erst.c | 4 - |
| drivers/acpi/apei/ghes.c | 4 - |
| drivers/acpi/apei/hest.c | 4 - |
| drivers/acpi/battery.c | 4 - |
| drivers/acpi/blacklist.c | 4 - |
| drivers/acpi/bus.c | 415 +++++++++- |
| drivers/acpi/button.c | 4 - |
| drivers/acpi/cm_sbs.c | 4 - |
| drivers/acpi/container.c | 4 - |
| drivers/acpi/device_pm.c | 12 +- |
| drivers/acpi/device_sysfs.c | 521 +++++++++++++ |
| drivers/acpi/dock.c | 4 - |
| drivers/acpi/ec.c | 4 - |
| drivers/acpi/fan.c | 4 - |
| drivers/acpi/hed.c | 4 - |
| drivers/acpi/internal.h | 14 +- |
| drivers/acpi/numa.c | 4 - |
| drivers/acpi/osl.c | 4 - |
| drivers/acpi/pci_irq.c | 4 - |
| drivers/acpi/pci_link.c | 4 - |
| drivers/acpi/pci_root.c | 4 - |
| drivers/acpi/pci_slot.c | 4 - |
| drivers/acpi/power.c | 19 +- |
| drivers/acpi/processor_driver.c | 6 +- |
| drivers/acpi/processor_idle.c | 4 - |
| drivers/acpi/processor_perflib.c | 8 +- |
| drivers/acpi/processor_thermal.c | 4 - |
| drivers/acpi/processor_throttling.c | 4 - |
| drivers/acpi/resource.c | 4 - |
| drivers/acpi/sbs.c | 4 - |
| drivers/acpi/scan.c | 860 --------------------- |
| drivers/acpi/tables.c | 4 - |
| drivers/acpi/thermal.c | 4 - |
| drivers/acpi/utils.c | 4 - |
| drivers/base/core.c | 43 ++ |
| drivers/base/dd.c | 20 + |
| drivers/base/power/clock_ops.c | 4 +- |
| drivers/base/power/domain.c | 377 ++------- |
| drivers/base/power/main.c | 2 +- |
| drivers/base/power/power.h | 2 + |
| drivers/base/power/qos.c | 37 + |
| drivers/base/power/sysfs.c | 11 + |
| drivers/cpufreq/acpi-cpufreq.c | 93 ++- |
| drivers/cpufreq/cpufreq.c | 322 ++++---- |
| drivers/cpufreq/cpufreq_conservative.c | 25 +- |
| drivers/cpufreq/cpufreq_governor.c | 196 +++-- |
| drivers/cpufreq/cpufreq_governor.h | 40 +- |
| drivers/cpufreq/cpufreq_ondemand.c | 67 +- |
| drivers/cpufreq/e_powersaver.c | 2 +- |
| drivers/cpufreq/ia64-acpi-cpufreq.c | 20 +- |
| drivers/cpufreq/integrator-cpufreq.c | 18 +- |
| drivers/cpufreq/intel_pstate.c | 15 +- |
| drivers/cpufreq/powernow-k7.c | 4 +- |
| drivers/cpufreq/powernow-k8.c | 5 +- |
| drivers/cpufreq/powernv-cpufreq.c | 198 ++++- |
| drivers/dma/Kconfig | 8 + |
| drivers/dma/Makefile | 1 + |
| drivers/dma/idma64.c | 710 +++++++++++++++++ |
| drivers/dma/idma64.h | 233 ++++++ |
| drivers/mfd/Kconfig | 23 + |
| drivers/mfd/Makefile | 3 + |
| drivers/mfd/intel-lpss-acpi.c | 84 ++ |
| drivers/mfd/intel-lpss-pci.c | 113 +++ |
| drivers/mfd/intel-lpss.c | 524 +++++++++++++ |
| drivers/mfd/intel-lpss.h | 62 ++ |
| drivers/mfd/mfd-core.c | 2 +- |
| drivers/powercap/intel_rapl.c | 2 + |
| drivers/xen/xen-acpi-processor.c | 16 +- |
| include/acpi/acoutput.h | 21 +- |
| include/acpi/acpi_bus.h | 4 - |
| include/acpi/acpi_drivers.h | 4 - |
| include/acpi/acpiosxf.h | 6 + |
| include/acpi/acpixf.h | 13 +- |
| include/acpi/actbl2.h | 17 +- |
| include/acpi/actypes.h | 11 +- |
| include/acpi/platform/acenvex.h | 3 + |
| include/acpi/platform/acmsvcex.h | 54 ++ |
| include/acpi/platform/acwinex.h | 49 ++ |
| include/acpi/processor.h | 5 +- |
| include/linux/acpi.h | 4 - |
| include/linux/device.h | 2 + |
| include/linux/klist.h | 1 + |
| include/linux/pm_domain.h | 7 - |
| include/linux/pm_qos.h | 5 + |
| include/linux/pm_runtime.h | 6 - |
| kernel/power/Kconfig | 10 + |
| kernel/power/suspend.c | 2 + |
| kernel/power/wakelock.c | 18 +- |
| lib/klist.c | 41 + |
| tools/power/acpi/Makefile | 168 +--- |
| tools/power/acpi/Makefile.config | 92 +++ |
| tools/power/acpi/Makefile.rules | 37 + |
| tools/power/acpi/tools/acpidump/Makefile | 53 ++ |
| tools/power/acpi/tools/ec/Makefile | 33 +- |
| tools/power/cpupower/utils/cpufreq-set.c | 4 + |
| 146 files changed, 5342 insertions(+), 2648 deletions(-) |
| create mode 100644 drivers/acpi/acpica/dsdebug.c |
| create mode 100644 drivers/acpi/acpica/utnonansi.c |
| create mode 100644 drivers/acpi/device_sysfs.c |
| create mode 100644 drivers/dma/idma64.c |
| create mode 100644 drivers/dma/idma64.h |
| create mode 100644 drivers/mfd/intel-lpss-acpi.c |
| create mode 100644 drivers/mfd/intel-lpss-pci.c |
| create mode 100644 drivers/mfd/intel-lpss.c |
| create mode 100644 drivers/mfd/intel-lpss.h |
| create mode 100644 include/acpi/platform/acmsvcex.h |
| create mode 100644 include/acpi/platform/acwinex.h |
| create mode 100644 tools/power/acpi/Makefile.config |
| create mode 100644 tools/power/acpi/Makefile.rules |
| create mode 100644 tools/power/acpi/tools/acpidump/Makefile |
| Merging idle/next (a576d08d4eb2 Merge branches 'cpuidle' and 'turbostat' into release) |
| $ git merge idle/next |
| Merge made by the 'recursive' strategy. |
| drivers/idle/intel_idle.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) |
| $ git merge apm/for-next |
| Already up-to-date. |
| Merging thermal/next (6ce87b2a60f1 Merge branches 'for-rc' and 'release' of .git into next) |
| $ git merge thermal/next |
| Auto-merging drivers/acpi/thermal.c |
| Merge made by the 'recursive' strategy. |
| Documentation/thermal/sysfs-api.txt | 6 + |
| drivers/acpi/thermal.c | 12 +- |
| drivers/hwmon/lm75.c | 2 +- |
| drivers/hwmon/ntc_thermistor.c | 2 +- |
| drivers/hwmon/tmp102.c | 2 +- |
| drivers/input/touchscreen/sun4i-ts.c | 8 +- |
| drivers/platform/x86/acerhdf.c | 9 +- |
| drivers/platform/x86/intel_mid_thermal.c | 9 +- |
| drivers/power/charger-manager.c | 2 +- |
| drivers/power/power_supply_core.c | 2 +- |
| drivers/thermal/Kconfig | 8 + |
| drivers/thermal/Makefile | 1 + |
| drivers/thermal/armada_thermal.c | 2 +- |
| drivers/thermal/db8500_thermal.c | 7 +- |
| drivers/thermal/dove_thermal.c | 2 +- |
| drivers/thermal/fair_share.c | 2 +- |
| drivers/thermal/gov_bang_bang.c | 5 +- |
| drivers/thermal/hisi_thermal.c | 5 +- |
| drivers/thermal/imx_thermal.c | 27 +- |
| drivers/thermal/int340x_thermal/int3400_thermal.c | 2 +- |
| .../thermal/int340x_thermal/int340x_thermal_zone.c | 10 +- |
| .../thermal/int340x_thermal/int340x_thermal_zone.h | 8 +- |
| .../int340x_thermal/processor_thermal_device.c | 4 +- |
| drivers/thermal/intel_pch_thermal.c | 286 +++++++++++++++++++++ |
| drivers/thermal/intel_powerclamp.c | 3 + |
| drivers/thermal/intel_quark_dts_thermal.c | 13 +- |
| drivers/thermal/intel_soc_dts_iosf.c | 8 +- |
| drivers/thermal/kirkwood_thermal.c | 2 +- |
| drivers/thermal/of-thermal.c | 14 +- |
| drivers/thermal/power_allocator.c | 42 +-- |
| drivers/thermal/qcom-spmi-temp-alarm.c | 2 +- |
| drivers/thermal/rcar_thermal.c | 7 +- |
| drivers/thermal/rockchip_thermal.c | 10 +- |
| drivers/thermal/samsung/Kconfig | 2 +- |
| drivers/thermal/samsung/exynos_tmu.c | 28 +- |
| drivers/thermal/spear_thermal.c | 2 +- |
| drivers/thermal/st/st_thermal.c | 5 +- |
| drivers/thermal/step_wise.c | 4 +- |
| drivers/thermal/tegra_soctherm.c | 4 +- |
| drivers/thermal/thermal_core.c | 110 ++++---- |
| drivers/thermal/thermal_hwmon.c | 10 +- |
| drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 10 +- |
| drivers/thermal/x86_pkg_temp_thermal.c | 10 +- |
| include/linux/thermal.h | 26 +- |
| include/trace/events/thermal_power_allocator.h | 6 +- |
| 45 files changed, 529 insertions(+), 212 deletions(-) |
| create mode 100644 drivers/thermal/intel_pch_thermal.c |
| Merging thermal-soc/next (3c19d237dd81 thermal: exynos: Remove unused code related to platform_data on probe()) |
| $ git merge thermal-soc/next |
| Already up-to-date. |
| Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs) |
| $ git merge ieee1394/for-next |
| Already up-to-date. |
| Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks) |
| $ git merge dlm/next |
| Already up-to-date. |
| Merging swiotlb/linux-next (023600f192be swiotlb: do not export map_single function) |
| $ git merge swiotlb/linux-next |
| Already up-to-date. |
| Merging slave-dma/next (002dbe1344da Merge branches 'topic/at_xdmac', 'topic/ti-xbar' and 'topic/zxdma' into next) |
| $ git merge slave-dma/next |
| Auto-merging drivers/dma/Makefile |
| Auto-merging drivers/dma/Kconfig |
| Merge made by the 'recursive' strategy. |
| Documentation/devicetree/bindings/dma/zxdma.txt | 38 ++ |
| drivers/dma/Kconfig | 7 + |
| drivers/dma/Makefile | 1 + |
| drivers/dma/at_hdmac.c | 6 +- |
| drivers/dma/at_xdmac.c | 12 +- |
| drivers/dma/hsu/hsu.c | 39 +- |
| drivers/dma/hsu/hsu.h | 1 - |
| drivers/dma/imx-dma.c | 23 +- |
| drivers/dma/ioat/dma_v3.c | 3 + |
| drivers/dma/ioat/pci.c | 34 + |
| drivers/dma/ipu/ipu_irq.c | 14 +- |
| drivers/dma/pch_dma.c | 4 - |
| drivers/dma/ti-dma-crossbar.c | 34 +- |
| drivers/dma/timb_dma.c | 4 - |
| drivers/dma/zx296702_dma.c | 874 ++++++++++++++++++++++++ |
| drivers/gpu/ipu-v3/ipu-common.c | 4 +- |
| 16 files changed, 1020 insertions(+), 78 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/dma/zxdma.txt |
| create mode 100644 drivers/dma/zx296702_dma.c |
| Merging net-next/master (d1b22e4d8e57 Merge branch 'cxgb4-next') |
| $ git merge net-next/master |
| Auto-merging net/sched/act_mirred.c |
| Removing net/openvswitch/vport-vxlan.h |
| Auto-merging net/openvswitch/actions.c |
| Auto-merging drivers/net/ethernet/rocker/rocker.c |
| Auto-merging MAINTAINERS |
| Merge made by the 'recursive' strategy. |
| Documentation/devicetree/bindings/net/ethernet.txt | 4 + |
| .../devicetree/bindings/net/keystone-netcp.txt | 6 +- |
| .../bindings/net/snps,dwc-qos-ethernet.txt | 75 + |
| Documentation/networking/ip-sysctl.txt | 40 +- |
| Documentation/networking/stmmac.txt | 14 +- |
| Documentation/networking/switchdev.txt | 14 +- |
| Documentation/networking/timestamping.txt | 7 + |
| MAINTAINERS | 18 +- |
| arch/arm/net/bpf_jit_32.c | 41 +- |
| arch/arm/net/bpf_jit_32.h | 3 + |
| arch/s390/net/bpf_jit.h | 5 +- |
| arch/s390/net/bpf_jit_comp.c | 89 +- |
| arch/sparc/net/bpf_jit_comp.c | 2 +- |
| arch/x86/net/bpf_jit_comp.c | 82 +- |
| drivers/bcma/main.c | 12 + |
| drivers/bluetooth/Kconfig | 1 + |
| drivers/bluetooth/bfusb.c | 2 +- |
| drivers/bluetooth/bt3c_cs.c | 2 +- |
| drivers/bluetooth/btbcm.c | 8 +- |
| drivers/bluetooth/btintel.c | 80 + |
| drivers/bluetooth/btintel.h | 19 + |
| drivers/bluetooth/btmrvl_drv.h | 6 +- |
| drivers/bluetooth/btusb.c | 94 +- |
| drivers/bluetooth/dtl1_cs.c | 6 +- |
| drivers/bluetooth/hci_h5.c | 2 +- |
| drivers/bluetooth/hci_intel.c | 561 ++++ |
| drivers/bluetooth/hci_ldisc.c | 8 +- |
| drivers/bluetooth/hci_uart.h | 5 + |
| drivers/infiniband/hw/mlx4/cq.c | 2 +- |
| drivers/net/bonding/bond_3ad.c | 2 - |
| drivers/net/bonding/bond_main.c | 2 - |
| drivers/net/bonding/bond_netlink.c | 17 +- |
| drivers/net/bonding/bond_options.c | 7 + |
| drivers/net/bonding/bond_sysfs.c | 20 +- |
| drivers/net/dsa/Kconfig | 6 +- |
| drivers/net/dsa/bcm_sf2.c | 18 +- |
| drivers/net/dsa/mv88e6352.c | 85 +- |
| drivers/net/dsa/mv88e6xxx.c | 223 +- |
| drivers/net/dsa/mv88e6xxx.h | 13 +- |
| drivers/net/ethernet/Kconfig | 1 + |
| drivers/net/ethernet/Makefile | 1 + |
| drivers/net/ethernet/broadcom/bcmsysport.c | 18 + |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 57 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 98 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 57 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 12 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h | 10 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h | 10 +- |
| .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 18 +- |
| .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 6 +- |
| .../ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h | 2 + |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 185 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 4 +- |
| .../net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h | 4 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 254 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 10 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 388 ++- |
| .../net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h | 4 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 79 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 325 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 77 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 358 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 58 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 4 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h | 4 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 212 +- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 37 +- |
| drivers/net/ethernet/broadcom/genet/bcmgenet.c | 79 +- |
| drivers/net/ethernet/broadcom/genet/bcmgenet.h | 5 +- |
| drivers/net/ethernet/broadcom/genet/bcmmii.c | 111 +- |
| drivers/net/ethernet/cadence/macb.c | 6 +- |
| drivers/net/ethernet/cadence/macb.h | 2 +- |
| drivers/net/ethernet/cavium/Kconfig | 2 + |
| drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 1 + |
| drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 42 +- |
| drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 341 +- |
| drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 14 + |
| drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 36 +- |
| drivers/net/ethernet/chelsio/cxgb4/l2t.c | 94 +- |
| drivers/net/ethernet/chelsio/cxgb4/l2t.h | 18 +- |
| drivers/net/ethernet/chelsio/cxgb4/sge.c | 14 +- |
| drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 177 +- |
| drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 1 - |
| drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 3 + |
| drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 18 + |
| drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 136 +- |
| drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 30 +- |
| drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 3 +- |
| drivers/net/ethernet/cisco/enic/enic_ethtool.c | 113 +- |
| drivers/net/ethernet/cisco/enic/enic_main.c | 135 +- |
| drivers/net/ethernet/ec_bhf.c | 14 +- |
| drivers/net/ethernet/emulex/benet/be.h | 7 +- |
| drivers/net/ethernet/emulex/benet/be_cmds.c | 71 +- |
| drivers/net/ethernet/emulex/benet/be_cmds.h | 11 +- |
| drivers/net/ethernet/emulex/benet/be_ethtool.c | 17 +- |
| drivers/net/ethernet/emulex/benet/be_main.c | 69 +- |
| drivers/net/ethernet/freescale/fec_ptp.c | 6 - |
| drivers/net/ethernet/freescale/gianfar.c | 502 +-- |
| drivers/net/ethernet/freescale/gianfar.h | 77 +- |
| drivers/net/ethernet/freescale/gianfar_ethtool.c | 4 +- |
| drivers/net/ethernet/hisilicon/hip04_eth.c | 1 - |
| drivers/net/ethernet/hisilicon/hip04_mdio.c | 1 - |
| drivers/net/ethernet/ibm/ibmveth.c | 145 +- |
| drivers/net/ethernet/ibm/ibmveth.h | 18 +- |
| drivers/net/ethernet/intel/e1000e/netdev.c | 1 + |
| drivers/net/ethernet/intel/i40e/i40e.h | 56 +- |
| drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 24 +- |
| drivers/net/ethernet/intel/i40e/i40e_common.c | 234 +- |
| drivers/net/ethernet/intel/i40e/i40e_dcb.h | 8 +- |
| drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 2 +- |
| drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 10 +- |
| drivers/net/ethernet/intel/i40e/i40e_diag.c | 11 +- |
| drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 97 +- |
| drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 12 +- |
| drivers/net/ethernet/intel/i40e/i40e_fcoe.h | 4 +- |
| drivers/net/ethernet/intel/i40e/i40e_hmc.c | 67 +- |
| drivers/net/ethernet/intel/i40e/i40e_hmc.h | 10 +- |
| drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 18 +- |
| drivers/net/ethernet/intel/i40e/i40e_main.c | 516 +-- |
| drivers/net/ethernet/intel/i40e/i40e_nvm.c | 6 +- |
| drivers/net/ethernet/intel/i40e/i40e_prototype.h | 2 + |
| drivers/net/ethernet/intel/i40e/i40e_ptp.c | 7 +- |
| drivers/net/ethernet/intel/i40e/i40e_txrx.c | 187 +- |
| drivers/net/ethernet/intel/i40e/i40e_txrx.h | 44 +- |
| drivers/net/ethernet/intel/i40e/i40e_type.h | 37 +- |
| drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 16 +- |
| drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 69 +- |
| drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 5 + |
| .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 18 +- |
| drivers/net/ethernet/intel/i40evf/i40e_common.c | 206 ++ |
| drivers/net/ethernet/intel/i40evf/i40e_hmc.h | 10 +- |
| drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 2 + |
| drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 148 +- |
| drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 42 +- |
| drivers/net/ethernet/intel/i40evf/i40e_type.h | 37 +- |
| drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 16 +- |
| drivers/net/ethernet/intel/i40evf/i40evf.h | 51 +- |
| drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 44 +- |
| drivers/net/ethernet/intel/i40evf/i40evf_main.c | 143 +- |
| .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 51 +- |
| drivers/net/ethernet/intel/igb/e1000_82575.c | 18 +- |
| drivers/net/ethernet/intel/igb/e1000_phy.c | 16 +- |
| drivers/net/ethernet/intel/igb/igb_ethtool.c | 25 +- |
| drivers/net/ethernet/intel/igb/igb_main.c | 98 +- |
| drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 - |
| drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 8 - |
| drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 25 +- |
| drivers/net/ethernet/intel/ixgbevf/defines.h | 12 + |
| drivers/net/ethernet/intel/ixgbevf/ethtool.c | 51 +- |
| drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 9 +- |
| drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 114 +- |
| drivers/net/ethernet/marvell/mvneta.c | 9 +- |
| drivers/net/ethernet/mellanox/Kconfig | 1 + |
| drivers/net/ethernet/mellanox/Makefile | 1 + |
| drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 51 +- |
| drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 46 + |
| drivers/net/ethernet/mellanox/mlx4/en_rx.c | 30 +- |
| drivers/net/ethernet/mellanox/mlx4/en_tx.c | 13 +- |
| drivers/net/ethernet/mellanox/mlx4/fw.c | 82 + |
| drivers/net/ethernet/mellanox/mlx4/fw.h | 1 + |
| drivers/net/ethernet/mellanox/mlx4/main.c | 35 +- |
| drivers/net/ethernet/mellanox/mlx4/mlx4.h | 3 + |
| drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 + |
| drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 48 +- |
| drivers/net/ethernet/mellanox/mlx5/core/en.h | 50 +- |
| .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 139 +- |
| .../ethernet/mellanox/mlx5/core/en_flow_table.c | 258 +- |
| drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 253 +- |
| drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 34 +- |
| drivers/net/ethernet/mellanox/mlx5/core/main.c | 32 +- |
| .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 7 +- |
| drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 29 + |
| drivers/net/ethernet/mellanox/mlx5/core/transobj.h | 4 + |
| drivers/net/ethernet/mellanox/mlx5/core/uar.c | 6 + |
| drivers/net/ethernet/mellanox/mlx5/core/wq.c | 12 +- |
| drivers/net/ethernet/mellanox/mlx5/core/wq.h | 3 +- |
| drivers/net/ethernet/mellanox/mlxsw/Kconfig | 32 + |
| drivers/net/ethernet/mellanox/mlxsw/Makefile | 6 + |
| drivers/net/ethernet/mellanox/mlxsw/cmd.h | 1090 ++++++ |
| drivers/net/ethernet/mellanox/mlxsw/core.c | 1286 +++++++ |
| drivers/net/ethernet/mellanox/mlxsw/core.h | 202 ++ |
| drivers/net/ethernet/mellanox/mlxsw/emad.h | 127 + |
| drivers/net/ethernet/mellanox/mlxsw/item.h | 405 +++ |
| drivers/net/ethernet/mellanox/mlxsw/pci.c | 1794 ++++++++++ |
| drivers/net/ethernet/mellanox/mlxsw/pci.h | 221 ++ |
| drivers/net/ethernet/mellanox/mlxsw/port.h | 75 + |
| drivers/net/ethernet/mellanox/mlxsw/reg.h | 1289 +++++++ |
| drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 1552 +++++++++ |
| drivers/net/ethernet/mellanox/mlxsw/trap.h | 66 + |
| drivers/net/ethernet/mellanox/mlxsw/txheader.h | 80 + |
| drivers/net/ethernet/neterion/s2io.c | 26 +- |
| drivers/net/ethernet/neterion/s2io.h | 2 - |
| drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 - |
| drivers/net/ethernet/renesas/ravb.h | 5 +- |
| drivers/net/ethernet/renesas/ravb_main.c | 116 +- |
| drivers/net/ethernet/rocker/rocker.c | 158 +- |
| drivers/net/ethernet/rocker/rocker.h | 2 + |
| drivers/net/ethernet/sfc/ef10.c | 519 ++- |
| drivers/net/ethernet/sfc/mcdi.c | 28 +- |
| drivers/net/ethernet/sfc/mcdi.h | 3 +- |
| drivers/net/ethernet/sfc/mcdi_pcol.h | 3463 ++++++++++++++----- |
| drivers/net/ethernet/sfc/net_driver.h | 2 + |
| drivers/net/ethernet/sfc/nic.h | 2 + |
| drivers/net/ethernet/sfc/selftest.c | 14 +- |
| drivers/net/ethernet/sfc/siena.c | 6 +- |
| .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 42 +- |
| .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 50 +- |
| .../net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c | 59 +- |
| drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 31 +- |
| drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 73 +- |
| .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 78 +- |
| drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 83 +- |
| drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 95 +- |
| .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 138 +- |
| .../net/ethernet/stmicro/stmmac/stmmac_platform.h | 9 +- |
| drivers/net/ethernet/synopsys/Kconfig | 27 + |
| drivers/net/ethernet/synopsys/Makefile | 5 + |
| drivers/net/ethernet/synopsys/dwc_eth_qos.c | 3019 +++++++++++++++++ |
| drivers/net/ethernet/ti/netcp_core.c | 16 +- |
| drivers/net/ethernet/ti/netcp_ethss.c | 401 ++- |
| drivers/net/hyperv/hyperv_net.h | 32 + |
| drivers/net/hyperv/netvsc.c | 43 +- |
| drivers/net/hyperv/netvsc_drv.c | 61 +- |
| drivers/net/hyperv/rndis_filter.c | 30 +- |
| drivers/net/ieee802154/at86rf230.c | 4 +- |
| drivers/net/ieee802154/cc2520.c | 1 - |
| drivers/net/ieee802154/mrf24j40.c | 1 - |
| drivers/net/ifb.c | 207 +- |
| drivers/net/macvlan.c | 1 + |
| drivers/net/phy/Kconfig | 20 +- |
| drivers/net/phy/Makefile | 2 + |
| drivers/net/phy/aquantia.c | 152 + |
| drivers/net/phy/dp83640.c | 10 +- |
| drivers/net/phy/dp83867.c | 6 +- |
| drivers/net/phy/fixed_phy.c | 8 +- |
| drivers/net/phy/marvell.c | 42 +- |
| drivers/net/phy/mdio-octeon.c | 136 +- |
| drivers/net/phy/phy.c | 3 + |
| drivers/net/phy/spi_ks8995.c | 22 - |
| drivers/net/phy/teranetics.c | 135 + |
| drivers/net/tun.c | 1 + |
| drivers/net/usb/Kconfig | 10 + |
| drivers/net/usb/Makefile | 1 + |
| drivers/net/usb/lan78xx.c | 3530 ++++++++++++++++++++ |
| drivers/net/usb/lan78xx.h | 1069 ++++++ |
| drivers/net/usb/qmi_wwan.c | 1 + |
| drivers/net/usb/r8152.c | 23 +- |
| drivers/net/veth.c | 1 + |
| drivers/net/virtio_net.c | 4 +- |
| drivers/net/vxlan.c | 681 ++-- |
| drivers/net/wireless/ath/ath10k/Makefile | 3 +- |
| drivers/net/wireless/ath/ath10k/bmi.h | 2 +- |
| drivers/net/wireless/ath/ath10k/ce.c | 1 + |
| drivers/net/wireless/ath/ath10k/ce.h | 17 +- |
| drivers/net/wireless/ath/ath10k/core.c | 111 +- |
| drivers/net/wireless/ath/ath10k/core.h | 26 +- |
| drivers/net/wireless/ath/ath10k/debug.c | 10 +- |
| drivers/net/wireless/ath/ath10k/htt.c | 45 + |
| drivers/net/wireless/ath/ath10k/htt.h | 47 + |
| drivers/net/wireless/ath/ath10k/htt_rx.c | 6 +- |
| drivers/net/wireless/ath/ath10k/htt_tx.c | 76 +- |
| drivers/net/wireless/ath/ath10k/hw.c | 86 +- |
| drivers/net/wireless/ath/ath10k/hw.h | 124 +- |
| drivers/net/wireless/ath/ath10k/mac.c | 159 +- |
| drivers/net/wireless/ath/ath10k/mac.h | 6 +- |
| drivers/net/wireless/ath/ath10k/pci.c | 193 +- |
| drivers/net/wireless/ath/ath10k/pci.h | 13 +- |
| drivers/net/wireless/ath/ath10k/swap.c | 208 ++ |
| drivers/net/wireless/ath/ath10k/swap.h | 72 + |
| drivers/net/wireless/ath/ath10k/targaddrs.h | 3 + |
| drivers/net/wireless/ath/ath10k/txrx.c | 6 +- |
| drivers/net/wireless/ath/ath10k/wmi-tlv.c | 142 +- |
| drivers/net/wireless/ath/ath10k/wmi.c | 1104 +++++- |
| drivers/net/wireless/ath/ath10k/wmi.h | 949 +++++- |
| drivers/net/wireless/ath/ath9k/ar9003_phy.h | 25 +- |
| drivers/net/wireless/ath/ath9k/debug.c | 2 + |
| drivers/net/wireless/ath/ath9k/debug.h | 2 + |
| drivers/net/wireless/ath/ath9k/dfs.c | 170 +- |
| drivers/net/wireless/ath/ath9k/recv.c | 7 +- |
| drivers/net/wireless/ath/ath9k/xmit.c | 11 +- |
| drivers/net/wireless/ath/dfs_pri_detector.c | 2 +- |
| drivers/net/wireless/ath/wil6210/cfg80211.c | 217 +- |
| drivers/net/wireless/ath/wil6210/wil6210.h | 2 + |
| drivers/net/wireless/b43/lo.c | 4 +- |
| drivers/net/wireless/b43/lo.h | 2 +- |
| drivers/net/wireless/b43/phy_g.c | 2 +- |
| drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 14 + |
| drivers/net/wireless/brcm80211/brcmfmac/core.h | 3 + |
| .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 4 +- |
| drivers/net/wireless/cw1200/cw1200_spi.c | 1 - |
| drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- |
| drivers/net/wireless/iwlegacy/3945-mac.c | 2 +- |
| drivers/net/wireless/iwlegacy/debug.c | 8 +- |
| drivers/net/wireless/mwifiex/cfg80211.c | 130 +- |
| drivers/net/wireless/mwifiex/decl.h | 3 + |
| drivers/net/wireless/mwifiex/fw.h | 93 +- |
| drivers/net/wireless/mwifiex/ie.c | 3 + |
| drivers/net/wireless/mwifiex/init.c | 3 +- |
| drivers/net/wireless/mwifiex/join.c | 2 + |
| drivers/net/wireless/mwifiex/main.c | 63 +- |
| drivers/net/wireless/mwifiex/main.h | 38 + |
| drivers/net/wireless/mwifiex/scan.c | 14 + |
| drivers/net/wireless/mwifiex/sta_cmd.c | 90 +- |
| drivers/net/wireless/mwifiex/sta_cmdresp.c | 5 + |
| drivers/net/wireless/mwifiex/sta_event.c | 207 +- |
| drivers/net/wireless/mwifiex/tdls.c | 78 +- |
| drivers/net/wireless/mwifiex/txrx.c | 22 +- |
| drivers/net/wireless/mwifiex/uap_cmd.c | 7 +- |
| drivers/net/wireless/mwifiex/uap_event.c | 13 + |
| drivers/net/wireless/mwifiex/usb.c | 6 +- |
| drivers/net/wireless/mwifiex/util.c | 59 + |
| drivers/net/wireless/mwifiex/wmm.c | 156 +- |
| drivers/net/wireless/mwifiex/wmm.h | 8 + |
| drivers/net/wireless/rtlwifi/rtl8192cu/def.h | 9 - |
| drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 16 +- |
| drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 12 - |
| drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 4 +- |
| drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 2 +- |
| drivers/net/wireless/rtlwifi/rtl8821ae/reg.h | 1 + |
| drivers/net/wireless/ti/wlcore/rx.c | 3 +- |
| drivers/net/wireless/ti/wlcore/rx.h | 3 + |
| drivers/net/wireless/ti/wlcore/sdio.c | 3 +- |
| drivers/net/xen-netback/common.h | 3 - |
| drivers/of/of_mdio.c | 19 +- |
| include/linux/bpf.h | 2 + |
| include/linux/filter.h | 17 +- |
| include/linux/ipv6.h | 4 +- |
| include/linux/mlx4/cq.h | 3 +- |
| include/linux/mlx4/device.h | 5 + |
| include/linux/mlx4/qp.h | 3 +- |
| include/linux/mlx5/driver.h | 12 +- |
| include/linux/mlx5/mlx5_ifc.h | 6 +- |
| include/linux/mpls_iptunnel.h | 6 + |
| include/linux/netdevice.h | 27 + |
| include/linux/phy.h | 2 + |
| include/linux/skbuff.h | 37 +- |
| include/linux/stmmac.h | 22 - |
| include/net/act_api.h | 15 +- |
| include/net/addrconf.h | 4 +- |
| include/net/bluetooth/hci_core.h | 2 +- |
| include/net/bluetooth/l2cap.h | 2 + |
| include/net/bond_options.h | 1 + |
| include/net/cfg802154.h | 2 + |
| include/net/cls_cgroup.h | 29 + |
| include/net/dst.h | 6 +- |
| include/net/dst_metadata.h | 56 + |
| include/net/fib_rules.h | 1 + |
| include/net/flow.h | 8 + |
| include/net/inet_hashtables.h | 4 +- |
| include/net/inet_timewait_sock.h | 8 +- |
| include/net/ip.h | 16 - |
| include/net/ip6_fib.h | 3 + |
| include/net/ip_fib.h | 5 +- |
| include/net/ip_tunnels.h | 112 +- |
| include/net/ipv6.h | 76 +- |
| include/net/lwtunnel.h | 147 + |
| include/net/mac802154.h | 17 - |
| include/net/mpls_iptunnel.h | 29 + |
| include/net/netns/ipv6.h | 1 + |
| include/net/route.h | 1 + |
| include/net/rtnetlink.h | 1 + |
| include/net/sch_generic.h | 31 +- |
| include/net/sock.h | 18 + |
| include/net/switchdev.h | 9 + |
| include/net/tc_act/tc_gact.h | 7 +- |
| include/net/tc_act/tc_mirred.h | 2 +- |
| include/net/tcp.h | 7 +- |
| include/net/timewait_sock.h | 3 - |
| include/net/vxlan.h | 85 +- |
| include/uapi/linux/Kbuild | 1 + |
| include/uapi/linux/bpf.h | 27 + |
| include/uapi/linux/ethtool.h | 5 + |
| include/uapi/linux/fib_rules.h | 2 +- |
| include/uapi/linux/if_bridge.h | 1 + |
| include/uapi/linux/if_link.h | 4 + |
| include/uapi/linux/ipv6.h | 2 + |
| include/uapi/linux/lwtunnel.h | 16 + |
| include/uapi/linux/mpls.h | 2 + |
| include/uapi/linux/mpls_iptunnel.h | 28 + |
| include/uapi/linux/openvswitch.h | 2 +- |
| include/uapi/linux/rtnetlink.h | 17 + |
| include/uapi/linux/snmp.h | 2 + |
| kernel/bpf/core.c | 7 +- |
| kernel/bpf/verifier.c | 6 +- |
| lib/test_bpf.c | 106 +- |
| lib/test_rhashtable.c | 7 + |
| net/6lowpan/iphc.c | 2 + |
| net/Kconfig | 7 + |
| net/atm/br2684.c | 9 +- |
| net/bluetooth/6lowpan.c | 23 +- |
| net/bluetooth/Kconfig | 5 + |
| net/bluetooth/Makefile | 3 +- |
| net/bluetooth/a2mp.c | 17 +- |
| net/bluetooth/a2mp.h | 19 + |
| net/bluetooth/amp.c | 134 +- |
| net/bluetooth/amp.h | 14 + |
| net/bluetooth/cmtp/capi.c | 8 +- |
| net/bluetooth/hci_core.c | 11 - |
| net/bluetooth/hci_event.c | 157 +- |
| net/bluetooth/l2cap_sock.c | 41 +- |
| net/bluetooth/mgmt.c | 23 + |
| net/bridge/br_device.c | 1 + |
| net/bridge/br_if.c | 1 + |
| net/bridge/br_mdb.c | 144 +- |
| net/bridge/br_multicast.c | 44 +- |
| net/bridge/br_netlink.c | 2 - |
| net/bridge/br_private.h | 9 +- |
| net/core/Makefile | 1 + |
| net/core/dev.c | 40 +- |
| net/core/dst.c | 107 +- |
| net/core/fib_rules.c | 24 +- |
| net/core/filter.c | 149 + |
| net/core/flow_dissector.c | 58 +- |
| net/core/lwtunnel.c | 243 ++ |
| net/core/net-sysfs.c | 14 + |
| net/core/pktgen.c | 5 +- |
| net/core/rtnetlink.c | 42 +- |
| net/core/timestamping.c | 6 +- |
| net/dsa/dsa_priv.h | 8 +- |
| net/dsa/slave.c | 94 +- |
| net/dsa/tag_brcm.c | 15 +- |
| net/dsa/tag_dsa.c | 12 +- |
| net/dsa/tag_edsa.c | 12 +- |
| net/dsa/tag_trailer.c | 12 +- |
| net/ieee802154/rdev-ops.h | 20 + |
| net/ieee802154/sysfs.c | 38 + |
| net/ieee802154/trace.h | 22 + |
| net/ipv4/af_inet.c | 3 + |
| net/ipv4/arp.c | 65 +- |
| net/ipv4/datagram.c | 2 +- |
| net/ipv4/fib_frontend.c | 10 + |
| net/ipv4/fib_semantics.c | 99 +- |
| net/ipv4/icmp.c | 1 + |
| net/ipv4/inet_hashtables.c | 38 +- |
| net/ipv4/inet_timewait_sock.c | 55 +- |
| net/ipv4/ip_fragment.c | 26 +- |
| net/ipv4/ip_input.c | 3 +- |
| net/ipv4/ip_tunnel_core.c | 121 + |
| net/ipv4/ping.c | 3 +- |
| net/ipv4/proc.c | 2 + |
| net/ipv4/route.c | 28 +- |
| net/ipv4/tcp_bic.c | 2 +- |
| net/ipv4/tcp_cdg.c | 2 +- |
| net/ipv4/tcp_cong.c | 6 +- |
| net/ipv4/tcp_cubic.c | 4 +- |
| net/ipv4/tcp_highspeed.c | 2 +- |
| net/ipv4/tcp_htcp.c | 2 +- |
| net/ipv4/tcp_hybla.c | 2 +- |
| net/ipv4/tcp_illinois.c | 2 +- |
| net/ipv4/tcp_input.c | 64 +- |
| net/ipv4/tcp_ipv4.c | 7 +- |
| net/ipv4/tcp_metrics.c | 2 +- |
| net/ipv4/tcp_minisocks.c | 6 +- |
| net/ipv4/tcp_output.c | 8 +- |
| net/ipv4/tcp_scalable.c | 2 +- |
| net/ipv4/tcp_timer.c | 1 - |
| net/ipv4/tcp_vegas.c | 6 +- |
| net/ipv4/tcp_veno.c | 2 +- |
| net/ipv6/Kconfig | 11 +- |
| net/ipv6/addrconf.c | 233 +- |
| net/ipv6/addrconf_core.c | 11 +- |
| net/ipv6/af_inet6.c | 12 +- |
| net/ipv6/datagram.c | 10 +- |
| net/ipv6/exthdrs.c | 2 +- |
| net/ipv6/icmp.c | 6 +- |
| net/ipv6/inet6_hashtables.c | 9 +- |
| net/ipv6/ip6_fib.c | 2 + |
| net/ipv6/ip6_gre.c | 5 +- |
| net/ipv6/ip6_input.c | 5 +- |
| net/ipv6/ip6_output.c | 18 +- |
| net/ipv6/ip6_tunnel.c | 2 +- |
| net/ipv6/ndisc.c | 16 +- |
| net/ipv6/raw.c | 3 +- |
| net/ipv6/route.c | 77 +- |
| net/ipv6/sysctl_net_ipv6.c | 15 +- |
| net/ipv6/tcp_ipv6.c | 7 +- |
| net/mac802154/cfg.c | 54 +- |
| net/mac802154/ieee802154_i.h | 11 +- |
| net/mac802154/iface.c | 14 +- |
| net/mac802154/main.c | 10 +- |
| net/mac802154/rx.c | 14 +- |
| net/mac802154/tx.c | 27 +- |
| net/mac802154/util.c | 8 + |
| net/mpls/Kconfig | 8 +- |
| net/mpls/Makefile | 1 + |
| net/mpls/af_mpls.c | 128 +- |
| net/mpls/internal.h | 9 +- |
| net/mpls/mpls_iptunnel.c | 233 ++ |
| net/netfilter/nft_meta.c | 4 + |
| net/netfilter/xt_TPROXY.c | 6 +- |
| net/openvswitch/Makefile | 2 +- |
| net/openvswitch/actions.c | 12 +- |
| net/openvswitch/datapath.c | 19 +- |
| net/openvswitch/datapath.h | 5 +- |
| net/openvswitch/dp_notify.c | 5 +- |
| net/openvswitch/flow.c | 4 +- |
| net/openvswitch/flow.h | 79 +- |
| net/openvswitch/flow_netlink.c | 84 +- |
| net/openvswitch/flow_netlink.h | 3 +- |
| net/openvswitch/flow_table.c | 4 +- |
| net/openvswitch/vport-geneve.c | 17 +- |
| net/openvswitch/vport-gre.c | 16 +- |
| net/openvswitch/vport-internal_dev.c | 38 +- |
| net/openvswitch/vport-netdev.c | 108 +- |
| net/openvswitch/vport-netdev.h | 16 +- |
| net/openvswitch/vport-vxlan.c | 229 +- |
| net/openvswitch/vport-vxlan.h | 11 - |
| net/openvswitch/vport.c | 34 +- |
| net/openvswitch/vport.h | 21 +- |
| net/packet/af_packet.c | 6 +- |
| net/sched/act_api.c | 44 +- |
| net/sched/act_bpf.c | 53 +- |
| net/sched/act_connmark.c | 3 +- |
| net/sched/act_csum.c | 3 +- |
| net/sched/act_gact.c | 44 +- |
| net/sched/act_ipt.c | 2 +- |
| net/sched/act_mirred.c | 58 +- |
| net/sched/act_nat.c | 3 +- |
| net/sched/act_pedit.c | 3 +- |
| net/sched/act_simple.c | 3 +- |
| net/sched/act_skbedit.c | 3 +- |
| net/sched/act_vlan.c | 3 +- |
| net/sched/cls_cgroup.c | 23 +- |
| net/sched/sch_qfq.c | 1 - |
| net/sctp/protocol.c | 42 +- |
| net/sctp/sm_statefuns.c | 2 +- |
| net/switchdev/switchdev.c | 111 +- |
| net/tipc/bcast.c | 31 +- |
| net/tipc/bcast.h | 1 + |
| net/tipc/bearer.c | 30 +- |
| net/tipc/bearer.h | 3 + |
| net/tipc/core.h | 10 + |
| net/tipc/discover.c | 130 +- |
| net/tipc/link.c | 2030 +++++------ |
| net/tipc/link.h | 109 +- |
| net/tipc/msg.c | 86 +- |
| net/tipc/msg.h | 112 +- |
| net/tipc/name_distr.c | 6 +- |
| net/tipc/node.c | 964 +++++- |
| net/tipc/node.h | 84 +- |
| net/tipc/socket.c | 385 +-- |
| net/tipc/socket.h | 2 +- |
| net/tipc/udp_media.c | 3 +- |
| net/xfrm/xfrm_user.c | 2 +- |
| samples/bpf/bpf_helpers.h | 25 + |
| samples/bpf/test_verifier.c | 59 + |
| samples/bpf/tracex1_kern.c | 2 +- |
| samples/bpf/tracex2_kern.c | 6 +- |
| samples/bpf/tracex3_kern.c | 4 +- |
| samples/bpf/tracex4_kern.c | 6 +- |
| samples/bpf/tracex5_kern.c | 6 +- |
| tools/net/bpf_jit_disasm.c | 109 +- |
| 552 files changed, 39008 insertions(+), 8397 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt |
| create mode 100644 drivers/net/ethernet/mellanox/mlxsw/Kconfig |
| create mode 100644 drivers/net/ethernet/mellanox/mlxsw/Makefile |
| create mode 100644 drivers/net/ethernet/mellanox/mlxsw/cmd.h |
| create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core.c |
| create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core.h |
| create mode 100644 drivers/net/ethernet/mellanox/mlxsw/emad.h |
| create mode 100644 drivers/net/ethernet/mellanox/mlxsw/item.h |
| create mode 100644 drivers/net/ethernet/mellanox/mlxsw/pci.c |
| create mode 100644 drivers/net/ethernet/mellanox/mlxsw/pci.h |
| create mode 100644 drivers/net/ethernet/mellanox/mlxsw/port.h |
| create mode 100644 drivers/net/ethernet/mellanox/mlxsw/reg.h |
| create mode 100644 drivers/net/ethernet/mellanox/mlxsw/switchx2.c |
| create mode 100644 drivers/net/ethernet/mellanox/mlxsw/trap.h |
| create mode 100644 drivers/net/ethernet/mellanox/mlxsw/txheader.h |
| create mode 100644 drivers/net/ethernet/synopsys/Kconfig |
| create mode 100644 drivers/net/ethernet/synopsys/Makefile |
| create mode 100644 drivers/net/ethernet/synopsys/dwc_eth_qos.c |
| create mode 100644 drivers/net/phy/aquantia.c |
| create mode 100644 drivers/net/phy/teranetics.c |
| create mode 100644 drivers/net/usb/lan78xx.c |
| create mode 100644 drivers/net/usb/lan78xx.h |
| create mode 100644 drivers/net/wireless/ath/ath10k/swap.c |
| create mode 100644 drivers/net/wireless/ath/ath10k/swap.h |
| create mode 100644 include/linux/mpls_iptunnel.h |
| create mode 100644 include/net/dst_metadata.h |
| create mode 100644 include/net/lwtunnel.h |
| create mode 100644 include/net/mpls_iptunnel.h |
| create mode 100644 include/uapi/linux/lwtunnel.h |
| create mode 100644 include/uapi/linux/mpls_iptunnel.h |
| create mode 100644 net/core/lwtunnel.c |
| create mode 100644 net/mpls/mpls_iptunnel.c |
| delete mode 100644 net/openvswitch/vport-vxlan.h |
| Merging ipsec-next/master (0b42c2863b3b Merge branch 'arm-bpf-next') |
| $ git merge ipsec-next/master |
| Already up-to-date. |
| Merging wireless-drivers-next/master (360d9bb5ee2d Revert "ath9k: export HW random number generator") |
| $ git merge wireless-drivers-next/master |
| Already up-to-date. |
| Merging bluetooth/master (bea3066afe5d Bluetooth: Fix breakage in amp_write_rem_assoc_frag()) |
| $ git merge bluetooth/master |
| Merge made by the 'recursive' strategy. |
| net/bluetooth/amp.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| Merging rdma/for-next (8e4349d13f33 IB/mad: Add final OPA MAD processing) |
| $ git merge rdma/for-next |
| Already up-to-date. |
| Merging mtd/master (5f867db63473 mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict) |
| $ git merge mtd/master |
| Already up-to-date. |
| Merging l2-mtd/master (43163022927b mtd: m25p80: allow arbitrary OF matching for "jedec,spi-nor") |
| $ git merge l2-mtd/master |
| Merge made by the 'recursive' strategy. |
| drivers/mtd/devices/m25p80.c | 18 ++++---- |
| drivers/mtd/nand/davinci_nand.c | 42 ++++++++++++++----- |
| drivers/mtd/nand/nandsim.c | 28 ++++--------- |
| drivers/mtd/nand/r852.c | 2 +- |
| drivers/mtd/nand/sunxi_nand.c | 88 +++++++++++++++++++++++++++++++++++---- |
| drivers/mtd/spi-nor/fsl-quadspi.c | 34 ++++++++++----- |
| drivers/mtd/spi-nor/spi-nor.c | 10 ++--- |
| 7 files changed, 160 insertions(+), 62 deletions(-) |
| Merging crypto/master (a4198fd4b487 crypto: testmgr - Reenable authenc tests) |
| $ git merge crypto/master |
| Removing drivers/crypto/nx/nx-842-platform.c |
| Removing drivers/crypto/nx/nx-842-crypto.c |
| Auto-merging arch/powerpc/kernel/process.c |
| Auto-merging arch/arm/boot/dts/sun7i-a20.dtsi |
| Auto-merging arch/arm/boot/dts/sun4i-a10.dtsi |
| Auto-merging MAINTAINERS |
| Merge made by the 'recursive' strategy. |
| Documentation/DocBook/crypto-API.tmpl | 4 +- |
| .../devicetree/bindings/crypto/sun4i-ss.txt | 19 + |
| MAINTAINERS | 8 +- |
| arch/arm/boot/dts/sun4i-a10.dtsi | 8 + |
| arch/arm/boot/dts/sun7i-a20.dtsi | 8 + |
| arch/arm/crypto/.gitignore | 2 + |
| arch/arm64/crypto/aes-ce-ccm-glue.c | 69 +- |
| arch/powerpc/include/asm/switch_to.h | 1 + |
| arch/powerpc/kernel/process.c | 3 - |
| arch/x86/crypto/Makefile | 6 + |
| arch/x86/crypto/aesni-intel_glue.c | 56 +- |
| arch/x86/crypto/chacha20-avx2-x86_64.S | 443 +++ |
| arch/x86/crypto/chacha20-ssse3-x86_64.S | 625 +++++ |
| arch/x86/crypto/chacha20_glue.c | 150 + |
| arch/x86/crypto/poly1305-avx2-x86_64.S | 386 +++ |
| arch/x86/crypto/poly1305-sse2-x86_64.S | 582 ++++ |
| arch/x86/crypto/poly1305_glue.c | 207 ++ |
| crypto/Kconfig | 27 + |
| crypto/aead.c | 18 +- |
| crypto/algapi.c | 25 +- |
| crypto/authenc.c | 584 ++-- |
| crypto/ccm.c | 388 +-- |
| crypto/chacha20_generic.c | 28 +- |
| crypto/chacha20poly1305.c | 220 +- |
| crypto/cryptd.c | 23 +- |
| crypto/echainiv.c | 24 +- |
| crypto/gcm.c | 114 +- |
| crypto/jitterentropy-kcapi.c | 2 +- |
| crypto/pcrypt.c | 12 +- |
| crypto/poly1305_generic.c | 73 +- |
| crypto/rsa.c | 26 +- |
| crypto/rsa_helper.c | 4 +- |
| crypto/seqiv.c | 34 +- |
| crypto/tcrypt.c | 89 +- |
| crypto/tcrypt.h | 20 + |
| crypto/testmgr.h | 2948 +++++++++++++++----- |
| drivers/crypto/Kconfig | 17 + |
| drivers/crypto/Makefile | 1 + |
| drivers/crypto/caam/caamalg.c | 2802 ++++++++++--------- |
| drivers/crypto/caam/ctrl.c | 24 +- |
| drivers/crypto/caam/desc_constr.h | 2 +- |
| drivers/crypto/caam/regs.h | 6 + |
| drivers/crypto/ccp/ccp-platform.c | 2 + |
| drivers/crypto/img-hash.c | 2 +- |
| drivers/crypto/ixp4xx_crypto.c | 313 ++- |
| drivers/crypto/marvell/cesa.c | 1 - |
| drivers/crypto/nx/Kconfig | 17 +- |
| drivers/crypto/nx/Makefile | 8 +- |
| drivers/crypto/nx/nx-842-crypto.c | 580 ---- |
| drivers/crypto/nx/nx-842-platform.c | 84 - |
| drivers/crypto/nx/nx-842-powernv.c | 42 +- |
| drivers/crypto/nx/nx-842-pseries.c | 139 +- |
| drivers/crypto/nx/nx-842.c | 554 +++- |
| drivers/crypto/nx/nx-842.h | 65 +- |
| drivers/crypto/nx/nx-aes-ccm.c | 153 +- |
| drivers/crypto/nx/nx-aes-gcm.c | 66 +- |
| drivers/crypto/nx/nx.c | 21 +- |
| drivers/crypto/nx/nx.h | 6 +- |
| drivers/crypto/omap-aes.c | 86 +- |
| drivers/crypto/picoxcell_crypto.c | 678 +++-- |
| drivers/crypto/qat/Kconfig | 2 + |
| drivers/crypto/qat/qat_common/.gitignore | 1 + |
| drivers/crypto/qat/qat_common/Makefile | 5 + |
| drivers/crypto/qat/qat_common/adf_accel_devices.h | 4 +- |
| drivers/crypto/qat/qat_common/adf_accel_engine.c | 42 +- |
| drivers/crypto/qat/qat_common/adf_aer.c | 2 +- |
| drivers/crypto/qat/qat_common/adf_cfg.c | 6 +- |
| drivers/crypto/qat/qat_common/adf_common_drv.h | 12 +- |
| drivers/crypto/qat/qat_common/adf_dev_mgr.c | 9 +- |
| drivers/crypto/qat/qat_common/adf_init.c | 14 +- |
| drivers/crypto/qat/qat_common/adf_transport.c | 2 +- |
| .../qat/qat_common/adf_transport_access_macros.h | 5 +- |
| drivers/crypto/qat/qat_common/icp_qat_fw.h | 2 + |
| drivers/crypto/qat/qat_common/icp_qat_fw_pke.h | 112 + |
| drivers/crypto/qat/qat_common/qat_algs.c | 332 +-- |
| drivers/crypto/qat/qat_common/qat_asym_algs.c | 652 +++++ |
| drivers/crypto/qat/qat_common/qat_crypto.c | 19 +- |
| drivers/crypto/qat/qat_common/qat_crypto.h | 2 - |
| drivers/crypto/qat/qat_common/qat_hal.c | 14 +- |
| drivers/crypto/qat/qat_common/qat_rsakey.asn1 | 5 + |
| drivers/crypto/qat/qat_common/qat_uclo.c | 27 +- |
| .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 8 +- |
| .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 3 + |
| drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 14 +- |
| drivers/crypto/sunxi-ss/Makefile | 2 + |
| drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 542 ++++ |
| drivers/crypto/sunxi-ss/sun4i-ss-core.c | 403 +++ |
| drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 492 ++++ |
| drivers/crypto/sunxi-ss/sun4i-ss.h | 199 ++ |
| drivers/crypto/talitos.c | 606 ++-- |
| drivers/crypto/talitos.h | 7 +- |
| drivers/crypto/vmx/aes.c | 3 + |
| drivers/crypto/vmx/aes_cbc.c | 3 + |
| drivers/crypto/vmx/aes_ctr.c | 3 + |
| drivers/crypto/vmx/ghash.c | 4 + |
| include/crypto/aead.h | 24 + |
| include/crypto/algapi.h | 3 +- |
| include/crypto/chacha20.h | 25 + |
| include/crypto/internal/aead.h | 36 + |
| include/crypto/poly1305.h | 41 + |
| 100 files changed, 11519 insertions(+), 5073 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/crypto/sun4i-ss.txt |
| create mode 100644 arch/x86/crypto/chacha20-avx2-x86_64.S |
| create mode 100644 arch/x86/crypto/chacha20-ssse3-x86_64.S |
| create mode 100644 arch/x86/crypto/chacha20_glue.c |
| create mode 100644 arch/x86/crypto/poly1305-avx2-x86_64.S |
| create mode 100644 arch/x86/crypto/poly1305-sse2-x86_64.S |
| create mode 100644 arch/x86/crypto/poly1305_glue.c |
| delete mode 100644 drivers/crypto/nx/nx-842-crypto.c |
| delete mode 100644 drivers/crypto/nx/nx-842-platform.c |
| create mode 100644 drivers/crypto/qat/qat_common/.gitignore |
| create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_pke.h |
| create mode 100644 drivers/crypto/qat/qat_common/qat_asym_algs.c |
| create mode 100644 drivers/crypto/qat/qat_common/qat_rsakey.asn1 |
| create mode 100644 drivers/crypto/sunxi-ss/Makefile |
| create mode 100644 drivers/crypto/sunxi-ss/sun4i-ss-cipher.c |
| create mode 100644 drivers/crypto/sunxi-ss/sun4i-ss-core.c |
| create mode 100644 drivers/crypto/sunxi-ss/sun4i-ss-hash.c |
| create mode 100644 drivers/crypto/sunxi-ss/sun4i-ss.h |
| create mode 100644 include/crypto/chacha20.h |
| create mode 100644 include/crypto/poly1305.h |
| Merging drm/drm-next (dcd14dd957f0 Merge tag 'topic/connector-locking-2015-07-23' of git://anongit.freedesktop.org/drm-intel into drm-next) |
| $ git merge drm/drm-next |
| Resolved 'drivers/gpu/drm/drm_crtc.c' using previous resolution. |
| Auto-merging include/uapi/drm/i915_drm.h |
| Auto-merging drivers/mfd/Kconfig |
| Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c |
| Auto-merging drivers/gpu/drm/i915/intel_uncore.c |
| Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c |
| Auto-merging drivers/gpu/drm/i915/i915_irq.c |
| Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c |
| Auto-merging drivers/gpu/drm/i915/i915_gem.c |
| Auto-merging drivers/gpu/drm/i915/i915_drv.h |
| Auto-merging drivers/gpu/drm/i915/i915_drv.c |
| Auto-merging drivers/gpu/drm/drm_crtc.c |
| CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c |
| Auto-merging drivers/gpu/drm/drm_atomic_helper.c |
| Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c |
| Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h |
| Auto-merging MAINTAINERS |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master a176ea01b635] Merge remote-tracking branch 'drm/drm-next' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/DocBook/drm.tmpl | 6 +- |
| MAINTAINERS | 5 + |
| arch/x86/configs/x86_64_defconfig | 1 - |
| drivers/char/agp/intel-gtt.c | 4 +- |
| drivers/gpio/gpiolib.c | 13 + |
| drivers/gpu/drm/amd/amdgpu/Makefile | 6 + |
| drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 + |
| drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 267 ++ |
| drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 65 + |
| drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 670 ++++ |
| drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 543 +++ |
| drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 + |
| drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 7 + |
| drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 7 + |
| drivers/gpu/drm/amd/amdgpu/cik.c | 11 +- |
| drivers/gpu/drm/amd/amdgpu/cikd.h | 6 + |
| drivers/gpu/drm/amd/amdgpu/vid.h | 5 + |
| drivers/gpu/drm/amd/amdkfd/Kconfig | 2 +- |
| drivers/gpu/drm/amd/amdkfd/Makefile | 3 +- |
| drivers/gpu/drm/amd/amdkfd/cik_regs.h | 11 - |
| drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 +- |
| .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 12 +- |
| .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 103 +- |
| drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 20 +- |
| drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 249 +- |
| drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 99 +- |
| drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h | 398 ++ |
| drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 5 + |
| drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 + |
| drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 3 +- |
| drivers/gpu/drm/amd/include/vi_structs.h | 417 ++ |
| drivers/gpu/drm/drm_atomic.c | 78 +- |
| drivers/gpu/drm/drm_atomic_helper.c | 18 +- |
| drivers/gpu/drm/drm_context.c | 51 +- |
| drivers/gpu/drm/drm_crtc.c | 219 +- |
| drivers/gpu/drm/drm_crtc_helper.c | 66 +- |
| drivers/gpu/drm/drm_drv.c | 19 +- |
| drivers/gpu/drm/drm_edid.c | 2 +- |
| drivers/gpu/drm/drm_fb_cma_helper.c | 18 +- |
| drivers/gpu/drm/drm_fb_helper.c | 45 +- |
| drivers/gpu/drm/drm_gem.c | 11 +- |
| drivers/gpu/drm/drm_gem_cma_helper.c | 3 - |
| drivers/gpu/drm/drm_ioc32.c | 55 +- |
| drivers/gpu/drm/drm_irq.c | 2 +- |
| drivers/gpu/drm/drm_legacy.h | 2 +- |
| drivers/gpu/drm/drm_lock.c | 6 + |
| drivers/gpu/drm/drm_modeset_lock.c | 7 +- |
| drivers/gpu/drm/drm_of.c | 2 +- |
| drivers/gpu/drm/drm_plane_helper.c | 19 +- |
| drivers/gpu/drm/drm_probe_helper.c | 45 +- |
| drivers/gpu/drm/i915/Kconfig | 9 - |
| drivers/gpu/drm/i915/Makefile | 2 + |
| drivers/gpu/drm/i915/dvo_ivch.c | 63 +- |
| drivers/gpu/drm/i915/i915_cmd_parser.c | 6 +- |
| drivers/gpu/drm/i915/i915_debugfs.c | 285 +- |
| drivers/gpu/drm/i915/i915_dma.c | 32 +- |
| drivers/gpu/drm/i915/i915_drv.c | 50 +- |
| drivers/gpu/drm/i915/i915_drv.h | 244 +- |
| drivers/gpu/drm/i915/i915_gem.c | 415 +- |
| drivers/gpu/drm/i915/i915_gem_context.c | 93 +- |
| drivers/gpu/drm/i915/i915_gem_execbuffer.c | 160 +- |
| drivers/gpu/drm/i915/i915_gem_gtt.c | 732 ++-- |
| drivers/gpu/drm/i915/i915_gem_gtt.h | 64 +- |
| drivers/gpu/drm/i915/i915_gem_render_state.c | 15 +- |
| drivers/gpu/drm/i915/i915_gem_render_state.h | 2 +- |
| drivers/gpu/drm/i915/i915_gem_stolen.c | 171 +- |
| drivers/gpu/drm/i915/i915_ioc32.c | 138 +- |
| drivers/gpu/drm/i915/i915_irq.c | 504 +-- |
| drivers/gpu/drm/i915/i915_params.c | 15 +- |
| drivers/gpu/drm/i915/i915_reg.h | 138 +- |
| drivers/gpu/drm/i915/i915_suspend.c | 2 +- |
| drivers/gpu/drm/i915/i915_sysfs.c | 22 +- |
| drivers/gpu/drm/i915/i915_trace.h | 16 +- |
| drivers/gpu/drm/i915/intel_atomic.c | 249 +- |
| drivers/gpu/drm/i915/intel_atomic_plane.c | 41 +- |
| drivers/gpu/drm/i915/intel_audio.c | 3 +- |
| drivers/gpu/drm/i915/intel_bios.c | 62 +- |
| drivers/gpu/drm/i915/intel_bios.h | 7 + |
| drivers/gpu/drm/i915/intel_csr.c | 6 +- |
| drivers/gpu/drm/i915/intel_ddi.c | 1100 ++++-- |
| drivers/gpu/drm/i915/intel_display.c | 4093 +++++++++++--------- |
| drivers/gpu/drm/i915/intel_dp.c | 254 +- |
| drivers/gpu/drm/i915/intel_dp_mst.c | 15 +- |
| drivers/gpu/drm/i915/intel_drv.h | 155 +- |
| drivers/gpu/drm/i915/intel_dsi.c | 49 +- |
| drivers/gpu/drm/i915/intel_dsi.h | 3 + |
| drivers/gpu/drm/i915/intel_dsi_pll.c | 97 +- |
| drivers/gpu/drm/i915/intel_fbc.c | 535 ++- |
| drivers/gpu/drm/i915/intel_fbdev.c | 49 +- |
| drivers/gpu/drm/i915/intel_frontbuffer.c | 115 +- |
| drivers/gpu/drm/i915/intel_hdmi.c | 423 +- |
| drivers/gpu/drm/i915/intel_hotplug.c | 499 +++ |
| drivers/gpu/drm/i915/intel_lrc.c | 882 +++-- |
| drivers/gpu/drm/i915/intel_lrc.h | 21 +- |
| drivers/gpu/drm/i915/intel_lvds.c | 72 +- |
| drivers/gpu/drm/i915/intel_mocs.c | 335 ++ |
| drivers/gpu/drm/i915/intel_mocs.h | 57 + |
| drivers/gpu/drm/i915/intel_opregion.c | 104 +- |
| drivers/gpu/drm/i915/intel_overlay.c | 63 +- |
| drivers/gpu/drm/i915/intel_panel.c | 94 +- |
| drivers/gpu/drm/i915/intel_pm.c | 827 +++- |
| drivers/gpu/drm/i915/intel_psr.c | 78 +- |
| drivers/gpu/drm/i915/intel_ringbuffer.c | 390 +- |
| drivers/gpu/drm/i915/intel_ringbuffer.h | 92 +- |
| drivers/gpu/drm/i915/intel_runtime_pm.c | 83 +- |
| drivers/gpu/drm/i915/intel_sprite.c | 205 +- |
| drivers/gpu/drm/i915/intel_uncore.c | 74 +- |
| drivers/gpu/drm/mgag200/mgag200_fb.c | 2 - |
| drivers/gpu/drm/mgag200/mgag200_mode.c | 9 +- |
| drivers/gpu/drm/mgag200/mgag200_ttm.c | 8 +- |
| drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +- |
| drivers/gpu/drm/radeon/radeon_dp_mst.c | 11 +- |
| drivers/gpu/drm/radeon/radeon_kfd.c | 3 +- |
| drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +- |
| drivers/mfd/Kconfig | 1 + |
| drivers/mfd/intel_soc_pmic_core.c | 29 + |
| drivers/mfd/intel_soc_pmic_crc.c | 3 + |
| drivers/pwm/Kconfig | 7 + |
| drivers/pwm/Makefile | 1 + |
| drivers/pwm/pwm-crc.c | 143 + |
| include/drm/drmP.h | 24 +- |
| include/drm/drm_crtc.h | 67 +- |
| include/drm/intel-gtt.h | 4 +- |
| include/linux/gpio/machine.h | 1 + |
| include/uapi/drm/drm_fourcc.h | 7 + |
| include/uapi/drm/i915_drm.h | 16 +- |
| 126 files changed, 12059 insertions(+), 6214 deletions(-) |
| create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c |
| create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h |
| create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c |
| create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c |
| create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h |
| create mode 100644 drivers/gpu/drm/amd/include/vi_structs.h |
| create mode 100644 drivers/gpu/drm/i915/intel_hotplug.c |
| create mode 100644 drivers/gpu/drm/i915/intel_mocs.c |
| create mode 100644 drivers/gpu/drm/i915/intel_mocs.h |
| create mode 100644 drivers/pwm/pwm-crc.c |
| Merging drm-panel/drm/panel/for-next (4946b0430c69 drm/panel: simple: Add bus format for HannStar HSD100PXN1) |
| $ git merge drm-panel/drm/panel/for-next |
| Already up-to-date. |
| Merging drm-intel/for-linux-next (8453580cb883 drm/i915: Fix command parser table validator) |
| $ git merge drm-intel/for-linux-next |
| Auto-merging drivers/gpu/drm/i915/intel_pm.c |
| Auto-merging drivers/gpu/drm/i915/i915_irq.c |
| Auto-merging drivers/gpu/drm/i915/i915_gem_tiling.c |
| Auto-merging drivers/gpu/drm/i915/i915_gem.c |
| Auto-merging drivers/gpu/drm/i915/i915_drv.h |
| Auto-merging drivers/gpu/drm/i915/i915_drv.c |
| Auto-merging drivers/gpu/drm/i915/i915_debugfs.c |
| Auto-merging Documentation/DocBook/drm.tmpl |
| Merge made by the 'recursive' strategy. |
| Documentation/DocBook/drm.tmpl | 18 +- |
| drivers/gpu/drm/i915/Makefile | 19 +- |
| drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +- |
| drivers/gpu/drm/i915/i915_debugfs.c | 25 +- |
| drivers/gpu/drm/i915/i915_dma.c | 10 - |
| drivers/gpu/drm/i915/i915_drv.c | 4 - |
| drivers/gpu/drm/i915/i915_drv.h | 33 +- |
| drivers/gpu/drm/i915/i915_gem.c | 448 ++------------- |
| drivers/gpu/drm/i915/i915_gem_fence.c | 787 +++++++++++++++++++++++++++ |
| drivers/gpu/drm/i915/i915_gem_render_state.c | 55 +- |
| drivers/gpu/drm/i915/i915_gem_render_state.h | 2 + |
| drivers/gpu/drm/i915/i915_gem_tiling.c | 303 ++--------- |
| drivers/gpu/drm/i915/i915_guc_reg.h | 102 ++++ |
| drivers/gpu/drm/i915/i915_irq.c | 77 ++- |
| drivers/gpu/drm/i915/i915_params.c | 9 + |
| drivers/gpu/drm/i915/i915_reg.h | 5 + |
| drivers/gpu/drm/i915/intel_dp.c | 13 +- |
| drivers/gpu/drm/i915/intel_guc_fwif.h | 245 +++++++++ |
| drivers/gpu/drm/i915/intel_hotplug.c | 20 +- |
| drivers/gpu/drm/i915/intel_lrc.c | 6 + |
| drivers/gpu/drm/i915/intel_pm.c | 6 +- |
| 21 files changed, 1408 insertions(+), 783 deletions(-) |
| create mode 100644 drivers/gpu/drm/i915/i915_gem_fence.c |
| create mode 100644 drivers/gpu/drm/i915/i915_guc_reg.h |
| create mode 100644 drivers/gpu/drm/i915/intel_guc_fwif.h |
| Merging drm-tegra/drm/tegra/for-next (8a8005e3e199 drm/tegra: dpaux: Registers are 32-bit) |
| $ git merge drm-tegra/drm/tegra/for-next |
| Already up-to-date. |
| Merging drm-misc/topic/drm-misc (c0e736629b89 drm/fb-helper: Move drm_fb_helper_force_kernel_mode() inside #ifdef) |
| $ git merge drm-misc/topic/drm-misc |
| Resolved 'drivers/gpu/drm/drm_crtc.c' using previous resolution. |
| Auto-merging include/drm/drm_crtc_helper.h |
| Auto-merging drivers/gpu/drm/drm_crtc.c |
| CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c |
| Auto-merging drivers/gpu/drm/drm_atomic_helper.c |
| Auto-merging drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master b8c6d0c10ba5] Merge remote-tracking branch 'drm-misc/topic/drm-misc' |
| $ git diff -M --stat --summary HEAD^.. |
| drivers/gpu/drm/Kconfig | 7 + |
| drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 45 ++-- |
| drivers/gpu/drm/armada/armada_fbdev.c | 33 +-- |
| drivers/gpu/drm/ast/ast_fb.c | 48 ++-- |
| drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 6 +- |
| drivers/gpu/drm/bochs/bochs_drv.c | 4 +- |
| drivers/gpu/drm/bochs/bochs_fbdev.c | 36 +-- |
| drivers/gpu/drm/cirrus/cirrus_drv.c | 4 +- |
| drivers/gpu/drm/cirrus/cirrus_fbdev.c | 41 +-- |
| drivers/gpu/drm/drm_atomic_helper.c | 101 +++++--- |
| drivers/gpu/drm/drm_crtc.c | 6 +- |
| drivers/gpu/drm/drm_crtc_helper.c | 9 +- |
| drivers/gpu/drm/drm_fb_cma_helper.c | 45 +--- |
| drivers/gpu/drm/drm_fb_helper.c | 329 ++++++++++++++++++++----- |
| drivers/gpu/drm/drm_modeset_lock.c | 52 +--- |
| drivers/gpu/drm/drm_plane_helper.c | 4 +- |
| drivers/gpu/drm/exynos/exynos_drm_crtc.c | 6 +- |
| drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 47 +--- |
| drivers/gpu/drm/gma500/accel_2d.c | 6 +- |
| drivers/gpu/drm/gma500/framebuffer.c | 48 ++-- |
| drivers/gpu/drm/i915/intel_crt.c | 8 +- |
| drivers/gpu/drm/i915/intel_display.c | 27 +- |
| drivers/gpu/drm/i915/intel_drv.h | 2 +- |
| drivers/gpu/drm/i915/intel_dvo.c | 8 +- |
| drivers/gpu/drm/i915/intel_fbdev.c | 61 +---- |
| drivers/gpu/drm/i915/intel_sdvo.c | 8 +- |
| drivers/gpu/drm/mgag200/mgag200_fb.c | 39 +-- |
| drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 6 +- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 6 +- |
| drivers/gpu/drm/msm/msm_fbdev.c | 34 +-- |
| drivers/gpu/drm/nouveau/nouveau_connector.c | 4 +- |
| drivers/gpu/drm/nouveau/nouveau_fbcon.c | 39 +-- |
| drivers/gpu/drm/omapdrm/omap_crtc.c | 6 +- |
| drivers/gpu/drm/omapdrm/omap_fbdev.c | 38 +-- |
| drivers/gpu/drm/qxl/qxl_fb.c | 40 +-- |
| drivers/gpu/drm/radeon/radeon_dp_mst.c | 3 +- |
| drivers/gpu/drm/radeon/radeon_fb.c | 42 +--- |
| drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 6 +- |
| drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 47 +--- |
| drivers/gpu/drm/sti/sti_drm_crtc.c | 6 +- |
| drivers/gpu/drm/tegra/dc.c | 6 +- |
| drivers/gpu/drm/tegra/dsi.c | 3 +- |
| drivers/gpu/drm/tegra/fb.c | 35 +-- |
| drivers/gpu/drm/tegra/hdmi.c | 5 +- |
| drivers/gpu/drm/tegra/rgb.c | 5 +- |
| drivers/gpu/drm/tegra/sor.c | 3 +- |
| drivers/gpu/drm/ttm/ttm_tt.c | 4 +- |
| drivers/gpu/drm/udl/udl_fb.c | 41 +-- |
| drivers/gpu/drm/virtio/virtgpu_fb.c | 32 +-- |
| drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 2 +- |
| drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- |
| drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 +- |
| drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +- |
| include/drm/drm_atomic.h | 3 +- |
| include/drm/drm_atomic_helper.h | 4 +- |
| include/drm/drm_crtc.h | 10 +- |
| include/drm/drm_crtc_helper.h | 8 +- |
| include/drm/drm_dp_helper.h | 2 +- |
| include/drm/drm_fb_helper.h | 27 ++ |
| include/drm/drm_modeset_lock.h | 1 - |
| 60 files changed, 716 insertions(+), 789 deletions(-) |
| Merging drm-exynos/exynos-drm/for-next (9eb8cc183731 drm/exynos: return return value of exynos_crtc->enable_vblank) |
| $ git merge drm-exynos/exynos-drm/for-next |
| Auto-merging drivers/gpu/drm/exynos/exynos_drm_crtc.c |
| Merge made by the 'recursive' strategy. |
| drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 65 +- |
| drivers/gpu/drm/exynos/exynos7_drm_decon.c | 78 ++- |
| drivers/gpu/drm/exynos/exynos_drm_crtc.c | 16 +- |
| drivers/gpu/drm/exynos/exynos_drm_crtc.h | 2 +- |
| drivers/gpu/drm/exynos/exynos_drm_drv.c | 6 +- |
| drivers/gpu/drm/exynos/exynos_drm_drv.h | 45 +- |
| drivers/gpu/drm/exynos/exynos_drm_fimd.c | 89 ++- |
| drivers/gpu/drm/exynos/exynos_drm_g2d.c | 6 - |
| drivers/gpu/drm/exynos/exynos_drm_gsc.c | 22 +- |
| drivers/gpu/drm/exynos/exynos_drm_iommu.c | 20 +- |
| drivers/gpu/drm/exynos/exynos_drm_iommu.h | 15 - |
| drivers/gpu/drm/exynos/exynos_drm_ipp.c | 16 +- |
| drivers/gpu/drm/exynos/exynos_drm_plane.c | 31 +- |
| drivers/gpu/drm/exynos/exynos_drm_vidi.c | 17 +- |
| drivers/gpu/drm/exynos/exynos_hdmi.c | 867 ++++++++------------------ |
| drivers/gpu/drm/exynos/exynos_mixer.c | 198 +++--- |
| 16 files changed, 512 insertions(+), 981 deletions(-) |
| Merging drm-msm/msm-next (753f568f151c drm/msm: Enable clocks during enable/disable_vblank() callbacks) |
| $ git merge drm-msm/msm-next |
| Auto-merging drivers/gpu/drm/msm/msm_drv.h |
| Auto-merging drivers/gpu/drm/msm/msm_drv.c |
| Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h |
| Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c |
| Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c |
| Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h |
| Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c |
| Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c |
| Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c |
| Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c |
| Merge made by the 'recursive' strategy. |
| Documentation/devicetree/bindings/drm/msm/dsi.txt | 41 +- |
| Documentation/devicetree/bindings/drm/msm/hdmi.txt | 3 +- |
| drivers/gpu/drm/msm/Makefile | 1 + |
| drivers/gpu/drm/msm/adreno/a2xx.xml.h | 18 +- |
| drivers/gpu/drm/msm/adreno/a3xx.xml.h | 14 +- |
| drivers/gpu/drm/msm/adreno/a4xx.xml.h | 23 +- |
| drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 18 +- |
| drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 18 +- |
| drivers/gpu/drm/msm/dsi/dsi.c | 92 +- |
| drivers/gpu/drm/msm/dsi/dsi.h | 41 +- |
| drivers/gpu/drm/msm/dsi/dsi.xml.h | 206 ++- |
| drivers/gpu/drm/msm/dsi/dsi_host.c | 123 +- |
| drivers/gpu/drm/msm/dsi/dsi_manager.c | 169 ++- |
| drivers/gpu/drm/msm/dsi/dsi_phy.c | 165 ++- |
| drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 26 +- |
| drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 42 +- |
| drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 1 + |
| drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c | 31 +- |
| drivers/gpu/drm/msm/dsi/sfpb.xml.h | 26 +- |
| drivers/gpu/drm/msm/edp/edp.xml.h | 22 +- |
| drivers/gpu/drm/msm/edp/edp_ctrl.c | 17 +- |
| drivers/gpu/drm/msm/hdmi/hdmi.c | 79 +- |
| drivers/gpu/drm/msm/hdmi/hdmi.h | 32 +- |
| drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 22 +- |
| drivers/gpu/drm/msm/hdmi/hdmi_audio.c | 1 - |
| drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 16 +- |
| drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 101 +- |
| drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 1437 ++++++++++++++++++++ |
| drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c | 52 - |
| drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 32 - |
| drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c | 57 - |
| drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 26 +- |
| drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 22 +- |
| drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 2 - |
| drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c | 9 + |
| drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 38 +- |
| drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 21 +- |
| drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 9 +- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 180 ++- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 180 ++- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h | 13 +- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 12 +- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 133 +- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 243 +++- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 43 +- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 18 +- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 9 + |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 80 +- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 54 +- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 297 ++-- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c | 26 +- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h | 3 +- |
| drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 28 +- |
| drivers/gpu/drm/msm/mdp/mdp_format.c | 46 +- |
| drivers/gpu/drm/msm/mdp/mdp_kms.h | 16 +- |
| drivers/gpu/drm/msm/msm_drv.c | 82 +- |
| drivers/gpu/drm/msm/msm_drv.h | 19 + |
| 57 files changed, 3630 insertions(+), 905 deletions(-) |
| create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c |
| Merging sound/for-next (11580297334c ALSA: hda - remove no physical connection pins from pin_quirk table) |
| $ git merge sound/for-next |
| Auto-merging sound/pci/hda/patch_realtek.c |
| Merge made by the 'recursive' strategy. |
| include/sound/hdaudio.h | 16 +-- |
| sound/aoa/codecs/onyx.c | 1 - |
| sound/aoa/codecs/tas.c | 1 - |
| sound/hda/hdac_device.c | 26 ++-- |
| sound/hda/hdac_regmap.c | 10 +- |
| sound/hda/hdac_sysfs.c | 3 +- |
| sound/pci/emu10k1/emumixer.c | 25 ++-- |
| sound/pci/hda/hda_auto_parser.c | 27 +++- |
| sound/pci/hda/hda_codec.c | 2 +- |
| sound/pci/hda/patch_realtek.c | 299 ++++------------------------------------ |
| 10 files changed, 96 insertions(+), 314 deletions(-) |
| Merging sound-asoc/for-next (0a9402cd3c6e Merge remote-tracking branches 'asoc/topic/wm8996' and 'asoc/topic/xtensa' into asoc-next) |
| $ git merge sound-asoc/for-next |
| Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt |
| Merge made by the 'recursive' strategy. |
| Documentation/devicetree/bindings/sound/cs4349.txt | 19 + |
| .../devicetree/bindings/sound/max98357a.txt | 6 +- |
| .../devicetree/bindings/sound/renesas,rsnd.txt | 22 + |
| .../bindings/sound/renesas,rsrc-card.txt | 7 + |
| .../bindings/sound/rockchip-max98090.txt | 19 + |
| .../devicetree/bindings/sound/rockchip-rt5645.txt | 17 + |
| .../devicetree/bindings/sound/st,sti-asoc-card.txt | 155 +++ |
| .../devicetree/bindings/vendor-prefixes.txt | 1 + |
| drivers/base/regmap/internal.h | 2 +- |
| drivers/base/regmap/regmap.c | 73 +- |
| drivers/gpu/drm/i2c/adv7511.c | 2 +- |
| drivers/input/misc/drv260x.c | 6 +- |
| drivers/input/misc/drv2665.c | 2 +- |
| drivers/input/misc/drv2667.c | 4 +- |
| drivers/mfd/arizona-core.c | 2 +- |
| drivers/mfd/twl6040.c | 2 +- |
| drivers/mfd/wm5102-tables.c | 6 +- |
| drivers/mfd/wm5110-tables.c | 22 +- |
| drivers/mfd/wm8994-core.c | 8 +- |
| drivers/mfd/wm8997-tables.c | 2 +- |
| include/linux/mfd/arizona/registers.h | 37 + |
| include/linux/regmap.h | 28 +- |
| include/sound/ac97_codec.h | 2 + |
| include/sound/rcar_snd.h | 14 + |
| include/sound/rt298.h | 20 + |
| include/sound/soc-dapm.h | 19 + |
| include/sound/soc.h | 18 +- |
| include/uapi/sound/asoc.h | 2 + |
| sound/ac97_bus.c | 62 + |
| sound/soc/Kconfig | 1 + |
| sound/soc/Makefile | 1 + |
| sound/soc/atmel/atmel_ssc_dai.c | 2 +- |
| sound/soc/codecs/88pm860x-codec.c | 4 +- |
| sound/soc/codecs/Kconfig | 21 + |
| sound/soc/codecs/Makefile | 8 + |
| sound/soc/codecs/ad1980.c | 36 +- |
| sound/soc/codecs/adau1373.c | 1 - |
| sound/soc/codecs/adau1701.c | 1 - |
| sound/soc/codecs/adau1761-i2c.c | 1 - |
| sound/soc/codecs/adau1781-i2c.c | 1 - |
| sound/soc/codecs/adau1977-i2c.c | 1 - |
| sound/soc/codecs/adav803.c | 1 - |
| sound/soc/codecs/adav80x.c | 2 +- |
| sound/soc/codecs/ak4535.c | 1 - |
| sound/soc/codecs/ak4641.c | 1 - |
| sound/soc/codecs/ak4642.c | 34 +- |
| sound/soc/codecs/ak4671.c | 1 - |
| sound/soc/codecs/alc5623.c | 1 - |
| sound/soc/codecs/alc5632.c | 3 +- |
| sound/soc/codecs/arizona.c | 80 +- |
| sound/soc/codecs/arizona.h | 19 + |
| sound/soc/codecs/cs35l32.c | 15 +- |
| sound/soc/codecs/cs35l32.h | 2 +- |
| sound/soc/codecs/cs4265.c | 29 +- |
| sound/soc/codecs/cs4270.c | 1 - |
| sound/soc/codecs/cs4271-i2c.c | 1 - |
| sound/soc/codecs/cs42l51-i2c.c | 1 - |
| sound/soc/codecs/cs42l52.c | 5 +- |
| sound/soc/codecs/cs42l56.c | 3 +- |
| sound/soc/codecs/cs42l73.c | 5 +- |
| sound/soc/codecs/cs42xx8-i2c.c | 4 +- |
| sound/soc/codecs/cs42xx8.c | 19 +- |
| sound/soc/codecs/cs42xx8.h | 1 + |
| sound/soc/codecs/cs4349.c | 393 ++++++ |
| sound/soc/codecs/cs4349.h | 136 +++ |
| sound/soc/codecs/da7210.c | 7 +- |
| sound/soc/codecs/da7213.c | 3 +- |
| sound/soc/codecs/da732x.c | 15 +- |
| sound/soc/codecs/da9055.c | 4 +- |
| sound/soc/codecs/gtm601.c | 95 ++ |
| sound/soc/codecs/isabelle.c | 11 +- |
| sound/soc/codecs/lm4857.c | 1 - |
| sound/soc/codecs/lm49453.c | 19 +- |
| sound/soc/codecs/max9768.c | 64 +- |
| sound/soc/codecs/max98088.c | 306 +---- |
| sound/soc/codecs/max98088.h | 2 +- |
| sound/soc/codecs/max98090.c | 83 +- |
| sound/soc/codecs/max98095.c | 319 +---- |
| sound/soc/codecs/max98357a.c | 25 +- |
| sound/soc/codecs/max9850.c | 1 - |
| sound/soc/codecs/max9877.c | 19 +- |
| sound/soc/codecs/max98925.c | 6 +- |
| sound/soc/codecs/mc13783.c | 6 +- |
| sound/soc/codecs/ml26124.c | 3 +- |
| sound/soc/codecs/pcm1681.c | 14 +- |
| sound/soc/codecs/pcm512x-i2c.c | 1 - |
| sound/soc/codecs/pcm512x.c | 4 +- |
| sound/soc/codecs/rl6231.c | 27 +- |
| sound/soc/codecs/rt286.c | 11 +- |
| sound/soc/codecs/rt298.c | 1271 ++++++++++++++++++++ |
| sound/soc/codecs/rt298.h | 206 ++++ |
| sound/soc/codecs/rt5631.c | 1 - |
| sound/soc/codecs/rt5640.c | 5 +- |
| sound/soc/codecs/rt5645.c | 274 +++-- |
| sound/soc/codecs/rt5645.h | 30 +- |
| sound/soc/codecs/rt5651.c | 5 +- |
| sound/soc/codecs/rt5670.c | 7 +- |
| sound/soc/codecs/rt5677.c | 143 +-- |
| sound/soc/codecs/rt5677.h | 5 +- |
| sound/soc/codecs/sgtl5000.c | 1 - |
| sound/soc/codecs/si476x.c | 2 +- |
| sound/soc/codecs/sirf-audio-codec.c | 4 +- |
| sound/soc/codecs/ssm2518.c | 1 - |
| sound/soc/codecs/ssm2602-i2c.c | 1 - |
| sound/soc/codecs/ssm4567.c | 13 +- |
| sound/soc/codecs/sta32x.c | 1 - |
| sound/soc/codecs/sta350.c | 1 - |
| sound/soc/codecs/sta529.c | 4 - |
| sound/soc/codecs/stac9766.c | 57 +- |
| sound/soc/codecs/sti-sas.c | 628 ++++++++++ |
| sound/soc/codecs/tas2552.c | 20 +- |
| sound/soc/codecs/tas2552.h | 2 +- |
| sound/soc/codecs/tas5086.c | 11 +- |
| sound/soc/codecs/tas571x.c | 2 +- |
| sound/soc/codecs/tfa9879.c | 3 +- |
| sound/soc/codecs/tlv320aic31xx.c | 3 +- |
| sound/soc/codecs/tlv320aic32x4.c | 1 - |
| sound/soc/codecs/tlv320aic3x.c | 3 +- |
| sound/soc/codecs/tlv320dac33.c | 1 - |
| sound/soc/codecs/tpa6130a2.c | 1 - |
| sound/soc/codecs/ts3a227e.c | 48 +- |
| sound/soc/codecs/uda134x.c | 180 ++- |
| sound/soc/codecs/uda134x.h | 2 - |
| sound/soc/codecs/uda1380.c | 1 - |
| sound/soc/codecs/wm0010.c | 3 +- |
| sound/soc/codecs/wm1250-ev1.c | 1 - |
| sound/soc/codecs/wm2000.c | 1 - |
| sound/soc/codecs/wm2200.c | 9 +- |
| sound/soc/codecs/wm5100.c | 13 +- |
| sound/soc/codecs/wm5102.c | 27 +- |
| sound/soc/codecs/wm5110.c | 315 ++++- |
| sound/soc/codecs/wm8510.c | 2 +- |
| sound/soc/codecs/wm8523.c | 2 +- |
| sound/soc/codecs/wm8580.c | 2 +- |
| sound/soc/codecs/wm8711.c | 1 - |
| sound/soc/codecs/wm8728.c | 1 - |
| sound/soc/codecs/wm8731.c | 82 +- |
| sound/soc/codecs/wm8737.c | 1 - |
| sound/soc/codecs/wm8741.c | 1 - |
| sound/soc/codecs/wm8750.c | 1 - |
| sound/soc/codecs/wm8753.c | 1 - |
| sound/soc/codecs/wm8776.c | 5 +- |
| sound/soc/codecs/wm8804-i2c.c | 1 - |
| sound/soc/codecs/wm8804.c | 2 +- |
| sound/soc/codecs/wm8900.c | 1 - |
| sound/soc/codecs/wm8903.c | 1 - |
| sound/soc/codecs/wm8904.c | 5 +- |
| sound/soc/codecs/wm8940.c | 1 - |
| sound/soc/codecs/wm8955.c | 1 - |
| sound/soc/codecs/wm8960.c | 1 - |
| sound/soc/codecs/wm8961.c | 1 - |
| sound/soc/codecs/wm8962.c | 7 +- |
| sound/soc/codecs/wm8971.c | 1 - |
| sound/soc/codecs/wm8974.c | 1 - |
| sound/soc/codecs/wm8978.c | 1 - |
| sound/soc/codecs/wm8983.c | 81 +- |
| sound/soc/codecs/wm8985.c | 1 - |
| sound/soc/codecs/wm8988.c | 1 - |
| sound/soc/codecs/wm8990.c | 1 - |
| sound/soc/codecs/wm8991.c | 1 - |
| sound/soc/codecs/wm8993.c | 5 +- |
| sound/soc/codecs/wm8995.c | 1 - |
| sound/soc/codecs/wm8996.c | 11 +- |
| sound/soc/codecs/wm8997.c | 20 +- |
| sound/soc/codecs/wm9081.c | 3 +- |
| sound/soc/codecs/wm9090.c | 1 - |
| sound/soc/codecs/wm9705.c | 40 +- |
| sound/soc/codecs/wm9712.c | 45 +- |
| sound/soc/codecs/wm9713.c | 48 +- |
| sound/soc/codecs/wm9713.h | 2 - |
| sound/soc/fsl/fsl_asrc.c | 25 +- |
| sound/soc/fsl/fsl_esai.c | 2 +- |
| sound/soc/fsl/fsl_sai.c | 2 +- |
| sound/soc/fsl/fsl_spdif.c | 19 +- |
| sound/soc/fsl/fsl_ssi.c | 2 +- |
| sound/soc/fsl/imx-pcm-dma.c | 25 +- |
| sound/soc/fsl/imx-pcm.h | 9 +- |
| sound/soc/fsl/imx-ssi.c | 2 +- |
| sound/soc/generic/simple-card.c | 9 + |
| sound/soc/intel/Kconfig | 29 +- |
| sound/soc/intel/Makefile | 1 + |
| sound/soc/intel/atom/sst-atom-controls.c | 6 +- |
| sound/soc/intel/atom/sst-mfld-platform-pcm.c | 1 - |
| sound/soc/intel/atom/sst-mfld-platform.h | 1 + |
| sound/soc/intel/baytrail/sst-baytrail-ipc.c | 2 + |
| sound/soc/intel/boards/cht_bsw_max98090_ti.c | 18 +- |
| sound/soc/intel/common/sst-dsp-priv.h | 23 +- |
| sound/soc/intel/common/sst-dsp.c | 71 ++ |
| sound/soc/intel/common/sst-dsp.h | 6 + |
| sound/soc/intel/haswell/sst-haswell-ipc.c | 2 + |
| sound/soc/intel/skylake/Makefile | 9 + |
| sound/soc/intel/skylake/skl-messages.c | 133 ++ |
| sound/soc/intel/skylake/skl-nhlt.c | 141 +++ |
| sound/soc/intel/skylake/skl-nhlt.h | 116 ++ |
| sound/soc/intel/skylake/skl-pcm.c | 916 ++++++++++++++ |
| sound/soc/intel/skylake/skl-sst-cldma.c | 327 +++++ |
| sound/soc/intel/skylake/skl-sst-cldma.h | 251 ++++ |
| sound/soc/intel/skylake/skl-sst-dsp.c | 342 ++++++ |
| sound/soc/intel/skylake/skl-sst-dsp.h | 145 +++ |
| sound/soc/intel/skylake/skl-sst-ipc.c | 771 ++++++++++++ |
| sound/soc/intel/skylake/skl-sst-ipc.h | 125 ++ |
| sound/soc/intel/skylake/skl-sst.c | 280 +++++ |
| sound/soc/intel/skylake/skl.c | 536 +++++++++ |
| sound/soc/intel/skylake/skl.h | 84 ++ |
| sound/soc/kirkwood/kirkwood-dma.c | 4 + |
| sound/soc/mediatek/mt8173-max98090.c | 1 - |
| sound/soc/mediatek/mt8173-rt5650-rt5676.c | 1 - |
| sound/soc/mediatek/mtk-afe-common.h | 8 - |
| sound/soc/mediatek/mtk-afe-pcm.c | 78 +- |
| sound/soc/omap/omap3pandora.c | 6 +- |
| sound/soc/qcom/Kconfig | 7 +- |
| sound/soc/qcom/lpass-ipq806x.c | 2 +- |
| sound/soc/rockchip/Kconfig | 19 + |
| sound/soc/rockchip/Makefile | 6 + |
| sound/soc/rockchip/rockchip_max98090.c | 236 ++++ |
| sound/soc/rockchip/rockchip_rt5645.c | 225 ++++ |
| sound/soc/sh/fsi.c | 1 - |
| sound/soc/sh/rcar/Makefile | 2 +- |
| sound/soc/sh/rcar/core.c | 195 ++- |
| sound/soc/sh/rcar/ctu.c | 171 +++ |
| sound/soc/sh/rcar/dma.c | 126 +- |
| sound/soc/sh/rcar/dvc.c | 73 +- |
| sound/soc/sh/rcar/gen.c | 33 +- |
| sound/soc/sh/rcar/mix.c | 200 +++ |
| sound/soc/sh/rcar/rsnd.h | 111 +- |
| sound/soc/sh/rcar/rsrc-card.c | 22 +- |
| sound/soc/sh/rcar/src.c | 117 +- |
| sound/soc/sh/rcar/ssi.c | 4 +- |
| sound/soc/soc-ac97.c | 30 +- |
| sound/soc/soc-core.c | 73 +- |
| sound/soc/soc-dapm.c | 196 ++- |
| sound/soc/soc-pcm.c | 16 +- |
| sound/soc/soc-topology.c | 28 +- |
| sound/soc/sti/Kconfig | 11 + |
| sound/soc/sti/Makefile | 4 + |
| sound/soc/sti/sti_uniperif.c | 254 ++++ |
| sound/soc/sti/uniperif.h | 1229 +++++++++++++++++++ |
| sound/soc/sti/uniperif_player.c | 1041 ++++++++++++++++ |
| sound/soc/sti/uniperif_reader.c | 362 ++++++ |
| sound/soc/ux500/ux500_msp_dai.c | 29 +- |
| sound/soc/xtensa/xtfpga-i2s.c | 8 +- |
| 241 files changed, 13321 insertions(+), 2191 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/sound/cs4349.txt |
| create mode 100644 Documentation/devicetree/bindings/sound/rockchip-max98090.txt |
| create mode 100644 Documentation/devicetree/bindings/sound/rockchip-rt5645.txt |
| create mode 100644 Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt |
| create mode 100644 include/sound/rt298.h |
| create mode 100644 sound/soc/codecs/cs4349.c |
| create mode 100644 sound/soc/codecs/cs4349.h |
| create mode 100644 sound/soc/codecs/gtm601.c |
| create mode 100644 sound/soc/codecs/rt298.c |
| create mode 100644 sound/soc/codecs/rt298.h |
| create mode 100644 sound/soc/codecs/sti-sas.c |
| create mode 100644 sound/soc/intel/skylake/Makefile |
| create mode 100644 sound/soc/intel/skylake/skl-messages.c |
| create mode 100644 sound/soc/intel/skylake/skl-nhlt.c |
| create mode 100644 sound/soc/intel/skylake/skl-nhlt.h |
| create mode 100644 sound/soc/intel/skylake/skl-pcm.c |
| create mode 100644 sound/soc/intel/skylake/skl-sst-cldma.c |
| create mode 100644 sound/soc/intel/skylake/skl-sst-cldma.h |
| create mode 100644 sound/soc/intel/skylake/skl-sst-dsp.c |
| create mode 100644 sound/soc/intel/skylake/skl-sst-dsp.h |
| create mode 100644 sound/soc/intel/skylake/skl-sst-ipc.c |
| create mode 100644 sound/soc/intel/skylake/skl-sst-ipc.h |
| create mode 100644 sound/soc/intel/skylake/skl-sst.c |
| create mode 100644 sound/soc/intel/skylake/skl.c |
| create mode 100644 sound/soc/intel/skylake/skl.h |
| create mode 100644 sound/soc/rockchip/rockchip_max98090.c |
| create mode 100644 sound/soc/rockchip/rockchip_rt5645.c |
| create mode 100644 sound/soc/sh/rcar/ctu.c |
| create mode 100644 sound/soc/sh/rcar/mix.c |
| create mode 100644 sound/soc/sti/Kconfig |
| create mode 100644 sound/soc/sti/Makefile |
| create mode 100644 sound/soc/sti/sti_uniperif.c |
| create mode 100644 sound/soc/sti/uniperif.h |
| create mode 100644 sound/soc/sti/uniperif_player.c |
| create mode 100644 sound/soc/sti/uniperif_reader.c |
| Merging modules/modules-next (20bdc2cfdbc4 modules: only use mod->param_lock if CONFIG_MODULES) |
| $ git merge modules/modules-next |
| Already up-to-date. |
| Merging input/next (62f46669688b Input: zforce - make the interrupt GPIO optional) |
| $ git merge input/next |
| Auto-merging include/linux/platform_data/pixcir_i2c_ts.h |
| Auto-merging drivers/input/touchscreen/goodix.c |
| Auto-merging drivers/input/misc/drv2667.c |
| Auto-merging drivers/input/misc/drv2665.c |
| Auto-merging drivers/input/misc/drv260x.c |
| Auto-merging drivers/hid/hid-core.c |
| Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt |
| Merge made by the 'recursive' strategy. |
| .../devicetree/bindings/input/ads7846.txt | 2 +- |
| .../devicetree/bindings/input/cypress,cyapa.txt | 44 + |
| .../devicetree/bindings/input/gpio-keys-polled.txt | 2 +- |
| .../devicetree/bindings/input/gpio-keys.txt | 2 +- |
| .../bindings/input/gpio-matrix-keypad.txt | 2 +- |
| .../bindings/input/qcom,pm8xxx-keypad.txt | 2 +- |
| .../devicetree/bindings/input/samsung-keypad.txt | 4 +- |
| .../bindings/input/touchscreen/pixcir_i2c_ts.txt | 3 + |
| .../bindings/input/touchscreen/zforce_ts.txt | 8 +- |
| Documentation/devicetree/bindings/mfd/tc3589x.txt | 4 +- |
| .../devicetree/bindings/vendor-prefixes.txt | 1 + |
| Documentation/kernel-parameters.txt | 4 + |
| drivers/hid/hid-core.c | 1 + |
| drivers/input/ff-core.c | 5 +- |
| drivers/input/joydev.c | 11 +- |
| drivers/input/keyboard/adp5589-keys.c | 1 - |
| drivers/input/keyboard/cap11xx.c | 1 - |
| drivers/input/keyboard/gpio_keys.c | 4 +- |
| drivers/input/keyboard/gpio_keys_polled.c | 5 +- |
| drivers/input/keyboard/lm8333.c | 1 - |
| drivers/input/keyboard/matrix_keypad.c | 6 +- |
| drivers/input/keyboard/mcs_touchkey.c | 1 - |
| drivers/input/keyboard/mpr121_touchkey.c | 1 - |
| drivers/input/keyboard/pmic8xxx-keypad.c | 10 +- |
| drivers/input/keyboard/qt1070.c | 1 - |
| drivers/input/keyboard/qt2160.c | 1 - |
| drivers/input/keyboard/samsung-keypad.c | 6 +- |
| drivers/input/keyboard/tc3589x-keypad.c | 63 +- |
| drivers/input/keyboard/tca8418_keypad.c | 1 - |
| drivers/input/misc/adxl34x-i2c.c | 1 - |
| drivers/input/misc/arizona-haptics.c | 26 +- |
| drivers/input/misc/bma150.c | 8 +- |
| drivers/input/misc/cma3000_d0x_i2c.c | 1 - |
| drivers/input/misc/drv260x.c | 3 +- |
| drivers/input/misc/drv2665.c | 3 +- |
| drivers/input/misc/drv2667.c | 3 +- |
| drivers/input/misc/gp2ap002a00f.c | 2 +- |
| drivers/input/misc/kxtj9.c | 1 - |
| drivers/input/misc/mpu3050.c | 1 - |
| drivers/input/misc/pcf8574_keypad.c | 1 - |
| drivers/input/misc/pmic8xxx-pwrkey.c | 268 ++++- |
| drivers/input/misc/uinput.c | 6 +- |
| drivers/input/mouse/Makefile | 2 +- |
| drivers/input/mouse/cyapa.c | 183 ++- |
| drivers/input/mouse/cyapa.h | 157 ++- |
| drivers/input/mouse/cyapa_gen3.c | 15 +- |
| drivers/input/mouse/cyapa_gen5.c | 1255 +++++++++++--------- |
| drivers/input/mouse/cyapa_gen6.c | 749 ++++++++++++ |
| drivers/input/mouse/elan_i2c_core.c | 2 +- |
| drivers/input/mouse/synaptics_i2c.c | 1 - |
| drivers/input/serio/ambakmi.c | 8 +- |
| drivers/input/serio/i8042.c | 43 +- |
| drivers/input/serio/i8042.h | 13 + |
| drivers/input/serio/serio.c | 5 +- |
| drivers/input/touchscreen/Kconfig | 13 +- |
| drivers/input/touchscreen/Makefile | 2 +- |
| drivers/input/touchscreen/ad7879-i2c.c | 1 - |
| drivers/input/touchscreen/ads7846.c | 3 +- |
| drivers/input/touchscreen/ar1021_i2c.c | 1 - |
| drivers/input/touchscreen/atmel_mxt_ts.c | 1 - |
| drivers/input/touchscreen/auo-pixcir-ts.c | 1 - |
| drivers/input/touchscreen/bu21013_ts.c | 1 - |
| drivers/input/touchscreen/chipone_icn8318.c | 1 - |
| drivers/input/touchscreen/cy8ctmg110_ts.c | 1 - |
| drivers/input/touchscreen/cyttsp4_i2c.c | 1 - |
| drivers/input/touchscreen/cyttsp_i2c.c | 1 - |
| drivers/input/touchscreen/edt-ft5x06.c | 3 +- |
| drivers/input/touchscreen/egalax_ts.c | 2 +- |
| drivers/input/touchscreen/elants_i2c.c | 1 - |
| drivers/input/touchscreen/goodix.c | 2 +- |
| drivers/input/touchscreen/ili210x.c | 1 - |
| drivers/input/touchscreen/max11801_ts.c | 1 - |
| drivers/input/touchscreen/mms114.c | 2 +- |
| drivers/input/touchscreen/of_touchscreen.c | 68 +- |
| drivers/input/touchscreen/pixcir_i2c_ts.c | 147 +-- |
| drivers/input/touchscreen/st1232.c | 1 - |
| drivers/input/touchscreen/tsc2005.c | 264 ++-- |
| drivers/input/touchscreen/tsc2007.c | 1 - |
| drivers/input/touchscreen/wacom_i2c.c | 1 - |
| drivers/input/touchscreen/wdt87xx_i2c.c | 49 +- |
| drivers/input/touchscreen/zforce_ts.c | 98 +- |
| include/linux/input/touchscreen.h | 11 +- |
| .../pixcir_ts.h => platform_data/pixcir_i2c_ts.h} | 1 - |
| include/linux/platform_data/zforce_ts.h | 3 - |
| include/linux/serio.h | 2 + |
| 85 files changed, 2520 insertions(+), 1119 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/input/cypress,cyapa.txt |
| create mode 100644 drivers/input/mouse/cyapa_gen6.c |
| rename include/linux/{input/pixcir_ts.h => platform_data/pixcir_i2c_ts.h} (96%) |
| Merging block/for-next (89c5a5c7f990 Merge branch 'for-4.3/core' into for-next) |
| $ git merge block/for-next |
| Resolved 'block/bounce.c' using previous resolution. |
| Resolved 'fs/f2fs/data.c' using previous resolution. |
| Auto-merging include/linux/blk_types.h |
| Auto-merging fs/xfs/xfs_buf.c |
| Auto-merging fs/gfs2/lops.c |
| Auto-merging fs/f2fs/data.c |
| CONFLICT (content): Merge conflict in fs/f2fs/data.c |
| Auto-merging fs/ext4/page-io.c |
| Auto-merging fs/btrfs/inode.c |
| Auto-merging fs/btrfs/disk-io.c |
| Auto-merging drivers/md/raid5.c |
| Auto-merging drivers/md/raid10.c |
| Auto-merging drivers/md/raid1.c |
| Auto-merging drivers/md/md.c |
| Auto-merging drivers/md/dm.c |
| Auto-merging drivers/md/dm-thin.c |
| Auto-merging drivers/md/dm-cache-target.c |
| Auto-merging drivers/block/rbd.c |
| Auto-merging drivers/block/null_blk.c |
| Auto-merging block/bounce.c |
| CONFLICT (content): Merge conflict in block/bounce.c |
| Auto-merging block/bio.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 460e71d71020] Merge remote-tracking branch 'block/for-next' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/block/biodoc.txt | 2 +- |
| Documentation/block/queue-sysfs.txt | 10 +- |
| arch/m68k/emu/nfblock.c | 2 +- |
| arch/powerpc/sysdev/axonram.c | 2 +- |
| arch/xtensa/platforms/iss/simdisk.c | 12 +-- |
| block/bio-integrity.c | 11 +- |
| block/bio.c | 57 +++++----- |
| block/blk-core.c | 17 +-- |
| block/blk-lib.c | 30 +++--- |
| block/blk-map.c | 4 +- |
| block/blk-merge.c | 2 +- |
| block/blk-mq.c | 6 +- |
| block/blk-settings.c | 4 + |
| block/blk-sysfs.c | 40 ++++++- |
| block/bounce.c | 27 ++--- |
| block/genhd.c | 9 +- |
| block/partition-generic.c | 12 +-- |
| drivers/block/aoe/aoecmd.c | 10 +- |
| drivers/block/aoe/aoedev.c | 2 +- |
| drivers/block/brd.c | 15 +-- |
| drivers/block/drbd/drbd_actlog.c | 4 +- |
| drivers/block/drbd/drbd_bitmap.c | 19 +--- |
| drivers/block/drbd/drbd_int.h | 11 +- |
| drivers/block/drbd/drbd_nl.c | 4 +- |
| drivers/block/drbd/drbd_req.c | 10 +- |
| drivers/block/drbd/drbd_worker.c | 44 ++------ |
| drivers/block/floppy.c | 7 +- |
| drivers/block/loop.c | 4 +- |
| drivers/block/nbd.c | 2 +- |
| drivers/block/null_blk.c | 2 +- |
| drivers/block/nvme-core.c | 205 +++++++++++++++++++++++++++--------- |
| drivers/block/pktcdvd.c | 32 +++--- |
| drivers/block/ps3vram.c | 3 +- |
| drivers/block/rbd.c | 2 +- |
| drivers/block/rsxx/dev.c | 9 +- |
| drivers/block/skd_main.c | 2 +- |
| drivers/block/umem.c | 4 +- |
| drivers/block/xen-blkback/blkback.c | 4 +- |
| drivers/block/xen-blkfront.c | 9 +- |
| drivers/block/zram/zram_drv.c | 7 +- |
| drivers/md/bcache/btree.c | 10 +- |
| drivers/md/bcache/closure.h | 2 +- |
| drivers/md/bcache/io.c | 8 +- |
| drivers/md/bcache/journal.c | 8 +- |
| drivers/md/bcache/movinggc.c | 8 +- |
| drivers/md/bcache/request.c | 27 ++--- |
| drivers/md/bcache/super.c | 16 +-- |
| drivers/md/bcache/writeback.c | 10 +- |
| drivers/md/dm-bio-prison.c | 6 +- |
| drivers/md/dm-bufio.c | 26 +++-- |
| drivers/md/dm-cache-target.c | 24 +++-- |
| drivers/md/dm-crypt.c | 14 ++- |
| drivers/md/dm-flakey.c | 2 +- |
| drivers/md/dm-io.c | 6 +- |
| drivers/md/dm-log-writes.c | 11 +- |
| drivers/md/dm-raid1.c | 24 +++-- |
| drivers/md/dm-snap.c | 6 +- |
| drivers/md/dm-stripe.c | 2 +- |
| drivers/md/dm-thin.c | 41 ++++---- |
| drivers/md/dm-verity.c | 9 +- |
| drivers/md/dm-zero.c | 2 +- |
| drivers/md/dm.c | 15 ++- |
| drivers/md/faulty.c | 4 +- |
| drivers/md/linear.c | 2 +- |
| drivers/md/md.c | 18 ++-- |
| drivers/md/multipath.c | 12 +-- |
| drivers/md/raid0.c | 2 +- |
| drivers/md/raid1.c | 57 +++++----- |
| drivers/md/raid10.c | 61 +++++------ |
| drivers/md/raid5.c | 54 +++++----- |
| drivers/mmc/card/queue.c | 2 +- |
| drivers/mtd/mtd_blkdevs.c | 2 +- |
| drivers/nvdimm/blk.c | 5 +- |
| drivers/nvdimm/btt.c | 5 +- |
| drivers/nvdimm/pmem.c | 2 +- |
| drivers/s390/block/dcssblk.c | 2 +- |
| drivers/s390/block/xpram.c | 3 +- |
| drivers/scsi/sd.c | 4 +- |
| drivers/target/target_core_iblock.c | 21 ++-- |
| drivers/target/target_core_pscsi.c | 6 +- |
| fs/btrfs/check-integrity.c | 10 +- |
| fs/btrfs/compression.c | 24 +++-- |
| fs/btrfs/disk-io.c | 35 +++--- |
| fs/btrfs/extent_io.c | 30 +++--- |
| fs/btrfs/inode.c | 50 ++++----- |
| fs/btrfs/raid56.c | 62 +++++------ |
| fs/btrfs/scrub.c | 22 ++-- |
| fs/btrfs/volumes.c | 23 ++-- |
| fs/buffer.c | 6 +- |
| fs/direct-io.c | 13 ++- |
| fs/ext4/page-io.c | 15 ++- |
| fs/ext4/readpage.c | 6 +- |
| fs/f2fs/data.c | 10 +- |
| fs/gfs2/lops.c | 10 +- |
| fs/gfs2/ops_fstype.c | 6 +- |
| fs/jfs/jfs_logmgr.c | 8 +- |
| fs/jfs/jfs_metapage.c | 8 +- |
| fs/logfs/dev_bdev.c | 12 +-- |
| fs/mpage.c | 4 +- |
| fs/nfs/blocklayout/blocklayout.c | 14 ++- |
| fs/nilfs2/segbuf.c | 5 +- |
| fs/ocfs2/cluster/heartbeat.c | 9 +- |
| fs/xfs/xfs_aops.c | 5 +- |
| fs/xfs/xfs_buf.c | 7 +- |
| include/linux/bio.h | 28 ++++- |
| include/linux/blk_types.h | 10 +- |
| include/linux/blkdev.h | 1 + |
| include/linux/genhd.h | 33 ++++-- |
| include/linux/nvme.h | 17 +++ |
| include/linux/swap.h | 4 +- |
| kernel/power/swap.c | 12 +-- |
| kernel/trace/blktrace.c | 10 +- |
| mm/page_io.c | 12 +-- |
| 113 files changed, 929 insertions(+), 789 deletions(-) |
| $ git am -3 ../patches/0001-block-lustre-temporary-fix-for-bio_endio-API-change.patch |
| Applying: block: lustre: temporary fix for bio_endio API change |
| $ git reset HEAD^ |
| Unstaged changes after reset: |
| M drivers/staging/lustre/lustre/include/linux/lustre_compat25.h |
| $ git add -A . |
| $ git commit -v -a --amend |
| [master ab0344c4ecb1] Merge remote-tracking branch 'block/for-next' |
| Date: Wed Aug 5 11:58:28 2015 +1000 |
| Merging device-mapper/for-next (bd4aaf8f9b85 dm: fix dm_merge_bvec regression on 32 bit systems) |
| $ git merge device-mapper/for-next |
| Auto-merging drivers/md/dm.c |
| Merge made by the 'recursive' strategy. |
| drivers/md/dm.c | 27 ++++++++++----------------- |
| 1 file changed, 10 insertions(+), 17 deletions(-) |
| Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) |
| $ git merge pcmcia/master |
| Already up-to-date. |
| Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) |
| $ git merge mmc/mmc-next |
| Already up-to-date. |
| Merging mmc-uh/next (77a5f675e2d8 mmc: block: add fixup of broken CMD23 for Sandisk card) |
| $ git merge mmc-uh/next |
| Resolved 'arch/arm/boot/dts/imx6qdl-gw52xx.dtsi' using previous resolution. |
| Resolved 'arch/arm/boot/dts/imx6qdl-gw53xx.dtsi' using previous resolution. |
| Resolved 'arch/arm/boot/dts/imx6qdl-gw54xx.dtsi' using previous resolution. |
| Auto-merging drivers/mmc/host/sdhci.c |
| Auto-merging drivers/mmc/host/sdhci-esdhc.h |
| Auto-merging drivers/mmc/host/omap_hsmmc.c |
| Auto-merging drivers/mmc/card/block.c |
| Auto-merging arch/arm/boot/dts/imx6qdl-gw54xx.dtsi |
| CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw54xx.dtsi |
| Auto-merging arch/arm/boot/dts/imx6qdl-gw53xx.dtsi |
| CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw53xx.dtsi |
| Auto-merging arch/arm/boot/dts/imx6qdl-gw52xx.dtsi |
| CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw52xx.dtsi |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 5b2cd06daa37] Merge remote-tracking branch 'mmc-uh/next' |
| $ git diff -M --stat --summary HEAD^.. |
| .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 2 +- |
| drivers/mmc/card/block.c | 7 + |
| drivers/mmc/core/core.c | 38 +++- |
| drivers/mmc/host/omap.c | 5 +- |
| drivers/mmc/host/omap_hsmmc.c | 39 ++-- |
| drivers/mmc/host/pxamci.c | 200 ++++++++++++--------- |
| drivers/mmc/host/sdhci-esdhc.h | 3 +- |
| drivers/mmc/host/sdhci-msm.c | 5 + |
| drivers/mmc/host/sdhci-of-arasan.c | 3 + |
| drivers/mmc/host/sdhci.c | 23 ++- |
| drivers/mmc/host/sdhci.h | 2 + |
| include/linux/mmc/card.h | 1 + |
| include/linux/mmc/host.h | 3 +- |
| 13 files changed, 207 insertions(+), 124 deletions(-) |
| Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) |
| $ git merge kgdb/kgdb-next |
| Merge made by the 'recursive' strategy. |
| kernel/debug/kdb/kdb_io.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| Merging md/for-next (f093136d2cad md-cluster: Read the disk bitmap sb and check if it needs recovery) |
| $ git merge md/for-next |
| Auto-merging drivers/md/raid5.c |
| Auto-merging drivers/md/raid10.c |
| Auto-merging drivers/md/raid1.c |
| Auto-merging drivers/md/raid0.c |
| Auto-merging drivers/md/md.c |
| Merge made by the 'recursive' strategy. |
| Documentation/md-cluster.txt | 4 +- |
| drivers/md/md-cluster.c | 155 +++++++++++++++++++++++++++++-------------- |
| drivers/md/md.c | 95 ++++++++++++++++---------- |
| drivers/md/raid0.c | 75 +++++++++++---------- |
| drivers/md/raid1.c | 11 +-- |
| drivers/md/raid10.c | 4 +- |
| drivers/md/raid5.c | 88 ++++++++++++++---------- |
| lib/raid6/neon.c | 13 +++- |
| lib/raid6/neon.uc | 46 +++++++++++++ |
| 9 files changed, 327 insertions(+), 164 deletions(-) |
| Merging mfd/for-mfd-next (45bc1e960d6a mfd: da9062: Support for the DA9063 OnKey in the DA9062 core) |
| $ git merge mfd/for-mfd-next |
| Auto-merging include/linux/mfd/arizona/registers.h |
| Auto-merging drivers/mfd/wm8997-tables.c |
| Auto-merging drivers/mfd/wm8994-core.c |
| Auto-merging drivers/mfd/wm5110-tables.c |
| Auto-merging drivers/mfd/wm5102-tables.c |
| Auto-merging drivers/mfd/twl6040.c |
| Auto-merging drivers/mfd/stmpe-i2c.c |
| Auto-merging drivers/mfd/intel_soc_pmic_core.c |
| Auto-merging drivers/mfd/arizona-core.c |
| Auto-merging drivers/mfd/Kconfig |
| Auto-merging MAINTAINERS |
| Merge made by the 'recursive' strategy. |
| Documentation/devicetree/bindings/mfd/axp20x.txt | 4 +- |
| Documentation/devicetree/bindings/mfd/da9062.txt | 88 ++ |
| Documentation/devicetree/bindings/mfd/rk808.txt | 8 +- |
| .../devicetree/bindings/rtc/rtc-st-lpc.txt | 15 +- |
| .../devicetree/bindings/timer/st,stih407-lpc | 28 + |
| .../devicetree/bindings/watchdog/st_lpc_wdt.txt | 12 +- |
| MAINTAINERS | 11 +- |
| drivers/clocksource/Kconfig | 8 + |
| drivers/clocksource/Makefile | 1 + |
| drivers/clocksource/clksrc_st_lpc.c | 131 ++ |
| drivers/mfd/88pm800.c | 1 - |
| drivers/mfd/88pm805.c | 1 - |
| drivers/mfd/88pm860x-core.c | 5 - |
| drivers/mfd/Kconfig | 22 +- |
| drivers/mfd/Makefile | 6 +- |
| drivers/mfd/aat2870-core.c | 1 - |
| drivers/mfd/ab3100-core.c | 1 - |
| drivers/mfd/ab8500-core.c | 4 - |
| drivers/mfd/adp5520.c | 1 - |
| drivers/mfd/arizona-core.c | 107 +- |
| drivers/mfd/arizona-i2c.c | 9 +- |
| drivers/mfd/arizona-irq.c | 16 +- |
| drivers/mfd/arizona.h | 5 + |
| drivers/mfd/as3711.c | 1 - |
| drivers/mfd/as3722.c | 1 - |
| drivers/mfd/asic3.c | 4 +- |
| drivers/mfd/atmel-hlcdc.c | 51 +- |
| drivers/mfd/axp20x.c | 84 +- |
| drivers/mfd/bcm590xx.c | 1 - |
| drivers/mfd/cros_ec_i2c.c | 1 - |
| drivers/mfd/da903x.c | 1 - |
| drivers/mfd/da9052-i2c.c | 1 - |
| drivers/mfd/da9055-i2c.c | 1 - |
| drivers/mfd/da9062-core.c | 533 +++++++ |
| drivers/mfd/da9063-i2c.c | 1 - |
| drivers/mfd/da9063-irq.c | 4 + |
| drivers/mfd/db8500-prcmu.c | 1 - |
| drivers/mfd/ezx-pcap.c | 11 +- |
| drivers/mfd/htc-egpio.c | 8 +- |
| drivers/mfd/htc-i2cpld.c | 6 +- |
| drivers/mfd/intel_soc_pmic_core.c | 3 +- |
| drivers/mfd/ipaq-micro.c | 38 +- |
| drivers/mfd/jz4740-adc.c | 6 +- |
| drivers/mfd/kempld-core.c | 16 + |
| drivers/mfd/lm3533-core.c | 1 - |
| drivers/mfd/lp3943.c | 1 - |
| drivers/mfd/lp8788-irq.c | 5 - |
| drivers/mfd/lp8788.c | 1 - |
| drivers/mfd/max14577.c | 1 - |
| drivers/mfd/max77686.c | 1 - |
| drivers/mfd/max77693.c | 1 - |
| drivers/mfd/max8907.c | 1 - |
| drivers/mfd/max8925-core.c | 5 +- |
| drivers/mfd/max8925-i2c.c | 1 - |
| drivers/mfd/max8997-irq.c | 20 +- |
| drivers/mfd/max8997.c | 1 - |
| drivers/mfd/max8998-irq.c | 14 +- |
| drivers/mfd/max8998.c | 1 - |
| drivers/mfd/mc13xxx-i2c.c | 1 - |
| drivers/mfd/mt6397-core.c | 12 +- |
| drivers/mfd/palmas.c | 1 - |
| drivers/mfd/pm8921-core.c | 52 +- |
| drivers/mfd/qcom_rpm.c | 1 + |
| drivers/mfd/rc5t583-irq.c | 4 +- |
| drivers/mfd/rc5t583.c | 1 - |
| drivers/mfd/retu-mfd.c | 1 - |
| drivers/mfd/sec-core.c | 1 - |
| drivers/mfd/si476x-i2c.c | 1 - |
| drivers/mfd/smsc-ece1099.c | 1 - |
| drivers/mfd/stmpe-i2c.c | 1 - |
| drivers/mfd/stmpe.c | 7 - |
| drivers/mfd/t7l66xb.c | 18 +- |
| drivers/mfd/tc3589x.c | 8 - |
| drivers/mfd/tc6393xb.c | 13 +- |
| drivers/mfd/tps6507x.c | 1 - |
| drivers/mfd/tps65090.c | 1 - |
| drivers/mfd/tps65217.c | 1 - |
| drivers/mfd/tps65218.c | 1 - |
| drivers/mfd/tps6586x.c | 12 +- |
| drivers/mfd/tps65910.c | 1 - |
| drivers/mfd/tps65912-i2c.c | 1 - |
| drivers/mfd/tps65912-irq.c | 8 +- |
| drivers/mfd/tps80031.c | 1 - |
| drivers/mfd/twl4030-irq.c | 11 +- |
| drivers/mfd/twl6030-irq.c | 15 +- |
| drivers/mfd/twl6040.c | 1 - |
| drivers/mfd/ucb1x00-core.c | 6 +- |
| drivers/mfd/wm5102-tables.c | 51 +- |
| drivers/mfd/wm5110-tables.c | 14 +- |
| drivers/mfd/wm831x-i2c.c | 1 - |
| drivers/mfd/wm831x-irq.c | 7 - |
| drivers/mfd/wm8350-i2c.c | 1 - |
| drivers/mfd/wm8350-irq.c | 8 +- |
| drivers/mfd/wm8400-core.c | 1 - |
| drivers/mfd/wm8994-core.c | 1 - |
| drivers/mfd/wm8994-irq.c | 7 - |
| drivers/mfd/wm8994-regmap.c | 6 +- |
| drivers/mfd/wm8997-tables.c | 8 +- |
| drivers/mfd/wm8998-tables.c | 1594 ++++++++++++++++++++ |
| drivers/rtc/rtc-st-lpc.c | 2 +- |
| include/dt-bindings/mfd/st-lpc.h | 1 + |
| include/linux/mfd/88pm80x.h | 162 +- |
| include/linux/mfd/arizona/core.h | 3 + |
| include/linux/mfd/arizona/pdata.h | 14 +- |
| include/linux/mfd/arizona/registers.h | 220 +++ |
| include/linux/mfd/axp20x.h | 61 +- |
| include/linux/mfd/da9062/core.h | 50 + |
| include/linux/mfd/da9062/registers.h | 1108 ++++++++++++++ |
| include/linux/mfd/da9063/core.h | 1 + |
| 109 files changed, 4367 insertions(+), 449 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/mfd/da9062.txt |
| create mode 100644 Documentation/devicetree/bindings/timer/st,stih407-lpc |
| create mode 100644 drivers/clocksource/clksrc_st_lpc.c |
| create mode 100644 drivers/mfd/da9062-core.c |
| create mode 100644 drivers/mfd/wm8998-tables.c |
| create mode 100644 include/linux/mfd/da9062/core.h |
| create mode 100644 include/linux/mfd/da9062/registers.h |
| $ git am -3 ../patches/0001-ACPI-PM-merge-fix-for-code-movement.patch |
| Applying: ACPI / PM: merge fix for code movement |
| Using index info to reconstruct a base tree... |
| M drivers/acpi/bus.c |
| Falling back to patching base and 3-way merge... |
| Auto-merging drivers/acpi/bus.c |
| $ git reset HEAD^ |
| Unstaged changes after reset: |
| M drivers/acpi/bus.c |
| $ git add -A . |
| $ git commit -v -a --amend |
| [master 4034eb3e9221] Merge remote-tracking branch 'mfd/for-mfd-next' |
| Date: Wed Aug 5 12:14:56 2015 +1000 |
| Merging backlight/for-backlight-next (cca0ba2df3d4 backlight: Change the return type of backlight_update_status() to int) |
| $ git merge backlight/for-backlight-next |
| Already up-to-date. |
| Merging battery/master (3e1d9c6f2419 power: olpc_battery: clean up eeprom read function) |
| $ git merge battery/master |
| Auto-merging Documentation/devicetree/bindings/arm/atmel-at91.txt |
| Merge made by the 'recursive' strategy. |
| .../devicetree/bindings/arm/atmel-at91.txt | 2 +- |
| drivers/power/bq24190_charger.c | 1 - |
| drivers/power/bq24735-charger.c | 52 +++------ |
| drivers/power/bq27x00_battery.c | 123 +++++++++++---------- |
| drivers/power/ds2780_battery.c | 20 +--- |
| drivers/power/ds2781_battery.c | 8 -- |
| drivers/power/ltc2941-battery-gauge.c | 54 ++------- |
| drivers/power/olpc_battery.c | 7 +- |
| drivers/power/pm2301_charger.c | 1 - |
| drivers/power/reset/Kconfig | 7 ++ |
| drivers/power/reset/Makefile | 1 + |
| drivers/power/reset/at91-reset.c | 26 +++-- |
| drivers/power/reset/zx-reboot.c | 80 ++++++++++++++ |
| drivers/power/rt9455_charger.c | 16 ++- |
| drivers/power/twl4030_charger.c | 46 +++----- |
| 15 files changed, 224 insertions(+), 220 deletions(-) |
| create mode 100644 drivers/power/reset/zx-reboot.c |
| Merging omap_dss2/for-next (f778dad38a54 Merge omapdss scaling fixes) |
| $ git merge omap_dss2/for-next |
| Already up-to-date. |
| Merging regulator/for-next (55e3555a8b83 Merge remote-tracking branches 'regulator/topic/rk808', 'regulator/topic/stub' and 'regulator/topic/tps6586x' into regulator-next) |
| $ git merge regulator/for-next |
| Removing drivers/regulator/max77843.c |
| Auto-merging drivers/mfd/max77693.c |
| Merge made by the 'recursive' strategy. |
| .../devicetree/bindings/regulator/da9210.txt | 4 + |
| .../devicetree/bindings/regulator/da9211.txt | 32 ++- |
| .../bindings/regulator/max8973-regulator.txt | 6 + |
| .../bindings/regulator/mt6311-regulator.txt | 35 +++ |
| .../bindings/regulator/pwm-regulator.txt | 65 ++++-- |
| .../bindings/regulator/qcom,spmi-regulator.txt | 60 +++++- |
| .../devicetree/bindings/regulator/regulator.txt | 1 + |
| drivers/extcon/extcon-max77693.c | 94 ++++---- |
| drivers/extcon/extcon-max77843.c | 66 +++--- |
| drivers/input/misc/max77693-haptic.c | 1 + |
| drivers/input/misc/max77843-haptic.c | 3 +- |
| drivers/leds/leds-max77693.c | 1 + |
| drivers/mfd/max77693.c | 31 +-- |
| drivers/mfd/max77843.c | 20 +- |
| drivers/power/max77693_charger.c | 1 + |
| drivers/regulator/88pm800.c | 236 ++++++++------------- |
| drivers/regulator/Kconfig | 31 +-- |
| drivers/regulator/Makefile | 2 +- |
| drivers/regulator/act8865-regulator.c | 1 - |
| drivers/regulator/axp20x-regulator.c | 1 + |
| drivers/regulator/core.c | 23 ++ |
| drivers/regulator/da9062-regulator.c | 1 - |
| drivers/regulator/da9210-regulator.c | 76 ++++++- |
| drivers/regulator/da9211-regulator.c | 41 ++-- |
| drivers/regulator/da9211-regulator.h | 18 +- |
| drivers/regulator/fan53555.c | 1 + |
| drivers/regulator/isl6271a-regulator.c | 1 - |
| drivers/regulator/isl9305.c | 1 - |
| drivers/regulator/lp3971.c | 1 - |
| drivers/regulator/lp3972.c | 1 - |
| drivers/regulator/lp872x.c | 1 - |
| drivers/regulator/ltc3589.c | 3 +- |
| drivers/regulator/max1586.c | 1 - |
| drivers/regulator/max77693.c | 161 ++++++++++++-- |
| drivers/regulator/max77843.c | 201 ------------------ |
| drivers/regulator/max8660.c | 1 - |
| drivers/regulator/max8973-regulator.c | 81 ++++++- |
| drivers/regulator/mt6311-regulator.c | 180 ++++++++++++++++ |
| drivers/regulator/mt6311-regulator.h | 65 ++++++ |
| drivers/regulator/of_regulator.c | 3 + |
| drivers/regulator/pfuze100-regulator.c | 1 - |
| drivers/regulator/pwm-regulator.c | 160 ++++++++++---- |
| drivers/regulator/qcom_spmi-regulator.c | 203 +++++++++++++++++- |
| drivers/regulator/rk808-regulator.c | 212 ++++++++++++++++-- |
| drivers/regulator/tps51632-regulator.c | 1 - |
| drivers/regulator/tps62360-regulator.c | 1 - |
| drivers/regulator/tps65023-regulator.c | 1 - |
| drivers/regulator/tps6586x-regulator.c | 4 +- |
| include/linux/mfd/max77693-common.h | 49 +++++ |
| include/linux/mfd/max77693-private.h | 134 +++++------- |
| include/linux/mfd/max77843-private.h | 174 +++++++-------- |
| include/linux/regulator/consumer.h | 6 + |
| include/linux/regulator/da9211.h | 19 +- |
| include/linux/regulator/driver.h | 1 + |
| include/linux/regulator/machine.h | 1 + |
| include/linux/regulator/mt6311.h | 29 +++ |
| 56 files changed, 1750 insertions(+), 798 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/regulator/mt6311-regulator.txt |
| delete mode 100644 drivers/regulator/max77843.c |
| create mode 100644 drivers/regulator/mt6311-regulator.c |
| create mode 100644 drivers/regulator/mt6311-regulator.h |
| create mode 100644 include/linux/mfd/max77693-common.h |
| create mode 100644 include/linux/regulator/mt6311.h |
| Merging security/next (730daa164e7c Yama: remove needless CONFIG_SECURITY_YAMA_STACKED) |
| $ git merge security/next |
| Resolved 'security/yama/yama_lsm.c' using previous resolution. |
| Auto-merging security/yama/yama_lsm.c |
| CONFLICT (content): Merge conflict in security/yama/yama_lsm.c |
| Auto-merging MAINTAINERS |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master f550b699a0b4] Merge remote-tracking branch 'security/next' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/security/Yama.txt | 10 ++++------ |
| MAINTAINERS | 6 ++++++ |
| arch/mips/configs/pistachio_defconfig | 1 - |
| include/linux/lsm_hooks.h | 6 ++++-- |
| include/linux/ptrace.h | 1 + |
| include/linux/seccomp.h | 2 +- |
| include/uapi/linux/ptrace.h | 6 ++++-- |
| kernel/ptrace.c | 13 +++++++++++++ |
| kernel/seccomp.c | 17 ++++++++++++----- |
| security/Kconfig | 5 ----- |
| security/security.c | 11 +++-------- |
| security/yama/Kconfig | 9 +-------- |
| security/yama/yama_lsm.c | 33 ++++++++++----------------------- |
| 13 files changed, 59 insertions(+), 61 deletions(-) |
| Merging integrity/next (24fd03c87695 ima: update builtin policies) |
| $ git merge integrity/next |
| Already up-to-date. |
| Merging selinux/next (fda4d578ed0a selinux: explicitly declare the role "base_r") |
| $ git merge selinux/next |
| Auto-merging security/selinux/include/avc.h |
| Auto-merging security/selinux/hooks.c |
| Auto-merging security/selinux/avc.c |
| Auto-merging security/lsm_audit.c |
| Merge made by the 'recursive' strategy. |
| include/linux/lsm_audit.h | 7 + |
| scripts/selinux/mdp/mdp.c | 1 + |
| security/lsm_audit.c | 15 ++ |
| security/selinux/avc.c | 418 ++++++++++++++++++++++++++++++++++-- |
| security/selinux/hooks.c | 147 ++++++++----- |
| security/selinux/include/avc.h | 6 + |
| security/selinux/include/security.h | 32 ++- |
| security/selinux/ss/avtab.c | 104 +++++++-- |
| security/selinux/ss/avtab.h | 33 ++- |
| security/selinux/ss/conditional.c | 32 ++- |
| security/selinux/ss/conditional.h | 6 +- |
| security/selinux/ss/policydb.c | 5 + |
| security/selinux/ss/services.c | 213 ++++++++++++++++-- |
| security/selinux/ss/services.h | 6 + |
| 14 files changed, 915 insertions(+), 110 deletions(-) |
| Merging lblnet/next (b2776bf7149b Linux 3.18) |
| $ git merge lblnet/next |
| Already up-to-date. |
| Merging watchdog/master (1c4c7159ed24 Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) |
| $ git merge watchdog/master |
| Already up-to-date. |
| Merging iommu/next (bbd08c2a0188 Merge branches 'arm/omap', 'x86/vt-d' and 'core' into next) |
| $ git merge iommu/next |
| Merge made by the 'recursive' strategy. |
| .../devicetree/bindings/iommu/ti,omap-iommu.txt | 6 + |
| drivers/iommu/dmar.c | 2 +- |
| drivers/iommu/intel-iommu.c | 23 ++- |
| drivers/iommu/intel_irq_remapping.c | 2 + |
| drivers/iommu/of_iommu.c | 8 +- |
| drivers/iommu/omap-iommu-debug.c | 131 +++++++++++--- |
| drivers/iommu/omap-iommu.c | 198 ++------------------- |
| drivers/iommu/omap-iommu.h | 79 ++++---- |
| drivers/iommu/omap-iopgtable.h | 27 +-- |
| 9 files changed, 222 insertions(+), 254 deletions(-) |
| Merging dwmw2-iommu/master (5dbaf90a6780 iommu/vt-d: Add initial shell of SVM support) |
| $ git merge dwmw2-iommu/master |
| Auto-merging drivers/iommu/intel-iommu.c |
| Merge made by the 'recursive' strategy. |
| drivers/iommu/Kconfig | 10 +++- |
| drivers/iommu/Makefile | 1 + |
| drivers/iommu/intel-iommu.c | 19 +++++-- |
| drivers/iommu/intel-svm.c | 71 ++++++++++++++++++++++++++ |
| drivers/iommu/iova.c | 120 +++++++++++++++++++++++++------------------- |
| include/linux/intel-iommu.h | 15 ++++++ |
| include/linux/iova.h | 4 +- |
| 7 files changed, 183 insertions(+), 57 deletions(-) |
| create mode 100644 drivers/iommu/intel-svm.c |
| Merging vfio/next (a714ea5fa416 MAINTAINERS: Add vfio-platform sub-maintainer) |
| $ git merge vfio/next |
| Already up-to-date. |
| Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) |
| $ git merge osd/linux-next |
| Already up-to-date. |
| Merging jc_docs/docs-next (7c97211b61d8 Documentation: Minor changes to men-chameleon-bus.txt) |
| $ git merge jc_docs/docs-next |
| Auto-merging MAINTAINERS |
| Merge made by the 'recursive' strategy. |
| Documentation/CodingStyle | 2 - |
| Documentation/DocBook/Makefile | 2 +- |
| Documentation/SubmittingPatches | 10 +- |
| Documentation/arm/Samsung/Bootloader-interface.txt | 15 +- |
| Documentation/email-clients.txt | 2 +- |
| Documentation/filesystems/btrfs.txt | 16 +- |
| Documentation/filesystems/debugfs.txt | 40 +++++ |
| Documentation/kernel-doc-nano-HOWTO.txt | 2 +- |
| Documentation/men-chameleon-bus.txt | 163 +++++++++++++++++++++ |
| Documentation/networking/can.txt | 4 +- |
| Documentation/powerpc/cxl.txt | 2 +- |
| Documentation/powerpc/dscr.txt | 6 +- |
| Documentation/powerpc/qe_firmware.txt | 2 +- |
| Documentation/pps/pps.txt | 2 +- |
| Documentation/sysctl/vm.txt | 10 +- |
| MAINTAINERS | 2 + |
| README | 2 +- |
| 17 files changed, 249 insertions(+), 33 deletions(-) |
| create mode 100644 Documentation/men-chameleon-bus.txt |
| Merging trivial/for-next (79ce48df755e lpfc: Grammar s/an negative/a negative/) |
| $ git merge trivial/for-next |
| Already up-to-date. |
| Merging audit/next (aa7c043d9783 audit: eliminate unnecessary extra layer of watch parent references) |
| $ git merge audit/next |
| Auto-merging kernel/audit_watch.c |
| Merge made by the 'recursive' strategy. |
| kernel/audit_watch.c | 11 ++++------- |
| kernel/auditfilter.c | 16 +++------------- |
| 2 files changed, 7 insertions(+), 20 deletions(-) |
| Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) |
| $ git merge devicetree/devicetree/next |
| Already up-to-date. |
| Merging dt-rh/for-next (76f90d76c27a of: Add vendor prefix for Sharp Microelectronics) |
| $ git merge dt-rh/for-next |
| Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt |
| Merge made by the 'recursive' strategy. |
| Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + |
| 1 file changed, 1 insertion(+) |
| Merging mailbox/mailbox-for-next (7d641938aa2a mailbox/bcm2835: Fix mailbox full detection.) |
| $ git merge mailbox/mailbox-for-next |
| Already up-to-date. |
| Merging spi/for-next (fd80c811893d Merge remote-tracking branches 'spi/topic/spidev', 'spi/topic/stats' and 'spi/topic/xcomm' into spi-next) |
| $ git merge spi/for-next |
| Merge made by the 'recursive' strategy. |
| .../bindings/powerpc/fsl/mpc5121-psc.txt | 24 ++- |
| .../devicetree/bindings/spi/spi-davinci.txt | 2 + |
| .../devicetree/bindings/spi/spi-img-spfi.txt | 1 + |
| arch/powerpc/include/asm/mpc52xx_psc.h | 5 +- |
| drivers/spi/spi-bcm2835.c | 10 +- |
| drivers/spi/spi-bitbang-txrx.h | 4 +- |
| drivers/spi/spi-davinci.c | 50 ++++- |
| drivers/spi/spi-img-spfi.c | 71 +++++-- |
| drivers/spi/spi-mpc512x-psc.c | 70 ++++--- |
| drivers/spi/spi-omap2-mcspi.c | 10 + |
| drivers/spi/spi-pxa2xx-pci.c | 1 - |
| drivers/spi/spi-pxa2xx.c | 62 ++++++- |
| drivers/spi/spi-pxa2xx.h | 2 - |
| drivers/spi/spi-rockchip.c | 1 - |
| drivers/spi/spi-rspi.c | 19 +- |
| drivers/spi/spi-s3c24xx.c | 1 - |
| drivers/spi/spi-sh-msiof.c | 5 - |
| drivers/spi/spi-xcomm.c | 2 +- |
| drivers/spi/spi.c | 206 ++++++++++++++++++++- |
| drivers/spi/spidev.c | 8 +- |
| include/linux/platform_data/spi-davinci.h | 1 + |
| include/linux/pxa2xx_ssp.h | 1 + |
| include/linux/spi/spi.h | 64 +++++++ |
| 23 files changed, 522 insertions(+), 98 deletions(-) |
| Merging tip/auto-latest (40736f0db421 Merge branch 'x86/platform') |
| $ git merge tip/auto-latest |
| Resolved 'arch/arm/mach-shmobile/setup-r8a7779.c' using previous resolution. |
| Removing scripts/rt-tester/t5-l4-pi-boost-deboost.tst |
| Removing scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst |
| Removing scripts/rt-tester/t4-l2-pi-deboost.tst |
| Removing scripts/rt-tester/t3-l2-pi.tst |
| Removing scripts/rt-tester/t3-l1-pi-steal.tst |
| Removing scripts/rt-tester/t3-l1-pi-signal.tst |
| Removing scripts/rt-tester/t3-l1-pi-3rt.tst |
| Removing scripts/rt-tester/t3-l1-pi-2rt.tst |
| Removing scripts/rt-tester/t3-l1-pi-1rt.tst |
| Removing scripts/rt-tester/t2-l2-2rt-deadlock.tst |
| Removing scripts/rt-tester/t2-l1-signal.tst |
| Removing scripts/rt-tester/t2-l1-pi.tst |
| Removing scripts/rt-tester/t2-l1-2rt-sameprio.tst |
| Removing scripts/rt-tester/rt-tester.py |
| Removing scripts/rt-tester/check-all.sh |
| Auto-merging lib/Kconfig.debug |
| Removing kernel/locking/rtmutex-tester.c |
| Auto-merging include/linux/irqchip/arm-gic.h |
| Auto-merging include/linux/device.h |
| Auto-merging drivers/xen/events/events_base.c |
| Auto-merging drivers/thermal/intel_powerclamp.c |
| Removing drivers/irqchip/irqchip.h |
| Auto-merging drivers/irqchip/irq-mips-gic.c |
| Auto-merging drivers/irqchip/irq-i8259.c |
| Auto-merging drivers/irqchip/irq-gic.c |
| Auto-merging drivers/cpufreq/intel_pstate.c |
| Auto-merging drivers/base/core.c |
| Auto-merging arch/x86/platform/intel/iosf_mbi.c |
| Auto-merging arch/x86/platform/atom/pmc_atom.c |
| Removing arch/x86/include/asm/context_tracking.h |
| Removing arch/x86/boot/mca.c |
| Auto-merging arch/x86/Kconfig |
| Auto-merging arch/s390/pci/pci.c |
| Auto-merging arch/mips/kernel/Makefile |
| Auto-merging arch/mips/Kconfig |
| Auto-merging arch/arm/mach-shmobile/setup-r8a7779.c |
| CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7779.c |
| CONFLICT (modify/delete): arch/arm/mach-shmobile/intc-sh73a0.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/arm/mach-shmobile/intc-sh73a0.c left in tree. |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git rm -f arch/arm/mach-shmobile/intc-sh73a0.c |
| arch/arm/mach-shmobile/intc-sh73a0.c: needs merge |
| rm 'arch/arm/mach-shmobile/intc-sh73a0.c' |
| $ git commit -v -a |
| [master 574ab08a9ff4] Merge remote-tracking branch 'tip/auto-latest' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/fault-injection/fault-injection.txt | 11 + |
| Documentation/x86/zero-page.txt | 3 +- |
| arch/alpha/kernel/irq.c | 2 +- |
| arch/alpha/kernel/osf_sys.c | 13 +- |
| arch/arc/kernel/mcip.c | 3 +- |
| arch/arm/mach-shmobile/setup-r8a7779.c | 2 - |
| arch/arm/mach-ux500/cpu.c | 1 - |
| arch/arm/mach-zynq/common.c | 1 - |
| arch/avr32/include/asm/io.h | 1 + |
| arch/avr32/mach-at32ap/extint.c | 4 +- |
| arch/avr32/mach-at32ap/pio.c | 6 +- |
| arch/blackfin/mach-bf537/ints-priority.c | 4 +- |
| arch/blackfin/mach-common/ints-priority.c | 15 +- |
| arch/c6x/platforms/megamod-pic.c | 7 +- |
| arch/frv/include/asm/io.h | 1 + |
| arch/ia64/kernel/iosapic.c | 8 +- |
| arch/ia64/kernel/irq.c | 6 +- |
| arch/ia64/kernel/msi_ia64.c | 6 +- |
| arch/ia64/sn/kernel/msi_sn.c | 4 +- |
| arch/m32r/include/asm/io.h | 1 + |
| arch/m68k/coldfire/intc-5272.c | 4 +- |
| arch/m68k/include/asm/io_mm.h | 1 + |
| arch/m68k/mac/oss.c | 6 +- |
| arch/m68k/mac/psc.c | 3 +- |
| arch/microblaze/kernel/intc.c | 3 +- |
| arch/mips/Kconfig | 4 - |
| arch/mips/bmips/irq.c | 2 +- |
| arch/mips/kernel/Makefile | 1 - |
| arch/mips/pci/msi-octeon.c | 2 +- |
| arch/mn10300/include/asm/io.h | 1 + |
| arch/mn10300/kernel/cevt-mn10300.c | 2 +- |
| arch/mn10300/kernel/irq.c | 13 +- |
| arch/parisc/configs/c8000_defconfig | 1 - |
| arch/parisc/configs/generic-32bit_defconfig | 1 - |
| arch/parisc/kernel/irq.c | 12 +- |
| arch/powerpc/include/asm/io.h | 1 + |
| arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 3 +- |
| arch/powerpc/platforms/cell/axon_msi.c | 6 +- |
| arch/powerpc/platforms/cell/interrupt.c | 3 +- |
| arch/powerpc/platforms/embedded6xx/flipper-pic.c | 3 +- |
| arch/powerpc/platforms/pasemi/msi.c | 4 +- |
| arch/powerpc/platforms/powermac/pic.c | 3 +- |
| arch/powerpc/platforms/powernv/opal-irqchip.c | 3 +- |
| arch/powerpc/platforms/powernv/pci.c | 4 +- |
| arch/powerpc/platforms/ps3/interrupt.c | 3 +- |
| arch/powerpc/platforms/pseries/msi.c | 6 +- |
| arch/powerpc/sysdev/ehv_pic.c | 3 +- |
| arch/powerpc/sysdev/fsl_msi.c | 4 +- |
| arch/powerpc/sysdev/i8259.c | 3 +- |
| arch/powerpc/sysdev/ipic.c | 3 +- |
| arch/powerpc/sysdev/mpic.c | 3 +- |
| arch/powerpc/sysdev/mpic_u3msi.c | 4 +- |
| arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 4 +- |
| arch/powerpc/sysdev/ppc4xx_msi.c | 4 +- |
| arch/powerpc/sysdev/qe_lib/qe_ic.c | 3 +- |
| arch/powerpc/sysdev/xics/ics-opal.c | 2 +- |
| arch/powerpc/sysdev/xics/ics-rtas.c | 2 +- |
| arch/powerpc/sysdev/xics/xics-common.c | 3 +- |
| arch/s390/pci/pci.c | 6 +- |
| arch/sh/boards/mach-se/7343/irq.c | 2 +- |
| arch/sh/boards/mach-se/7722/irq.c | 2 +- |
| arch/sh/boards/mach-se/7724/irq.c | 3 +- |
| arch/sh/boards/mach-x3proto/gpio.c | 2 +- |
| arch/sh/include/asm/io.h | 1 + |
| arch/sh/kernel/irq.c | 9 +- |
| arch/sparc/kernel/irq_64.c | 27 +- |
| arch/sparc/kernel/leon_kernel.c | 6 +- |
| arch/sparc/kernel/pci.c | 2 +- |
| arch/sparc/kernel/sun4d_irq.c | 4 +- |
| arch/sparc/kernel/sun4m_irq.c | 6 +- |
| arch/tile/include/asm/io.h | 1 + |
| arch/tile/kernel/pci_gx.c | 5 +- |
| arch/um/include/shared/kern_util.h | 3 +- |
| arch/um/kernel/process.c | 6 +- |
| arch/um/kernel/signal.c | 8 +- |
| arch/um/kernel/tlb.c | 2 +- |
| arch/um/kernel/trap.c | 2 +- |
| arch/unicore32/kernel/irq.c | 5 +- |
| arch/x86/Kconfig | 60 ++- |
| arch/x86/Makefile | 13 +- |
| arch/x86/boot/Makefile | 2 +- |
| arch/x86/boot/boot.h | 3 - |
| arch/x86/boot/compressed/aslr.c | 2 +- |
| arch/x86/boot/compressed/eboot.c | 4 - |
| arch/x86/boot/compressed/misc.c | 24 + |
| arch/x86/boot/compressed/misc.h | 11 + |
| arch/x86/boot/main.c | 3 - |
| arch/x86/boot/mca.c | 38 -- |
| arch/x86/entry/Makefile | 1 + |
| arch/x86/entry/calling.h | 9 - |
| arch/x86/entry/common.c | 375 ++++++++++++++ |
| arch/x86/entry/entry_32.S | 24 +- |
| arch/x86/entry/entry_64.S | 197 ++----- |
| arch/x86/entry/entry_64_compat.S | 61 ++- |
| arch/x86/entry/syscalls/syscall_32.tbl | 15 + |
| arch/x86/entry/vdso/Makefile | 6 +- |
| arch/x86/entry/vdso/vclock_gettime.c | 16 +- |
| arch/x86/entry/vdso/vma.c | 7 +- |
| arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- |
| arch/x86/ia32/ia32_signal.c | 93 ---- |
| arch/x86/include/asm/barrier.h | 11 - |
| arch/x86/include/asm/context_tracking.h | 10 - |
| arch/x86/include/asm/cpufeature.h | 1 + |
| arch/x86/include/asm/elf.h | 17 +- |
| arch/x86/include/asm/ia32.h | 9 - |
| arch/x86/include/asm/io.h | 2 + |
| arch/x86/include/asm/iosf_mbi.h | 8 +- |
| arch/x86/include/asm/irq_vectors.h | 10 - |
| arch/x86/include/asm/math_emu.h | 6 +- |
| arch/x86/include/asm/microcode_amd.h | 1 + |
| arch/x86/include/asm/mmu.h | 2 + |
| arch/x86/include/asm/mmu_context.h | 28 +- |
| arch/x86/include/asm/msr.h | 61 ++- |
| arch/x86/include/asm/paravirt.h | 34 -- |
| arch/x86/include/asm/paravirt_types.h | 2 - |
| arch/x86/include/asm/pmc_atom.h | 29 ++ |
| arch/x86/include/asm/processor.h | 21 +- |
| arch/x86/include/asm/pvclock.h | 10 +- |
| arch/x86/include/asm/qrwlock.h | 4 +- |
| arch/x86/include/asm/sigframe.h | 10 + |
| arch/x86/include/asm/signal.h | 1 + |
| arch/x86/include/asm/stackprotector.h | 2 +- |
| arch/x86/include/asm/syscalls.h | 1 + |
| arch/x86/include/asm/thread_info.h | 11 +- |
| arch/x86/include/asm/traps.h | 4 +- |
| arch/x86/include/asm/tsc.h | 18 +- |
| arch/x86/include/asm/vm86.h | 57 +- |
| arch/x86/include/uapi/asm/bootparam.h | 2 +- |
| arch/x86/kernel/Makefile | 6 +- |
| arch/x86/kernel/acpi/boot.c | 8 +- |
| arch/x86/kernel/apb_timer.c | 8 +- |
| arch/x86/kernel/apic/apic.c | 92 ++-- |
| arch/x86/kernel/apic/io_apic.c | 2 +- |
| arch/x86/kernel/apic/msi.c | 2 +- |
| arch/x86/kernel/apic/vector.c | 11 +- |
| arch/x86/kernel/apic/x2apic_cluster.c | 2 +- |
| arch/x86/kernel/apm_32.c | 2 +- |
| arch/x86/kernel/cpu/amd.c | 6 +- |
| arch/x86/kernel/cpu/common.c | 18 + |
| arch/x86/kernel/cpu/cpu.h | 1 + |
| arch/x86/kernel/cpu/intel.c | 47 +- |
| arch/x86/kernel/cpu/mcheck/mce.c | 9 +- |
| arch/x86/kernel/cpu/mcheck/p5.c | 5 +- |
| arch/x86/kernel/cpu/mcheck/winchip.c | 4 +- |
| arch/x86/kernel/cpu/microcode/amd.c | 52 +- |
| arch/x86/kernel/cpu/microcode/amd_early.c | 24 +- |
| arch/x86/kernel/cpu/microcode/core.c | 2 +- |
| arch/x86/kernel/cpu/microcode/intel_early.c | 2 +- |
| arch/x86/kernel/cpu/perf_event.c | 6 +- |
| arch/x86/kernel/cpuid.c | 2 +- |
| arch/x86/kernel/espfix_64.c | 2 +- |
| arch/x86/kernel/hpet.c | 206 +++++--- |
| arch/x86/kernel/irq.c | 31 +- |
| arch/x86/kernel/kexec-bzimage64.c | 3 - |
| arch/x86/kernel/nmi.c | 10 +- |
| arch/x86/kernel/paravirt.c | 2 - |
| arch/x86/kernel/paravirt_patch_32.c | 2 - |
| arch/x86/kernel/process.c | 3 + |
| arch/x86/kernel/process_32.c | 1 + |
| arch/x86/kernel/process_64.c | 6 +- |
| arch/x86/kernel/ptrace.c | 340 +++--------- |
| arch/x86/kernel/setup.c | 5 - |
| arch/x86/kernel/signal.c | 33 +- |
| arch/x86/kernel/signal_compat.c | 95 ++++ |
| arch/x86/kernel/smpboot.c | 2 +- |
| arch/x86/kernel/step.c | 2 + |
| arch/x86/kernel/topology.c | 4 +- |
| arch/x86/kernel/trace_clock.c | 7 +- |
| arch/x86/kernel/traps.c | 88 ++-- |
| arch/x86/kernel/tsc.c | 12 +- |
| arch/x86/kernel/tsc_sync.c | 14 +- |
| arch/x86/kernel/uprobes.c | 9 + |
| arch/x86/kernel/vm86_32.c | 373 +++++++------ |
| arch/x86/kvm/lapic.c | 4 +- |
| arch/x86/kvm/svm.c | 4 +- |
| arch/x86/kvm/vmx.c | 4 +- |
| arch/x86/kvm/x86.c | 26 +- |
| arch/x86/lguest/boot.c | 24 +- |
| arch/x86/lib/delay.c | 13 +- |
| arch/x86/math-emu/get_address.c | 1 + |
| arch/x86/mm/fault.c | 7 +- |
| arch/x86/mm/init_32.c | 1 + |
| arch/x86/pci/intel_mid_pci.c | 36 +- |
| arch/x86/pci/xen.c | 8 +- |
| arch/x86/platform/Makefile | 1 + |
| arch/x86/platform/atom/Makefile | 3 +- |
| arch/x86/{kernel => platform/atom}/pmc_atom.c | 302 +++++++---- |
| arch/x86/platform/intel/Makefile | 1 + |
| arch/x86/{kernel => platform/intel}/iosf_mbi.c | 27 +- |
| arch/x86/platform/uv/uv_irq.c | 2 +- |
| arch/x86/platform/uv/uv_time.c | 37 +- |
| arch/x86/um/asm/barrier.h | 13 - |
| arch/x86/xen/enlighten.c | 3 - |
| arch/x86/xen/time.c | 80 ++- |
| arch/xtensa/configs/iss_defconfig | 1 - |
| arch/xtensa/kernel/irq.c | 10 +- |
| drivers/base/Makefile | 1 + |
| drivers/base/core.c | 3 + |
| drivers/base/platform-msi.c | 282 ++++++++++ |
| drivers/cpufreq/intel_pstate.c | 2 +- |
| drivers/cpuidle/cpuidle.c | 4 + |
| drivers/input/gameport/gameport.c | 4 +- |
| drivers/input/joystick/analog.c | 4 +- |
| drivers/irqchip/Kconfig | 4 + |
| drivers/irqchip/Makefile | 3 +- |
| drivers/irqchip/exynos-combiner.c | 20 +- |
| drivers/irqchip/irq-armada-370-xp.c | 5 +- |
| drivers/irqchip/irq-atmel-aic.c | 4 +- |
| drivers/irqchip/irq-atmel-aic5.c | 4 +- |
| drivers/irqchip/irq-bcm2835.c | 11 +- |
| drivers/irqchip/irq-bcm7038-l1.c | 7 +- |
| drivers/irqchip/irq-bcm7120-l2.c | 76 ++- |
| drivers/irqchip/irq-brcmstb-l2.c | 10 +- |
| drivers/irqchip/irq-clps711x.c | 3 +- |
| drivers/irqchip/irq-crossbar.c | 3 +- |
| drivers/irqchip/irq-digicolor.c | 3 +- |
| drivers/irqchip/irq-dw-apb-ictl.c | 56 +- |
| drivers/irqchip/irq-gic-v2m.c | 52 +- |
| drivers/irqchip/irq-gic-v3-its-pci-msi.c | 140 +++++ |
| drivers/irqchip/irq-gic-v3-its-platform-msi.c | 93 ++++ |
| drivers/irqchip/irq-gic-v3-its.c | 144 ++---- |
| drivers/irqchip/irq-gic-v3.c | 2 +- |
| drivers/irqchip/irq-gic.c | 20 +- |
| drivers/irqchip/irq-hip04.c | 6 +- |
| .../kernel/i8259.c => drivers/irqchip/irq-i8259.c | 8 +- |
| drivers/irqchip/irq-imgpdc.c | 11 +- |
| drivers/irqchip/irq-ingenic.c | 3 +- |
| drivers/irqchip/irq-keystone.c | 6 +- |
| drivers/irqchip/irq-metag-ext.c | 9 +- |
| drivers/irqchip/irq-metag.c | 3 +- |
| drivers/irqchip/irq-mips-cpu.c | 3 +- |
| drivers/irqchip/irq-mips-gic.c | 20 +- |
| drivers/irqchip/irq-mmp.c | 6 +- |
| drivers/irqchip/irq-moxart.c | 3 +- |
| drivers/irqchip/irq-mtk-sysirq.c | 3 +- |
| drivers/irqchip/irq-mxs.c | 3 +- |
| drivers/irqchip/irq-nvic.c | 3 +- |
| drivers/irqchip/irq-omap-intc.c | 38 +- |
| drivers/irqchip/irq-or1k-pic.c | 3 +- |
| drivers/irqchip/irq-orion.c | 9 +- |
| drivers/irqchip/irq-renesas-h8300h.c | 2 - |
| drivers/irqchip/irq-renesas-h8s.c | 2 +- |
| drivers/irqchip/irq-renesas-irqc.c | 16 +- |
| drivers/irqchip/irq-s3c24xx.c | 11 +- |
| drivers/irqchip/irq-sirfsoc.c | 50 +- |
| drivers/irqchip/irq-sun4i.c | 3 +- |
| drivers/irqchip/irq-sunxi-nmi.c | 7 +- |
| drivers/irqchip/irq-tb10x.c | 9 +- |
| drivers/irqchip/irq-tegra.c | 3 +- |
| drivers/irqchip/irq-versatile-fpga.c | 10 +- |
| drivers/irqchip/irq-vf610-mscm-ir.c | 3 +- |
| drivers/irqchip/irq-vic.c | 7 +- |
| drivers/irqchip/irq-vt8500.c | 9 +- |
| drivers/irqchip/irq-xtensa-mx.c | 3 +- |
| drivers/irqchip/irq-xtensa-pic.c | 3 +- |
| drivers/irqchip/irq-zevio.c | 3 +- |
| drivers/irqchip/irqchip.h | 11 - |
| drivers/irqchip/spear-shirq.c | 7 +- |
| drivers/net/ethernet/tile/tilegx.c | 4 +- |
| drivers/net/hamradio/baycom_epp.c | 2 +- |
| drivers/of/irq.c | 21 + |
| drivers/of/platform.c | 1 + |
| drivers/parisc/iosapic.c | 2 +- |
| drivers/pci/host/pci-keystone-dw.c | 21 +- |
| drivers/pci/host/pci-keystone.c | 13 +- |
| drivers/pci/host/pci-xgene-msi.c | 55 +- |
| drivers/pci/host/pcie-designware.c | 6 +- |
| drivers/pci/host/pcie-xilinx.c | 12 +- |
| drivers/pci/msi.c | 106 ++-- |
| drivers/pci/of.c | 30 ++ |
| drivers/pci/probe.c | 45 ++ |
| drivers/pci/xen-pcifront.c | 2 +- |
| drivers/scsi/dpt_i2o.c | 3 + |
| drivers/sh/intc/chip.c | 6 +- |
| drivers/sh/intc/core.c | 2 +- |
| drivers/sh/intc/virq.c | 29 +- |
| drivers/spmi/spmi-pmic-arb.c | 13 +- |
| drivers/staging/media/lirc/lirc_serial.c | 63 +-- |
| drivers/staging/ozwpan/ozproto.c | 17 +- |
| drivers/thermal/intel_powerclamp.c | 4 +- |
| drivers/video/fbdev/aty/atyfb.h | 5 +- |
| drivers/video/fbdev/aty/atyfb_base.c | 109 ++-- |
| drivers/xen/events/events_base.c | 4 +- |
| include/asm-generic/io.h | 30 +- |
| include/asm-generic/qrwlock.h | 58 +-- |
| include/linux/clockchips.h | 3 - |
| include/linux/context_tracking.h | 15 + |
| include/linux/context_tracking_state.h | 1 + |
| include/linux/device.h | 24 + |
| include/linux/irq.h | 19 +- |
| include/linux/irqchip/arm-gic-v3.h | 1 + |
| include/linux/irqchip/arm-gic.h | 1 - |
| include/linux/irqdomain.h | 26 +- |
| include/linux/jiffies.h | 9 +- |
| include/linux/msi.h | 109 +++- |
| include/linux/of_irq.h | 1 + |
| include/linux/pci.h | 5 +- |
| include/linux/spinlock.h | 30 +- |
| include/linux/tick.h | 25 +- |
| include/linux/uprobes.h | 17 + |
| include/uapi/linux/perf_event.h | 31 +- |
| kernel/events/core.c | 107 +++- |
| kernel/events/uprobes.c | 228 ++++---- |
| kernel/futex.c | 100 +++- |
| kernel/irq/chip.c | 24 +- |
| kernel/irq/generic-chip.c | 6 + |
| kernel/irq/handle.c | 4 +- |
| kernel/irq/internals.h | 11 +- |
| kernel/irq/irqdesc.c | 2 +- |
| kernel/irq/irqdomain.c | 18 +- |
| kernel/irq/manage.c | 64 +-- |
| kernel/irq/msi.c | 17 + |
| kernel/irq/pm.c | 12 +- |
| kernel/irq/resend.c | 4 +- |
| kernel/irq/spurious.c | 26 +- |
| kernel/locking/Makefile | 1 - |
| kernel/locking/qrwlock.c | 23 +- |
| kernel/locking/qspinlock_paravirt.h | 11 +- |
| kernel/locking/rtmutex-tester.c | 420 --------------- |
| kernel/locking/rtmutex.c | 2 +- |
| kernel/locking/rtmutex_common.h | 22 - |
| kernel/notifier.c | 2 + |
| kernel/sched/core.c | 2 +- |
| kernel/sched/fair.c | 109 ++-- |
| kernel/sched/features.h | 18 +- |
| kernel/sched/idle.c | 14 +- |
| kernel/sys_ni.c | 1 + |
| kernel/time/tick-common.c | 3 - |
| kernel/time/tick-sched.c | 72 +-- |
| kernel/time/time.c | 10 +- |
| lib/Kconfig.debug | 13 +- |
| scripts/rt-tester/check-all.sh | 21 - |
| scripts/rt-tester/rt-tester.py | 218 -------- |
| scripts/rt-tester/t2-l1-2rt-sameprio.tst | 94 ---- |
| scripts/rt-tester/t2-l1-pi.tst | 77 --- |
| scripts/rt-tester/t2-l1-signal.tst | 72 --- |
| scripts/rt-tester/t2-l2-2rt-deadlock.tst | 84 --- |
| scripts/rt-tester/t3-l1-pi-1rt.tst | 87 ---- |
| scripts/rt-tester/t3-l1-pi-2rt.tst | 88 ---- |
| scripts/rt-tester/t3-l1-pi-3rt.tst | 87 ---- |
| scripts/rt-tester/t3-l1-pi-signal.tst | 93 ---- |
| scripts/rt-tester/t3-l1-pi-steal.tst | 91 ---- |
| scripts/rt-tester/t3-l2-pi.tst | 87 ---- |
| scripts/rt-tester/t4-l2-pi-deboost.tst | 118 ----- |
| .../rt-tester/t5-l4-pi-boost-deboost-setsched.tst | 178 ------- |
| scripts/rt-tester/t5-l4-pi-boost-deboost.tst | 138 ----- |
| tools/lib/api/fs/debugfs.c | 15 +- |
| tools/lib/traceevent/event-parse.c | 68 ++- |
| tools/lib/traceevent/event-parse.h | 8 + |
| tools/perf/Build | 1 + |
| tools/perf/Documentation/perf-bench.txt | 4 + |
| tools/perf/Documentation/perf-record.txt | 23 +- |
| tools/perf/Documentation/perf-script.txt | 4 + |
| tools/perf/Makefile.perf | 5 + |
| tools/perf/bench/Build | 1 + |
| tools/perf/bench/bench.h | 2 + |
| tools/perf/bench/futex-lock-pi.c | 219 ++++++++ |
| tools/perf/bench/futex.h | 20 + |
| tools/perf/builtin-bench.c | 2 + |
| tools/perf/builtin-buildid-cache.c | 16 +- |
| tools/perf/builtin-buildid-list.c | 4 +- |
| tools/perf/builtin-inject.c | 1 + |
| tools/perf/builtin-probe.c | 3 +- |
| tools/perf/builtin-record.c | 23 +- |
| tools/perf/builtin-script.c | 48 +- |
| tools/perf/builtin-trace.c | 187 ++++--- |
| tools/perf/config/Makefile | 10 +- |
| tools/perf/perf.h | 3 + |
| tools/perf/python/twatch.py | 12 +- |
| tools/perf/tests/make | 13 +- |
| tools/perf/tests/parse-events.c | 12 +- |
| tools/perf/tests/thread-map.c | 4 + |
| tools/perf/trace/strace/groups/file | 18 + |
| tools/perf/util/Build | 1 + |
| tools/perf/util/build-id.c | 6 +- |
| tools/perf/util/build-id.h | 3 +- |
| tools/perf/util/dso.h | 4 + |
| tools/perf/util/event.c | 28 + |
| tools/perf/util/event.h | 12 + |
| tools/perf/util/evlist.c | 34 +- |
| tools/perf/util/evlist.h | 12 +- |
| tools/perf/util/evsel.c | 75 ++- |
| tools/perf/util/evsel.h | 28 +- |
| tools/perf/util/header.c | 35 +- |
| tools/perf/util/header.h | 1 + |
| tools/perf/util/machine.c | 27 +- |
| tools/perf/util/machine.h | 6 + |
| tools/perf/util/map.c | 14 + |
| tools/perf/util/map.h | 7 + |
| tools/perf/util/parse-events.c | 152 +++++- |
| tools/perf/util/parse-events.h | 1 + |
| tools/perf/util/probe-event.c | 388 +++----------- |
| tools/perf/util/probe-event.h | 7 + |
| tools/perf/util/probe-file.c | 301 +++++++++++ |
| tools/perf/util/probe-file.h | 18 + |
| tools/perf/util/probe-finder.c | 2 +- |
| tools/perf/util/python.c | 140 ++--- |
| tools/perf/util/record.c | 10 + |
| tools/perf/util/session.c | 25 +- |
| tools/perf/util/stat-shadow.c | 8 +- |
| tools/perf/util/string.c | 39 ++ |
| tools/perf/util/strlist.c | 43 +- |
| tools/perf/util/strlist.h | 9 +- |
| tools/perf/util/symbol-elf.c | 2 +- |
| tools/perf/util/symbol.c | 9 +- |
| tools/perf/util/thread_map.c | 6 +- |
| tools/perf/util/tool.h | 1 + |
| tools/perf/util/trace-event-info.c | 22 +- |
| tools/perf/util/trace-event-parse.c | 30 -- |
| tools/perf/util/trace-event-read.c | 28 +- |
| tools/perf/util/trace-event.c | 44 +- |
| tools/perf/util/trace-event.h | 2 + |
| tools/perf/util/util.h | 12 + |
| .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 4 +- |
| tools/testing/selftests/x86/Makefile | 4 +- |
| tools/testing/selftests/x86/entry_from_vm86.c | 139 ++++- |
| tools/testing/selftests/x86/ldt_gdt.c | 576 +++++++++++++++++++++ |
| tools/testing/selftests/x86/syscall_arg_fault.c | 130 +++++ |
| 418 files changed, 6577 insertions(+), 5550 deletions(-) |
| delete mode 100644 arch/x86/boot/mca.c |
| create mode 100644 arch/x86/entry/common.c |
| delete mode 100644 arch/x86/include/asm/context_tracking.h |
| create mode 100644 arch/x86/kernel/signal_compat.c |
| rename arch/x86/{kernel => platform/atom}/pmc_atom.c (53%) |
| create mode 100644 arch/x86/platform/intel/Makefile |
| rename arch/x86/{kernel => platform/intel}/iosf_mbi.c (93%) |
| create mode 100644 drivers/base/platform-msi.c |
| create mode 100644 drivers/irqchip/irq-gic-v3-its-pci-msi.c |
| create mode 100644 drivers/irqchip/irq-gic-v3-its-platform-msi.c |
| rename arch/mips/kernel/i8259.c => drivers/irqchip/irq-i8259.c (98%) |
| delete mode 100644 drivers/irqchip/irqchip.h |
| delete mode 100644 kernel/locking/rtmutex-tester.c |
| delete mode 100644 scripts/rt-tester/check-all.sh |
| delete mode 100755 scripts/rt-tester/rt-tester.py |
| delete mode 100644 scripts/rt-tester/t2-l1-2rt-sameprio.tst |
| delete mode 100644 scripts/rt-tester/t2-l1-pi.tst |
| delete mode 100644 scripts/rt-tester/t2-l1-signal.tst |
| delete mode 100644 scripts/rt-tester/t2-l2-2rt-deadlock.tst |
| delete mode 100644 scripts/rt-tester/t3-l1-pi-1rt.tst |
| delete mode 100644 scripts/rt-tester/t3-l1-pi-2rt.tst |
| delete mode 100644 scripts/rt-tester/t3-l1-pi-3rt.tst |
| delete mode 100644 scripts/rt-tester/t3-l1-pi-signal.tst |
| delete mode 100644 scripts/rt-tester/t3-l1-pi-steal.tst |
| delete mode 100644 scripts/rt-tester/t3-l2-pi.tst |
| delete mode 100644 scripts/rt-tester/t4-l2-pi-deboost.tst |
| delete mode 100644 scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst |
| delete mode 100644 scripts/rt-tester/t5-l4-pi-boost-deboost.tst |
| create mode 100644 tools/perf/bench/futex-lock-pi.c |
| create mode 100644 tools/perf/trace/strace/groups/file |
| create mode 100644 tools/perf/util/probe-file.c |
| create mode 100644 tools/perf/util/probe-file.h |
| create mode 100644 tools/testing/selftests/x86/ldt_gdt.c |
| create mode 100644 tools/testing/selftests/x86/syscall_arg_fault.c |
| Merging clockevents/clockevents/next (6fd817226ae6 clockevents/drivers/timer-sp804: Migrate to new 'set-state' interface) |
| $ git merge clockevents/clockevents/next |
| Auto-merging drivers/clocksource/Kconfig |
| Merge made by the 'recursive' strategy. |
| arch/x86/kernel/i8253.c | 2 +- |
| drivers/clocksource/Kconfig | 2 +- |
| drivers/clocksource/arm_arch_timer.c | 52 +++++----- |
| drivers/clocksource/arm_global_timer.c | 37 ++++--- |
| drivers/clocksource/asm9260_timer.c | 64 +++++++----- |
| drivers/clocksource/bcm2835_timer.c | 16 --- |
| drivers/clocksource/bcm_kona_timer.c | 17 +--- |
| drivers/clocksource/cadence_ttc_timer.c | 59 ++++++------ |
| drivers/clocksource/clps711x-timer.c | 6 -- |
| drivers/clocksource/cs5535-clockevt.c | 24 +++-- |
| drivers/clocksource/dummy_timer.c | 10 -- |
| drivers/clocksource/dw_apb_timer.c | 146 ++++++++++++++++------------ |
| drivers/clocksource/em_sti.c | 39 +++----- |
| drivers/clocksource/exynos_mct.c | 101 +++++++++---------- |
| drivers/clocksource/fsl_ftm_timer.c | 35 ++++--- |
| drivers/clocksource/i8253.c | 77 ++++++++------- |
| drivers/clocksource/meson6_timer.c | 50 +++++----- |
| drivers/clocksource/metag_generic.c | 20 ---- |
| drivers/clocksource/mips-gic-timer.c | 7 -- |
| drivers/clocksource/moxart_timer.c | 49 +++++----- |
| drivers/clocksource/mtk_timer.c | 32 +++--- |
| drivers/clocksource/mxs_timer.c | 80 ++++++--------- |
| drivers/clocksource/nomadik-mtu.c | 58 +++++------ |
| drivers/clocksource/pxa_timer.c | 39 +++----- |
| drivers/clocksource/qcom-timer.c | 24 ++--- |
| drivers/clocksource/rockchip_timer.c | 32 +++--- |
| drivers/clocksource/samsung_pwm_timer.c | 41 ++++---- |
| drivers/clocksource/sh_cmt.c | 65 ++++++------- |
| drivers/clocksource/sh_mtu2.c | 42 +++----- |
| drivers/clocksource/sh_tmu.c | 63 ++++++------ |
| drivers/clocksource/sun4i_timer.c | 41 ++++---- |
| drivers/clocksource/tcb_clksrc.c | 93 ++++++++++-------- |
| drivers/clocksource/tegra20_timer.c | 45 +++++---- |
| drivers/clocksource/time-armada-370-xp.c | 53 +++++----- |
| drivers/clocksource/time-efm32.c | 66 +++++++------ |
| drivers/clocksource/time-orion.c | 46 +++++---- |
| drivers/clocksource/timer-atlas7.c | 19 ++-- |
| drivers/clocksource/timer-atmel-pit.c | 41 ++++---- |
| drivers/clocksource/timer-atmel-st.c | 69 +++++++------ |
| drivers/clocksource/timer-digicolor.c | 41 ++++---- |
| drivers/clocksource/timer-imx-gpt.c | 75 ++++++++------- |
| drivers/clocksource/timer-integrator-ap.c | 58 ++++++----- |
| drivers/clocksource/timer-keystone.c | 44 +++------ |
| drivers/clocksource/timer-prima2.c | 34 +++---- |
| drivers/clocksource/timer-sp804.c | 54 +++++------ |
| drivers/clocksource/timer-stm32.c | 30 +++--- |
| drivers/clocksource/timer-sun5i.c | 45 +++++---- |
| drivers/clocksource/timer-u300.c | 155 +++++++++++++++--------------- |
| drivers/clocksource/vf_pit_timer.c | 27 +++--- |
| drivers/clocksource/vt8500_timer.c | 29 ++---- |
| drivers/clocksource/zevio-timer.c | 44 ++++----- |
| 51 files changed, 1157 insertions(+), 1241 deletions(-) |
| Merging edac/linux_next (fa2ce64f85be sb_edac: support for Broadwell -EP and -EX) |
| $ git merge edac/linux_next |
| Already up-to-date. |
| Merging edac-amd/for-next (f586abe27a44 EDAC, ppc4xx: Access mci->csrows array elements properly) |
| $ git merge edac-amd/for-next |
| Merge made by the 'recursive' strategy. |
| drivers/edac/mce_amd.c | 3 ++- |
| drivers/edac/ppc4xx_edac.c | 2 +- |
| drivers/edac/xgene_edac.c | 1 - |
| 3 files changed, 3 insertions(+), 3 deletions(-) |
| Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next) |
| $ git merge irqchip/irqchip/for-next |
| Already up-to-date! |
| Merge made by the 'recursive' strategy. |
| Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) |
| $ git merge tiny/tiny/next |
| Already up-to-date. |
| Merging ftrace/for-next (b44754d8262d ring_buffer: Allow to exit the ring buffer benchmark immediately) |
| $ git merge ftrace/for-next |
| Already up-to-date. |
| Merging rcu/rcu/next (623f41bedea6 rcu: Silence lockdep false positive for expedited grace periods) |
| $ git merge rcu/rcu/next |
| Resolved 'arch/x86/kernel/traps.c' using previous resolution. |
| Auto-merging scripts/checkpatch.pl |
| Auto-merging lib/Kconfig.debug |
| Auto-merging kernel/sched/core.c |
| Auto-merging kernel/cpu.c |
| Auto-merging init/Kconfig |
| Auto-merging include/linux/spinlock.h |
| Auto-merging arch/x86/kernel/traps.c |
| CONFLICT (content): Merge conflict in arch/x86/kernel/traps.c |
| Auto-merging arch/x86/kernel/cpu/mcheck/mce.c |
| Auto-merging MAINTAINERS |
| Auto-merging Documentation/kernel-parameters.txt |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master c312862d0db7] Merge remote-tracking branch 'rcu/rcu/next' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/RCU/rcu_dereference.txt | 2 +- |
| Documentation/RCU/stallwarn.txt | 29 +- |
| Documentation/RCU/trace.txt | 36 +- |
| Documentation/RCU/whatisRCU.txt | 2 +- |
| Documentation/kernel-parameters.txt | 35 +- |
| Documentation/memory-barriers.txt | 404 ++++++------ |
| MAINTAINERS | 6 +- |
| arch/powerpc/include/asm/spinlock.h | 2 - |
| arch/x86/kernel/cpu/mcheck/mce.c | 6 +- |
| arch/x86/kernel/traps.c | 2 +- |
| drivers/base/power/opp.c | 4 +- |
| include/linux/fdtable.h | 4 +- |
| include/linux/rcupdate.h | 144 +++-- |
| include/linux/rcutiny.h | 10 + |
| include/linux/rcutree.h | 2 + |
| include/linux/spinlock.h | 10 - |
| include/linux/types.h | 3 + |
| include/trace/events/rcu.h | 1 - |
| init/Kconfig | 10 +- |
| kernel/cgroup.c | 4 +- |
| kernel/cpu.c | 10 +- |
| kernel/pid.c | 5 +- |
| kernel/rcu/rcutorture.c | 42 +- |
| kernel/rcu/srcu.c | 15 +- |
| kernel/rcu/tiny.c | 8 +- |
| kernel/rcu/tree.c | 681 ++++++++++++--------- |
| kernel/rcu/tree.h | 96 ++- |
| kernel/rcu/tree_plugin.h | 130 +--- |
| kernel/rcu/tree_trace.c | 19 +- |
| kernel/rcu/update.c | 90 ++- |
| kernel/sched/core.c | 8 +- |
| kernel/time/Kconfig | 2 - |
| kernel/workqueue.c | 20 +- |
| lib/Kconfig.debug | 16 +- |
| scripts/checkpatch.pl | 19 + |
| security/device_cgroup.c | 6 +- |
| .../selftests/rcutorture/configs/rcu/TASKS01 | 4 +- |
| .../selftests/rcutorture/configs/rcu/TREE01 | 1 - |
| .../selftests/rcutorture/configs/rcu/TREE02 | 1 - |
| .../selftests/rcutorture/configs/rcu/TREE02-T | 1 - |
| .../selftests/rcutorture/configs/rcu/TREE03 | 1 - |
| .../selftests/rcutorture/configs/rcu/TREE04 | 1 - |
| .../selftests/rcutorture/configs/rcu/TREE05 | 1 - |
| .../selftests/rcutorture/configs/rcu/TREE06 | 1 - |
| .../selftests/rcutorture/configs/rcu/TREE07 | 1 - |
| .../selftests/rcutorture/configs/rcu/TREE08 | 1 - |
| .../selftests/rcutorture/configs/rcu/TREE08-T | 1 - |
| .../selftests/rcutorture/configs/rcu/TREE09 | 1 - |
| .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 1 - |
| 49 files changed, 992 insertions(+), 907 deletions(-) |
| Merging kvm/linux-next (554726d33c20 Merge tag 'kvm-s390-next-20150728' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next) |
| $ git merge kvm/linux-next |
| Auto-merging arch/x86/kvm/x86.c |
| Auto-merging arch/x86/kvm/vmx.c |
| Auto-merging arch/x86/kvm/svm.c |
| Auto-merging arch/s390/kvm/kvm-s390.c |
| Auto-merging arch/s390/kvm/interrupt.c |
| Auto-merging arch/s390/include/asm/kvm_host.h |
| Removing Documentation/s390/kvm.txt |
| Merge made by the 'recursive' strategy. |
| Documentation/s390/00-INDEX | 2 - |
| Documentation/s390/kvm.txt | 125 ------------- |
| Documentation/virtual/kvm/api.txt | 5 + |
| arch/s390/include/asm/kvm_host.h | 4 +- |
| arch/s390/kvm/diag.c | 13 +- |
| arch/s390/kvm/guestdbg.c | 35 ++++ |
| arch/s390/kvm/interrupt.c | 88 +++++---- |
| arch/s390/kvm/kvm-s390.c | 73 ++++++-- |
| arch/s390/kvm/kvm-s390.h | 11 +- |
| arch/s390/kvm/priv.c | 26 +-- |
| arch/s390/kvm/sigp.c | 13 +- |
| arch/s390/kvm/trace-s390.h | 33 ++-- |
| arch/x86/include/asm/kvm_host.h | 24 ++- |
| arch/x86/include/asm/vmx.h | 1 + |
| arch/x86/include/uapi/asm/vmx.h | 2 + |
| arch/x86/kvm/Makefile | 4 +- |
| arch/x86/kvm/hyperv.c | 377 ++++++++++++++++++++++++++++++++++++++ |
| arch/x86/kvm/hyperv.h | 32 ++++ |
| arch/x86/kvm/lapic.h | 2 +- |
| arch/x86/kvm/svm.c | 15 +- |
| arch/x86/kvm/vmx.c | 93 ++++++++-- |
| arch/x86/kvm/x86.c | 278 ++-------------------------- |
| arch/x86/kvm/x86.h | 5 + |
| include/linux/kvm_host.h | 4 + |
| include/uapi/linux/kvm.h | 2 + |
| 25 files changed, 741 insertions(+), 526 deletions(-) |
| delete mode 100644 Documentation/s390/kvm.txt |
| create mode 100644 arch/x86/kvm/hyperv.c |
| create mode 100644 arch/x86/kvm/hyperv.h |
| Merging kvm-arm/next (f6596a60303f arm64: KVM: remove remaining reference to vgic_sr_vectors) |
| $ git merge kvm-arm/next |
| Auto-merging include/uapi/linux/kvm.h |
| Auto-merging arch/arm64/kvm/hyp.S |
| Auto-merging arch/arm64/kernel/hw_breakpoint.c |
| Auto-merging Documentation/virtual/kvm/api.txt |
| Merge made by the 'recursive' strategy. |
| Documentation/virtual/kvm/api.txt | 15 +- |
| arch/arm/include/asm/kvm_host.h | 5 + |
| arch/arm/kvm/arm.c | 15 +- |
| arch/arm/kvm/guest.c | 6 + |
| arch/arm/kvm/interrupts.S | 14 +- |
| arch/arm64/include/asm/hw_breakpoint.h | 14 + |
| arch/arm64/include/asm/kvm_arm.h | 5 +- |
| arch/arm64/include/asm/kvm_asm.h | 26 +- |
| arch/arm64/include/asm/kvm_host.h | 42 ++- |
| arch/arm64/include/uapi/asm/kvm.h | 37 ++- |
| arch/arm64/kernel/asm-offsets.c | 9 +- |
| arch/arm64/kernel/hw_breakpoint.c | 12 - |
| arch/arm64/kvm/Makefile | 2 +- |
| arch/arm64/kvm/debug.c | 217 ++++++++++++ |
| arch/arm64/kvm/guest.c | 43 ++- |
| arch/arm64/kvm/handle_exit.c | 44 +++ |
| arch/arm64/kvm/hyp.S | 589 +++++++++++---------------------- |
| arch/arm64/kvm/reset.c | 16 + |
| arch/arm64/kvm/sys_regs.c | 291 ++++++++++++++-- |
| arch/arm64/kvm/sys_regs.h | 6 + |
| arch/arm64/kvm/sys_regs_generic_v8.c | 2 + |
| arch/arm64/kvm/trace.h | 123 +++++++ |
| include/uapi/linux/kvm.h | 5 + |
| 23 files changed, 1065 insertions(+), 473 deletions(-) |
| create mode 100644 arch/arm64/kvm/debug.c |
| Merging kvm-ppc/kvm-ppc-next (b79013b2449c Merge tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) |
| $ git merge kvm-ppc/kvm-ppc-next |
| Already up-to-date. |
| Merging kvms390/next (fdf036507f1f KVM: s390: host STP toleration for VMs) |
| $ git merge kvms390/next |
| Auto-merging arch/s390/kvm/kvm-s390.c |
| Auto-merging arch/s390/kvm/interrupt.c |
| Auto-merging arch/s390/kernel/time.c |
| Merge made by the 'recursive' strategy. |
| arch/s390/include/asm/etr.h | 3 +++ |
| arch/s390/kernel/time.c | 16 +++++++++++++--- |
| arch/s390/kvm/interrupt.c | 10 +++++++++- |
| arch/s390/kvm/kvm-s390.c | 38 ++++++++++++++++++++++++++++++++++++++ |
| arch/s390/kvm/priv.c | 2 ++ |
| 5 files changed, 65 insertions(+), 4 deletions(-) |
| Merging xen-tip/linux-next (e98f79cc5de0 xen-blkfront: convert to blk-mq APIs) |
| $ git merge xen-tip/linux-next |
| Auto-merging drivers/block/xen-blkfront.c |
| Merge made by the 'recursive' strategy. |
| arch/x86/xen/platform-pci-unplug.c | 2 +- |
| drivers/block/xen-blkfront.c | 146 +++++++++++++++---------------------- |
| drivers/xen/preempt.c | 2 +- |
| 3 files changed, 62 insertions(+), 88 deletions(-) |
| Merging percpu/for-next (292c24a073ee percpu: clean up of schunk->map[] assignment in pcpu_setup_first_chunk) |
| $ git merge percpu/for-next |
| Merge made by the 'recursive' strategy. |
| include/linux/percpu-defs.h | 6 ++---- |
| mm/percpu.c | 5 ++--- |
| 2 files changed, 4 insertions(+), 7 deletions(-) |
| Merging workqueues/for-next (1dadafa86a77 workqueue: Make flush_workqueue() available again to non GPL modules) |
| $ git merge workqueues/for-next |
| Auto-merging kernel/workqueue.c |
| Auto-merging MAINTAINERS |
| Merge made by the 'recursive' strategy. |
| MAINTAINERS | 1 + |
| kernel/workqueue.c | 2 +- |
| 2 files changed, 2 insertions(+), 1 deletion(-) |
| Merging drivers-x86/for-next (3e07e5baa2af toshiba_acpi: Add set_fan_status function) |
| $ git merge drivers-x86/for-next |
| Merge made by the 'recursive' strategy. |
| Documentation/ioctl/ioctl-number.txt | 2 +- |
| drivers/platform/x86/toshiba_acpi.c | 290 ++++++++++++++++++++++------------- |
| include/uapi/linux/toshiba.h | 32 +++- |
| 3 files changed, 217 insertions(+), 107 deletions(-) |
| Merging chrome-platform/for-next (96cba9b00e29 platform/chrome: chromeos_laptop - instantiate Atmel at primary address) |
| $ git merge chrome-platform/for-next |
| Already up-to-date. |
| Merging regmap/for-next (bd66dccff302 Merge remote-tracking branches 'regmap/topic/debugfs', 'regmap/topic/force-update' and 'regmap/topic/seq-delay' into regmap-next) |
| $ git merge regmap/for-next |
| Merge made by the 'recursive' strategy. |
| drivers/base/regmap/regcache-rbtree.c | 19 ++++++-- |
| drivers/base/regmap/regmap-debugfs.c | 90 +++++++++++++++++++++++++++++++++-- |
| drivers/base/regmap/regmap.c | 61 ++++++++++++++++++++---- |
| fs/debugfs/file.c | 14 +++--- |
| include/linux/debugfs.h | 20 ++++++++ |
| include/linux/regmap.h | 5 +- |
| 6 files changed, 185 insertions(+), 24 deletions(-) |
| $ git am -3 ../patches/mfd__Fixup_clients_of_multi_reg_write_register_patch.patch |
| Applying: mfd: Fixup clients of multi_reg_write/register_patch |
| $ git reset HEAD^ |
| Unstaged changes after reset: |
| M drivers/mfd/wm5110-tables.c |
| M drivers/mfd/wm8998-tables.c |
| $ git add -A . |
| $ git commit -v -a --amend |
| [master 587e23eb206d] Merge remote-tracking branch 'regmap/for-next' |
| Date: Wed Aug 5 13:31:37 2015 +1000 |
| Merging hsi/for-next (d770e558e219 Linux 4.2-rc1) |
| $ git merge hsi/for-next |
| Already up-to-date. |
| Merging leds/for-next (c5d39d96ac57 leds/led-class: Add missing put_device()) |
| $ git merge leds/for-next |
| Merge made by the 'recursive' strategy. |
| Documentation/devicetree/bindings/leds/common.txt | 27 ++-- |
| .../devicetree/bindings/leds/leds-ns2.txt | 9 ++ |
| arch/arm/boot/dts/kirkwood-d2net.dts | 5 + |
| arch/arm/boot/dts/kirkwood-is2.dts | 5 + |
| arch/arm/boot/dts/kirkwood-ns2.dts | 5 + |
| arch/arm/boot/dts/kirkwood-ns2max.dts | 5 + |
| arch/arm/boot/dts/kirkwood-ns2mini.dts | 5 + |
| drivers/leds/Kconfig | 19 ++- |
| drivers/leds/led-class.c | 7 +- |
| drivers/leds/leds-lm3530.c | 1 - |
| drivers/leds/leds-lm355x.c | 1 - |
| drivers/leds/leds-lm3642.c | 1 - |
| drivers/leds/leds-lp8860.c | 4 +- |
| drivers/leds/leds-ns2.c | 169 ++++++++++++--------- |
| drivers/leds/leds-pca955x.c | 1 - |
| drivers/leds/leds-pca963x.c | 1 - |
| drivers/leds/leds-tca6507.c | 1 - |
| drivers/leds/leds-tlc591xx.c | 4 - |
| drivers/leds/trigger/Kconfig | 2 +- |
| include/dt-bindings/leds/leds-ns2.h | 8 + |
| include/linux/platform_data/leds-kirkwood-ns2.h | 14 ++ |
| 21 files changed, 195 insertions(+), 99 deletions(-) |
| create mode 100644 include/dt-bindings/leds/leds-ns2.h |
| Merging ipmi/for-next (cc5c8d2cc014 ipmi: Make some data const that was only read) |
| $ git merge ipmi/for-next |
| Auto-merging drivers/char/ipmi/ipmi_powernv.c |
| Merge made by the 'recursive' strategy. |
| drivers/acpi/acpi_pnp.c | 2 - |
| drivers/char/ipmi/ipmi_bt_sm.c | 2 +- |
| drivers/char/ipmi/ipmi_kcs_sm.c | 2 +- |
| drivers/char/ipmi/ipmi_msghandler.c | 16 +- |
| drivers/char/ipmi/ipmi_powernv.c | 1 - |
| drivers/char/ipmi/ipmi_si_intf.c | 373 ++++++++++++++++++------------------ |
| drivers/char/ipmi/ipmi_si_sm.h | 10 +- |
| drivers/char/ipmi/ipmi_smic_sm.c | 2 +- |
| drivers/char/ipmi/ipmi_ssif.c | 6 +- |
| include/linux/ipmi_smi.h | 2 +- |
| 10 files changed, 207 insertions(+), 209 deletions(-) |
| Merging driver-core/driver-core-next (cbfe8fa6cd67 Linux 4.2-rc4) |
| $ git merge driver-core/driver-core-next |
| Already up-to-date. |
| Merging tty/tty-next (458e2c82c5fb Revert "tty: serial: imx.c: Reset UART before activating interrupts") |
| $ git merge tty/tty-next |
| Auto-merging arch/arm/boot/dts/am33xx.dtsi |
| Merge made by the 'recursive' strategy. |
| .../devicetree/bindings/serial/atmel-usart.txt | 3 + |
| .../devicetree/bindings/serial/omap_serial.txt | 3 + |
| arch/arm/boot/dts/am33xx.dtsi | 12 +- |
| drivers/tty/n_gsm.c | 2 +- |
| drivers/tty/n_tty.c | 15 +- |
| drivers/tty/pty.c | 8 + |
| drivers/tty/serial/8250/8250.h | 11 + |
| drivers/tty/serial/8250/8250_core.c | 3260 ++------------------ |
| drivers/tty/serial/8250/8250_early.c | 4 +- |
| drivers/tty/serial/8250/8250_fintek.c | 172 +- |
| drivers/tty/serial/8250/8250_ingenic.c | 1 - |
| drivers/tty/serial/8250/8250_omap.c | 133 +- |
| drivers/tty/serial/8250/8250_port.c | 2912 +++++++++++++++++ |
| drivers/tty/serial/8250/Makefile | 5 +- |
| drivers/tty/serial/Kconfig | 2 +- |
| drivers/tty/serial/atmel_serial.c | 467 ++- |
| drivers/tty/serial/etraxfs-uart.c | 9 +- |
| drivers/tty/serial/imx.c | 28 +- |
| drivers/tty/serial/lantiq.c | 8 +- |
| drivers/tty/serial/samsung.c | 1 - |
| drivers/tty/serial/sc16is7xx.c | 1 - |
| drivers/tty/serial/sirfsoc_uart.c | 126 +- |
| drivers/tty/serial/sirfsoc_uart.h | 5 +- |
| drivers/tty/serial/sn_console.c | 32 +- |
| drivers/tty/serial/stm32-usart.c | 2 +- |
| drivers/tty/serial/suncore.c | 11 +- |
| drivers/tty/serial/sunhv.c | 13 +- |
| drivers/tty/serial/ucc_uart.c | 2 +- |
| drivers/tty/tty_buffer.c | 12 +- |
| drivers/tty/tty_io.c | 84 +- |
| drivers/tty/tty_ioctl.c | 11 +- |
| drivers/tty/tty_ldisc.c | 15 +- |
| include/linux/atmel_serial.h | 240 +- |
| include/linux/serial_8250.h | 7 +- |
| include/linux/tty.h | 6 + |
| include/uapi/linux/gsmmux.h | 1 + |
| 36 files changed, 3994 insertions(+), 3630 deletions(-) |
| create mode 100644 drivers/tty/serial/8250/8250_port.c |
| Merging usb/usb-next (722b262c966a Merge 4.2-rc4 into usb-next) |
| $ git merge usb/usb-next |
| Merge made by the 'recursive' strategy. |
| Documentation/ABI/testing/sysfs-bus-usb | 14 ++++ |
| Documentation/usb/power-management.txt | 15 +++- |
| drivers/usb/atm/cxacru.c | 7 +- |
| drivers/usb/class/usblp.c | 66 ++++++++++------ |
| drivers/usb/core/driver.c | 1 + |
| drivers/usb/core/hcd.c | 19 +++-- |
| drivers/usb/core/hub.c | 4 + |
| drivers/usb/core/sysfs.c | 31 ++++++++ |
| drivers/usb/host/bcma-hcd.c | 128 +++++++++++++++++++++++++++----- |
| drivers/usb/host/ehci-fsl.c | 49 ++++++++---- |
| drivers/usb/host/ehci-fsl.h | 1 + |
| drivers/usb/host/fsl-mph-dr-of.c | 25 ++++++- |
| drivers/usb/host/xhci.c | 2 +- |
| drivers/usb/renesas_usbhs/mod_gadget.c | 62 ++++++++++++++++ |
| drivers/usb/storage/transport.c | 2 +- |
| include/linux/fsl_devices.h | 19 +++-- |
| 16 files changed, 366 insertions(+), 79 deletions(-) |
| Merging usb-gadget/next (5dbe135a1538 usb: gadget: epautoconf: remove ep and desc configuration from ep_matches()) |
| $ git merge usb-gadget/next |
| Resolved 'drivers/usb/renesas_usbhs/mod_gadget.c' using previous resolution. |
| Auto-merging drivers/usb/renesas_usbhs/mod_gadget.c |
| CONFLICT (content): Merge conflict in drivers/usb/renesas_usbhs/mod_gadget.c |
| Auto-merging drivers/usb/gadget/udc/bdc/bdc_ep.c |
| Auto-merging drivers/usb/gadget/function/f_uac2.c |
| Auto-merging drivers/usb/gadget/function/f_printer.c |
| Auto-merging drivers/usb/chipidea/core.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 05438b726f16] Merge remote-tracking branch 'usb-gadget/next' |
| $ git diff -M --stat --summary HEAD^.. |
| .../ABI/testing/configfs-usb-gadget-loopback | 2 +- |
| .../ABI/testing/configfs-usb-gadget-sourcesink | 2 +- |
| .../bindings/usb/allwinner,sun4i-a10-musb.txt | 29 + |
| Documentation/devicetree/bindings/usb/generic.txt | 15 + |
| .../devicetree/bindings/usb/msm-hsusb.txt | 4 + |
| .../devicetree/bindings/usb/qcom,usb-8x16-phy.txt | 76 +++ |
| Documentation/usb/gadget-testing.txt | 7 +- |
| drivers/staging/emxx_udc/emxx_udc.c | 76 ++- |
| drivers/usb/chipidea/ci.h | 5 +- |
| drivers/usb/chipidea/core.c | 15 + |
| drivers/usb/chipidea/debug.c | 1 + |
| drivers/usb/chipidea/udc.c | 21 +- |
| drivers/usb/common/common.c | 56 ++ |
| drivers/usb/dwc2/gadget.c | 15 +- |
| drivers/usb/dwc3/Kconfig | 7 - |
| drivers/usb/dwc3/Makefile | 2 - |
| drivers/usb/dwc3/core.c | 2 - |
| drivers/usb/dwc3/dwc3-exynos.c | 2 +- |
| drivers/usb/dwc3/dwc3-keystone.c | 2 +- |
| drivers/usb/dwc3/dwc3-omap.c | 75 +- |
| drivers/usb/dwc3/dwc3-pci.c | 26 +- |
| drivers/usb/dwc3/dwc3-qcom.c | 4 +- |
| drivers/usb/dwc3/dwc3-st.c | 4 - |
| drivers/usb/dwc3/ep0.c | 92 ++- |
| drivers/usb/dwc3/gadget.c | 57 +- |
| drivers/usb/gadget/composite.c | 41 +- |
| drivers/usb/gadget/config.c | 56 ++ |
| drivers/usb/gadget/configfs.c | 29 +- |
| drivers/usb/gadget/epautoconf.c | 168 ++--- |
| drivers/usb/gadget/function/f_ecm.c | 4 +- |
| drivers/usb/gadget/function/f_fs.c | 8 +- |
| drivers/usb/gadget/function/f_loopback.c | 5 - |
| drivers/usb/gadget/function/f_mass_storage.c | 162 ++--- |
| drivers/usb/gadget/function/f_mass_storage.h | 6 +- |
| drivers/usb/gadget/function/f_midi.c | 4 + |
| drivers/usb/gadget/function/f_ncm.c | 5 +- |
| drivers/usb/gadget/function/f_obex.c | 21 +- |
| drivers/usb/gadget/function/f_printer.c | 7 +- |
| drivers/usb/gadget/function/f_sourcesink.c | 5 - |
| drivers/usb/gadget/function/f_uac2.c | 31 +- |
| drivers/usb/gadget/function/f_uvc.c | 7 +- |
| drivers/usb/gadget/function/storage_common.h | 2 +- |
| drivers/usb/gadget/function/u_ether.h | 2 +- |
| drivers/usb/gadget/legacy/Kconfig | 1 + |
| drivers/usb/gadget/legacy/acm_ms.c | 41 +- |
| drivers/usb/gadget/legacy/audio.c | 40 +- |
| drivers/usb/gadget/legacy/cdc2.c | 35 +- |
| drivers/usb/gadget/legacy/dbgp.c | 10 +- |
| drivers/usb/gadget/legacy/ether.c | 36 +- |
| drivers/usb/gadget/legacy/g_ffs.c | 32 +- |
| drivers/usb/gadget/legacy/gmidi.c | 6 +- |
| drivers/usb/gadget/legacy/hid.c | 36 +- |
| drivers/usb/gadget/legacy/mass_storage.c | 41 +- |
| drivers/usb/gadget/legacy/multi.c | 43 +- |
| drivers/usb/gadget/legacy/ncm.c | 34 +- |
| drivers/usb/gadget/legacy/nokia.c | 104 ++- |
| drivers/usb/gadget/legacy/printer.c | 49 +- |
| drivers/usb/gadget/legacy/serial.c | 37 +- |
| drivers/usb/gadget/legacy/zero.c | 41 +- |
| drivers/usb/gadget/udc/amd5536udc.c | 88 ++- |
| drivers/usb/gadget/udc/at91_udc.c | 39 +- |
| drivers/usb/gadget/udc/atmel_usba_udc.c | 15 + |
| drivers/usb/gadget/udc/bcm63xx_udc.c | 29 +- |
| drivers/usb/gadget/udc/bdc/bdc_ep.c | 9 + |
| drivers/usb/gadget/udc/dummy_hcd.c | 95 ++- |
| drivers/usb/gadget/udc/fotg210-udc.c | 29 +- |
| drivers/usb/gadget/udc/fsl_qe_udc.c | 11 + |
| drivers/usb/gadget/udc/fsl_udc_core.c | 13 + |
| drivers/usb/gadget/udc/fusb300_udc.c | 11 + |
| drivers/usb/gadget/udc/goku_udc.c | 8 + |
| drivers/usb/gadget/udc/gr_udc.c | 11 + |
| drivers/usb/gadget/udc/lpc32xx_udc.c | 32 + |
| drivers/usb/gadget/udc/m66592-udc.c | 13 +- |
| drivers/usb/gadget/udc/mv_u3d_core.c | 9 + |
| drivers/usb/gadget/udc/mv_udc_core.c | 9 + |
| drivers/usb/gadget/udc/net2272.c | 15 +- |
| drivers/usb/gadget/udc/net2280.c | 67 +- |
| drivers/usb/gadget/udc/omap_udc.c | 22 + |
| drivers/usb/gadget/udc/pch_udc.c | 52 +- |
| drivers/usb/gadget/udc/pxa25x_udc.c | 30 + |
| drivers/usb/gadget/udc/pxa27x_udc.c | 3 +- |
| drivers/usb/gadget/udc/pxa27x_udc.h | 40 +- |
| drivers/usb/gadget/udc/r8a66597-udc.c | 10 + |
| drivers/usb/gadget/udc/s3c-hsudc.c | 15 + |
| drivers/usb/gadget/udc/s3c2410_udc.c | 10 + |
| drivers/usb/gadget/udc/udc-xilinx.c | 9 + |
| drivers/usb/isp1760/isp1760-udc.c | 15 +- |
| drivers/usb/musb/Kconfig | 51 +- |
| drivers/usb/musb/Makefile | 1 + |
| drivers/usb/musb/musb_dsps.c | 6 +- |
| drivers/usb/musb/musb_gadget.c | 13 + |
| drivers/usb/musb/sunxi.c | 756 +++++++++++++++++++++ |
| drivers/usb/phy/Kconfig | 14 + |
| drivers/usb/phy/Makefile | 1 + |
| drivers/usb/phy/phy-generic.c | 6 +- |
| drivers/usb/phy/phy-keystone.c | 6 +- |
| drivers/usb/phy/phy-msm-usb.c | 67 +- |
| drivers/usb/phy/phy-mxs-usb.c | 6 +- |
| drivers/usb/phy/phy-omap-otg.c | 22 +- |
| drivers/usb/phy/phy-qcom-8x16-usb.c | 436 ++++++++++++ |
| drivers/usb/phy/phy-tahvo.c | 27 +- |
| drivers/usb/renesas_usbhs/common.c | 2 +- |
| drivers/usb/renesas_usbhs/mod_gadget.c | 8 +- |
| include/linux/usb/chipidea.h | 1 + |
| include/linux/usb/composite.h | 2 + |
| include/linux/usb/gadget.h | 179 ++++- |
| include/linux/usb/msm_hsusb.h | 9 +- |
| include/linux/usb/of.h | 7 + |
| include/linux/usb/otg.h | 15 + |
| include/uapi/linux/usb/ch9.h | 12 + |
| 110 files changed, 3241 insertions(+), 861 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.txt |
| create mode 100644 Documentation/devicetree/bindings/usb/qcom,usb-8x16-phy.txt |
| create mode 100644 drivers/usb/musb/sunxi.c |
| create mode 100644 drivers/usb/phy/phy-qcom-8x16-usb.c |
| Merging usb-serial/usb-next (26c78daade0f USB: io_ti: Add heartbeat to keep idle EP/416 ports from disconnecting) |
| $ git merge usb-serial/usb-next |
| Merge made by the 'recursive' strategy. |
| drivers/usb/serial/ftdi_sio_ids.h | 2 +- |
| drivers/usb/serial/io_ti.c | 279 +++++++++++++++++++++++++++++--------- |
| drivers/usb/serial/pl2303.c | 35 +++-- |
| 3 files changed, 240 insertions(+), 76 deletions(-) |
| Merging staging/staging-next (948fa942dc6b staging: rtl8192e: probe: iounmap mmio when probe fails) |
| $ git merge staging/staging-next |
| Resolved 'drivers/staging/lustre/lustre/include/linux/lustre_compat25.h' using previous resolution. |
| Removing drivers/staging/xgifb/vb_util.c |
| Removing drivers/staging/wilc1000/wilc_wfi_netdevice.c |
| Removing drivers/staging/wilc1000/fifo_buffer.h |
| Removing drivers/staging/wilc1000/fifo_buffer.c |
| Removing drivers/staging/wilc1000/coreconfigsimulator.h |
| Auto-merging drivers/staging/vt6655/device_main.c |
| Auto-merging drivers/staging/lustre/lustre/include/linux/lustre_compat25.h |
| CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/include/linux/lustre_compat25.h |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master a98dd133723b] Merge remote-tracking branch 'staging/staging-next' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/ABI/testing/sysfs-bus-iio | 5 + |
| drivers/iio/accel/bma180.c | 1 - |
| drivers/iio/accel/bmc150-accel.c | 93 +- |
| drivers/iio/accel/kxcjk-1013.c | 3 - |
| drivers/iio/accel/mma9551_core.c | 35 +- |
| drivers/iio/accel/mma9551_core.h | 6 +- |
| drivers/iio/accel/mma9553.c | 81 +- |
| drivers/iio/accel/st_accel_i2c.c | 1 - |
| drivers/iio/accel/stk8312.c | 380 +++- |
| drivers/iio/accel/stk8ba50.c | 368 +++- |
| drivers/iio/adc/Kconfig | 48 +- |
| drivers/iio/adc/cc10001_adc.c | 26 +- |
| drivers/iio/adc/mcp3422.c | 1 - |
| drivers/iio/adc/ti-adc081c.c | 1 - |
| drivers/iio/common/ssp_sensors/ssp_dev.c | 1 - |
| drivers/iio/dac/ad5064.c | 1 - |
| drivers/iio/dac/ad5380.c | 1 - |
| drivers/iio/dac/ad5446.c | 1 - |
| drivers/iio/dac/max5821.c | 1 - |
| drivers/iio/frequency/adf4350.c | 1 - |
| drivers/iio/gyro/itg3200_core.c | 1 - |
| drivers/iio/gyro/st_gyro_i2c.c | 1 - |
| drivers/iio/humidity/si7005.c | 1 - |
| drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 7 +- |
| drivers/iio/industrialio-buffer.c | 18 +- |
| drivers/iio/industrialio-core.c | 8 + |
| drivers/iio/industrialio-triggered-buffer.c | 12 +- |
| drivers/iio/light/Kconfig | 13 +- |
| drivers/iio/light/Makefile | 1 + |
| drivers/iio/light/apds9300.c | 1 - |
| drivers/iio/light/bh1750.c | 1 - |
| drivers/iio/light/cm32181.c | 1 - |
| drivers/iio/light/cm3232.c | 1 - |
| drivers/iio/light/cm3323.c | 19 +- |
| drivers/iio/light/cm36651.c | 1 - |
| drivers/iio/light/gp2ap020a00f.c | 1 - |
| drivers/iio/light/hid-sensor-prox.c | 3 +- |
| drivers/iio/light/isl29125.c | 13 +- |
| drivers/iio/light/jsa1212.c | 1 - |
| drivers/iio/light/ltr501.c | 1 - |
| drivers/iio/light/rpr0521.c | 615 +++++++ |
| drivers/iio/light/tcs3414.c | 1 - |
| drivers/iio/light/tcs3472.c | 1 - |
| drivers/iio/light/tsl4531.c | 1 - |
| drivers/iio/light/vcnl4000.c | 1 - |
| drivers/iio/magnetometer/bmc150_magn.c | 71 +- |
| drivers/iio/magnetometer/st_magn_i2c.c | 1 - |
| drivers/iio/pressure/Kconfig | 6 +- |
| drivers/iio/pressure/ms5611.h | 16 +- |
| drivers/iio/pressure/ms5611_core.c | 82 +- |
| drivers/iio/pressure/ms5611_i2c.c | 6 +- |
| drivers/iio/pressure/ms5611_spi.c | 6 +- |
| drivers/iio/pressure/st_pressure_i2c.c | 1 - |
| drivers/iio/temperature/mlx90614.c | 1 - |
| drivers/iio/temperature/tmp006.c | 5 +- |
| drivers/staging/Kconfig | 2 + |
| drivers/staging/Makefile | 1 + |
| drivers/staging/android/ashmem.c | 4 +- |
| drivers/staging/android/ion/ion.c | 24 +- |
| drivers/staging/android/ion/ion_chunk_heap.c | 4 +- |
| drivers/staging/android/ion/ion_cma_heap.c | 4 +- |
| drivers/staging/android/ion/ion_page_pool.c | 5 +- |
| drivers/staging/android/ion/ion_system_heap.c | 16 +- |
| drivers/staging/comedi/Kconfig | 2 +- |
| drivers/staging/comedi/comedi_compat32.c | 3 +- |
| drivers/staging/comedi/comedi_fops.c | 6 +- |
| drivers/staging/comedi/drivers/cb_pcimdas.c | 6 +- |
| drivers/staging/comedi/drivers/dac02.c | 6 +- |
| drivers/staging/comedi/drivers/das08_cs.c | 4 +- |
| drivers/staging/comedi/drivers/das16.c | 3 +- |
| drivers/staging/comedi/drivers/das16m1.c | 41 +- |
| drivers/staging/comedi/drivers/dmm32at.c | 6 +- |
| drivers/staging/comedi/drivers/fl512.c | 6 +- |
| drivers/staging/comedi/drivers/ni_daq_dio24.c | 6 +- |
| drivers/staging/comedi/drivers/pcl816.c | 2 +- |
| drivers/staging/comedi/drivers/s626.c | 6 +- |
| drivers/staging/comedi/drivers/usbduxsigma.c | 214 +-- |
| drivers/staging/dgap/dgap.c | 45 +- |
| drivers/staging/dgnc/dgnc_driver.h | 6 +- |
| drivers/staging/fbtft/Kconfig | 6 + |
| drivers/staging/fbtft/Makefile | 1 + |
| drivers/staging/fbtft/fb_uc1611.c | 350 ++++ |
| drivers/staging/fbtft/fbtft-core.c | 5 + |
| drivers/staging/fbtft/fbtft_device.c | 31 + |
| drivers/staging/fbtft/flexfb.c | 26 +- |
| drivers/staging/fsl-mc/TODO | 24 +- |
| drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 31 +- |
| .../staging/ft1000/ft1000-usb/ft1000_download.c | 24 +- |
| drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 1 - |
| drivers/staging/iio/addac/adt7316-i2c.c | 1 - |
| drivers/staging/iio/iio_dummy_evgen.c | 1 + |
| drivers/staging/iio/iio_simple_dummy.c | 2 - |
| drivers/staging/iio/iio_simple_dummy.h | 1 + |
| drivers/staging/iio/iio_simple_dummy_buffer.c | 2 +- |
| drivers/staging/iio/light/isl29018.c | 1 - |
| drivers/staging/iio/light/isl29028.c | 1 - |
| .../staging/lustre/include/linux/libcfs/libcfs.h | 2 +- |
| .../lustre/include/linux/libcfs/libcfs_debug.h | 1 - |
| .../lustre/include/linux/libcfs/libcfs_fail.h | 18 +- |
| .../lustre/include/linux/libcfs/libcfs_private.h | 28 +- |
| .../lustre/include/linux/libcfs/libcfs_string.h | 2 - |
| .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 12 - |
| .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 2 +- |
| .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 5 - |
| .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 1 + |
| .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 3 +- |
| drivers/staging/lustre/lnet/lnet/router_proc.c | 11 - |
| drivers/staging/lustre/lustre/fid/fid_request.c | 4 +- |
| drivers/staging/lustre/lustre/fld/fld_cache.c | 2 +- |
| drivers/staging/lustre/lustre/fld/fld_request.c | 2 +- |
| .../lustre/lustre/include/linux/lustre_compat25.h | 58 - |
| .../lustre/include/linux/lustre_patchless_compat.h | 12 - |
| drivers/staging/lustre/lustre/include/obd.h | 2 +- |
| drivers/staging/lustre/lustre/include/obd_class.h | 3 +- |
| .../staging/lustre/lustre/include/obd_support.h | 16 +- |
| drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 2 +- |
| drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 3 +- |
| drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 4 +- |
| drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 17 +- |
| drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 8 +- |
| drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 1 + |
| drivers/staging/lustre/lustre/libcfs/debug.c | 149 +- |
| drivers/staging/lustre/lustre/libcfs/fail.c | 2 +- |
| drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 2 +- |
| .../staging/lustre/lustre/libcfs/libcfs_string.c | 2 +- |
| .../lustre/lustre/libcfs/linux/linux-crypto.c | 4 +- |
| drivers/staging/lustre/lustre/libcfs/module.c | 346 +--- |
| drivers/staging/lustre/lustre/libcfs/tracefile.c | 12 - |
| drivers/staging/lustre/lustre/libcfs/tracefile.h | 1 - |
| drivers/staging/lustre/lustre/llite/file.c | 5 +- |
| drivers/staging/lustre/lustre/llite/llite_capa.c | 40 +- |
| drivers/staging/lustre/lustre/llite/llite_lib.c | 4 +- |
| drivers/staging/lustre/lustre/llite/lloop.c | 4 +- |
| drivers/staging/lustre/lustre/llite/namei.c | 2 +- |
| drivers/staging/lustre/lustre/llite/vvp_page.c | 27 +- |
| drivers/staging/lustre/lustre/llite/xattr_cache.c | 2 +- |
| drivers/staging/lustre/lustre/lmv/lmv_intent.c | 2 +- |
| drivers/staging/lustre/lustre/lmv/lmv_obd.c | 8 +- |
| drivers/staging/lustre/lustre/lov/lov_dev.c | 2 +- |
| drivers/staging/lustre/lustre/lov/lov_io.c | 2 +- |
| drivers/staging/lustre/lustre/lov/lov_merge.c | 1 + |
| drivers/staging/lustre/lustre/lov/lov_obd.c | 9 +- |
| drivers/staging/lustre/lustre/lov/lov_pool.c | 2 +- |
| drivers/staging/lustre/lustre/lov/lov_request.c | 18 +- |
| drivers/staging/lustre/lustre/mdc/mdc_lib.c | 2 +- |
| drivers/staging/lustre/lustre/mdc/mdc_request.c | 6 +- |
| drivers/staging/lustre/lustre/mgc/mgc_request.c | 4 +- |
| drivers/staging/lustre/lustre/obdclass/cl_page.c | 30 +- |
| drivers/staging/lustre/lustre/obdclass/class_obd.c | 19 +- |
| drivers/staging/lustre/lustre/obdclass/genops.c | 22 +- |
| .../lustre/lustre/obdclass/linux/linux-module.c | 6 +- |
| .../lustre/lustre/obdclass/linux/linux-sysctl.c | 374 +--- |
| drivers/staging/lustre/lustre/obdclass/llog.c | 8 +- |
| .../lustre/lustre/obdclass/lprocfs_status.c | 4 +- |
| drivers/staging/lustre/lustre/obdclass/lu_object.c | 8 +- |
| .../staging/lustre/lustre/obdclass/lustre_peer.c | 2 +- |
| .../staging/lustre/lustre/obdclass/obd_config.c | 17 +- |
| drivers/staging/lustre/lustre/obdclass/obd_mount.c | 14 +- |
| drivers/staging/lustre/lustre/obdclass/uuid.c | 34 +- |
| .../staging/lustre/lustre/obdecho/echo_client.c | 10 +- |
| drivers/staging/lustre/lustre/osc/osc_cache.c | 6 - |
| drivers/staging/lustre/lustre/osc/osc_dev.c | 2 +- |
| drivers/staging/lustre/lustre/osc/osc_page.c | 2 +- |
| drivers/staging/lustre/lustre/osc/osc_request.c | 4 +- |
| drivers/staging/lustre/lustre/ptlrpc/client.c | 2 +- |
| drivers/staging/lustre/lustre/ptlrpc/events.c | 4 +- |
| drivers/staging/lustre/lustre/ptlrpc/import.c | 6 +- |
| .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 8 +- |
| drivers/staging/lustre/lustre/ptlrpc/nrs.c | 2 +- |
| .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 2 +- |
| drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 2 +- |
| drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +- |
| drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 2 +- |
| drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 2 +- |
| drivers/staging/lustre/lustre/ptlrpc/service.c | 8 +- |
| drivers/staging/lustre/sysfs-fs-lustre | 103 ++ |
| .../most/Documentation/ABI/sysfs-class-most.txt | 181 ++ |
| .../staging/most/Documentation/driver_usage.txt | 180 ++ |
| drivers/staging/most/Kconfig | 30 + |
| drivers/staging/most/Makefile | 8 + |
| drivers/staging/most/TODO | 8 + |
| drivers/staging/most/aim-cdev/Kconfig | 12 + |
| drivers/staging/most/aim-cdev/Makefile | 4 + |
| drivers/staging/most/aim-cdev/cdev.c | 528 ++++++ |
| drivers/staging/most/aim-network/Kconfig | 13 + |
| drivers/staging/most/aim-network/Makefile | 4 + |
| drivers/staging/most/aim-network/networking.c | 567 ++++++ |
| drivers/staging/most/aim-network/networking.h | 23 + |
| drivers/staging/most/aim-sound/Kconfig | 12 + |
| drivers/staging/most/aim-sound/Makefile | 4 + |
| drivers/staging/most/aim-sound/sound.c | 758 ++++++++ |
| drivers/staging/most/aim-v4l2/Kconfig | 12 + |
| drivers/staging/most/aim-v4l2/Makefile | 6 + |
| drivers/staging/most/aim-v4l2/video.c | 635 +++++++ |
| drivers/staging/most/hdm-dim2/Kconfig | 15 + |
| drivers/staging/most/hdm-dim2/Makefile | 5 + |
| drivers/staging/most/hdm-dim2/dim2_errors.h | 67 + |
| drivers/staging/most/hdm-dim2/dim2_hal.c | 919 ++++++++++ |
| drivers/staging/most/hdm-dim2/dim2_hal.h | 124 ++ |
| drivers/staging/most/hdm-dim2/dim2_hdm.c | 964 ++++++++++ |
| drivers/staging/most/hdm-dim2/dim2_hdm.h | 26 + |
| drivers/staging/most/hdm-dim2/dim2_reg.h | 176 ++ |
| drivers/staging/most/hdm-dim2/dim2_sysfs.c | 116 ++ |
| drivers/staging/most/hdm-dim2/dim2_sysfs.h | 39 + |
| drivers/staging/most/hdm-i2c/Kconfig | 12 + |
| drivers/staging/most/hdm-i2c/Makefile | 3 + |
| drivers/staging/most/hdm-i2c/hdm_i2c.c | 451 +++++ |
| drivers/staging/most/hdm-usb/Kconfig | 14 + |
| drivers/staging/most/hdm-usb/Makefile | 4 + |
| drivers/staging/most/hdm-usb/hdm_usb.c | 1454 +++++++++++++++ |
| drivers/staging/most/mostcore/Kconfig | 13 + |
| drivers/staging/most/mostcore/Makefile | 3 + |
| drivers/staging/most/mostcore/core.c | 1931 ++++++++++++++++++++ |
| drivers/staging/most/mostcore/mostcore.h | 316 ++++ |
| drivers/staging/mt29f_spinand/mt29f_spinand.c | 1 - |
| drivers/staging/octeon/ethernet-tx.c | 10 +- |
| drivers/staging/octeon/ethernet.c | 1 + |
| drivers/staging/ozwpan/ozusbsvc1.c | 1 + |
| drivers/staging/panel/panel.c | 12 +- |
| drivers/staging/rtl8188eu/core/rtw_ap.c | 5 +- |
| drivers/staging/rtl8188eu/core/rtw_debug.c | 2 + |
| drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 4 +- |
| drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 10 +- |
| drivers/staging/rtl8188eu/core/rtw_mlme.c | 39 +- |
| drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +- |
| drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 8 +- |
| drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 2 + |
| drivers/staging/rtl8188eu/hal/bb_cfg.c | 6 +- |
| drivers/staging/rtl8188eu/hal/hal_com.c | 27 +- |
| drivers/staging/rtl8188eu/hal/hal_intf.c | 32 - |
| drivers/staging/rtl8188eu/hal/odm.c | 11 +- |
| drivers/staging/rtl8188eu/hal/rf.c | 2 +- |
| drivers/staging/rtl8188eu/hal/rf_cfg.c | 2 +- |
| drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 21 - |
| drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 33 +- |
| drivers/staging/rtl8188eu/hal/usb_halinit.c | 99 +- |
| drivers/staging/rtl8188eu/include/HalVerDef.h | 84 - |
| drivers/staging/rtl8188eu/include/hal_intf.h | 16 - |
| drivers/staging/rtl8188eu/include/ieee80211.h | 54 - |
| drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 1 - |
| drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 8 - |
| drivers/staging/rtl8188eu/include/rtw_mlme.h | 3 +- |
| drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 1 - |
| drivers/staging/rtl8188eu/include/sta_info.h | 1 - |
| drivers/staging/rtl8188eu/include/wifi.h | 7 - |
| drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 22 +- |
| drivers/staging/rtl8188eu/os_dep/os_intfs.c | 2 +- |
| drivers/staging/rtl8188eu/os_dep/usb_intf.c | 79 +- |
| drivers/staging/rtl8192e/dot11d.c | 39 - |
| drivers/staging/rtl8192e/dot11d.h | 6 - |
| drivers/staging/rtl8192e/rtl8192e/r8190P_def.h | 46 - |
| drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 192 +- |
| drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h | 11 +- |
| drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 11 +- |
| drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h | 5 +- |
| drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 440 +++-- |
| drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 58 +- |
| .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 20 +- |
| .../staging/rtl8192e/rtl8192e/r8192E_firmware.h | 6 +- |
| drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 448 +++-- |
| drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 70 +- |
| drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 125 +- |
| drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 16 +- |
| drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 611 ++----- |
| drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 112 +- |
| drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 472 +++-- |
| drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 44 +- |
| drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c | 40 +- |
| drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h | 2 +- |
| drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 2 +- |
| drivers/staging/rtl8192e/rtl8192e/rtl_pci.h | 2 +- |
| drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 24 +- |
| drivers/staging/rtl8192e/rtl8192e/rtl_pm.h | 4 +- |
| drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 53 +- |
| drivers/staging/rtl8192e/rtl8192e/rtl_ps.h | 19 +- |
| drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 132 +- |
| drivers/staging/rtl8192e/rtl819x_BA.h | 5 - |
| drivers/staging/rtl8192e/rtl819x_BAProc.c | 5 +- |
| drivers/staging/rtl8192e/rtl819x_HT.h | 2 - |
| drivers/staging/rtl8192e/rtl819x_HTProc.c | 5 +- |
| drivers/staging/rtl8192e/rtl819x_Qos.h | 5 - |
| drivers/staging/rtl8192e/rtl819x_TS.h | 2 - |
| drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- |
| drivers/staging/rtl8192e/rtllib.h | 92 - |
| drivers/staging/rtl8192e/rtllib_debug.h | 8 - |
| drivers/staging/rtl8192e/rtllib_rx.c | 91 +- |
| drivers/staging/rtl8192e/rtllib_softmac.c | 30 +- |
| drivers/staging/rtl8192e/rtllib_tx.c | 9 +- |
| drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 4 +- |
| .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 6 +- |
| .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +- |
| drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 +- |
| .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 17 +- |
| .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 16 +- |
| .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 4 +- |
| drivers/staging/rtl8192u/r8192U_core.c | 14 +- |
| drivers/staging/rtl8192u/r8192U_dm.c | 8 +- |
| drivers/staging/rtl8192u/r819xU_firmware.c | 12 +- |
| drivers/staging/rtl8712/rtl8712_recv.c | 4 +- |
| drivers/staging/rtl8712/rtl871x_security.c | 35 +- |
| drivers/staging/rtl8723au/core/rtw_recv.c | 3 +- |
| drivers/staging/rtl8723au/hal/odm.c | 2 +- |
| drivers/staging/rts5208/sd.c | 11 +- |
| drivers/staging/slicoss/slicoss.c | 1 + |
| drivers/staging/sm750fb/ddk750_chip.c | 15 +- |
| drivers/staging/sm750fb/ddk750_chip.h | 12 +- |
| drivers/staging/sm750fb/ddk750_display.c | 170 +- |
| drivers/staging/sm750fb/ddk750_display.h | 11 +- |
| drivers/staging/sm750fb/ddk750_dvi.c | 75 +- |
| drivers/staging/sm750fb/ddk750_dvi.h | 3 +- |
| drivers/staging/sm750fb/ddk750_help.c | 8 +- |
| drivers/staging/sm750fb/ddk750_help.h | 4 +- |
| drivers/staging/sm750fb/ddk750_hwi2c.c | 244 ++- |
| drivers/staging/sm750fb/ddk750_mode.c | 164 +- |
| drivers/staging/sm750fb/ddk750_mode.h | 52 +- |
| drivers/staging/sm750fb/ddk750_power.c | 261 ++- |
| drivers/staging/sm750fb/ddk750_power.h | 11 +- |
| drivers/staging/sm750fb/ddk750_reg.h | 18 +- |
| drivers/staging/sm750fb/ddk750_sii164.c | 389 ++-- |
| drivers/staging/sm750fb/ddk750_sii164.h | 31 +- |
| drivers/staging/sm750fb/sm750.c | 8 +- |
| drivers/staging/sm750fb/sm750.h | 58 +- |
| drivers/staging/sm750fb/sm750_accel.c | 381 ++-- |
| drivers/staging/sm750fb/sm750_accel.h | 4 +- |
| drivers/staging/sm750fb/sm750_cursor.c | 51 +- |
| drivers/staging/sm750fb/sm750_help.h | 28 +- |
| drivers/staging/sm750fb/sm750_hw.c | 414 +++-- |
| drivers/staging/sm750fb/sm750_hw.h | 42 +- |
| drivers/staging/sm7xxfb/sm7xx.h | 39 +- |
| drivers/staging/sm7xxfb/sm7xxfb.c | 69 +- |
| drivers/staging/speakup/keyhelp.c | 2 +- |
| drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1 - |
| drivers/staging/unisys/Kconfig | 2 +- |
| drivers/staging/unisys/include/channel_guid.h | 24 +- |
| drivers/staging/unisys/include/visorbus.h | 3 +- |
| drivers/staging/unisys/visorbus/controlvmchannel.h | 9 +- |
| .../unisys/visorbus/controlvmcompletionstatus.h | 9 +- |
| drivers/staging/unisys/visorbus/iovmcall_gnuc.h | 9 +- |
| drivers/staging/unisys/visorbus/periodic_work.c | 9 +- |
| drivers/staging/unisys/visorbus/vbuschannel.h | 9 +- |
| drivers/staging/unisys/visorbus/vbusdeviceinfo.h | 9 +- |
| drivers/staging/unisys/visorbus/visorbus_main.c | 107 +- |
| drivers/staging/unisys/visorbus/visorbus_private.h | 9 +- |
| drivers/staging/unisys/visorbus/visorchannel.c | 22 +- |
| drivers/staging/unisys/visorbus/visorchipset.c | 22 +- |
| drivers/staging/unisys/visorbus/vmcallinterface.h | 9 +- |
| drivers/staging/unisys/visornic/visornic_main.c | 985 +++++----- |
| drivers/staging/vme/devices/vme_user.c | 164 +- |
| drivers/staging/vt6655/baseband.c | 6 +- |
| drivers/staging/vt6655/card.c | 9 +- |
| drivers/staging/vt6655/desc.h | 78 +- |
| drivers/staging/vt6655/device.h | 1 + |
| drivers/staging/vt6655/device_cfg.h | 15 - |
| drivers/staging/vt6655/device_main.c | 48 +- |
| drivers/staging/vt6655/dpc.c | 2 +- |
| drivers/staging/vt6655/mac.c | 18 - |
| drivers/staging/vt6655/power.c | 16 +- |
| drivers/staging/vt6655/rf.c | 532 +++--- |
| drivers/staging/vt6655/rf.h | 24 +- |
| drivers/staging/vt6655/rxtx.c | 4 +- |
| drivers/staging/vt6655/upc.h | 36 +- |
| drivers/staging/vt6656/rxtx.c | 7 +- |
| drivers/staging/wilc1000/Kconfig | 28 +- |
| drivers/staging/wilc1000/Makefile | 4 +- |
| drivers/staging/wilc1000/coreconfigsimulator.h | 17 - |
| drivers/staging/wilc1000/coreconfigurator.c | 117 +- |
| drivers/staging/wilc1000/coreconfigurator.h | 15 +- |
| drivers/staging/wilc1000/fifo_buffer.c | 133 -- |
| drivers/staging/wilc1000/fifo_buffer.h | 26 - |
| drivers/staging/wilc1000/host_interface.c | 415 ++--- |
| drivers/staging/wilc1000/host_interface.h | 1 - |
| drivers/staging/wilc1000/linux_mon.c | 21 +- |
| drivers/staging/wilc1000/linux_wlan.c | 171 +- |
| drivers/staging/wilc1000/wilc_sdio.c | 288 +-- |
| drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 28 +- |
| drivers/staging/wilc1000/wilc_wfi_netdevice.c | 951 ---------- |
| drivers/staging/wilc1000/wilc_wfi_netdevice.h | 12 +- |
| drivers/staging/wilc1000/wilc_wlan.c | 5 +- |
| drivers/staging/wilc1000/wilc_wlan_cfg.c | 6 - |
| drivers/staging/wilc1000/wilc_wlan_if.h | 4 +- |
| drivers/staging/xgifb/Makefile | 2 +- |
| drivers/staging/xgifb/XGI_main_26.c | 12 +- |
| drivers/staging/xgifb/vb_util.c | 42 - |
| drivers/staging/xgifb/vb_util.h | 44 +- |
| include/linux/iio/triggered_buffer.h | 4 +- |
| tools/iio/generic_buffer.c | 67 +- |
| tools/iio/iio_event_monitor.c | 27 +- |
| tools/iio/iio_utils.c | 121 +- |
| tools/iio/iio_utils.h | 15 +- |
| tools/iio/lsiio.c | 43 +- |
| 390 files changed, 16873 insertions(+), 8648 deletions(-) |
| create mode 100644 drivers/iio/light/rpr0521.c |
| create mode 100644 drivers/staging/fbtft/fb_uc1611.c |
| create mode 100644 drivers/staging/most/Documentation/ABI/sysfs-class-most.txt |
| create mode 100644 drivers/staging/most/Documentation/driver_usage.txt |
| create mode 100644 drivers/staging/most/Kconfig |
| create mode 100644 drivers/staging/most/Makefile |
| create mode 100644 drivers/staging/most/TODO |
| create mode 100644 drivers/staging/most/aim-cdev/Kconfig |
| create mode 100644 drivers/staging/most/aim-cdev/Makefile |
| create mode 100644 drivers/staging/most/aim-cdev/cdev.c |
| create mode 100644 drivers/staging/most/aim-network/Kconfig |
| create mode 100644 drivers/staging/most/aim-network/Makefile |
| create mode 100644 drivers/staging/most/aim-network/networking.c |
| create mode 100644 drivers/staging/most/aim-network/networking.h |
| create mode 100644 drivers/staging/most/aim-sound/Kconfig |
| create mode 100644 drivers/staging/most/aim-sound/Makefile |
| create mode 100644 drivers/staging/most/aim-sound/sound.c |
| create mode 100644 drivers/staging/most/aim-v4l2/Kconfig |
| create mode 100644 drivers/staging/most/aim-v4l2/Makefile |
| create mode 100644 drivers/staging/most/aim-v4l2/video.c |
| create mode 100644 drivers/staging/most/hdm-dim2/Kconfig |
| create mode 100644 drivers/staging/most/hdm-dim2/Makefile |
| create mode 100644 drivers/staging/most/hdm-dim2/dim2_errors.h |
| create mode 100644 drivers/staging/most/hdm-dim2/dim2_hal.c |
| create mode 100644 drivers/staging/most/hdm-dim2/dim2_hal.h |
| create mode 100644 drivers/staging/most/hdm-dim2/dim2_hdm.c |
| create mode 100644 drivers/staging/most/hdm-dim2/dim2_hdm.h |
| create mode 100644 drivers/staging/most/hdm-dim2/dim2_reg.h |
| create mode 100644 drivers/staging/most/hdm-dim2/dim2_sysfs.c |
| create mode 100644 drivers/staging/most/hdm-dim2/dim2_sysfs.h |
| create mode 100644 drivers/staging/most/hdm-i2c/Kconfig |
| create mode 100644 drivers/staging/most/hdm-i2c/Makefile |
| create mode 100644 drivers/staging/most/hdm-i2c/hdm_i2c.c |
| create mode 100644 drivers/staging/most/hdm-usb/Kconfig |
| create mode 100644 drivers/staging/most/hdm-usb/Makefile |
| create mode 100644 drivers/staging/most/hdm-usb/hdm_usb.c |
| create mode 100644 drivers/staging/most/mostcore/Kconfig |
| create mode 100644 drivers/staging/most/mostcore/Makefile |
| create mode 100644 drivers/staging/most/mostcore/core.c |
| create mode 100644 drivers/staging/most/mostcore/mostcore.h |
| delete mode 100644 drivers/staging/wilc1000/coreconfigsimulator.h |
| delete mode 100644 drivers/staging/wilc1000/fifo_buffer.c |
| delete mode 100644 drivers/staging/wilc1000/fifo_buffer.h |
| delete mode 100644 drivers/staging/wilc1000/wilc_wfi_netdevice.c |
| delete mode 100644 drivers/staging/xgifb/vb_util.c |
| $ git am -3 ../patches/0001-staging-lustre-fix-for-bio_endio-API-change.patch |
| Applying: staging/lustre: fix for bio_endio() API change |
| $ git reset HEAD^ |
| Unstaged changes after reset: |
| M drivers/staging/lustre/lustre/llite/lloop.c |
| $ git add -A . |
| $ git commit -v -a --amend |
| [master abb23939a3a6] Merge remote-tracking branch 'staging/staging-next' |
| Date: Wed Aug 5 13:41:44 2015 +1000 |
| Merging char-misc/char-misc-next (ccf97fe3ddac ARM: dts: qcom: Add dts changes for qcom coincell charger) |
| $ git merge char-misc/char-misc-next |
| Auto-merging drivers/misc/eeprom/at24.c |
| Merge made by the 'recursive' strategy. |
| .../bindings/power/qcom,coincell-charger.txt | 48 +++++++ |
| .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 10 ++ |
| arch/arm/boot/dts/qcom-pm8941.dtsi | 6 + |
| drivers/char/misc.c | 8 +- |
| drivers/misc/Kconfig | 10 ++ |
| drivers/misc/Makefile | 1 + |
| drivers/misc/ad525x_dpot-i2c.c | 1 - |
| drivers/misc/apds990x.c | 1 - |
| drivers/misc/bh1770glc.c | 1 - |
| drivers/misc/bmp085-i2c.c | 1 - |
| drivers/misc/eeprom/at24.c | 1 - |
| drivers/misc/isl29003.c | 1 - |
| drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 1 - |
| drivers/misc/qcom-coincell.c | 152 +++++++++++++++++++++ |
| drivers/misc/ti-st/st_kim.c | 1 - |
| drivers/misc/tsl2550.c | 1 - |
| 16 files changed, 231 insertions(+), 13 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/power/qcom,coincell-charger.txt |
| create mode 100644 drivers/misc/qcom-coincell.c |
| Merging extcon/extcon-next (4e491fe7920c extcon: Fix signedness bugs about break error handling) |
| $ git merge extcon/extcon-next |
| Auto-merging drivers/extcon/extcon-max77843.c |
| Merge made by the 'recursive' strategy. |
| drivers/extcon/extcon-arizona.c | 101 ++++++++++++++++++++++++++++++++------- |
| drivers/extcon/extcon-gpio.c | 18 ------- |
| drivers/extcon/extcon-max77843.c | 9 ++++ |
| drivers/extcon/extcon-palmas.c | 3 -- |
| drivers/extcon/extcon-rt8973a.c | 1 - |
| drivers/extcon/extcon-sm5502.c | 1 - |
| drivers/extcon/extcon.c | 48 ++++++++++++++----- |
| include/linux/extcon.h | 7 --- |
| 8 files changed, 127 insertions(+), 61 deletions(-) |
| Merging kdbus/kdbus (63c8e2f6f337 kdbus: fix wrong message size on 32bit) |
| $ git merge kdbus/kdbus |
| Auto-merging tools/testing/selftests/Makefile |
| Auto-merging init/Kconfig |
| Auto-merging include/uapi/linux/Kbuild |
| Auto-merging Makefile |
| Auto-merging MAINTAINERS |
| Auto-merging Documentation/ioctl/ioctl-number.txt |
| Merge made by the 'recursive' strategy. |
| Documentation/Makefile | 2 +- |
| Documentation/ioctl/ioctl-number.txt | 1 + |
| Documentation/kdbus/.gitignore | 2 + |
| Documentation/kdbus/Makefile | 44 + |
| Documentation/kdbus/kdbus.bus.xml | 344 ++++ |
| Documentation/kdbus/kdbus.connection.xml | 1244 ++++++++++++ |
| Documentation/kdbus/kdbus.endpoint.xml | 429 +++++ |
| Documentation/kdbus/kdbus.fs.xml | 124 ++ |
| Documentation/kdbus/kdbus.item.xml | 839 ++++++++ |
| Documentation/kdbus/kdbus.match.xml | 555 ++++++ |
| Documentation/kdbus/kdbus.message.xml | 1276 +++++++++++++ |
| Documentation/kdbus/kdbus.name.xml | 711 +++++++ |
| Documentation/kdbus/kdbus.policy.xml | 406 ++++ |
| Documentation/kdbus/kdbus.pool.xml | 326 ++++ |
| Documentation/kdbus/kdbus.xml | 1012 ++++++++++ |
| Documentation/kdbus/stylesheet.xsl | 16 + |
| MAINTAINERS | 13 + |
| Makefile | 1 + |
| include/uapi/linux/Kbuild | 1 + |
| include/uapi/linux/kdbus.h | 980 ++++++++++ |
| include/uapi/linux/magic.h | 2 + |
| init/Kconfig | 13 + |
| ipc/Makefile | 2 +- |
| ipc/kdbus/Makefile | 33 + |
| ipc/kdbus/bus.c | 514 +++++ |
| ipc/kdbus/bus.h | 99 + |
| ipc/kdbus/connection.c | 2207 ++++++++++++++++++++++ |
| ipc/kdbus/connection.h | 261 +++ |
| ipc/kdbus/domain.c | 296 +++ |
| ipc/kdbus/domain.h | 77 + |
| ipc/kdbus/endpoint.c | 275 +++ |
| ipc/kdbus/endpoint.h | 67 + |
| ipc/kdbus/fs.c | 508 +++++ |
| ipc/kdbus/fs.h | 28 + |
| ipc/kdbus/handle.c | 709 +++++++ |
| ipc/kdbus/handle.h | 103 + |
| ipc/kdbus/item.c | 293 +++ |
| ipc/kdbus/item.h | 61 + |
| ipc/kdbus/limits.h | 61 + |
| ipc/kdbus/main.c | 114 ++ |
| ipc/kdbus/match.c | 546 ++++++ |
| ipc/kdbus/match.h | 35 + |
| ipc/kdbus/message.c | 1040 ++++++++++ |
| ipc/kdbus/message.h | 120 ++ |
| ipc/kdbus/metadata.c | 1342 +++++++++++++ |
| ipc/kdbus/metadata.h | 86 + |
| ipc/kdbus/names.c | 770 ++++++++ |
| ipc/kdbus/names.h | 74 + |
| ipc/kdbus/node.c | 897 +++++++++ |
| ipc/kdbus/node.h | 86 + |
| ipc/kdbus/notify.c | 204 ++ |
| ipc/kdbus/notify.h | 30 + |
| ipc/kdbus/policy.c | 489 +++++ |
| ipc/kdbus/policy.h | 51 + |
| ipc/kdbus/pool.c | 728 +++++++ |
| ipc/kdbus/pool.h | 46 + |
| ipc/kdbus/queue.c | 363 ++++ |
| ipc/kdbus/queue.h | 84 + |
| ipc/kdbus/reply.c | 252 +++ |
| ipc/kdbus/reply.h | 68 + |
| ipc/kdbus/util.c | 156 ++ |
| ipc/kdbus/util.h | 73 + |
| samples/Kconfig | 7 + |
| samples/Makefile | 3 +- |
| samples/kdbus/.gitignore | 1 + |
| samples/kdbus/Makefile | 9 + |
| samples/kdbus/kdbus-api.h | 114 ++ |
| samples/kdbus/kdbus-workers.c | 1345 +++++++++++++ |
| tools/testing/selftests/Makefile | 1 + |
| tools/testing/selftests/kdbus/.gitignore | 1 + |
| tools/testing/selftests/kdbus/Makefile | 49 + |
| tools/testing/selftests/kdbus/kdbus-enum.c | 94 + |
| tools/testing/selftests/kdbus/kdbus-enum.h | 15 + |
| tools/testing/selftests/kdbus/kdbus-test.c | 899 +++++++++ |
| tools/testing/selftests/kdbus/kdbus-test.h | 83 + |
| tools/testing/selftests/kdbus/kdbus-util.c | 1611 ++++++++++++++++ |
| tools/testing/selftests/kdbus/kdbus-util.h | 218 +++ |
| tools/testing/selftests/kdbus/test-activator.c | 318 ++++ |
| tools/testing/selftests/kdbus/test-benchmark.c | 451 +++++ |
| tools/testing/selftests/kdbus/test-bus.c | 175 ++ |
| tools/testing/selftests/kdbus/test-chat.c | 122 ++ |
| tools/testing/selftests/kdbus/test-connection.c | 597 ++++++ |
| tools/testing/selftests/kdbus/test-daemon.c | 65 + |
| tools/testing/selftests/kdbus/test-endpoint.c | 352 ++++ |
| tools/testing/selftests/kdbus/test-fd.c | 789 ++++++++ |
| tools/testing/selftests/kdbus/test-free.c | 64 + |
| tools/testing/selftests/kdbus/test-match.c | 441 +++++ |
| tools/testing/selftests/kdbus/test-message.c | 734 +++++++ |
| tools/testing/selftests/kdbus/test-metadata-ns.c | 500 +++++ |
| tools/testing/selftests/kdbus/test-monitor.c | 176 ++ |
| tools/testing/selftests/kdbus/test-names.c | 194 ++ |
| tools/testing/selftests/kdbus/test-policy-ns.c | 632 +++++++ |
| tools/testing/selftests/kdbus/test-policy-priv.c | 1285 +++++++++++++ |
| tools/testing/selftests/kdbus/test-policy.c | 80 + |
| tools/testing/selftests/kdbus/test-sync.c | 369 ++++ |
| tools/testing/selftests/kdbus/test-timeout.c | 99 + |
| 96 files changed, 33479 insertions(+), 3 deletions(-) |
| create mode 100644 Documentation/kdbus/.gitignore |
| create mode 100644 Documentation/kdbus/Makefile |
| create mode 100644 Documentation/kdbus/kdbus.bus.xml |
| create mode 100644 Documentation/kdbus/kdbus.connection.xml |
| create mode 100644 Documentation/kdbus/kdbus.endpoint.xml |
| create mode 100644 Documentation/kdbus/kdbus.fs.xml |
| create mode 100644 Documentation/kdbus/kdbus.item.xml |
| create mode 100644 Documentation/kdbus/kdbus.match.xml |
| create mode 100644 Documentation/kdbus/kdbus.message.xml |
| create mode 100644 Documentation/kdbus/kdbus.name.xml |
| create mode 100644 Documentation/kdbus/kdbus.policy.xml |
| create mode 100644 Documentation/kdbus/kdbus.pool.xml |
| create mode 100644 Documentation/kdbus/kdbus.xml |
| create mode 100644 Documentation/kdbus/stylesheet.xsl |
| create mode 100644 include/uapi/linux/kdbus.h |
| create mode 100644 ipc/kdbus/Makefile |
| create mode 100644 ipc/kdbus/bus.c |
| create mode 100644 ipc/kdbus/bus.h |
| create mode 100644 ipc/kdbus/connection.c |
| create mode 100644 ipc/kdbus/connection.h |
| create mode 100644 ipc/kdbus/domain.c |
| create mode 100644 ipc/kdbus/domain.h |
| create mode 100644 ipc/kdbus/endpoint.c |
| create mode 100644 ipc/kdbus/endpoint.h |
| create mode 100644 ipc/kdbus/fs.c |
| create mode 100644 ipc/kdbus/fs.h |
| create mode 100644 ipc/kdbus/handle.c |
| create mode 100644 ipc/kdbus/handle.h |
| create mode 100644 ipc/kdbus/item.c |
| create mode 100644 ipc/kdbus/item.h |
| create mode 100644 ipc/kdbus/limits.h |
| create mode 100644 ipc/kdbus/main.c |
| create mode 100644 ipc/kdbus/match.c |
| create mode 100644 ipc/kdbus/match.h |
| create mode 100644 ipc/kdbus/message.c |
| create mode 100644 ipc/kdbus/message.h |
| create mode 100644 ipc/kdbus/metadata.c |
| create mode 100644 ipc/kdbus/metadata.h |
| create mode 100644 ipc/kdbus/names.c |
| create mode 100644 ipc/kdbus/names.h |
| create mode 100644 ipc/kdbus/node.c |
| create mode 100644 ipc/kdbus/node.h |
| create mode 100644 ipc/kdbus/notify.c |
| create mode 100644 ipc/kdbus/notify.h |
| create mode 100644 ipc/kdbus/policy.c |
| create mode 100644 ipc/kdbus/policy.h |
| create mode 100644 ipc/kdbus/pool.c |
| create mode 100644 ipc/kdbus/pool.h |
| create mode 100644 ipc/kdbus/queue.c |
| create mode 100644 ipc/kdbus/queue.h |
| create mode 100644 ipc/kdbus/reply.c |
| create mode 100644 ipc/kdbus/reply.h |
| create mode 100644 ipc/kdbus/util.c |
| create mode 100644 ipc/kdbus/util.h |
| create mode 100644 samples/kdbus/.gitignore |
| create mode 100644 samples/kdbus/Makefile |
| create mode 100644 samples/kdbus/kdbus-api.h |
| create mode 100644 samples/kdbus/kdbus-workers.c |
| create mode 100644 tools/testing/selftests/kdbus/.gitignore |
| create mode 100644 tools/testing/selftests/kdbus/Makefile |
| create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.c |
| create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.h |
| create mode 100644 tools/testing/selftests/kdbus/kdbus-test.c |
| create mode 100644 tools/testing/selftests/kdbus/kdbus-test.h |
| create mode 100644 tools/testing/selftests/kdbus/kdbus-util.c |
| create mode 100644 tools/testing/selftests/kdbus/kdbus-util.h |
| create mode 100644 tools/testing/selftests/kdbus/test-activator.c |
| create mode 100644 tools/testing/selftests/kdbus/test-benchmark.c |
| create mode 100644 tools/testing/selftests/kdbus/test-bus.c |
| create mode 100644 tools/testing/selftests/kdbus/test-chat.c |
| create mode 100644 tools/testing/selftests/kdbus/test-connection.c |
| create mode 100644 tools/testing/selftests/kdbus/test-daemon.c |
| create mode 100644 tools/testing/selftests/kdbus/test-endpoint.c |
| create mode 100644 tools/testing/selftests/kdbus/test-fd.c |
| create mode 100644 tools/testing/selftests/kdbus/test-free.c |
| create mode 100644 tools/testing/selftests/kdbus/test-match.c |
| create mode 100644 tools/testing/selftests/kdbus/test-message.c |
| create mode 100644 tools/testing/selftests/kdbus/test-metadata-ns.c |
| create mode 100644 tools/testing/selftests/kdbus/test-monitor.c |
| create mode 100644 tools/testing/selftests/kdbus/test-names.c |
| create mode 100644 tools/testing/selftests/kdbus/test-policy-ns.c |
| create mode 100644 tools/testing/selftests/kdbus/test-policy-priv.c |
| create mode 100644 tools/testing/selftests/kdbus/test-policy.c |
| create mode 100644 tools/testing/selftests/kdbus/test-sync.c |
| create mode 100644 tools/testing/selftests/kdbus/test-timeout.c |
| Merging cgroup/for-next (cbd8c38800ab Merge branch 'for-4.3-unified-base' into for-4.3) |
| $ git merge cgroup/for-next |
| Auto-merging kernel/sched/core.c |
| Auto-merging kernel/fork.c |
| Auto-merging kernel/cgroup.c |
| Auto-merging init/Kconfig |
| Merge made by the 'recursive' strategy. |
| CREDITS | 5 + |
| Documentation/cgroups/00-INDEX | 2 + |
| Documentation/cgroups/pids.txt | 85 +++++++ |
| Documentation/cgroups/unified-hierarchy.txt | 80 +++++- |
| include/linux/cgroup-defs.h | 10 +- |
| include/linux/cgroup.h | 24 +- |
| include/linux/cgroup_subsys.h | 28 +++ |
| init/Kconfig | 16 ++ |
| kernel/Makefile | 1 + |
| kernel/cgroup.c | 81 +++++- |
| kernel/cgroup_freezer.c | 2 +- |
| kernel/cgroup_pids.c | 366 ++++++++++++++++++++++++++++ |
| kernel/fork.c | 17 +- |
| kernel/sched/core.c | 2 +- |
| 14 files changed, 698 insertions(+), 21 deletions(-) |
| create mode 100644 Documentation/cgroups/pids.txt |
| create mode 100644 kernel/cgroup_pids.c |
| Merging scsi/for-next (0c958ecc69c2 scsi: fix memory leak with scsi-mq) |
| $ git merge scsi/for-next |
| Already up-to-date. |
| Merging target-updates/for-next (109e2381749c target: Drop iSCSI use of mutex around max_cmd_sn increment) |
| $ git merge target-updates/for-next |
| Resolved 'drivers/ata/libata-scsi.c' using previous resolution. |
| Resolved 'drivers/scsi/scsi_error.c' using previous resolution. |
| Resolved 'include/scsi/scsi_eh.h' using previous resolution. |
| Auto-merging include/target/iscsi/iscsi_target_core.h |
| Auto-merging include/scsi/scsi_eh.h |
| CONFLICT (content): Merge conflict in include/scsi/scsi_eh.h |
| Auto-merging drivers/target/target_core_spc.c |
| Auto-merging drivers/target/iscsi/iscsi_target_nego.c |
| Auto-merging drivers/target/iscsi/iscsi_target_login.c |
| Auto-merging drivers/target/iscsi/iscsi_target.c |
| Auto-merging drivers/scsi/scsi_error.c |
| CONFLICT (content): Merge conflict in drivers/scsi/scsi_error.c |
| Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c |
| Auto-merging drivers/ata/libata-scsi.c |
| CONFLICT (content): Merge conflict in drivers/ata/libata-scsi.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 41c1aca716d1] Merge remote-tracking branch 'target-updates/for-next' |
| $ git diff -M --stat --summary HEAD^.. |
| drivers/scsi/libiscsi.c | 9 +- |
| drivers/scsi/qla2xxx/Kconfig | 4 +- |
| drivers/scsi/qla2xxx/tcm_qla2xxx.c | 8 +- |
| drivers/scsi/scsi_common.c | 109 +++++++ |
| drivers/scsi/scsi_error.c | 68 +--- |
| drivers/target/iscsi/iscsi_target.c | 37 ++- |
| drivers/target/iscsi/iscsi_target_configfs.c | 12 +- |
| drivers/target/iscsi/iscsi_target_device.c | 7 +- |
| drivers/target/iscsi/iscsi_target_login.c | 2 +- |
| drivers/target/iscsi/iscsi_target_nego.c | 9 +- |
| drivers/target/iscsi/iscsi_target_tmr.c | 2 +- |
| drivers/target/iscsi/iscsi_target_tpg.c | 19 ++ |
| drivers/target/iscsi/iscsi_target_tpg.h | 1 + |
| drivers/target/iscsi/iscsi_target_util.c | 7 +- |
| drivers/target/loopback/tcm_loop.c | 22 +- |
| drivers/target/target_core_device.c | 11 +- |
| drivers/target/target_core_fabric_configfs.c | 2 +- |
| drivers/target/target_core_hba.c | 5 + |
| drivers/target/target_core_sbc.c | 49 ++- |
| drivers/target/target_core_spc.c | 42 +-- |
| drivers/target/target_core_tpg.c | 17 + |
| drivers/target/target_core_transport.c | 453 ++++++++++----------------- |
| drivers/target/tcm_fc/tfc_cmd.c | 2 +- |
| include/scsi/scsi_common.h | 5 + |
| include/scsi/scsi_eh.h | 6 +- |
| include/target/iscsi/iscsi_target_core.h | 5 +- |
| include/target/target_core_backend.h | 2 + |
| include/target/target_core_base.h | 27 +- |
| include/target/target_core_fabric.h | 1 + |
| 29 files changed, 466 insertions(+), 477 deletions(-) |
| Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) |
| $ git merge target-merge/for-next-merge |
| Already up-to-date. |
| Merging pinctrl/for-next (48356aa79ccb pinctrl: sirf: add power management support for atlas7) |
| $ git merge pinctrl/for-next |
| Auto-merging drivers/pinctrl/pinctrl-single.c |
| Auto-merging drivers/pinctrl/pinctrl-lpc18xx.c |
| Auto-merging drivers/pinctrl/bcm/pinctrl-bcm2835.c |
| Auto-merging drivers/Makefile |
| Auto-merging arch/arm/boot/dts/ste-nomadik-stn8815.dtsi |
| Auto-merging arch/arm/boot/dts/ste-dbx5x0.dtsi |
| Auto-merging MAINTAINERS |
| Auto-merging CREDITS |
| Merge made by the 'recursive' strategy. |
| CREDITS | 4 + |
| .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 37 +- |
| .../bindings/pinctrl/cnxt,cx92755-pinctrl.txt | 86 ++ |
| .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 36 +- |
| .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 20 +- |
| .../devicetree/bindings/pinctrl/ste,nomadik.txt | 7 +- |
| MAINTAINERS | 1 - |
| arch/arm/boot/dts/ste-dbx5x0.dtsi | 23 +- |
| arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 8 +- |
| drivers/Makefile | 2 +- |
| drivers/pinctrl/Kconfig | 7 + |
| drivers/pinctrl/Makefile | 8 +- |
| drivers/pinctrl/bcm/pinctrl-bcm2835.c | 5 +- |
| drivers/pinctrl/core.c | 3 +- |
| drivers/pinctrl/devicetree.c | 8 +- |
| drivers/pinctrl/freescale/Kconfig | 7 + |
| drivers/pinctrl/freescale/Makefile | 1 + |
| drivers/pinctrl/freescale/pinctrl-imx6ul.c | 323 ++++ |
| drivers/pinctrl/intel/pinctrl-baytrail.c | 4 +- |
| drivers/pinctrl/intel/pinctrl-cherryview.c | 8 +- |
| drivers/pinctrl/intel/pinctrl-intel.c | 6 +- |
| drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 6 +- |
| drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | 21 - |
| drivers/pinctrl/nomadik/pinctrl-nomadik-db8540.c | 24 - |
| drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 30 +- |
| drivers/pinctrl/nomadik/pinctrl-nomadik.c | 236 +-- |
| drivers/pinctrl/nomadik/pinctrl-nomadik.h | 4 - |
| drivers/pinctrl/pinconf.c | 84 +- |
| drivers/pinctrl/pinctrl-adi2-bf60x.c | 8 +- |
| drivers/pinctrl/pinctrl-adi2.c | 4 +- |
| drivers/pinctrl/pinctrl-amd.c | 15 +- |
| drivers/pinctrl/pinctrl-at91.c | 12 +- |
| drivers/pinctrl/pinctrl-coh901.c | 7 +- |
| drivers/pinctrl/pinctrl-digicolor.c | 378 +++++ |
| drivers/pinctrl/pinctrl-lpc18xx.c | 54 +- |
| drivers/pinctrl/pinctrl-pistachio.c | 6 +- |
| drivers/pinctrl/pinctrl-rockchip.c | 16 +- |
| drivers/pinctrl/pinctrl-single.c | 14 +- |
| drivers/pinctrl/pinctrl-st.c | 6 +- |
| drivers/pinctrl/pinmux.c | 3 +- |
| drivers/pinctrl/qcom/Kconfig | 20 + |
| drivers/pinctrl/qcom/Makefile | 3 + |
| drivers/pinctrl/qcom/pinctrl-msm.c | 19 +- |
| drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 122 ++ |
| drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 376 +++-- |
| drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 791 ++++++++++ |
| drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 882 +++++++++++ |
| drivers/pinctrl/samsung/pinctrl-exynos.c | 18 +- |
| drivers/pinctrl/samsung/pinctrl-exynos5440.c | 90 +- |
| drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 28 +- |
| drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 34 +- |
| drivers/pinctrl/sh-pfc/core.c | 52 +- |
| drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 4 - |
| drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 21 +- |
| drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 19 +- |
| drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 4 - |
| drivers/pinctrl/sh-pfc/pinctrl.c | 42 +- |
| drivers/pinctrl/sirf/pinctrl-atlas7.c | 398 ++++- |
| drivers/pinctrl/sirf/pinctrl-sirf.c | 5 +- |
| drivers/pinctrl/sunxi/pinctrl-sunxi.c | 62 +- |
| drivers/pinctrl/uniphier/Kconfig | 32 + |
| drivers/pinctrl/uniphier/Makefile | 8 + |
| drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c | 886 +++++++++++ |
| drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c | 1274 ++++++++++++++++ |
| drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c | 1554 ++++++++++++++++++++ |
| drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c | 1346 +++++++++++++++++ |
| drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c | 794 ++++++++++ |
| drivers/pinctrl/uniphier/pinctrl-proxstream2.c | 1269 ++++++++++++++++ |
| drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 684 +++++++++ |
| drivers/pinctrl/uniphier/pinctrl-uniphier.h | 217 +++ |
| include/dt-bindings/pinctrl/qcom,pmic-mpp.h | 51 + |
| 71 files changed, 11860 insertions(+), 777 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/pinctrl/cnxt,cx92755-pinctrl.txt |
| create mode 100644 drivers/pinctrl/freescale/pinctrl-imx6ul.c |
| create mode 100644 drivers/pinctrl/pinctrl-digicolor.c |
| create mode 100644 drivers/pinctrl/qcom/pinctrl-qdf2xxx.c |
| create mode 100644 drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c |
| create mode 100644 drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c |
| create mode 100644 drivers/pinctrl/uniphier/Kconfig |
| create mode 100644 drivers/pinctrl/uniphier/Makefile |
| create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c |
| create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c |
| create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c |
| create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c |
| create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c |
| create mode 100644 drivers/pinctrl/uniphier/pinctrl-proxstream2.c |
| create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-core.c |
| create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier.h |
| Merging vhost/linux-next (6569ffbcd749 PCI/MSI: Make pci_msi_shutdown(), pci_msix_shutdown() static) |
| $ git merge vhost/linux-next |
| Resolved 'include/uapi/linux/pci_regs.h' using previous resolution. |
| Auto-merging include/uapi/linux/pci_regs.h |
| CONFLICT (content): Merge conflict in include/uapi/linux/pci_regs.h |
| Auto-merging include/linux/pci.h |
| Auto-merging drivers/pci/msi.c |
| Auto-merging drivers/net/tun.c |
| Auto-merging drivers/net/macvtap.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master f9fc48b90bf5] Merge remote-tracking branch 'vhost/linux-next' |
| $ git diff -M --stat --summary HEAD^.. |
| drivers/net/macvtap.c | 2 +- |
| drivers/net/tun.c | 2 +- |
| drivers/pci/msi.c | 4 ++-- |
| drivers/pci/pci-driver.c | 2 -- |
| include/linux/pci.h | 4 ---- |
| 5 files changed, 4 insertions(+), 10 deletions(-) |
| Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage) |
| $ git merge remoteproc/for-next |
| Already up-to-date. |
| Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) |
| $ git merge rpmsg/for-next |
| Already up-to-date. |
| Merging gpio/for-next (505936131ea7 gpio: mpc8xxx: Convert mpc8xxx_gpio_chip.lock to raw_spinlock) |
| $ git merge gpio/for-next |
| Removing include/linux/platform_data/gpio-em.h |
| Auto-merging drivers/iio/magnetometer/bmc150_magn.c |
| Auto-merging drivers/iio/light/stk3310.c |
| Auto-merging drivers/gpio/gpiolib.c |
| Auto-merging drivers/gpio/gpio-zynq.c |
| Auto-merging drivers/gpio/gpio-omap.c |
| Auto-merging drivers/gpio/gpio-davinci.c |
| Auto-merging drivers/gpio/Makefile |
| Merge made by the 'recursive' strategy. |
| .../devicetree/bindings/gpio/brcm,brcmstb-gpio.txt | 35 ++- |
| .../devicetree/bindings/gpio/gpio-etraxfs.txt | 3 +- |
| .../devicetree/bindings/gpio/gpio-mpc8xxx.txt | 22 ++ |
| .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 1 + |
| .../devicetree/bindings/gpio/zx296702-gpio.txt | 24 ++ |
| Documentation/gpio/00-INDEX | 3 + |
| Documentation/gpio/drivers-on-gpio.txt | 95 ++++++ |
| Documentation/gpio/sysfs.txt | 9 +- |
| drivers/gpio/Kconfig | 8 +- |
| drivers/gpio/Makefile | 1 + |
| drivers/gpio/devres.c | 18 +- |
| drivers/gpio/gpio-74xx-mmio.c | 2 +- |
| drivers/gpio/gpio-adp5588.c | 10 +- |
| drivers/gpio/gpio-altera.c | 4 +- |
| drivers/gpio/gpio-bcm-kona.c | 17 +- |
| drivers/gpio/gpio-davinci.c | 16 +- |
| drivers/gpio/gpio-dwapb.c | 2 +- |
| drivers/gpio/gpio-em.c | 35 +-- |
| drivers/gpio/gpio-ep93xx.c | 8 +- |
| drivers/gpio/gpio-etraxfs.c | 70 ++++- |
| drivers/gpio/gpio-generic.c | 41 ++- |
| drivers/gpio/gpio-grgpio.c | 8 - |
| drivers/gpio/gpio-mcp23s08.c | 4 - |
| drivers/gpio/gpio-mpc8xxx.c | 121 +++++--- |
| drivers/gpio/gpio-msm-v2.c | 23 +- |
| drivers/gpio/gpio-mvebu.c | 8 +- |
| drivers/gpio/gpio-mxc.c | 6 +- |
| drivers/gpio/gpio-mxs.c | 2 +- |
| drivers/gpio/gpio-omap.c | 86 +++--- |
| drivers/gpio/gpio-pcf857x.c | 14 +- |
| drivers/gpio/gpio-pch.c | 4 +- |
| drivers/gpio/gpio-pxa.c | 8 +- |
| drivers/gpio/gpio-rcar.c | 24 +- |
| drivers/gpio/gpio-sa1100.c | 6 +- |
| drivers/gpio/gpio-sta2x11.c | 2 +- |
| drivers/gpio/gpio-tegra.c | 9 +- |
| drivers/gpio/gpio-timberdale.c | 12 +- |
| drivers/gpio/gpio-tz1090.c | 4 +- |
| drivers/gpio/gpio-vf610.c | 2 +- |
| drivers/gpio/gpio-zx.c | 324 +++++++++++++++++++++ |
| drivers/gpio/gpio-zynq.c | 12 +- |
| drivers/gpio/gpiolib-of.c | 34 ++- |
| drivers/gpio/gpiolib.c | 45 +-- |
| drivers/gpu/drm/tilcdc/tilcdc_panel.c | 22 +- |
| drivers/iio/light/stk3310.c | 6 +- |
| drivers/iio/magnetometer/bmc150_magn.c | 6 +- |
| drivers/media/i2c/adp1653.c | 2 +- |
| drivers/nfc/nxp-nci/i2c.c | 10 +- |
| drivers/phy/phy-tusb1210.c | 30 +- |
| include/linux/basic_mmio_gpio.h | 1 + |
| include/linux/gpio/consumer.h | 82 ++---- |
| include/linux/of_gpio.h | 4 +- |
| include/linux/platform_data/gpio-em.h | 11 - |
| 53 files changed, 936 insertions(+), 420 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mpc8xxx.txt |
| create mode 100644 Documentation/devicetree/bindings/gpio/zx296702-gpio.txt |
| create mode 100644 Documentation/gpio/drivers-on-gpio.txt |
| create mode 100644 drivers/gpio/gpio-zx.c |
| delete mode 100644 include/linux/platform_data/gpio-em.h |
| Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) |
| $ git merge dma-mapping/dma-mapping-next |
| Already up-to-date. |
| Merging pwm/for-next (361c1066c939 pwm: lpss: pci: Add support for Broxton platform) |
| $ git merge pwm/for-next |
| Already up-to-date. |
| Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) |
| $ git merge dma-buf/for-next |
| Already up-to-date. |
| Merging userns/for-next (75509fd88fbd nsfs: Add a show_path method to fix mountinfo) |
| $ git merge userns/for-next |
| Auto-merging security/security.c |
| Auto-merging include/linux/fs.h |
| Auto-merging fs/namespace.c |
| Merge made by the 'recursive' strategy. |
| fs/exec.c | 10 ++++++++-- |
| fs/namespace.c | 33 +++++++++++++++++++++++++-------- |
| fs/nsfs.c | 10 ++++++++++ |
| fs/open.c | 2 +- |
| fs/proc/root.c | 2 ++ |
| fs/sysfs/mount.c | 4 ++++ |
| include/linux/fs.h | 3 +++ |
| kernel/sys.c | 3 +-- |
| mm/mmap.c | 4 ++-- |
| mm/nommu.c | 2 +- |
| security/security.c | 2 +- |
| 11 files changed, 58 insertions(+), 17 deletions(-) |
| Merging ktest/for-next (b953c0d234bc Linux 4.1) |
| $ git merge ktest/for-next |
| Already up-to-date. |
| Merging clk/clk-next (1fb6dd9da6ed clk: hisi: refine parameter checking for init) |
| $ git merge clk/clk-next |
| Resolved 'drivers/clk/ti/Makefile' using previous resolution. |
| Auto-merging include/linux/clk/ti.h |
| Auto-merging drivers/clocksource/cadence_ttc_timer.c |
| Auto-merging drivers/clk/zte/clk.c |
| Auto-merging drivers/clk/ti/dpll44xx.c |
| Auto-merging drivers/clk/ti/dpll3xxx.c |
| Auto-merging drivers/clk/ti/clkt_dpll.c |
| Auto-merging drivers/clk/ti/clk-816x.c |
| Auto-merging drivers/clk/ti/Makefile |
| CONFLICT (content): Merge conflict in drivers/clk/ti/Makefile |
| Auto-merging drivers/clk/tegra/clk.c |
| Auto-merging drivers/clk/tegra/clk-tegra124.c |
| Auto-merging drivers/clk/tegra/clk-tegra-super-gen4.c |
| Auto-merging drivers/clk/sunxi/clk-sunxi.c |
| Auto-merging drivers/clk/spear/spear6xx_clock.c |
| Auto-merging drivers/clk/spear/spear1340_clock.c |
| Auto-merging drivers/clk/spear/spear1310_clock.c |
| Auto-merging drivers/clk/shmobile/clk-rcar-gen2.c |
| Auto-merging drivers/clk/shmobile/clk-r8a7779.c |
| Auto-merging drivers/clk/shmobile/clk-r8a7778.c |
| Auto-merging drivers/clk/h8300/clk-h8s2678.c |
| Removing drivers/clk/clk-gpio-gate.c |
| Auto-merging drivers/acpi/acpi_lpss.c |
| Auto-merging arch/arm64/kernel/setup.c |
| Auto-merging arch/arm/mach-s3c64xx/common.c |
| Auto-merging arch/arm/mach-omap2/omap_hwmod.c |
| Auto-merging arch/arm/mach-omap2/io.c |
| Removing arch/arm/mach-omap2/clock_common_data.c |
| Removing arch/arm/mach-omap2/clock44xx.h |
| Removing arch/arm/mach-omap2/clock3xxx.c |
| Removing arch/arm/mach-omap2/clock36xx.h |
| Removing arch/arm/mach-omap2/clock36xx.c |
| Removing arch/arm/mach-omap2/clock3517.h |
| Removing arch/arm/mach-omap2/clock3517.c |
| Removing arch/arm/mach-omap2/clock34xx.h |
| Removing arch/arm/mach-omap2/clock34xx.c |
| Removing arch/arm/mach-omap2/clock2xxx.c |
| Removing arch/arm/mach-omap2/clock2430.c |
| Removing arch/arm/mach-omap2/clkt_iclk.c |
| Removing arch/arm/mach-omap2/clkt_clksel.c |
| Auto-merging arch/arm/mach-omap2/Makefile |
| Auto-merging arch/arm/mach-at91/at91rm9200.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 5d21898b673b] Merge remote-tracking branch 'clk/clk-next' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/clk.txt | 8 +- |
| .../devicetree/bindings/clock/gpio-mux-clock.txt | 19 + |
| arch/arm/mach-at91/at91rm9200.c | 1 - |
| arch/arm/mach-hisi/hisilicon.c | 1 - |
| arch/arm/mach-keystone/pm_domain.c | 1 - |
| arch/arm/mach-mvebu/board-v7.c | 1 - |
| arch/arm/mach-omap2/Makefile | 22 +- |
| arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 7 +- |
| arch/arm/mach-omap2/clkt_clksel.c | 466 -------------- |
| arch/arm/mach-omap2/clkt_iclk.c | 68 --- |
| arch/arm/mach-omap2/clock.c | 676 +-------------------- |
| arch/arm/mach-omap2/clock.h | 205 +------ |
| arch/arm/mach-omap2/clock2430.c | 57 -- |
| arch/arm/mach-omap2/clock2xxx.c | 57 -- |
| arch/arm/mach-omap2/clock34xx.c | 138 ----- |
| arch/arm/mach-omap2/clock34xx.h | 18 - |
| arch/arm/mach-omap2/clock3517.c | 118 ---- |
| arch/arm/mach-omap2/clock3517.h | 14 - |
| arch/arm/mach-omap2/clock36xx.c | 69 --- |
| arch/arm/mach-omap2/clock36xx.h | 13 - |
| arch/arm/mach-omap2/clock3xxx.c | 135 ---- |
| arch/arm/mach-omap2/clock44xx.h | 20 - |
| arch/arm/mach-omap2/clock_common_data.c | 115 ---- |
| arch/arm/mach-omap2/io.c | 3 +- |
| arch/arm/mach-omap2/omap_hwmod.c | 1 + |
| arch/arm/mach-omap2/pm24xx.c | 1 + |
| arch/arm/mach-orion5x/board-dt.c | 1 - |
| arch/arm/mach-s3c64xx/common.c | 1 - |
| arch/arm64/kernel/setup.c | 1 - |
| arch/mips/alchemy/common/clock.c | 66 +- |
| arch/powerpc/platforms/512x/clock-commonclk.c | 1 + |
| drivers/acpi/acpi_apd.c | 1 - |
| drivers/acpi/acpi_lpss.c | 1 - |
| drivers/clk/Makefile | 2 +- |
| drivers/clk/at91/clk-main.c | 7 +- |
| drivers/clk/at91/clk-master.c | 7 +- |
| drivers/clk/at91/clk-programmable.c | 32 +- |
| drivers/clk/at91/clk-slow.c | 16 +- |
| drivers/clk/at91/clk-smd.c | 7 +- |
| drivers/clk/at91/clk-usb.c | 35 +- |
| drivers/clk/at91/pmc.c | 1 - |
| drivers/clk/at91/pmc.h | 124 ++-- |
| drivers/clk/bcm/clk-kona.c | 35 +- |
| drivers/clk/clk-axi-clkgen.c | 1 - |
| drivers/clk/clk-cdce706.c | 1 + |
| drivers/clk/clk-cdce925.c | 1 + |
| drivers/clk/clk-clps711x.c | 1 - |
| drivers/clk/clk-composite.c | 49 +- |
| drivers/clk/clk-divider.c | 20 +- |
| drivers/clk/clk-efm32gg.c | 1 - |
| drivers/clk/clk-fractional-divider.c | 8 + |
| drivers/clk/clk-gate.c | 4 + |
| drivers/clk/clk-gpio-gate.c | 207 ------- |
| drivers/clk/clk-gpio.c | 325 ++++++++++ |
| drivers/clk/clk-highbank.c | 1 + |
| drivers/clk/clk-moxart.c | 1 + |
| drivers/clk/clk-mux.c | 5 +- |
| drivers/clk/clk-nomadik.c | 3 +- |
| drivers/clk/clk-palmas.c | 1 - |
| drivers/clk/clk-rk808.c | 1 - |
| drivers/clk/clk-s2mps11.c | 32 +- |
| drivers/clk/clk-si5351.c | 2 +- |
| drivers/clk/clk-si570.c | 1 + |
| drivers/clk/clk-twl6040.c | 13 +- |
| drivers/clk/clk-u300.c | 2 +- |
| drivers/clk/clk-wm831x.c | 1 - |
| drivers/clk/clk-xgene.c | 28 +- |
| drivers/clk/clk.c | 219 ++++--- |
| drivers/clk/h8300/clk-div.c | 4 +- |
| drivers/clk/h8300/clk-h8s2678.c | 20 +- |
| drivers/clk/hisilicon/clk-hi3620.c | 41 +- |
| drivers/clk/hisilicon/clk-hip04.c | 2 - |
| drivers/clk/hisilicon/clk.c | 14 +- |
| drivers/clk/hisilicon/clkgate-separated.c | 2 - |
| drivers/clk/imx/clk-imx1.c | 1 - |
| drivers/clk/imx/clk-imx21.c | 1 - |
| drivers/clk/imx/clk-pfd.c | 1 - |
| drivers/clk/imx/clk-pllv1.c | 1 - |
| drivers/clk/imx/clk-pllv3.c | 1 - |
| drivers/clk/ingenic/cgu.c | 1 + |
| drivers/clk/keystone/gate.c | 1 - |
| drivers/clk/keystone/pll.c | 4 +- |
| drivers/clk/mediatek/clk-gate.h | 3 +- |
| drivers/clk/mediatek/clk-mt8135.c | 1 + |
| drivers/clk/mediatek/clk-mt8173.c | 25 +- |
| drivers/clk/mediatek/clk-mtk.h | 9 +- |
| drivers/clk/mediatek/clk-pll.c | 39 +- |
| drivers/clk/meson/clk-cpu.c | 1 + |
| drivers/clk/meson/clkc.c | 1 - |
| drivers/clk/mmp/clk-apbc.c | 1 - |
| drivers/clk/mmp/clk-apmu.c | 1 - |
| drivers/clk/mmp/clk-mix.c | 23 +- |
| drivers/clk/mmp/clk.c | 3 +- |
| drivers/clk/mvebu/clk-cpu.c | 3 +- |
| drivers/clk/mvebu/common.c | 2 +- |
| drivers/clk/mxs/clk-div.c | 1 - |
| drivers/clk/mxs/clk-frac.c | 1 - |
| drivers/clk/mxs/clk-imx23.c | 3 +- |
| drivers/clk/mxs/clk-imx28.c | 2 +- |
| drivers/clk/mxs/clk-pll.c | 1 - |
| drivers/clk/mxs/clk-ref.c | 1 - |
| drivers/clk/mxs/clk.h | 3 +- |
| drivers/clk/nxp/clk-lpc18xx-cgu.c | 1 - |
| drivers/clk/pistachio/clk.c | 1 + |
| drivers/clk/pxa/clk-pxa25x.c | 2 +- |
| drivers/clk/pxa/clk-pxa27x.c | 2 +- |
| drivers/clk/pxa/clk-pxa3xx.c | 2 +- |
| drivers/clk/qcom/clk-pll.c | 93 ++- |
| drivers/clk/qcom/clk-pll.h | 1 + |
| drivers/clk/qcom/clk-rcg.c | 44 +- |
| drivers/clk/qcom/clk-rcg2.c | 78 +-- |
| drivers/clk/qcom/common.c | 3 + |
| drivers/clk/qcom/gcc-apq8084.c | 13 +- |
| drivers/clk/qcom/gcc-ipq806x.c | 10 +- |
| drivers/clk/qcom/gcc-msm8660.c | 8 +- |
| drivers/clk/qcom/gcc-msm8916.c | 24 +- |
| drivers/clk/qcom/gcc-msm8960.c | 12 +- |
| drivers/clk/qcom/gcc-msm8974.c | 5 +- |
| drivers/clk/qcom/lcc-ipq806x.c | 6 +- |
| drivers/clk/qcom/lcc-msm8960.c | 8 +- |
| drivers/clk/qcom/mmcc-apq8084.c | 20 +- |
| drivers/clk/qcom/mmcc-msm8960.c | 15 +- |
| drivers/clk/qcom/mmcc-msm8974.c | 16 +- |
| drivers/clk/rockchip/clk-cpu.c | 1 + |
| drivers/clk/rockchip/clk-mmc-phase.c | 1 + |
| drivers/clk/rockchip/clk-pll.c | 19 +- |
| drivers/clk/rockchip/clk-rk3188.c | 3 +- |
| drivers/clk/rockchip/clk-rk3288.c | 2 +- |
| drivers/clk/rockchip/clk.h | 12 +- |
| drivers/clk/samsung/clk-cpu.c | 3 + |
| drivers/clk/samsung/clk-exynos-audss.c | 3 +- |
| drivers/clk/samsung/clk-exynos-clkout.c | 2 +- |
| drivers/clk/samsung/clk-exynos3250.c | 2 - |
| drivers/clk/samsung/clk-exynos4.c | 4 +- |
| drivers/clk/samsung/clk-exynos4415.c | 2 - |
| drivers/clk/samsung/clk-exynos5250.c | 2 - |
| drivers/clk/samsung/clk-exynos5260.c | 2 - |
| drivers/clk/samsung/clk-exynos5410.c | 2 - |
| drivers/clk/samsung/clk-exynos5420.c | 3 +- |
| drivers/clk/samsung/clk-exynos5433.c | 2 - |
| drivers/clk/samsung/clk-exynos5440.c | 2 - |
| drivers/clk/samsung/clk-exynos7.c | 2 - |
| drivers/clk/samsung/clk-pll.c | 2 + |
| drivers/clk/samsung/clk-s3c2410-dclk.c | 4 + |
| drivers/clk/samsung/clk-s3c2410.c | 2 - |
| drivers/clk/samsung/clk-s3c2412.c | 2 - |
| drivers/clk/samsung/clk-s3c2443.c | 2 - |
| drivers/clk/samsung/clk-s3c64xx.c | 3 +- |
| drivers/clk/samsung/clk-s5pv210-audss.c | 2 +- |
| drivers/clk/samsung/clk-s5pv210.c | 2 - |
| drivers/clk/samsung/clk.c | 4 + |
| drivers/clk/samsung/clk.h | 3 +- |
| drivers/clk/shmobile/clk-div6.c | 2 +- |
| drivers/clk/shmobile/clk-r8a73a4.c | 2 +- |
| drivers/clk/shmobile/clk-r8a7740.c | 2 +- |
| drivers/clk/shmobile/clk-r8a7778.c | 2 +- |
| drivers/clk/shmobile/clk-r8a7779.c | 2 +- |
| drivers/clk/shmobile/clk-rcar-gen2.c | 2 +- |
| drivers/clk/shmobile/clk-sh73a0.c | 2 +- |
| drivers/clk/sirf/clk-atlas6.c | 1 - |
| drivers/clk/sirf/clk-common.c | 2 + |
| drivers/clk/sirf/clk-prima2.c | 1 - |
| drivers/clk/socfpga/clk-gate-a10.c | 3 +- |
| drivers/clk/socfpga/clk-gate.c | 5 +- |
| drivers/clk/socfpga/clk-periph-a10.c | 3 +- |
| drivers/clk/socfpga/clk-periph.c | 5 +- |
| drivers/clk/socfpga/clk-pll-a10.c | 1 + |
| drivers/clk/socfpga/clk-pll.c | 3 +- |
| drivers/clk/socfpga/clk.h | 2 - |
| drivers/clk/spear/spear1310_clock.c | 1 - |
| drivers/clk/spear/spear1340_clock.c | 1 - |
| drivers/clk/spear/spear6xx_clock.c | 1 - |
| drivers/clk/st/clk-flexgen.c | 7 +- |
| drivers/clk/st/clkgen-fsyn.c | 1 + |
| drivers/clk/st/clkgen-mux.c | 91 +-- |
| drivers/clk/st/clkgen-pll.c | 1 + |
| drivers/clk/sunxi/clk-a20-gmac.c | 4 +- |
| drivers/clk/sunxi/clk-factors.c | 29 +- |
| drivers/clk/sunxi/clk-mod0.c | 3 +- |
| drivers/clk/sunxi/clk-sun6i-ar100.c | 28 +- |
| drivers/clk/sunxi/clk-sun8i-mbus.c | 2 +- |
| drivers/clk/sunxi/clk-sun9i-core.c | 2 +- |
| drivers/clk/sunxi/clk-sun9i-mmc.c | 3 +- |
| drivers/clk/sunxi/clk-sunxi.c | 40 +- |
| drivers/clk/sunxi/clk-usb.c | 3 +- |
| drivers/clk/tegra/clk-divider.c | 1 - |
| drivers/clk/tegra/clk-emc.c | 28 +- |
| drivers/clk/tegra/clk-periph-gate.c | 1 - |
| drivers/clk/tegra/clk-periph.c | 1 - |
| drivers/clk/tegra/clk-pll-out.c | 1 - |
| drivers/clk/tegra/clk-pll.c | 2 +- |
| drivers/clk/tegra/clk-super.c | 1 - |
| drivers/clk/tegra/clk-tegra-audio.c | 1 - |
| drivers/clk/tegra/clk-tegra-fixed.c | 1 - |
| drivers/clk/tegra/clk-tegra-periph.c | 1 - |
| drivers/clk/tegra/clk-tegra-pmc.c | 1 - |
| drivers/clk/tegra/clk-tegra-super-gen4.c | 1 - |
| drivers/clk/tegra/clk-tegra114.c | 2 - |
| drivers/clk/tegra/clk-tegra124.c | 1 - |
| drivers/clk/tegra/clk-tegra20.c | 1 - |
| drivers/clk/tegra/clk-tegra30.c | 1 - |
| drivers/clk/tegra/clk.c | 1 + |
| drivers/clk/ti/Makefile | 17 +- |
| drivers/clk/ti/apll.c | 7 +- |
| drivers/clk/ti/autoidle.c | 121 +++- |
| drivers/clk/ti/clk-2xxx.c | 4 +- |
| drivers/clk/ti/clk-33xx.c | 3 + |
| drivers/clk/ti/clk-3xxx-legacy.c | 1 + |
| drivers/clk/ti/clk-3xxx.c | 235 +++++++ |
| drivers/clk/ti/clk-43xx.c | 3 + |
| drivers/clk/ti/clk-44xx.c | 2 + |
| drivers/clk/ti/clk-54xx.c | 2 + |
| drivers/clk/ti/clk-7xx.c | 3 +- |
| drivers/clk/ti/clk-816x.c | 2 + |
| drivers/clk/ti/clk-dra7-atl.c | 1 + |
| drivers/clk/ti/clk.c | 150 ++++- |
| drivers/clk/ti/clkt_dflt.c | 316 ++++++++++ |
| .../arm/mach-omap2 => drivers/clk/ti}/clkt_dpll.c | 27 +- |
| drivers/clk/ti/clkt_iclk.c | 101 +++ |
| drivers/clk/ti/clock.h | 105 ++++ |
| drivers/clk/ti/clockdomain.c | 79 +++ |
| drivers/clk/ti/composite.c | 4 +- |
| drivers/clk/ti/dpll.c | 5 +- |
| {arch/arm/mach-omap2 => drivers/clk/ti}/dpll3xxx.c | 186 +++--- |
| {arch/arm/mach-omap2 => drivers/clk/ti}/dpll44xx.c | 53 +- |
| drivers/clk/ti/fapll.c | 4 +- |
| drivers/clk/ti/fixed-factor.c | 2 + |
| drivers/clk/ti/mux.c | 4 +- |
| drivers/clk/ux500/abx500-clk.c | 1 - |
| drivers/clk/ux500/clk.h | 3 +- |
| drivers/clk/ux500/u8500_clk.c | 1 - |
| drivers/clk/ux500/u8500_of_clk.c | 2 - |
| drivers/clk/ux500/u8540_clk.c | 1 - |
| drivers/clk/ux500/u9540_clk.c | 2 - |
| drivers/clk/versatile/clk-icst.c | 5 +- |
| drivers/clk/versatile/clk-impd1.c | 1 - |
| drivers/clk/versatile/clk-realview.c | 1 - |
| drivers/clk/versatile/clk-sp810.c | 7 +- |
| drivers/clk/versatile/clk-versatile.c | 2 - |
| drivers/clk/zte/Makefile | 2 +- |
| drivers/clk/zte/clk-zx296702.c | 126 +++- |
| drivers/clk/zte/{clk-pll.c => clk.c} | 141 ++++- |
| drivers/clk/zte/clk.h | 9 + |
| drivers/clk/zynq/clkc.c | 1 + |
| drivers/clocksource/cadence_ttc_timer.c | 1 - |
| .../clocking-wizard/clk-xlnx-clock-wizard.c | 1 + |
| drivers/video/fbdev/simplefb.c | 1 + |
| include/dt-bindings/clock/zx296702-clock.h | 17 +- |
| include/linux/clk-provider.h | 74 ++- |
| include/linux/clk/tegra.h | 3 +- |
| include/linux/clk/ti.h | 157 ++--- |
| lib/vsprintf.c | 1 + |
| 252 files changed, 2933 insertions(+), 3544 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/clock/gpio-mux-clock.txt |
| delete mode 100644 arch/arm/mach-omap2/clkt_clksel.c |
| delete mode 100644 arch/arm/mach-omap2/clkt_iclk.c |
| delete mode 100644 arch/arm/mach-omap2/clock2430.c |
| delete mode 100644 arch/arm/mach-omap2/clock2xxx.c |
| delete mode 100644 arch/arm/mach-omap2/clock34xx.c |
| delete mode 100644 arch/arm/mach-omap2/clock34xx.h |
| delete mode 100644 arch/arm/mach-omap2/clock3517.c |
| delete mode 100644 arch/arm/mach-omap2/clock3517.h |
| delete mode 100644 arch/arm/mach-omap2/clock36xx.c |
| delete mode 100644 arch/arm/mach-omap2/clock36xx.h |
| delete mode 100644 arch/arm/mach-omap2/clock3xxx.c |
| delete mode 100644 arch/arm/mach-omap2/clock44xx.h |
| delete mode 100644 arch/arm/mach-omap2/clock_common_data.c |
| delete mode 100644 drivers/clk/clk-gpio-gate.c |
| create mode 100644 drivers/clk/clk-gpio.c |
| create mode 100644 drivers/clk/ti/clkt_dflt.c |
| rename {arch/arm/mach-omap2 => drivers/clk/ti}/clkt_dpll.c (94%) |
| create mode 100644 drivers/clk/ti/clkt_iclk.c |
| rename {arch/arm/mach-omap2 => drivers/clk/ti}/dpll3xxx.c (82%) |
| rename {arch/arm/mach-omap2 => drivers/clk/ti}/dpll44xx.c (80%) |
| rename drivers/clk/zte/{clk-pll.c => clk.c} (55%) |
| $ git am -3 ../patches/0001-clk-ti-fix-for-definition-movement.patch |
| Applying: clk: ti: fix for definition movement |
| $ git reset HEAD^ |
| Unstaged changes after reset: |
| M drivers/clk/ti/clk-814x.c |
| $ git add -A . |
| $ git commit -v -a --amend |
| [master 9974c6084f14] Merge remote-tracking branch 'clk/clk-next' |
| Date: Wed Aug 5 14:33:29 2015 +1000 |
| Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) |
| $ git merge random/dev |
| Already up-to-date. |
| Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0) |
| $ git merge aio/master |
| Already up-to-date. |
| Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) |
| $ git merge llvmlinux/for-next |
| Merge made by the 'recursive' strategy. |
| Merging kselftest/next (d770e558e219 Linux 4.2-rc1) |
| $ git merge kselftest/next |
| Already up-to-date. |
| Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) |
| $ git merge y2038/y2038 |
| Resolved 'drivers/staging/media/lirc/lirc_parallel.c' using previous resolution. |
| Auto-merging kernel/cpuset.c |
| Auto-merging fs/coredump.c |
| Auto-merging drivers/staging/media/lirc/lirc_serial.c |
| Auto-merging drivers/staging/media/lirc/lirc_sasem.c |
| Auto-merging drivers/staging/media/lirc/lirc_parallel.c |
| CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c |
| Auto-merging drivers/staging/gdm72xx/gdm_sdio.c |
| Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c |
| Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c |
| Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 6bb6874802f9] Merge remote-tracking branch 'y2038/y2038' |
| $ git diff -M --stat --summary HEAD^.. |
| drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 +- |
| drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 4 +- |
| drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 +- |
| drivers/staging/ft1000/ft1000.h | 4 +- |
| drivers/staging/gdm72xx/gdm_sdio.c | 13 +++--- |
| drivers/staging/gdm72xx/gdm_sdio.h | 4 +- |
| drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++---------- |
| drivers/staging/media/lirc/lirc_sasem.c | 20 +++++----- |
| drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++---------------- |
| fs/coredump.c | 8 ++-- |
| kernel/cpuset.c | 12 ++++-- |
| 11 files changed, 68 insertions(+), 90 deletions(-) |
| Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux) |
| $ git merge luto-misc/next |
| Already up-to-date. |
| Merging access_once/linux-next (c231afa3ccf1 compiler.h: cast away attributes in WRITE_ONCE magic) |
| $ git merge access_once/linux-next |
| Recorded preimage for 'arch/arm64/include/asm/barrier.h' |
| Auto-merging tools/testing/selftests/Makefile |
| Auto-merging lib/Makefile |
| Auto-merging lib/Kconfig.debug |
| Auto-merging kernel/sched/core.c |
| Auto-merging arch/arm64/include/asm/barrier.h |
| CONFLICT (content): Merge conflict in arch/arm64/include/asm/barrier.h |
| Auto-merging arch/arm/include/asm/barrier.h |
| Auto-merging Documentation/memory-barriers.txt |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| Recorded resolution for 'arch/arm64/include/asm/barrier.h'. |
| [master cd1ebcb3d684] Merge remote-tracking branch 'access_once/linux-next' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/atomic_ops.txt | 4 +- |
| Documentation/memory-barriers.txt | 6 +- |
| Documentation/static-keys.txt | 99 ++++---- |
| arch/Kconfig | 6 + |
| arch/arm/include/asm/barrier.h | 4 +- |
| arch/arm/include/asm/jump_label.h | 25 +- |
| arch/arm/kernel/jump_label.c | 2 +- |
| arch/arm64/include/asm/jump_label.h | 18 +- |
| arch/arm64/kernel/jump_label.c | 2 +- |
| arch/ia64/include/asm/barrier.h | 4 +- |
| arch/metag/include/asm/barrier.h | 4 +- |
| arch/mips/include/asm/barrier.h | 4 +- |
| arch/mips/include/asm/jump_label.h | 19 +- |
| arch/mips/kernel/jump_label.c | 2 +- |
| arch/powerpc/include/asm/barrier.h | 4 +- |
| arch/powerpc/include/asm/jump_label.h | 19 +- |
| arch/powerpc/kernel/jump_label.c | 2 +- |
| arch/s390/include/asm/barrier.h | 4 +- |
| arch/s390/include/asm/jump_label.h | 19 +- |
| arch/s390/kernel/jump_label.c | 2 +- |
| arch/s390/lib/uaccess.c | 12 +- |
| arch/sparc/include/asm/barrier_64.h | 4 +- |
| arch/sparc/include/asm/jump_label.h | 35 ++- |
| arch/sparc/kernel/jump_label.c | 2 +- |
| arch/x86/include/asm/barrier.h | 8 +- |
| arch/x86/include/asm/jump_label.h | 21 +- |
| arch/x86/kernel/jump_label.c | 2 +- |
| arch/x86/kernel/tsc.c | 22 +- |
| include/asm-generic/barrier.h | 4 +- |
| include/linux/compiler.h | 7 +- |
| include/linux/jump_label.h | 261 +++++++++++++++++---- |
| kernel/jump_label.c | 158 +++++++++---- |
| kernel/locking/qrwlock.c | 12 +- |
| kernel/locking/qspinlock.c | 6 +- |
| kernel/locking/qspinlock_paravirt.h | 102 +++++--- |
| kernel/sched/core.c | 6 +- |
| lib/Kconfig.debug | 9 + |
| lib/Makefile | 2 + |
| lib/test_static_key_base.c | 68 ++++++ |
| lib/test_static_keys.c | 225 ++++++++++++++++++ |
| tools/testing/selftests/Makefile | 1 + |
| tools/testing/selftests/static_keys/Makefile | 8 + |
| .../selftests/static_keys/test_static_keys.sh | 16 ++ |
| 43 files changed, 972 insertions(+), 268 deletions(-) |
| create mode 100644 lib/test_static_key_base.c |
| create mode 100644 lib/test_static_keys.c |
| create mode 100644 tools/testing/selftests/static_keys/Makefile |
| create mode 100644 tools/testing/selftests/static_keys/test_static_keys.sh |
| Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next) |
| $ git merge livepatching/for-next |
| Merge made by the 'recursive' strategy. |
| kernel/livepatch/core.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| Merging coresight/next (395855d956ed coresight: Fix implicit inclusion of linux/sched.h) |
| $ git merge coresight/next |
| Merge made by the 'recursive' strategy. |
| .../ABI/testing/sysfs-bus-coresight-devices-etm3x | 2 +- |
| .../ABI/testing/sysfs-bus-coresight-devices-etm4x | 2 +- |
| .../devicetree/bindings/arm/coresight.txt | 1 + |
| Documentation/trace/coresight.txt | 4 +-- |
| drivers/hwtracing/coresight/coresight-etm.h | 7 ++-- |
| drivers/hwtracing/coresight/coresight-etm3x.c | 33 ++++++++++++------- |
| drivers/hwtracing/coresight/coresight-etm4x.c | 37 ++++++++++++++-------- |
| drivers/hwtracing/coresight/coresight-etm4x.h | 7 ++-- |
| drivers/hwtracing/coresight/coresight-replicator.c | 13 +------- |
| include/linux/coresight.h | 21 ++++++++++++ |
| 10 files changed, 82 insertions(+), 45 deletions(-) |
| Merging rtc/rtc-next (bf459bb3f04f rtc: rx8025: remove obsolete local_irq_disable() and local_irq_enable() for rtc_update_irq()) |
| $ git merge rtc/rtc-next |
| Auto-merging drivers/rtc/Kconfig |
| Merge made by the 'recursive' strategy. |
| .../devicetree/bindings/rtc/nxp,lpc1788-rtc.txt | 21 ++ |
| drivers/rtc/Kconfig | 12 + |
| drivers/rtc/Makefile | 1 + |
| drivers/rtc/class.c | 31 +-- |
| drivers/rtc/rtc-88pm80x.c | 28 +- |
| drivers/rtc/rtc-ab-b5ze-s3.c | 1 - |
| drivers/rtc/rtc-bq32k.c | 3 +- |
| drivers/rtc/rtc-dev.c | 1 + |
| drivers/rtc/rtc-ds1307.c | 106 +++---- |
| drivers/rtc/rtc-ds1374.c | 5 +- |
| drivers/rtc/rtc-ds1685.c | 22 +- |
| drivers/rtc/rtc-ds3232.c | 3 +- |
| drivers/rtc/rtc-fm3130.c | 1 - |
| drivers/rtc/rtc-hym8563.c | 1 - |
| drivers/rtc/rtc-isl12022.c | 7 +- |
| drivers/rtc/rtc-isl12057.c | 1 - |
| drivers/rtc/rtc-lpc24xx.c | 310 +++++++++++++++++++++ |
| drivers/rtc/rtc-opal.c | 10 +- |
| drivers/rtc/rtc-pcf2123.c | 8 +- |
| drivers/rtc/rtc-pcf2127.c | 35 ++- |
| drivers/rtc/rtc-pcf85063.c | 1 - |
| drivers/rtc/rtc-pcf8523.c | 1 - |
| drivers/rtc/rtc-pcf8563.c | 1 - |
| drivers/rtc/rtc-pcf8583.c | 1 - |
| drivers/rtc/rtc-rx8025.c | 5 - |
| drivers/rtc/rtc-rx8581.c | 1 - |
| drivers/rtc/rtc-sirfsoc.c | 107 ++++--- |
| 27 files changed, 532 insertions(+), 192 deletions(-) |
| create mode 100644 Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.txt |
| create mode 100644 drivers/rtc/rtc-lpc24xx.c |
| Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) |
| $ git merge hwspinlock/for-next |
| Already up-to-date. |
| Merging nvdimm/libnvdimm-for-next (f6ef5a2a5081 nvdimm: fix inline function return type warning) |
| $ git merge nvdimm/libnvdimm-for-next |
| Auto-merging drivers/nvdimm/pmem.c |
| Auto-merging drivers/nvdimm/btt.c |
| Merge made by the 'recursive' strategy. |
| drivers/acpi/nfit.c | 21 +---- |
| drivers/acpi/nfit.h | 1 + |
| drivers/nvdimm/btt.c | 5 +- |
| drivers/nvdimm/nd.h | 2 +- |
| drivers/nvdimm/pmem.c | 1 + |
| include/uapi/linux/ndctl.h | 12 ++- |
| tools/testing/nvdimm/test/nfit.c | 199 +++++++++++++++++++++++++++------------ |
| 7 files changed, 160 insertions(+), 81 deletions(-) |
| $ git am -3 ../patches/0001-crypto-authenc-select-CRYPTO_NULL.patch |
| Applying: crypto: authenc - select CRYPTO_NULL |
| Merging akpm-current/current (32d8136e7b9b ipc/msg.c: use freezable blocking call) |
| $ git merge --no-ff akpm-current/current |
| Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. |
| Auto-merging sound/soc/soc-core.c |
| Auto-merging scripts/checkpatch.pl |
| Auto-merging mm/mmap.c |
| Auto-merging mm/Kconfig |
| Auto-merging lib/vsprintf.c |
| Auto-merging lib/Makefile |
| Auto-merging lib/Kconfig.debug |
| Auto-merging kernel/sys_ni.c |
| Auto-merging kernel/fork.c |
| Auto-merging kernel/events/core.c |
| Auto-merging kernel/Makefile |
| Auto-merging init/Kconfig |
| Auto-merging include/uapi/linux/Kbuild |
| Auto-merging include/net/sock.h |
| Auto-merging include/linux/swap.h |
| Auto-merging include/linux/nmi.h |
| Auto-merging include/linux/fs.h |
| Auto-merging fs/xfs/xfs_file.c |
| Auto-merging fs/ocfs2/refcounttree.c |
| Auto-merging fs/ocfs2/quota_local.c |
| Auto-merging fs/ocfs2/namei.c |
| Auto-merging fs/ocfs2/file.c |
| Auto-merging fs/ocfs2/cluster/heartbeat.c |
| Auto-merging fs/namespace.c |
| Auto-merging fs/mpage.c |
| Auto-merging fs/ext4/super.c |
| Auto-merging fs/ext4/inode.c |
| CONFLICT (modify/delete): fs/ext3/super.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of fs/ext3/super.c left in tree. |
| Auto-merging fs/ext2/inode.c |
| Auto-merging fs/dax.c |
| Auto-merging fs/Makefile |
| Auto-merging drivers/pci/pci-driver.c |
| Auto-merging drivers/clk/tegra/clk.c |
| Auto-merging drivers/clk/tegra/clk-tegra-pmc.c |
| Auto-merging drivers/clk/samsung/clk.c |
| Auto-merging drivers/clk/samsung/clk-pll.c |
| Auto-merging drivers/clk/clk-moxart.c |
| Auto-merging drivers/block/zram/zram_drv.c |
| Auto-merging drivers/acpi/acpi_lpss.c |
| Auto-merging drivers/acpi/acpi_apd.c |
| Auto-merging block/genhd.c |
| Auto-merging arch/x86/platform/efi/efi.c |
| Auto-merging arch/x86/kvm/vmx.c |
| Auto-merging arch/x86/kernel/setup.c |
| Auto-merging arch/x86/kernel/Makefile |
| Auto-merging arch/x86/entry/syscalls/syscall_32.tbl |
| CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl |
| Auto-merging arch/x86/Kconfig |
| Auto-merging arch/tile/Kconfig |
| Auto-merging arch/s390/Kconfig |
| Auto-merging arch/powerpc/platforms/512x/clock-commonclk.c |
| Auto-merging arch/powerpc/kernel/signal_32.c |
| Auto-merging arch/powerpc/Kconfig |
| Auto-merging arch/mips/kernel/signal32.c |
| Auto-merging arch/mips/Kconfig |
| Auto-merging arch/arm64/include/asm/pgtable.h |
| Auto-merging arch/arm/mach-at91/pm.c |
| Auto-merging arch/arm/Kconfig |
| Auto-merging arch/Kconfig |
| Auto-merging MAINTAINERS |
| Auto-merging Documentation/sysrq.txt |
| Auto-merging Documentation/ioctl/ioctl-number.txt |
| Auto-merging CREDITS |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git rm -f fs/ext3/super.c |
| fs/ext3/super.c: needs merge |
| rm 'fs/ext3/super.c' |
| $ git commit -v -a |
| [master 889c677a670e] Merge branch 'akpm-current/current' |
| $ git diff -M --stat --summary HEAD^.. |
| CREDITS | 4 + |
| Documentation/blockdev/zram.txt | 3 +- |
| Documentation/devicetree/bindings/w1/omap-hdq.txt | 7 +- |
| Documentation/features/vm/TLB/arch-support.txt | 40 + |
| Documentation/filesystems/dax.txt | 7 +- |
| .../filesystems/ocfs2-online-filecheck.txt | 95 + |
| Documentation/filesystems/proc.txt | 18 +- |
| Documentation/filesystems/vfat.txt | 10 + |
| Documentation/ioctl/ioctl-number.txt | 1 + |
| Documentation/printk-formats.txt | 8 + |
| Documentation/sysrq.txt | 3 +- |
| Documentation/vm/00-INDEX | 2 + |
| Documentation/vm/idle_page_tracking.txt | 94 + |
| Documentation/vm/pagemap.txt | 30 +- |
| Documentation/vm/userfaultfd.txt | 144 + |
| Documentation/w1/masters/omap-hdq | 6 + |
| MAINTAINERS | 3 +- |
| arch/Kconfig | 3 + |
| arch/alpha/include/uapi/asm/mman.h | 4 + |
| arch/arm/Kconfig | 1 + |
| arch/arm/include/asm/pgtable-3level.h | 1 + |
| arch/arm/mach-at91/pm.c | 2 +- |
| arch/arm/mach-imx/pm-imx5.c | 2 +- |
| arch/arm/mach-imx/pm-imx6.c | 2 +- |
| arch/arm/mach-socfpga/pm.c | 2 +- |
| arch/arm/mach-vexpress/spc.c | 2 +- |
| arch/arm64/include/asm/pgtable.h | 2 + |
| arch/arm64/kernel/signal32.c | 5 +- |
| arch/ia64/Kconfig | 1 + |
| arch/m68k/Kconfig | 1 + |
| arch/mips/Kconfig | 1 + |
| arch/mips/include/uapi/asm/mman.h | 7 + |
| arch/mips/include/uapi/asm/unistd.h | 15 +- |
| arch/mips/kernel/scall32-o32.S | 1 + |
| arch/mips/kernel/scall64-64.S | 1 + |
| arch/mips/kernel/scall64-n32.S | 1 + |
| arch/mips/kernel/scall64-o32.S | 1 + |
| arch/mips/kernel/signal32.c | 2 - |
| arch/parisc/include/uapi/asm/mman.h | 4 + |
| arch/powerpc/Kconfig | 1 + |
| arch/powerpc/include/asm/pgtable-ppc64.h | 2 + |
| arch/powerpc/include/asm/systbl.h | 1 + |
| arch/powerpc/include/asm/unistd.h | 2 +- |
| arch/powerpc/include/uapi/asm/mman.h | 1 + |
| arch/powerpc/include/uapi/asm/unistd.h | 1 + |
| arch/powerpc/kernel/signal_32.c | 2 - |
| arch/powerpc/platforms/512x/clock-commonclk.c | 4 +- |
| arch/s390/Kconfig | 1 + |
| arch/sh/Kconfig | 1 + |
| arch/sparc/include/asm/pgtable_64.h | 9 + |
| arch/sparc/include/uapi/asm/mman.h | 1 + |
| arch/tile/Kconfig | 1 + |
| arch/tile/include/uapi/asm/mman.h | 1 + |
| arch/tile/kernel/compat_signal.c | 2 - |
| arch/x86/Kconfig | 4 +- |
| arch/x86/boot/header.S | 2 +- |
| arch/x86/entry/syscalls/syscall_32.tbl | 2 + |
| arch/x86/entry/syscalls/syscall_64.tbl | 2 + |
| arch/x86/include/asm/kdebug.h | 2 +- |
| arch/x86/include/asm/pgtable.h | 5 + |
| arch/x86/include/asm/tlbflush.h | 6 + |
| arch/x86/kernel/Makefile | 4 +- |
| arch/x86/kernel/cpu/perf_event_intel.c | 2 +- |
| arch/x86/kernel/kvmclock.c | 4 +- |
| arch/x86/kernel/machine_kexec_64.c | 1 + |
| arch/x86/kernel/reboot.c | 4 +- |
| arch/x86/kernel/setup.c | 2 +- |
| arch/x86/kernel/vmlinux.lds.S | 2 +- |
| arch/x86/kvm/vmx.c | 8 +- |
| arch/x86/mm/numa.c | 6 +- |
| arch/x86/mm/tlb.c | 1 + |
| arch/x86/platform/efi/efi.c | 4 +- |
| arch/x86/platform/uv/uv_nmi.c | 6 +- |
| arch/xtensa/include/uapi/asm/mman.h | 7 + |
| block/genhd.c | 2 +- |
| drivers/acpi/acpi_apd.c | 3 +- |
| drivers/acpi/acpi_lpss.c | 2 +- |
| drivers/block/zram/zram_drv.c | 15 +- |
| drivers/block/zram/zram_drv.h | 1 - |
| drivers/clk/clk-mb86s7x.c | 2 +- |
| drivers/clk/clk-moxart.c | 4 +- |
| drivers/clk/samsung/clk-pll.c | 2 +- |
| drivers/clk/samsung/clk.c | 9 +- |
| drivers/clk/tegra/clk-tegra-pmc.c | 2 +- |
| drivers/clk/tegra/clk.c | 2 +- |
| .../crypto/qat/qat_common/adf_transport_debug.c | 16 +- |
| drivers/firmware/efi/Kconfig | 2 +- |
| drivers/gpu/drm/drm_vm.c | 8 +- |
| drivers/media/platform/coda/coda-common.c | 2 +- |
| drivers/misc/sram.c | 8 +- |
| drivers/net/wireless/ath/wil6210/debugfs.c | 35 +- |
| drivers/parisc/ccio-dma.c | 13 +- |
| drivers/parisc/sba_iommu.c | 9 +- |
| drivers/pci/pci-driver.c | 2 +- |
| drivers/s390/crypto/zcrypt_api.c | 10 +- |
| drivers/tty/sysrq.c | 11 +- |
| drivers/w1/masters/omap_hdq.c | 224 +- |
| fs/9p/v9fs.c | 8 +- |
| fs/Makefile | 1 + |
| fs/affs/super.c | 8 +- |
| fs/aio.c | 27 +- |
| fs/binfmt_misc.c | 12 +- |
| fs/block_dev.c | 1 + |
| fs/cachefiles/daemon.c | 84 +- |
| fs/char_dev.c | 2 +- |
| fs/cifs/file.c | 8 +- |
| fs/coda/upcall.c | 6 +- |
| fs/dax.c | 152 ++ |
| fs/dcache.c | 15 +- |
| fs/exofs/super.c | 8 +- |
| fs/ext2/file.c | 10 +- |
| fs/ext2/inode.c | 1 + |
| fs/ext2/super.c | 6 +- |
| fs/ext4/file.c | 11 +- |
| fs/ext4/fsync.c | 5 +- |
| fs/ext4/indirect.c | 1 + |
| fs/ext4/inode.c | 1 + |
| fs/ext4/super.c | 15 +- |
| fs/fat/cache.c | 79 +- |
| fs/fat/dir.c | 2 +- |
| fs/fat/fat.h | 6 +- |
| fs/fat/file.c | 61 + |
| fs/fat/inode.c | 75 +- |
| fs/file_table.c | 24 +- |
| fs/hfs/bnode.c | 9 +- |
| fs/hfs/brec.c | 20 +- |
| fs/hfsplus/bnode.c | 3 - |
| fs/hugetlbfs/inode.c | 304 ++- |
| fs/inode.c | 2 +- |
| fs/libfs.c | 26 +- |
| fs/mpage.c | 23 +- |
| fs/namespace.c | 4 +- |
| fs/notify/dnotify/dnotify.c | 14 +- |
| fs/notify/fanotify/fanotify_user.c | 8 +- |
| fs/notify/fdinfo.c | 3 +- |
| fs/notify/fsnotify.c | 11 +- |
| fs/notify/fsnotify.h | 21 +- |
| fs/notify/inode_mark.c | 20 - |
| fs/notify/mark.c | 141 +- |
| fs/notify/vfsmount_mark.c | 19 - |
| fs/ntfs/super.c | 21 +- |
| fs/ocfs2/Makefile | 3 +- |
| fs/ocfs2/acl.c | 26 +- |
| fs/ocfs2/alloc.c | 245 +- |
| fs/ocfs2/aops.c | 58 +- |
| fs/ocfs2/buffer_head_io.c | 6 + |
| fs/ocfs2/cluster/heartbeat.c | 123 +- |
| fs/ocfs2/cluster/nodemanager.c | 50 +- |
| fs/ocfs2/dir.c | 70 +- |
| fs/ocfs2/dlm/dlmmaster.c | 22 +- |
| fs/ocfs2/dlm/dlmthread.c | 10 + |
| fs/ocfs2/dlmglue.c | 10 +- |
| fs/ocfs2/extent_map.c | 22 +- |
| fs/ocfs2/file.c | 25 +- |
| fs/ocfs2/filecheck.c | 571 ++++ |
| fs/ocfs2/filecheck.h | 48 + |
| fs/ocfs2/inode.c | 245 +- |
| fs/ocfs2/inode.h | 5 +- |
| fs/ocfs2/journal.c | 32 +- |
| fs/ocfs2/localalloc.c | 3 +- |
| fs/ocfs2/move_extents.c | 8 +- |
| fs/ocfs2/namei.c | 66 +- |
| fs/ocfs2/ocfs2.h | 2 + |
| fs/ocfs2/ocfs2_trace.h | 2 + |
| fs/ocfs2/quota_local.c | 3 +- |
| fs/ocfs2/refcounttree.c | 81 +- |
| fs/ocfs2/stack_user.c | 50 +- |
| fs/ocfs2/stackglue.c | 3 +- |
| fs/ocfs2/stackglue.h | 2 + |
| fs/ocfs2/suballoc.c | 90 +- |
| fs/ocfs2/super.c | 74 +- |
| fs/ocfs2/super.h | 8 +- |
| fs/ocfs2/xattr.c | 51 +- |
| fs/proc/array.c | 5 +- |
| fs/proc/base.c | 113 +- |
| fs/proc/page.c | 286 ++ |
| fs/proc/task_mmu.c | 292 +-- |
| fs/seq_file.c | 42 + |
| fs/signalfd.c | 5 +- |
| fs/super.c | 8 +- |
| fs/userfaultfd.c | 1330 ++++++++++ |
| fs/xfs/xfs_buf.h | 1 + |
| fs/xfs/xfs_file.c | 30 +- |
| fs/xfs/xfs_trace.h | 1 + |
| include/linux/crc64_ecma.h | 56 + |
| include/linux/cred.h | 8 + |
| include/linux/dax.h | 39 + |
| include/linux/fs.h | 20 +- |
| include/linux/fsnotify_backend.h | 55 +- |
| include/linux/genalloc.h | 6 +- |
| include/linux/gfp.h | 5 +- |
| include/linux/huge_mm.h | 27 +- |
| include/linux/hugetlb.h | 17 +- |
| include/linux/kernel.h | 129 +- |
| include/linux/kexec.h | 8 +- |
| include/linux/kthread.h | 2 +- |
| include/linux/memblock.h | 4 +- |
| include/linux/memcontrol.h | 392 ++- |
| include/linux/mm.h | 176 +- |
| include/linux/mm_types.h | 12 + |
| include/linux/mmu_notifier.h | 46 + |
| include/linux/mmzone.h | 8 - |
| include/linux/nmi.h | 8 +- |
| include/linux/oom.h | 38 +- |
| include/linux/page-flags.h | 248 +- |
| include/linux/page-isolation.h | 5 - |
| include/linux/page_ext.h | 4 + |
| include/linux/pagemap.h | 25 +- |
| include/linux/parse-integer.h | 188 ++ |
| include/linux/poison.h | 17 +- |
| include/linux/printk.h | 14 +- |
| include/linux/rmap.h | 12 +- |
| include/linux/sched.h | 23 + |
| include/linux/seq_file.h | 4 + |
| include/linux/slab.h | 10 + |
| include/linux/smpboot.h | 11 +- |
| include/linux/string.h | 1 + |
| include/linux/swap.h | 22 +- |
| include/linux/syscalls.h | 3 + |
| include/linux/userfaultfd_k.h | 85 + |
| include/linux/vm_event_item.h | 1 + |
| include/linux/wait.h | 5 +- |
| include/linux/watchdog.h | 8 - |
| include/linux/zbud.h | 2 +- |
| include/linux/zpool.h | 4 +- |
| include/linux/zsmalloc.h | 6 + |
| include/net/sock.h | 33 - |
| include/trace/events/tlb.h | 3 +- |
| include/uapi/asm-generic/mman-common.h | 6 + |
| include/uapi/asm-generic/mman.h | 1 + |
| include/uapi/asm-generic/unistd.h | 4 +- |
| include/uapi/linux/Kbuild | 1 + |
| include/uapi/linux/kernel-page-flags.h | 1 + |
| include/uapi/linux/prctl.h | 7 + |
| include/uapi/linux/securebits.h | 11 +- |
| include/uapi/linux/userfaultfd.h | 169 ++ |
| init/Kconfig | 22 + |
| init/initramfs.c | 4 +- |
| init/main.c | 2 +- |
| ipc/mqueue.c | 5 - |
| ipc/msg.c | 5 +- |
| ipc/msgutil.c | 2 +- |
| ipc/shm.c | 6 +- |
| kernel/Makefile | 2 + |
| kernel/events/core.c | 2 +- |
| kernel/extable.c | 1 - |
| kernel/fork.c | 8 +- |
| kernel/kexec.c | 2769 +------------------- |
| kernel/kexec_core.c | 1510 +++++++++++ |
| kernel/kexec_file.c | 1044 ++++++++ |
| kernel/kexec_internal.h | 22 + |
| kernel/ksysfs.c | 6 +- |
| kernel/kthread.c | 11 +- |
| kernel/printk/printk.c | 2 +- |
| kernel/reboot.c | 2 +- |
| kernel/sched/wait.c | 7 +- |
| kernel/signal.c | 13 +- |
| kernel/smpboot.c | 27 +- |
| kernel/sys_ni.c | 2 + |
| kernel/sysctl.c | 12 +- |
| kernel/user_namespace.c | 4 +- |
| kernel/watchdog.c | 17 +- |
| lib/Kconfig | 7 + |
| lib/Kconfig.debug | 3 + |
| lib/Makefile | 3 + |
| lib/bitmap.c | 43 +- |
| lib/cmdline.c | 44 +- |
| lib/crc64_ecma.c | 341 +++ |
| lib/genalloc.c | 110 +- |
| lib/iommu-common.c | 2 +- |
| lib/kstrtox.c | 254 -- |
| lib/kstrtox.h | 1 - |
| lib/parse-integer.c | 222 ++ |
| lib/parser.c | 33 +- |
| lib/show_mem.c | 4 +- |
| lib/string_helpers.c | 10 +- |
| lib/swiotlb.c | 2 +- |
| lib/test-kstrtox.c | 6 +- |
| lib/test-parse-integer.c | 563 ++++ |
| lib/vsprintf.c | 101 +- |
| mm/Kconfig | 13 + |
| mm/Makefile | 1 + |
| mm/bootmem.c | 7 + |
| mm/compaction.c | 32 +- |
| mm/debug.c | 5 + |
| mm/dmapool.c | 5 +- |
| mm/filemap.c | 49 +- |
| mm/gup.c | 70 +- |
| mm/huge_memory.c | 223 +- |
| mm/hugetlb.c | 448 +++- |
| mm/hwpoison-inject.c | 5 +- |
| mm/internal.h | 15 + |
| mm/kmemleak.c | 21 +- |
| mm/ksm.c | 2 +- |
| mm/madvise.c | 187 +- |
| mm/memblock.c | 14 +- |
| mm/memcontrol.c | 497 +--- |
| mm/memory-failure.c | 18 +- |
| mm/memory.c | 66 +- |
| mm/memory_hotplug.c | 11 +- |
| mm/mempolicy.c | 7 +- |
| mm/mempool.c | 3 + |
| mm/memtest.c | 23 +- |
| mm/migrate.c | 25 +- |
| mm/mlock.c | 95 +- |
| mm/mmap.c | 56 +- |
| mm/mmu_notifier.c | 17 + |
| mm/mprotect.c | 3 +- |
| mm/mremap.c | 50 +- |
| mm/oom_kill.c | 142 +- |
| mm/page_alloc.c | 115 +- |
| mm/page_ext.c | 3 + |
| mm/page_isolation.c | 42 +- |
| mm/rmap.c | 175 +- |
| mm/shmem.c | 22 +- |
| mm/slab.c | 15 +- |
| mm/slab.h | 9 + |
| mm/slab_common.c | 31 +- |
| mm/slob.c | 13 + |
| mm/slub.c | 204 +- |
| mm/swap.c | 46 + |
| mm/swap_state.c | 41 +- |
| mm/swapfile.c | 42 + |
| mm/userfaultfd.c | 308 +++ |
| mm/util.c | 40 +- |
| mm/vmscan.c | 209 +- |
| mm/vmstat.c | 1 + |
| mm/zbud.c | 10 +- |
| mm/zpool.c | 4 +- |
| mm/zsmalloc.c | 235 +- |
| mm/zswap.c | 75 +- |
| net/sunrpc/sched.c | 2 +- |
| scripts/Lindent | 3 + |
| scripts/checkpatch.pl | 117 +- |
| scripts/decode_stacktrace.sh | 5 +- |
| scripts/kernel-doc | 38 +- |
| scripts/spelling.txt | 5 + |
| security/commoncap.c | 103 +- |
| security/keys/process_keys.c | 1 + |
| sound/core/oss/mixer_oss.c | 7 +- |
| sound/core/oss/pcm_oss.c | 13 +- |
| sound/core/pcm.c | 13 +- |
| sound/core/pcm_memory.c | 11 +- |
| sound/pci/ac97/ac97_codec.c | 9 +- |
| sound/soc/soc-core.c | 9 +- |
| tools/testing/selftests/vm/Makefile | 5 + |
| tools/testing/selftests/vm/mlock2-tests.c | 661 +++++ |
| tools/testing/selftests/vm/on-fault-limit.c | 47 + |
| tools/testing/selftests/vm/run_vmtests | 33 + |
| tools/testing/selftests/vm/userfaultfd.c | 636 +++++ |
| tools/vm/page-types.c | 35 +- |
| virt/kvm/kvm_main.c | 31 + |
| 352 files changed, 14991 insertions(+), 6218 deletions(-) |
| create mode 100644 Documentation/features/vm/TLB/arch-support.txt |
| create mode 100644 Documentation/filesystems/ocfs2-online-filecheck.txt |
| create mode 100644 Documentation/vm/idle_page_tracking.txt |
| create mode 100644 Documentation/vm/userfaultfd.txt |
| create mode 100644 fs/ocfs2/filecheck.c |
| create mode 100644 fs/ocfs2/filecheck.h |
| create mode 100644 fs/userfaultfd.c |
| create mode 100644 include/linux/crc64_ecma.h |
| create mode 100644 include/linux/dax.h |
| create mode 100644 include/linux/parse-integer.h |
| create mode 100644 include/linux/userfaultfd_k.h |
| create mode 100644 include/uapi/linux/userfaultfd.h |
| create mode 100644 kernel/kexec_core.c |
| create mode 100644 kernel/kexec_file.c |
| create mode 100644 kernel/kexec_internal.h |
| create mode 100644 lib/crc64_ecma.c |
| create mode 100644 lib/parse-integer.c |
| create mode 100644 lib/test-parse-integer.c |
| create mode 100644 mm/userfaultfd.c |
| create mode 100644 tools/testing/selftests/vm/mlock2-tests.c |
| create mode 100644 tools/testing/selftests/vm/on-fault-limit.c |
| create mode 100644 tools/testing/selftests/vm/userfaultfd.c |
| $ git am -3 ../patches/userfaultfd--selftest--update-userfaultfd-x86-32bit-syscall-number.patch |
| Applying: userfaultfd: selftest: update userfaultfd x86 32bit syscall number |
| $ git reset HEAD^ |
| Unstaged changes after reset: |
| M tools/testing/selftests/vm/userfaultfd.c |
| $ git add -A . |
| $ git commit -v -a --amend |
| [master 081df8d926a3] Merge branch 'akpm-current/current' |
| Date: Wed Aug 5 16:50:20 2015 +1000 |
| $ 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: drivers/gpu/drm/i915/intel_sprite.c: fix build |
| Applying: drivers/gpu/drm/i915/intel_tv.c: fix build |
| Applying: net/netfilter/ipset: work around gcc-4.4.4 initializer bug |
| Applying: ARM: mm: do not use virt_to_idmap() for NOMMU systems |
| Applying: namei: fix warning while make xmldocs caused by namei.c |
| Applying: fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void |
| Applying: fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix |
| Applying: mm: mark most vm_operations_struct const |
| Applying: mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff() |
| Applying: mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix |
| Applying: mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix-checkpatch-fixes |
| Applying: mm: make sure all file VMAs have ->vm_ops set |
| Applying: mm: use vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd() |
| Applying: mm, madvise: use vma_is_anonymous() to check for anon VMA |
| Applying: drivers/w1/w1_int.c: call put_device if device_register fails |
| $ cd ../next |
| $ git fetch -f ../rebase-tmp akpm:akpm/master |
| From ../rebase-tmp |
| + 828efd55b035...f19b1de5c289 akpm -> akpm/master (forced update) |
| $ rm -rf ../rebase-tmp |
| Merging akpm/master (f19b1de5c289 drivers/w1/w1_int.c: call put_device if device_register fails) |
| $ git merge --no-ff akpm/master |
| Merge made by the 'recursive' strategy. |
| arch/arm/include/asm/memory.h | 4 ++ |
| arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- |
| arch/x86/mm/mpx.c | 51 +++---------------- |
| drivers/android/binder.c | 2 +- |
| drivers/gpu/drm/i915/intel_sprite.c | 2 +- |
| drivers/gpu/drm/i915/intel_tv.c | 2 +- |
| drivers/gpu/drm/vgem/vgem_drv.c | 2 +- |
| drivers/hsi/clients/cmt_speech.c | 2 +- |
| drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- |
| drivers/infiniband/hw/qib/qib_mmap.c | 2 +- |
| drivers/media/platform/omap/omap_vout.c | 2 +- |
| drivers/misc/genwqe/card_dev.c | 2 +- |
| drivers/staging/android/ion/ion.c | 2 +- |
| drivers/staging/comedi/comedi_fops.c | 2 +- |
| drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 2 +- |
| drivers/w1/w1_int.c | 3 +- |
| drivers/xen/gntalloc.c | 2 +- |
| drivers/xen/gntdev.c | 2 +- |
| drivers/xen/privcmd.c | 4 +- |
| fs/ceph/addr.c | 2 +- |
| fs/cifs/file.c | 2 +- |
| fs/namei.c | 2 +- |
| fs/nsfs.c | 3 +- |
| fs/seq_file.c | 70 ++++++++++++-------------- |
| include/linux/mm.h | 12 ++++- |
| include/linux/seq_file.h | 19 +++---- |
| mm/madvise.c | 2 +- |
| mm/memory.c | 4 +- |
| mm/mmap.c | 18 ++++--- |
| mm/nommu.c | 19 +++---- |
| net/netfilter/ipset/ip_set_hash_netnet.c | 10 +++- |
| net/netfilter/ipset/ip_set_hash_netportnet.c | 10 +++- |
| security/selinux/selinuxfs.c | 2 +- |
| 33 files changed, 127 insertions(+), 140 deletions(-) |
