1. 03 Nov, 2011 4 commits
  2. 31 Oct, 2011 6 commits
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 1eb63378
      Linus Torvalds authored
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (348 commits)
        [media] pctv452e: Remove bogus code
        [media] adv7175: Make use of media bus pixel codes
        [media] media: vb2: fix incorrect return value
        [media] em28xx: implement VIDIOC_ENUM_FRAMESIZES
        [media] cx23885: Stop the risc video fifo before reconfiguring it
        [media] cx23885: Avoid incorrect error handling and reporting
        [media] cx23885: Avoid stopping the risc engine during buffer timeout
        [media] cx23885: Removed a spurious function cx23885_set_scale()
        [media] cx23885: v4l2 api compliance, set the audioset field correctly
        [media] cx23885: hook the audio selection functions into the main driver
        [media] cx23885: add generic functions for dealing with audio input selection
        [media] cx23885: fixes related to maximum number of inputs and range checking
        [media] cx23885: Initial support for the MPX-885 mini-card
        [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use
        [media] cx23885: Enable audio line in support from the back panel
        [media] cx23885: Allow the audio mux config to be specified on a per input basis
        [media] cx25840: Enable support for non-tuner LR1/LR2 audio inputs
        [media] cx23885: Name an internal i2c part and declare a bitfield by name
        [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming
        [media] cx23885: remove channel dump diagnostics when a vbi buffer times out
        ...
      
      Fix up trivial conflicts in drivers/misc/altera-stapl/altera.c (header
      file rename vs add)
      1eb63378
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 1a4ceab1
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (27 commits)
        vlan: allow nested vlan_do_receive()
        ipv6: fix route lookup in addrconf_prefix_rcv()
        bonding: eliminate bond_close race conditions
        qlcnic: fix beacon and LED test.
        qlcnic: Updated License file
        qlcnic: updated reset sequence
        qlcnic: reset loopback mode if promiscous mode setting fails.
        qlcnic: skip IDC ack check in fw reset path.
        i825xx: Fix incorrect dependency for BVME6000_NET
        ipv6: fix route error binding peer in func icmp6_dst_alloc
        ipv6: fix error propagation in ip6_ufo_append_data()
        stmmac: update normal descriptor structure (v2)
        stmmac: fix NULL pointer dereference in capabilities fixup (v2)
        stmmac: fix a bug while checking the HW cap reg (v2)
        be2net: Changing MAC Address of a VF was broken.
        be2net: Refactored be_cmds.c file.
        bnx2x: update driver version to 1.70.30-0
        bnx2x: use FW 7.0.29.0
        bnx2x: Enable changing speed when port type is PORT_DA
        bnx2x: Fix 54618se LED behavior
        ...
      1a4ceab1
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 83f89ca7
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Fix masking and shifting in VIS fpcmp emulation.
        sparc32: Correct the return value of memcpy.
        sparc32: Remove uses of %g7 in memcpy implementation.
        sparc32: Remove non-kernel code from memcpy implementation.
      83f89ca7
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://neil.brown.name/md · 571109f5
      Linus Torvalds authored
      * 'for-linus' of git://neil.brown.name/md:
        md/raid10:  Fix bug when activating a hot-spare.
      571109f5
    • David S. Miller's avatar
    • NeilBrown's avatar
      md/raid10: Fix bug when activating a hot-spare. · 7fcc7c8a
      NeilBrown authored
      This is a fairly serious bug in RAID10.
      
      When a RAID10 array is degraded and a hot-spare is activated, the
      spare does not take up the empty slot, but rather replaces the first
      working device.
      This is likely to make the array non-functional.   It would normally
      be possible to recover the data, but that would need care and is not
      guaranteed.
      
      This bug was introduced in commit
         2bb77736
      which first appeared in 3.1.
      
      Cc: stable@kernel.org
      Signed-off-by: default avatarNeilBrown <neilb@suse.de>
      7fcc7c8a
  3. 30 Oct, 2011 26 commits
  4. 29 Oct, 2011 4 commits
    • Linus Torvalds's avatar
      Merge git://github.com/rustyrussell/linux · ce949717
      Linus Torvalds authored
      * git://github.com/rustyrussell/linux:
        lguest: move process freezing before pending signals check
        lguest: don't allow KVM-detection cpuid.
        lguest: Allow running under paravirt-enabled KVM.
      ce949717
    • Linus Torvalds's avatar
      Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 · 24984247
      Linus Torvalds authored
      * 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
        ARM: mark empty gpio.h files empty
        gpio: Fix ARM versatile-express build failure
        of: include errno.h
      24984247
    • Linus Torvalds's avatar
      Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 · 18c06353
      Linus Torvalds authored
      * 'spi/next' of git://git.secretlab.ca/git/linux-2.6:
        drivercore: Add helper macro for platform_driver boilerplate
        spi: irq: Remove IRQF_DISABLED
        OMAP: SPI: Fix the trying to free nonexistent resource error
        spi/spi-ep93xx: add module.h include
        spi/tegra: fix compilation error in spi-tegra.c
        spi: spi-dw: fix all sparse warnings
        spi/spi-pl022: Call pl022_dma_remove(pl022) only if enable_dma is true
        spi/spi-pl022: calculate_effective_freq() must set rate <= requested rate
        spi/spi-pl022: Don't allocate more sg than required.
        spi/spi-pl022: Use GFP_ATOMIC for allocation from tasklet
        spi/spi-pl022: Resolve formatting issues
      18c06353
    • Linus Torvalds's avatar
      Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 · 41684f67
      Linus Torvalds authored
      * 'gpio/next' of git://git.secretlab.ca/git/linux-2.6:
        h8300: Move gpio.h to gpio-internal.h
        gpio: pl061: add DT binding support
        gpio: fix build error in include/asm-generic/gpio.h
        gpiolib: Ensure struct gpio is always defined
        irq: Add EXPORT_SYMBOL_GPL to function of irq generic-chip
        gpio-ml-ioh: Use NUMA_NO_NODE not GFP_KERNEL
        gpio-pch: Use NUMA_NO_NODE not GFP_KERNEL
        gpio: langwell: ensure alternate function is cleared
        gpio-pch: Support interrupt function
        gpio-pch: Save register value in suspend()
        gpio-pch: modify gpio_nums and mask
        gpio-pch: support ML7223 IOH n-Bus
        gpio-pch: add spinlock in suspend/resume processing
        gpio-pch: Delete invalid "restore" code in suspend()
        gpio-ml-ioh: Fix suspend/resume issue
        gpio-ml-ioh: Support interrupt function
        gpio-ml-ioh: Delete unnecessary code
        gpio/mxc: add chained_irq_enter/exit() to mx3_gpio_irq_handler()
        gpio/nomadik: use genirq core to track enablement
        gpio/nomadik: disable clocks when unused
      41684f67