From 72114d93e1f5fd108346b6ecec48ccaeb190e856 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Sat, 15 Dec 2012 01:35:39 -0700 Subject: [PATCH] --- yaml --- r: 347377 b: refs/heads/master c: ba68c7eff599705b5fe3b42895dd7d2757cb368a h: refs/heads/master i: 347375: bdc5d680a1a1e72766f708ab80bfdcc71c95c55f v: v3 --- [refs] | 2 +- trunk/Documentation/DMA-attributes.txt | 9 - trunk/Documentation/DocBook/drm.tmpl | 39 +- trunk/Documentation/arm/OMAP/DSS | 10 +- .../devicetree/bindings/crypto/fsl-sec4.txt | 5 +- .../bindings/gpu/nvidia,tegra20-host1x.txt | 191 - .../devicetree/bindings/mfd/stmpe.txt | 28 - .../bindings/regulator/tps65217.txt | 4 - .../devicetree/bindings/video/exynos_dp.txt | 80 - .../devicetree/bindings/video/ssd1307fb.txt | 24 - trunk/Documentation/filesystems/ext4.txt | 9 +- trunk/Documentation/i2c/smbus-protocol | 40 +- trunk/Documentation/kernel-parameters.txt | 3 - trunk/Documentation/kref.txt | 88 - trunk/Documentation/prctl/seccomp_filter.txt | 74 +- trunk/Documentation/security/keys.txt | 17 - trunk/MAINTAINERS | 17 +- trunk/arch/arm/boot/dts/Makefile | 4 +- trunk/arch/arm/boot/dts/sun4i-cubieboard.dts | 4 +- trunk/arch/arm/boot/dts/sun5i-olinuxino.dts | 4 +- trunk/arch/arm/mach-davinci/board-da850-evm.c | 1 - trunk/arch/arm/mach-davinci/da830.c | 2 +- trunk/arch/arm/mach-davinci/da850.c | 2 +- trunk/arch/arm/mach-davinci/devices-da8xx.c | 22 +- trunk/arch/arm/mach-davinci/pm_domain.c | 1 - trunk/arch/arm/mach-exynos/common.h | 2 +- trunk/arch/arm/mach-omap2/board-rx51-video.c | 14 + trunk/arch/arm/mach-omap2/board-rx51.c | 3 + trunk/arch/arm/mach-omap2/cclock44xx_data.c | 8 +- trunk/arch/arm/mach-omap2/display.c | 15 +- trunk/arch/arm/mach-shmobile/board-ag5evm.c | 198 +- trunk/arch/arm/mach-shmobile/board-ap4evb.c | 4 +- trunk/arch/arm/mach-shmobile/board-mackerel.c | 6 + trunk/arch/arm/mach-tegra/common.c | 2 +- trunk/arch/arm/mach-tegra/tegra30_clocks.c | 4 +- trunk/arch/arm/mach-u300/core.c | 34 + trunk/arch/arm/mach-ux500/devices-db8500.h | 1 - trunk/arch/arm/mm/dma-mapping.c | 41 +- trunk/arch/arm/plat-omap/fb.c | 5 +- trunk/arch/arm/plat-omap/include/plat/vram.h | 43 + trunk/arch/m68k/Kconfig.cpu | 3 +- trunk/arch/m68k/Makefile | 6 +- trunk/arch/m68k/include/asm/m5249sim.h | 269 + trunk/arch/m68k/include/asm/m525xsim.h | 116 +- trunk/arch/m68k/include/asm/mcfclk.h | 9 +- trunk/arch/m68k/include/asm/mcfsim.h | 5 +- trunk/arch/m68k/include/asm/page_no.h | 2 +- trunk/arch/m68k/lib/memcpy.c | 3 +- trunk/arch/m68k/platform/68000/Makefile | 18 - trunk/arch/m68k/platform/68000/head.S | 240 - trunk/arch/m68k/platform/68328/Makefile | 21 + .../m68k/platform/{68000 => 68328}/bootlogo.h | 0 .../{68000/m68328.c => 68328/config.c} | 2 +- .../m68k/platform/{68000 => 68328}/entry.S | 0 trunk/arch/m68k/platform/68328/head-de2.S | 128 + trunk/arch/m68k/platform/68328/head-pilot.S | 207 + trunk/arch/m68k/platform/68328/head-ram.S | 141 + trunk/arch/m68k/platform/68328/head-rom.S | 105 + .../m68k/platform/{68000 => 68328}/ints.c | 2 +- .../m68k/platform/{68000 => 68328}/romvec.S | 2 +- .../m68k/platform/{68000 => 68328}/timers.c | 2 +- trunk/arch/m68k/platform/68EZ328/Makefile | 5 + .../{68000/m68EZ328.c => 68EZ328/config.c} | 2 +- trunk/arch/m68k/platform/68VZ328/Makefile | 5 + .../bootlogo-vz.h => 68VZ328/bootlogo.h} | 0 .../{68000/m68VZ328.c => 68VZ328/config.c} | 4 +- trunk/arch/m68k/platform/coldfire/clk.c | 100 +- trunk/arch/m68k/platform/coldfire/intc-5249.c | 8 +- trunk/arch/m68k/platform/coldfire/m5206.c | 20 - trunk/arch/m68k/platform/coldfire/m523x.c | 28 - trunk/arch/m68k/platform/coldfire/m5249.c | 28 +- trunk/arch/m68k/platform/coldfire/m525x.c | 20 - trunk/arch/m68k/platform/coldfire/m5272.c | 26 - trunk/arch/m68k/platform/coldfire/m527x.c | 30 - trunk/arch/m68k/platform/coldfire/m528x.c | 28 - trunk/arch/m68k/platform/coldfire/m5307.c | 20 - trunk/arch/m68k/platform/coldfire/m5407.c | 20 - trunk/arch/m68k/platform/coldfire/m54xx.c | 26 - trunk/arch/microblaze/include/asm/Kbuild | 2 + .../include/{uapi => }/asm/auxvec.h | 0 .../include/{uapi => }/asm/bitsperlong.h | 0 .../include/{uapi => }/asm/byteorder.h | 0 trunk/arch/microblaze/include/asm/elf.h | 97 +- trunk/arch/microblaze/include/asm/entry.h | 2 - .../microblaze/include/{uapi => }/asm/errno.h | 0 .../microblaze/include/{uapi => }/asm/fcntl.h | 0 .../microblaze/include/{uapi => }/asm/ioctl.h | 0 .../include/{uapi => }/asm/ioctls.h | 0 .../include/{uapi => }/asm/ipcbuf.h | 0 .../include/{uapi => }/asm/kvm_para.h | 0 .../microblaze/include/{uapi => }/asm/mman.h | 0 .../include/{uapi => }/asm/msgbuf.h | 0 .../microblaze/include/{uapi => }/asm/param.h | 0 .../microblaze/include/{uapi => }/asm/poll.h | 0 .../include/{uapi => }/asm/posix_types.h | 0 trunk/arch/microblaze/include/asm/ptrace.h | 62 +- .../include/{uapi => }/asm/resource.h | 0 .../include/{uapi => }/asm/sembuf.h | 0 trunk/arch/microblaze/include/asm/setup.h | 6 +- .../include/{uapi => }/asm/shmbuf.h | 0 .../include/{uapi => }/asm/sigcontext.h | 0 .../include/{uapi => }/asm/siginfo.h | 0 .../include/{uapi => }/asm/signal.h | 0 .../include/{uapi => }/asm/socket.h | 0 .../include/{uapi => }/asm/sockios.h | 0 .../microblaze/include/{uapi => }/asm/stat.h | 0 .../include/{uapi => }/asm/statfs.h | 0 .../microblaze/include/{uapi => }/asm/swab.h | 0 .../include/{uapi => }/asm/termbits.h | 0 .../include/{uapi => }/asm/termios.h | 0 .../microblaze/include/{uapi => }/asm/types.h | 0 trunk/arch/microblaze/include/asm/uaccess.h | 3 +- trunk/arch/microblaze/include/asm/unistd.h | 390 +- trunk/arch/microblaze/include/uapi/asm/Kbuild | 32 - trunk/arch/microblaze/include/uapi/asm/elf.h | 121 - .../arch/microblaze/include/uapi/asm/ptrace.h | 72 - .../arch/microblaze/include/uapi/asm/setup.h | 19 - .../arch/microblaze/include/uapi/asm/unistd.h | 401 -- trunk/arch/microblaze/kernel/entry-nommu.S | 1 + trunk/arch/microblaze/kernel/intc.c | 5 +- trunk/arch/microblaze/kernel/process.c | 1 + trunk/arch/microblaze/kernel/prom.c | 4 +- trunk/arch/microblaze/kernel/signal.c | 2 +- trunk/arch/microblaze/kernel/syscall_table.S | 1 - trunk/arch/microblaze/lib/libgcc.h | 7 - trunk/arch/microblaze/lib/muldi3.c | 28 +- trunk/arch/sh/boards/mach-ap325rxa/setup.c | 6 + trunk/arch/sh/boards/mach-ecovec24/setup.c | 6 + trunk/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | 16 +- trunk/arch/sh/boards/mach-kfr2r09/setup.c | 7 +- .../sh/include/mach-kfr2r09/mach/kfr2r09.h | 6 +- trunk/arch/sh/mm/Kconfig | 1 - trunk/arch/x86/Kconfig | 2 - trunk/arch/x86/crypto/Makefile | 5 - .../x86/crypto/camellia-aesni-avx-asm_64.S | 1102 --- .../arch/x86/crypto/camellia_aesni_avx_glue.c | 558 -- trunk/arch/x86/crypto/camellia_glue.c | 92 +- .../arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 348 +- trunk/arch/x86/crypto/cast5_avx_glue.c | 79 +- .../arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 206 +- trunk/arch/x86/crypto/cast6_avx_glue.c | 77 +- .../{crc32c-intel_glue.c => crc32c-intel.c} | 81 - .../arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 460 -- trunk/arch/x86/crypto/glue_helper-asm-avx.S | 91 - trunk/arch/x86/crypto/glue_helper.c | 12 +- .../x86/crypto/serpent-avx-x86_64-asm_64.S | 166 +- trunk/arch/x86/crypto/serpent_avx_glue.c | 49 +- trunk/arch/x86/crypto/serpent_sse2_glue.c | 12 +- .../x86/crypto/twofish-avx-x86_64-asm_64.S | 208 +- trunk/arch/x86/crypto/twofish_avx_glue.c | 73 +- trunk/arch/x86/crypto/twofish_glue_3way.c | 20 +- trunk/arch/x86/include/asm/crypto/camellia.h | 82 - .../arch/x86/include/asm/crypto/glue_helper.h | 28 +- .../arch/x86/include/asm/crypto/serpent-avx.h | 27 +- trunk/arch/x86/include/asm/crypto/twofish.h | 4 +- trunk/arch/x86/include/asm/efi.h | 28 +- trunk/arch/x86/include/asm/pgtable.h | 17 +- trunk/arch/x86/include/asm/pgtable_types.h | 20 - trunk/arch/x86/kernel/tboot.c | 78 +- trunk/arch/x86/kernel/vsyscall_64.c | 110 +- trunk/arch/x86/mm/init_64.c | 9 +- trunk/arch/x86/mm/ioremap.c | 105 + trunk/arch/x86/mm/pageattr.c | 10 +- trunk/arch/x86/mm/pgtable.c | 8 +- trunk/arch/x86/platform/efi/efi.c | 30 +- trunk/arch/x86/platform/efi/efi_64.c | 15 + trunk/arch/x86/realmode/init.c | 17 +- trunk/block/blk-cgroup.c | 2 +- trunk/block/blk-core.c | 127 +- trunk/block/blk-exec.c | 4 +- trunk/block/blk-lib.c | 26 +- trunk/block/blk-settings.c | 6 +- trunk/block/blk-sysfs.c | 4 +- trunk/block/blk-throttle.c | 2 +- trunk/block/blk.h | 4 +- trunk/block/bsg-lib.c | 13 + trunk/block/cfq-iosched.c | 3 +- trunk/block/deadline-iosched.c | 2 +- trunk/block/elevator.c | 16 +- trunk/block/genhd.c | 2 +- trunk/block/partitions/Kconfig | 4 +- trunk/crypto/Kconfig | 42 - trunk/crypto/Makefile | 1 - trunk/crypto/cast5_generic.c | 277 +- trunk/crypto/cast6_generic.c | 280 +- trunk/crypto/cast_common.c | 290 - trunk/crypto/tcrypt.c | 29 - trunk/crypto/testmgr.c | 369 +- trunk/crypto/testmgr.h | 5906 +---------------- trunk/crypto/vmac.c | 47 +- trunk/drivers/amba/tegra-ahb.c | 2 - trunk/drivers/ata/ahci_platform.c | 46 +- trunk/drivers/ata/ata_piix.c | 444 +- trunk/drivers/ata/libahci.c | 2 +- trunk/drivers/ata/libata-acpi.c | 4 - trunk/drivers/ata/libata-core.c | 31 +- trunk/drivers/ata/libata-eh.c | 1 - trunk/drivers/ata/libata-scsi.c | 6 +- trunk/drivers/ata/pata_arasan_cf.c | 7 +- trunk/drivers/ata/pata_cmd64x.c | 6 +- trunk/drivers/ata/pata_cs5536.c | 32 +- trunk/drivers/ata/pata_ep93xx.c | 6 +- trunk/drivers/ata/pata_imx.c | 2 +- trunk/drivers/ata/pata_ixp4xx_cf.c | 11 +- trunk/drivers/ata/pata_mpc52xx.c | 17 +- trunk/drivers/ata/pata_of_platform.c | 8 +- trunk/drivers/ata/pata_palmld.c | 4 +- trunk/drivers/ata/pata_platform.c | 24 +- trunk/drivers/ata/pata_rdc.c | 3 + trunk/drivers/ata/sata_dwc_460ex.c | 1 - trunk/drivers/ata/sata_highbank.c | 14 +- trunk/drivers/ata/sata_inic162x.c | 2 + trunk/drivers/ata/sata_promise.c | 15 +- trunk/drivers/ata/sata_sil24.c | 4 + trunk/drivers/ata/sata_sx4.c | 14 +- trunk/drivers/bus/Kconfig | 1 - trunk/drivers/char/agp/intel-agp.h | 91 + trunk/drivers/char/agp/intel-gtt.c | 320 +- trunk/drivers/char/tpm/tpm_ibmvtpm.c | 81 +- trunk/drivers/char/tpm/tpm_ibmvtpm.h | 5 +- trunk/drivers/crypto/Kconfig | 1 - trunk/drivers/crypto/picoxcell_crypto.c | 1 - trunk/drivers/crypto/s5p-sss.c | 2 +- trunk/drivers/crypto/talitos.c | 3 +- trunk/drivers/crypto/tegra-aes.c | 10 +- trunk/drivers/extcon/extcon-arizona.c | 1 - trunk/drivers/extcon/extcon-class.c | 2 +- trunk/drivers/extcon/extcon-max77693.c | 36 +- trunk/drivers/extcon/extcon-max8997.c | 28 +- trunk/drivers/gpio/Kconfig | 13 - trunk/drivers/gpio/Makefile | 1 - trunk/drivers/gpio/gpio-da9052.c | 6 +- trunk/drivers/gpio/gpio-tps6586x.c | 9 - trunk/drivers/gpio/gpio-twl4030.c | 12 +- trunk/drivers/gpio/gpio-viperboard.c | 517 -- trunk/drivers/gpu/drm/Kconfig | 2 - trunk/drivers/gpu/drm/Makefile | 6 +- trunk/drivers/gpu/drm/ast/ast_ttm.c | 12 +- trunk/drivers/gpu/drm/cirrus/cirrus_drv.c | 13 +- trunk/drivers/gpu/drm/cirrus/cirrus_ttm.c | 12 +- trunk/drivers/gpu/drm/drm_crtc.c | 63 +- trunk/drivers/gpu/drm/drm_crtc_helper.c | 161 +- .../{drm_dp_helper.c => drm_dp_i2c_helper.c} | 146 +- trunk/drivers/gpu/drm/drm_edid.c | 48 +- trunk/drivers/gpu/drm/drm_fb_helper.c | 76 +- trunk/drivers/gpu/drm/drm_hashtab.c | 38 +- trunk/drivers/gpu/drm/drm_ioctl.c | 3 - trunk/drivers/gpu/drm/drm_irq.c | 120 +- trunk/drivers/gpu/drm/drm_modes.c | 8 +- trunk/drivers/gpu/drm/drm_pci.c | 2 +- trunk/drivers/gpu/drm/drm_stub.c | 37 +- trunk/drivers/gpu/drm/drm_sysfs.c | 6 +- trunk/drivers/gpu/drm/exynos/Kconfig | 30 - trunk/drivers/gpu/drm/exynos/Makefile | 5 - trunk/drivers/gpu/drm/exynos/exynos_ddc.c | 4 +- trunk/drivers/gpu/drm/exynos/exynos_drm_buf.c | 115 +- trunk/drivers/gpu/drm/exynos/exynos_drm_buf.h | 4 +- .../drivers/gpu/drm/exynos/exynos_drm_crtc.c | 5 - .../gpu/drm/exynos/exynos_drm_dmabuf.c | 150 +- trunk/drivers/gpu/drm/exynos/exynos_drm_drv.c | 117 +- trunk/drivers/gpu/drm/exynos/exynos_drm_drv.h | 43 +- .../gpu/drm/exynos/exynos_drm_encoder.c | 36 +- .../gpu/drm/exynos/exynos_drm_encoder.h | 1 - trunk/drivers/gpu/drm/exynos/exynos_drm_fb.c | 94 +- .../drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 74 +- .../drivers/gpu/drm/exynos/exynos_drm_fimc.c | 2001 ------ .../drivers/gpu/drm/exynos/exynos_drm_fimc.h | 37 - .../drivers/gpu/drm/exynos/exynos_drm_fimd.c | 200 +- trunk/drivers/gpu/drm/exynos/exynos_drm_g2d.c | 495 +- trunk/drivers/gpu/drm/exynos/exynos_drm_gem.c | 435 +- trunk/drivers/gpu/drm/exynos/exynos_drm_gem.h | 58 +- trunk/drivers/gpu/drm/exynos/exynos_drm_gsc.c | 1870 ------ trunk/drivers/gpu/drm/exynos/exynos_drm_gsc.h | 38 - .../drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 59 +- .../drivers/gpu/drm/exynos/exynos_drm_hdmi.h | 3 +- .../drivers/gpu/drm/exynos/exynos_drm_iommu.c | 150 - .../drivers/gpu/drm/exynos/exynos_drm_iommu.h | 85 - trunk/drivers/gpu/drm/exynos/exynos_drm_ipp.c | 2060 ------ trunk/drivers/gpu/drm/exynos/exynos_drm_ipp.h | 266 - .../drivers/gpu/drm/exynos/exynos_drm_plane.c | 12 +- .../gpu/drm/exynos/exynos_drm_rotator.c | 855 --- .../gpu/drm/exynos/exynos_drm_rotator.h | 33 - .../drivers/gpu/drm/exynos/exynos_drm_vidi.c | 26 +- trunk/drivers/gpu/drm/exynos/exynos_hdmi.c | 324 +- trunk/drivers/gpu/drm/exynos/exynos_hdmiphy.c | 4 +- trunk/drivers/gpu/drm/exynos/exynos_mixer.c | 376 +- trunk/drivers/gpu/drm/exynos/regs-fimc.h | 669 -- trunk/drivers/gpu/drm/exynos/regs-gsc.h | 284 - trunk/drivers/gpu/drm/exynos/regs-hdmi.h | 22 +- trunk/drivers/gpu/drm/exynos/regs-rotator.h | 73 - trunk/drivers/gpu/drm/gma500/cdv_device.c | 4 +- trunk/drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- trunk/drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 6 +- trunk/drivers/gpu/drm/gma500/cdv_intel_lvds.c | 10 +- .../drivers/gpu/drm/gma500/mdfld_dsi_output.c | 12 +- .../gpu/drm/gma500/mdfld_intel_display.c | 2 +- trunk/drivers/gpu/drm/gma500/oaktrail.h | 6 - trunk/drivers/gpu/drm/gma500/oaktrail_crtc.c | 10 +- .../drivers/gpu/drm/gma500/oaktrail_device.c | 2 +- trunk/drivers/gpu/drm/gma500/oaktrail_hdmi.c | 365 +- trunk/drivers/gpu/drm/gma500/oaktrail_lvds.c | 8 +- trunk/drivers/gpu/drm/gma500/psb_intel_lvds.c | 10 +- trunk/drivers/gpu/drm/gma500/psb_intel_sdvo.c | 24 +- trunk/drivers/gpu/drm/i2c/ch7006_drv.c | 20 +- trunk/drivers/gpu/drm/i915/i915_debugfs.c | 66 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 95 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 136 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 472 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 292 +- trunk/drivers/gpu/drm/i915/i915_gem_context.c | 5 +- .../gpu/drm/i915/i915_gem_execbuffer.c | 64 +- trunk/drivers/gpu/drm/i915/i915_gem_gtt.c | 420 +- trunk/drivers/gpu/drm/i915/i915_irq.c | 86 +- trunk/drivers/gpu/drm/i915/i915_reg.h | 308 +- trunk/drivers/gpu/drm/i915/i915_suspend.c | 763 ++- trunk/drivers/gpu/drm/i915/i915_sysfs.c | 45 +- trunk/drivers/gpu/drm/i915/i915_trace.h | 10 +- trunk/drivers/gpu/drm/i915/intel_bios.c | 3 +- trunk/drivers/gpu/drm/i915/intel_crt.c | 62 +- trunk/drivers/gpu/drm/i915/intel_ddi.c | 1091 +-- trunk/drivers/gpu/drm/i915/intel_display.c | 2007 ++---- trunk/drivers/gpu/drm/i915/intel_dp.c | 961 ++- trunk/drivers/gpu/drm/i915/intel_drv.h | 123 +- trunk/drivers/gpu/drm/i915/intel_hdmi.c | 135 +- trunk/drivers/gpu/drm/i915/intel_i2c.c | 9 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 227 +- trunk/drivers/gpu/drm/i915/intel_modes.c | 11 +- trunk/drivers/gpu/drm/i915/intel_opregion.c | 2 - trunk/drivers/gpu/drm/i915/intel_panel.c | 90 +- trunk/drivers/gpu/drm/i915/intel_pm.c | 511 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 250 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.h | 36 +- trunk/drivers/gpu/drm/i915/intel_sdvo.c | 128 +- trunk/drivers/gpu/drm/i915/intel_sprite.c | 101 +- trunk/drivers/gpu/drm/i915/intel_tv.c | 21 +- trunk/drivers/gpu/drm/mgag200/mgag200_main.c | 4 +- trunk/drivers/gpu/drm/mgag200/mgag200_ttm.c | 12 +- trunk/drivers/gpu/drm/nouveau/Makefile | 38 +- .../gpu/drm/nouveau/core/core/engctx.c | 15 - .../gpu/drm/nouveau/core/core/falcon.c | 247 - .../gpu/drm/nouveau/core/core/gpuobj.c | 4 +- trunk/drivers/gpu/drm/nouveau/core/core/mm.c | 17 +- .../gpu/drm/nouveau/core/engine/bsp/nv84.c | 108 +- .../gpu/drm/nouveau/core/engine/bsp/nvc0.c | 110 - .../gpu/drm/nouveau/core/engine/bsp/nve0.c | 110 - .../gpu/drm/nouveau/core/engine/copy/nva3.c | 124 +- .../gpu/drm/nouveau/core/engine/copy/nvc0.c | 167 +- .../gpu/drm/nouveau/core/engine/copy/nve0.c | 54 +- .../gpu/drm/nouveau/core/engine/crypt/nv84.c | 46 +- .../gpu/drm/nouveau/core/engine/crypt/nv98.c | 83 +- .../drm/nouveau/core/engine/disp/dacnv50.c | 88 - .../drm/nouveau/core/engine/disp/hdanva3.c | 48 - .../drm/nouveau/core/engine/disp/hdanvd0.c | 53 - .../drm/nouveau/core/engine/disp/hdminv84.c | 66 - .../drm/nouveau/core/engine/disp/hdminva3.c | 66 - .../drm/nouveau/core/engine/disp/hdminvd0.c | 62 - .../gpu/drm/nouveau/core/engine/disp/nv50.c | 1144 +--- .../gpu/drm/nouveau/core/engine/disp/nv50.h | 142 - .../gpu/drm/nouveau/core/engine/disp/nv84.c | 98 - .../gpu/drm/nouveau/core/engine/disp/nv94.c | 109 - .../gpu/drm/nouveau/core/engine/disp/nva0.c | 88 - .../gpu/drm/nouveau/core/engine/disp/nva3.c | 111 - .../gpu/drm/nouveau/core/engine/disp/nvd0.c | 884 +-- .../gpu/drm/nouveau/core/engine/disp/nve0.c | 94 - .../drm/nouveau/core/engine/disp/sornv50.c | 112 - .../drm/nouveau/core/engine/disp/sornv94.c | 190 - .../drm/nouveau/core/engine/disp/sornvd0.c | 126 - .../gpu/drm/nouveau/core/engine/dmaobj/base.c | 71 +- .../gpu/drm/nouveau/core/engine/dmaobj/nv04.c | 68 +- .../gpu/drm/nouveau/core/engine/dmaobj/nv50.c | 126 +- .../gpu/drm/nouveau/core/engine/dmaobj/nvc0.c | 104 +- .../gpu/drm/nouveau/core/engine/dmaobj/nvd0.c | 122 - .../gpu/drm/nouveau/core/engine/fifo/base.c | 19 +- .../gpu/drm/nouveau/core/engine/fifo/nv04.c | 17 +- .../gpu/drm/nouveau/core/engine/fifo/nv10.c | 6 +- .../gpu/drm/nouveau/core/engine/fifo/nv17.c | 8 +- .../gpu/drm/nouveau/core/engine/fifo/nv40.c | 8 +- .../gpu/drm/nouveau/core/engine/fifo/nv50.c | 36 +- .../gpu/drm/nouveau/core/engine/fifo/nv84.c | 60 +- .../gpu/drm/nouveau/core/engine/fifo/nvc0.c | 26 +- .../gpu/drm/nouveau/core/engine/fifo/nve0.c | 21 +- .../gpu/drm/nouveau/core/engine/graph/nv04.c | 184 +- .../gpu/drm/nouveau/core/engine/graph/nv10.c | 10 +- .../gpu/drm/nouveau/core/engine/graph/nv20.c | 6 +- .../gpu/drm/nouveau/core/engine/graph/nv40.c | 38 +- .../gpu/drm/nouveau/core/engine/graph/nv50.c | 83 +- .../gpu/drm/nouveau/core/engine/graph/nvc0.c | 2 +- .../gpu/drm/nouveau/core/engine/graph/regs.h | 5 - .../gpu/drm/nouveau/core/engine/mpeg/nv31.c | 6 +- .../gpu/drm/nouveau/core/engine/mpeg/nv50.c | 1 + .../gpu/drm/nouveau/core/engine/ppp/nv98.c | 107 +- .../gpu/drm/nouveau/core/engine/ppp/nvc0.c | 110 - .../drm/nouveau/core/engine/software/nv04.c | 4 +- .../drm/nouveau/core/engine/software/nv10.c | 2 +- .../drm/nouveau/core/engine/software/nv50.c | 10 +- .../drm/nouveau/core/engine/software/nvc0.c | 10 +- .../gpu/drm/nouveau/core/engine/vp/nv84.c | 108 +- .../gpu/drm/nouveau/core/engine/vp/nvc0.c | 110 - .../gpu/drm/nouveau/core/engine/vp/nve0.c | 110 - .../gpu/drm/nouveau/core/include/core/class.h | 225 - .../drm/nouveau/core/include/core/engctx.h | 3 - .../drm/nouveau/core/include/core/falcon.h | 81 - .../drm/nouveau/core/include/core/gpuobj.h | 4 +- .../gpu/drm/nouveau/core/include/core/mm.h | 6 - .../drm/nouveau/core/include/core/object.h | 41 +- .../drm/nouveau/core/include/core/parent.h | 2 +- .../gpu/drm/nouveau/core/include/engine/bsp.h | 41 +- .../drm/nouveau/core/include/engine/copy.h | 39 +- .../drm/nouveau/core/include/engine/crypt.h | 39 + .../drm/nouveau/core/include/engine/disp.h | 5 - .../drm/nouveau/core/include/engine/dmaobj.h | 29 +- .../drm/nouveau/core/include/engine/fifo.h | 6 +- .../gpu/drm/nouveau/core/include/engine/ppp.h | 40 +- .../gpu/drm/nouveau/core/include/engine/vp.h | 41 +- .../nouveau/core/include/subdev/bios/dcb.h | 34 +- .../nouveau/core/include/subdev/bios/disp.h | 48 - .../drm/nouveau/core/include/subdev/bios/dp.h | 32 +- .../gpu/drm/nouveau/core/include/subdev/fb.h | 43 +- .../gpu/drm/nouveau/core/subdev/bar/base.c | 4 +- .../gpu/drm/nouveau/core/subdev/bios/base.c | 32 +- .../gpu/drm/nouveau/core/subdev/bios/dcb.c | 63 - .../gpu/drm/nouveau/core/subdev/bios/disp.c | 178 - .../gpu/drm/nouveau/core/subdev/bios/dp.c | 182 +- .../gpu/drm/nouveau/core/subdev/bios/gpio.c | 4 +- .../gpu/drm/nouveau/core/subdev/bios/init.c | 13 +- .../gpu/drm/nouveau/core/subdev/device/base.c | 28 +- .../gpu/drm/nouveau/core/subdev/device/nv10.c | 4 +- .../gpu/drm/nouveau/core/subdev/device/nv20.c | 6 +- .../gpu/drm/nouveau/core/subdev/device/nv30.c | 6 +- .../gpu/drm/nouveau/core/subdev/device/nv40.c | 28 +- .../gpu/drm/nouveau/core/subdev/device/nv50.c | 26 +- .../gpu/drm/nouveau/core/subdev/device/nvc0.c | 64 +- .../gpu/drm/nouveau/core/subdev/device/nve0.c | 17 +- .../drm/nouveau/core/subdev/devinit/nv50.c | 34 +- .../gpu/drm/nouveau/core/subdev/fb/base.c | 92 +- .../gpu/drm/nouveau/core/subdev/fb/nv04.c | 62 +- .../gpu/drm/nouveau/core/subdev/fb/nv10.c | 52 +- .../gpu/drm/nouveau/core/subdev/fb/nv1a.c | 89 - .../gpu/drm/nouveau/core/subdev/fb/nv20.c | 86 +- .../gpu/drm/nouveau/core/subdev/fb/nv25.c | 81 - .../gpu/drm/nouveau/core/subdev/fb/nv30.c | 51 +- .../gpu/drm/nouveau/core/subdev/fb/nv35.c | 82 - .../gpu/drm/nouveau/core/subdev/fb/nv36.c | 82 - .../gpu/drm/nouveau/core/subdev/fb/nv40.c | 131 +- .../gpu/drm/nouveau/core/subdev/fb/nv41.c | 106 - .../gpu/drm/nouveau/core/subdev/fb/nv44.c | 114 - .../gpu/drm/nouveau/core/subdev/fb/nv46.c | 79 - .../gpu/drm/nouveau/core/subdev/fb/nv47.c | 66 - .../gpu/drm/nouveau/core/subdev/fb/nv49.c | 84 - .../gpu/drm/nouveau/core/subdev/fb/nv4e.c | 72 - .../gpu/drm/nouveau/core/subdev/fb/nv50.c | 393 +- .../gpu/drm/nouveau/core/subdev/fb/nvc0.c | 126 +- .../gpu/drm/nouveau/core/subdev/i2c/aux.c | 2 +- .../drm/nouveau/core/subdev/instmem/nv04.c | 8 +- .../drm/nouveau/core/subdev/instmem/nv40.c | 4 +- .../drm/nouveau/core/subdev/instmem/nv50.c | 4 +- .../gpu/drm/nouveau/core/subdev/mc/base.c | 8 +- .../gpu/drm/nouveau/core/subdev/mc/nv50.c | 1 - .../gpu/drm/nouveau/core/subdev/mc/nv98.c | 1 - .../gpu/drm/nouveau/core/subdev/mc/nvc0.c | 1 - trunk/drivers/gpu/drm/nouveau/nouveau_abi16.c | 27 +- trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c | 30 +- trunk/drivers/gpu/drm/nouveau/nouveau_acpi.h | 4 - trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 235 +- trunk/drivers/gpu/drm/nouveau/nouveau_bios.h | 9 + trunk/drivers/gpu/drm/nouveau/nouveau_bo.c | 65 +- trunk/drivers/gpu/drm/nouveau/nouveau_bo.h | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_chan.c | 6 +- .../gpu/drm/nouveau/nouveau_connector.c | 25 +- .../gpu/drm/nouveau/nouveau_connector.h | 16 - trunk/drivers/gpu/drm/nouveau/nouveau_crtc.h | 10 + .../drivers/gpu/drm/nouveau/nouveau_display.c | 25 +- trunk/drivers/gpu/drm/nouveau/nouveau_dp.c | 141 +- trunk/drivers/gpu/drm/nouveau/nouveau_drm.c | 98 +- trunk/drivers/gpu/drm/nouveau/nouveau_drm.h | 4 +- .../drivers/gpu/drm/nouveau/nouveau_encoder.h | 7 +- trunk/drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_hdmi.c | 261 + trunk/drivers/gpu/drm/nouveau/nouveau_irq.c | 12 + trunk/drivers/gpu/drm/nouveau/nouveau_prime.c | 4 + trunk/drivers/gpu/drm/nouveau/nouveau_vga.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv04_crtc.c | 6 +- trunk/drivers/gpu/drm/nouveau/nv04_display.c | 5 + trunk/drivers/gpu/drm/nouveau/nv10_fence.c | 7 +- trunk/drivers/gpu/drm/nouveau/nv17_tv.c | 16 +- trunk/drivers/gpu/drm/nouveau/nv50_crtc.c | 764 +++ trunk/drivers/gpu/drm/nouveau/nv50_cursor.c | 136 + trunk/drivers/gpu/drm/nouveau/nv50_dac.c | 321 + trunk/drivers/gpu/drm/nouveau/nv50_display.c | 2561 ++----- trunk/drivers/gpu/drm/nouveau/nv50_display.h | 71 +- trunk/drivers/gpu/drm/nouveau/nv50_evo.c | 403 ++ trunk/drivers/gpu/drm/nouveau/nv50_evo.h | 120 + trunk/drivers/gpu/drm/nouveau/nv50_fence.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv50_pm.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_sor.c | 530 ++ trunk/drivers/gpu/drm/nouveau/nvc0_fence.c | 28 +- trunk/drivers/gpu/drm/nouveau/nvd0_display.c | 2141 ++++++ trunk/drivers/gpu/drm/radeon/atombios_crtc.c | 2 - trunk/drivers/gpu/drm/radeon/atombios_dp.c | 149 +- .../gpu/drm/radeon/atombios_encoders.c | 2 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 218 +- trunk/drivers/gpu/drm/radeon/evergreen_cs.c | 739 +-- trunk/drivers/gpu/drm/radeon/evergreend.h | 131 - trunk/drivers/gpu/drm/radeon/ni.c | 357 +- trunk/drivers/gpu/drm/radeon/nid.h | 86 - trunk/drivers/gpu/drm/radeon/r100.c | 23 +- trunk/drivers/gpu/drm/radeon/r600.c | 480 +- trunk/drivers/gpu/drm/radeon/r600_cp.c | 7 +- trunk/drivers/gpu/drm/radeon/r600_cs.c | 357 +- trunk/drivers/gpu/drm/radeon/r600_reg.h | 9 - trunk/drivers/gpu/drm/radeon/r600d.h | 86 +- trunk/drivers/gpu/drm/radeon/radeon.h | 38 +- trunk/drivers/gpu/drm/radeon/radeon_asic.c | 198 +- trunk/drivers/gpu/drm/radeon/radeon_asic.h | 34 - trunk/drivers/gpu/drm/radeon/radeon_combios.c | 6 +- .../gpu/drm/radeon/radeon_connectors.c | 62 +- trunk/drivers/gpu/drm/radeon/radeon_cp.c | 14 + trunk/drivers/gpu/drm/radeon/radeon_cs.c | 13 - trunk/drivers/gpu/drm/radeon/radeon_cursor.c | 17 +- trunk/drivers/gpu/drm/radeon/radeon_device.c | 1 - trunk/drivers/gpu/drm/radeon/radeon_display.c | 4 - trunk/drivers/gpu/drm/radeon/radeon_drv.c | 18 +- trunk/drivers/gpu/drm/radeon/radeon_drv.h | 1 + trunk/drivers/gpu/drm/radeon/radeon_fence.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_gart.c | 1 + trunk/drivers/gpu/drm/radeon/radeon_kms.c | 16 - trunk/drivers/gpu/drm/radeon/radeon_mode.h | 2 +- trunk/drivers/gpu/drm/radeon/radeon_object.c | 52 +- trunk/drivers/gpu/drm/radeon/radeon_object.h | 2 +- trunk/drivers/gpu/drm/radeon/radeon_test.c | 37 +- trunk/drivers/gpu/drm/radeon/radeon_ttm.c | 40 +- trunk/drivers/gpu/drm/radeon/rv515.c | 122 +- trunk/drivers/gpu/drm/radeon/rv770.c | 31 +- trunk/drivers/gpu/drm/radeon/rv770d.h | 71 - trunk/drivers/gpu/drm/radeon/si.c | 355 +- trunk/drivers/gpu/drm/radeon/sid.h | 119 - .../drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +- trunk/drivers/gpu/drm/tegra/Kconfig | 23 - trunk/drivers/gpu/drm/tegra/Makefile | 7 - trunk/drivers/gpu/drm/tegra/dc.c | 834 --- trunk/drivers/gpu/drm/tegra/dc.h | 388 -- trunk/drivers/gpu/drm/tegra/drm.c | 115 - trunk/drivers/gpu/drm/tegra/drm.h | 234 - trunk/drivers/gpu/drm/tegra/fb.c | 56 - trunk/drivers/gpu/drm/tegra/hdmi.c | 1334 ---- trunk/drivers/gpu/drm/tegra/hdmi.h | 575 -- trunk/drivers/gpu/drm/tegra/host1x.c | 325 - trunk/drivers/gpu/drm/tegra/output.c | 272 - trunk/drivers/gpu/drm/tegra/rgb.c | 228 - trunk/drivers/gpu/drm/ttm/ttm_bo.c | 321 +- trunk/drivers/gpu/drm/ttm/ttm_bo_util.c | 8 +- trunk/drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +- trunk/drivers/gpu/drm/ttm/ttm_execbuf_util.c | 10 +- trunk/drivers/gpu/drm/ttm/ttm_memory.c | 1 + trunk/drivers/gpu/drm/ttm/ttm_object.c | 51 +- trunk/drivers/gpu/drm/udl/udl_connector.c | 14 +- trunk/drivers/gpu/drm/vmwgfx/Makefile | 3 +- .../gpu/drm/vmwgfx/svga3d_surfacedefs.h | 909 --- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 23 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 274 - trunk/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 22 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 92 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 153 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 917 +-- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 7 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 21 +- .../drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2109 ++++-- .../gpu/drm/vmwgfx/vmwgfx_resource_priv.h | 84 - trunk/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 893 --- trunk/drivers/gpu/vga/vga_switcheroo.c | 6 + trunk/drivers/i2c/busses/Kconfig | 10 - trunk/drivers/i2c/busses/Makefile | 1 - trunk/drivers/i2c/busses/i2c-i801.c | 13 +- trunk/drivers/i2c/busses/i2c-piix4.c | 5 +- trunk/drivers/i2c/busses/i2c-viperboard.c | 480 -- trunk/drivers/iio/adc/Kconfig | 14 - trunk/drivers/iio/adc/Makefile | 3 +- trunk/drivers/iio/adc/ti_am335x_adc.c | 260 - trunk/drivers/iio/adc/viperboard_adc.c | 181 - trunk/drivers/infiniband/ulp/srpt/ib_srpt.c | 178 +- trunk/drivers/infiniband/ulp/srpt/ib_srpt.h | 1 + trunk/drivers/input/keyboard/Kconfig | 1 - trunk/drivers/input/misc/da9052_onkey.c | 22 +- trunk/drivers/input/touchscreen/Kconfig | 6 +- trunk/drivers/input/touchscreen/Makefile | 2 +- trunk/drivers/input/touchscreen/da9052_tsi.c | 59 +- .../drivers/input/touchscreen/ti_am335x_tsc.c | 398 -- trunk/drivers/input/touchscreen/ti_tscadc.c | 486 ++ trunk/drivers/leds/led-class.c | 2 +- trunk/drivers/leds/led-triggers.c | 25 +- trunk/drivers/leds/leds-88pm860x.c | 9 +- trunk/drivers/leds/leds-adp5520.c | 4 +- trunk/drivers/leds/leds-bd2802.c | 10 +- trunk/drivers/leds/leds-clevo-mail.c | 11 +- trunk/drivers/leds/leds-cobalt-qube.c | 11 +- trunk/drivers/leds/leds-cobalt-raq.c | 11 +- trunk/drivers/leds/leds-da903x.c | 10 +- trunk/drivers/leds/leds-fsg.c | 15 +- trunk/drivers/leds/leds-gpio.c | 37 +- trunk/drivers/leds/leds-lm355x.c | 4 +- trunk/drivers/leds/leds-lm3642.c | 12 +- trunk/drivers/leds/leds-lp3944.c | 2 +- trunk/drivers/leds/leds-lp5521.c | 13 +- trunk/drivers/leds/leds-lp5523.c | 24 +- trunk/drivers/leds/leds-lt3593.c | 20 +- trunk/drivers/leds/leds-net48xx.c | 2 +- trunk/drivers/leds/leds-netxbig.c | 2 +- trunk/drivers/leds/leds-ns2.c | 36 +- trunk/drivers/leds/leds-pca955x.c | 2 +- trunk/drivers/leds/leds-pwm.c | 2 +- trunk/drivers/leds/leds-rb532.c | 2 +- trunk/drivers/leds/leds-renesas-tpu.c | 25 +- trunk/drivers/leds/leds-ss4200.c | 2 +- trunk/drivers/leds/leds-wm8350.c | 4 +- trunk/drivers/leds/leds-wrap.c | 2 +- trunk/drivers/leds/ledtrig-backlight.c | 4 +- trunk/drivers/leds/ledtrig-gpio.c | 2 +- trunk/drivers/media/platform/omap/omap_vout.c | 21 +- .../media/platform/omap/omap_voutlib.c | 38 +- .../media/platform/omap/omap_voutlib.h | 3 - trunk/drivers/mfd/Kconfig | 63 +- trunk/drivers/mfd/Makefile | 10 +- trunk/drivers/mfd/ab8500-core.c | 107 +- trunk/drivers/mfd/arizona-core.c | 17 +- trunk/drivers/mfd/arizona-irq.c | 1 - trunk/drivers/mfd/as3711.c | 217 - trunk/drivers/mfd/da9052-core.c | 273 +- trunk/drivers/mfd/da9052-irq.c | 288 - trunk/drivers/mfd/db8500-prcmu.c | 8 +- trunk/drivers/mfd/jz4740-adc.c | 20 +- trunk/drivers/mfd/lpc_ich.c | 16 +- trunk/drivers/mfd/mc13xxx-core.c | 94 +- trunk/drivers/mfd/mc13xxx-i2c.c | 22 +- trunk/drivers/mfd/mc13xxx-spi.c | 29 +- trunk/drivers/mfd/mc13xxx.h | 18 +- trunk/drivers/mfd/mfd-core.c | 15 +- trunk/drivers/mfd/rc5t583-irq.c | 2 +- trunk/drivers/mfd/retu-mfd.c | 264 - trunk/drivers/mfd/rtsx_pcr.c | 1 - trunk/drivers/mfd/sec-irq.c | 102 +- trunk/drivers/mfd/sta2x11-mfd.c | 536 +- trunk/drivers/mfd/stmpe-i2c.c | 8 +- trunk/drivers/mfd/stmpe.c | 206 +- trunk/drivers/mfd/ti_am335x_tscadc.c | 274 - trunk/drivers/mfd/tps6507x.c | 21 +- trunk/drivers/mfd/tps65090.c | 312 +- trunk/drivers/mfd/tps65217.c | 12 - trunk/drivers/mfd/tps6586x.c | 103 +- trunk/drivers/mfd/tps65910-irq.c | 260 + trunk/drivers/mfd/tps65910.c | 234 +- trunk/drivers/mfd/tps80031.c | 574 -- trunk/drivers/mfd/twl-core.c | 227 +- trunk/drivers/mfd/twl4030-irq.c | 10 +- trunk/drivers/mfd/twl4030-madc.c | 14 +- trunk/drivers/mfd/twl4030-power.c | 124 +- trunk/drivers/mfd/twl6030-irq.c | 4 +- .../drivers/mfd/{twl6040.c => twl6040-core.c} | 138 +- trunk/drivers/mfd/twl6040-irq.c | 205 + trunk/drivers/mfd/viperboard.c | 137 - trunk/drivers/mfd/wm5102-tables.c | 35 +- trunk/drivers/mfd/wm8994-core.c | 17 +- trunk/drivers/mmc/host/Makefile | 2 - trunk/drivers/mmc/host/rtsx_pci_sdmmc.c | 4 +- trunk/drivers/power/da9052-battery.c | 44 +- trunk/drivers/rtc/rtc-twl.c | 32 +- trunk/drivers/scsi/qla2xxx/qla_target.c | 21 +- trunk/drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 +- trunk/drivers/scsi/scsi_lib.c | 2 +- trunk/drivers/staging/omapdrm/omap_drv.c | 11 - trunk/drivers/target/iscsi/iscsi_target.c | 84 +- .../target/iscsi/iscsi_target_configfs.c | 28 +- .../drivers/target/iscsi/iscsi_target_core.h | 2 +- .../drivers/target/iscsi/iscsi_target_erl1.c | 11 +- .../drivers/target/iscsi/iscsi_target_erl2.c | 2 +- .../drivers/target/iscsi/iscsi_target_login.c | 18 +- .../drivers/target/iscsi/iscsi_target_nego.c | 10 +- .../target/iscsi/iscsi_target_parameters.c | 16 +- trunk/drivers/target/iscsi/iscsi_target_tmr.c | 4 +- trunk/drivers/target/iscsi/iscsi_target_tq.c | 3 +- .../drivers/target/iscsi/iscsi_target_util.c | 8 +- trunk/drivers/target/loopback/tcm_loop.h | 1 + trunk/drivers/target/sbp/Kconfig | 2 +- trunk/drivers/target/sbp/sbp_target.c | 24 +- trunk/drivers/target/target_core_alua.c | 346 +- trunk/drivers/target/target_core_alua.h | 9 +- trunk/drivers/target/target_core_configfs.c | 705 +- trunk/drivers/target/target_core_device.c | 710 +- .../target/target_core_fabric_configfs.c | 37 +- trunk/drivers/target/target_core_fabric_lib.c | 3 +- trunk/drivers/target/target_core_file.c | 279 +- trunk/drivers/target/target_core_file.h | 2 - trunk/drivers/target/target_core_hba.c | 9 +- trunk/drivers/target/target_core_iblock.c | 501 +- trunk/drivers/target/target_core_iblock.h | 1 - trunk/drivers/target/target_core_internal.h | 16 +- trunk/drivers/target/target_core_pr.c | 1225 ++-- trunk/drivers/target/target_core_pr.h | 10 +- trunk/drivers/target/target_core_pscsi.c | 349 +- trunk/drivers/target/target_core_pscsi.h | 2 +- trunk/drivers/target/target_core_rd.c | 126 +- trunk/drivers/target/target_core_rd.h | 1 - trunk/drivers/target/target_core_sbc.c | 185 +- trunk/drivers/target/target_core_spc.c | 572 +- trunk/drivers/target/target_core_stat.c | 312 +- trunk/drivers/target/target_core_tmr.c | 9 +- trunk/drivers/target/target_core_tpg.c | 29 +- trunk/drivers/target/target_core_transport.c | 675 +- trunk/drivers/target/target_core_ua.c | 20 +- trunk/drivers/target/target_core_ua.h | 2 +- trunk/drivers/target/tcm_fc/tfc_sess.c | 2 +- trunk/drivers/usb/phy/Kconfig | 1 - trunk/drivers/vhost/tcm_vhost.c | 4 + trunk/drivers/video/Kconfig | 17 +- trunk/drivers/video/Makefile | 1 - trunk/drivers/video/console/softcursor.c | 3 +- trunk/drivers/video/da8xx-fb.c | 170 +- trunk/drivers/video/exynos/exynos_dp_core.c | 697 +- trunk/drivers/video/exynos/exynos_dp_core.h | 21 +- trunk/drivers/video/exynos/exynos_dp_reg.c | 77 +- trunk/drivers/video/exynos/exynos_dp_reg.h | 3 +- trunk/drivers/video/fsl-diu-fb.c | 201 +- trunk/drivers/video/omap2/Kconfig | 7 +- trunk/drivers/video/omap2/Makefile | 1 + .../video/omap2/displays/panel-acx565akm.c | 23 + .../video/omap2/displays/panel-generic-dpi.c | 36 + .../omap2/displays/panel-lgphilips-lb035q02.c | 34 + .../drivers/video/omap2/displays/panel-n8x0.c | 89 +- .../omap2/displays/panel-nec-nl8048hl11-01b.c | 24 + .../video/omap2/displays/panel-picodlp.c | 45 +- .../omap2/displays/panel-sharp-ls037v7dw01.c | 17 + .../drivers/video/omap2/displays/panel-taal.c | 72 + .../video/omap2/displays/panel-tfp410.c | 33 + .../omap2/displays/panel-tpo-td043mtea1.c | 20 + trunk/drivers/video/omap2/dss/Kconfig | 35 +- trunk/drivers/video/omap2/dss/Makefile | 7 +- trunk/drivers/video/omap2/dss/apply.c | 331 +- trunk/drivers/video/omap2/dss/core.c | 72 +- trunk/drivers/video/omap2/dss/dispc-compat.c | 667 -- trunk/drivers/video/omap2/dss/dispc-compat.h | 30 - trunk/drivers/video/omap2/dss/dispc.c | 1063 ++- trunk/drivers/video/omap2/dss/display-sysfs.c | 321 - trunk/drivers/video/omap2/dss/display.c | 386 +- trunk/drivers/video/omap2/dss/dpi.c | 126 +- trunk/drivers/video/omap2/dss/dsi.c | 247 +- trunk/drivers/video/omap2/dss/dss.c | 101 +- trunk/drivers/video/omap2/dss/dss.h | 124 +- trunk/drivers/video/omap2/dss/dss_features.c | 15 +- trunk/drivers/video/omap2/dss/dss_features.h | 7 + trunk/drivers/video/omap2/dss/hdmi.c | 159 +- trunk/drivers/video/omap2/dss/hdmi_panel.c | 82 +- trunk/drivers/video/omap2/dss/manager.c | 39 + trunk/drivers/video/omap2/dss/output.c | 90 +- trunk/drivers/video/omap2/dss/overlay.c | 17 + trunk/drivers/video/omap2/dss/rfbi.c | 23 +- trunk/drivers/video/omap2/dss/sdi.c | 11 +- trunk/drivers/video/omap2/dss/ti_hdmi.h | 3 - .../drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 11 +- trunk/drivers/video/omap2/dss/venc.c | 11 +- trunk/drivers/video/omap2/dss/venc_panel.c | 19 + trunk/drivers/video/omap2/omapfb/Kconfig | 1 + .../drivers/video/omap2/omapfb/omapfb-ioctl.c | 46 +- .../drivers/video/omap2/omapfb/omapfb-main.c | 204 +- .../drivers/video/omap2/omapfb/omapfb-sysfs.c | 4 - trunk/drivers/video/omap2/omapfb/omapfb.h | 20 +- trunk/drivers/video/omap2/vram.c | 514 ++ trunk/drivers/video/s3c-fb.c | 24 +- trunk/drivers/video/sh_mipi_dsi.c | 69 +- trunk/drivers/video/sh_mobile_lcdcfb.c | 74 +- trunk/drivers/video/sh_mobile_lcdcfb.h | 1 - trunk/drivers/video/ssd1307fb.c | 396 -- trunk/drivers/w1/masters/Kconfig | 1 - trunk/drivers/xen/swiotlb-xen.c | 25 +- trunk/fs/Kconfig | 4 +- trunk/fs/cifs/cifsacl.c | 12 +- trunk/fs/ext3/inode.c | 3 +- trunk/fs/ext3/super.c | 3 + trunk/fs/ext4/Kconfig | 15 + trunk/fs/ext4/Makefile | 4 +- trunk/fs/ext4/acl.c | 6 +- trunk/fs/ext4/dir.c | 41 +- trunk/fs/ext4/ext4.h | 165 +- trunk/fs/ext4/ext4_extents.h | 40 + trunk/fs/ext4/ext4_jbd2.h | 7 + trunk/fs/ext4/extents.c | 480 +- trunk/fs/ext4/extents_status.c | 500 -- trunk/fs/ext4/extents_status.h | 45 - trunk/fs/ext4/file.c | 336 +- trunk/fs/ext4/fsync.c | 6 +- trunk/fs/ext4/ialloc.c | 6 +- trunk/fs/ext4/indirect.c | 5 +- trunk/fs/ext4/inline.c | 1884 ------ trunk/fs/ext4/inode.c | 629 +- trunk/fs/ext4/mballoc.c | 60 +- trunk/fs/ext4/migrate.c | 1 - trunk/fs/ext4/move_extent.c | 1 - trunk/fs/ext4/namei.c | 531 +- trunk/fs/ext4/page-io.c | 3 +- trunk/fs/ext4/resize.c | 17 +- trunk/fs/ext4/super.c | 57 +- trunk/fs/ext4/symlink.c | 4 + trunk/fs/ext4/xattr.c | 110 +- trunk/fs/ext4/xattr.h | 158 +- trunk/fs/gfs2/aops.c | 2 +- trunk/fs/gfs2/bmap.c | 54 +- trunk/fs/gfs2/dir.c | 7 +- trunk/fs/gfs2/file.c | 4 +- trunk/fs/gfs2/glock.c | 40 +- trunk/fs/gfs2/glock.h | 54 +- trunk/fs/gfs2/glops.c | 19 +- trunk/fs/gfs2/incore.h | 6 +- trunk/fs/gfs2/inode.c | 209 +- trunk/fs/gfs2/lock_dlm.c | 20 +- trunk/fs/gfs2/ops_fstype.c | 3 - trunk/fs/gfs2/quota.c | 10 +- trunk/fs/gfs2/rgrp.c | 139 +- trunk/fs/gfs2/rgrp.h | 3 +- trunk/fs/gfs2/trace_gfs2.h | 2 +- trunk/fs/gfs2/xattr.c | 2 +- trunk/fs/jbd2/journal.c | 1 + trunk/fs/jbd2/transaction.c | 11 + trunk/fs/nfs/idmap.c | 12 +- trunk/fs/pstore/ftrace.c | 4 +- trunk/fs/pstore/ram.c | 42 +- trunk/fs/quota/quota.c | 4 - trunk/fs/udf/inode.c | 14 +- trunk/include/asm-generic/pgtable.h | 110 - trunk/include/crypto/cast5.h | 6 +- trunk/include/crypto/cast6.h | 6 +- trunk/include/crypto/cast_common.h | 9 - trunk/include/crypto/vmac.h | 2 - trunk/include/drm/drmP.h | 3 - trunk/include/drm/drm_crtc.h | 19 +- trunk/include/drm/drm_crtc_helper.h | 3 - trunk/include/drm/drm_dp_helper.h | 39 - trunk/include/drm/drm_hashtab.h | 14 - trunk/include/drm/exynos_drm.h | 26 - trunk/include/drm/intel-gtt.h | 7 +- trunk/include/drm/ttm/ttm_bo_api.h | 33 +- trunk/include/drm/ttm/ttm_bo_driver.h | 45 +- trunk/include/drm/ttm/ttm_execbuf_util.h | 3 + trunk/include/drm/ttm/ttm_memory.h | 2 + trunk/include/drm/ttm/ttm_object.h | 4 - trunk/include/linux/ata_platform.h | 2 + trunk/include/linux/backing-dev.h | 4 - trunk/include/linux/blkdev.h | 17 +- trunk/include/linux/bsg-lib.h | 1 + trunk/include/linux/cred.h | 17 +- trunk/include/linux/dma-attrs.h | 1 - trunk/include/linux/efi.h | 2 - trunk/include/linux/extcon.h | 50 +- trunk/include/linux/fsl-diu-fb.h | 9 - trunk/include/linux/huge_mm.h | 16 +- trunk/include/linux/hugetlb.h | 8 +- trunk/include/linux/i2c/twl.h | 73 +- trunk/include/linux/input/ti_am335x_tsc.h | 23 - trunk/include/linux/input/ti_tscadc.h | 17 + trunk/include/linux/jbd2.h | 9 +- trunk/include/linux/key.h | 1 - trunk/include/linux/kref.h | 21 - trunk/include/linux/leds.h | 17 - trunk/include/linux/libata.h | 5 - trunk/include/linux/mempolicy.h | 8 - trunk/include/linux/mfd/arizona/registers.h | 1 - trunk/include/linux/mfd/as3711.h | 126 - trunk/include/linux/mfd/da9052/da9052.h | 10 - trunk/include/linux/mfd/da9055/core.h | 2 +- trunk/include/linux/mfd/da9055/pdata.h | 2 +- trunk/include/linux/mfd/da9055/reg.h | 2 +- trunk/include/linux/mfd/rc5t583.h | 3 +- trunk/include/linux/mfd/retu.h | 22 - trunk/include/linux/mfd/sta2x11-mfd.h | 198 +- trunk/include/linux/mfd/stmpe.h | 4 +- trunk/include/linux/mfd/ti_am335x_tscadc.h | 152 - trunk/include/linux/mfd/tps65090.h | 73 +- trunk/include/linux/mfd/tps6586x.h | 1 - trunk/include/linux/mfd/tps65910.h | 145 +- trunk/include/linux/mfd/tps80031.h | 637 -- trunk/include/linux/mfd/twl6040.h | 10 +- trunk/include/linux/mfd/viperboard.h | 110 - trunk/include/linux/migrate.h | 46 +- trunk/include/linux/mm.h | 39 - trunk/include/linux/mm_types.h | 31 - trunk/include/linux/mmzone.h | 13 - .../linux/platform_data/ti_am335x_adc.h | 14 - trunk/include/linux/rmap.h | 33 +- trunk/include/linux/sched.h | 27 - trunk/include/linux/swiotlb.h | 20 +- trunk/include/linux/vm_event_item.h | 12 +- trunk/include/linux/vmstat.h | 8 - trunk/include/target/target_core_backend.h | 49 +- trunk/include/target/target_core_base.h | 212 +- trunk/include/target/target_core_fabric.h | 15 +- trunk/include/trace/events/ext4.h | 136 +- trunk/include/trace/events/migrate.h | 51 - trunk/include/uapi/drm/drm.h | 1 - trunk/include/uapi/drm/exynos_drm.h | 203 +- trunk/include/uapi/drm/i915_drm.h | 6 - trunk/include/uapi/drm/radeon_drm.h | 6 - trunk/include/uapi/linux/mempolicy.h | 15 +- trunk/include/video/da8xx-fb.h | 25 +- trunk/include/video/omapdss.h | 91 +- trunk/include/video/samsung_fimd.h | 168 +- trunk/include/video/sh_mipi_dsi.h | 4 +- trunk/include/video/sh_mobile_lcdc.h | 1 + trunk/init/Kconfig | 44 - trunk/init/main.c | 8 +- trunk/kernel/cred.c | 127 +- trunk/kernel/fork.c | 3 - trunk/kernel/padata.c | 5 +- trunk/kernel/sched/core.c | 71 +- trunk/kernel/sched/fair.c | 227 - trunk/kernel/sched/features.h | 11 - trunk/kernel/sched/sched.h | 12 - trunk/kernel/seccomp.c | 13 +- trunk/kernel/sysctl.c | 45 +- trunk/lib/swiotlb.c | 269 +- trunk/mm/backing-dev.c | 84 - trunk/mm/compaction.c | 15 +- trunk/mm/huge_memory.c | 110 +- trunk/mm/hugetlb.c | 10 +- trunk/mm/internal.h | 7 +- trunk/mm/ksm.c | 6 +- trunk/mm/memcontrol.c | 7 +- trunk/mm/memory-failure.c | 7 +- trunk/mm/memory.c | 198 +- trunk/mm/memory_hotplug.c | 3 +- trunk/mm/mempolicy.c | 283 +- trunk/mm/migrate.c | 337 +- trunk/mm/mmap.c | 10 +- trunk/mm/mprotect.c | 135 +- trunk/mm/mremap.c | 2 +- trunk/mm/page_alloc.c | 10 +- trunk/mm/pgtable-generic.c | 9 +- trunk/mm/rmap.c | 66 +- trunk/mm/vmstat.c | 16 +- trunk/net/dns_resolver/dns_key.c | 15 +- trunk/security/keys/key.c | 6 +- trunk/security/keys/keyctl.c | 15 +- trunk/security/keys/keyring.c | 10 +- trunk/security/keys/process_keys.c | 92 +- trunk/security/keys/request_key.c | 21 +- trunk/security/smack/Kconfig | 6 +- trunk/security/smack/smackfs.c | 17 - trunk/security/yama/yama_lsm.c | 88 +- 947 files changed, 31352 insertions(+), 71455 deletions(-) delete mode 100644 trunk/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt delete mode 100644 trunk/Documentation/devicetree/bindings/mfd/stmpe.txt delete mode 100644 trunk/Documentation/devicetree/bindings/video/exynos_dp.txt delete mode 100644 trunk/Documentation/devicetree/bindings/video/ssd1307fb.txt create mode 100644 trunk/arch/arm/plat-omap/include/plat/vram.h create mode 100644 trunk/arch/m68k/include/asm/m5249sim.h delete mode 100644 trunk/arch/m68k/platform/68000/Makefile delete mode 100644 trunk/arch/m68k/platform/68000/head.S create mode 100644 trunk/arch/m68k/platform/68328/Makefile rename trunk/arch/m68k/platform/{68000 => 68328}/bootlogo.h (100%) rename trunk/arch/m68k/platform/{68000/m68328.c => 68328/config.c} (97%) rename trunk/arch/m68k/platform/{68000 => 68328}/entry.S (100%) create mode 100644 trunk/arch/m68k/platform/68328/head-de2.S create mode 100644 trunk/arch/m68k/platform/68328/head-pilot.S create mode 100644 trunk/arch/m68k/platform/68328/head-ram.S create mode 100644 trunk/arch/m68k/platform/68328/head-rom.S rename trunk/arch/m68k/platform/{68000 => 68328}/ints.c (98%) rename trunk/arch/m68k/platform/{68000 => 68328}/romvec.S (94%) rename trunk/arch/m68k/platform/{68000 => 68328}/timers.c (98%) create mode 100644 trunk/arch/m68k/platform/68EZ328/Makefile rename trunk/arch/m68k/platform/{68000/m68EZ328.c => 68EZ328/config.c} (97%) create mode 100644 trunk/arch/m68k/platform/68VZ328/Makefile rename trunk/arch/m68k/platform/{68000/bootlogo-vz.h => 68VZ328/bootlogo.h} (100%) rename trunk/arch/m68k/platform/{68000/m68VZ328.c => 68VZ328/config.c} (98%) rename trunk/arch/microblaze/include/{uapi => }/asm/auxvec.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/bitsperlong.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/byteorder.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/errno.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/fcntl.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/ioctl.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/ioctls.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/ipcbuf.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/kvm_para.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/mman.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/msgbuf.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/param.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/poll.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/posix_types.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/resource.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/sembuf.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/shmbuf.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/sigcontext.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/siginfo.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/signal.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/socket.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/sockios.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/stat.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/statfs.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/swab.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/termbits.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/termios.h (100%) rename trunk/arch/microblaze/include/{uapi => }/asm/types.h (100%) delete mode 100644 trunk/arch/microblaze/include/uapi/asm/elf.h delete mode 100644 trunk/arch/microblaze/include/uapi/asm/ptrace.h delete mode 100644 trunk/arch/microblaze/include/uapi/asm/setup.h delete mode 100644 trunk/arch/microblaze/include/uapi/asm/unistd.h delete mode 100644 trunk/arch/x86/crypto/camellia-aesni-avx-asm_64.S delete mode 100644 trunk/arch/x86/crypto/camellia_aesni_avx_glue.c rename trunk/arch/x86/crypto/{crc32c-intel_glue.c => crc32c-intel.c} (69%) delete mode 100644 trunk/arch/x86/crypto/crc32c-pcl-intel-asm_64.S delete mode 100644 trunk/arch/x86/crypto/glue_helper-asm-avx.S delete mode 100644 trunk/arch/x86/include/asm/crypto/camellia.h delete mode 100644 trunk/crypto/cast_common.c mode change 100644 => 100755 trunk/drivers/ata/sata_dwc_460ex.c delete mode 100644 trunk/drivers/gpio/gpio-viperboard.c rename trunk/drivers/gpu/drm/{drm_dp_helper.c => drm_dp_i2c_helper.c} (58%) delete mode 100644 trunk/drivers/gpu/drm/exynos/exynos_drm_fimc.c delete mode 100644 trunk/drivers/gpu/drm/exynos/exynos_drm_fimc.h delete mode 100644 trunk/drivers/gpu/drm/exynos/exynos_drm_gsc.c delete mode 100644 trunk/drivers/gpu/drm/exynos/exynos_drm_gsc.h delete mode 100644 trunk/drivers/gpu/drm/exynos/exynos_drm_iommu.c delete mode 100644 trunk/drivers/gpu/drm/exynos/exynos_drm_iommu.h delete mode 100644 trunk/drivers/gpu/drm/exynos/exynos_drm_ipp.c delete mode 100644 trunk/drivers/gpu/drm/exynos/exynos_drm_ipp.h delete mode 100644 trunk/drivers/gpu/drm/exynos/exynos_drm_rotator.c delete mode 100644 trunk/drivers/gpu/drm/exynos/exynos_drm_rotator.h delete mode 100644 trunk/drivers/gpu/drm/exynos/regs-fimc.h delete mode 100644 trunk/drivers/gpu/drm/exynos/regs-gsc.h delete mode 100644 trunk/drivers/gpu/drm/exynos/regs-rotator.h delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/core/falcon.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/bsp/nvc0.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/bsp/nve0.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/hdanva3.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/hdanvd0.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/hdminv84.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/hdminvd0.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/nv50.h delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/nv84.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/nv94.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/nva0.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/nva3.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/nve0.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/sornv94.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/disp/sornvd0.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/dmaobj/nvd0.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/ppp/nvc0.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/vp/nvc0.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/engine/vp/nve0.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/include/core/falcon.h delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/include/subdev/bios/disp.h delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/subdev/bios/disp.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv25.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv35.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv36.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv41.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv44.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv46.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv47.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv49.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv4e.c create mode 100644 trunk/drivers/gpu/drm/nouveau/nouveau_hdmi.c create mode 100644 trunk/drivers/gpu/drm/nouveau/nv50_crtc.c create mode 100644 trunk/drivers/gpu/drm/nouveau/nv50_cursor.c create mode 100644 trunk/drivers/gpu/drm/nouveau/nv50_dac.c create mode 100644 trunk/drivers/gpu/drm/nouveau/nv50_evo.c create mode 100644 trunk/drivers/gpu/drm/nouveau/nv50_evo.h create mode 100644 trunk/drivers/gpu/drm/nouveau/nv50_sor.c create mode 100644 trunk/drivers/gpu/drm/nouveau/nvd0_display.c delete mode 100644 trunk/drivers/gpu/drm/tegra/Kconfig delete mode 100644 trunk/drivers/gpu/drm/tegra/Makefile delete mode 100644 trunk/drivers/gpu/drm/tegra/dc.c delete mode 100644 trunk/drivers/gpu/drm/tegra/dc.h delete mode 100644 trunk/drivers/gpu/drm/tegra/drm.c delete mode 100644 trunk/drivers/gpu/drm/tegra/drm.h delete mode 100644 trunk/drivers/gpu/drm/tegra/fb.c delete mode 100644 trunk/drivers/gpu/drm/tegra/hdmi.c delete mode 100644 trunk/drivers/gpu/drm/tegra/hdmi.h delete mode 100644 trunk/drivers/gpu/drm/tegra/host1x.c delete mode 100644 trunk/drivers/gpu/drm/tegra/output.c delete mode 100644 trunk/drivers/gpu/drm/tegra/rgb.c delete mode 100644 trunk/drivers/gpu/drm/vmwgfx/svga3d_surfacedefs.h delete mode 100644 trunk/drivers/gpu/drm/vmwgfx/vmwgfx_context.c delete mode 100644 trunk/drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h delete mode 100644 trunk/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c delete mode 100644 trunk/drivers/i2c/busses/i2c-viperboard.c delete mode 100644 trunk/drivers/iio/adc/ti_am335x_adc.c delete mode 100644 trunk/drivers/iio/adc/viperboard_adc.c delete mode 100644 trunk/drivers/input/touchscreen/ti_am335x_tsc.c create mode 100644 trunk/drivers/input/touchscreen/ti_tscadc.c delete mode 100644 trunk/drivers/mfd/as3711.c delete mode 100644 trunk/drivers/mfd/da9052-irq.c delete mode 100644 trunk/drivers/mfd/retu-mfd.c delete mode 100644 trunk/drivers/mfd/ti_am335x_tscadc.c create mode 100644 trunk/drivers/mfd/tps65910-irq.c delete mode 100644 trunk/drivers/mfd/tps80031.c rename trunk/drivers/mfd/{twl6040.c => twl6040-core.c} (84%) create mode 100644 trunk/drivers/mfd/twl6040-irq.c delete mode 100644 trunk/drivers/mfd/viperboard.c delete mode 100644 trunk/drivers/video/omap2/dss/dispc-compat.c delete mode 100644 trunk/drivers/video/omap2/dss/dispc-compat.h delete mode 100644 trunk/drivers/video/omap2/dss/display-sysfs.c create mode 100644 trunk/drivers/video/omap2/vram.c delete mode 100644 trunk/drivers/video/ssd1307fb.c delete mode 100644 trunk/fs/ext4/extents_status.c delete mode 100644 trunk/fs/ext4/extents_status.h delete mode 100644 trunk/fs/ext4/inline.c delete mode 100644 trunk/include/crypto/cast_common.h delete mode 100644 trunk/include/linux/input/ti_am335x_tsc.h create mode 100644 trunk/include/linux/input/ti_tscadc.h delete mode 100644 trunk/include/linux/mfd/as3711.h delete mode 100644 trunk/include/linux/mfd/retu.h delete mode 100644 trunk/include/linux/mfd/ti_am335x_tscadc.h delete mode 100644 trunk/include/linux/mfd/tps80031.h delete mode 100644 trunk/include/linux/mfd/viperboard.h delete mode 100644 trunk/include/linux/platform_data/ti_am335x_adc.h delete mode 100644 trunk/include/trace/events/migrate.h diff --git a/[refs] b/[refs] index e3b2ef94b7ee..a47104470ab8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68136b105cbb798b13e9545b9952e568d04e347c +refs/heads/master: ba68c7eff599705b5fe3b42895dd7d2757cb368a diff --git a/trunk/Documentation/DMA-attributes.txt b/trunk/Documentation/DMA-attributes.txt index e59480db9ee0..f50309081ac7 100644 --- a/trunk/Documentation/DMA-attributes.txt +++ b/trunk/Documentation/DMA-attributes.txt @@ -91,12 +91,3 @@ transferred to 'device' domain. This attribute can be also used for dma_unmap_{single,page,sg} functions family to force buffer to stay in device domain after releasing a mapping for it. Use this attribute with care! - -DMA_ATTR_FORCE_CONTIGUOUS -------------------------- - -By default DMA-mapping subsystem is allowed to assemble the buffer -allocated by dma_alloc_attrs() function from individual pages if it can -be mapped as contiguous chunk into device dma address space. By -specifing this attribute the allocated buffer is forced to be contiguous -also in physical memory. diff --git a/trunk/Documentation/DocBook/drm.tmpl b/trunk/Documentation/DocBook/drm.tmpl index 4ee2304f82f9..b0300529ab13 100644 --- a/trunk/Documentation/DocBook/drm.tmpl +++ b/trunk/Documentation/DocBook/drm.tmpl @@ -1141,13 +1141,23 @@ int max_width, max_height; the page_flip operation will be called with a non-NULL event argument pointing to a drm_pending_vblank_event instance. Upon page - flip completion the driver must call drm_send_vblank_event - to fill in the event and send to wake up any waiting processes. - This can be performed with + flip completion the driver must fill the + event::event + sequence, tv_sec + and tv_usec fields with the associated + vertical blanking count and timestamp, add the event to the + drm_file list of events to be signaled, and wake + up any waiting process. This can be performed with event.sequence = drm_vblank_count_and_time(..., &now); + event->event.tv_sec = now.tv_sec; + event->event.tv_usec = now.tv_usec; + spin_lock_irqsave(&dev->event_lock, flags); - ... - drm_send_vblank_event(dev, pipe, event); + list_add_tail(&event->base.link, &event->base.file_priv->event_list); + wake_up_interruptible(&event->base.file_priv->event_wait); spin_unlock_irqrestore(&dev->event_lock, flags); ]]> @@ -1611,10 +1621,10 @@ void intel_crt_init(struct drm_device *dev) - + - Mode Setting Helper Functions + Mid-layer Helper Functions The CRTC, encoder and connector functions provided by the drivers implement the DRM API. They're called by the DRM core and ioctl handlers @@ -2096,21 +2106,6 @@ void intel_crt_init(struct drm_device *dev) - - Modeset Helper Functions Reference -!Edrivers/gpu/drm/drm_crtc_helper.c - - - fbdev Helper Functions Reference -!Pdrivers/gpu/drm/drm_fb_helper.c fbdev helpers -!Edrivers/gpu/drm/drm_fb_helper.c - - - Display Port Helper Functions Reference -!Pdrivers/gpu/drm/drm_dp_helper.c dp helpers -!Iinclude/drm/drm_dp_helper.h -!Edrivers/gpu/drm/drm_dp_helper.c - diff --git a/trunk/Documentation/arm/OMAP/DSS b/trunk/Documentation/arm/OMAP/DSS index 4484e021290e..a564ceea9e98 100644 --- a/trunk/Documentation/arm/OMAP/DSS +++ b/trunk/Documentation/arm/OMAP/DSS @@ -285,10 +285,7 @@ FB0 +-- GFX ---- LCD ---- LCD Misc notes ---------- -OMAP FB allocates the framebuffer memory using the standard dma allocator. You -can enable Contiguous Memory Allocator (CONFIG_CMA) to improve the dma -allocator, and if CMA is enabled, you use "cma=" kernel parameter to increase -the global memory area for CMA. +OMAP FB allocates the framebuffer memory using the OMAP VRAM allocator. Using DSI DPLL to generate pixel clock it is possible produce the pixel clock of 86.5MHz (max possible), and with that you get 1280x1024@57 output from DVI. @@ -304,6 +301,11 @@ framebuffer parameters. Kernel boot arguments --------------------- +vram=[,] + - Amount of total VRAM to preallocate and optionally a physical start + memory address. For example, "10M". omapfb allocates memory for + framebuffers from VRAM. + omapfb.mode=:[,...] - Default video mode for specified displays. For example, "dvi:800x400MR-24@60". See drivers/video/modedb.c. diff --git a/trunk/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/trunk/Documentation/devicetree/bindings/crypto/fsl-sec4.txt index fc9ce6f1688c..bd7ce120bc13 100644 --- a/trunk/Documentation/devicetree/bindings/crypto/fsl-sec4.txt +++ b/trunk/Documentation/devicetree/bindings/crypto/fsl-sec4.txt @@ -54,8 +54,7 @@ PROPERTIES - compatible Usage: required Value type: - Definition: Must include "fsl,sec-v4.0". Also includes SEC - ERA versions (optional) with which the device is compatible. + Definition: Must include "fsl,sec-v4.0" - #address-cells Usage: required @@ -107,7 +106,7 @@ PROPERTIES EXAMPLE crypto@300000 { - compatible = "fsl,sec-v4.0", "fsl,sec-era-v2.0"; + compatible = "fsl,sec-v4.0"; #address-cells = <1>; #size-cells = <1>; reg = <0x300000 0x10000>; diff --git a/trunk/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt b/trunk/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt deleted file mode 100644 index b4fa934ae3a2..000000000000 --- a/trunk/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt +++ /dev/null @@ -1,191 +0,0 @@ -NVIDIA Tegra host1x - -Required properties: -- compatible: "nvidia,tegra-host1x" -- reg: Physical base address and length of the controller's registers. -- interrupts: The interrupt outputs from the controller. -- #address-cells: The number of cells used to represent physical base addresses - in the host1x address space. Should be 1. -- #size-cells: The number of cells used to represent the size of an address - range in the host1x address space. Should be 1. -- ranges: The mapping of the host1x address space to the CPU address space. - -The host1x top-level node defines a number of children, each representing one -of the following host1x client modules: - -- mpe: video encoder - - Required properties: - - compatible: "nvidia,tegra-mpe" - - reg: Physical base address and length of the controller's registers. - - interrupts: The interrupt outputs from the controller. - -- vi: video input - - Required properties: - - compatible: "nvidia,tegra-vi" - - reg: Physical base address and length of the controller's registers. - - interrupts: The interrupt outputs from the controller. - -- epp: encoder pre-processor - - Required properties: - - compatible: "nvidia,tegra-epp" - - reg: Physical base address and length of the controller's registers. - - interrupts: The interrupt outputs from the controller. - -- isp: image signal processor - - Required properties: - - compatible: "nvidia,tegra-isp" - - reg: Physical base address and length of the controller's registers. - - interrupts: The interrupt outputs from the controller. - -- gr2d: 2D graphics engine - - Required properties: - - compatible: "nvidia,tegra-gr2d" - - reg: Physical base address and length of the controller's registers. - - interrupts: The interrupt outputs from the controller. - -- gr3d: 3D graphics engine - - Required properties: - - compatible: "nvidia,tegra-gr3d" - - reg: Physical base address and length of the controller's registers. - -- dc: display controller - - Required properties: - - compatible: "nvidia,tegra-dc" - - reg: Physical base address and length of the controller's registers. - - interrupts: The interrupt outputs from the controller. - - Each display controller node has a child node, named "rgb", that represents - the RGB output associated with the controller. It can take the following - optional properties: - - nvidia,ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing - - nvidia,hpd-gpio: specifies a GPIO used for hotplug detection - - nvidia,edid: supplies a binary EDID blob - -- hdmi: High Definition Multimedia Interface - - Required properties: - - compatible: "nvidia,tegra-hdmi" - - reg: Physical base address and length of the controller's registers. - - interrupts: The interrupt outputs from the controller. - - vdd-supply: regulator for supply voltage - - pll-supply: regulator for PLL - - Optional properties: - - nvidia,ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing - - nvidia,hpd-gpio: specifies a GPIO used for hotplug detection - - nvidia,edid: supplies a binary EDID blob - -- tvo: TV encoder output - - Required properties: - - compatible: "nvidia,tegra-tvo" - - reg: Physical base address and length of the controller's registers. - - interrupts: The interrupt outputs from the controller. - -- dsi: display serial interface - - Required properties: - - compatible: "nvidia,tegra-dsi" - - reg: Physical base address and length of the controller's registers. - -Example: - -/ { - ... - - host1x { - compatible = "nvidia,tegra20-host1x", "simple-bus"; - reg = <0x50000000 0x00024000>; - interrupts = <0 65 0x04 /* mpcore syncpt */ - 0 67 0x04>; /* mpcore general */ - - #address-cells = <1>; - #size-cells = <1>; - - ranges = <0x54000000 0x54000000 0x04000000>; - - mpe { - compatible = "nvidia,tegra20-mpe"; - reg = <0x54040000 0x00040000>; - interrupts = <0 68 0x04>; - }; - - vi { - compatible = "nvidia,tegra20-vi"; - reg = <0x54080000 0x00040000>; - interrupts = <0 69 0x04>; - }; - - epp { - compatible = "nvidia,tegra20-epp"; - reg = <0x540c0000 0x00040000>; - interrupts = <0 70 0x04>; - }; - - isp { - compatible = "nvidia,tegra20-isp"; - reg = <0x54100000 0x00040000>; - interrupts = <0 71 0x04>; - }; - - gr2d { - compatible = "nvidia,tegra20-gr2d"; - reg = <0x54140000 0x00040000>; - interrupts = <0 72 0x04>; - }; - - gr3d { - compatible = "nvidia,tegra20-gr3d"; - reg = <0x54180000 0x00040000>; - }; - - dc@54200000 { - compatible = "nvidia,tegra20-dc"; - reg = <0x54200000 0x00040000>; - interrupts = <0 73 0x04>; - - rgb { - status = "disabled"; - }; - }; - - dc@54240000 { - compatible = "nvidia,tegra20-dc"; - reg = <0x54240000 0x00040000>; - interrupts = <0 74 0x04>; - - rgb { - status = "disabled"; - }; - }; - - hdmi { - compatible = "nvidia,tegra20-hdmi"; - reg = <0x54280000 0x00040000>; - interrupts = <0 75 0x04>; - status = "disabled"; - }; - - tvo { - compatible = "nvidia,tegra20-tvo"; - reg = <0x542c0000 0x00040000>; - interrupts = <0 76 0x04>; - status = "disabled"; - }; - - dsi { - compatible = "nvidia,tegra20-dsi"; - reg = <0x54300000 0x00040000>; - status = "disabled"; - }; - }; - - ... -}; diff --git a/trunk/Documentation/devicetree/bindings/mfd/stmpe.txt b/trunk/Documentation/devicetree/bindings/mfd/stmpe.txt deleted file mode 100644 index 56edb5520685..000000000000 --- a/trunk/Documentation/devicetree/bindings/mfd/stmpe.txt +++ /dev/null @@ -1,28 +0,0 @@ -* ST Microelectronics STMPE Multi-Functional Device - -STMPE is an MFD device which may expose the following inbuilt devices: gpio, -keypad, touchscreen, adc, pwm, rotator. - -Required properties: - - compatible : "st,stmpe[610|801|811|1601|2401|2403]" - - reg : I2C/SPI address of the device - -Optional properties: - - interrupts : The interrupt outputs from the controller - - interrupt-controller : Marks the device node as an interrupt controller - - interrupt-parent : Specifies which IRQ controller we're connected to - - wakeup-source : Marks the input device as wakable - - st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024 - -Example: - - stmpe1601: stmpe1601@40 { - compatible = "st,stmpe1601"; - reg = <0x40>; - interrupts = <26 0x4>; - interrupt-parent = <&gpio6>; - interrupt-controller; - - wakeup-source; - st,autosleep-timeout = <1024>; - }; diff --git a/trunk/Documentation/devicetree/bindings/regulator/tps65217.txt b/trunk/Documentation/devicetree/bindings/regulator/tps65217.txt index 4f05d208c95c..d316fb895daf 100644 --- a/trunk/Documentation/devicetree/bindings/regulator/tps65217.txt +++ b/trunk/Documentation/devicetree/bindings/regulator/tps65217.txt @@ -11,9 +11,6 @@ Required properties: using the standard binding for regulators found at Documentation/devicetree/bindings/regulator/regulator.txt. -Optional properties: -- ti,pmic-shutdown-controller: Telling the PMIC to shutdown on PWR_EN toggle. - The valid names for regulators are: tps65217: dcdc1, dcdc2, dcdc3, ldo1, ldo2, ldo3 and ldo4 @@ -23,7 +20,6 @@ Example: tps: tps@24 { compatible = "ti,tps65217"; - ti,pmic-shutdown-controller; regulators { dcdc1_reg: dcdc1 { diff --git a/trunk/Documentation/devicetree/bindings/video/exynos_dp.txt b/trunk/Documentation/devicetree/bindings/video/exynos_dp.txt deleted file mode 100644 index c60da67a5d76..000000000000 --- a/trunk/Documentation/devicetree/bindings/video/exynos_dp.txt +++ /dev/null @@ -1,80 +0,0 @@ -The Exynos display port interface should be configured based on -the type of panel connected to it. - -We use two nodes: - -dp-controller node - -dptx-phy node(defined inside dp-controller node) - -For the DP-PHY initialization, we use the dptx-phy node. -Required properties for dptx-phy: - -reg: - Base address of DP PHY register. - -samsung,enable-mask: - The bit-mask used to enable/disable DP PHY. - -For the Panel initialization, we read data from dp-controller node. -Required properties for dp-controller: - -compatible: - should be "samsung,exynos5-dp". - -reg: - physical base address of the controller and length - of memory mapped region. - -interrupts: - interrupt combiner values. - -interrupt-parent: - phandle to Interrupt combiner node. - -samsung,color-space: - input video data format. - COLOR_RGB = 0, COLOR_YCBCR422 = 1, COLOR_YCBCR444 = 2 - -samsung,dynamic-range: - dynamic range for input video data. - VESA = 0, CEA = 1 - -samsung,ycbcr-coeff: - YCbCr co-efficients for input video. - COLOR_YCBCR601 = 0, COLOR_YCBCR709 = 1 - -samsung,color-depth: - number of bits per colour component. - COLOR_6 = 0, COLOR_8 = 1, COLOR_10 = 2, COLOR_12 = 3 - -samsung,link-rate: - link rate supported by the panel. - LINK_RATE_1_62GBPS = 0x6, LINK_RATE_2_70GBPS = 0x0A - -samsung,lane-count: - number of lanes supported by the panel. - LANE_COUNT1 = 1, LANE_COUNT2 = 2, LANE_COUNT4 = 4 - -Optional properties for dp-controller: - -interlaced: - interlace scan mode. - Progressive if defined, Interlaced if not defined - -vsync-active-high: - VSYNC polarity configuration. - High if defined, Low if not defined - -hsync-active-high: - HSYNC polarity configuration. - High if defined, Low if not defined - -Example: - -SOC specific portion: - dp-controller { - compatible = "samsung,exynos5-dp"; - reg = <0x145b0000 0x10000>; - interrupts = <10 3>; - interrupt-parent = <&combiner>; - - dptx-phy { - reg = <0x10040720>; - samsung,enable-mask = <1>; - }; - - }; - -Board Specific portion: - dp-controller { - samsung,color-space = <0>; - samsung,dynamic-range = <0>; - samsung,ycbcr-coeff = <0>; - samsung,color-depth = <1>; - samsung,link-rate = <0x0a>; - samsung,lane-count = <4>; - }; diff --git a/trunk/Documentation/devicetree/bindings/video/ssd1307fb.txt b/trunk/Documentation/devicetree/bindings/video/ssd1307fb.txt deleted file mode 100644 index 3d0060cff062..000000000000 --- a/trunk/Documentation/devicetree/bindings/video/ssd1307fb.txt +++ /dev/null @@ -1,24 +0,0 @@ -* Solomon SSD1307 Framebuffer Driver - -Required properties: - - compatible: Should be "solomon,ssd1307fb-". The only supported bus for - now is i2c. - - reg: Should contain address of the controller on the I2C bus. Most likely - 0x3c or 0x3d - - pwm: Should contain the pwm to use according to the OF device tree PWM - specification [0] - - reset-gpios: Should contain the GPIO used to reset the OLED display - -Optional properties: - - reset-active-low: Is the reset gpio is active on physical low? - -[0]: Documentation/devicetree/bindings/pwm/pwm.txt - -Examples: -ssd1307: oled@3c { - compatible = "solomon,ssd1307fb-i2c"; - reg = <0x3c>; - pwms = <&pwm 4 3000>; - reset-gpios = <&gpio2 7>; - reset-active-low; -}; diff --git a/trunk/Documentation/filesystems/ext4.txt b/trunk/Documentation/filesystems/ext4.txt index 34ea4f1fa6ea..104322bf378c 100644 --- a/trunk/Documentation/filesystems/ext4.txt +++ b/trunk/Documentation/filesystems/ext4.txt @@ -200,9 +200,12 @@ inode_readahead_blks=n This tuning parameter controls the maximum table readahead algorithm will pre-read into the buffer cache. The default value is 32 blocks. -nouser_xattr Disables Extended User Attributes. See the - attr(5) manual page and http://acl.bestbits.at/ - for more information about extended attributes. +nouser_xattr Disables Extended User Attributes. If you have extended + attribute support enabled in the kernel configuration + (CONFIG_EXT4_FS_XATTR), extended attribute support + is enabled by default on mount. See the attr(5) manual + page and http://acl.bestbits.at/ for more information + about extended attributes. noacl This option disables POSIX Access Control List support. If ACL support is enabled in the kernel diff --git a/trunk/Documentation/i2c/smbus-protocol b/trunk/Documentation/i2c/smbus-protocol index d1f22618e14b..49f5b680809d 100644 --- a/trunk/Documentation/i2c/smbus-protocol +++ b/trunk/Documentation/i2c/smbus-protocol @@ -23,12 +23,6 @@ don't match these function names. For some of the operations which pass a single data byte, the functions using SMBus protocol operation names execute a different protocol operation entirely. -Each transaction type corresponds to a functionality flag. Before calling a -transaction function, a device driver should always check (just once) for -the corresponding functionality flag to ensure that the underlying I2C -adapter supports the transaction in question. See - for the details. - Key to symbols ============== @@ -55,8 +49,6 @@ This sends a single bit to the device, at the place of the Rd/Wr bit. A Addr Rd/Wr [A] P -Functionality flag: I2C_FUNC_SMBUS_QUICK - SMBus Receive Byte: i2c_smbus_read_byte() ========================================== @@ -68,8 +60,6 @@ the previous SMBus command. S Addr Rd [A] [Data] NA P -Functionality flag: I2C_FUNC_SMBUS_READ_BYTE - SMBus Send Byte: i2c_smbus_write_byte() ======================================== @@ -79,8 +69,6 @@ to a device. See Receive Byte for more information. S Addr Wr [A] Data [A] P -Functionality flag: I2C_FUNC_SMBUS_WRITE_BYTE - SMBus Read Byte: i2c_smbus_read_byte_data() ============================================ @@ -90,8 +78,6 @@ The register is specified through the Comm byte. S Addr Wr [A] Comm [A] S Addr Rd [A] [Data] NA P -Functionality flag: I2C_FUNC_SMBUS_READ_BYTE_DATA - SMBus Read Word: i2c_smbus_read_word_data() ============================================ @@ -102,8 +88,6 @@ byte. But this time, the data is a complete word (16 bits). S Addr Wr [A] Comm [A] S Addr Rd [A] [DataLow] A [DataHigh] NA P -Functionality flag: I2C_FUNC_SMBUS_READ_WORD_DATA - Note the convenience function i2c_smbus_read_word_swapped is available for reads where the two data bytes are the other way around (not SMBus compliant, but very popular.) @@ -118,8 +102,6 @@ the Read Byte operation. S Addr Wr [A] Comm [A] Data [A] P -Functionality flag: I2C_FUNC_SMBUS_WRITE_BYTE_DATA - SMBus Write Word: i2c_smbus_write_word_data() ============================================== @@ -130,8 +112,6 @@ specified through the Comm byte. S Addr Wr [A] Comm [A] DataLow [A] DataHigh [A] P -Functionality flag: I2C_FUNC_SMBUS_WRITE_WORD_DATA - Note the convenience function i2c_smbus_write_word_swapped is available for writes where the two data bytes are the other way around (not SMBus compliant, but very popular.) @@ -146,8 +126,6 @@ This command selects a device register (through the Comm byte), sends S Addr Wr [A] Comm [A] DataLow [A] DataHigh [A] S Addr Rd [A] [DataLow] A [DataHigh] NA P -Functionality flag: I2C_FUNC_SMBUS_PROC_CALL - SMBus Block Read: i2c_smbus_read_block_data() ============================================== @@ -159,8 +137,6 @@ of data is specified by the device in the Count byte. S Addr Wr [A] Comm [A] S Addr Rd [A] [Count] A [Data] A [Data] A ... A [Data] NA P -Functionality flag: I2C_FUNC_SMBUS_READ_BLOCK_DATA - SMBus Block Write: i2c_smbus_write_block_data() ================================================ @@ -171,8 +147,6 @@ Comm byte. The amount of data is specified in the Count byte. S Addr Wr [A] Comm [A] Count [A] Data [A] Data [A] ... [A] Data [A] P -Functionality flag: I2C_FUNC_SMBUS_WRITE_BLOCK_DATA - SMBus Block Write - Block Read Process Call =========================================== @@ -186,8 +160,6 @@ This command selects a device register (through the Comm byte), sends S Addr Wr [A] Comm [A] Count [A] Data [A] ... S Addr Rd [A] [Count] A [Data] ... A P -Functionality flag: I2C_FUNC_SMBUS_BLOCK_PROC_CALL - SMBus Host Notify ================= @@ -257,7 +229,15 @@ designated register that is specified through the Comm byte. S Addr Wr [A] Comm [A] S Addr Rd [A] [Data] A [Data] A ... A [Data] NA P -Functionality flag: I2C_FUNC_SMBUS_READ_I2C_BLOCK + +I2C Block Read (2 Comm bytes) +============================= + +This command reads a block of bytes from a device, from a +designated register that is specified through the two Comm bytes. + +S Addr Wr [A] Comm1 [A] Comm2 [A] + S Addr Rd [A] [Data] A [Data] A ... A [Data] NA P I2C Block Write: i2c_smbus_write_i2c_block_data() @@ -269,5 +249,3 @@ Comm byte. Note that command lengths of 0, 2, or more bytes are supported as they are indistinguishable from data. S Addr Wr [A] Comm [A] Data [A] Data [A] ... [A] Data [A] P - -Functionality flag: I2C_FUNC_SMBUS_WRITE_I2C_BLOCK diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index ea8e5b485576..20e248cc03a9 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -2032,9 +2032,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. nr_uarts= [SERIAL] maximum number of UARTs to be registered. - numa_balancing= [KNL,X86] Enable or disable automatic NUMA balancing. - Allowed values are enable and disable - numa_zonelist_order= [KNL, BOOT] Select zonelist order for NUMA. one of ['zone', 'node', 'default'] can be specified This can be set from sysctl after boot. diff --git a/trunk/Documentation/kref.txt b/trunk/Documentation/kref.txt index ddf85a5dde0c..48ba715d5a63 100644 --- a/trunk/Documentation/kref.txt +++ b/trunk/Documentation/kref.txt @@ -213,91 +213,3 @@ presentation on krefs, which can be found at: and: http://www.kroah.com/linux/talks/ols_2004_kref_talk/ - -The above example could also be optimized using kref_get_unless_zero() in -the following way: - -static struct my_data *get_entry() -{ - struct my_data *entry = NULL; - mutex_lock(&mutex); - if (!list_empty(&q)) { - entry = container_of(q.next, struct my_data, link); - if (!kref_get_unless_zero(&entry->refcount)) - entry = NULL; - } - mutex_unlock(&mutex); - return entry; -} - -static void release_entry(struct kref *ref) -{ - struct my_data *entry = container_of(ref, struct my_data, refcount); - - mutex_lock(&mutex); - list_del(&entry->link); - mutex_unlock(&mutex); - kfree(entry); -} - -static void put_entry(struct my_data *entry) -{ - kref_put(&entry->refcount, release_entry); -} - -Which is useful to remove the mutex lock around kref_put() in put_entry(), but -it's important that kref_get_unless_zero is enclosed in the same critical -section that finds the entry in the lookup table, -otherwise kref_get_unless_zero may reference already freed memory. -Note that it is illegal to use kref_get_unless_zero without checking its -return value. If you are sure (by already having a valid pointer) that -kref_get_unless_zero() will return true, then use kref_get() instead. - -The function kref_get_unless_zero also makes it possible to use rcu -locking for lookups in the above example: - -struct my_data -{ - struct rcu_head rhead; - . - struct kref refcount; - . - . -}; - -static struct my_data *get_entry_rcu() -{ - struct my_data *entry = NULL; - rcu_read_lock(); - if (!list_empty(&q)) { - entry = container_of(q.next, struct my_data, link); - if (!kref_get_unless_zero(&entry->refcount)) - entry = NULL; - } - rcu_read_unlock(); - return entry; -} - -static void release_entry_rcu(struct kref *ref) -{ - struct my_data *entry = container_of(ref, struct my_data, refcount); - - mutex_lock(&mutex); - list_del_rcu(&entry->link); - mutex_unlock(&mutex); - kfree_rcu(entry, rhead); -} - -static void put_entry(struct my_data *entry) -{ - kref_put(&entry->refcount, release_entry_rcu); -} - -But note that the struct kref member needs to remain in valid memory for a -rcu grace period after release_entry_rcu was called. That can be accomplished -by using kfree_rcu(entry, rhead) as done above, or by calling synchronize_rcu() -before using kfree, but note that synchronize_rcu() may sleep for a -substantial amount of time. - - -Thomas Hellstrom diff --git a/trunk/Documentation/prctl/seccomp_filter.txt b/trunk/Documentation/prctl/seccomp_filter.txt index 1e469ef75778..597c3c581375 100644 --- a/trunk/Documentation/prctl/seccomp_filter.txt +++ b/trunk/Documentation/prctl/seccomp_filter.txt @@ -95,15 +95,12 @@ SECCOMP_RET_KILL: SECCOMP_RET_TRAP: Results in the kernel sending a SIGSYS signal to the triggering - task without executing the system call. siginfo->si_call_addr - will show the address of the system call instruction, and - siginfo->si_syscall and siginfo->si_arch will indicate which - syscall was attempted. The program counter will be as though - the syscall happened (i.e. it will not point to the syscall - instruction). The return value register will contain an arch- - dependent value -- if resuming execution, set it to something - sensible. (The architecture dependency is because replacing - it with -ENOSYS could overwrite some useful information.) + task without executing the system call. The kernel will + rollback the register state to just before the system call + entry such that a signal handler in the task will be able to + inspect the ucontext_t->uc_mcontext registers and emulate + system call success or failure upon return from the signal + handler. The SECCOMP_RET_DATA portion of the return value will be passed as si_errno. @@ -126,18 +123,6 @@ SECCOMP_RET_TRACE: the BPF program return value will be available to the tracer via PTRACE_GETEVENTMSG. - The tracer can skip the system call by changing the syscall number - to -1. Alternatively, the tracer can change the system call - requested by changing the system call to a valid syscall number. If - the tracer asks to skip the system call, then the system call will - appear to return the value that the tracer puts in the return value - register. - - The seccomp check will not be run again after the tracer is - notified. (This means that seccomp-based sandboxes MUST NOT - allow use of ptrace, even of other sandboxed processes, without - extreme care; ptracers can use this mechanism to escape.) - SECCOMP_RET_ALLOW: Results in the system call being executed. @@ -176,50 +161,3 @@ architecture supports both ptrace_event and seccomp, it will be able to support seccomp filter with minor fixup: SIGSYS support and seccomp return value checking. Then it must just add CONFIG_HAVE_ARCH_SECCOMP_FILTER to its arch-specific Kconfig. - - - -Caveats -------- - -The vDSO can cause some system calls to run entirely in userspace, -leading to surprises when you run programs on different machines that -fall back to real syscalls. To minimize these surprises on x86, make -sure you test with -/sys/devices/system/clocksource/clocksource0/current_clocksource set to -something like acpi_pm. - -On x86-64, vsyscall emulation is enabled by default. (vsyscalls are -legacy variants on vDSO calls.) Currently, emulated vsyscalls will honor seccomp, with a few oddities: - -- A return value of SECCOMP_RET_TRAP will set a si_call_addr pointing to - the vsyscall entry for the given call and not the address after the - 'syscall' instruction. Any code which wants to restart the call - should be aware that (a) a ret instruction has been emulated and (b) - trying to resume the syscall will again trigger the standard vsyscall - emulation security checks, making resuming the syscall mostly - pointless. - -- A return value of SECCOMP_RET_TRACE will signal the tracer as usual, - but the syscall may not be changed to another system call using the - orig_rax register. It may only be changed to -1 order to skip the - currently emulated call. Any other change MAY terminate the process. - The rip value seen by the tracer will be the syscall entry address; - this is different from normal behavior. The tracer MUST NOT modify - rip or rsp. (Do not rely on other changes terminating the process. - They might work. For example, on some kernels, choosing a syscall - that only exists in future kernels will be correctly emulated (by - returning -ENOSYS). - -To detect this quirky behavior, check for addr & ~0x0C00 == -0xFFFFFFFFFF600000. (For SECCOMP_RET_TRACE, use rip. For -SECCOMP_RET_TRAP, use siginfo->si_call_addr.) Do not check any other -condition: future kernels may improve vsyscall emulation and current -kernels in vsyscall=native mode will behave differently, but the -instructions at 0xF...F600{0,4,8,C}00 will not be system calls in these -cases. - -Note that modern systems are unlikely to use vsyscalls at all -- they -are a legacy feature and they are considerably slower than standard -syscalls. New code will use the vDSO, and vDSO-issued system calls -are indistinguishable from normal system calls. diff --git a/trunk/Documentation/security/keys.txt b/trunk/Documentation/security/keys.txt index 7b4145d00452..7d9ca92022d8 100644 --- a/trunk/Documentation/security/keys.txt +++ b/trunk/Documentation/security/keys.txt @@ -994,23 +994,6 @@ payload contents" for more information. reference pointer if successful. -(*) A keyring can be created by: - - struct key *keyring_alloc(const char *description, uid_t uid, gid_t gid, - const struct cred *cred, - key_perm_t perm, - unsigned long flags, - struct key *dest); - - This creates a keyring with the given attributes and returns it. If dest - is not NULL, the new keyring will be linked into the keyring to which it - points. No permission checks are made upon the destination keyring. - - Error EDQUOT can be returned if the keyring would overload the quota (pass - KEY_ALLOC_NOT_IN_QUOTA in flags if the keyring shouldn't be accounted - towards the user's quota). Error ENOMEM can also be returned. - - (*) To check the validity of a key, this function can be called: int validate_key(struct key *key); diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6892b26025ba..b95ae9b07121 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2549,15 +2549,6 @@ S: Supported F: drivers/gpu/drm/exynos F: include/drm/exynos* -DRM DRIVERS FOR NVIDIA TEGRA -M: Thierry Reding -L: dri-devel@lists.freedesktop.org -L: linux-tegra@vger.kernel.org -T: git git://gitorious.org/thierryreding/linux.git -S: Maintained -F: drivers/gpu/drm/tegra/ -F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt - DSCC4 DRIVER M: Francois Romieu L: netdev@vger.kernel.org @@ -3171,12 +3162,6 @@ F: drivers/video/ F: include/video/ F: include/linux/fb.h -FREESCALE DIU FRAMEBUFFER DRIVER -M: Timur Tabi -L: linux-fbdev@vger.kernel.org -S: Supported -F: drivers/video/fsl-diu-fb.* - FREESCALE DMA DRIVER M: Li Yang M: Zhang Wei @@ -3721,7 +3706,7 @@ I2C/SMBUS STUB DRIVER M: "Mark M. Hoffman" L: linux-i2c@vger.kernel.org S: Maintained -F: drivers/i2c/i2c-stub.c +F: drivers/i2c/busses/i2c-stub.c I2C SUBSYSTEM M: Wolfram Sang diff --git a/trunk/arch/arm/boot/dts/Makefile b/trunk/arch/arm/boot/dts/Makefile index ca6fb8e7f17d..0f441740c22a 100644 --- a/trunk/arch/arm/boot/dts/Makefile +++ b/trunk/arch/arm/boot/dts/Makefile @@ -131,8 +131,8 @@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \ spear320-evb.dtb \ spear320-hmi.dtb dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb -dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \ - sun5i-a13-olinuxino.dtb +dtb-$(CONFIG_ARCH_SUNXI) += sun4i-cubieboard.dtb \ + sun5i-olinuxino.dtb dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ tegra20-medcom-wide.dtb \ tegra20-paz00.dtb \ diff --git a/trunk/arch/arm/boot/dts/sun4i-cubieboard.dts b/trunk/arch/arm/boot/dts/sun4i-cubieboard.dts index 5cab82540437..f4ca126ad994 100644 --- a/trunk/arch/arm/boot/dts/sun4i-cubieboard.dts +++ b/trunk/arch/arm/boot/dts/sun4i-cubieboard.dts @@ -11,11 +11,11 @@ */ /dts-v1/; -/include/ "sun4i-a10.dtsi" +/include/ "sun4i.dtsi" / { model = "Cubietech Cubieboard"; - compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10"; + compatible = "cubietech,cubieboard", "allwinner,sun4i"; aliases { serial0 = &uart0; diff --git a/trunk/arch/arm/boot/dts/sun5i-olinuxino.dts b/trunk/arch/arm/boot/dts/sun5i-olinuxino.dts index 498a091a4ea2..d6ff889a5d87 100644 --- a/trunk/arch/arm/boot/dts/sun5i-olinuxino.dts +++ b/trunk/arch/arm/boot/dts/sun5i-olinuxino.dts @@ -12,11 +12,11 @@ */ /dts-v1/; -/include/ "sun5i-a13.dtsi" +/include/ "sun5i.dtsi" / { model = "Olimex A13-Olinuxino"; - compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13"; + compatible = "olimex,a13-olinuxino", "allwinner,sun5i"; chosen { bootargs = "earlyprintk console=ttyS0,115200"; diff --git a/trunk/arch/arm/mach-davinci/board-da850-evm.c b/trunk/arch/arm/mach-davinci/board-da850-evm.c index 0299915575a8..7211772edd9d 100644 --- a/trunk/arch/arm/mach-davinci/board-da850-evm.c +++ b/trunk/arch/arm/mach-davinci/board-da850-evm.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include diff --git a/trunk/arch/arm/mach-davinci/da830.c b/trunk/arch/arm/mach-davinci/da830.c index 678a54a64dae..510648e0394b 100644 --- a/trunk/arch/arm/mach-davinci/da830.c +++ b/trunk/arch/arm/mach-davinci/da830.c @@ -408,7 +408,7 @@ static struct clk_lookup da830_clks[] = { CLK(NULL, "pwm2", &pwm2_clk), CLK("eqep.0", NULL, &eqep0_clk), CLK("eqep.1", NULL, &eqep1_clk), - CLK("da8xx_lcdc.0", "fck", &lcdc_clk), + CLK("da8xx_lcdc.0", NULL, &lcdc_clk), CLK("davinci-mcasp.0", NULL, &mcasp0_clk), CLK("davinci-mcasp.1", NULL, &mcasp1_clk), CLK("davinci-mcasp.2", NULL, &mcasp2_clk), diff --git a/trunk/arch/arm/mach-davinci/da850.c b/trunk/arch/arm/mach-davinci/da850.c index 6b9154e9f908..68c5fe01857c 100644 --- a/trunk/arch/arm/mach-davinci/da850.c +++ b/trunk/arch/arm/mach-davinci/da850.c @@ -403,7 +403,7 @@ static struct clk_lookup da850_clks[] = { CLK(NULL, "rmii", &rmii_clk), CLK("davinci_emac.1", NULL, &emac_clk), CLK("davinci-mcasp.0", NULL, &mcasp_clk), - CLK("da8xx_lcdc.0", "fck", &lcdc_clk), + CLK("da8xx_lcdc.0", NULL, &lcdc_clk), CLK("davinci_mmc.0", NULL, &mmcsd0_clk), CLK("davinci_mmc.1", NULL, &mmcsd1_clk), CLK(NULL, "aemif", &aemif_clk), diff --git a/trunk/arch/arm/mach-davinci/devices-da8xx.c b/trunk/arch/arm/mach-davinci/devices-da8xx.c index fcdbe437409e..46c9a0c09ae5 100644 --- a/trunk/arch/arm/mach-davinci/devices-da8xx.c +++ b/trunk/arch/arm/mach-davinci/devices-da8xx.c @@ -589,9 +589,29 @@ int __init da8xx_register_uio_pruss(void) return platform_device_register(&da8xx_uio_pruss_dev); } +static const struct display_panel disp_panel = { + QVGA, + 16, + 16, + COLOR_ACTIVE, +}; + static struct lcd_ctrl_config lcd_cfg = { - .panel_shade = COLOR_ACTIVE, + &disp_panel, + .ac_bias = 255, + .ac_bias_intrpt = 0, + .dma_burst_sz = 16, .bpp = 16, + .fdd = 255, + .tft_alt_mode = 0, + .stn_565_mode = 0, + .mono_8bit_mode = 0, + .invert_line_clock = 1, + .invert_frm_clock = 1, + .sync_edge = 0, + .sync_ctrl = 1, + .raster_order = 0, + .fifo_th = 6, }; struct da8xx_lcdc_platform_data sharp_lcd035q3dg01_pdata = { diff --git a/trunk/arch/arm/mach-davinci/pm_domain.c b/trunk/arch/arm/mach-davinci/pm_domain.c index c90250e3bef8..00946e23c1ee 100644 --- a/trunk/arch/arm/mach-davinci/pm_domain.c +++ b/trunk/arch/arm/mach-davinci/pm_domain.c @@ -53,7 +53,6 @@ static struct dev_pm_domain davinci_pm_domain = { static struct pm_clk_notifier_block platform_bus_notifier = { .pm_domain = &davinci_pm_domain, - .con_ids = { "fck", NULL, }, }; static int __init davinci_pm_runtime_init(void) diff --git a/trunk/arch/arm/mach-exynos/common.h b/trunk/arch/arm/mach-exynos/common.h index 04744f9c120f..dac146df79ac 100644 --- a/trunk/arch/arm/mach-exynos/common.h +++ b/trunk/arch/arm/mach-exynos/common.h @@ -25,7 +25,7 @@ void exynos_init_late(void); #ifdef CONFIG_PM_GENERIC_DOMAINS int exynos_pm_late_initcall(void); #else -static inline int exynos_pm_late_initcall(void) { return 0; } +static int exynos_pm_late_initcall(void) { return 0; } #endif #ifdef CONFIG_ARCH_EXYNOS4 diff --git a/trunk/arch/arm/mach-omap2/board-rx51-video.c b/trunk/arch/arm/mach-omap2/board-rx51-video.c index 46f4fc982766..c22e111bcd00 100644 --- a/trunk/arch/arm/mach-omap2/board-rx51-video.c +++ b/trunk/arch/arm/mach-omap2/board-rx51-video.c @@ -16,6 +16,7 @@ #include #include #include