Merge branch 'defconfigs-for-arnd' of git://git.linaro.org/people/triad/linux-stericsson into fixes

98014be3 · Arnd Bergmann <[email protected]> · 2011-11-29 14:50:17 +00:00

Commit: 98014be39bda8277a5ad130bb274ed6eb18b74df
Parents: 55135dfb · 6e2a587e

Merge commit. Changes below are compared with the first parent: 55135dfb.

Changes

453 files changed · +3858 −3335

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-block	modified	+0	−13	View file
Documentation/DocBook/uio-howto.tmpl	modified	+6	−1	View file
Documentation/blockdev/cciss.txt	modified	+6	−8	View file
Documentation/i2c/ten-bit-addresses	modified	+19	−17	View file
Documentation/networking/ip-sysctl.txt	modified	+1	−1	View file
Documentation/serial/serial-rs485.txt	modified	+11	−3	View file
Documentation/sound/alsa/HD-Audio.txt	modified	+4	−4	View file
MAINTAINERS	modified	+21	−9	View file
Makefile	modified	+1	−1	View file
arch/arm/boot/Makefile	modified	+2	−0	View file
arch/arm/configs/u300_defconfig	modified	+6	−7	View file
arch/arm/configs/u8500_defconfig	modified	+5	−9	View file
arch/arm/include/asm/hardware/cache-l2x0.h	modified	+2	−0	View file
arch/arm/include/asm/mach/arch.h	modified	+1	−0	View file
arch/arm/include/asm/unistd.h	modified	+2	−0	View file
arch/arm/kernel/calls.S	modified	+2	−0	View file
arch/arm/kernel/head.S	modified	+1	−1	View file
arch/arm/kernel/machine_kexec.c	modified	+17	−18	View file
arch/arm/kernel/setup.c	modified	+4	−2	View file
arch/arm/mach-bcmring/core.c	modified	+1	−1	View file
arch/arm/mach-bcmring/dma.c	modified	+1	−0	View file
arch/arm/mach-shmobile/pm-sh7372.c	modified	+26	−7	View file
arch/arm/mach-w90x900/dev.c	modified	+2	−2	View file
arch/arm/mach-w90x900/include/mach/mfp.h	modified	+2	−1	View file
arch/arm/mach-w90x900/include/mach/nuc900_spi.h	modified	+1	−1	View file
arch/arm/mach-w90x900/mfp.c	modified	+42	−6	View file
arch/cris/arch-v10/drivers/Kconfig	modified	+1	−1	View file
arch/cris/arch-v32/drivers/Kconfig	modified	+1	−1	View file
arch/microblaze/include/asm/namei.h	deleted	+0	−22	View before deletion
arch/mips/cavium-octeon/flash_setup.c	modified	+2	−7	View file
arch/mips/cavium-octeon/smp.c	modified	+3	−2	View file
arch/mips/emma/common/prom.c	modified	+1	−1	View file
arch/mips/include/asm/mach-bcm47xx/gpio.h	modified	+15	−3	View file
arch/mips/include/asm/unistd.h	modified	+12	−6	View file
arch/mips/kernel/cevt-r4k.c	modified	+19	−19	View file
arch/mips/kernel/cpufreq/loongson2_clock.c	modified	+1	−0	View file
arch/mips/kernel/scall32-o32.S	modified	+2	−0	View file
arch/mips/kernel/scall64-64.S	modified	+2	−0	View file
arch/mips/kernel/scall64-n32.S	modified	+2	−0	View file
arch/mips/kernel/scall64-o32.S	modified	+2	−0	View file
arch/mips/kernel/traps.c	modified	+2	−1	View file
arch/mips/lantiq/clk.c	modified	+1	−1	View file
arch/mips/lantiq/devices.c	modified	+1	−1	View file
arch/mips/lantiq/prom.c	modified	+1	−1	View file
arch/mips/lantiq/setup.c	modified	+1	−1	View file
arch/mips/lantiq/xway/clk-ase.c	modified	+1	−1	View file
arch/mips/lantiq/xway/clk-xway.c	modified	+1	−1	View file
arch/mips/lantiq/xway/devices.c	modified	+1	−1	View file
arch/mips/lantiq/xway/dma.c	modified	+1	−0	View file
arch/mips/lantiq/xway/gpio.c	modified	+1	−1	View file
arch/mips/lantiq/xway/gpio_ebu.c	modified	+1	−1	View file
arch/mips/lantiq/xway/gpio_stp.c	modified	+1	−1	View file
arch/mips/lantiq/xway/prom-ase.c	modified	+1	−1	View file
arch/mips/lantiq/xway/prom-xway.c	modified	+1	−1	View file
arch/mips/lantiq/xway/reset.c	modified	+1	−1	View file
arch/mips/nxp/pnx8550/common/pci.c	deleted	+0	−134	View before deletion
arch/mips/nxp/pnx8550/common/setup.c	deleted	+0	−143	View before deletion
arch/mips/pci/pci-alchemy.c	modified	+1	−0	View file
arch/mips/pci/pci-lantiq.c	modified	+1	−0	View file
arch/mips/pmc-sierra/yosemite/prom.c	modified	+1	−1	View file
arch/powerpc/Kconfig	modified	+1	−1	View file
arch/powerpc/Makefile	modified	+0	−6	View file
arch/powerpc/include/asm/atomic.h	modified	+24	−24	View file
arch/powerpc/include/asm/bitops.h	modified	+6	−6	View file
arch/powerpc/include/asm/futex.h	modified	+4	−3	View file
arch/powerpc/include/asm/kvm.h	modified	+0	−8	View file
arch/powerpc/include/asm/kvm_book3s.h	modified	+0	−2	View file
arch/powerpc/include/asm/reg_booke.h	modified	+1	−1	View file
arch/powerpc/include/asm/sections.h	modified	+1	−1	View file
arch/powerpc/include/asm/synch.h	modified	+7	−2	View file
arch/powerpc/kernel/entry_32.S	modified	+15	−0	View file
arch/powerpc/kernel/jump_label.c	modified	+2	−0	View file
arch/powerpc/kernel/kvm.c	modified	+0	−1	View file
arch/powerpc/kernel/misc_32.S	modified	+1	−1	View file
arch/powerpc/kernel/process.c	modified	+1	−23	View file
arch/powerpc/kernel/prom_init.c	modified	+2	−4	View file
arch/powerpc/kernel/setup_32.c	modified	+2	−0	View file
arch/powerpc/kernel/setup_64.c	modified	+1	−0	View file
arch/powerpc/kernel/signal_32.c	modified	+1	−1	View file
arch/powerpc/kernel/traps.c	modified	+0	−2	View file
arch/powerpc/kvm/book3s_hv.c	modified	+1	−0	View file
arch/powerpc/kvm/book3s_pr.c	modified	+2	−12	View file
arch/powerpc/kvm/powerpc.c	modified	+0	−1	View file
arch/powerpc/lib/feature-fixups.c	modified	+23	−0	View file
arch/powerpc/platforms/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/ps3/interrupt.c	modified	+22	−1	View file
arch/powerpc/platforms/ps3/platform.h	modified	+1	−0	View file
arch/powerpc/platforms/ps3/smp.c	modified	+32	−30	View file
arch/s390/Kconfig	modified	+1	−0	View file
arch/s390/crypto/crypt_s390.h	modified	+5	−2	View file
arch/s390/include/asm/kvm_host.h	modified	+2	−1	View file
arch/s390/include/asm/pgtable.h	modified	+9	−3	View file
arch/s390/include/asm/setup.h	modified	+3	−0	View file
arch/s390/include/asm/timex.h	modified	+1	−1	View file
arch/s390/include/asm/unistd.h	modified	+3	−1	View file
arch/s390/kernel/compat_wrapper.S	modified	+20	−0	View file
arch/s390/kernel/early.c	modified	+2	−0	View file
arch/s390/kernel/setup.c	modified	+3	−1	View file
arch/s390/kernel/syscalls.S	modified	+2	−0	View file
arch/s390/kernel/topology.c	modified	+38	−7	View file
arch/s390/kernel/vmlinux.lds.S	modified	+2	−0	View file
arch/s390/kvm/diag.c	modified	+1	−1	View file
arch/s390/kvm/intercept.c	modified	+2	−1	View file
arch/s390/kvm/interrupt.c	modified	+1	−0	View file
arch/s390/kvm/kvm-s390.c	modified	+9	−3	View file
arch/s390/kvm/priv.c	modified	+8	−2	View file
arch/s390/kvm/sigp.c	modified	+42	−3	View file
arch/s390/mm/fault.c	modified	+7	−2	View file
arch/sparc/include/asm/pgtable_32.h	modified	+16	−4	View file
arch/sparc/include/asm/pgtable_64.h	modified	+16	−4	View file
arch/sparc/kernel/entry.h	modified	+7	−0	View file
arch/sparc/kernel/module.c	modified	+27	−0	View file
arch/sparc/kernel/setup_64.c	modified	+29	−19	View file
arch/sparc/kernel/signal32.c	modified	+10	−8	View file
arch/sparc/kernel/signal_32.c	modified	+25	−5	View file
arch/sparc/kernel/signal_64.c	modified	+28	−14	View file
arch/sparc/kernel/sigutil_64.c	modified	+1	−0	View file
arch/sparc/mm/Makefile	modified	+0	−1	View file
arch/sparc/mm/generic_32.c	deleted	+0	−99	View before deletion
arch/sparc/mm/generic_64.c	deleted	+0	−165	View before deletion
arch/unicore32/Kconfig	modified	+2	−2	View file
arch/unicore32/Kconfig.debug	modified	+0	−14	View file
arch/unicore32/boot/compressed/Makefile	modified	+2	−2	View file
arch/unicore32/include/asm/bitops.h	modified	+6	−6	View file
arch/unicore32/include/asm/processor.h	modified	+0	−1	View file
arch/unicore32/kernel/ksyms.c	modified	+2	−2	View file
arch/unicore32/lib/findbit.S	modified	+8	−6	View file
arch/x86/include/asm/apic.h	modified	+1	−0	View file
arch/x86/include/asm/mach_traps.h	modified	+1	−1	View file
arch/x86/include/asm/mce.h	modified	+4	−1	View file
arch/x86/include/asm/mrst.h	modified	+7	−0	View file
arch/x86/include/asm/x86_init.h	modified	+3	−0	View file
arch/x86/kernel/alternative.c	modified	+1	−1	View file
arch/x86/kernel/apic/apic.c	modified	+26	−7	View file
arch/x86/kernel/apic/io_apic.c	modified	+6	−3	View file
arch/x86/kernel/cpu/mcheck/mce-inject.c	modified	+1	−1	View file
arch/x86/kernel/cpu/mcheck/mce.c	modified	+22	−3	View file
arch/x86/kernel/kvmclock.c	modified	+3	−2	View file
arch/x86/kernel/nmi.c	modified	+2	−1	View file
arch/x86/kernel/setup.c	modified	+2	−0	View file
arch/x86/kernel/x86_init.c	modified	+4	−0	View file
arch/x86/kvm/vmx.c	modified	+119	−12	View file
arch/x86/platform/mrst/mrst.c	modified	+41	−5	View file
arch/x86/um/asm/processor.h	modified	+1	−1	View file
arch/x86/xen/enlighten.c	modified	+1	−2	View file
arch/x86/xen/grant-table.c	modified	+1	−1	View file
block/blk-core.c	modified	+11	−7	View file
block/blk-map.c	modified	+4	−3	View file
block/genhd.c	modified	+0	−71	View file
drivers/ata/ahci_platform.c	modified	+1	−1	View file
drivers/ata/libata-sff.c	modified	+4	−0	View file
drivers/base/core.c	modified	+3	−0	View file
drivers/base/node.c	modified	+8	−6	View file
drivers/base/power/clock_ops.c	modified	+2	−1	View file
drivers/base/power/main.c	modified	+2	−1	View file
drivers/base/power/qos.c	modified	+6	−12	View file
drivers/block/cciss.c	modified	+6	−0	View file
drivers/block/cciss_scsi.c	modified	+1	−0	View file
drivers/block/loop.c	modified	+31	−16	View file
drivers/block/paride/pg.c	modified	+1	−0	View file
drivers/bluetooth/btusb.c	modified	+3	−0	View file
drivers/char/random.c	modified	+1	−1	View file
drivers/devfreq/Kconfig	modified	+17	−24	View file
drivers/devfreq/devfreq.c	modified	+8	−2	View file
drivers/firmware/dmi_scan.c	modified	+2	−4	View file
drivers/gpu/drm/drm_crtc.c	modified	+4	−0	View file
drivers/gpu/drm/drm_irq.c	modified	+0	−9	View file
drivers/gpu/drm/i915/i915_debugfs.c	modified	+51	−6	View file
drivers/gpu/drm/i915/i915_drv.c	modified	+3	−3	View file
drivers/gpu/drm/i915/i915_drv.h	modified	+10	−9	View file
drivers/gpu/drm/i915/i915_gem.c	modified	+7	−5	View file
drivers/gpu/drm/i915/i915_irq.c	modified	+1	−0	View file
drivers/gpu/drm/i915/i915_reg.h	modified	+17	−4	View file
drivers/gpu/drm/i915/i915_suspend.c	modified	+2	−0	View file
drivers/gpu/drm/i915/intel_display.c	modified	+24	−9	View file
drivers/gpu/drm/i915/intel_dp.c	modified	+237	−174	View file
drivers/gpu/drm/i915/intel_panel.c	modified	+2	−1	View file
drivers/gpu/drm/radeon/evergreen_cs.c	modified	+50	−42	View file
drivers/gpu/drm/radeon/r300.c	modified	+51	−43	View file
drivers/gpu/drm/radeon/r600_cs.c	modified	+16	−10	View file
drivers/gpu/drm/radeon/radeon.h	modified	+2	−1	View file
drivers/gpu/drm/radeon/radeon_atombios.c	modified	+91	−119	View file
drivers/gpu/drm/radeon/radeon_cs.c	modified	+10	−1	View file
drivers/gpu/drm/radeon/radeon_drv.c	modified	+2	−1	View file
drivers/gpu/drm/ttm/ttm_bo.c	modified	+7	−1	View file
drivers/gpu/vga/vgaarb.c	modified	+33	−29	View file
drivers/hwmon/Kconfig	modified	+1	−1	View file
drivers/i2c/algos/i2c-algo-bit.c	modified	+2	−2	View file
drivers/i2c/i2c-core.c	modified	+3	−1	View file
drivers/i2c/i2c-dev.c	modified	+1	−1	View file
drivers/ide/cy82c693.c	modified	+3	−3	View file
drivers/ide/icside.c	modified	+1	−1	View file
drivers/ide/piix.c	modified	+10	−8	View file
drivers/ide/triflex.c	modified	+15	−1	View file
drivers/input/mouse/elantech.c	modified	+18	−8	View file
drivers/input/serio/ams_delta_serio.c	modified	+1	−0	View file
drivers/input/serio/i8042-x86ia64io.h	modified	+14	−0	View file
drivers/leds/led-class.c	modified	+1	−4	View file
drivers/misc/Kconfig	modified	+8	−7	View file
drivers/misc/ad525x_dpot.h	modified	+1	−1	View file
drivers/misc/carma/carma-fpga-program.c	modified	+4	−5	View file
drivers/misc/carma/carma-fpga.c	modified	+4	−5	View file
drivers/misc/eeprom/Kconfig	modified	+1	−1	View file
drivers/misc/pch_phub.c	modified	+59	−22	View file
drivers/misc/spear13xx_pcie_gadget.c	modified	+1	−1	View file
drivers/net/Kconfig	modified	+2	−0	View file
drivers/net/bonding/bond_sysfs.c	modified	+7	−0	View file
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	modified	+29	−21	View file
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c	modified	+6	−9	View file
drivers/net/ethernet/cadence/Kconfig	modified	+1	−0	View file
drivers/net/ethernet/lantiq_etop.c	modified	+2	−0	View file
drivers/net/ethernet/marvell/sky2.c	modified	+68	−38	View file
drivers/net/ethernet/marvell/sky2.h	modified	+1	−0	View file
drivers/net/ethernet/mellanox/mlx4/en_rx.c	modified	+5	−1	View file
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h	modified	+1	−0	View file
drivers/net/ethernet/nvidia/forcedeth.c	modified	+27	−9	View file
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c	modified	+1	−1	View file
drivers/net/ethernet/rdc/r6040.c	modified	+1	−1	View file
drivers/net/ethernet/realtek/r8169.c	modified	+1	−1	View file
drivers/net/ethernet/smsc/smsc911x.c	modified	+12	−0	View file
drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c	modified	+2	−1	View file
drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c	modified	+2	−1	View file
drivers/net/ethernet/stmicro/stmmac/stmmac.h	modified	+1	−1	View file
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c	modified	+6	−0	View file
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	modified	+76	−41	View file
drivers/net/ethernet/sun/sunhme.c	modified	+1	−1	View file
drivers/net/ethernet/xilinx/ll_temac_main.c	modified	+6	−1	View file
drivers/net/hippi/Kconfig	modified	+1	−1	View file
drivers/net/usb/asix.c	modified	+52	−16	View file
drivers/net/usb/cdc_ether.c	modified	+1	−1	View file
drivers/net/usb/lg-vl600.c	modified	+11	−14	View file
drivers/net/usb/smsc75xx.c	modified	+4	−3	View file
drivers/net/wireless/ath/regd.c	modified	+2	−0	View file
drivers/net/wireless/b43/xmit.c	modified	+13	−2	View file
drivers/net/wireless/b43/xmit.h	modified	+15	−1	View file
drivers/net/wireless/brcm80211/brcmsmac/dma.c	modified	+3	−2	View file
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c	modified	+17	−16	View file
drivers/net/wireless/libertas/cfg.c	modified	+1	−1	View file
drivers/net/wireless/libertas/if_spi.c	modified	+1	−0	View file
drivers/net/wireless/mwifiex/scan.c	modified	+6	−3	View file
drivers/net/wireless/rt2x00/rt2800usb.c	modified	+1	−0	View file
drivers/net/wireless/rt2x00/rt2x00.h	modified	+1	−0	View file
drivers/net/wireless/rt2x00/rt2x00dev.c	modified	+20	−2	View file
drivers/net/wireless/wl12xx/scan.c	modified	+1	−1	View file
drivers/of/irq.c	modified	+7	−7	View file
drivers/pci/Kconfig	modified	+1	−0	View file
drivers/pci/hotplug/acpiphp_glue.c	modified	+24	−5	View file
drivers/pci/hotplug/pciehp_ctrl.c	modified	+0	−3	View file
drivers/pci/hotplug/pciehp_hpc.c	modified	+18	−9	View file
drivers/pci/hotplug/shpchp_core.c	modified	+2	−2	View file
drivers/pci/hotplug/shpchp_hpc.c	modified	+2	−2	View file
drivers/platform/x86/dell-laptop.c	modified	+2	−2	View file
drivers/regulator/tps65910-regulator.c	modified	+8	−6	View file
drivers/rtc/rtc-puv3.c	modified	+2	−2	View file
drivers/s390/char/zcore.c	modified	+2	−0	View file
drivers/s390/crypto/ap_bus.c	modified	+17	−6	View file
drivers/s390/net/Kconfig	modified	+1	−1	View file
drivers/s390/net/lcs.c	modified	+3	−3	View file
drivers/s390/net/netiucv.c	modified	+2	−0	View file
drivers/s390/net/qeth_core.h	modified	+1	−2	View file
drivers/s390/net/qeth_core_main.c	modified	+0	−1	View file
drivers/s390/net/qeth_l3_main.c	modified	+7	−0	View file
drivers/s390/net/qeth_l3_sys.c	modified	+2	−2	View file
drivers/scsi/aacraid/linit.c	modified	+4	−0	View file
drivers/scsi/hpsa.c	modified	+5	−0	View file
drivers/scsi/mpt2sas/mpt2sas_scsih.c	modified	+5	−0	View file
drivers/scsi/scsi_lib.c	modified	+2	−1	View file
drivers/scsi/scsi_scan.c	modified	+1	−5	View file
drivers/spi/spi-pl022.c	modified	+8	−0	View file
drivers/staging/et131x/Kconfig	modified	+2	−1	View file
drivers/staging/et131x/et131x.c	modified	+6	−6	View file
drivers/staging/iio/industrialio-core.c	modified	+9	−1	View file
drivers/staging/media/as102/as102_drv.c	modified	+2	−2	View file
drivers/staging/media/as102/as102_drv.h	modified	+2	−1	View file
drivers/staging/octeon/ethernet-tx.c	modified	+1	−1	View file
drivers/staging/slicoss/Kconfig	modified	+1	−1	View file
drivers/tty/hvc/hvc_dcc.c	modified	+2	−0	View file
drivers/tty/serial/Kconfig	modified	+7	−7	View file
drivers/tty/serial/atmel_serial.c	modified	+3	−13	View file
drivers/tty/serial/crisv10.c	modified	+2	−8	View file
drivers/tty/serial/mfd.c	modified	+1	−3	View file
drivers/tty/serial/pch_uart.c	modified	+14	−5	View file
drivers/tty/tty_ldisc.c	modified	+23	−7	View file
drivers/usb/class/cdc-acm.c	modified	+5	−3	View file
drivers/usb/core/hub.c	modified	+6	−0	View file
drivers/usb/core/quirks.c	modified	+27	−0	View file
drivers/usb/dwc3/gadget.c	modified	+1	−0	View file
drivers/usb/gadget/Kconfig	modified	+5	−4	View file
drivers/usb/gadget/ci13xxx_msm.c	modified	+2	−0	View file
drivers/usb/gadget/ci13xxx_udc.c	modified	+13	−8	View file
drivers/usb/gadget/f_mass_storage.c	modified	+4	−2	View file
drivers/usb/gadget/f_midi.c	modified	+65	−73	View file
drivers/usb/gadget/f_phonet.c	modified	+1	−1	View file
drivers/usb/gadget/file_storage.c	modified	+2	−2	View file
drivers/usb/gadget/fsl_udc_core.c	modified	+2	−3	View file
drivers/usb/gadget/inode.c	modified	+3	−2	View file
drivers/usb/gadget/pch_udc.c	modified	+8	−2	View file
drivers/usb/gadget/r8a66597-udc.c	modified	+11	−19	View file
drivers/usb/gadget/udc-core.c	modified	+5	−5	View file
drivers/usb/host/ehci-sched.c	modified	+10	−5	View file
drivers/usb/host/ehci-xls.c	modified	+1	−1	View file
drivers/usb/host/ohci-at91.c	modified	+6	−0	View file
drivers/usb/host/ohci-hcd.c	modified	+6	−9	View file
drivers/usb/host/ohci-pci.c	modified	+0	−26	View file
drivers/usb/host/ohci.h	modified	+0	−1	View file
drivers/usb/host/pci-quirks.c	modified	+25	−32	View file
drivers/usb/host/xhci-mem.c	modified	+0	−5	View file
drivers/usb/host/xhci-ring.c	modified	+7	−6	View file
drivers/usb/host/xhci.c	modified	+18	−16	View file
drivers/usb/musb/Kconfig	modified	+2	−1	View file
drivers/usb/musb/am35x.c	modified	+1	−0	View file
drivers/usb/musb/da8xx.c	modified	+1	−0	View file
drivers/usb/musb/musb_core.c	modified	+1	−2	View file
drivers/usb/musb/musb_gadget.c	modified	+0	−4	View file
drivers/usb/renesas_usbhs/common.c	modified	+1	−1	View file
drivers/usb/renesas_usbhs/fifo.c	modified	+2	−2	View file
drivers/usb/renesas_usbhs/mod.h	modified	+4	−4	View file
drivers/usb/renesas_usbhs/mod_gadget.c	modified	+2	−2	View file
drivers/usb/renesas_usbhs/mod_host.c	modified	+39	−24	View file
drivers/usb/serial/ark3116.c	modified	+5	−5	View file
drivers/usb/serial/ftdi_sio.c	modified	+11	−3	View file
drivers/usb/serial/option.c	modified	+28	−0	View file
drivers/usb/serial/pl2303.c	modified	+0	−1	View file
drivers/usb/serial/pl2303.h	modified	+0	−4	View file
drivers/usb/storage/ene_ub6250.c	modified	+1	−2	View file
drivers/usb/storage/protocol.c	modified	+3	−4	View file
drivers/virtio/Kconfig	modified	+1	−1	View file
drivers/virtio/virtio_mmio.c	modified	+1	−1	View file
drivers/virtio/virtio_pci.c	modified	+18	−0	View file
drivers/watchdog/Kconfig	modified	+0	−7	View file
drivers/watchdog/Makefile	modified	+0	−1	View file
drivers/watchdog/adx_wdt.c	deleted	+0	−355	View before deletion
drivers/watchdog/s3c2410_wdt.c	modified	+2	−2	View file
drivers/watchdog/wm831x_wdt.c	modified	+1	−1	View file
drivers/xen/balloon.c	modified	+2	−2	View file
drivers/xen/gntalloc.c	modified	+2	−2	View file
drivers/xen/gntdev.c	modified	+5	−5	View file
drivers/xen/xenbus/xenbus_client.c	modified	+8	−3	View file
fs/bio.c	modified	+4	−3	View file
fs/btrfs/backref.c	modified	+1	−1	View file
fs/btrfs/ctree.c	modified	+16	−1	View file
fs/btrfs/ctree.h	modified	+4	−1	View file
fs/btrfs/disk-io.c	modified	+129	−18	View file
fs/btrfs/extent-tree.c	modified	+79	−40	View file
fs/btrfs/extent_io.c	modified	+6	−3	View file
fs/btrfs/extent_io.h	modified	+1	−1	View file
fs/btrfs/free-space-cache.c	modified	+26	−37	View file
fs/btrfs/inode.c	modified	+4	−2	View file
fs/btrfs/ioctl.c	modified	+9	−6	View file
fs/btrfs/scrub.c	modified	+1	−1	View file
fs/btrfs/super.c	modified	+6	−32	View file
fs/btrfs/transaction.c	modified	+8	−0	View file
fs/btrfs/volumes.h	modified	+6	−0	View file
fs/ceph/dir.c	modified	+1	−1	View file
fs/ceph/inode.c	modified	+6	−3	View file
fs/ceph/super.c	modified	+4	−2	View file
fs/dcache.c	modified	+10	−1	View file
fs/ecryptfs/crypto.c	modified	+14	−12	View file
fs/ecryptfs/ecryptfs_kernel.h	modified	+3	−2	View file
fs/ecryptfs/file.c	modified	+22	−1	View file
fs/ecryptfs/inode.c	modified	+31	−21	View file
fs/ext4/balloc.c	modified	+1	−1	View file
fs/ext4/inode.c	modified	+1	−0	View file
fs/ext4/super.c	modified	+3	−3	View file
fs/minix/bitmap.c	modified	+24	−31	View file
fs/minix/inode.c	modified	+23	−2	View file
fs/minix/minix.h	modified	+8	−3	View file
fs/namespace.c	modified	+32	−0	View file
fs/nfs/dir.c	modified	+1	−1	View file
fs/nfs/file.c	modified	+51	−40	View file
fs/nfs/inode.c	modified	+1	−1	View file
fs/nfs/internal.h	modified	+2	−0	View file
fs/nfs/nfs3proc.c	modified	+1	−0	View file
fs/nfs/nfs4proc.c	modified	+2	−2	View file
fs/nfs/pnfs.c	modified	+21	−5	View file
fs/nfs/proc.c	modified	+1	−0	View file
fs/nfs/read.c	modified	+2	−12	View file
fs/nfs/super.c	modified	+6	−31	View file
fs/xfs/xfs_qm.c	modified	+2	−1	View file
include/drm/drm_mode.h	modified	+2	−0	View file
include/drm/drm_pciids.h	modified	+2	−0	View file
include/drm/radeon_drm.h	modified	+4	−0	View file
include/linux/bio.h	modified	+7	−3	View file
include/linux/ceph/osd_client.h	modified	+7	−1	View file
include/linux/device.h	modified	+6	−1	View file
include/linux/fs.h	modified	+1	−0	View file
include/linux/genhd.h	modified	+0	−4	View file
include/linux/hugetlb.h	modified	+0	−5	View file
include/linux/i2c.h	modified	+0	−3	View file
include/linux/inet_diag.h	modified	+2	−1	View file
include/linux/init_task.h	modified	+0	−1	View file
include/linux/kvm.h	modified	+0	−1	View file
include/linux/mfd/tps65910.h	modified	+2	−1	View file
include/linux/nfs_fs.h	modified	+3	−0	View file
include/linux/nfs_xdr.h	modified	+1	−0	View file
include/linux/pci-ats.h	modified	+3	−3	View file
include/linux/pci.h	modified	+1	−1	View file
include/linux/pm.h	modified	+1	−1	View file
include/linux/pm_runtime.h	modified	+0	−6	View file
include/linux/sched.h	modified	+0	−1	View file
include/linux/serial.h	modified	+8	−6	View file
include/linux/virtio_config.h	modified	+2	−0	View file
include/linux/virtio_mmio.h	modified	+1	−1	View file
include/linux/vmalloc.h	modified	+1	−1	View file
include/net/bluetooth/l2cap.h	modified	+5	−2	View file
include/net/cfg80211.h	modified	+4	−0	View file
include/xen/platform_pci.h	modified	+2	−4	View file
kernel/fork.c	modified	+0	−5	View file
kernel/irq/spurious.c	modified	+1	−1	View file
kernel/power/hibernate.c	modified	+17	−6	View file
kernel/power/main.c	modified	+2	−1	View file
mm/backing-dev.c	modified	+8	−0	View file
mm/hugetlb.c	modified	+2	−0	View file
mm/nommu.c	modified	+1	−1	View file
mm/oom_kill.c	modified	+5	−0	View file
mm/page-writeback.c	modified	+7	−16	View file
mm/vmalloc.c	modified	+13	−14	View file
net/bluetooth/hci_conn.c	modified	+1	−1	View file
net/bluetooth/l2cap_core.c	modified	+8	−8	View file
net/bridge/br_multicast.c	modified	+4	−2	View file
net/ceph/osd_client.c	modified	+1	−1	View file
net/ipv4/ah4.c	modified	+2	−6	View file
net/ipv4/inet_diag.c	modified	+2	−2	View file
net/ipv4/ip_options.c	modified	+1	−0	View file
net/ipv4/ping.c	modified	+0	−2	View file
net/ipv4/route.c	modified	+66	−54	View file
net/ipv4/tcp_ipv4.c	modified	+1	−0	View file
net/ipv4/tcp_output.c	modified	+1	−1	View file
net/ipv6/ah6.c	modified	+2	−6	View file
net/ipv6/ip6_input.c	modified	+8	−0	View file
net/ipv6/ip6_tunnel.c	modified	+7	−1	View file
net/l2tp/l2tp_core.c	modified	+4	−4	View file
net/mac80211/mlme.c	modified	+20	−1	View file
net/mac80211/rx.c	modified	+6	−3	View file
net/mac80211/sta_info.c	modified	+4	−4	View file
net/mac80211/util.c	modified	+4	−0	View file
net/rds/Kconfig	modified	+0	−1	View file
net/sunrpc/xprtsock.c	modified	+3	−1	View file
net/wireless/nl80211.c	modified	+7	−2	View file
net/wireless/reg.c	modified	+3	−0	View file
net/wireless/scan.c	modified	+8	−5	View file
security/keys/encrypted-keys/Makefile	modified	+6	−2	View file
security/keys/encrypted-keys/encrypted.c	modified	+1	−1	View file
security/keys/encrypted-keys/encrypted.h	modified	+2	−1	View file
security/keys/user_defined.c	modified	+2	−1	View file
security/smack/smackfs.c	modified	+39	−76	View file
sound/pci/hda/hda_eld.c	modified	+9	−4	View file
sound/pci/hda/hda_local.h	modified	+3	−0	View file
sound/pci/hda/patch_cirrus.c	modified	+13	−10	View file
sound/pci/hda/patch_hdmi.c	modified	+33	−22	View file
sound/pci/hda/patch_realtek.c	modified	+1	−1	View file
sound/pci/hda/patch_sigmatel.c	modified	+9	−24	View file
tools/testing/ktest/ktest.pl	modified	+16	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/testing/sysfs-block

View file

diff --git a/Documentation/ABI/testing/sysfs-block b/Documentation/ABI/testing/sysfs-block
index 2b5d561..c1eb41c 100644
--- a/Documentation/ABI/testing/sysfs-block
+++ b/Documentation/ABI/testing/sysfs-block
@@ -206,16 +206,3 @@ Description:
 		when a discarded area is read the discard_zeroes_data
 		parameter will be set to one. Otherwise it will be 0 and
 		the result of reading a discarded area is undefined.
-What:		/sys/block/<disk>/alias
-Date:		Aug 2011
-Contact:	Nao Nishijima <[email protected]>
-Description:
-		A raw device name of a disk does not always point a same disk
-		each boot-up time. Therefore, users have to use persistent
-		device names, which udev creates when the kernel finds a disk,
-		instead of raw device name. However, kernel doesn't show those
-		persistent names on its messages (e.g. dmesg).
-		This file can store an alias of the disk and it would be
-		appeared in kernel messages if it is set. A disk can have an
-		alias which length is up to 255bytes. Users can use alphabets,
-		numbers, "-" and "_" in alias name. This file is writeonce.

Documentation/DocBook/uio-howto.tmpl

View file

diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl
index 54883de..ac3d001 100644
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
@@ -521,6 +521,11 @@ Here's a description of the fields of <varname>struct uio_mem</varname>:
 
 <itemizedlist>
 <listitem><para>
+<varname>const char *name</varname>: Optional. Set this to help identify
+the memory region, it will show up in the corresponding sysfs node.
+</para></listitem>
+
+<listitem><para>
 <varname>int memtype</varname>: Required if the mapping is used. Set this to
 <varname>UIO_MEM_PHYS</varname> if you you have physical memory on your
 card to be mapped. Use <varname>UIO_MEM_LOGICAL</varname> for logical
@@ -553,7 +558,7 @@ instead to remember such an address.
 </itemizedlist>
 
 <para>
-Please do not touch the <varname>kobj</varname> element of
+Please do not touch the <varname>map</varname> element of
 <varname>struct uio_mem</varname>! It is used by the UIO framework
 to set up sysfs files for this mapping. Simply leave it alone.
 </para>

Documentation/blockdev/cciss.txt

View file

diff --git a/Documentation/blockdev/cciss.txt b/Documentation/blockdev/cciss.txt
index 71464e0..b79d0a1 100644
--- a/Documentation/blockdev/cciss.txt
+++ b/Documentation/blockdev/cciss.txt
@@ -98,14 +98,12 @@ You must enable "SCSI tape drive support for Smart Array 5xxx" and
 "SCSI support" in your kernel configuration to be able to use SCSI
 tape drives with your Smart Array 5xxx controller.
 
-Additionally, note that the driver will not engage the SCSI core at init 
-time.  The driver must be directed to dynamically engage the SCSI core via 
-the /proc filesystem entry which the "block" side of the driver creates as 
-/proc/driver/cciss/cciss* at runtime.  This is because at driver init time, 
-the SCSI core may not yet be initialized (because the driver is a block 
-driver) and attempting to register it with the SCSI core in such a case 
-would cause a hang.  This is best done via an initialization script 
-(typically in /etc/init.d, but could vary depending on distribution). 
+Additionally, note that the driver will engage the SCSI core at init
+time if any tape drives or medium changers are detected.  The driver may
+also be directed to dynamically engage the SCSI core via the /proc filesystem
+entry which the "block" side of the driver creates as
+/proc/driver/cciss/cciss* at runtime.  This is best done via a script.
+
 For example:
 
 	for x in /proc/driver/cciss/cciss[0-9]*

Documentation/i2c/ten-bit-addresses

View file

diff --git a/Documentation/i2c/ten-bit-addresses b/Documentation/i2c/ten-bit-addresses
index e989070..cdfe139 100644
--- a/Documentation/i2c/ten-bit-addresses
+++ b/Documentation/i2c/ten-bit-addresses
@@ -1,22 +1,24 @@
 The I2C protocol knows about two kinds of device addresses: normal 7 bit
 addresses, and an extended set of 10 bit addresses. The sets of addresses
 do not intersect: the 7 bit address 0x10 is not the same as the 10 bit
-address 0x10 (though a single device could respond to both of them). You
-select a 10 bit address by adding an extra byte after the address
-byte:
-  S Addr7 Rd/Wr ....
-becomes
-  S 11110 Addr10 Rd/Wr
-S is the start bit, Rd/Wr the read/write bit, and if you count the number
-of bits, you will see the there are 8 after the S bit for 7 bit addresses,
-and 16 after the S bit for 10 bit addresses.
+address 0x10 (though a single device could respond to both of them).
 
-WARNING! The current 10 bit address support is EXPERIMENTAL. There are
-several places in the code that will cause SEVERE PROBLEMS with 10 bit
-addresses, even though there is some basic handling and hooks. Also,
-almost no supported adapter handles the 10 bit addresses correctly.
+I2C messages to and from 10-bit address devices have a different format.
+See the I2C specification for the details.
 
-As soon as a real 10 bit address device is spotted 'in the wild', we
-can and will add proper support. Right now, 10 bit address devices
-are defined by the I2C protocol, but we have never seen a single device
-which supports them.
+The current 10 bit address support is minimal. It should work, however
+you can expect some problems along the way:
+* Not all bus drivers support 10-bit addresses. Some don't because the
+  hardware doesn't support them (SMBus doesn't require 10-bit address
+  support for example), some don't because nobody bothered adding the
+  code (or it's there but not working properly.) Software implementation
+  (i2c-algo-bit) is known to work.
+* Some optional features do not support 10-bit addresses. This is the
+  case of automatic detection and instantiation of devices by their,
+  drivers, for example.
+* Many user-space packages (for example i2c-tools) lack support for
+  10-bit addresses.
+
+Note that 10-bit address devices are still pretty rare, so the limitations
+listed above could stay for a long time, maybe even forever if nobody
+needs them to be fixed.

Documentation/networking/ip-sysctl.txt

View file

diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index cb7f314..f049a1c 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -20,7 +20,7 @@ ip_no_pmtu_disc - BOOLEAN
 	default FALSE
 
 min_pmtu - INTEGER
-	default 562 - minimum discovered Path MTU
+	default 552 - minimum discovered Path MTU
 
 route/max_size - INTEGER
 	Maximum number of routes allowed in the kernel.  Increase

Documentation/serial/serial-rs485.txt

View file

diff --git a/Documentation/serial/serial-rs485.txt b/Documentation/serial/serial-rs485.txt
index 079cb3d..41c8378 100644
--- a/Documentation/serial/serial-rs485.txt
+++ b/Documentation/serial/serial-rs485.txt
@@ -97,15 +97,23 @@
 
 	struct serial_rs485 rs485conf;
 
-	/* Set RS485 mode: */
+	/* Enable RS485 mode: */
 	rs485conf.flags |= SER_RS485_ENABLED;
 
+	/* Set logical level for RTS pin equal to 1 when sending: */
+	rs485conf.flags |= SER_RS485_RTS_ON_SEND;
+	/* or, set logical level for RTS pin equal to 0 when sending: */
+	rs485conf.flags &= ~(SER_RS485_RTS_ON_SEND);
+
+	/* Set logical level for RTS pin equal to 1 after sending: */
+	rs485conf.flags |= SER_RS485_RTS_AFTER_SEND;
+	/* or, set logical level for RTS pin equal to 0 after sending: */
+	rs485conf.flags &= ~(SER_RS485_RTS_AFTER_SEND);
+
 	/* Set rts delay before send, if needed: */
-	rs485conf.flags |= SER_RS485_RTS_BEFORE_SEND;
 	rs485conf.delay_rts_before_send = ...;
 
 	/* Set rts delay after send, if needed: */
-	rs485conf.flags |= SER_RS485_RTS_AFTER_SEND;
 	rs485conf.delay_rts_after_send = ...;
 
 	/* Set this flag if you want to receive data even whilst sending data */

Documentation/sound/alsa/HD-Audio.txt

View file

diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt
index 03e2771..91fee3b 100644
--- a/Documentation/sound/alsa/HD-Audio.txt
+++ b/Documentation/sound/alsa/HD-Audio.txt
@@ -579,7 +579,7 @@ Development Tree
 ~~~~~~~~~~~~~~~~
 The latest development codes for HD-audio are found on sound git tree:
 
-- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
+- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 
 The master branch or for-next branches can be used as the main
 development branches in general while the HD-audio specific patches
@@ -594,7 +594,7 @@ is, installed via the usual spells: configure, make and make
 install(-modules).  See INSTALL in the package.  The snapshot tarballs
 are found at:
 
-- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/
+- ftp://ftp.suse.com/pub/people/tiwai/snapshot/
 
 
 Sending a Bug Report
@@ -696,7 +696,7 @@ via hda-verb won't change the mixer value.
 
 The hda-verb program is found in the ftp directory:
 
-- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/misc/
+- ftp://ftp.suse.com/pub/people/tiwai/misc/
 
 Also a git repository is available:
 
@@ -764,7 +764,7 @@ operation, the jack plugging simulation, etc.
 
 The package is found in:
 
-- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/misc/
+- ftp://ftp.suse.com/pub/people/tiwai/misc/
 
 A git repository is available:
 

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 8962427..66c1304 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1797,6 +1797,14 @@ F:	include/net/cfg80211.h
 F:	net/wireless/*
 X:	net/wireless/wext*
 
+CHAR and MISC DRIVERS
+M:	Arnd Bergmann <[email protected]>
+M:	Greg Kroah-Hartman <[email protected]>
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
+S:	Maintained
+F:	drivers/char/*
+F:	drivers/misc/*
+
 CHECKPATCH
 M:	Andy Whitcroft <[email protected]>
 S:	Supported
@@ -1935,9 +1943,11 @@ S:	Maintained
 F:	drivers/connector/
 
 CONTROL GROUPS (CGROUPS)
-M:	Paul Menage <[email protected]>
+M:	Tejun Heo <[email protected]>
 M:	Li Zefan <[email protected]>
 L:	[email protected]
+L:	[email protected]
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:	Maintained
 F:	include/linux/cgroup*
 F:	kernel/cgroup*
@@ -2592,7 +2602,7 @@ S:	Maintained
 F:	drivers/net/ethernet/i825xx/eexpress.*
 
 ETHERNET BRIDGE
-M:	Stephen Hemminger <[email protected]>
+M:	Stephen Hemminger <[email protected]>
 L:	[email protected]
 L:	[email protected]
 W:	http://www.linuxfoundation.org/en/Net:Bridge
@@ -3726,7 +3736,7 @@ F:	fs/jbd2/
 F:	include/linux/jbd2.h
 
 JSM Neo PCI based serial card
-M:	Breno Leitao <[email protected]>
+M:	Lucas Tavares <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/tty/serial/jsm/
@@ -4312,6 +4322,7 @@ MEMORY RESOURCE CONTROLLER
 M:	Balbir Singh <[email protected]>
 M:	Daisuke Nishimura <[email protected]>
 M:	KAMEZAWA Hiroyuki <[email protected]>
+L:	[email protected]
 L:	[email protected]
 S:	Maintained
 F:	mm/memcontrol.c
@@ -4345,7 +4356,7 @@ MIPS
 M:	Ralf Baechle <[email protected]>
 L:	[email protected]
 W:	http://www.linux-mips.org/
-T:	git git://git.linux-mips.org/pub/scm/linux.git
+T:	git git://git.linux-mips.org/pub/scm/ralf/linux.git
 Q:	http://patchwork.linux-mips.org/project/linux-mips/list/
 S:	Supported
 F:	Documentation/mips/
@@ -4478,7 +4489,7 @@ S:	Supported
 F:	drivers/infiniband/hw/nes/
 
 NETEM NETWORK EMULATOR
-M:	Stephen Hemminger <[email protected]>
+M:	Stephen Hemminger <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	net/sched/sch_netem.c
@@ -4955,7 +4966,7 @@ F:	drivers/char/ppdev.c
 F:	include/linux/ppdev.h
 
 PARAVIRT_OPS INTERFACE
-M:	Jeremy Fitzhardinge <[email protected]>
+M:	Jeremy Fitzhardinge <[email protected]>
 M:	Chris Wright <[email protected]>
 M:	Alok Kataria <[email protected]>
 M:	Rusty Russell <[email protected]>
@@ -5993,7 +6004,7 @@ S:	Maintained
 F:	drivers/usb/misc/sisusbvga/
 
 SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS
-M:	Stephen Hemminger <[email protected]>
+M:	Stephen Hemminger <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/ethernet/marvell/sk*
@@ -7407,8 +7418,8 @@ S:	Maintained
 F:	arch/x86/kernel/cpu/mcheck/*
 
 XEN HYPERVISOR INTERFACE
-M:	Jeremy Fitzhardinge <[email protected]>
 M:	Konrad Rzeszutek Wilk <[email protected]>
+M:	Jeremy Fitzhardinge <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 L:	[email protected]
 S:	Supported
@@ -7441,7 +7452,8 @@ F:	drivers/xen/*swiotlb*
 
 XFS FILESYSTEM
 P:	Silicon Graphics Inc
-M:	Alex Elder <[email protected]>
+M:	Ben Myers <[email protected]>
+M:	Alex Elder <[email protected]>
 M:	[email protected]
 L:	[email protected]
 W:	http://oss.sgi.com/projects/xfs

Makefile

View file

diff --git a/Makefile b/Makefile
index dab8610..3a8f064 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 2
 SUBLEVEL = 0
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc3
 NAME = Saber-toothed Squirrel
 
 # *DOCUMENTATION*

arch/arm/boot/Makefile

View file

diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index 176062a..5df26a9 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -65,6 +65,8 @@ $(obj)/%.dtb: $(src)/dts/%.dts
 
 $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))
 
+clean-files := *.dtb
+
 quiet_cmd_uimage = UIMAGE  $@
       cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
 		   -C none -a $(LOADADDR) -e $(STARTADDR) \

arch/arm/configs/u300_defconfig

View file

diff --git a/arch/arm/configs/u300_defconfig b/arch/arm/configs/u300_defconfig
index 4a5a126..374000e 100644
--- a/arch/arm/configs/u300_defconfig
+++ b/arch/arm/configs/u300_defconfig
@@ -14,8 +14,6 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_ARCH_U300=y
 CONFIG_MACH_U300=y
 CONFIG_MACH_U300_BS335=y
-CONFIG_MACH_U300_DUAL_RAM=y
-CONFIG_U300_DEBUG=y
 CONFIG_MACH_U300_SPIDUMMY=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -26,19 +24,21 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="root=/dev/ram0 rw rootfstype=rootfs console=ttyAMA0,115200n8 lpj=515072"
 CONFIG_CPU_IDLE=y
 CONFIG_FPE_NWFPE=y
-CONFIG_PM=y
 # CONFIG_SUSPEND is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_MISC_DEVICES is not set
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_FSMC=y
 # CONFIG_INPUT_MOUSEDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_SERIO is not set
+CONFIG_LEGACY_PTY_COUNT=16
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_LEGACY_PTY_COUNT=16
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 # CONFIG_HWMON is not set
@@ -51,6 +51,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_MMC=y
+CONFIG_MMC_CLKGATE=y
 CONFIG_MMC_ARMMMCI=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_HCTOSYS is not set
@@ -65,10 +66,8 @@ CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_KERNEL=y
 # CONFIG_SCHED_DEBUG is not set
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_INFO=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_CRC32 is not set

arch/arm/configs/u8500_defconfig

View file

diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 97d31a4..2d7b6e7 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -10,7 +10,7 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_ARCH_U8500=y
 CONFIG_UX500_SOC_DB5500=y
 CONFIG_UX500_SOC_DB8500=y
-CONFIG_MACH_U8500=y
+CONFIG_MACH_HREFV60=y
 CONFIG_MACH_SNOWBALL=y
 CONFIG_MACH_U5500=y
 CONFIG_NO_HZ=y
@@ -24,6 +24,7 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_VFP=y
 CONFIG_NEON=y
+CONFIG_PM_RUNTIME=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -41,11 +42,8 @@ CONFIG_MISC_DEVICES=y
 CONFIG_AB8500_PWM=y
 CONFIG_SENSORS_BH1780=y
 CONFIG_NETDEVICES=y
-CONFIG_SMSC_PHY=y
-CONFIG_NET_ETHERNET=y
 CONFIG_SMSC911X=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
+CONFIG_SMSC_PHY=y
 # CONFIG_WLAN is not set
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
@@ -72,15 +70,12 @@ CONFIG_SPI=y
 CONFIG_SPI_PL022=y
 CONFIG_GPIO_STMPE=y
 CONFIG_GPIO_TC3589X=y
-# CONFIG_HWMON is not set
 CONFIG_MFD_STMPE=y
 CONFIG_MFD_TC3589X=y
+CONFIG_AB5500_CORE=y
 CONFIG_AB8500_CORE=y
 CONFIG_REGULATOR_AB8500=y
 # CONFIG_HID_SUPPORT is not set
-CONFIG_USB_MUSB_HDRC=y
-CONFIG_USB_GADGET_MUSB_HDRC=y
-CONFIG_MUSB_PIO_ONLY=y
 CONFIG_USB_GADGET=y
 CONFIG_AB8500_USB=y
 CONFIG_MMC=y
@@ -97,6 +92,7 @@ CONFIG_DMADEVICES=y
 CONFIG_STE_DMA40=y
 CONFIG_STAGING=y
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y
+CONFIG_HSEM_U8500=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y

arch/arm/include/asm/hardware/cache-l2x0.h

View file

diff --git a/arch/arm/include/asm/hardware/cache-l2x0.h b/arch/arm/include/asm/hardware/cache-l2x0.h
index 1db1143..7df239b 100644
--- a/arch/arm/include/asm/hardware/cache-l2x0.h
+++ b/arch/arm/include/asm/hardware/cache-l2x0.h
@@ -20,6 +20,8 @@
 #ifndef __ASM_ARM_HARDWARE_L2X0_H
 #define __ASM_ARM_HARDWARE_L2X0_H
 
+#include <linux/errno.h>
+
 #define L2X0_CACHE_ID			0x000
 #define L2X0_CACHE_TYPE			0x004
 #define L2X0_CTRL			0x100

arch/arm/include/asm/mach/arch.h

View file

diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 7d19425..2b0efc3 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -13,6 +13,7 @@
 struct tag;
 struct meminfo;
 struct sys_timer;
+struct pt_regs;
 
 struct machine_desc {
 	unsigned int		nr;		/* architecture number	*/

arch/arm/include/asm/unistd.h

View file

diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index c60a294..4a11237 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -402,6 +402,8 @@
 #define __NR_syncfs			(__NR_SYSCALL_BASE+373)
 #define __NR_sendmmsg			(__NR_SYSCALL_BASE+374)
 #define __NR_setns			(__NR_SYSCALL_BASE+375)
+#define __NR_process_vm_readv		(__NR_SYSCALL_BASE+376)
+#define __NR_process_vm_writev		(__NR_SYSCALL_BASE+377)
 
 /*
  * The following SWIs are ARM private.

arch/arm/kernel/calls.S

View file

diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 9943e9e..463ff4a 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -385,6 +385,8 @@
 		CALL(sys_syncfs)
 		CALL(sys_sendmmsg)
 /* 375 */	CALL(sys_setns)
+		CALL(sys_process_vm_readv)
+		CALL(sys_process_vm_writev)
 #ifndef syscalls_counted
 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
 #define syscalls_counted

arch/arm/kernel/head.S

View file

diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 566c54c..08c82fd 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -360,7 +360,7 @@ __secondary_data:
  *  r13 = *virtual* address to jump to upon completion
  */
 __enable_mmu:
-#ifdef CONFIG_ALIGNMENT_TRAP
+#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 6
 	orr	r0, r0, #CR_A
 #else
 	bic	r0, r0, #CR_A

arch/arm/kernel/machine_kexec.c

View file

diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c
index c1b4463..e59bbd4 100644
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
@@ -32,24 +32,6 @@ static atomic_t waiting_for_crash_ipi;
 
 int machine_kexec_prepare(struct kimage *image)
 {
-	unsigned long page_list;
-	void *reboot_code_buffer;
-	page_list = image->head & PAGE_MASK;
-
-	reboot_code_buffer = page_address(image->control_code_page);
-
-	/* Prepare parameters for reboot_code_buffer*/
-	kexec_start_address = image->start;
-	kexec_indirection_page = page_list;
-	kexec_mach_type = machine_arch_type;
-	kexec_boot_atags = image->start - KEXEC_ARM_ZIMAGE_OFFSET + KEXEC_ARM_ATAGS_OFFSET;
-
-	/* copy our kernel relocation code to the control code page */
-	memcpy(reboot_code_buffer,
-	       relocate_new_kernel, relocate_new_kernel_size);
-
-	flush_icache_range((unsigned long) reboot_code_buffer,
-			   (unsigned long) reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE);
 	return 0;
 }
 
@@ -100,14 +82,31 @@ void (*kexec_reinit)(void);
 
 void machine_kexec(struct kimage *image)
 {
+	unsigned long page_list;
 	unsigned long reboot_code_buffer_phys;
 	void *reboot_code_buffer;
 
+
+	page_list = image->head & PAGE_MASK;
+
 	/* we need both effective and real address here */
 	reboot_code_buffer_phys =
 	    page_to_pfn(image->control_code_page) << PAGE_SHIFT;
 	reboot_code_buffer = page_address(image->control_code_page);
 
+	/* Prepare parameters for reboot_code_buffer*/
+	kexec_start_address = image->start;
+	kexec_indirection_page = page_list;
+	kexec_mach_type = machine_arch_type;
+	kexec_boot_atags = image->start - KEXEC_ARM_ZIMAGE_OFFSET + KEXEC_ARM_ATAGS_OFFSET;
+
+	/* copy our kernel relocation code to the control code page */
+	memcpy(reboot_code_buffer,
+	       relocate_new_kernel, relocate_new_kernel_size);
+
+
+	flush_icache_range((unsigned long) reboot_code_buffer,
+			   (unsigned long) reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE);
 	printk(KERN_INFO "Bye!\n");
 
 	if (kexec_reinit)

arch/arm/kernel/setup.c

View file

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 7e7977a..3448a3f 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -461,8 +461,10 @@ static void __init setup_processor(void)
 	       cpu_name, read_cpuid_id(), read_cpuid_id() & 15,
 	       proc_arch[cpu_architecture()], cr_alignment);
 
-	sprintf(init_utsname()->machine, "%s%c", list->arch_name, ENDIANNESS);
-	sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS);
+	snprintf(init_utsname()->machine, __NEW_UTS_LEN + 1, "%s%c",
+		 list->arch_name, ENDIANNESS);
+	snprintf(elf_platform, ELF_PLATFORM_SIZE, "%s%c",
+		 list->elf_name, ENDIANNESS);
 	elf_hwcap = list->elf_hwcap;
 #ifndef CONFIG_ARM_THUMB
 	elf_hwcap &= ~HWCAP_THUMB;