Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jan 18, 2011
  1. Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    authored
    …kernel/git/groeck/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
      hwmon: (lm93) Add support for LM94
  2. Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-…

    authored
    …linus
    
    * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (26 commits)
      MIPS: Malta: enable Cirrus FB console
      MIPS: add CONFIG_VIRTUALIZATION for virtio support
      MIPS: Implement __read_mostly
      MIPS: ath79: add common WMAC device for AR913X based boards
      MIPS: ath79: Add initial support for the Atheros AP81 reference board
      MIPS: ath79: add common SPI controller device
      SPI: Add SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs
      MIPS: ath79: add common GPIO buttons device
      MIPS: ath79: add common watchdog device
      MIPS: ath79: add common GPIO LEDs device
      MIPS: ath79: add initial support for the Atheros PB44 reference board
      MIPS: ath79: utilize the MIPS multi-machine support
      MIPS: ath79: add GPIOLIB support
      MIPS: Add initial support for the Atheros AR71XX/AR724X/AR931X SoCs
      MIPS: jump label: Add MIPS support.
      MIPS: Use WARN() in uasm for better diagnostics.
      MIPS: Optimize TLB handlers for Octeon CPUs
      MIPS: Add LDX and LWX instructions to uasm.
      MIPS: Use BBIT instructions in TLB handlers
      MIPS: Declare uasm bbit0 and bbit1 functions.
      ...
  3. hwmon: (lm93) Add support for LM94

    Guenter Roeck authored
    This patch adds basic support for LM94 to the LM93 driver. LM94 specific
    sensors and features are not supported.
    
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Acked-by: Jean Delvare <khali@linux-fr.org>
  4. @ralfbaechle

    SPI: Add SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs

    Gabor Juhos authored ralfbaechle committed
    The Atheros AR71XX/AR724X/AR913X SoCs have a built-in SPI controller. This
    patch implements a driver for that.
    
    Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: spi-devel-general@lists.sourceforge.net
    Acked-by: Grant Likely <grant.likely@secretlab.ca>
    Cc: linux-mips@linux-mips.org
    Cc: Imre Kaloz <kaloz@openwrt.org>
    Cc: Luis R. Rodriguez <lrodriguez@atheros.com>
    Cc: Cliff Holden <Cliff.Holden@Atheros.com>
    Cc: Kathy Giori <Kathy.Giori@Atheros.com>
    Patchwork: https://patchwork.linux-mips.org/patch/1960/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  5. @dilinger

    staging: fix build failure in bcm driver

    dilinger authored committed
    While building latest Linus git, I hit the following:
    
        CC [M]  drivers/staging/bcm/Qos.o
      drivers/staging/bcm/Qos.c: In function ‘PruneQueue’:
      drivers/staging/bcm/Qos.c:367: error: ‘struct netdev_queue’ has no member named ‘tx_dropped’
      drivers/staging/bcm/Qos.c: In function ‘flush_all_queues’:
      drivers/staging/bcm/Qos.c:416: error: ‘struct netdev_queue’ has no member named ‘tx_dropped’
      make[5]: *** [drivers/staging/bcm/Qos.o] Error 1
      make[4]: *** [drivers/staging/bcm] Error 2
      make[3]: *** [drivers/staging] Error 2
    
    As well as:
    
        CC [M]  drivers/staging/bcm/Transmit.o
      drivers/staging/bcm/Transmit.c: In function ‘SetupNextSend’:
      drivers/staging/bcm/Transmit.c:163: error: ‘struct netdev_queue’ has no member named ‘tx_bytes’
      drivers/staging/bcm/Transmit.c:164: error: ‘struct netdev_queue’ has no member named ‘tx_packets’
      make[2]: *** [drivers/staging/bcm/Transmit.o] Error 1
    
    tx_dropped/tx_bytes_tx_packets were removed in commit 1ac9ad1.  This patch
    converts bcm to use net_device_stats instead of netdev_queue.
    
    Acked-by: Stephen Hemminger <shemminger@vyatta.com>
    Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: Andres Salomon <dilinger@queued.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Jan 17, 2011
  1. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      RDMA: Update workqueue usage
      RDMA/nes: Fix incorrect SFP+ link status detection on driver init
      RDMA/nes: Fix SFP+ link down detection issue with switch port disable
      RDMA/nes: Generate IB_EVENT_PORT_ERR/PORT_ACTIVE events
      RDMA/nes: Fix bonding on iw_nes
      IB/srp: Test only once whether iu allocation succeeded
      IB/mlx4: Handle protocol field in multicast table
      RDMA: Use vzalloc() to replace vmalloc()+memset(0)
      mlx4_{core, ib, en}: Fix driver when sizeof (phys_addr_t) > sizeof (long)
      IB/mthca: Fix driver when sizeof (phys_addr_t) > sizeof (long)
  2. Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

    authored
    * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
      spi/spi_sh_msiof: fix a wrong free_irq() parameter
      dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch()
  3. Merge git://git.infradead.org/mtd-2.6

    authored
    * git://git.infradead.org/mtd-2.6: (59 commits)
      mtd: mtdpart: disallow reading OOB past the end of the partition
      mtd: pxa3xx_nand: NULL dereference in pxa3xx_nand_probe
      UBI: use mtd->writebufsize to set minimal I/O unit size
      mtd: initialize writebufsize in the MTD object of a partition
      mtd: onenand: add mtd->writebufsize initialization
      mtd: nand: add mtd->writebufsize initialization
      mtd: cfi: add writebufsize initialization
      mtd: add writebufsize field to mtd_info struct
      mtd: OneNAND: OMAP2/3: prevent regulator sleeping while OneNAND is in use
      mtd: OneNAND: add enable / disable methods to onenand_chip
      mtd: m25p80: Fix JEDEC ID for AT26DF321
      mtd: txx9ndfmc: limit transfer bytes to 512 (ECC provides 6 bytes max)
      mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips
      mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips
      mtd: nand: ams-delta: drop omap_read/write, use ioremap
      mtd: m25p80: add debugging trace in sst_write
      mtd: nand: ams-delta: select for built-in by default
      mtd: OneNAND: lighten scary initial bad block messages
      mtd: OneNAND: OMAP2/3: add support for command line partitioning
      mtd: nand: rearrange ONFI revision checking, add ONFI 2.3
      ...
    
    Fix up trivial conflict in drivers/mtd/Kconfig as per DavidW.
  4. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/viro/vfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      fs: fix address space warnings in ioctl_fiemap()
      aio: check return value of create_workqueue()
      hpfs_setattr error case avoids unlock_kernel
      compat: copy missing fields in compat_statfs64 to user
      compat: update comment of compat statfs syscalls
      compat: remove unnecessary assignment in compat_rw_copy_check_uvector()
      fs: FS_POSIX_ACL does not depend on BLOCK
      fs: Remove unlikely() from fget_light()
      fs: Remove unlikely() from fput_light()
      fallocate should be a file operation
      make the feature checks in ->fallocate future proof
      staging: smbfs building fix
      tidy up around finish_automount()
      don't drop newmnt on error in do_add_mount()
      Take the completion of automount into new helper
  5. Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: balance asic_reset functions
      drm/radeon/kms: remove duplicate card_posted() functions
      drm/radeon/kms: add module option for pcie gen2
      drm/radeon/kms: fix typo in evergreen safe reg
      drm/nouveau: fix gpu page faults triggered by plymouthd
      drm/nouveau: greatly simplify mm, killing some bugs in the process
      drm/nvc0: enable protection of system-use-only structures in vm
      drm/nv40: initialise 0x17xx on all chipsets that have it
      drm/nv40: make detection of 0x4097-ful chipsets available everywhere
  6. Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/…

    authored
    …djbw/async_tx
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (63 commits)
      ARM: PL08x: cleanup comments
      Update CONFIG_MD_RAID6_PQ to CONFIG_RAID6_PQ in drivers/dma/iop-adma.c
      ARM: PL08x: fix a warning
      Fix dmaengine_submit() return type
      dmaengine: at_hdmac: fix race while monitoring channel status
      dmaengine: at_hdmac: flags located in first descriptor
      dmaengine: at_hdmac: use subsys_initcall instead of module_init
      dmaengine: at_hdmac: no need set ACK in new descriptor
      dmaengine: at_hdmac: trivial add precision to unmapping comment
      dmaengine: at_hdmac: use dma_address to program DMA hardware
      pch_dma: support new device ML7213 IOH
      ARM: PL08x: prevent dma_set_runtime_config() reconfiguring memcpy channels
      ARM: PL08x: allow dma_set_runtime_config() to return errors
      ARM: PL08x: fix locking between prepare function and submit function
      ARM: PL08x: introduce 'phychan_hold' to hold on to physical channels
      ARM: PL08x: put txd's on the pending list in pl08x_tx_submit()
      ARM: PL08x: rename 'desc_list' as 'pend_list'
      ARM: PL08x: implement unmapping of memcpy buffers
      ARM: PL08x: store prep_* flags in async_tx structure
      ARM: PL08x: shrink srcbus/dstbus in txd structure
      ...
  7. @lyakh

    spi/spi_sh_msiof: fix a wrong free_irq() parameter

    lyakh authored Grant Likely committed
    Without this fix reloading of the driver is impossible.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  8. @dwmw2

    mtd: mtdpart: disallow reading OOB past the end of the partition

    Artem Bityutskiy authored dwmw2 committed
    This patch fixes the mtdpart bug which allows users reading OOB past the
    end of the partition. This happens because 'part_read_oob()' allows reading
    multiple OOB areas in one go, and mtdparts does not validate the OOB
    length in the request.
    
    Although there is such check in 'nand_do_read_oob()' in nand_base.c, but
    it checks that we do not read past the flash chip, not the partition,
    because in nand_base.c we work with the whole chip (e.g., mtd->size
    in nand_base.c is the size of the whole chip). So this check cannot
    be done correctly in nand_base.c and should be instead done in mtdparts.c.
    
    This problem was reported by Jason Liu <r64343@freescale.com> and reproduced
    with nandsim:
    
    $ modprobe nandsim first_id_byte=0x20 second_id_byte=0xaa third_id_byte=0x00 \
                       fourth_id_byte=0x15 parts=0x400,0x400
    $ modprobe nandsim mtd_oobtest.ko dev=0
    $ dmesg
    = snip =
    mtd_oobtest: attempting to read past end of device
    mtd_oobtest: an error is expected...
    mtd_oobtest: error: read past end of device
    = snip =
    mtd_oobtest: finished with 2 errors
    
    Reported-by: Jason Liu <liu.h.jason@gmail.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  9. staging: smbfs building fix

    Yang Ruirui authored Al Viro committed
    Building error for smbfs:
    
    drivers/staging/smbfs/dir.c:286: error: static declaration of 'smbfs_dentry_operations' follows non-static declaration
    drivers/staging/smbfs/proto.h:42: error: previous declaration of 'smbfs_dentry_operations' was here
    drivers/staging/smbfs/dir.c:294: error: static declaration of 'smbfs_dentry_operations_case' follows non-static declaration
    drivers/staging/smbfs/proto.h:41: error: previous declaration of 'smbfs_dentry_operations_case' was here
    make[3]: *** [drivers/staging/smbfs/dir.o] Error 1
    make[2]: *** [drivers/staging/smbfs] Error 2
    make[1]: *** [drivers/staging] Error 2
    make[1]: *** Waiting for unfinished jobs....
    
    Fix it by removing static keywords
    
    Signed-off-by: Yang Ruirui <ruirui.r.yang@tieto.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  10. RDMA: Update workqueue usage

    Tejun Heo authored Roland Dreier committed
    * ib_wq is added, which is used as the common workqueue for infiniband
      instead of the system workqueue.  All system workqueue usages
      including flush_scheduled_work() callers are converted to use and
      flush ib_wq.
    
    * cancel_delayed_work() + flush_scheduled_work() converted to
      cancel_delayed_work_sync().
    
    * qib_wq is removed and ib_wq is used instead.
    
    This is to prepare for deprecation of flush_scheduled_work().
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
  11. drm/radeon/kms: balance asic_reset functions

    Alex Deucher authored Dave Airlie committed
    First, we were calling mc_stop() at the top of the function
    which turns off all MC (memory controller) clients,
    then checking if the GPU is idle.  If it was idle we
    returned without re-enabling the MC clients which would
    lead to a blank screen, etc.  This patch checks if the
    GPU is idle before calling mc_stop().
    
    Second, if the reset failed, we were returning without
    re-enabling the MC clients.  This patch re-enables
    the MC clients before returning regardless of whether
    the reset was successful or not.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Cc: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  12. drm/radeon/kms: remove duplicate card_posted() functions

    Alex Deucher authored Dave Airlie committed
    Use the common one for all asics.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  13. drm/radeon/kms: add module option for pcie gen2

    Alex Deucher authored Dave Airlie committed
    Switching to pcie gen2 causes problems on some
    boards.  Add a module option to turn it on/off.
    
    There are gen2 compatability issues with some
    motherboards it seems.
    
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=33027
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  14. drm/radeon/kms: fix typo in evergreen safe reg

    Alex Deucher authored Dave Airlie committed
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  15. Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouvea…

    Dave Airlie authored
    …u-next into drm-fixes
    
    * 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next:
      drm/nouveau: fix gpu page faults triggered by plymouthd
      drm/nouveau: greatly simplify mm, killing some bugs in the process
      drm/nvc0: enable protection of system-use-only structures in vm
      drm/nv40: initialise 0x17xx on all chipsets that have it
      drm/nv40: make detection of 0x4097-ful chipsets available everywhere
  16. drm/nouveau: fix gpu page faults triggered by plymouthd

    Ben Skeggs authored
    The switch to separate BAR and channel address spaces made the fbcon memory
    address calculation incorrect on NV50+ boards, this commit fixes that.
    
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  17. drm/nouveau: greatly simplify mm, killing some bugs in the process

    Ben Skeggs authored
    Reviewed-by: Francisco Jerez <currojerez@riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  18. drm/nvc0: enable protection of system-use-only structures in vm

    Ben Skeggs authored
    Somehow missed this in the original merge of the nvc0 code.
    
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  19. drm/nv40: initialise 0x17xx on all chipsets that have it

    Ben Skeggs authored
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  20. drm/nv40: make detection of 0x4097-ful chipsets available everywhere

    Ben Skeggs authored
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  21. drivers/nfc/pn544.c: fix min_t warnings

    Andrew Morton authored committed
    Fix these:
    
      drivers/nfc/pn544.c: In function 'pn544_read':
      drivers/nfc/pn544.c:356: warning: comparison of distinct pointer types lacks a cast
      drivers/nfc/pn544.c:377: warning: comparison of distinct pointer types lacks a cast
      drivers/nfc/pn544.c: In function 'pn544_write':
      drivers/nfc/pn544.c:463: warning: comparison of distinct pointer types lacks a cast
      drivers/nfc/pn544.c:485: warning: comparison of distinct pointer types lacks a cast
    
    Cc: "Matti J. Aaltonen" <matti.j.aaltonen@nokia.com>
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22. @djbw

    ARM: PL08x: cleanup comments

    Russell King - ARM Linux authored djbw committed
    Cleanup the formatting of comments, remove some which don't make sense
    anymore.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    [fix conflict with 96a608a]
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Commits on Jan 16, 2011
  1. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/nab/scsi-post-merge-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6:
      ocfs2: Make OCFS2_FS depend on CONFIGFS_FS
      dlm: Make DLM depend on CONFIGFS_FS
      net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FS
      configfs: change depends -> select SYSFS
      [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event
      [SCSI] sd: implement sd_check_events()
  2. RDMA/nes: Fix incorrect SFP+ link status detection on driver init

    Maciej Sosnowski authored Roland Dreier committed
    During iw_nes initialization the link status for SFP+ PHY is always
    detected as "up" regardless of real state (cable either connected or
    disconnected).  Add SFP+ PHY specific link status detection to the
    iw_nes initialization procedure.  Use link status recheck for
    netdev_open to detect delayed state updates.
    
    Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
  3. RDMA/nes: Fix SFP+ link down detection issue with switch port disable

    Maciej Sosnowski authored Roland Dreier committed
    In case of SFP+ PHY, link status check at interrupt processing can
    give false results.  For proper link status change detection a delayed
    recheck is needed to give nes registers time to settle.  Add a
    periodic link status recheck scheduled at interrupt to detect
    potential delayed registers state changes.
    
    Addresses: http://bugs.openfabrics.org/bugzilla/show_bug.cgi?id=2117
    Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
  4. RDMA/nes: Generate IB_EVENT_PORT_ERR/PORT_ACTIVE events

    Maciej Sosnowski authored Roland Dreier committed
    Depending on link state change, IB_EVENT_PORT_ERR or
    IB_EVENT_PORT_ACTIVE should be generated when handling MAC interrupts.
    
    Plugging in a cable happens to result in series of interrupts changing
    driver's link state a number of times before finally staying at link
    up (e.g. link up, link down, link up, link down, ..., link up).  To
    prevent sending series of redundant IB_EVENT_PORT_ACTIVE and
    IB_EVENT_PORT_ERR events, we use a timer to debounce them in
    nes_port_ibevent().
    
    Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
  5. RDMA/nes: Fix bonding on iw_nes

    Maciej Sosnowski authored Roland Dreier committed
    Enable configuring bonds on nes devices by adding missing support for
    master net_device to the driver.
    
    Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
  6. @nablio3000

    net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FS

    nablio3000 authored
    This patch fixes the following kconfig error after changing
    CONFIGFS_FS -> select SYSFS:
    
    fs/sysfs/Kconfig:1:error: recursive dependency detected!
    fs/sysfs/Kconfig:1:	symbol SYSFS is selected by CONFIGFS_FS
    fs/configfs/Kconfig:1:	symbol CONFIGFS_FS is selected by NETCONSOLE_DYNAMIC
    drivers/net/Kconfig:3390:	symbol NETCONSOLE_DYNAMIC depends on SYSFS
    
    Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
    Cc: Joel Becker <jlbec@evilplan.org>
    Cc: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Cc: James Bottomley <James.Bottomley@suse.de>
  7. @rjwysocki

    ACPI: Fix boot problem related to APEI with acpi_disabled set

    rjwysocki authored committed
    Commit 415e12b ("PCI/ACPI: Request _OSC control once for each root
    bridge (v3)") put the acpi_hest_init() call in acpi_pci_root_init() into
    a wrong place, presumably because the author confused acpi_pci_disabled
    with acpi_disabled.  Bring the code ordering in acpi_pci_root_init()
    back to sanity.
    
    Additionally, make sure that hest_disable is set when acpi_disabled is
    set, which is going to prevent acpi_hest_parse(), that still may be
    executed for acpi_disabled=1 through aer_acpi_firmware_first(), from
    crashing because of uninitialized hest_tab.
    
    Reported-and-tested-by: Andres Salomon <dilinger@queued.net>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.