1. 28 May, 2011 14 commits
    • Linus Torvalds's avatar
      Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci · 87367a0b
      Linus Torvalds authored
      * 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci:
        Intel xhci: Limit number of active endpoints to 64.
        Intel xhci: Ignore spurious successful event.
        Intel xhci: Support EHCI/xHCI port switching.
        Intel xhci: Add PCI id for Panther Point xHCI host.
        xhci: STFU: Be quieter during URB submission and completion.
        xhci: STFU: Don't print event ring dequeue pointer.
        xhci: STFU: Remove function tracing.
        xhci: Don't submit commands when the host is dead.
        xhci: Clear stopped_td when Stop Endpoint command completes.
      87367a0b
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx · 4cb865de
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (33 commits)
        x86: poll waiting for I/OAT DMA channel status
        maintainers: add dma engine tree details
        dmaengine: add TODO items for future work on dma drivers
        dmaengine: Add API documentation for slave dma usage
        dmaengine/dw_dmac: Update maintainer-ship
        dmaengine: move link order
        dmaengine/dw_dmac: implement pause and resume in dwc_control
        dmaengine/dw_dmac: Replace spin_lock* with irqsave variants and enable submission from callback
        dmaengine/dw_dmac: Divide one sg to many desc, if sg len is greater than DWC_MAX_COUNT
        dmaengine/dw_dmac: set residue as total len in dwc_tx_status if status is !DMA_SUCCESS
        dmaengine/dw_dmac: don't call callback routine in case dmaengine_terminate_all() is called
        dmaengine: at_hdmac: pause: no need to wait for FIFO empty
        pch_dma: modify pci device table definition
        pch_dma: Support new device ML7223 IOH
        pch_dma: Support I2S for ML7213 IOH
        pch_dma: Fix DMA setting issue
        pch_dma: modify for checkpatch
        pch_dma: fix dma direction issue for ML7213 IOH video-in
        dmaengine: at_hdmac: use descriptor chaining help function
        dmaengine: at_hdmac: implement pause and resume in atc_control
        ...
      
      Fix up trivial conflict in drivers/dma/dw_dmac.c
      4cb865de
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · 55f08e1b
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
        mfd: Fix build breakage caused by tps65910 gpio directory move
        mfd: Use mfd cell platform_data for db8500-prcmu cells platform bits
      55f08e1b
    • Linus Torvalds's avatar
      Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 · d02bf062
      Linus Torvalds authored
      * 'spi/next' of git://git.secretlab.ca/git/linux-2.6:
        spi/spi_bfin_sport: new driver for a SPI bus via the Blackfin SPORT peripheral
        spi/tle620x: add missing device_remove_file()
      d02bf062
    • Linus Torvalds's avatar
      Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 · 04830fcc
      Linus Torvalds authored
      * 'gpio/next' of git://git.secretlab.ca/git/linux-2.6:
        gpio/pch_gpio: Support new device ML7223
        gpio: make gpio_{request,free}_array gpio array parameter const
        GPIO: OMAP: move to drivers/gpio
        GPIO: OMAP: move register offset defines into <plat/gpio.h>
        gpio: Convert gpio_is_valid to return bool
        gpio: Move the s5pc100 GPIO to drivers/gpio
        gpio: Move the s5pv210 GPIO to drivers/gpio
        gpio: Move the exynos4 GPIO to drivers/gpio
        gpio: Move to Samsung common GPIO library to drivers/gpio
        gpio/nomadik: add function to read GPIO pull down status
        gpio/nomadik: show all pins in debug
        gpio: move Nomadik GPIO driver to drivers/gpio
        gpio: move U300 GPIO driver to drivers/gpio
        langwell_gpio: add runtime pm support
        gpio/pca953x: Add support for pca9574 and pca9575 devices
        gpio/cs5535: Show explicit dependency between gpio_cs5535 and mfd_cs5535
      04830fcc
    • Linus Torvalds's avatar
      Merge branch 'setns' · 571503e1
      Linus Torvalds authored
      * setns:
        ns: Wire up the setns system call
      
      Done as a merge to make it easier to fix up conflicts in arm due to
      addition of sendmmsg system call
      571503e1
    • Eric W. Biederman's avatar
      ns: Wire up the setns system call · 7b21fddd
      Eric W. Biederman authored
      32bit and 64bit on x86 are tested and working.  The rest I have looked
      at closely and I can't find any problems.
      
      setns is an easy system call to wire up.  It just takes two ints so I
      don't expect any weird architecture porting problems.
      
      While doing this I have noticed that we have some architectures that are
      very slow to get new system calls.  cris seems to be the slowest where
      the last system calls wired up were preadv and pwritev.  avr32 is weird
      in that recvmmsg was wired up but never declared in unistd.h.  frv is
      behind with perf_event_open being the last syscall wired up.  On h8300
      the last system call wired up was epoll_wait.  On m32r the last system
      call wired up was fallocate.  mn10300 has recvmmsg as the last system
      call wired up.  The rest seem to at least have syncfs wired up which was
      new in the 2.6.39.
      
      v2: Most of the architecture support added by Daniel Lezcano <dlezcano@fr.ibm.com>
      v3: ported to v2.6.36-rc4 by: Eric W. Biederman <ebiederm@xmission.com>
      v4: Moved wiring up of the system call to another patch
      v5: ported to v2.6.39-rc6
      v6: rebased onto parisc-next and net-next to avoid syscall  conflicts.
      v7: ported to Linus's latest post 2.6.39 tree.
      
      >  arch/blackfin/include/asm/unistd.h     |    3 ++-
      >  arch/blackfin/mach-common/entry.S      |    1 +
      Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
      
      Oh - ia64 wiring looks good.
      Acked-by: default avatarTony Luck <tony.luck@intel.com>
      Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7b21fddd
    • Liam Girdwood's avatar
    • Mattias Wallin's avatar
      mfd: Use mfd cell platform_data for db8500-prcmu cells platform bits · 1ed7891f
      Mattias Wallin authored
      With the addition of a device platform mfd_cell pointer, MFD drivers
      can go back to passing platform data back to their sub drivers.
      This allows for an mfd_cell->mfd_data removal and thus keep the
      sub drivers MFD agnostic. This is mostly needed for non MFD aware
      sub drivers.
      Signed-off-by: default avatarMattias Wallin <mattias.wallin@stericsson.com>
      Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
      1ed7891f
    • Grant Likely's avatar
      Merge branch 'for_2.6.40/gpio-move' of... · 1486a740
      Grant Likely authored
      Merge branch 'for_2.6.40/gpio-move' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
      1486a740
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · 29a6ccca
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6: (97 commits)
        mtd: kill CONFIG_MTD_PARTITIONS
        mtd: remove add_mtd_partitions, add_mtd_device and friends
        mtd: convert remaining users to mtd_device_register()
        mtd: samsung onenand: convert to mtd_device_register()
        mtd: omap2 onenand: convert to mtd_device_register()
        mtd: txx9ndfmc: convert to mtd_device_register()
        mtd: tmio_nand: convert to mtd_device_register()
        mtd: socrates_nand: convert to mtd_device_register()
        mtd: sharpsl: convert to mtd_device_register()
        mtd: s3c2410 nand: convert to mtd_device_register()
        mtd: ppchameleonevb: convert to mtd_device_register()
        mtd: orion_nand: convert to mtd_device_register()
        mtd: omap2: convert to mtd_device_register()
        mtd: nomadik_nand: convert to mtd_device_register()
        mtd: ndfc: convert to mtd_device_register()
        mtd: mxc_nand: convert to mtd_device_register()
        mtd: mpc5121_nfc: convert to mtd_device_register()
        mtd: jz4740_nand: convert to mtd_device_register()
        mtd: h1910: convert to mtd_device_register()
        mtd: fsmc_nand: convert to mtd_device_register()
        ...
      
      Fixed up trivial conflicts in
       - drivers/mtd/maps/integrator-flash.c: removed in ARM tree
       - drivers/mtd/maps/physmap.c: addition of afs partition probe type
         clashing with removal of CONFIG_MTD_PARTITIONS
      29a6ccca
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 42604831
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (60 commits)
        [SCSI] lpfc 8.3.24: Extend BSG infrastructure and add link diagnostics
        [SCSI] lpfc 8.3.24: Add resource extent support
        [SCSI] lpfc 8.3.24: Add request-firmware support
        [SCSI] lpfc 8.3.24: Add SR-IOV control
        [SCSI] lpfc 8.3.24: Extended hardware support and support dump images
        [SCSI] lpfc 8.3.24: Miscellaneous Fixes and Corrections
        [SCSI] libsas: Add option for SATA soft reset
        [SCSI] libsas: check dev->gone before submitting sata i/o
        [SCSI] libsas: fix/amend device gone notification in sas_deform_port()
        [SCSI] MAINTAINERS update for SCSI (new email address)
        [SCSI] Fix Ultrastor asm snippet
        [SCSI] osst: fix warning
        [SCSI] osst: wrong index used in inner loop
        [SCSI] aic94xx: world-writable sysfs update_bios file
        [SCSI] MAINTAINERS: Add drivers/target/ entry
        [SCSI] target: Convert TASK_ATTR to scsi_tcq.h definitions
        [SCSI] target: Convert REPORT_LUNs to use int_to_scsilun
        [SCSI] target: Fix task->task_execute_queue=1 clear bug + LUN_RESET OOPs
        [SCSI] target: Fix bug with task_sg chained transport_free_dev_tasks release
        [SCSI] target: Fix interrupt context bug with stats_lock and core_tmr_alloc_req
        ...
      42604831
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 2a56d222
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)
        ARM: 6945/1: Add unwinding support for division functions
        ARM: kill pmd_off()
        ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks
        ARM: 6943/1: mm: use TTBR1 instead of reserved context ID
        ARM: 6942/1: mm: make TTBR1 always point to swapper_pg_dir on ARMv6/7
        ARM: 6941/1: cache: ensure MVA is cacheline aligned in flush_kern_dcache_area
        ARM: add sendmmsg syscall
        ARM: 6863/1: allow hotplug on msm
        ARM: 6832/1: mmci: support for ST-Ericsson db8500v2
        ARM: 6830/1: mach-ux500: force PrimeCell revisions
        ARM: 6829/1: amba: make hardcoded periphid override hardware
        ARM: 6828/1: mach-ux500: delete SSP PrimeCell ID
        ARM: 6827/1: mach-netx: delete hardcoded periphid
        ARM: 6940/1: fiq: Briefly document driver responsibilities for suspend/resume
        ARM: 6938/1: fiq: Refactor {get,set}_fiq_regs() for Thumb-2
        ARM: 6914/1: sparsemem: fix highmem detection when using SPARSEMEM
        ARM: 6913/1: sparsemem: allow pfn_valid to be overridden when using SPARSEMEM
        at91: drop at572d940hf support
        at91rm9200: introduce at91rm9200_set_type to specficy cpu package
        at91: drop boot_params and PLAT_PHYS_OFFSET
        ...
      2a56d222
    • Linus Torvalds's avatar
      ALSA: fix hda AZX_DCAPS_NO_TCSEL quirk check in driver_caps · 46f2cc80
      Linus Torvalds authored
      Commit 9477c58e ("ALSA: hda - Reorganize controller quriks with bit
      flags") changed the driver type compares into various quirk bits.
      However, the check for AZX_DCAPS_NO_TCSEL got reverted: instead of
      clearing TCSEL for chipsets that have that standard capability, it
      cleared then when the NO_TCSEL bit was set.
      
      This can lead to noise and repeated sounds - a weird "echo" behavior.
      As the comment just above says: "Ensuring these bits are 0 clears
      playback static on some HD Audio codecs".  Which is definitely true at
      least on my Core i5 Westmere system.
      
      Cc: Takashi Iwai <tiwai@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      46f2cc80
  2. 27 May, 2011 26 commits
    • Tomoya MORINAGA's avatar
      gpio/pch_gpio: Support new device ML7223 · bc786cce
      Tomoya MORINAGA authored
      Support new device OKI SEMICONDUCTOR ML7223 IOH(Input/Output Hub).
      The ML7223 IOH is for MP(Media Phone) use.
      The ML7223 is companion chip for Intel Atom E6xx series.
      The ML7223 is completely compatible for Intel EG20T PCH.
      Signed-off-by: default avatarTomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      bc786cce
    • Lars-Peter Clausen's avatar
      gpio: make gpio_{request,free}_array gpio array parameter const · 7c295975
      Lars-Peter Clausen authored
      gpio_{request,free}_array should not (and do not) modify the passed gpio
      array, so make the parameter const.
      Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
      Acked-by: default avatarEric Miao <eric.y.miao@gmail.com>
      Acked-by: default avatarWolfram Sang <w.sang@pengutronix.de>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      7c295975
    • Russell King's avatar
    • Laura Abbott's avatar
      ARM: 6945/1: Add unwinding support for division functions · 81479c24
      Laura Abbott authored
      The software division functions never had unwinding annotations
      added. Currently, when a division by zero occurs the backtrace shown
      will stop at Ldiv0 or some completely unrelated function. Add
      unwinding annotations in hopes of getting a more useful backtrace
      when a division by zero occurs.
      Signed-off-by: default avatarLaura Abbott <lauraa@codeaurora.org>
      Acked-by: default avatarDave Martin <dave.martin@linaro.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      81479c24
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · f23a5e14
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
        PM: Fix PM QOS's user mode interface to work with ASCII input
        PM / Hibernate: Update kerneldoc comments in hibernate.c
        PM / Hibernate: Remove arch_prepare_suspend()
        PM / Hibernate: Update some comments in core hibernate code
      f23a5e14
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · d24c2af4
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] Follow on to cifsacl endian patch (__constant_cpu_to_le32 was required)
      d24c2af4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · a0c30610
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (58 commits)
        Btrfs: use the device_list_mutex during write_dev_supers
        Btrfs: setup free ino caching in a more asynchronous way
        btrfs scrub: don't coalesce pages that are logically discontiguous
        Btrfs: return -ENOMEM in clear_extent_bit
        Btrfs: add mount -o auto_defrag
        Btrfs: using rcu lock in the reader side of devices list
        Btrfs: drop unnecessary device lock
        Btrfs: fix the race between remove dev and alloc chunk
        Btrfs: fix the race between reading and updating devices
        Btrfs: fix bh leak on __btrfs_open_devices path
        Btrfs: fix unsafe usage of merge_state
        Btrfs: allocate extent state and check the result properly
        fs/btrfs: Add missing btrfs_free_path
        Btrfs: check return value of btrfs_inc_extent_ref()
        Btrfs: return error to caller if read_one_inode() fails
        Btrfs: BUG_ON is deleted from the caller of btrfs_truncate_item & btrfs_extend_item
        Btrfs: return error code to caller when btrfs_del_item fails
        Btrfs: return error code to caller when btrfs_previous_item fails
        btrfs: fix typo 'testeing' -> 'testing'
        btrfs: typo: 'btrfS' -> 'btrfs'
        ...
      a0c30610
    • Steve French's avatar
      [CIFS] Follow on to cifsacl endian patch (__constant_cpu_to_le32 was required) · 4f61258f
      Steve French authored
      As Jeff just pointed out, __constant_cpu_to_le32 was required instead of
      cpu_to_le32 in previous patch to cifsacl.c 383c5535
      (Fix endian error comparing authusers when cifsacl enabled)
      
      CC: Stable <stable@kernel.org>
      Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
      CC: Shirish Pargaonkar <shirishp@us.ibm.com>
      Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
      4f61258f
    • Sarah Sharp's avatar
      Intel xhci: Limit number of active endpoints to 64. · 2cf95c18
      Sarah Sharp authored
      The Panther Point chipset has an xHCI host controller that has a limit to
      the number of active endpoints it can handle.  Ideally, it would signal
      that it can't handle anymore endpoints by returning a Resource Error for
      the Configure Endpoint command, but they don't.  Instead it needs software
      to keep track of the number of active endpoints, across configure endpoint
      commands, reset device commands, disable slot commands, and address device
      commands.
      
      Add a new endpoint context counter, xhci_hcd->num_active_eps, and use it
      to track the number of endpoints the xHC has active.  This gets a little
      tricky, because commands to change the number of active endpoints can
      fail.  This patch adds a new xHCI quirk for these Intel hosts, and the new
      code should not have any effect on other xHCI host controllers.
      
      Fail a new device allocation if we don't have room for the new default
      control endpoint.  Use the endpoint ring pointers to determine what
      endpoints were active before a Reset Device command or a Disable Slot
      command, and drop those once the command completes.
      
      Fail a configure endpoint command if it would add too many new endpoints.
      We have to be a bit over zealous here, and only count the number of new
      endpoints to be added, without subtracting the number of dropped
      endpoints.  That's because a second configure endpoint command for a
      different device could sneak in before we know if the first command is
      completed.  If the first command dropped resources, the host controller
      fails the command for some reason, and we're nearing the limit of
      endpoints, we could end up oversubscribing the host.
      
      To fix this race condition, when evaluating whether a configure endpoint
      command will fix in our bandwidth budget, only add the new endpoints to
      xhci->num_active_eps, and don't subtract the dropped endpoints.  Ignore
      changed endpoints (ones that are dropped and then re-added), as that
      shouldn't effect the host's endpoint resources.  When the configure
      endpoint command completes, subtract off the dropped endpoints.
      
      This may mean some configuration changes may temporarily fail, but it's
      always better to under-subscribe than over-subscribe resources.
      
      (Originally my plan had been to push the resource allocation down into the
      ring allocation functions.  However, that would cause us to allocate
      unnecessary resources when endpoints were changed, because the xHCI driver
      allocates a new ring for the changed endpoint, and only deletes the old
      ring once the Configure Endpoint command succeeds.  A further complication
      would have been dealing with the per-device endpoint ring cache.)
      Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
      2cf95c18
    • Sarah Sharp's avatar
      Intel xhci: Ignore spurious successful event. · ad808333
      Sarah Sharp authored
      The xHCI host controller in the Panther Point chipset sometimes produces
      spurious events on the event ring.  If it receives a short packet, it
      first puts a Transfer Event with a short transfer completion code on the
      event ring.  Then it puts a Transfer Event with a successful completion
      code on the ring for the same TD.  The xHCI driver correctly processes the
      short transfer completion code, gives the URB back to the driver, and then
      prints a warning in dmesg about the spurious event.  These warning
      messages really fill up dmesg when an HD webcam is plugged into xHCI.
      
      This spurious successful event behavior isn't technically disallowed by
      the xHCI specification, so make the xHCI driver just ignore the spurious
      completion event.
      Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
      ad808333
    • Sarah Sharp's avatar
      Intel xhci: Support EHCI/xHCI port switching. · 69e848c2
      Sarah Sharp authored
      The Intel Panther Point chipsets contain an EHCI and xHCI host controller
      that shares some number of skew-dependent ports.  These ports can be
      switched from the EHCI to the xHCI host (and vice versa) by a hardware MUX
      that is controlled by registers in the xHCI PCI configuration space.  The
      USB 3.0 SuperSpeed terminations on the xHCI ports can be controlled
      separately from the USB 2.0 data wires.
      
      This switchover mechanism is there to support users who do a custom
      install of certain non-Linux operating systems that don't have official
      USB 3.0 support.  By default, the ports are under EHCI, SuperSpeed
      terminations are off, and USB 3.0 devices will show up under the EHCI
      controller at reduced speeds.  (This was more palatable for the marketing
      folks than having completely dead USB 3.0 ports if no xHCI drivers are
      available.)  Users should be able to turn on xHCI by default through a
      BIOS option, but users are happiest when they don't have to change random
      BIOS settings.
      
      This patch introduces a driver method to switchover the ports from EHCI to
      xHCI before the EHCI driver finishes PCI enumeration.  We want to switch
      the ports over before the USB core has the chance to enumerate devices
      under EHCI, or boot from USB mass storage will fail if the boot device
      connects under EHCI first, and then gets disconnected when the port
      switches over to xHCI.
      
      Add code to the xHCI PCI quirk to switch the ports from EHCI to xHCI.  The
      PCI quirks code will run before any other PCI probe function is called, so
      this avoids the issue with boot devices.
      
      Another issue is with BIOS behavior during system resume from hibernate.
      If the BIOS doesn't support xHCI, it may switch the devices under EHCI to
      allow use of the USB keyboard, mice, and mass storage devices.  It's
      supposed to remember the value of the port routing registers and switch
      them back when the OS attempts to take control of the xHCI host controller,
      but we all know not to trust BIOS writers.
      
      Make both the xHCI driver and the EHCI driver attempt to switchover the
      ports in their PCI resume functions.  We can't guarantee which PCI device
      will be resumed first, so this avoids any race conditions.  Writing a '1'
      to an already set port switchover bit or a '0' to a cleared port switchover
      bit should have no effect.
      
      The xHCI PCI configuration registers will be documented in the EDS-level
      chipset spec, which is not public yet.  I have permission from legal and
      the Intel chipset group to release this patch early to allow good Linux
      support at product launch.  I've tried to document the registers as much
      as possible, so please let me know if anything is unclear.
      Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
      69e848c2
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 10799db6
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        net: Kill ratelimit.h dependency in linux/net.h
        net: Add linux/sysctl.h includes where needed.
        net: Kill ether_table[] declaration.
        inetpeer: fix race in unused_list manipulations
        atm: expose ATM device index in sysfs
        IPVS: bug in ip_vs_ftp, same list heaad used in all netns.
        bug.h: Move ratelimit warn interfaces to ratelimit.h
        bonding: cleanup module option descriptions
        net:8021q:vlan.c Fix pr_info to just give the vlan fullname and version.
        net: davinci_emac: fix dev_err use at probe
        can: convert to %pK for kptr_restrict support
        net: fix ETHTOOL_SFEATURES compatibility with old ethtool_ops.set_flags
        netfilter: Fix several warnings in compat_mtw_from_user().
        netfilter: ipset: fix ip_set_flush return code
        netfilter: ipset: remove unused variable from type_pf_tdel()
        netfilter: ipset: Use proper timeout value to jiffies conversion
      10799db6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6 · aaab1842
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
        MAINTAINERS: Update eCryptfs mailing list
        eCryptfs: Allow 2 scatterlist entries for encrypted filenames
        eCryptfs: Clear i_nlink in rmdir
      aaab1842
    • David S. Miller's avatar
      net: Kill ratelimit.h dependency in linux/net.h · c5c177b4
      David S. Miller authored
      Ingo Molnar noticed that we have this unnecessary ratelimit.h
      dependency in linux/net.h, which hid compilation problems from
      people doing builds only with CONFIG_NET enabled.
      
      Move this stuff out to a seperate net/net_ratelimit.h file and
      include that in the only two places where this thing is needed.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      Acked-by: default avatarIngo Molnar <mingo@elte.hu>
      c5c177b4
    • David S. Miller's avatar
      net: Add linux/sysctl.h includes where needed. · bee95250
      David S. Miller authored
      Several networking headers were depending upon the implicit
      linux/sysctl.h include they get when including linux/net.h
      
      Add explicit includes.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bee95250
    • David S. Miller's avatar
      net: Kill ether_table[] declaration. · 9d931dd2
      David S. Miller authored
      This got missed back in 2006 when Jes Sorensen deleted
      net/ethernet/sysctl_net_ether.c
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9d931dd2
    • Eric Dumazet's avatar
      inetpeer: fix race in unused_list manipulations · 686a7e32
      Eric Dumazet authored
      Several crashes in cleanup_once() were reported in recent kernels.
      
      Commit d6cc1d64 (inetpeer: various changes) added a race in
      unlink_from_unused().
      
      One way to avoid taking unused_peers.lock before doing the list_empty()
      test is to catch 0->1 refcnt transitions, using full barrier atomic
      operations variants (atomic_cmpxchg() and atomic_inc_return()) instead
      of previous atomic_inc() and atomic_add_unless() variants.
      
      We then call unlink_from_unused() only for the owner of the 0->1
      transition.
      
      Add a new atomic_add_unless_return() static helper
      
      With help from Arun Sharma.
      
      Refs: https://bugzilla.kernel.org/show_bug.cgi?id=32772Reported-by: default avatarArun Sharma <asharma@fb.com>
      Reported-by: default avatarMaximilian Engelhardt <maxi@daemonizer.de>
      Reported-by: default avatarYann Dupont <Yann.Dupont@univ-nantes.fr>
      Reported-by: default avatarDenys Fedoryshchenko <denys@visp.net.lb>
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      686a7e32
    • Linus Torvalds's avatar
      Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs · e52e713e
      Linus Torvalds authored
      * 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs:
        Create Documentation/security/, move LSM-, credentials-, and keys-related files from Documentation/   to Documentation/security/, add Documentation/security/00-INDEX, and update all occurrences of Documentation/<moved_file>   to Documentation/security/<moved_file>.
      e52e713e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · bdf7cf1c
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        loop: export module parameters
        block: export blk_{get,put}_queue()
        block: remove unused variable in bio_attempt_front_merge()
        block: always allocate genhd->ev if check_events is implemented
        brd: export module parameters
        brd: fix comment on initial device creation
        brd: handle on-demand devices correctly
        brd: limit 'max_part' module param to DISK_MAX_PARTS
        brd: get rid of unused members from struct brd_device
        block: fix oops on !disk->queue and sysfs discard alignment display
      bdf7cf1c
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 40efeb4d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] Fix endian error comparing authusers when cifsacl enabled
        [CIFS] Rename three structures to avoid camel case
        Fix extended security auth failure
        CIFS: Add rwpidforward mount option
        CIFS: Migrate to shared superblock model
        [CIFS] Migrate from prefixpath logic
        CIFS: Fix memory leak in cifs_do_mount
        [CIFS] When mandatory encryption on share, fail mount
        CIFS: Use pid saved from cifsFileInfo in writepages and set_file_size
        cifs: add cifs_async_writev
        cifs: clean up wsize negotiation and allow for larger wsize
        cifs: convert cifs_writepages to use async writes
        CIFS: Fix undefined behavior when mount fails
        cifs: don't call mid_q_entry->callback under the Global_MidLock (try #5)
        CIFS: Simplify mount code for further shared sb capability
        CIFS: Simplify connection structure search calls
        cifs: remove unused SMB2 config and mount options
        cifs: add ignore_pend flag to cifs_call_async
        cifs: make cifs_send_async take a kvec array
        cifs: consolidate SendReceive response checks
      40efeb4d
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · 81faae7f
      Linus Torvalds authored
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
        Ocfs2/move_extents: Validate moving goal after the adjustment.
        Ocfs2/move_extents: Avoid doing division in extent moving.
      81faae7f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 95948c31
      Linus Torvalds authored
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
        [S390] mm: add ZONE_DMA to 31-bit config again
        [S390] mm: add page fault retry handling
        [S390] mm: handle kernel caused page fault oom situations
        [S390] delay: implement ndelay
        [S390] topology,sched: fix cpu_coregroup_mask/cpu_book_mask definitions
        [S390] hwsampler: allow cpu hotplug
        [S390] uaccess: turn __access_ok() into a define
        [S390] irq: merge irq.c and s390_ext.c
        [S390] irq: fix service signal external interrupt handling
        [S390] pfault: always enable service signal interrupt
      95948c31
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 45acab01
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/fsl_rio: Error interrupt handler for sRIO on MPC85xx
        powerpc/fsl_rio: move machine_check handler
        powerpc/fsl_lbc: Add workaround for ELBC-A001 erratum
      45acab01
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · c0880dcd
      Linus Torvalds authored
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
        [media] v1.88 DM04/QQBOX Move remote to use rc_core dvb-usb-remote
        [media] Add missing include guard to header file
        [media] Inlined functions should be static
        [media] Remove invalid parameter description
        [media] cpia2: fix warning about invalid trigraph sequence
        [media] s5p-csis: Add missing dependency on PLAT_S5P
        [media] gspca/kinect: wrap gspca_debug with GSPCA_DEBUG
        [media] fintek-cir: new driver for Fintek LPC SuperIO CIR function
        [media] uvcvideo: Connect video devices to media entities
        [media] uvcvideo: Register subdevices for each entity
        [media] uvcvideo: Register a v4l2_device
        [media] add V4L2-PIX-FMT-SRGGB12 & friends to docbook
        [media] Documentation/DocBook: Rename media fops xml files
        [media] Media DocBook: fix validation errors
        [media] wl12xx: g_volatile_ctrl fix: wrong field set
        [media] fix kconfig dependency warning for VIDEO_TIMBERDALE
        [media] dm1105: GPIO handling added, I2C on GPIO added, LNB control through GPIO reworked
        [media] Add support for M-5MOLS 8 Mega Pixel camera ISP
      c0880dcd
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 · f7fc06e3
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (42 commits)
        regulator: Fix _regulator_get_voltage if get_voltage callback is NULL
        USB: TWL6025 allow different regulator name
        REGULATOR: TWL6025: add support to twl-regulator
        regulator: twl6030: do not write to _GRP for regulator disable
        regulator: twl6030: do not write to _GRP for regulator enable
        TPS65911: Comparator: Add comparator driver
        TPS65911: Add support for added GPIO lines
        GPIO: TPS65910: Move driver to drivers/gpio/
        TPS65911: Add new irq definitions
        regulator: tps65911: Add new chip version
        MFD: TPS65910: Add support for TPS65911 device
        regulator: Fix off-by-one value range checking for mc13xxx_regulator_get_voltage
        regulator: mc13892: Fix voltage unit in test case.
        regulator: Remove MAX8997_REG_BUCK1DVS/MAX8997_REG_BUCK2DVS/MAX8997_REG_BUCK5DVS macros
        mfd: Fix off-by-one value range checking for tps65910_i2c_write
        regulator: Only apply voltage constraints from consumers that set them
        regulator: If we can't configure optimum mode we're always in the best one
        regulator: max8997: remove useless code
        regulator: Fix memory leak in max8998_pmic_probe failure path
        regulator: Fix desc_id for tps65023/6507x/65910
        ...
      f7fc06e3
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/battery-2.6 · ea0ca3a8
      Linus Torvalds authored
      * git://git.infradead.org/battery-2.6:
        PXA: Use dev_pm_ops in z2_battery
        ds2760_battery: Fix rated capacity of the hx4700 1800mAh battery
        ds2760_battery: Fix indexing of the 4 active full EEPROM registers
        power: Make test_power driver more dynamic.
        bq27x00_battery: Name of cycle count property
        max8903_charger: Add GENERIC_HARDIRQS as a dependency (fixes S390 build)
        ARM: RX-51: Enable isp1704 power on/off
        isp1704_charger: Allow board specific powering routine
        gpio-charger: Add gpio_charger_resume
        power_supply: Add driver for MAX8903 charger
      ea0ca3a8