GIT: wrapfs-4.3.y -- Wrapfs: update copyright year to 2015 (push to branch refs/heads/master)

ezk at fsl.cs.sunysb.edu ezk at fsl.cs.sunysb.edu
Sun Dec 13 18:59:47 EST 2015


Push to branch refs/heads/master:
5e4bd0facaeddc687b3207db842270e0978c136e -->
  ac8ab709daa01f0084aa930335446be72a3ab898

 .gitignore                                         |     6 +
 .mailmap                                           |     1 +
 CREDITS                                            |     4 +
 Documentation/ABI/testing/sysfs-hypervisor-pmu     |    23 +
 Documentation/Changes                              |    17 +-
 Documentation/DMA-API.txt                          |     7 +
 Documentation/DocBook/device-drivers.tmpl          |    61 +
 Documentation/DocBook/media/Makefile               |     3 +-
 Documentation/DocBook/media/dvb/intro.xml          |     5 +-
 Documentation/DocBook/media/v4l/controls.xml       |     2 +-
 .../DocBook/media/v4l/media-ioc-device-info.xml    |     2 +-
 Documentation/DocBook/media/v4l/vidioc-expbuf.xml  |    38 +-
 Documentation/DocBook/media/v4l/vidioc-g-parm.xml  |     2 +-
 .../DocBook/media/v4l/vidioc-queryctrl.xml         |     2 +-
 Documentation/arm/OMAP/README                      |     7 +
 Documentation/blockdev/zram.txt                    |     3 +-
 Documentation/cgroups/blkio-controller.txt         |    24 +-
 Documentation/cgroups/unified-hierarchy.txt        |    61 +-
 Documentation/device-mapper/snapshot.txt           |    10 +-
 Documentation/devicetree/bindings/arm/gic-v3.txt   |     5 +
 .../devicetree/bindings/arm/idle-states.txt        |     2 +-
 Documentation/devicetree/bindings/gpio/gpio.txt    |     4 +-
 Documentation/devicetree/bindings/hwmon/ina209.txt |    18 +
 Documentation/devicetree/bindings/hwmon/ina2xx.txt |    22 +
 .../devicetree/bindings/hwmon/max6697.txt          |    64 +
 .../devicetree/bindings/i2c/i2c-cadence.txt        |     6 +-
 .../devicetree/bindings/i2c/i2c-emev2.txt          |    22 +
 .../devicetree/bindings/i2c/i2c-lpc2k.txt          |    33 +
 .../devicetree/bindings/i2c/i2c-mux-reg.txt        |    74 +
 Documentation/devicetree/bindings/i2c/i2c.txt      |    45 +
 Documentation/devicetree/bindings/i2c/ina209.txt   |    18 -
 Documentation/devicetree/bindings/i2c/ina2xx.txt   |    22 -
 Documentation/devicetree/bindings/i2c/max6697.txt  |    64 -
 Documentation/devicetree/bindings/i2c/ti,bq32k.txt |    18 -
 .../devicetree/bindings/i2c/trivial-devices.txt    |     2 +
 .../devicetree/bindings/iio/accel/bma180.txt       |     8 +-
 .../devicetree/bindings/input/cypress,cyapa.txt    |     2 +-
 .../bindings/input/touchscreen/colibri-vf50-ts.txt |    36 +
 .../bindings/input/touchscreen/imx6ul_tsc.txt      |    36 +
 .../interrupt-controller/qca,ath79-misc-intc.txt   |    20 +-
 .../devicetree/bindings/iommu/arm,smmu.txt         |     6 +
 .../devicetree/bindings/iommu/ti,omap-iommu.txt    |     6 +
 Documentation/devicetree/bindings/ipmi.txt         |    25 +
 .../devicetree/bindings/media/i2c/adv7604.txt      |    21 +-
 .../devicetree/bindings/media/i2c/tc358743.txt     |    48 +
 .../devicetree/bindings/media/renesas,jpu.txt      |    24 +
 .../bindings/media/stih407-c8sectpfe.txt           |    89 +
 .../devicetree/bindings/mmc/arasan,sdhci.txt       |     2 +-
 .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |     6 +
 .../devicetree/bindings/mmc/sdhci-atmel.txt        |    21 +
 .../devicetree/bindings/mmc/ti-omap-hsmmc.txt      |     2 +-
 Documentation/devicetree/bindings/net/cpsw.txt     |     1 +
 .../devicetree/bindings/net/smsc-lan87xx.txt       |    24 +
 .../devicetree/bindings/pci/pci-rcar-gen2.txt      |     3 +-
 .../devicetree/bindings/pwm/lpc1850-sct-pwm.txt    |    20 +
 .../bindings/regulator/pbias-regulator.txt         |     7 +-
 .../devicetree/bindings/rtc/nxp,lpc1788-rtc.txt    |    21 +
 Documentation/devicetree/bindings/rtc/rtc-omap.txt |     4 +
 Documentation/devicetree/bindings/rtc/ti,bq32k.txt |    18 +
 Documentation/devicetree/bindings/rtc/xlnx-rtc.txt |    25 +
 .../devicetree/bindings/soc/qcom/qcom,smd.txt      |     6 +
 Documentation/devicetree/bindings/spi/sh-msiof.txt |     2 +-
 .../devicetree/bindings/spi/spi-mt65xx.txt         |    16 +-
 .../devicetree/bindings/thermal/thermal.txt        |    27 +-
 .../devicetree/bindings/usb/ci-hdrc-usb2.txt       |     1 +
 Documentation/devicetree/bindings/usb/dwc3.txt     |     2 +
 .../devicetree/bindings/usb/renesas_usbhs.txt      |     1 +
 .../devicetree/bindings/vendor-prefixes.txt        |     1 +
 .../bindings/watchdog/atmel-sama5d4-wdt.txt        |    35 +
 .../devicetree/bindings/watchdog/lpc18xx-wdt.txt   |    19 +
 Documentation/features/vm/THP/arch-support.txt     |     2 +-
 Documentation/features/vm/TLB/arch-support.txt     |    40 +
 Documentation/filesystems/00-INDEX                 |     3 +
 Documentation/filesystems/Locking                  |     3 +-
 Documentation/filesystems/dax.txt                  |     7 +-
 Documentation/filesystems/nfs/nfs-rdma.txt         |    16 +-
 Documentation/filesystems/proc.txt                 |    23 +-
 Documentation/filesystems/wrapfs.txt               |   172 +
 Documentation/gpio/board.txt                       |    40 +-
 Documentation/gpio/consumer.txt                    |     3 +
 Documentation/hwmon/nct6775                        |     4 +
 Documentation/i2c/busses/i2c-parport               |     1 +
 Documentation/i2c/slave-interface                  |     9 +-
 Documentation/i2c/ten-bit-addresses                |     4 +
 Documentation/infiniband/sysfs.txt                 |    20 +
 Documentation/input/multi-touch-protocol.txt       |     2 +-
 Documentation/ioctl/ioctl-number.txt               |     3 +-
 Documentation/kbuild/kbuild.txt                    |     5 +
 Documentation/kernel-parameters.txt                |    16 +
 Documentation/md-cluster.txt                       |     4 +-
 Documentation/module-signing.txt                   |    56 +-
 Documentation/networking/vrf.txt                   |    96 +
 Documentation/power/pci.txt                        |    51 +-
 Documentation/ptp/testptp.c                        |     1 +
 Documentation/security/Smack.txt                   |    27 +-
 Documentation/security/Yama.txt                    |    10 +-
 Documentation/static-keys.txt                      |     4 +-
 Documentation/sysctl/net.txt                       |    16 +-
 Documentation/sysctl/vm.txt                        |     4 +-
 Documentation/sysrq.txt                            |     3 +-
 Documentation/thermal/power_allocator.txt          |     2 +-
 Documentation/thermal/sysfs-api.txt                |     6 +
 Documentation/trace/ftrace.txt                     |    51 +-
 Documentation/virtual/kvm/api.txt                  |    15 +-
 Documentation/vm/00-INDEX                          |     2 +
 Documentation/vm/hugetlbpage.txt                   |    15 +-
 Documentation/vm/idle_page_tracking.txt            |    98 +
 Documentation/vm/pagemap.txt                       |    28 +-
 Documentation/vm/userfaultfd.txt                   |   144 +
 Documentation/vm/zswap.txt                         |    36 +-
 Documentation/watchdog/src/watchdog-test.c         |    22 +-
 MAINTAINERS                                        |   224 +-
 Makefile                                           |    29 +-
 arch/Kconfig                                       |     4 +-
 arch/alpha/include/asm/dma-mapping.h               |    36 -
 arch/alpha/include/asm/io.h                        |     4 +-
 arch/alpha/include/asm/word-at-a-time.h            |     2 +
 arch/alpha/kernel/irq.c                            |     2 +-
 arch/alpha/kernel/pci-noop.c                       |    10 -
 arch/alpha/kernel/pci.c                            |     7 +-
 arch/alpha/kernel/pci_iommu.c                      |    11 -
 arch/alpha/lib/udelay.c                            |     1 +
 arch/arc/include/asm/Kbuild                        |     1 +
 arch/arc/kernel/mcip.c                             |     2 +-
 arch/arc/plat-axs10x/axs10x.c                      |     2 +
 arch/arm/Kconfig                                   |     2 +
 arch/arm/Makefile                                  |     8 +
 arch/arm/boot/compressed/decompress.c              |     2 +-
 arch/arm/boot/dts/Makefile                         |     2 +-
 arch/arm/boot/dts/am335x-phycore-som.dtsi          |     4 +-
 arch/arm/boot/dts/am4372.dtsi                      |     2 +
 arch/arm/boot/dts/am437x-gp-evm.dts                |    13 +
 arch/arm/boot/dts/am437x-idk-evm.dts               |     9 +
 arch/arm/boot/dts/am437x-sk-evm.dts                |     9 +
 arch/arm/boot/dts/am57xx-beagle-x15.dts            |    49 +-
 arch/arm/boot/dts/armada-385-db-ap.dts             |     2 +-
 arch/arm/boot/dts/berlin2q.dtsi                    |     6 +-
 arch/arm/boot/dts/dm8148-evm.dts                   |     4 +-
 arch/arm/boot/dts/dm8148-t410.dts                  |     6 +-
 arch/arm/boot/dts/dm814x.dtsi                      |     8 +-
 arch/arm/boot/dts/dra7.dtsi                        |     5 +-
 arch/arm/boot/dts/emev2-kzm9d.dts                  |     8 +-
 arch/arm/boot/dts/exynos3250-monk.dts              |    20 +
 arch/arm/boot/dts/exynos3250-rinato.dts            |    20 +
 arch/arm/boot/dts/exynos3250.dtsi                  |    16 +
 arch/arm/boot/dts/exynos4.dtsi                     |     1 +
 arch/arm/boot/dts/exynos4210-trats.dts             |     2 +-
 arch/arm/boot/dts/exynos4210-universal_c210.dts    |     2 +-
 arch/arm/boot/dts/exynos4212.dtsi                  |    81 +
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi    |     4 +
 arch/arm/boot/dts/exynos4412-odroidu3.dts          |     8 +
 arch/arm/boot/dts/exynos4412-origen.dts            |     4 +
 arch/arm/boot/dts/exynos4412-trats2.dts            |     5 +
 arch/arm/boot/dts/exynos4412.dtsi                  |    84 +
 arch/arm/boot/dts/exynos5250-arndale.dts           |     4 +
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |     5 +
 arch/arm/boot/dts/exynos5250-snow.dts              |     5 +
 arch/arm/boot/dts/exynos5250-spring.dts            |     4 +
 arch/arm/boot/dts/exynos5250.dtsi                  |    22 +
 arch/arm/boot/dts/exynos5420-peach-pit.dts         |     5 +
 arch/arm/boot/dts/exynos5420.dtsi                  |     2 +-
 arch/arm/boot/dts/exynos5422-cpus.dtsi             |    81 +
 arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi |     2 +-
 arch/arm/boot/dts/exynos5800-peach-pi.dts          |     5 +
 arch/arm/boot/dts/imx27.dtsi                       |    16 +-
 arch/arm/boot/dts/imx53-qsrb.dts                   |     2 +-
 arch/arm/boot/dts/imx53.dtsi                       |     1 +
 arch/arm/boot/dts/imx6qdl-rex.dtsi                 |     2 -
 arch/arm/boot/dts/imx7d.dtsi                       |     4 +-
 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts  |     2 +-
 arch/arm/boot/dts/meson.dtsi                       |    23 +-
 arch/arm/boot/dts/omap2430.dtsi                    |     3 +-
 arch/arm/boot/dts/omap3-beagle.dts                 |     2 +-
 arch/arm/boot/dts/omap3-evm-37xx.dts               |     2 +-
 arch/arm/boot/dts/omap3-igep.dtsi                  |     6 -
 arch/arm/boot/dts/omap3-igep0020-common.dtsi       |     6 +
 arch/arm/boot/dts/omap3.dtsi                       |    25 +-
 arch/arm/boot/dts/omap4.dtsi                       |     3 +-
 arch/arm/boot/dts/omap5-uevm.dts                   |    70 +-
 arch/arm/boot/dts/omap5.dtsi                       |     3 +-
 arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts        |     8 +
 arch/arm/boot/dts/qcom-apq8064-ifc6410.dts         |     4 +
 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts     |     8 +
 arch/arm/boot/dts/qcom-apq8084-ifc6540.dts         |     8 +
 arch/arm/boot/dts/qcom-apq8084-mtp.dts             |     8 +
 arch/arm/boot/dts/qcom-apq8084.dtsi                |     2 +-
 arch/arm/boot/dts/qcom-ipq8064-ap148.dts           |     8 +
 arch/arm/boot/dts/qcom-ipq8064.dtsi                |     2 +-
 arch/arm/boot/dts/qcom-msm8660-surf.dts            |     8 +
 arch/arm/boot/dts/qcom-msm8660.dtsi                |     2 +-
 arch/arm/boot/dts/qcom-msm8960-cdp.dts             |     8 +
 arch/arm/boot/dts/qcom-msm8960.dtsi                |     2 +-
 .../boot/dts/qcom-msm8974-sony-xperia-honami.dts   |     8 +
 arch/arm/boot/dts/qcom-msm8974.dtsi                |     2 +-
 arch/arm/boot/dts/r8a7790.dtsi                     |     1 +
 arch/arm/boot/dts/r8a7791.dtsi                     |     1 +
 arch/arm/boot/dts/rk3288-veyron.dtsi               |     1 +
 arch/arm/boot/dts/sama5d4.dtsi                     |     8 +-
 arch/arm/boot/dts/ste-hrefv60plus.dtsi             |     2 +-
 arch/arm/boot/dts/ste-snowball.dts                 |    10 +-
 arch/arm/boot/dts/stih407.dtsi                     |    82 +-
 arch/arm/boot/dts/stih410.dtsi                     |    82 +-
 arch/arm/boot/dts/sun6i-a31-hummingbird.dts        |     8 +-
 arch/arm/boot/dts/sun7i-a20.dtsi                   |     2 +-
 arch/arm/boot/dts/tegra114.dtsi                    |     2 +
 arch/arm/boot/dts/tegra124.dtsi                    |     2 +
 arch/arm/boot/dts/tegra20.dtsi                     |     2 +
 arch/arm/boot/dts/tegra30.dtsi                     |     2 +
 arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts        |     2 +-
 arch/arm/common/edma.c                             |     6 +-
 arch/arm/common/it8152.c                           |     2 +-
 arch/arm/common/locomo.c                           |     2 +-
 arch/arm/common/sa1111.c                           |     6 +-
 arch/arm/configs/cm_x2xx_defconfig                 |     2 +-
 arch/arm/configs/em_x270_defconfig                 |     2 +-
 arch/arm/configs/exynos_defconfig                  |     5 +
 arch/arm/configs/magician_defconfig                |     2 +-
 arch/arm/configs/multi_v7_defconfig                |     6 +-
 arch/arm/configs/omap2plus_defconfig               |     5 +-
 arch/arm/configs/palmz72_defconfig                 |     2 +-
 arch/arm/configs/pcm027_defconfig                  |     2 +-
 arch/arm/configs/trizeps4_defconfig                |     2 +-
 arch/arm/include/asm/assembler.h                   |     5 -
 arch/arm/include/asm/bug.h                         |     1 +
 arch/arm/include/asm/dma-mapping.h                 |    68 +-
 arch/arm/include/asm/domain.h                      |     6 +-
 arch/arm/include/asm/hardware/it8152.h             |     2 +-
 arch/arm/include/asm/hw_irq.h                      |     6 -
 arch/arm/include/asm/irq.h                         |    10 +
 arch/arm/include/asm/kvm_host.h                    |    15 +-
 arch/arm/include/asm/mach/irq.h                    |     4 +-
 arch/arm/include/asm/memory.h                      |     6 -
 arch/arm/include/asm/thread_info.h                 |     1 -
 arch/arm/include/asm/unistd.h                      |     2 +-
 arch/arm/include/asm/xen/events.h                  |     6 +
 arch/arm/include/asm/xen/page.h                    |    44 +-
 arch/arm/include/uapi/asm/unistd.h                 |     2 +
 arch/arm/kernel/calls.S                            |     2 +
 arch/arm/kernel/irq.c                              |    20 -
 arch/arm/kernel/kgdb.c                             |     8 +-
 arch/arm/kernel/process.c                          |     2 +
 arch/arm/kernel/signal.c                           |    15 +-
 arch/arm/kernel/smp.c                              |    18 +
 arch/arm/kvm/Kconfig                               |    12 +-
 arch/arm/kvm/arm.c                                 |    40 +-
 arch/arm/kvm/guest.c                               |     6 +
 arch/arm/kvm/interrupts.S                          |    14 +-
 arch/arm/kvm/interrupts_head.S                     |     6 +-
 arch/arm/kvm/mmu.c                                 |     6 +-
 arch/arm/kvm/psci.c                                |    12 +-
 arch/arm/kvm/reset.c                               |     4 +-
 arch/arm/mach-at91/pm.c                            |     2 +-
 arch/arm/mach-at91/pm_suspend.S                    |     2 +
 arch/arm/mach-clps711x/board-cdb89712.c            |     2 +-
 arch/arm/mach-dove/irq.c                           |     6 +-
 arch/arm/mach-exynos/Kconfig                       |     2 +
 arch/arm/mach-exynos/exynos.c                      |     4 +
 arch/arm/mach-exynos/mcpm-exynos.c                 |    27 +-
 arch/arm/mach-exynos/pm_domains.c                  |     8 +-
 arch/arm/mach-exynos/regs-pmu.h                    |     6 +
 arch/arm/mach-footbridge/isa-irq.c                 |     5 +-
 arch/arm/mach-gemini/gpio.c                        |     2 +-
 arch/arm/mach-imx/3ds_debugboard.c                 |     2 +-
 arch/arm/mach-imx/mach-mx31ads.c                   |     2 +-
 arch/arm/mach-imx/pm-imx5.c                        |     2 +-
 arch/arm/mach-imx/pm-imx6.c                        |     2 +-
 arch/arm/mach-iop13xx/msi.c                        |     2 +-
 arch/arm/mach-lpc32xx/irq.c                        |     4 +-
 arch/arm/mach-mmp/include/mach/regs-rtc.h          |    23 -
 arch/arm/mach-netx/generic.c                       |     3 +-
 arch/arm/mach-omap1/fpga.c                         |     2 +-
 arch/arm/mach-omap2/Kconfig                        |     8 +-
 arch/arm/mach-omap2/board-generic.c                |    17 +-
 arch/arm/mach-omap2/id.c                           |     8 +-
 arch/arm/mach-omap2/io.c                           |     1 +
 arch/arm/mach-omap2/omap_device.c                  |     3 +-
 arch/arm/mach-omap2/pdata-quirks.c                 |     9 +-
 arch/arm/mach-omap2/pm.h                           |     3 +-
 arch/arm/mach-omap2/prm_common.c                   |     2 +-
 arch/arm/mach-omap2/soc.h                          |     2 +
 arch/arm/mach-omap2/timer.c                        |     8 +-
 arch/arm/mach-omap2/vc.c                           |     2 +-
 arch/arm/mach-pxa/balloon3.c                       |     4 +-
 arch/arm/mach-pxa/cm-x2xx-pci.c                    |     5 +-
 arch/arm/mach-pxa/devices.c                        |    18 +-
 arch/arm/mach-pxa/include/mach/addr-map.h          |     7 +
 arch/arm/mach-pxa/include/mach/pxa27x.h            |     2 +-
 arch/arm/mach-pxa/lpd270.c                         |     2 +-
 arch/arm/mach-pxa/pcm990-baseboard.c               |     2 +-
 arch/arm/mach-pxa/pxa27x.c                         |     3 +-
 arch/arm/mach-pxa/pxa3xx.c                         |    23 +-
 arch/arm/mach-pxa/viper.c                          |     2 +-
 arch/arm/mach-pxa/zeus.c                           |     2 +-
 arch/arm/mach-rpc/ecard.c                          |     3 +-
 arch/arm/mach-s3c24xx/bast-irq.c                   |     4 +-
 arch/arm/mach-s3c64xx/common.c                     |     8 +-
 arch/arm/mach-sa1100/include/mach/SA-1100.h        |    34 -
 arch/arm/mach-sa1100/neponset.c                    |     2 +-
 arch/arm/mach-shmobile/pm-rcar.c                   |     2 +-
 arch/arm/mach-socfpga/pm.c                         |     2 +-
 arch/arm/mach-tegra/board-paz00.c                  |     4 +-
 arch/arm/mm/alignment.c                            |    30 +-
 arch/arm/mm/dma-mapping.c                          |    23 +-
 arch/arm/net/bpf_jit_32.c                          |     1 +
 arch/arm/nwfpe/entry.S                             |     3 +-
 arch/arm/plat-orion/common.c                       |     2 +-
 arch/arm/plat-orion/gpio.c                         |     2 +-
 arch/arm/plat-pxa/ssp.c                            |     1 -
 arch/arm/vdso/vdsomunge.c                          |    17 +-
 arch/arm/xen/enlighten.c                           |    25 +-
 arch/arm/xen/hypercall.S                           |    15 +
 arch/arm/xen/mm.c                                  |     4 +-
 arch/arm64/Kconfig                                 |    17 +
 arch/arm64/Makefile                                |     4 +
 arch/arm64/boot/dts/arm/juno-motherboard.dtsi      |    12 +-
 arch/arm64/boot/dts/mediatek/mt8173.dtsi           |     2 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi           |     2 +-
 arch/arm64/include/asm/dma-mapping.h               |    69 -
 arch/arm64/include/asm/hardirq.h                   |     5 -
 arch/arm64/include/asm/hw_breakpoint.h             |    14 +
 arch/arm64/include/asm/irq.h                       |     5 +
 arch/arm64/include/asm/kvm_arm.h                   |    16 +-
 arch/arm64/include/asm/kvm_asm.h                   |    24 +-
 arch/arm64/include/asm/kvm_host.h                  |    52 +-
 arch/arm64/include/asm/memory.h                    |     6 -
 arch/arm64/include/asm/pgtable.h                   |    16 +-
 arch/arm64/include/asm/ptrace.h                    |    16 +-
 arch/arm64/include/asm/unistd.h                    |     2 +-
 arch/arm64/include/asm/unistd32.h                  |     9 +
 arch/arm64/include/asm/xen/events.h                |     6 +
 arch/arm64/include/uapi/asm/kvm.h                  |    37 +-
 arch/arm64/include/uapi/asm/signal.h               |     3 +
 arch/arm64/kernel/armv8_deprecated.c               |    16 +-
 arch/arm64/kernel/asm-offsets.c                    |     9 +-
 arch/arm64/kernel/debug-monitors.c                 |    25 +-
 arch/arm64/kernel/efi-stub.c                       |    14 +-
 arch/arm64/kernel/efi.c                            |     3 +-
 arch/arm64/kernel/entry-ftrace.S                   |    22 +-
 arch/arm64/kernel/head.S                           |     5 +
 arch/arm64/kernel/hw_breakpoint.c                  |    14 +-
 arch/arm64/kernel/insn.c                           |     6 +-
 arch/arm64/kernel/module.c                         |     2 +
 arch/arm64/kernel/setup.c                          |    64 +
 arch/arm64/kernel/signal32.c                       |    47 +-
 arch/arm64/kernel/stacktrace.c                     |     6 +-
 arch/arm64/kernel/suspend.c                        |    22 +-
 arch/arm64/kernel/vmlinux.lds.S                    |     5 +-
 arch/arm64/kvm/Kconfig                             |    11 -
 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                               |   644 +-
 arch/arm64/kvm/reset.c                             |    20 +-
 arch/arm64/kvm/sys_regs.c                          |   298 +-
 arch/arm64/kvm/sys_regs.h                          |     6 +
 arch/arm64/kvm/sys_regs_generic_v8.c               |     2 +
 arch/arm64/kvm/trace.h                             |   123 +
 arch/arm64/mm/dma-mapping.c                        |     2 +-
 arch/arm64/mm/fault.c                              |     1 +
 arch/avr32/include/asm/Kbuild                      |     1 +
 arch/avr32/mach-at32ap/extint.c                    |     2 +-
 arch/avr32/mach-at32ap/pio.c                       |     2 +-
 arch/blackfin/include/asm/Kbuild                   |     1 +
 arch/blackfin/include/asm/irq_handler.h            |     4 +-
 arch/blackfin/kernel/irqchip.c                     |     2 +-
 arch/blackfin/mach-bf537/ints-priority.c           |    10 +-
 arch/blackfin/mach-common/ints-priority.c          |     5 +-
 arch/c6x/include/asm/Kbuild                        |     1 +
 arch/c6x/platforms/megamod-pic.c                   |     2 +-
 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-v10/arch/elf.h              |    83 -
 arch/cris/include/arch-v10/arch/ptrace.h           |   118 -
 arch/cris/include/arch-v32/arch/bug.h              |    11 +-
 arch/cris/include/arch-v32/arch/elf.h              |    75 -
 arch/cris/include/arch-v32/arch/irqflags.h         |     2 +-
 arch/cris/include/arch-v32/arch/ptrace.h           |   118 -
 arch/cris/include/asm/Kbuild                       |    18 +
 arch/cris/include/asm/elf.h                        |    89 -
 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                   |    90 +
 arch/cris/include/uapi/asm/elf_v10.h               |    84 +
 arch/cris/include/uapi/asm/elf_v32.h               |    76 +
 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/cris/include/uapi/asm/ptrace_v10.h            |   118 +
 arch/cris/include/uapi/asm/ptrace_v32.h            |   118 +
 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 +
 arch/frv/include/asm/Kbuild                        |     1 +
 arch/frv/mb93090-mb00/pci-vdk.c                    |     2 +
 arch/h8300/boot/compressed/misc.c                  |     2 +-
 arch/h8300/include/asm/Kbuild                      |     1 +
 arch/h8300/include/asm/dma-mapping.h               |    44 -
 arch/hexagon/include/asm/Kbuild                    |     1 +
 arch/hexagon/include/asm/dma-mapping.h             |    49 +-
 arch/hexagon/include/uapi/asm/signal.h             |     2 -
 arch/hexagon/kernel/dma.c                          |    11 -
 arch/hexagon/kernel/time.c                         |    17 +-
 arch/ia64/Kconfig                                  |     1 +
 arch/ia64/hp/common/sba_iommu.c                    |     6 +-
 arch/ia64/include/asm/Kbuild                       |     1 +
 arch/ia64/include/asm/dma-mapping.h                |    50 -
 arch/ia64/include/asm/io.h                         |     1 +
 arch/ia64/include/asm/unistd.h                     |     2 +-
 arch/ia64/include/uapi/asm/unistd.h                |     3 +
 arch/ia64/kernel/cyclone.c                         |     2 +-
 arch/ia64/kernel/entry.S                           |     3 +
 arch/ia64/kernel/uncached.c                        |     2 +-
 arch/ia64/mm/init.c                                |     4 +-
 arch/ia64/pci/pci.c                                |     5 +-
 arch/ia64/sn/pci/pci_dma.c                         |     2 +-
 arch/m32r/boot/compressed/misc.c                   |     3 +-
 arch/m32r/include/asm/Kbuild                       |     1 +
 arch/m68k/Kconfig                                  |     1 +
 arch/m68k/amiga/amiints.c                          |     8 +-
 arch/m68k/coldfire/intc-5272.c                     |     6 +-
 arch/m68k/coldfire/m54xx.c                         |     9 +-
 arch/m68k/coldfire/pit.c                           |    66 +-
 arch/m68k/configs/amiga_defconfig                  |     9 +-
 arch/m68k/configs/apollo_defconfig                 |     9 +-
 arch/m68k/configs/atari_defconfig                  |     9 +-
 arch/m68k/configs/bvme6000_defconfig               |     9 +-
 arch/m68k/configs/hp300_defconfig                  |     9 +-
 arch/m68k/configs/mac_defconfig                    |     9 +-
 arch/m68k/configs/multi_defconfig                  |     9 +-
 arch/m68k/configs/mvme147_defconfig                |     9 +-
 arch/m68k/configs/mvme16x_defconfig                |     9 +-
 arch/m68k/configs/q40_defconfig                    |     9 +-
 arch/m68k/configs/sun3_defconfig                   |     9 +-
 arch/m68k/configs/sun3x_defconfig                  |     9 +-
 arch/m68k/include/asm/irq.h                        |     3 +-
 arch/m68k/include/asm/linkage.h                    |    30 +
 arch/m68k/include/asm/mac_via.h                    |     2 +-
 arch/m68k/include/asm/unistd.h                     |     2 +-
 arch/m68k/include/uapi/asm/unistd.h                |    19 +
 arch/m68k/kernel/syscalltable.S                    |    20 +-
 arch/m68k/mac/baboon.c                             |     2 +-
 arch/m68k/mac/oss.c                                |     4 +-
 arch/m68k/mac/psc.c                                |     2 +-
 arch/m68k/mac/via.c                                |     6 +-
 arch/metag/include/asm/Kbuild                      |     1 +
 arch/metag/include/asm/ftrace.h                    |     2 +-
 arch/metag/kernel/irq.c                            |    14 +-
 arch/microblaze/include/asm/Kbuild                 |     1 +
 arch/microblaze/include/asm/dma-mapping.h          |    70 -
 arch/microblaze/include/asm/ftrace.h               |     2 +-
 arch/microblaze/include/uapi/asm/elf.h             |     3 +-
 arch/microblaze/pci/pci-common.c                   |     9 +-
 arch/mips/Kconfig                                  |     1 +
 arch/mips/alchemy/common/irq.c                     |     4 +-
 arch/mips/alchemy/devboards/bcsr.c                 |     2 +-
 arch/mips/ath25/ar2315.c                           |     2 +-
 arch/mips/ath25/ar5312.c                           |     2 +-
 arch/mips/ath79/irq.c                              |    30 +-
 arch/mips/ath79/setup.c                            |     2 +-
 arch/mips/boot/compressed/decompress.c             |     4 +-
 arch/mips/cavium-octeon/dma-octeon.c               |     8 -
 arch/mips/cavium-octeon/octeon-irq.c               |     2 +-
 arch/mips/cavium-octeon/setup.c                    |     2 +-
 arch/mips/configs/pistachio_defconfig              |     1 -
 arch/mips/include/asm/Kbuild                       |     1 +
 arch/mips/include/asm/cdmm.h                       |    11 +
 arch/mips/include/asm/cpu-features.h               |     3 +
 arch/mips/include/asm/cpu.h                        |     1 +
 arch/mips/include/asm/dma-mapping.h                |    67 -
 arch/mips/include/asm/io.h                         |     1 +
 arch/mips/include/asm/kvm_host.h                   |     2 +
 arch/mips/include/asm/maar.h                       |     9 +
 arch/mips/include/asm/mips-cm.h                    |    39 +
 arch/mips/include/asm/mipsregs.h                   |     2 +
 arch/mips/include/asm/netlogic/common.h            |     4 +-
 arch/mips/include/uapi/asm/swab.h                  |    19 +-
 arch/mips/include/uapi/asm/unistd.h                |    18 +-
 arch/mips/jz4740/board-qi_lb60.c                   |     1 +
 arch/mips/jz4740/gpio.c                            |     3 +-
 arch/mips/kernel/cps-vec.S                         |    12 +-
 arch/mips/kernel/cpu-probe.c                       |    21 +-
 arch/mips/kernel/octeon_switch.S                   |    26 +-
 arch/mips/kernel/r2300_switch.S                    |    28 +-
 arch/mips/kernel/scall32-o32.S                     |    41 +-
 arch/mips/kernel/scall64-64.S                      |    40 +-
 arch/mips/kernel/scall64-n32.S                     |    21 +-
 arch/mips/kernel/scall64-o32.S                     |    21 +-
 arch/mips/kernel/setup.c                           |    10 +-
 arch/mips/kernel/smp.c                             |     2 +
 arch/mips/kvm/emulate.c                            |     2 +-
 arch/mips/kvm/locore.S                             |    16 +-
 arch/mips/kvm/mips.c                               |     6 +-
 arch/mips/lantiq/clk.c                             |    17 +
 arch/mips/loongson64/common/dma-swiotlb.c          |    11 +-
 arch/mips/loongson64/common/env.c                  |     3 +
 arch/mips/mm/dma-default.c                         |    23 +-
 arch/mips/mm/init.c                                |   177 +-
 arch/mips/net/bpf_jit_asm.S                        |    63 +-
 arch/mips/netlogic/common/nlm-dma.c                |    10 -
 arch/mips/netlogic/common/smp.c                    |     4 +-
 arch/mips/pci/pci-ar2315.c                         |     2 +-
 arch/mips/pci/pci-ar71xx.c                         |     2 +-
 arch/mips/pci/pci-ar724x.c                         |     2 +-
 arch/mips/pci/pci-rt3883.c                         |     2 +-
 arch/mips/pci/pci.c                                |     6 +
 arch/mips/ralink/irq.c                             |     2 +-
 arch/mn10300/include/asm/Kbuild                    |     1 +
 arch/mn10300/unit-asb2305/pci.c                    |     1 +
 arch/nios2/boot/dts/10m50_devboard.dts             |   248 +
 arch/nios2/configs/10m50_defconfig                 |    81 +
 arch/nios2/include/asm/Kbuild                      |     1 +
 arch/nios2/kernel/misaligned.c                     |    20 +-
 arch/nios2/kernel/time.c                           |    49 +-
 arch/openrisc/include/asm/dma-mapping.h            |    67 +-
 arch/parisc/include/asm/io.h                       |     2 +
 arch/parisc/kernel/irq.c                           |     9 +-
 arch/parisc/kernel/syscall.S                       |     2 +-
 arch/parisc/kernel/time.c                          |    21 +-
 arch/parisc/mm/fault.c                             |     2 +-
 arch/powerpc/Kconfig                               |     1 +
 arch/powerpc/Makefile                              |     8 +-
 arch/powerpc/boot/Makefile                         |     3 +
 arch/powerpc/configs/ppc64_defconfig               |     2 +-
 arch/powerpc/configs/pseries_defconfig             |     2 +-
 arch/powerpc/include/asm/cache.h                   |     7 -
 arch/powerpc/include/asm/dma-mapping.h             |    68 +-
 arch/powerpc/include/asm/ftrace.h                  |     2 +-
 arch/powerpc/include/asm/kvm_book3s.h              |     5 +-
 arch/powerpc/include/asm/kvm_book3s_asm.h          |    22 +-
 arch/powerpc/include/asm/kvm_booke.h               |     4 +-
 arch/powerpc/include/asm/kvm_host.h                |    30 +-
 arch/powerpc/include/asm/machdep.h                 |     9 +-
 arch/powerpc/include/asm/ppc-opcode.h              |    17 -
 arch/powerpc/include/asm/qe_ic.h                   |    23 +-
 arch/powerpc/include/asm/reg.h                     |     1 -
 arch/powerpc/include/asm/systbl.h                  |     2 +
 arch/powerpc/include/asm/tsi108_pci.h              |     2 +-
 arch/powerpc/include/asm/unistd.h                  |     2 +-
 arch/powerpc/include/asm/word-at-a-time.h          |     5 +
 arch/powerpc/include/uapi/asm/unistd.h             |     2 +
 arch/powerpc/kernel/asm-offsets.c                  |     9 +
 arch/powerpc/kernel/dma.c                          |     2 +-
 arch/powerpc/kernel/irq.c                          |     2 +-
 arch/powerpc/kernel/pci-common.c                   |     8 +-
 arch/powerpc/kernel/pci_of_scan.c                  |     2 +-
 arch/powerpc/kernel/rtas.c                         |     3 +
 arch/powerpc/kernel/setup_32.c                     |     6 +
 arch/powerpc/kvm/Kconfig                           |     8 +-
 arch/powerpc/kvm/book3s.c                          |    10 +-
 arch/powerpc/kvm/book3s_32_mmu_host.c              |     1 +
 arch/powerpc/kvm/book3s_64_mmu_host.c              |     1 +
 arch/powerpc/kvm/book3s_64_mmu_hv.c                |     8 +-
 arch/powerpc/kvm/book3s_emulate.c                  |     1 +
 arch/powerpc/kvm/book3s_hv.c                       |   697 +-
 arch/powerpc/kvm/book3s_hv_builtin.c               |    32 +-
 arch/powerpc/kvm/book3s_hv_rm_mmu.c                |   161 +-
 arch/powerpc/kvm/book3s_hv_rm_xics.c               |     4 +-
 arch/powerpc/kvm/book3s_hv_rmhandlers.S            |   138 +-
 arch/powerpc/kvm/book3s_paired_singles.c           |     2 +-
 arch/powerpc/kvm/book3s_segment.S                  |     4 +-
 arch/powerpc/kvm/book3s_xics.c                     |     2 +-
 arch/powerpc/kvm/booke.c                           |     2 +
 arch/powerpc/kvm/e500_mmu.c                        |     2 +-
 arch/powerpc/kvm/powerpc.c                         |     2 +-
 arch/powerpc/lib/copy_32.S                         |    11 +
 arch/powerpc/mm/hash_native_64.c                   |    23 +-
 arch/powerpc/mm/hugepage-hash64.c                  |     3 +-
 arch/powerpc/mm/mem.c                              |     4 +-
 arch/powerpc/platforms/512x/mpc5121_ads_cpld.c     |     5 +-
 arch/powerpc/platforms/52xx/media5200.c            |     2 +-
 arch/powerpc/platforms/52xx/mpc52xx_gpt.c          |     2 +-
 arch/powerpc/platforms/52xx/mpc52xx_pic.c          |     2 +-
 arch/powerpc/platforms/82xx/pq2ads-pci-pic.c       |     2 +-
 arch/powerpc/platforms/85xx/common.c               |     2 +-
 arch/powerpc/platforms/85xx/mpc85xx_cds.c          |     5 +-
 arch/powerpc/platforms/85xx/mpc85xx_ds.c           |     2 +-
 arch/powerpc/platforms/85xx/socrates_fpga_pic.c    |     3 +-
 arch/powerpc/platforms/86xx/pic.c                  |     2 +-
 arch/powerpc/platforms/8xx/m8xx_setup.c            |     2 +-
 arch/powerpc/platforms/cell/axon_msi.c             |     2 +-
 arch/powerpc/platforms/cell/interrupt.c            |     3 +-
 arch/powerpc/platforms/cell/ras.c                  |     2 +-
 arch/powerpc/platforms/cell/spider-pic.c           |     2 +-
 arch/powerpc/platforms/chrp/setup.c                |     2 +-
 arch/powerpc/platforms/embedded6xx/hlwd-pic.c      |     3 +-
 arch/powerpc/platforms/embedded6xx/mvme5100.c      |     2 +-
 arch/powerpc/platforms/pasemi/msi.c                |     5 +-
 arch/powerpc/platforms/powernv/opal.c              |     7 +-
 arch/powerpc/platforms/powernv/pci-ioda.c          |    16 +-
 arch/powerpc/platforms/powernv/pci.c               |     5 +-
 arch/powerpc/platforms/powernv/smp.c               |    29 +-
 arch/powerpc/platforms/ps3/os-area.c               |     5 -
 arch/powerpc/platforms/pseries/dlpar.c             |     4 +-
 arch/powerpc/platforms/pseries/setup.c             |     2 +-
 arch/powerpc/sysdev/axonram.c                      |     7 +-
 arch/powerpc/sysdev/cpm2_pic.c                     |     4 +-
 arch/powerpc/sysdev/fsl_msi.c                      |     5 +-
 arch/powerpc/sysdev/ge/ge_pic.c                    |     2 +-
 arch/powerpc/sysdev/ge/ge_pic.h                    |     2 -
 arch/powerpc/sysdev/ipic.c                         |     4 +-
 arch/powerpc/sysdev/mpc8xx_pic.c                   |     2 +-
 arch/powerpc/sysdev/mpic.c                         |     2 +-
 arch/powerpc/sysdev/mpic_u3msi.c                   |     5 +-
 arch/powerpc/sysdev/ppc4xx_msi.c                   |     5 +-
 arch/powerpc/sysdev/qe_lib/qe_ic.c                 |     4 +-
 arch/powerpc/sysdev/tsi108_pci.c                   |     2 +-
 arch/powerpc/sysdev/uic.c                          |     2 +-
 arch/powerpc/sysdev/xics/ics-opal.c                |     2 +-
 arch/powerpc/sysdev/xics/ics-rtas.c                |     2 +-
 arch/powerpc/sysdev/xilinx_intc.c                  |     2 +-
 arch/s390/Kconfig                                  |     1 +
 arch/s390/boot/compressed/Makefile                 |     2 +-
 arch/s390/boot/compressed/misc.c                   |     2 +-
 arch/s390/configs/default_defconfig                |     2 +-
 arch/s390/configs/gcov_defconfig                   |     2 +-
 arch/s390/configs/performance_defconfig            |     2 +-
 arch/s390/configs/zfcpdump_defconfig               |     5 -
 arch/s390/include/asm/Kbuild                       |     1 +
 arch/s390/include/asm/dma-mapping.h                |    55 -
 arch/s390/include/asm/kvm_host.h                   |     2 +
 arch/s390/include/asm/numa.h                       |     2 +-
 arch/s390/include/asm/topology.h                   |     2 +-
 arch/s390/include/asm/unistd.h                     |    20 -
 arch/s390/include/uapi/asm/unistd.h                |    21 +-
 arch/s390/kernel/asm-offsets.c                     |     1 +
 arch/s390/kernel/compat_signal.c                   |    27 +-
 arch/s390/kernel/compat_wrapper.c                  |    70 +-
 arch/s390/kernel/entry.S                           |    32 +-
 arch/s390/kernel/perf_cpum_cf.c                    |    12 +-
 arch/s390/kernel/ptrace.c                          |     8 +-
 arch/s390/kernel/swsusp.S                          |    38 +-
 arch/s390/kernel/syscalls.S                        |   121 +-
 arch/s390/kernel/vtime.c                           |    62 +-
 arch/s390/kvm/interrupt.c                          |     7 +-
 arch/s390/kvm/kvm-s390.c                           |    13 +-
 arch/s390/kvm/sigp.c                               |     8 +-
 arch/s390/mm/init.c                                |     2 +-
 arch/s390/numa/mode_emu.c                          |     4 +-
 arch/s390/numa/numa.c                              |     4 +-
 arch/s390/pci/pci_dma.c                            |    10 -
 arch/s390/pci/pci_insn.c                           |     6 +-
 arch/score/include/asm/Kbuild                      |     1 +
 arch/sh/Kconfig                                    |     1 +
 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                  |     2 +-
 arch/sh/boards/mach-x3proto/gpio.c                 |     2 +-
 arch/sh/boot/compressed/misc.c                     |     2 +-
 arch/sh/cchips/hd6446x/hd64461.c                   |     2 +-
 arch/sh/include/asm/dma-mapping.h                  |    77 +-
 arch/sh/include/asm/ftrace.h                       |     2 +-
 arch/sh/include/asm/io.h                           |     1 +
 arch/sh/include/asm/page.h                         |     1 +
 arch/sh/kernel/cpu/sh4a/clock-sh7724.c             |     2 +-
 arch/sh/mm/init.c                                  |     9 +-
 arch/sh/mm/numa.c                                  |     4 +-
 arch/sparc/crypto/aes_glue.c                       |     2 +
 arch/sparc/crypto/camellia_glue.c                  |     1 +
 arch/sparc/crypto/des_glue.c                       |     2 +
 arch/sparc/include/asm/dma-mapping.h               |    40 +-
 arch/sparc/include/asm/ftrace.h                    |     2 +-
 arch/sparc/include/asm/pgtable_32.h                |     2 +-
 arch/sparc/kernel/leon_kernel.c                    |     2 +-
 arch/sparc/kernel/leon_pci_grpci1.c                |     2 +-
 arch/sparc/kernel/leon_pci_grpci2.c                |     2 +-
 arch/sparc/kernel/pci.c                            |     3 +-
 arch/tile/Kconfig                                  |     1 +
 arch/tile/gxio/mpipe.c                             |    33 +-
 arch/tile/include/asm/dma-mapping.h                |    45 +-
 arch/tile/include/asm/word-at-a-time.h             |     8 +-
 arch/tile/kernel/pci_gx.c                          |     5 +-
 arch/tile/kernel/usb.c                             |     1 +
 arch/tile/mm/init.c                                |     2 +-
 arch/um/Makefile                                   |     4 +-
 arch/um/include/asm/Kbuild                         |     1 +
 arch/um/kernel/trap.c                              |     2 +-
 arch/um/os-Linux/helper.c                          |     6 +-
 arch/unicore32/boot/compressed/misc.c              |     4 +-
 arch/unicore32/include/asm/Kbuild                  |     1 +
 arch/unicore32/include/asm/dma-mapping.h           |    57 -
 arch/unicore32/include/asm/memory.h                |     6 -
 arch/unicore32/kernel/irq.c                        |     2 +-
 arch/x86/Kconfig                                   |    37 +-
 arch/x86/boot/compressed/eboot.c                   |     8 +-
 arch/x86/boot/compressed/misc.c                    |     3 +-
 arch/x86/boot/header.S                             |     2 +-
 arch/x86/crypto/camellia_aesni_avx_glue.c          |     5 +
 arch/x86/crypto/ghash-clmulni-intel_glue.c         |     1 +
 arch/x86/entry/entry_64.S                          |    16 +-
 arch/x86/entry/syscalls/syscall_32.tbl             |     2 +
 arch/x86/entry/syscalls/syscall_64.tbl             |     2 +
 arch/x86/entry/vsyscall/vsyscall_64.c              |     2 +-
 arch/x86/include/asm/cacheflush.h                  |    73 +-
 arch/x86/include/asm/cpufeature.h                  |     3 +-
 arch/x86/include/asm/dma-mapping.h                 |    34 +-
 arch/x86/include/asm/efi.h                         |    12 +
 arch/x86/include/asm/ftrace.h                      |     4 +-
 arch/x86/include/asm/i8259.h                       |     1 +
 arch/x86/include/asm/io.h                          |     6 -
 arch/x86/include/asm/kdebug.h                      |     2 +-
 arch/x86/include/asm/kvm_emulate.h                 |    10 +
 arch/x86/include/asm/kvm_host.h                    |     8 +-
 arch/x86/include/asm/msr-index.h                   |     3 +
 arch/x86/include/asm/paravirt_types.h              |     1 -
 arch/x86/include/asm/pmem.h                        |   153 +
 arch/x86/include/asm/pvclock-abi.h                 |     1 +
 arch/x86/include/asm/qspinlock.h                   |    19 +-
 arch/x86/include/asm/string_64.h                   |     5 +-
 arch/x86/include/asm/tlbflush.h                    |     6 +
 arch/x86/include/asm/xen/events.h                  |    11 +
 arch/x86/include/asm/xen/hypercall.h               |    10 +-
 arch/x86/include/asm/xen/interface.h               |   219 +-
 arch/x86/include/asm/xen/page.h                    |    47 +-
 arch/x86/include/uapi/asm/bitsperlong.h            |     2 +-
 arch/x86/include/uapi/asm/e820.h                   |     2 +-
 arch/x86/include/uapi/asm/svm.h                    |     1 +
 arch/x86/kernel/Makefile                           |     6 +-
 arch/x86/kernel/alternative.c                      |     5 +
 arch/x86/kernel/apic/apic.c                        |     7 +
 arch/x86/kernel/apic/hw_nmi.c                      |   133 +-
 arch/x86/kernel/apic/io_apic.c                     |    11 +-
 arch/x86/kernel/apic/vector.c                      |    10 +-
 arch/x86/kernel/cpu/common.c                       |     7 +-
 arch/x86/kernel/cpu/mshyperv.c                     |    12 +-
 arch/x86/kernel/cpu/perf_event.h                   |     1 +
 arch/x86/kernel/cpu/perf_event_intel.c             |    31 +-
 arch/x86/kernel/cpu/perf_event_intel_bts.c         |     1 +
 arch/x86/kernel/cpu/perf_event_msr.c               |     4 +-
 arch/x86/kernel/cpu/scattered.c                    |     2 +-
 arch/x86/kernel/crash.c                            |     7 +-
 arch/x86/kernel/fpu/signal.c                       |    11 +-
 arch/x86/kernel/fpu/xstate.c                       |     1 -
 arch/x86/kernel/head_64.S                          |     8 +
 arch/x86/kernel/i8259.c                            |    29 +-
 arch/x86/kernel/irq_32.c                           |    19 +-
 arch/x86/kernel/irq_64.c                           |     2 +-
 arch/x86/kernel/kexec-bzimage64.c                  |     4 +-
 arch/x86/kernel/kvmclock.c                         |     4 +-
 arch/x86/kernel/ldt.c                              |     4 +-
 arch/x86/kernel/paravirt.c                         |    16 +-
 arch/x86/kernel/pci-dma.c                          |    59 +-
 arch/x86/kernel/pmem.c                             |    79 +-
 arch/x86/kernel/process.c                          |    58 +
 arch/x86/kernel/process_32.c                       |    28 -
 arch/x86/kernel/process_64.c                       |    24 -
 arch/x86/kernel/reboot.c                           |     4 +-
 arch/x86/kernel/setup.c                            |    32 +-
 arch/x86/kernel/smpboot.c                          |    15 +-
 arch/x86/kernel/tsc.c                              |    17 +-
 arch/x86/kernel/verify_cpu.S                       |    12 +-
 arch/x86/kernel/vm86_32.c                          |    27 +
 arch/x86/kernel/vmlinux.lds.S                      |     2 +-
 arch/x86/kvm/emulate.c                             |    47 +-
 arch/x86/kvm/lapic.c                               |     2 +
 arch/x86/kvm/mmu.c                                 |    32 +-
 arch/x86/kvm/svm.c                                 |   148 +-
 arch/x86/kvm/vmx.c                                 |    57 +-
 arch/x86/kvm/x86.c                                 |   158 +-
 arch/x86/lguest/boot.c                             |     2 +-
 arch/x86/mm/init_32.c                              |     4 +-
 arch/x86/mm/init_64.c                              |     6 +-
 arch/x86/mm/mpx.c                                  |    98 +-
 arch/x86/mm/numa.c                                 |     6 +-
 arch/x86/mm/srat.c                                 |     5 +-
 arch/x86/mm/tlb.c                                  |     1 +
 arch/x86/pci/common.c                              |     1 +
 arch/x86/platform/efi/efi.c                        |    71 +-
 arch/x86/platform/uv/uv_nmi.c                      |     6 +-
 arch/x86/um/ldt.c                                  |     5 +-
 arch/x86/xen/Kconfig                               |    21 +-
 arch/x86/xen/Makefile                              |     2 +-
 arch/x86/xen/apic.c                                |     6 +
 arch/x86/xen/enlighten.c                           |    44 +-
 arch/x86/xen/mmu.c                                 |   431 +-
 arch/x86/xen/p2m.c                                 |    62 +-
 arch/x86/xen/p2m.h                                 |    15 -
 arch/x86/xen/platform-pci-unplug.c                 |     2 +-
 arch/x86/xen/pmu.c                                 |   570 +
 arch/x86/xen/pmu.h                                 |    15 +
 arch/x86/xen/setup.c                               |   498 +-
 arch/x86/xen/smp.c                                 |    31 +-
 arch/x86/xen/suspend.c                             |    23 +-
 arch/x86/xen/xen-head.S                            |     2 +
 arch/x86/xen/xen-ops.h                             |     7 +
 arch/xtensa/include/asm/Kbuild                     |     1 +
 arch/xtensa/include/asm/dma-mapping.h              |    60 -
 arch/xtensa/include/asm/io.h                       |     1 +
 arch/xtensa/kernel/pci.c                           |     4 +
 block/bio-integrity.c                              |     5 +
 block/bio.c                                        |     2 +-
 block/blk-cgroup.c                                 |   527 +-
 block/blk-core.c                                   |     6 +-
 block/blk-integrity.c                              |     3 +
 block/blk-lib.c                                    |    31 +-
 block/blk-map.c                                    |    26 +-
 block/blk-merge.c                                  |    59 +-
 block/blk-mq-cpumap.c                              |     9 +-
 block/blk-mq-sysfs.c                               |    34 +-
 block/blk-mq-tag.c                                 |    28 +-
 block/blk-mq-tag.h                                 |     2 +
 block/blk-mq.c                                     |   122 +-
 block/blk-mq.h                                     |     3 +-
 block/blk-sysfs.c                                  |     1 +
 block/blk-throttle.c                               |   505 +-
 block/blk.h                                        |     5 -
 block/bounce.c                                     |     4 +-
 block/cfq-iosched.c                                |   651 +-
 certs/Kconfig                                      |    42 +
 certs/Makefile                                     |    94 +
 certs/system_certificates.S                        |    23 +
 certs/system_keyring.c                             |   157 +
 crypto/Kconfig                                     |     1 +
 crypto/ablkcipher.c                                |     2 +-
 crypto/ahash.c                                     |     3 +-
 crypto/algapi.c                                    |     2 +-
 crypto/api.c                                       |     6 +-
 crypto/asymmetric_keys/Makefile                    |     8 +-
 crypto/asymmetric_keys/asymmetric_type.c           |    11 +
 crypto/asymmetric_keys/mscode_parser.c             |     9 +
 crypto/asymmetric_keys/pkcs7.asn1                  |    22 +-
 crypto/asymmetric_keys/pkcs7_key_type.c            |    17 +-
 crypto/asymmetric_keys/pkcs7_parser.c              |   277 +-
 crypto/asymmetric_keys/pkcs7_parser.h              |    20 +-
 crypto/asymmetric_keys/pkcs7_trust.c               |    10 +-
 crypto/asymmetric_keys/pkcs7_verify.c              |   145 +-
 crypto/asymmetric_keys/public_key.c                |     1 +
 crypto/asymmetric_keys/verify_pefile.c             |     7 +-
 crypto/asymmetric_keys/x509_akid.asn1              |    35 +
 crypto/asymmetric_keys/x509_cert_parser.c          |   233 +-
 crypto/asymmetric_keys/x509_parser.h               |    12 +-
 crypto/asymmetric_keys/x509_public_key.c           |    99 +-
 crypto/crypto_user.c                               |     2 +-
 crypto/testmgr.c                                   |     5 +-
 drivers/acpi/Kconfig                               |     1 +
 drivers/acpi/acpi_pnp.c                            |     2 -
 drivers/acpi/acpica/acglobal.h                     |     1 +
 drivers/acpi/acpica/actables.h                     |     4 +-
 drivers/acpi/acpica/evxfevnt.c                     |     2 +-
 drivers/acpi/acpica/tbfadt.c                       |    10 +-
 drivers/acpi/acpica/tbutils.c                      |    26 +-
 drivers/acpi/bus.c                                 |    12 +-
 drivers/acpi/ec.c                                  |     2 +
 drivers/acpi/int340x_thermal.c                     |     9 +-
 drivers/acpi/nfit.c                                |    79 +-
 drivers/acpi/nfit.h                                |    17 +-
 drivers/acpi/pci_irq.c                             |     1 +
 drivers/acpi/pci_link.c                            |    16 +-
 drivers/acpi/thermal.c                             |    12 +-
 drivers/android/binder.c                           |     2 +-
 drivers/atm/he.c                                   |     7 +-
 drivers/atm/solos-pci.c                            |    12 +-
 drivers/base/cacheinfo.c                           |    10 +-
 drivers/base/dma-contiguous.c                      |     2 +-
 drivers/base/node.c                                |    10 +
 drivers/base/platform-msi.c                        |    18 +-
 drivers/base/power/domain.c                        |    38 +-
 drivers/base/power/domain_governor.c               |    22 +-
 drivers/base/power/opp.c                           |    45 +-
 drivers/base/property.c                            |    14 +-
 drivers/base/regmap/internal.h                     |    10 +-
 drivers/base/regmap/regcache.c                     |     2 +-
 drivers/base/regmap/regmap-ac97.c                  |    41 +-
 drivers/base/regmap/regmap-debugfs.c               |   104 +-
 drivers/base/regmap/regmap-i2c.c                   |    90 +-
 drivers/base/regmap/regmap-irq.c                   |     4 +-
 drivers/base/regmap/regmap-mmio.c                  |    52 +-
 drivers/base/regmap/regmap-spi.c                   |    41 +-
 drivers/base/regmap/regmap-spmi.c                  |    78 +-
 drivers/base/regmap/regmap.c                       |   295 +-
 drivers/block/brd.c                                |     8 +-
 drivers/block/loop.c                               |    11 +-
 drivers/block/nbd.c                                |    36 +-
 drivers/block/null_blk.c                           |    38 +-
 drivers/block/nvme-core.c                          |    68 +-
 drivers/block/rbd.c                                |    88 +-
 drivers/block/virtio_blk.c                         |     8 +-
 drivers/block/xen-blkback/xenbus.c                 |    38 +-
 drivers/block/xen-blkfront.c                       |   140 +-
 drivers/block/zram/zcomp.c                         |    12 +-
 drivers/block/zram/zram_drv.c                      |    30 +-
 drivers/block/zram/zram_drv.h                      |     1 -
 drivers/bluetooth/ath3k.c                          |     4 +
 drivers/bluetooth/btusb.c                          |     2 +
 drivers/bus/Kconfig                                |     1 -
 drivers/bus/arm-ccn.c                              |     5 +-
 drivers/bus/vexpress-config.c                      |     2 +-
 drivers/char/hw_random/xgene-rng.c                 |     7 +-
 drivers/char/ipmi/ipmi_bt_sm.c                     |     2 +-
 drivers/char/ipmi/ipmi_kcs_sm.c                    |     2 +-
 drivers/char/ipmi/ipmi_msghandler.c                |    46 +-
 drivers/char/ipmi/ipmi_powernv.c                   |    10 +-
 drivers/char/ipmi/ipmi_si_intf.c                   |   597 +-
 drivers/char/ipmi/ipmi_si_sm.h                     |    10 +-
 drivers/char/ipmi/ipmi_smic_sm.c                   |     2 +-
 drivers/char/ipmi/ipmi_ssif.c                      |    14 +-
 drivers/clk/bcm/clk-iproc-pll.c                    |    13 +-
 drivers/clk/clk.c                                  |     3 +-
 drivers/clk/clkdev.c                               |     3 +-
 drivers/clk/h8300/clk-h8s2678.c                    |     1 +
 drivers/clk/hisilicon/Kconfig                      |     8 +-
 drivers/clk/hisilicon/Makefile                     |     3 +-
 drivers/clk/mvebu/clk-cpu.c                        |     4 +-
 drivers/clk/rockchip/clk-rk3188.c                  |     9 +-
 drivers/clk/rockchip/clk-rk3368.c                  |     6 +
 drivers/clk/samsung/clk-cpu.c                      |    10 +-
 drivers/clk/samsung/clk-exynos4.c                  |    50 +
 drivers/clk/shmobile/clk-emev2.c                   |     6 +
 drivers/clk/st/clkgen-fsyn.c                       |     8 +-
 drivers/clk/st/clkgen-pll.c                        |    12 +-
 drivers/clk/tegra/clk-dfll.c                       |     8 +-
 drivers/clk/ti/clk-3xxx.c                          |     2 +-
 drivers/clk/ti/clk-7xx.c                           |    18 +-
 drivers/clk/ti/clkt_dflt.c                         |     4 +-
 drivers/clk/versatile/clk-icst.c                   |     4 +-
 drivers/clocksource/arm_global_timer.c             |     9 +-
 drivers/clocksource/fsl_ftm_timer.c                |     2 +-
 drivers/clocksource/rockchip_timer.c               |     2 +-
 drivers/clocksource/samsung_pwm_timer.c            |     2 +-
 drivers/clocksource/sh_mtu2.c                      |     4 +-
 drivers/clocksource/time-pistachio.c               |     3 +-
 drivers/clocksource/timer-digicolor.c              |     2 +-
 drivers/clocksource/timer-keystone.c               |     2 +-
 drivers/clocksource/timer-prima2.c                 |     2 +-
 drivers/clocksource/vf_pit_timer.c                 |     2 +-
 drivers/cpufreq/Kconfig.arm                        |    50 +-
 drivers/cpufreq/Makefile                           |     4 -
 drivers/cpufreq/acpi-cpufreq.c                     |     6 +-
 drivers/cpufreq/cpufreq-dt.c                       |    39 +-
 drivers/cpufreq/cpufreq.c                          |    13 +-
 drivers/cpufreq/exynos-cpufreq.c                   |   239 -
 drivers/cpufreq/exynos-cpufreq.h                   |    89 -
 drivers/cpufreq/exynos4x12-cpufreq.c               |   236 -
 drivers/cpufreq/exynos5250-cpufreq.c               |   210 -
 drivers/cpufreq/intel_pstate.c                     |    43 +-
 drivers/cpuidle/coupled.c                          |    22 +
 drivers/cpuidle/cpuidle.h                          |     6 +
 drivers/cpuidle/driver.c                           |     4 +
 drivers/crypto/Kconfig                             |     2 +-
 drivers/crypto/marvell/cesa.h                      |    27 +
 drivers/crypto/marvell/cipher.c                    |     7 +-
 drivers/crypto/marvell/hash.c                      |     8 +-
 drivers/crypto/qat/qat_common/adf_aer.c            |     3 +
 .../crypto/qat/qat_common/adf_transport_debug.c    |    16 +-
 drivers/crypto/sunxi-ss/sun4i-ss-cipher.c          |     2 +-
 drivers/devfreq/devfreq.c                          |    19 +-
 drivers/devfreq/event/exynos-ppmu.c                |     3 +-
 drivers/devfreq/governor_simpleondemand.c          |    33 +-
 drivers/devfreq/tegra-devfreq.c                    |     8 +-
 drivers/dma/at_xdmac.c                             |    15 +-
 drivers/dma/dmaengine.c                            |    10 +-
 drivers/dma/dw/core.c                              |     4 +-
 drivers/dma/idma64.c                               |    16 +-
 drivers/dma/ipu/ipu_irq.c                          |     2 +-
 drivers/dma/pxa_dma.c                              |    31 +-
 drivers/dma/sun4i-dma.c                            |     6 +-
 drivers/dma/xgene-dma.c                            |    46 +-
 drivers/dma/zx296702_dma.c                         |     2 +-
 drivers/edac/sb_edac.c                             |    72 +-
 drivers/extcon/extcon.c                            |     2 +-
 drivers/firmware/Kconfig                           |     8 +
 drivers/firmware/Makefile                          |     3 +-
 drivers/firmware/efi/Kconfig                       |     2 +-
 drivers/firmware/efi/libstub/arm-stub.c            |    88 +-
 drivers/firmware/efi/libstub/efistub.h             |     4 -
 drivers/firmware/qcom_scm-64.c                     |    63 +
 drivers/gpio/Kconfig                               |     2 +-
 drivers/gpio/gpio-altera.c                         |     6 +-

commit ac8ab709daa01f0084aa930335446be72a3ab898
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Nov 6 13:16:39 2015 -0500

    Wrapfs: update copyright year to 2015

commit f27d6939a7a6165b64742b129b9b401efee03799
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Nov 6 13:15:39 2015 -0500

    Wrapfs: use vfs xattr helpers
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 4801ffc67440dedad52d664be6d77fcc1ea0dfa5
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Sep 4 23:23:14 2015 -0400

    Wrapfs: update follow_link
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit b7392c564354c9b01c63efcd20e6d78ee8bc8850
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Sep 4 23:13:21 2015 -0400

    Wrapfs: update ->direct_IO op prototype
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit c16035ce95ffbf9f9c368209e17076359d6f2b79
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Sep 4 23:12:21 2015 -0400

    Wrapfs: use d_inode macro
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 0aef1b3455fcbb9bfc6804cc9643232ad49fd59b
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Sep 4 23:11:21 2015 -0400

    Wrapfs: remove aio_read/write ops
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit b402e4424a909c6d73e42d903179c87180d83505
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Aug 15 22:48:32 2014 -0400

    Wrapfs: properly copy meta-data after AIO operations from lower inode
    
    Signed-off-by: Mengyang Li <li.mengyang at stonybrook.edu>
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 71faf2b15b92697983161423ebfe6022a5d2f07a
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Aug 11 18:10:35 2014 -0400

    Wrapfs: leave placeholders for updating upper inode after AIO
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 7cac194db9d4f7ed5c0a74cc80394e371c37ed4f
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Sun Aug 10 00:40:56 2014 -0400

    Wrapfs: protect lower_file by ref-count during aio operation
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
    Signed-off-by: Mengyang Li <li.mengyang at stonybrook.edu>

commit 8774a70da81b931417327291b0b968f499630502
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Sun Aug 10 00:40:56 2014 -0400

    Wrapfs: add read_iter/write_iter opeations
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
    Signed-off-by: Mengyang Li <li.mengyang at stonybrook.edu>

commit 2abdc6689f40c57bed2045ff5a3ff8e95b3a4d68
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Sun Aug 10 00:40:56 2014 -0400

    Wrapfs: update to new direct_IO interface
    
    Signed-off-by: Mengyang Li <li.mengyang at stonybrook.edu>
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 1d0a91007db0a436c1522863e4c683fd330a219e
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Sat Jul 26 19:06:53 2014 -0400

    Wrapfs: update wrapfs_fsync
    
    In v3.16 generic_file_fsync will access ->i_sb->s_bdev->bd_disk, but
    s_bdev is NULL for wrapfs inode.  This will trigger a kernel panic in
    xfstests generic/075, generic/091, etc. as of  kernel v3.16-rc1.
    
    This patch fixes this issue by using __generic_file_fsync, a new
    interface introduced in v3.16.
    
    Signed-off-by: Mengyang Li <li.mengyang at stonybrook.edu>
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit c4a2e8b528a443851229d0be770a15c1bc8af9aa
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Wed Jun 25 22:37:16 2014 -0400

    Wrapfs: fix ->llseek to update upper and lower offsets
    
    Fixes bug: xfstests generic/257. f_pos consistently is required by and
    only by dir_ops->wrapfs_readdir, main_ops is not affected.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
    Signed-off-by: Mengyang Li <li.mengyang at stonybrook.edu>

commit dee2f10eda5eb775285d21887838b373c3f1575b
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Wed Jun 25 22:30:27 2014 -0400

     Wrapfs: support extended attributes (xattr) operations
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
    Signed-off-by: Mengyang Li <li.mengyang at stonybrook.edu>

commit d3199ffc8d1e541d400b2f8140d0b2d5869e8a28
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Jun 20 19:40:04 2014 -0400

    Wrapfs: support asynchronous-IO (AIO) operations
    
    Signed-off-by: Li Mengyang <li.mengyang at stonybrook.edu>
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 8d03563e7d3a98c86752b788cd48a0909b3b0353
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Jun 20 19:39:40 2014 -0400

    Wrapfs: support direct-IO (DIO) operations
    
    Signed-off-by: Li Mengyang <li.mengyang at stonybrook.edu>
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 8900756d4b204202260c94df568d662a38685d23
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Wed May 14 23:45:28 2014 -0400

    Wrapfs: implement vm_ops->page_mkwrite
    
    Some file systems (e.g., ext4) require it.  Reported by Ted Ts'o.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit c2a3f7f409cc90871d1a6728b92ded21034dbf23
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Sat Apr 26 22:43:20 2014 -0400

    Wrapfs: use new vfs_rename prototype
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 5f1868e6b7343703cc7bfa5c255e8ac31f2aa47e
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Thu Apr 3 13:24:28 2014 -0400

    Wrapfs: update documentation
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 78dfae159f2480474d15693ce0505174c7c64261
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Thu Apr 3 13:17:55 2014 -0400

    Wrapfs: update maintainers
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 61d15c7a7637dc7c8e68e530c77b32602f210f78
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jan 21 03:03:00 2014 -0500

    Wrapfs: update documentation
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit e083333cd24e42c97dce3ec614714d1cf0d488b4
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jan 21 01:25:54 2014 -0500

    Wrapfs: 2014 Copyright update
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 16c83eaa68f2a70c74d13c9c6e3eb489497c185b
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Nov 26 23:05:22 2013 -0500

    Wrapfs: use generic put_link helper
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 9298b44b81de2dc9144be8b187c1025b4995cc62
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Nov 26 23:03:46 2013 -0500

    Wrapfs: remove unnecessary initializations
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit fd0c91900faddfc6427b0b14ed11a077c7b23bbf
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Sun Nov 24 11:12:07 2013 -0500

    Wrapfs: remove deprecated init_lower_nd
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit c367704f9607e9d5bbeeba2c29382dcf28223be3
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Nov 19 19:00:00 2013 -0500

    Wrapfs: update MAINTAINERS info
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 9b21ec57ff9bd55953dadda9117f62f9f6307e5a
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Nov 19 18:59:47 2013 -0500

    patch wrapfs-copyright-update.patch

commit 034d2082dae0f0c4ff3aef6af7d89583beddaf4f
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Nov 19 17:23:31 2013 -0500

    Wrapfs: use DCACHE_OP_REVALIDATE flag in ->d_revalidate
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 7e9fceae8a43fe75a81bd1a62119cbbd52cf2262
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Nov 19 17:22:31 2013 -0500

    Wrapfs: implement ->getattr
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit e56bdcd849c3bd66325dc0dba1ec1ca472cdef7d
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Nov 19 17:21:31 2013 -0500

    Wrapfs: use file_inode helper
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit c5bc0a9e68664562bc46986938b1cabe820b47d7
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Nov 19 17:20:31 2013 -0500

    Wrapfs: call filemap_write_and_wait in ->flush
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 3e43b6641fdb0dfb974f14f2eeed9d474fde296c
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Nov 19 17:19:31 2013 -0500

    Wrapfs: handle new VFS API with delegation support
    
    For now, wrapfs isn't supporting NFS delegations.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit b0a509c02fd211c915ef4d4ae04ce5fa6529b4a7
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Nov 19 17:18:31 2013 -0500

    VFS: export vfs_path_lookup
    
    In 3.12, this useful function was unexported: wrapfs needs a way to lookup
    relative to a struct path and use a proper vfsmount, unlike lookup_one_len.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 56a4b421044a386ad649c8d1e6673df5ae379f7f
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Nov 19 17:17:31 2013 -0500

    Wrapfs: ->readdir op now ->iterate
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit bca294d7e675134a2c788cf15bc0e9d2f20e6e24
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Wed Jun 5 01:36:58 2013 -0400

    Wrapfs: copy lower inode attributes in ->ioctl
    
    Some ioctls (e.g., EXT2_IOC_SETFLAGS) can change inode attributes, so copy
    them from lower inode.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 5dfb2cfa2c44ae89fa1c4d97f167c3d268beffce
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Wed Jun 5 01:36:58 2013 -0400

    Wrapfs: remove unnecessary call to vm_unmap in ->mmap
    
    Code is unnecessary and causes deadlocks in newer kernels.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 536e7226f50ae8cb68af2e7f1ae531cbe0d29fd3
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jun 4 23:19:32 2013 -0400

    Wrapfs: declare MODULE_ALIAS_FS
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 5933e868936a395bde6f51ac5ba4dfcca29ad340
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jun 4 23:19:32 2013 -0400

    Wrapfs: don't use FS_REVAL_DOT in fs_flags
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 53e47a74c428bb167411ee3c0a010f4f6cc49ec2
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jun 4 23:19:31 2013 -0400

    Wrapfs: remove dependency on now-defunct CONFIG_EXPERIMENTAL
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit d8c1beff5c2b624533b5eb5c8a8f276654ac521a
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jun 4 23:19:31 2013 -0400

    Wrapfs: dentry_open() no longer does mntput/dput
    
    We need to grab a reference on the path before dentry_open, and drop it
    after.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 684825c016145b63df4640c35cc2b65e7d17969e
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jun 4 23:19:30 2013 -0400

    Wrapfs: no need to call mnt_want_write any longer
    
    Apparently this is now being done by the VFS.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit d1f87147b47ac0d67732fedd7c19fe80b687e21d
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jun 4 23:19:30 2013 -0400

    Wrapfs: remove VM_CAN_NONLINEAR flag use in ->mmap
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 9ccfe0d7fe69a5fedf254385efe7da19913c164c
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jun 4 23:19:29 2013 -0400

    Wrapfs: ->lookup takes flags not a nameidata
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 97e870cfd749beea0510ab9f086c1ee4c17d24b9
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jun 4 23:19:29 2013 -0400

    Wrapfs: ->create no longer takes a nameidata, only a flag
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit e14c1f314d426dc03eca6785205c80abc8d7dcb7
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jun 4 23:19:29 2013 -0400

    Wrapfs: ->d_revalidate now takes namei flags, not nameidata
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit a6c3774deea74af214f043a968502a84ca9da6ce
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jun 4 23:19:28 2013 -0400

    Wrapfs: struct nameidata no longer has an open-intent data
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit e82bb2d9b579efd6b0934223d9dd41138b54e9d3
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jun 4 23:19:28 2013 -0400

    Wrapfs: dentry_open now takes a struct path
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit db3e9f5c774c4fbe9a0cd37a0e7288f870fccf28
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jun 4 23:19:27 2013 -0400

    Wrapfs: use vm_munmap in ->mmap
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit e6ef2033cac028b0a4b5cbcddb870bea67b4b489
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jun 4 23:19:27 2013 -0400

    Wrapfs: use clear_inode in evict_inode
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit a14dfb2ebf70e621105221a7f423fde1927189b9
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jun 4 23:19:26 2013 -0400

    Wrapfs: use d_make_root
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 4108219a2b3525d4a18d46842d887d7ff7dbc359
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jan 31 04:40:19 2012 -0500

    Wrapfs: use mode_t
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit ad8186787a341dcd2d61da38b16edf09cce2a37d
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Sun Jan 29 20:34:27 2012 -0500

    Wrapfs: use set_nlink()
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 2b231c0574addf33cc4ba86fbf65a683cb39738c
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Sep 9 00:47:49 2011 -0400

    Wrapfs: drop our dentry in ->rmdir
    
    Also clear nlinks on our inode.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 5ed78096639559ba41e436f170846dc1891e070f
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Sep 6 00:10:32 2011 -0400

    Wrapfs: use d_alloc_root
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 73a6429251d5c6a4dedc08df7e6c47a6bc002c93
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Sep 6 00:10:31 2011 -0400

    Wrapfs: use d_set_d_op
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 3f52a629ada07d724dba5fab5fe2530849dc3710
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Sep 6 00:10:30 2011 -0400

    Wrapfs: use updated vfs_path_lookup prototype
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 31628eb8fc8f9d41965701d7971c8f92297d4b2b
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Sep 6 00:10:30 2011 -0400

    Wrapfs: ->fsync updates for new prototype
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit a2f3541e3627bbb82ca8dc7943ab9d8bb0fe5c1b
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Sep 6 00:10:29 2011 -0400

    Wrapfs: support LOOKUP_RCU in ->d_revalidate
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 6a639850ff56c6088f51000a29e49db46e1b7875
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Sep 6 00:10:28 2011 -0400

    Wrapfs: new ->permission prototype and fixes.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit ad1fb305cbd8b32aa947849e7c9cf275bc11063a
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon May 2 02:00:02 2011 -0400

    Wrapfs: lookup fixes
    
    Don't use lookup_one_len any longer (doesn't work for NFS).
    Initialize lower wrapfs_dentry_info so lower_path is NULL.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 53b5def64b5d9ddc23afab7822552fbb97937353
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Mar 18 13:14:28 2011 -0400

    Wrapfs: remove extra debug in rmdir
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 3f451dd1ac09e8709adbd93d7efd53c5d1d47e91
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Mar 18 12:38:01 2011 -0400

    Wrapfs: checkpatch fixes
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit d86ae8186487d8e56566724a8567924788fe4062
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Mar 18 00:45:17 2011 -0400

    Wrapfs: port to 2.6.39
    
    Remove lock/unlock_kernel in ->fasync.
    Convert from ->get_sb to ->mount op.
    Remove include to smp_lock.h, added sched.h.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit ab1551a6161bbea1658fd9b7b6bf74801d386def
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Thu Mar 17 23:21:55 2011 -0400

    Wrapfs: copyright update for 2011
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit b5b8a34c23d67bfbfd849f2503b443da63c0c892
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Thu Mar 17 23:21:55 2011 -0400

    Wrapfs: better handling of NFS silly-renamed files
    
    In ->unlink, if we try to unlink an NFS silly-renamed file, NFS returns
    -EBUSY.  We have to treat it as a success and return 0 to the VFS.  NFS will
    remove silly-deleted files later on anyway.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 89b70d34e57d5f0e087c5e55e3fa5ee0f02d35ea
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Thu Mar 17 23:21:55 2011 -0400

    Wrapfs: update parent directory inode size in inode ops
    
    After ->unlink, ->rmdir, and ->rename, we need to copy the (possibly
    changed) inode size of the parent directory(ies) where the operation took
    place.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 1368a47e57546aa15b5d02f2b9069085cc5759b8
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Thu Mar 17 23:21:55 2011 -0400

    Wrapfs: remove unnecessary calls to copy lower inode->n_links
    
    Removed from ->create, ->symlink, and ->mknod.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 32f72295a2f4488c693a0c11c9f7432e8f46dd70
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Mar 7 23:20:33 2011 -0500

    Wrapfs: ->setattr fixes
    
    Call inode_change_ok on our inode, not lower.
    Don't copy inode sizes (VFS does it).
    Pass lower file in struct iattr passed to notify_change on lower inode.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 298e0e44900b703805370900ab37c2e9ad1bc56f
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Sun Mar 6 16:23:16 2011 -0500

    Wrapfs: update ->permission prototye and code for new iperm flag
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit f107b1bcec8058b9c99c57e79ad7dc8084a2eda2
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Nov 12 18:15:05 2010 -0500

    Wrapfs: handle maxbytes properly
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 4e0c40ac2fe74bf78df5805f7256175fa375255a
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Sat Sep 11 15:49:33 2010 -0400

    Wrapfs: support ->unlocked_ioctl and ->compat_ioctl
    
    Old ->ioctl was split into ->unlocked_ioctl and ->compat_ioctl.  Compat
    version doesn't need to lock_kernel any longer.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 0ed30e11169d8e1642806c2f952f55d7eae0883d
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Aug 10 23:50:14 2010 -0400

    Wrapfs: new vfs_statfs and ->evict_inode prototypes
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit eeebe33e73880cf8f2e2da8e7e48727f34fe5436
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Aug 6 23:37:29 2010 -0400

    Wrapfs: update ->fsync prototype
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 89a56dc282fe320102d023bfd2b7b8211cf53470
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Apr 20 21:22:02 2010 -0400

    Wrapfs: update documentation
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 12fd84782702d3c38a1fd838fedc55277814c190
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Apr 20 15:32:09 2010 -0400

    Wrapfs: include slab.h
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit dcbbc833776a7c374701b1cdd3073b45a28ae1cd
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Apr 20 15:26:02 2010 -0400

    Wrapfs: avoid an extra path_get/put pair in wrapfs_open
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit e498ace8ac112ef0d43e363fedfb047f858a26b3
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Fri Feb 26 03:18:04 2010 -0500

    Wrapfs: decrement nd_path on follow_link error
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 906c393fa5f384257989aa6b7fc52e60069f7af0
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Tue Jan 5 04:27:00 2010 -0500

    Wrapfs: don't mention kernel version in modload message
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 401a65fd755f097beb7697b98a5fb15fe93c1d46
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Kconfig: hook to configure Wrapfs
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit b372ac1b322c4f37e435a3d8bfcfaa6a57f587c4
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Makefile: hook to compile Wrapfs
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 5b104e0e77001b7418de400bcf72ac04ec0e0c50
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Wrapfs: file system magic number
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit eede690785b696a7152dbceb22c2f653f079c6bc
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Wrapfs: Kconfig options
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit e753a541317610cc123bb8148632d64f83bfb4b9
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Wrapfs: main Makefile
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 6fbce2348a56dd63823865ebd9d8fb47b3aa1385
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Wrapfs: vm_ops operations
    
    Includes necessary address_space workaround ops.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 45e34671145f80d8b30035b20b0ba68ad21c2888
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Wrapfs: mount-time and module-linkage functions
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit e4170de495cf5e4e1c2f2ef02677d4fd3c2eccea
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Wrapfs: lookup-related functions
    
    Main lookup function, nameidata helpers, and stacking-interposition
    functions.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 7d6d6d942c2b4cf561625e766f7693304b1ffb69
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Wrapfs: file operations
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit b972699a254c314dc3926359be0a5073894631ed
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Wrapfs: dentry operations
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 76d9ae8687517d83604140dbbe2814afed17d3ed
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Wrapfs: inode operations
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 204544f0c30069dca91646cf061209d011fe3b8f
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Wrapfs: superblock operations
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit ef4cdd73c1b6e66941ce5f467dfe57a38d51e6ca
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Wrapfs: main header file
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 3beb69e94712936e9f999ac41bb43b86eea77446
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Wrapfs: Maintainers
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit ba9c137b73265f8c4d781caf8c80b6023b480914
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Documentation: index entry for Wrapfs
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 7ca832332b1e9ca7a566f4346941341d29382d88
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jan 4 20:45:06 2010 -0500

    Wrapfs: introduction and usage documentation
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

commit 14fd7c710c1f9f31ec4d36413c3066092c71aa3d
Author: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Date:   Thu Dec 10 18:11:40 2015 -0500

    Linux 4.3.2

commit 14a837d297366fed10bc5f6f2bbecf9400e84e15
Author: David Howells <dhowells at redhat.com>
Date:   Thu Nov 12 09:36:40 2015 +0000

    X.509: Fix the time validation [ver #2]
    
    commit cc25b994acfbc901429da682d0f73c190e960206 upstream.
    
    This fixes CVE-2015-5327.  It affects kernels from 4.3-rc1 onwards.
    
    Fix the X.509 time validation to use month number-1 when looking up the
    number of days in that month.  Also put the month number validation before
    doing the lookup so as not to risk overrunning the array.
    
    This can be tested by doing the following:
    
    cat <<EOF | openssl x509 -outform DER | keyctl padd asymmetric "" @s
    -----BEGIN CERTIFICATE-----
    MIIDbjCCAlagAwIBAgIJAN/lUld+VR4hMA0GCSqGSIb3DQEBCwUAMCkxETAPBgNV
    BAoMCGxvY2FsLWNhMRQwEgYDVQQDDAtzaWduaW5nIGtleTAeFw0xNTA5MDEyMTMw
    MThaFw0xNjA4MzEyMTMwMThaMCkxETAPBgNVBAoMCGxvY2FsLWNhMRQwEgYDVQQD
    DAtzaWduaW5nIGtleTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANrn
    crcMfMeG67nagX4+m02Xk9rkmsMKI5XTUxbikROe7GSUVJ27sPVPZp4mgzoWlvhh
    jfK8CC/qhEhwep8Pgg4EJZyWOjhZb7R97ckGvLIoUC6IO3FC2ZnR7WtmWDgo2Jcj
    VlXwJdHhKU1VZwulh81O61N8IBKqz2r/kDhIWiicUCUkI/Do/RMRfKAoDBcSh86m
    gOeIAGfq62vbiZhVsX5dOE8Oo2TK5weAvwUIOR7OuGBl5AqwFlPnXQolewiHzKry
    THg9e44HfzG4Mi6wUvcJxVaQT1h5SrKD779Z5+8+wf1JLaooetcEUArvWyuxCU59
    qxA4lsTjBwl4cmEki+cCAwEAAaOBmDCBlTAMBgNVHRMEBTADAQH/MAsGA1UdDwQE
    AwIHgDAdBgNVHQ4EFgQUyND/eKUis7ep/hXMJ8iZMdUhI+IwWQYDVR0jBFIwUIAU
    yND/eKUis7ep/hXMJ8iZMdUhI+KhLaQrMCkxETAPBgNVBAoMCGxvY2FsLWNhMRQw
    EgYDVQQDDAtzaWduaW5nIGtleYIJAN/lUld+VR4hMA0GCSqGSIb3DQEBCwUAA4IB
    AQAMqm1N1yD5pimUELLhT5eO2lRdGUfTozljRxc7e2QT3RLk2TtGhg65JFFN6eml
    XS58AEPVcAsSLDlR6WpOpOLB2giM0+fV/eYFHHmh22yqTJl4YgkdUwyzPdCHNOZL
    hmSKeY9xliHb6PNrNWWtZwhYYvRaO2DX4GXOMR0Oa2O4vaYu6/qGlZOZv3U6qZLY
    wwHEJSrqeBDyMuwN+eANHpoSpiBzD77S4e+7hUDJnql4j6xzJ65+nWJ89fCrQypR
    4sN5R3aGeIh3QAQUIKpHilwek0CtEaYERgc5m+jGyKSc1rezJW62hWRTaitOc+d5
    G5hh+9YpnYcxQHEKnZ7rFNKJ
    -----END CERTIFICATE-----
    EOF
    
    If it works, it emit a key ID; if it fails, it should give a bad message
    error.
    
    Reported-by: Mimi Zohar <zohar at linux.vnet.ibm.com>
    Signed-off-by: David Howells <dhowells at redhat.com>
    Tested-by: Mimi Zohar <zohar at linux.vnet.ibm.com>
    Acked-by: David Woodhouse <David.Woodhouse at intel.com>
    Signed-off-by: James Morris <james.l.morris at oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>

commit 6b8b7d4fb9d71db1d78d29ce39323e198049e2c3
Author: sudip <sudipm.mukherjee at gmail.com>
Date:   Thu Sep 17 13:12:51 2015 +0530

    crypto: asymmetric_keys - remove always false comparison
    
    commit 4dd17c9c8a30c8d8cd1c9d4b94f08aca4b038d3e upstream.
    
    hour, min and sec are unsigned int and they can never be less than zero.
    
    Signed-off-by: Sudip Mukherjee <sudip at vectorindia.org>
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>

commit 5f8b2364ca1fc71022ae7e33b6c517133b8267ea
Author: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Date:   Wed Dec 9 14:40:26 2015 -0500

    Linux 4.3.1

commit a8adab1a510bbb18be8cf2e35276dc933db814cc
Author: Boris Ostrovsky <boris.ostrovsky at oracle.com>
Date:   Fri Nov 20 11:25:04 2015 -0500

    xen/events: Always allocate legacy interrupts on PV guests
    
    commit b4ff8389ed14b849354b59ce9b360bdefcdbf99c upstream.
    
    After commit 8c058b0b9c34 ("x86/irq: Probe for PIC presence before
    allocating descs for legacy IRQs") early_irq_init() will no longer
    preallocate descriptors for legacy interrupts if PIC does not
    exist, which is the case for Xen PV guests.
    
    Therefore we may need to allocate those descriptors ourselves.
    
    Signed-off-by: Boris Ostrovsky <boris.ostrovsky at oracle.com>
    Suggested-by: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: David Vrabel <david.vrabel at citrix.com>
    Cc: Vitaly Kuznetsov <vkuznets at redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>

commit b2cb7afbb1693195b3171e85b10c0aa42ff37990
Author: Arnd Bergmann <arnd at arndb.de>
Date:   Sun Sep 27 16:45:01 2015 -0400

    staging/lustre: use jiffies for lp_last_query times
    
    commit 9f088dba3cc267ea11ec0da318cd0175575b5f9b upstream.
    
    The recently introduced lnet_peer_set_alive() function uses
    get_seconds() to read the current time into a shared variable,
    but all other uses of that variable compare it to jiffies values.
    
    This changes the current use to jiffies as well for consistency.
    
    Signed-off-by: Arnd Bergmann <arnd at arndb.de>
    Fixes: af3fa7c71bf ("staging/lustre/lnet: peer aliveness status and NI status")
    Cc: Liang Zhen <liang.zhen at intel.com>
    Cc: James Simmons <uja.ornl at gmail.com>
    Cc: Isaac Huang <he.huang at intel.com>
    Signed-off-by: Oleg Drokin <oleg.drokin at intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>

diff --git a/.gitignore b/.gitignore
index 4ad4a98..fd3a355 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@
 modules.builtin
 Module.symvers
 *.dwo
+*.su
 
 #
 # Top-level generic files
@@ -44,6 +45,7 @@ Module.symvers
 /TAGS
 /linux
 /vmlinux
+/vmlinux.32
 /vmlinux-gdb.py
 /vmlinuz
 /System.map
@@ -89,6 +91,9 @@ GRTAGS
 GSYMS
 GTAGS
 
+# id-utils files
+ID
+
 *.orig
 *~
 \#*#
@@ -97,6 +102,7 @@ GTAGS
 # Leavings from module signing
 #
 extra_certificates
+signing_key.pem
 signing_key.priv
 signing_key.x509
 x509.genkey
diff --git a/.mailmap b/.mailmap
index 4b31af5..b1e9a97 100644
--- a/.mailmap
+++ b/.mailmap
@@ -59,6 +59,7 @@ James Bottomley <jejb at mulgrave.(none)>
 James Bottomley <jejb at titanic.il.steeleye.com>
 James E Wilson <wilson at specifix.com>
 James Ketrenos <jketreno at io.(none)>
+<javier at osg.samsung.com> <javier.martinez at collabora.co.uk>
 Jean Tourrilhes <jt at hpl.hp.com>
 Jeff Garzik <jgarzik at pretzel.yyz.us>
 Jens Axboe <axboe at suse.de>
diff --git a/CREDITS b/CREDITS
index bcb8efa..8207cc6 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2992,6 +2992,10 @@ S: 2200 Mission College Blvd
 S: Santa Clara, CA 95052
 S: USA
 
+N: Anil Ravindranath
+E: anil_ravindranath at pmc-sierra.com
+D: PMC-Sierra MaxRAID driver
+
 N: Eric S. Raymond
 E: esr at thyrsus.com
 W: http://www.tuxedo.org/~esr/
diff --git a/Documentation/ABI/testing/sysfs-hypervisor-pmu b/Documentation/ABI/testing/sysfs-hypervisor-pmu
new file mode 100644
index 0000000..224faa1
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-hypervisor-pmu
@@ -0,0 +1,23 @@
+What:		/sys/hypervisor/pmu/pmu_mode
+Date:		August 2015
+KernelVersion:	4.3
+Contact:	Boris Ostrovsky <boris.ostrovsky at oracle.com>
+Description:
+		Describes mode that Xen's performance-monitoring unit (PMU)
+		uses. Accepted values are
+			"off"  -- PMU is disabled
+			"self" -- The guest can profile itself
+			"hv"   -- The guest can profile itself and, if it is
+				  privileged (e.g. dom0), the hypervisor
+			"all" --  The guest can profile itself, the hypervisor
+				  and all other guests. Only available to
+				  privileged guests.
+
+What:           /sys/hypervisor/pmu/pmu_features
+Date:           August 2015
+KernelVersion:  4.3
+Contact:        Boris Ostrovsky <boris.ostrovsky at oracle.com>
+Description:
+		Describes Xen PMU features (as an integer). A set bit indicates
+		that the corresponding feature is enabled. See
+		include/xen/interface/xenpmu.h for available features
diff --git a/Documentation/Changes b/Documentation/Changes
index 646cdaa..f447f05 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -43,6 +43,7 @@ o  udev                   081                     # udevd --version
 o  grub                   0.93                    # grub --version || grub-install --version
 o  mcelog                 0.6                     # mcelog --version
 o  iptables               1.4.2                   # iptables -V
+o  openssl & libcrypto    1.0.0                   # openssl version
 
 
 Kernel compilation
@@ -79,6 +80,17 @@ BC
 You will need bc to build kernels 3.10 and higher
 
 
+OpenSSL
+-------
+
+Module signing and external certificate handling use the OpenSSL program and
+crypto library to do key creation and signature generation.
+
+You will need openssl to build kernels 3.7 and higher if module signing is
+enabled.  You will also need openssl development packages to build kernels 4.3
+and higher.
+
+
 System utilities
 ================
 
@@ -295,6 +307,10 @@ Binutils
 --------
 o  <ftp://ftp.kernel.org/pub/linux/devel/binutils/>
 
+OpenSSL
+-------
+o  <https://www.openssl.org/>
+
 System utilities
 ****************
 
@@ -392,4 +408,3 @@ o  <http://oprofile.sf.net/download/>
 NFS-Utils
 ---------
 o  <http://nfs.sourceforge.net/>
-
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt
index 7eba542..edccacd 100644
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
@@ -104,6 +104,13 @@ crossing restrictions, pass 0 for alloc; passing 4096 says memory allocated
 from this pool must not cross 4KByte boundaries.
 
 
+	void *dma_pool_zalloc(struct dma_pool *pool, gfp_t mem_flags,
+			      dma_addr_t *handle)
+
+Wraps dma_pool_alloc() and also zeroes the returned memory if the
+allocation attempt succeeded.
+
+
 	void *dma_pool_alloc(struct dma_pool *pool, gfp_t gfp_flags,
 			dma_addr_t *dma_handle);
 
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
index bbc1d7e..1d6008d 100644
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@ -217,6 +217,40 @@ X!Isound/sound_firmware.c
 -->
   </chapter>
 
+  <chapter id="mediadev">
+     <title>Media Devices</title>
+
+     <sect1><title>Video2Linux devices</title>
+!Iinclude/media/v4l2-async.h
+!Iinclude/media/v4l2-ctrls.h
+!Iinclude/media/v4l2-dv-timings.h
+!Iinclude/media/v4l2-event.h
+!Iinclude/media/v4l2-flash-led-class.h
+!Iinclude/media/v4l2-mediabus.h
+!Iinclude/media/v4l2-mem2mem.h
+!Iinclude/media/v4l2-of.h
+!Iinclude/media/v4l2-subdev.h
+!Iinclude/media/videobuf2-core.h
+!Iinclude/media/videobuf2-memops.h
+     </sect1>
+     <sect1><title>Digital TV (DVB) devices</title>
+!Idrivers/media/dvb-core/dvb_ca_en50221.h
+!Idrivers/media/dvb-core/dvb_frontend.h
+!Idrivers/media/dvb-core/dvb_math.h
+!Idrivers/media/dvb-core/dvb_ringbuffer.h
+!Idrivers/media/dvb-core/dvbdev.h
+     </sect1>
+     <sect1><title>Remote Controller devices</title>
+!Iinclude/media/rc-core.h
+     </sect1>
+     <sect1><title>Media Controller devices</title>
+!Iinclude/media/media-device.h
+!Iinclude/media/media-devnode.h
+!Iinclude/media/media-entity.h
+     </sect1>
+
+  </chapter>
+
   <chapter id="uart16x50">
      <title>16x50 UART Driver</title>
 !Edrivers/tty/serial/serial_core.c
@@ -456,4 +490,31 @@ X!Ilib/fonts/fonts.c
 !Edrivers/hsi/hsi.c
   </chapter>
 
+  <chapter id="pwm">
+    <title>Pulse-Width Modulation (PWM)</title>
+    <para>
+      Pulse-width modulation is a modulation technique primarily used to
+      control power supplied to electrical devices.
+    </para>
+    <para>
+      The PWM framework provides an abstraction for providers and consumers
+      of PWM signals. A controller that provides one or more PWM signals is
+      registered as <structname>struct pwm_chip</structname>. Providers are
+      expected to embed this structure in a driver-specific structure. This
+      structure contains fields that describe a particular chip.
+    </para>
+    <para>
+      A chip exposes one or more PWM signal sources, each of which exposed
+      as a <structname>struct pwm_device</structname>. Operations can be
+      performed on PWM devices to control the period, duty cycle, polarity
+      and active state of the signal.
+    </para>
+    <para>
+      Note that PWM devices are exclusive resources: they can always only be
+      used by one consumer at a time.
+    </para>
+!Iinclude/linux/pwm.h
+!Edrivers/pwm/core.c
+  </chapter>
+
 </book>
diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile
index 23996f8..08527e7 100644
--- a/Documentation/DocBook/media/Makefile
+++ b/Documentation/DocBook/media/Makefile
@@ -199,7 +199,8 @@ DVB_DOCUMENTED = \
 #
 
 install_media_images = \
-	$(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/*.svg $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
+	$(Q)-mkdir $(MEDIA_OBJ_DIR)/media_api; \
+	cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/*.svg $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
 
 $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64
 	$(Q)base64 -d $< >$@
diff --git a/Documentation/DocBook/media/dvb/intro.xml b/Documentation/DocBook/media/dvb/intro.xml
index bcc72c2..51db156 100644
--- a/Documentation/DocBook/media/dvb/intro.xml
+++ b/Documentation/DocBook/media/dvb/intro.xml
@@ -163,9 +163,8 @@ are called:</para>
 <para>where N enumerates the DVB PCI cards in a system starting
 from&#x00A0;0, and M enumerates the devices of each type within each
 adapter, starting from&#x00A0;0, too. We will omit the “
-<constant>/dev/dvb/adapterN/</constant>” in the further dicussion
-of these devices. The naming scheme for the devices is the same wheter
-devfs is used or not.</para>
+<constant>/dev/dvb/adapterN/</constant>” in the further discussion
+of these devices.</para>
 
 <para>More details about the data structures and function calls of all
 the devices are described in the following chapters.</para>
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index 6e1667b..33aece5 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -3414,7 +3414,7 @@ giving priority to the center of the metered area.</entry>
 		<row>
 		  <entry><constant>V4L2_EXPOSURE_METERING_MATRIX</constant> </entry>
 		  <entry>A multi-zone metering. The light intensity is measured
-in several points of the frame and the the results are combined. The
+in several points of the frame and the results are combined. The
 algorithm of the zones selection and their significance in calculating the
 final value is device dependent.</entry>
 		</row>
diff --git a/Documentation/DocBook/media/v4l/media-ioc-device-info.xml b/Documentation/DocBook/media/v4l/media-ioc-device-info.xml
index 2ce5214..b0a21ac 100644
--- a/Documentation/DocBook/media/v4l/media-ioc-device-info.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-device-info.xml
@@ -102,7 +102,7 @@
 	  </row>
 	  <row>
 	    <entry>__u32</entry>
-	    <entry><structfield>media_version</structfield></entry>
+	    <entry><structfield>driver_version</structfield></entry>
 	    <entry>Media device driver version, formatted with the
 	    <constant>KERNEL_VERSION()</constant> macro. Together with the
 	    <structfield>driver</structfield> field this identifies a particular
diff --git a/Documentation/DocBook/media/v4l/vidioc-expbuf.xml b/Documentation/DocBook/media/v4l/vidioc-expbuf.xml
index a78c920..0ae0b6a 100644
--- a/Documentation/DocBook/media/v4l/vidioc-expbuf.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-expbuf.xml
@@ -62,28 +62,28 @@ buffer as a DMABUF file at any time after buffers have been allocated with the
 &VIDIOC-REQBUFS; ioctl.</para>
 
 <para> To export a buffer, applications fill &v4l2-exportbuffer;.  The
-<structfield> type </structfield> field is set to the same buffer type as was
-previously used with  &v4l2-requestbuffers;<structfield> type </structfield>.
-Applications must also set the <structfield> index </structfield> field. Valid
+<structfield>type</structfield> field is set to the same buffer type as was
+previously used with &v4l2-requestbuffers; <structfield>type</structfield>.
+Applications must also set the <structfield>index</structfield> field. Valid
 index numbers range from zero to the number of buffers allocated with
-&VIDIOC-REQBUFS; (&v4l2-requestbuffers;<structfield> count </structfield>)
-minus one.  For the multi-planar API, applications set the <structfield> plane
-</structfield> field to the index of the plane to be exported. Valid planes
+&VIDIOC-REQBUFS; (&v4l2-requestbuffers; <structfield>count</structfield>)
+minus one.  For the multi-planar API, applications set the <structfield>plane</structfield>
+field to the index of the plane to be exported. Valid planes
 range from zero to the maximal number of valid planes for the currently active
-format. For the single-planar API, applications must set <structfield> plane
-</structfield> to zero.  Additional flags may be posted in the <structfield>
-flags </structfield> field.  Refer to a manual for open() for details.
+format. For the single-planar API, applications must set <structfield>plane</structfield>
+to zero.  Additional flags may be posted in the <structfield>flags</structfield>
+field.  Refer to a manual for open() for details.
 Currently only O_CLOEXEC, O_RDONLY, O_WRONLY, and O_RDWR are supported.  All
 other fields must be set to zero.
 In the case of multi-planar API, every plane is exported separately using
-multiple <constant> VIDIOC_EXPBUF </constant> calls. </para>
+multiple <constant>VIDIOC_EXPBUF</constant> calls.</para>
 
-<para> After calling <constant>VIDIOC_EXPBUF</constant> the <structfield> fd
-</structfield> field will be set by a driver.  This is a DMABUF file
+<para>After calling <constant>VIDIOC_EXPBUF</constant> the <structfield>fd</structfield>
+field will be set by a driver.  This is a DMABUF file
 descriptor. The application may pass it to other DMABUF-aware devices. Refer to
 <link linkend="dmabuf">DMABUF importing</link> for details about importing
 DMABUF files into V4L2 nodes. It is recommended to close a DMABUF file when it
-is no longer used to allow the associated memory to be reclaimed. </para>
+is no longer used to allow the associated memory to be reclaimed.</para>
   </refsect1>
 
   <refsect1>
@@ -170,9 +170,9 @@ multi-planar API. Otherwise this value must be set to zero. </entry>
 	  <row>
 	    <entry>__u32</entry>
 	    <entry><structfield>flags</structfield></entry>
-	    <entry>Flags for the newly created file, currently only <constant>
-O_CLOEXEC </constant>, <constant>O_RDONLY</constant>, <constant>O_WRONLY
-</constant>, and <constant>O_RDWR</constant> are supported, refer to the manual
+	    <entry>Flags for the newly created file, currently only
+<constant>O_CLOEXEC</constant>, <constant>O_RDONLY</constant>, <constant>O_WRONLY</constant>,
+and <constant>O_RDWR</constant> are supported, refer to the manual
 of open() for more details.</entry>
 	  </row>
 	  <row>
@@ -200,9 +200,9 @@ set the array to zero.</entry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	  <para>A queue is not in MMAP mode or DMABUF exporting is not
-supported or <structfield> flags </structfield> or <structfield> type
-</structfield> or <structfield> index </structfield> or <structfield> plane
-</structfield> fields are invalid.</para>
+supported or <structfield>flags</structfield> or <structfield>type</structfield>
+or <structfield>index</structfield> or <structfield>plane</structfield> fields
+are invalid.</para>
 	</listitem>
       </varlistentry>
     </variablelist>
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-parm.xml b/Documentation/DocBook/media/v4l/vidioc-g-parm.xml
index f4e28e7..7217287 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-parm.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-parm.xml
@@ -267,7 +267,7 @@ is intended for still imaging applications. The idea is to get the
 best possible image quality that the hardware can deliver. It is not
 defined how the driver writer may achieve that; it will depend on the
 hardware and the ingenuity of the driver writer. High quality mode is
-a different mode from the the regular motion video capture modes. In
+a different mode from the regular motion video capture modes. In
 high quality mode:<itemizedlist>
 		  <listitem>
 		    <para>The driver may be able to capture higher
diff --git a/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml b/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml
index dc83ad7..6ec39c6 100644
--- a/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml
@@ -616,7 +616,7 @@ pointer to memory containing the payload of the control.</entry>
 	    <entry><constant>V4L2_CTRL_FLAG_EXECUTE_ON_WRITE</constant></entry>
 	    <entry>0x0200</entry>
 	    <entry>The value provided to the control will be propagated to the driver
-even if remains constant. This is required when the control represents an action
+even if it remains constant. This is required when the control represents an action
 on the hardware. For example: clearing an error flag or triggering the flash. All the
 controls of the type <constant>V4L2_CTRL_TYPE_BUTTON</constant> have this flag set.</entry>
 	  </row>
diff --git a/Documentation/arm/OMAP/README b/Documentation/arm/OMAP/README
new file mode 100644
index 0000000..75645c4
--- /dev/null
+++ b/Documentation/arm/OMAP/README
@@ -0,0 +1,7 @@
+This file contains documentation for running mainline
+kernel on omaps.
+
+KERNEL		NEW DEPENDENCIES
+v4.3+		Update is needed for custom .config files to make sure
+		CONFIG_REGULATOR_PBIAS is enabled for MMC1 to work
+		properly.
diff --git a/Documentation/blockdev/zram.txt b/Documentation/blockdev/zram.txt
index c4de576..62435bb 100644
--- a/Documentation/blockdev/zram.txt
+++ b/Documentation/blockdev/zram.txt
@@ -144,7 +144,8 @@ mem_used_max      RW    the maximum amount memory zram have consumed to
                         store compressed data
 mem_limit         RW    the maximum amount of memory ZRAM can use to store
                         the compressed data
-num_migrated      RO    the number of objects migrated migrated by compaction
+pages_compacted   RO    the number of pages freed during compaction
+                        (available only via zram<id>/mm_stat node)
 compact           WO    trigger memory compaction
 
 WARNING
diff --git a/Documentation/cgroups/blkio-controller.txt b/Documentation/cgroups/blkio-controller.txt
index 68b6a6a..12686be 100644
--- a/Documentation/cgroups/blkio-controller.txt
+++ b/Documentation/cgroups/blkio-controller.txt
@@ -201,7 +201,7 @@ Proportional weight policy files
 	  specifies the number of bytes.
 
 - blkio.io_serviced
-	- Number of IOs completed to/from the disk by the group. These
+	- Number of IOs (bio) issued to the disk by the group. These
 	  are further divided by the type of operation - read or write, sync
 	  or async. First two fields specify the major and minor number of the
 	  device, third field specifies the operation type and the fourth field
@@ -327,18 +327,11 @@ Note: If both BW and IOPS rules are specified for a device, then IO is
       subjected to both the constraints.
 
 - blkio.throttle.io_serviced
-	- Number of IOs (bio) completed to/from the disk by the group (as
-	  seen by throttling policy). These are further divided by the type
-	  of operation - read or write, sync or async. First two fields specify
-	  the major and minor number of the device, third field specifies the
-	  operation type and the fourth field specifies the number of IOs.
-
-	  blkio.io_serviced does accounting as seen by CFQ and counts are in
-	  number of requests (struct request). On the other hand,
-	  blkio.throttle.io_serviced counts number of IO in terms of number
-	  of bios as seen by throttling policy.  These bios can later be
-	  merged by elevator and total number of requests completed can be
-	  lesser.
+	- Number of IOs (bio) issued to the disk by the group. These
+	  are further divided by the type of operation - read or write, sync
+	  or async. First two fields specify the major and minor number of the
+	  device, third field specifies the operation type and the fourth field
+	  specifies the number of IOs.
 
 - blkio.throttle.io_service_bytes
 	- Number of bytes transferred to/from the disk by the group. These
@@ -347,11 +340,6 @@ Note: If both BW and IOPS rules are specified for a device, then IO is
 	  device, third field specifies the operation type and the fourth field
 	  specifies the number of bytes.
 
-	  These numbers should roughly be same as blkio.io_service_bytes as
-	  updated by CFQ. The difference between two is that
-	  blkio.io_service_bytes will not be updated if CFQ is not operating
-	  on request queue.
-
 Common files among various policies
 -----------------------------------
 - blkio.reset_stats
diff --git a/Documentation/cgroups/unified-hierarchy.txt b/Documentation/cgroups/unified-hierarchy.txt
index 1ee9caf..e0975c2 100644
--- a/Documentation/cgroups/unified-hierarchy.txt
+++ b/Documentation/cgroups/unified-hierarchy.txt
@@ -27,7 +27,7 @@ CONTENTS
     5-3-1. Format
     5-3-2. Control Knobs
   5-4. Per-Controller Changes
-    5-4-1. blkio
+    5-4-1. io
     5-4-2. cpuset
     5-4-3. memory
 6. Planned Changes
@@ -203,7 +203,7 @@ other issues.  The mapping from nice level to weight isn't obvious or
 universal, and there are various other knobs which simply aren't
 available for tasks.
 
-The blkio controller implicitly creates a hidden leaf node for each
+The io controller implicitly creates a hidden leaf node for each
 cgroup to host the tasks.  The hidden leaf has its own copies of all
 the knobs with "leaf_" prefixed.  While this allows equivalent control
 over internal tasks, it's with serious drawbacks.  It always adds an
@@ -438,9 +438,62 @@ may be specified in any order and not all pairs have to be specified.
 
 5-4. Per-Controller Changes
 
-5-4-1. blkio
+5-4-1. io
 
-- blk-throttle becomes properly hierarchical.
+- blkio is renamed to io.  The interface is overhauled anyway.  The
+  new name is more in line with the other two major controllers, cpu
+  and memory, and better suited given that it may be used for cgroup
+  writeback without involving block layer.
+
+- Everything including stat is always hierarchical making separate
+  recursive stat files pointless and, as no internal node can have
+  tasks, leaf weights are meaningless.  The operation model is
+  simplified and the interface is overhauled accordingly.
+
+  io.stat
+
+	The stat file.  The reported stats are from the point where
+	bio's are issued to request_queue.  The stats are counted
+	independent of which policies are enabled.  Each line in the
+	file follows the following format.  More fields may later be
+	added at the end.
+
+	  $MAJ:$MIN rbytes=$RBYTES wbytes=$WBYTES rios=$RIOS wrios=$WIOS
+
+  io.weight
+
+	The weight setting, currently only available and effective if
+	cfq-iosched is in use for the target device.  The weight is
+	between 1 and 10000 and defaults to 100.  The first line
+	always contains the default weight in the following format to
+	use when per-device setting is missing.
+
+	  default $WEIGHT
+
+	Subsequent lines list per-device weights of the following
+	format.
+
+	  $MAJ:$MIN $WEIGHT
+
+	Writing "$WEIGHT" or "default $WEIGHT" changes the default
+	setting.  Writing "$MAJ:$MIN $WEIGHT" sets per-device weight
+	while "$MAJ:$MIN default" clears it.
+
+	This file is available only on non-root cgroups.
+
+  io.max
+
+	The maximum bandwidth and/or iops setting, only available if
+	blk-throttle is enabled.  The file is of the following format.
+
+	  $MAJ:$MIN rbps=$RBPS wbps=$WBPS riops=$RIOPS wiops=$WIOPS
+
+	${R|W}BPS are read/write bytes per second and ${R|W}IOPS are
+	read/write IOs per second.  "max" indicates no limit.  Writing
+	to the file follows the same format but the individual
+	settings may be ommitted or specified in any order.
+
+	This file is available only on non-root cgroups.
 
 
 5-4-2. cpuset
diff --git a/Documentation/device-mapper/snapshot.txt b/Documentation/device-mapper/snapshot.txt
index 0d5bc46..ad6949b 100644
--- a/Documentation/device-mapper/snapshot.txt
+++ b/Documentation/device-mapper/snapshot.txt
@@ -41,9 +41,13 @@ useless and be disabled, returning errors.  So it is important to monitor
 the amount of free space and expand the <COW device> before it fills up.
 
 <persistent?> is P (Persistent) or N (Not persistent - will not survive
-after reboot).
-The difference is that for transient snapshots less metadata must be
-saved on disk - they can be kept in memory by the kernel.
+after reboot).  O (Overflow) can be added as a persistent store option
+to allow userspace to advertise its support for seeing "Overflow" in the
+snapshot status.  So supported store types are "P", "PO" and "N".
+
+The difference between persistent and transient is with transient
+snapshots less metadata must be saved on disk - they can be kept in
+memory by the kernel.
 
 
 * snapshot-merge <origin> <COW device> <persistent> <chunksize>
diff --git a/Documentation/devicetree/bindings/arm/gic-v3.txt b/Documentation/devicetree/bindings/arm/gic-v3.txt
index ddfade4..7803e77 100644
--- a/Documentation/devicetree/bindings/arm/gic-v3.txt
+++ b/Documentation/devicetree/bindings/arm/gic-v3.txt
@@ -57,6 +57,8 @@ used to route Message Signalled Interrupts (MSI) to the CPUs.
 These nodes must have the following properties:
 - compatible : Should at least contain  "arm,gic-v3-its".
 - msi-controller : Boolean property. Identifies the node as an MSI controller
+- #msi-cells: Must be <1>. The single msi-cell is the DeviceID of the device
+  which will generate the MSI.
 - reg: Specifies the base physical address and size of the ITS
   registers.
 
@@ -83,6 +85,7 @@ Examples:
 		gic-its at 2c200000 {
 			compatible = "arm,gic-v3-its";
 			msi-controller;
+			#msi-cells = <1>;
 			reg = <0x0 0x2c200000 0 0x200000>;
 		};
 	};
@@ -107,12 +110,14 @@ Examples:
 		gic-its at 2c200000 {
 			compatible = "arm,gic-v3-its";
 			msi-controller;
+			#msi-cells = <1>;
 			reg = <0x0 0x2c200000 0 0x200000>;
 		};
 
 		gic-its at 2c400000 {
 			compatible = "arm,gic-v3-its";
 			msi-controller;
+			#msi-cells = <1>;
 			reg = <0x0 0x2c400000 0 0x200000>;
 		};
 	};
diff --git a/Documentation/devicetree/bindings/arm/idle-states.txt b/Documentation/devicetree/bindings/arm/idle-states.txt
index a8274ea..b8e41c1 100644
--- a/Documentation/devicetree/bindings/arm/idle-states.txt
+++ b/Documentation/devicetree/bindings/arm/idle-states.txt
@@ -497,7 +497,7 @@ cpus {
 	};
 
 	idle-states {
-		entry-method = "arm,psci";
+		entry-method = "psci";
 
 		CPU_RETENTION_0_0: cpu-retention-0-0 {
 			compatible = "arm,idle-state";
diff --git a/Documentation/devicetree/bindings/gpio/gpio.txt b/Documentation/devicetree/bindings/gpio/gpio.txt
index 5788d5c..82d40e2 100644
--- a/Documentation/devicetree/bindings/gpio/gpio.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio.txt
@@ -16,7 +16,9 @@ properties, each containing a 'gpio-list':
 GPIO properties should be named "[<name>-]gpios", with <name> being the purpose
 of this GPIO for the device. While a non-existent <name> is considered valid
 for compatibility reasons (resolving to the "gpios" property), it is not allowed
-for new bindings.
+for new bindings. Also, GPIO properties named "[<name>-]gpio" are valid and old
+bindings use it, but are only supported for compatibility reasons and should not
+be used for newer bindings since it has been deprecated.
 
 GPIO properties can contain one or more GPIO phandles, but only in exceptional
 cases should they contain more than one. If your device uses several GPIOs with
diff --git a/Documentation/devicetree/bindings/hwmon/ina209.txt b/Documentation/devicetree/bindings/hwmon/ina209.txt
new file mode 100644
index 0000000..9dd2bee
--- /dev/null
+++ b/Documentation/devicetree/bindings/hwmon/ina209.txt
@@ -0,0 +1,18 @@
+ina209 properties
+
+Required properties:
+- compatible: Must be "ti,ina209"
+- reg: I2C address
+
+Optional properties:
+
+- shunt-resistor
+	Shunt resistor value in micro-Ohm
+
+Example:
+
+temp-sensor at 4c {
+	compatible = "ti,ina209";
+	reg = <0x4c>;
+	shunt-resistor = <5000>;
+};
diff --git a/Documentation/devicetree/bindings/hwmon/ina2xx.txt b/Documentation/devicetree/bindings/hwmon/ina2xx.txt
new file mode 100644
index 0000000..a2ad85d
--- /dev/null
+++ b/Documentation/devicetree/bindings/hwmon/ina2xx.txt
@@ -0,0 +1,22 @@
+ina2xx properties
+
+Required properties:
+- compatible: Must be one of the following:
+	- "ti,ina219" for ina219
+	- "ti,ina220" for ina220
+	- "ti,ina226" for ina226
+	- "ti,ina230" for ina230
+- reg: I2C address
+
+Optional properties:
+
+- shunt-resistor
+	Shunt resistor value in micro-Ohm
+
+Example:
+
+ina220 at 44 {
+	compatible = "ti,ina220";
+	reg = <0x44>;
+	shunt-resistor = <1000>;
+};
diff --git a/Documentation/devicetree/bindings/hwmon/max6697.txt b/Documentation/devicetree/bindings/hwmon/max6697.txt
new file mode 100644
index 0000000..5f79399
--- /dev/null
+++ b/Documentation/devicetree/bindings/hwmon/max6697.txt
@@ -0,0 +1,64 @@
+max6697 properties
+
+Required properties:
+- compatible:
+	Should be one of
+		maxim,max6581
+		maxim,max6602
+		maxim,max6622
+		maxim,max6636
+		maxim,max6689
+		maxim,max6693
+		maxim,max6694
+		maxim,max6697
+		maxim,max6698
+		maxim,max6699
+- reg: I2C address
+
+Optional properties:
+
+- smbus-timeout-disable
+	Set to disable SMBus timeout. If not specified, SMBus timeout will be
+	enabled.
+- extended-range-enable
+	Only valid for MAX6581. Set to enable extended temperature range.
+	Extended temperature will be disabled if not specified.
+- beta-compensation-enable
+	Only valid for MAX6693 and MX6694. Set to enable beta compensation on
+	remote temperature channel 1.
+	Beta compensation will be disabled if not specified.
+- alert-mask
+	Alert bit mask. Alert disabled for bits set.
+	Select bit 0 for local temperature, bit 1..7 for remote temperatures.
+	If not specified, alert will be enabled for all channels.
+- over-temperature-mask
+	Over-temperature bit mask. Over-temperature reporting disabled for
+	bits set.
+	Select bit 0 for local temperature, bit 1..7 for remote temperatures.
+	If not specified, over-temperature reporting will be enabled for all
+	channels.
+- resistance-cancellation
+	Boolean for all chips other than MAX6581. Set to enable resistance
+	cancellation on remote temperature channel 1.
+	For MAX6581, resistance cancellation enabled for all channels if
+	specified as boolean, otherwise as per bit mask specified.
+	Only supported for remote temperatures (bit 1..7).
+	If not specified, resistance cancellation will be disabled for all
+	channels.
+- transistor-ideality
+	For MAX6581 only. Two values; first is bit mask, second is ideality
+	select value as per MAX6581 data sheet. Select bit 1..7 for remote
+	channels.
+	Transistor ideality will be initialized to default (1.008) if not
+	specified.
+
+Example:
+
+temp-sensor at 1a {
+	compatible = "maxim,max6697";
+	reg = <0x1a>;
+	smbus-timeout-disable;
+	resistance-cancellation;
+	alert-mask = <0x72>;
+	over-temperature-mask = <0x7f>;
+};
diff --git a/Documentation/devicetree/bindings/i2c/i2c-cadence.txt b/Documentation/devicetree/bindings/i2c/i2c-cadence.txt
index 7cb0b56..ebaa90c 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-cadence.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-cadence.txt
@@ -2,7 +2,11 @@ Binding for the Cadence I2C controller
 
 Required properties:
   - reg: Physical base address and size of the controller's register area.
-  - compatible: Compatibility string. Must be 'cdns,i2c-r1p10'.
+  - compatible: Should contain one of:
+		* "cdns,i2c-r1p10"
+		Note:	Use this when cadence i2c controller version 1.0 is used.
+		* "cdns,i2c-r1p14"
+		Note:	Use this when cadence i2c controller version 1.4 is used.
   - clocks: Input clock specifier. Refer to common clock bindings.
   - interrupts: Interrupt specifier. Refer to interrupt bindings.
   - #address-cells: Should be 1.
diff --git a/Documentation/devicetree/bindings/i2c/i2c-emev2.txt b/Documentation/devicetree/bindings/i2c/i2c-emev2.txt
new file mode 100644
index 0000000..5ed1ea1
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-emev2.txt
@@ -0,0 +1,22 @@
+Device tree configuration for Renesas EMEV2 IIC controller
+
+Required properties:
+- compatible      : "renesas,iic-emev2"
+- reg             : address start and address range size of device
+- interrupts      : specifier for the IIC controller interrupt
+- clocks          : phandle to the IP core SCLK
+- clock-names     : must be "sclk"
+- #address-cells  : should be <1>
+- #size-cells     : should be <0>
+
+Example:
+
+	iic0: i2c at e0070000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "renesas,iic-emev2";
+		reg = <0xe0070000 0x28>;
+		interrupts = <0 32 IRQ_TYPE_EDGE_RISING>;
+		clocks = <&iic0_sclk>;
+		clock-names = "sclk";
+	};
diff --git a/Documentation/devicetree/bindings/i2c/i2c-lpc2k.txt b/Documentation/devicetree/bindings/i2c/i2c-lpc2k.txt
new file mode 100644
index 0000000..4101aa6
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-lpc2k.txt
@@ -0,0 +1,33 @@
+NXP I2C controller for LPC2xxx/178x/18xx/43xx
+
+Required properties:
+ - compatible: must be "nxp,lpc1788-i2c"
+ - reg: physical address and length of the device registers
+ - interrupts: a single interrupt specifier
+ - clocks: clock for the device
+ - #address-cells: should be <1>
+ - #size-cells: should be <0>
+
+Optional properties:
+- clock-frequency: the desired I2C bus clock frequency in Hz; in
+  absence of this property the default value is used (100 kHz).
+
+Example:
+i2c0: i2c at 400a1000 {
+	compatible = "nxp,lpc1788-i2c";
+	reg = <0x400a1000 0x1000>;
+	interrupts = <18>;
+	clocks = <&ccu1 CLK_APB1_I2C0>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+};
+
+&i2c0 {
+	clock-frequency = <400000>;
+
+	lm75 at 48 {
+		compatible = "nxp,lm75";
+		reg = <0x48>;
+	};
+};
+
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt
new file mode 100644
index 0000000..688783f
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt
@@ -0,0 +1,74 @@
+Register-based I2C Bus Mux
+
+This binding describes an I2C bus multiplexer that uses a single register
+to route the I2C signals.
+
+Required properties:
+- compatible: i2c-mux-reg
+- i2c-parent: The phandle of the I2C bus that this multiplexer's master-side
+  port is connected to.
+* Standard I2C mux properties. See mux.txt in this directory.
+* I2C child bus nodes. See mux.txt in this directory.
+
+Optional properties:
+- reg: this pair of <offset size> specifies the register to control the mux.
+  The <offset size> depends on its parent node. It can be any memory-mapped
+  address. The size must be either 1, 2, or 4 bytes. If reg is omitted, the
+  resource of this device will be used.
+- little-endian: The existence indicates the register is in little endian.
+- big-endian: The existence indicates the register is in big endian.
+  If both little-endian and big-endian are omitted, the endianness of the
+  CPU will be used.
+- write-only: The existence indicates the register is write-only.
+- idle-state: value to set the muxer to when idle. When no value is
+  given, it defaults to the last value used.
+
+Whenever an access is made to a device on a child bus, the value set
+in the revelant node's reg property will be output to the register.
+
+If an idle state is defined, using the idle-state (optional) property,
+whenever an access is not being made to a device on a child bus, the
+register will be set according to the idle value.
+
+If an idle state is not defined, the most recently used value will be
+left programmed into the register.
+
+Example of a mux on PCIe card, the host is a powerpc SoC (big endian):
+
+	i2c-mux {
+		/* the <offset size> depends on the address translation
+		 * of the parent device. If omitted, device resource
+		 * will be used instead. The size is to determine
+		 * whether iowrite32, iowrite16, or iowrite8 will be used.
+		 */
+		reg = <0x6028 0x4>;
+		little-endian;		/* little endian register on PCIe */
+		compatible = "i2c-mux-reg";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		i2c-parent = <&i2c1>;
+		i2c at 0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			si5338: clock-generator at 70 {
+				compatible = "silabs,si5338";
+				reg = <0x70>;
+				/* other stuff */
+			};
+		};
+
+		i2c at 1 {
+			/* data is written using iowrite32 */
+			reg = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			si5338: clock-generator at 70 {
+				compatible = "silabs,si5338";
+				reg = <0x70>;
+				/* other stuff */
+			};
+		};
+	};
diff --git a/Documentation/devicetree/bindings/i2c/i2c.txt b/Documentation/devicetree/bindings/i2c/i2c.txt
new file mode 100644
index 0000000..8a99150
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c.txt
@@ -0,0 +1,45 @@
+Generic device tree bindings for I2C busses
+===========================================
+
+This document describes generic bindings which can be used to describe I2C
+busses in a device tree.
+
+Required properties
+-------------------
+
+- #address-cells  - should be <1>. Read more about addresses below.
+- #size-cells     - should be <0>.
+- compatible      - name of I2C bus controller following generic names
+		    recommended practice.
+
+For other required properties e.g. to describe register sets,
+clocks, etc. check the binding documentation of the specific driver.
+
+The cells properties above define that an address of children of an I2C bus
+are described by a single value. This is usually a 7 bit address. However,
+flags can be attached to the address. I2C_TEN_BIT_ADDRESS is used to mark a 10
+bit address. It is needed to avoid the ambiguity between e.g. a 7 bit address
+of 0x50 and a 10 bit address of 0x050 which, in theory, can be on the same bus.
+Another flag is I2C_OWN_SLAVE_ADDRESS to mark addresses on which we listen to
+be devices ourselves.
+
+Optional properties
+-------------------
+
+These properties may not be supported by all drivers. However, if a driver
+wants to support one of the below features, it should adapt the bindings below.
+
+- clock-frequency	- frequency of bus clock in Hz.
+- wakeup-source		- device can be used as a wakeup source.
+
+- interrupts		- interrupts used by the device.
+- interrupt-names	- "irq" and "wakeup" names are recognized by I2C core,
+			  other names are left to individual drivers.
+
+Binding may contain optional "interrupts" property, describing interrupts
+used by the device. I2C core will assign "irq" interrupt (or the very first
+interrupt if not using interrupt names) as primary interrupt for the slave.
+
+Also, if device is marked as a wakeup source, I2C core will set up "wakeup"
+interrupt for the device. If "wakeup" interrupt name is not present in the
+binding, then primary interrupt will be used as wakeup interrupt.
diff --git a/Documentation/devicetree/bindings/i2c/ina209.txt b/Documentation/devicetree/bindings/i2c/ina209.txt
deleted file mode 100644
index 9dd2bee..0000000
--- a/Documentation/devicetree/bindings/i2c/ina209.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ina209 properties
-
-Required properties:
-- compatible: Must be "ti,ina209"
-- reg: I2C address
-
-Optional properties:
-
-- shunt-resistor
-	Shunt resistor value in micro-Ohm
-
-Example:
-
-temp-sensor at 4c {
-	compatible = "ti,ina209";
-	reg = <0x4c>;
-	shunt-resistor = <5000>;
-};
diff --git a/Documentation/devicetree/bindings/i2c/ina2xx.txt b/Documentation/devicetree/bindings/i2c/ina2xx.txt
deleted file mode 100644



More information about the unionfs-cvs mailing list