1. 26 Oct, 2010 19 commits
  2. 25 Oct, 2010 21 commits
    • Linus Torvalds's avatar
      Merge branch 'davinci-for-linus' of... · 72e58063
      Linus Torvalds authored
      Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
      
      * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (50 commits)
        davinci: fix remaining board support after io_pgoffst removal
        davinci: mityomapl138: make file local data static
        arm/davinci: remove duplicated include
        davinci: Initial support for Omapl138-Hawkboard
        davinci: MityDSP-L138/MityARM-1808 read MAC address from I2C Prom
        davinci: add tnetv107x touchscreen platform device
        input: add driver for tnetv107x touchscreen controller
        davinci: add keypad config for tnetv107x evm board
        davinci: add tnetv107x keypad platform device
        input: add driver for tnetv107x on-chip keypad controller
        net: davinci_emac: cleanup unused cpdma code
        net: davinci_emac: switch to new cpdma layer
        net: davinci_emac: separate out cpdma code
        net: davinci_emac: cleanup unused mdio emac code
        omap: cleanup unused davinci mdio arch code
        davinci: cleanup mdio arch code and switch to phy_id
        net: davinci_emac: switch to new mdio
        omap: add mdio platform devices
        davinci: add mdio platform devices
        net: davinci_emac: separate out davinci mdio
        ...
      
      Fix up trivial conflict in drivers/input/keyboard/Kconfig (two entries
      added next to each other - one from the davinci merge, one from the
      input merge)
      72e58063
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd · 57c155d5
      Linus Torvalds authored
      * 'for-linus' of git://git.open-osd.org/linux-open-osd:
        exofs: Remove inode->i_count manipulation in exofs_new_inode
        fs/exofs: typo fix of faild to failed
        exofs: Set i_mapping->backing_dev_info anyway
        exofs: Cleaup read path in regard with read_for_write
      57c155d5
    • Borislav Petkov's avatar
      x86-32, mm: Remove duplicated include · 9afd281a
      Borislav Petkov authored
      Commit b40827fa ("x86-32, mm: Add an initial page table for core
      bootstrapping") added an include directive which is needless and is
      taken care of by a previous one.  Remove it.
      Caught-by: default avatarJaswinder Singh Rajput <jaswinderlinux@gmail.com>
      Signed-off-by: default avatarBorislav Petkov <bp@alien8.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9afd281a
    • Boaz Harrosh's avatar
      exofs: Remove inode->i_count manipulation in exofs_new_inode · fe2fd9ed
      Boaz Harrosh authored
      exofs_new_inode() was incrementing the inode->i_count and
      decrementing it in create_done(), in a bad attempt to make sure
      the inode will still be there when the asynchronous create_done()
      finally arrives. This was very stupid because iput() was not called,
      and if it was actually needed, it would leak the inode.
      
      However all this is not needed, because at exofs_evict_inode()
      we already wait for create_done() by waiting for the
      object_created event. Therefore remove the superfluous ref counting
      and just Thicken the comment at exofs_evict_inode() a bit.
      
      While at it change places that open coded wait_obj_created()
      to call the already available wrapper.
      
      CC: Dave Chinner <dchinner@redhat.com>
      CC: Christoph Hellwig <hch@lst.de>
      CC: Nick Piggin <npiggin@kernel.dk>
      Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
      fe2fd9ed
    • Joe Perches's avatar
      fs/exofs: typo fix of faild to failed · 571f7f46
      Joe Perches authored
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
      571f7f46
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · c4a6eb3b
      Linus Torvalds authored
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (48 commits)
        [S390] topology: export cpu topology via proc/sysinfo
        [S390] topology: move topology sysinfo code
        [S390] topology: clean up facility detection
        [S390] cleanup facility list handling
        [S390] enable ARCH_DMA_ADDR_T_64BIT with 64BIT
        [S390] dasd: ignore unsolicited interrupts for DIAG
        [S390] kvm: Enable z196 instruction facilities
        [S390] dasd: fix unsolicited interrupt recognition
        [S390] dasd: fix use after free in dbf
        [S390] kvm: Fix badness at include/asm/mmu_context.h:83
        [S390] cio: fix I/O cancel function
        [S390] topology: change default
        [S390] smp: use correct cpu address in print_cpu_info()
        [S390] remove ieee_instruction_pointer from thread_struct
        [S390] cleanup system call parameter setup
        [S390] correct alignment of cpuid structure
        [S390] cleanup lowcore access from external interrupts
        [S390] cleanup lowcore access from program checks
        [S390] pgtable: move pte_mkhuge() from hugetlb.h to pgtable.h
        [S390] fix SIGBUS handling
        ...
      c4a6eb3b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 33081adf
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (365 commits)
        ALSA: hda - Disable sticky PCM stream assignment for AD codecs
        ALSA: usb - Creative USB X-Fi volume knob support
        ALSA: ca0106: Use card specific dac id for mute controls.
        ALSA: ca0106: Allow different sound cards to use different SPI channel mappings.
        ALSA: ca0106: Create a nice spot for mapping channels to dacs.
        ALSA: ca0106: Move enabling of front dac out of hardcoded setup sequence.
        ALSA: ca0106: Pull out dac powering routine into separate function.
        ALSA: ca0106 - add Sound Blaster 5.1vx info.
        ASoC: tlv320dac33: Use usleep_range for delays
        ALSA: usb-audio: add Novation Launchpad support
        ALSA: hda - Add workarounds for CT-IBG controllers
        ALSA: hda - Fix wrong TLV mute bit for STAC/IDT codecs
        ASoC: tpa6130a2: Error handling for broken chip
        ASoC: max98088: Staticise m98088_eq_band
        ASoC: soc-core: Fix codec->name memory leak
        ALSA: hda - Apply ideapad quirk to Acer laptops with Cxt5066
        ALSA: hda - Add some workarounds for Creative IBG
        ALSA: hda - Fix wrong SPDIF NID assignment for CA0110
        ALSA: hda - Fix codec rename rules for ALC662-compatible codecs
        ALSA: hda - Add alc_init_jacks() call to other codecs
        ...
      33081adf
    • Linus Torvalds's avatar
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb · c5596049
      Linus Torvalds authored
      * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
        uwb: Orphan the UWB and WUSB subsystems
        uwb: Remove the WLP subsystem and drivers
      c5596049
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of... · fbaab1dc
      Linus Torvalds authored
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (44 commits)
        eeepc-wmi: Add cpufv sysfs interface
        eeepc-wmi: add additional hotkeys
        panasonic-laptop: Simplify calls to acpi_pcc_retrieve_biosdata
        panasonic-laptop: Handle errors properly if they happen
        intel_pmic_gpio: fix off-by-one value range checking
        IBM Real-Time "SMI Free" mode driver -v7
        Add OLPC XO-1 rfkill driver
        Move hdaps driver to platform/x86
        ideapad-laptop: Fix Makefile
        intel_pmic_gpio: swap the bits and mask args for intel_scu_ipc_update_register
        ideapad: Add param: no_bt_rfkill
        ideapad: Change the driver name to ideapad-laptop
        ideapad: rewrite the sw rfkill set
        ideapad: rewrite the hw rfkill notify
        ideapad: use EC command to control camera
        ideapad: use return value of _CFG to tell if device exist or not
        ideapad: make sure we bind on the correct device
        ideapad: check VPC bit before sync rfkill hw status
        ideapad: add ACPI helpers
        dell-laptop: Add debugfs support
        ...
      fbaab1dc
    • Linus Torvalds's avatar
      Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 · 51f00a47
      Linus Torvalds authored
      * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
        mtd/m25p80: add support to parse the partitions by OF node
        of/irq: of_irq.c needs to include linux/irq.h
        of/mips: Cleanup some include directives/files.
        of/mips: Add device tree support to MIPS
        of/flattree: Eliminate need to provide early_init_dt_scan_chosen_arch
        of/device: Rework to use common platform_device_alloc() for allocating devices
        of/xsysace: Fix OF probing on little-endian systems
        of: use __be32 types for big-endian device tree data
        of/irq: remove references to NO_IRQ in drivers/of/platform.c
        of/promtree: add package-to-path support to pdt
        of/promtree: add of_pdt namespace to pdt code
        of/promtree: no longer call prom_ functions directly; use an ops structure
        of/promtree: make drivers/of/pdt.c no longer sparc-only
        sparc: break out some PROM device-tree building code out into drivers/of
        of/sparc: convert various prom_* functions to use phandle
        sparc: stop exporting openprom.h header
        powerpc, of_serial: Endianness issues setting up the serial ports
        of: MTD: Fix OF probing on little-endian systems
        of: GPIO: Fix OF probing on little-endian systems
      51f00a47
    • Ralf Baechle's avatar
      MIPS: MT: Fix build error iFPU affinity code · a7f505c6
      Ralf Baechle authored
      Commit b0ae1981 ("security: remove unused parameter from
      security_task_setscheduler()") broke the build of
      arch/mips/kernel/mips-mt-fpaff.c.  The function arguments were
      unnecessary, not the semicolon ...
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Acked-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
      Acked-by: default avatarJames Morris <jmorris@namei.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a7f505c6
    • Linus Torvalds's avatar
      Merge branch 'ieee1394-removal' of... · b7d41a9f
      Linus Torvalds authored
      Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
      
      * 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        ieee1394: remove the old IEEE 1394 driver stack
        ieee1394: move init_ohci1394_dma to drivers/firewire/
      
      Fix trivial change/delete conflict: drivers/ieee1394/eth1394.c is
      getting removed, but was modified by the networking merge.
      b7d41a9f
    • Yoshihisa Abe's avatar
      Coda: replace BKL with mutex · da47c19e
      Yoshihisa Abe authored
      Replace the BKL with a mutex to protect the venus_comm structure which
      binds the mountpoint with the character device and holds the upcall
      queues.
      Signed-off-by: default avatarYoshihisa Abe <yoshiabe@cs.cmu.edu>
      Signed-off-by: default avatarJan Harkes <jaharkes@cs.cmu.edu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      da47c19e
    • Yoshihisa Abe's avatar
      Coda: push BKL regions into coda_upcall() · f7cc02b8
      Yoshihisa Abe authored
      Now that shared inode state is locked using the cii->c_lock, the BKL is
      only used to protect the upcall queues used to communicate with the
      userspace cache manager. The remaining state is all local and we can
      push the lock further down into coda_upcall().
      Signed-off-by: default avatarYoshihisa Abe <yoshiabe@cs.cmu.edu>
      Signed-off-by: default avatarJan Harkes <jaharkes@cs.cmu.edu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f7cc02b8
    • Yoshihisa Abe's avatar
      Coda: add spin lock to protect accesses to struct coda_inode_info. · b5ce1d83
      Yoshihisa Abe authored
      We mostly need it to protect cached user permissions. The c_flags field
      is advisory, reading the wrong value is harmless and in the worst case
      we hit a slow path where we have to make an extra upcall to the
      userspace cache manager when revalidating a dentry or inode.
      Signed-off-by: default avatarYoshihisa Abe <yoshiabe@cs.cmu.edu>
      Signed-off-by: default avatarJan Harkes <jaharkes@cs.cmu.edu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b5ce1d83
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 3a99c631
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (75 commits)
        Input: wacom - specify Cinitq supported tools
        Input: ab8500-ponkey - fix IRQ freeing in error path
        Input: adp5588-keys - use more obvious i2c_device_id name string
        Input: ad7877 - switch to using threaded IRQ
        Input: ad7877 - use attribute group to control visibility of attributes
        Input: serio - add support for PS2Mult multiplexer protocol
        Input: wacom - properly enable runtime PM
        Input: ad7877 - filter events where pressure is beyond the maximum
        Input: ad7877 - implement EV_KEY:BTN_TOUCH reporting
        Input: ad7877 - implement specified chip select behavior
        Input: hp680_ts_input - use cancel_delayed_work_sync()
        Input: mousedev - correct lockdep annotation
        Input: ads7846 - switch to using threaded IRQ
        Input: serio - support multiple child devices per single parent
        Input: synaptics - simplify pass-through port handling
        Input: add ROHM BU21013 touch panel controller support
        Input: omap4-keypad - wake-up on events & long presses
        Input: omap4-keypad - fix interrupt line configuration
        Input: omap4-keypad - SYSCONFIG register configuration
        Input: omap4-keypad - use platform device helpers
        ...
      3a99c631
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 1dfd166e
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (110 commits)
        sh: i2c-sh7760: Replase from ctrl_* to __raw_*
        sh: clkfwk: Shuffle around to match the intc split up.
        sh: clkfwk: modify for_each_frequency end condition
        sh: fix clk_get() error handling
        sh: clkfwk: Fix fault in frequency iterator.
        sh: clkfwk: Add a helper for rate rounding by divisor ranges.
        sh: clkfwk: Abstract rate rounding helper.
        sh: clkfwk: support clock remapping.
        sh: pci: Convert to upper/lower_32_bits() helpers.
        sh: mach-sdk7786: Add support for the FPGA SRAM.
        sh: Provide a generic SRAM pool for tiny memories.
        sh: pci: Support secondary FPGA-driven PCIe clocks on SDK7786.
        sh: pci: Support slot 4 routing on SDK7786.
        sh: Fix up PMB locking.
        sh: mach-sdk7786: Add support for fpga gpios.
        sh: use pr_fmt for clock framework, too.
        sh: remove name and id from struct clk
        sh: free-without-alloc fix for sh_mobile_lcdcfb
        sh: perf: Set up perf_max_events.
        sh: perf: Support SH-X3 hardware counters.
        ...
      
      Fix up trivial conflicts (perf_max_events got removed) in arch/sh/kernel/perf_event.c
      1dfd166e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · 8e775167
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        Revert "block: fix accounting bug on cross partition merges"
      8e775167
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 4b37ba90
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (21 commits)
        m68knommu: convert to using tracehook_report_syscall_*
        m68knommu: some boards use fixed phy for FEC ethernet
        m68knommu: support the external GPIO based interrupts of the 5272
        m68knommu: mask of vector bits in exception word properly
        m68knommu: change to new flag variables
        m68knommu: Fix MCFUART_TXFIFOSIZE for m548x.
        m68knommu: add basic mmu-less m548x support
        m68knommu: .gitignore vmlinux.lds
        m68knommu: stop using __do_IRQ
        m68knommu: rename PT_OFF_VECTOR to PT_OFF_FORMATVEC.
        m68knommu: add support for Coldfire 547x/548x interrupt controller
        m68k{nommu}: Remove unused DEFINE's from asm-offsets.c
        m68knommu: whitespace cleanup in 68328/entry.S
        m68knommu: Document supported chips in intc-2.c and intc-simr.c.
        m68knommu: fix strace support for 68328/68360
        m68knommu: fix default starting date
        arch/m68knommu: Removing dead 68328_SERIAL_UART2 config option
        arch/m68knommu: Removing dead RAM_{16,32}_MB config option
        arch/m68knommu: Removing dead M68KFPU_EMU config option
        arch/m68knommu: Removing dead RELOCATE config option
        ...
      4b37ba90
    • Heiko Carstens's avatar
      [S390] topology: export cpu topology via proc/sysinfo · 96f4a70d
      Heiko Carstens authored
      Export the cpu configuration topology via sysinfo. Two new lines are
      introduced:
      
      CPU Topology HW:      0 0 0 4 6 4
      CPU Topology SW:      0 0 0 0 4 24
      
      The HW line describes the cpu topology nesting levels when the maximum
      nesting level is used to get the corresponding SYSIB.
      The SW line describes what Linux is actually using. In this case it
      supports only two levels (CONFIG_SCHED_BOOK off) and therefore the
      hardware folded the two lower levels in the SYSIB response block.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      96f4a70d
    • Heiko Carstens's avatar
      [S390] topology: move topology sysinfo code · c30f91b6
      Heiko Carstens authored
      Move the topology sysinfo SYSIB definitions to the proper place in
      asm/sysinfo.h where they should be.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      c30f91b6