Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 12, 2010
  1. Linux 2.6.35-rc5

    authored
  2. Merge branch 'arm/defconfig/reduced-v2.6.35-rc1' of git://git.pengutr…

    authored
    …onix.de/git/ukl/linux-2.6
    
    * 'arm/defconfig/reduced-v2.6.35-rc1' of git://git.pengutronix.de/git/ukl/linux-2.6:
      ARM: reduce defconfigs
    
    This is a big change, but results in no loss of information, despite us
    losing almost 200k lines:
    
     177 files changed, 652 insertions(+), 194157 deletions(-)
    
    and Grant Likely thinks powerpc can also use the same reduction
    technique.
    
    The python script that did the reduction looks like this:
    
        #! /usr/bin/env python
        # vim: set fileencoding=utf-8 :
        # Copyright (C) 2010 by Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    
        import re
        import subprocess
        import os
        import sys
    
        # This prevents including a timestamp in the .config which makes comparing a
        # bit easier.
        os.environ['KCONFIG_NOTIMESTAMP'] = 'Yes, please'
    
        # XXX: get these using getopt
        kernel_tree = '' # os.path.join(os.environ['HOME'], 'gsrc', 'linux-2.6')
        arch = 'arm'
        target = sys.argv[1]
        defconfig_src = os.path.join(kernel_tree, 'arch/%s/configs/%s' % (arch, target))
    
        subprocess.check_call(['make', '-s', 'ARCH=%s' % arch, target])
        origconfig = list(open('.config'))
        config = list(origconfig)
        config_size = os.stat('.config').st_size
    
        i = 0
    
        while i < len(config):
            print 'test for %r' % config[i]
            defconfig = open(defconfig_src, 'w')
            defconfig.writelines(config[:i])
            defconfig.writelines(config[i + 1:])
            defconfig.close()
            subprocess.check_call(['make', '-s', 'ARCH=%s' % arch, target])
            if os.stat('.config').st_size == config_size and list(open('.config')) == origconfig:
                del config[i]
            else:
                i += 1
    
        defconfig = open(defconfig_src, 'w')
        defconfig.writelines(config)
        defconfig.close()
    
    which is pretty self-explanatory.
    
    Acked-by: Nicolas Pitre <nico@fluxnic.net>
    Acked-by: Russell King <linux@arm.linux.org.uk>
    Acked-by: Grant Likely <grant.likely@secretlab.ca>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/g…

    authored
    …it/tiwai/sound-2.6
    
    * 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda - Restore cleared pin controls on resume
  4. Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/k…

    authored
    …ernel/git/mchehab/linux-2.6
    
    * 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
      V4L/DVB: uvc: Fix multiple symbols definitions with UVC gadget and host drivers
      V4L/DVB: v4l: mem2mem_testdev: fix g_fmt NULL pointer dereference
      V4L/DVB: uvcvideo: Power line frequency control doesn't support GET_MIN/MAX/RES
      V4L/DVB: ivtv: Add delay to ensure the decoder always restarts with a blank screen
      V4L/DVB: Documentation: Add the Philips FQ1236 MK5 to video4linux/CARDLIST.tuner
      V4L/DVB: tveeprom: Add an entry for tuner code 168: a TCL M30WTP-4N-E tuner
      V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tuner
      V4L/DVB: OMAP_VOUT: fix: Module params were not working through bootargs
      V4L/DVB: OMAP_VOUT: fix: Replaced dma-sg with dma-contig
      V4L/DVB: OMAP_VOUT:Build FIX: Rebased against latest DSS2 changes
  5. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: Send Report ID when numbered reports are sent over the control endpoint.
      HID: Enable HID_QUIRK_MULTI_INPUT for Retro Adaptor
      HID: add support for CH Eclipse yoke
      HID: eliminate a double lock in debug code
      HID: ntrig: add support for new firwmare versions
      HID: check for HID_QUIRK_IGNORE during probing
      HID: roccat: fix modules interdependencies
  6. @JoePerches

    MAINTAINERS: fix EDAC-I7CORE file patterns

    JoePerches authored committed
    File patterns are one per line.
    Fixed include file location.
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Jul 11, 2010
  1. @signal11

    HID: Send Report ID when numbered reports are sent over the control e…

    signal11 authored Jiri Kosina committed
    …ndpoint.
    
    The Report ID wasn't sent as part of the payload for reports which were sent
    over the control endpoint. This is required by section 8.1 of the HID spec.
    
    Signed-off-by: Alan Ott <alan@signal11.us>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  2. @pinchartl

    V4L/DVB: uvc: Fix multiple symbols definitions with UVC gadget and ho…

    pinchartl authored Mauro Carvalho Chehab committed
    …st drivers
    
    The UVC gadget driver borrowed code from the UVC host driver without
    changing the symbol names. This results in a namespace clash with
    multiple definitions of several symbols when compiling both drivers in
    the kernel.
    
    Make all generic UVC functions and variables static in the UVC gadget
    driver, as the symbols are not referenced outside of the gadget driver.
    Rename the uvc_trace_param global variable to uvc_gadget_trace_param.
    
    Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  3. Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    authored
    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: Fix autoloading of fschmd on recent Fujitsu machines
      hwmon: (coretemp) Properly label the sensors
      hwmon: (coretemp) Skip duplicate CPU entries
      hwmon: (it87) Fix in7 on IT8720F
      hwmon: (k8temp) Fix temperature reporting for ASB1 processor revisions
  4. Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/ke…

    authored
    …rnel/git/jdelvare/staging
    
    * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      i2c/mips: Fix error return codes from Sibyte i2c bus driver
      i2c: Fix probability check
  5. HID: Enable HID_QUIRK_MULTI_INPUT for Retro Adaptor

    Peter Edwards authored Jiri Kosina committed
    Patch for linux-2.6.35-rc4 mainline kernel to enable Paul Qureshi's
    Retro Adapter [http://keio.dk/retroadapter.html], an open source USB
    device which allows controllers and joysticks from classic computers
    and consoles to work on modern PCs, to appear as two separate devices
    under Linux.
    Signed-off-by: Peter Edwards <samwise@bagshot-row.org>
    Acked-by: Paul Qureshi <retro@world3.net>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  6. @jrockway

    HID: add support for CH Eclipse yoke

    jrockway authored Jiri Kosina committed
    This USB flight yoke needs the NOGET quirk, like most of CH's other
    products. This patch adds that.
    
    Signed-off-by: Jonathan Rockway <jon@jrock.us>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Commits on Jul 10, 2010
  1. i2c/mips: Fix error return codes from Sibyte i2c bus driver

    Guenter Roeck authored Jean Delvare committed
    Sibyte i2c bus driver returns non-descriptive error values.
    Update to return error values as defined in Documentation/i2c/fault-codes.
    
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  2. i2c: Fix probability check

    Jean Delvare authored
    The new unified probing function differs from the original code, and
    the preliminary test whether probing is possible must be updated
    accordingly.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
Commits on Jul 9, 2010
  1. hwmon: Fix autoloading of fschmd on recent Fujitsu machines

    Jean Delvare authored
    Fujitsu slightly changed the DMI strings in their recent machines,
    (for example the D2778) and this breaks the automatic loading of the
    needed fschmd driver. Being more tolerant on string comparison fixes
    the issue.
    
    This closes bug #15634:
    https://bugzilla.kernel.org/show_bug.cgi?id=15634
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Tested-by: Sergey Spiridonov <sena@hurd.homeunix.org>
    Cc: Hans de Goede <hdegoede@redhat.com>
  2. hwmon: (coretemp) Properly label the sensors

    Jean Delvare authored
    Don't assume that CPU entry number and core ID always match. It
    worked in the simple cases (single CPU, no HT) but fails on
    multi-CPU systems.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Huaxu Wan <huaxu.wan@intel.com>
    Cc: stable@kernel.org
  3. hwmon: (coretemp) Skip duplicate CPU entries

    Jean Delvare authored
    On hyper-threaded CPUs, each core appears twice in the CPU list. Skip
    the second entry to avoid duplicate sensors.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Huaxu Wan <huaxu.wan@intel.com>
    Cc: stable@kernel.org
  4. hwmon: (it87) Fix in7 on IT8720F

    Jean Delvare authored
    The IT8720F has no VIN7 pin, so VCCH should always be routed
    internally to VIN7 with an internal divider. Curiously, there still
    is a configuration bit to control this, which means it can be set
    incorrectly. And even more curiously, many boards out there are
    improperly configured, even though the IT8720F datasheet claims that
    the internal routing of VCCH to VIN7 is the default setting. So we
    force the internal routing in this case.
    
    It turns out that all boards with the wrong setting are from Gigabyte,
    so I suspect a BIOS bug. But it's easy enough to workaround in the
    driver, so let's do it.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Jean-Marc Spaggiari <jean-marc@spaggiari.org>
    Cc: stable@kernel.org
  5. hwmon: (k8temp) Fix temperature reporting for ASB1 processor revisions

    Andreas Herrmann authored Jean Delvare committed
    Reported temperature for ASB1 CPUs is too high.
    Add ASB1 CPU revisions (these are also non-desktop variants) to the
    list of CPUs for which the temperature fixup is not required.
    
    Example: (from LENOVO ThinkPad Edge 13, 01972NG, system was idle)
    
      Current kernel reports
    
      $ sensors
      k8temp-pci-00c3
      Adapter: PCI adapter
      Core0 Temp:  +74.0 C
      Core0 Temp:  +70.0 C
      Core1 Temp:  +69.0 C
      Core1 Temp:  +70.0 C
    
      With this patch I have
    
      $ sensors
      k8temp-pci-00c3
      Adapter: PCI adapter
      Core0 Temp:  +54.0 C
      Core0 Temp:  +51.0 C
      Core1 Temp:  +48.0 C
      Core1 Temp:  +49.0 C
    
    Cc: stable@kernel.org [.32.x .33.x, .34.x]
    Cc: Rudolf Marek <r.marek@assembler.cz>
    Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  6. @tiwai

    ALSA: hda - Restore cleared pin controls on resume

    tiwai authored
    Many codecs now clear the pin controls at suspend via snd_hda_shutup_pins()
    for reducing the click noise at power-off.  But this leaves some pins
    uninitialized, and they'll be never recovered after resume.
    
    This patch adds the proper recovery of cleared pin controls on resume.
    Also it adds a check of bus->shutdown so that pins won't be cleared at
    module unloading.
    
    Reference: Kernel bug 16339
    	http://bugzilla.kernel.org/show_bug.cgi?id=16339
    
    Cc: <stable@kernel.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
Commits on Jul 8, 2010
  1. IB/qib: Use request_firmware() to load SD7220 firmware

    Ben Hutchings authored Roland Dreier committed
    Extract the microcode for the QLogic QLE7220 series IB HCA and use the
    kernel microcode request facility to load the microcode.  This
    supports Debian Linux's requirements to separate microcode which
    doesn't have open source code available from the device driver.
    
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
  2. V4L/DVB: v4l: mem2mem_testdev: fix g_fmt NULL pointer dereference

    Pawel Osciak authored Mauro Carvalho Chehab committed
    Calling g_fmt before s_fmt resulted in a NULL pointer dereference as no
    default formats were being selected on probe.
    
    Reported-by: Németh Márton <nm127@freemail.hu>
    Signed-off-by: Pawel Osciak <p.osciak@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  3. @pinchartl

    V4L/DVB: uvcvideo: Power line frequency control doesn't support GET_M…

    pinchartl authored Mauro Carvalho Chehab committed
    …IN/MAX/RES
    
    Issuing a GET_MIN request on the power line frequency control times out
    on at least the Apple iSight. As the UVC specification doesn't list
    GET_MIN/MAX/RES as supported on that control, remove them from the
    uvc_ctrls array.
    
    Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  4. V4L/DVB: ivtv: Add delay to ensure the decoder always restarts with a…

    Ian Armstrong authored Mauro Carvalho Chehab committed
    … blank screen
    
    Add a short delay when stopping the decoder, allowing it to settle and
    preventing some unexpected interaction with other firmware commands.
    
    Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk>
    Tested-by: Martin Dauskardt <martin.dauskardt@gmx.de>
    Signed-off-by: Andy Walls <awalls@md.metrocast.net>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  5. @awalls-cx18

    V4L/DVB: Documentation: Add the Philips FQ1236 MK5 to video4linux/CAR…

    awalls-cx18 authored Mauro Carvalho Chehab committed
    …DLIST.tuner
    
    Signed-off-by: Andy Walls <awalls@md.metrocast.net>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  6. @awalls-cx18

    V4L/DVB: tveeprom: Add an entry for tuner code 168: a TCL M30WTP-4N-E…

    awalls-cx18 authored Mauro Carvalho Chehab committed
    … tuner
    
    Hauppauge EEPROM tuner code 168 has recently shown up on HVR-1600 TV
    capture cards supported by the cx18 driver.  This change allows analog
    tuner type autodetection to succeed for these cards.
    
    Information for decoding tuner code 168 was provided by Hauppauge.
    
    Signed-off-by: Andy Walls <awalls@md.metrocast.net>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  7. @awalls-cx18

    V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tuner

    awalls-cx18 authored Mauro Carvalho Chehab committed
    Signed-off-by: Andy Walls <awalls@md.metrocast.net>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  8. V4L/DVB: OMAP_VOUT: fix: Module params were not working through bootargs

    Vaibhav Hiremath authored Mauro Carvalho Chehab committed
    Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
    Signed-off-by: Muralidharan Karicheri <mkaricheri@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  9. V4L/DVB: OMAP_VOUT: fix: Replaced dma-sg with dma-contig

    Vaibhav Hiremath authored Mauro Carvalho Chehab committed
    Actually OMAP doesn't support scatter-gather DMA for
    Display subsystem but due to legacy coding it has been overlooked
    till now.
    
    Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
    Signed-off-by: Muralidharan Karicheri <mkaricheri@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  10. V4L/DVB: OMAP_VOUT:Build FIX: Rebased against latest DSS2 changes

    Vaibhav Hiremath authored Mauro Carvalho Chehab committed
    Changes -
    	- Kconfig option dependancy changed to ARCH_OMAP2/3 from
    	ARCH_OMAP24XX/34XX
    	- There are some moments of function from omap_dss_device
    	to omap_dss_driver. Incorporated changes for the same.
    
    Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
    Signed-off-by: Muralidharan Karicheri <mkaricheri@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  11. 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:
      IPoIB: Fix world-writable child interface control sysfs attributes
      IB/qib: Clean up properly if qib_init() fails
      IB/qib: Completion queue callback needs to be single threaded
      IB/qib: Update 7322 serdes tables
      IB/qib: Clear 6120 hardware error register
      IB/qib: Clear eager buffer memory for each new process
      IB/qib: Mask hardware error during link reset
      IB/qib: Don't mark VL15 bufs as WC to avoid a rare 7322 chip problem
      RDMA/cxgb4: Derive smac_idx from port viid
      RDMA/cxgb4: Avoid false GTS CIDX_INC overflows
      RDMA/cxgb4: Don't call abort_connection() for active connect failures
      RDMA/cxgb4: Use the DMA state API instead of the pci equivalents
  12. Merge branches 'cxgb4', 'ipoib' and 'qib' into for-next

    Roland Dreier authored
  13. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda - Enable beep on Realtek codecs with PCI SSID override
      ALSA: usb-audio - Add volume resolution quirk for some Logitech webcams
      ALSA: hda - Add Macbook 5,2 quirk
      ALSA: hda - Fix uninitialized variable
  14. Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

    authored
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      writeback: simplify the write back thread queue
      writeback: split writeback_inodes_wb
      writeback: remove writeback_inodes_wbc
      fs-writeback: fix kernel-doc warnings
      splice: check f_mode for seekable file
      splice: direct_splice_actor() should not use pos in sd
  15. Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    authored
    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc: Fix userspace build of ptrace.h
      powerpc: Fix default_machine_crash_shutdown #ifdef botch
      powerpc: Fix logic error in fixup_irqs
      powerpc/iseries: Fix possible null pointer dereference in iSeries_pcibios_fixup_resources
      powerpc: Linux cannot run with 0 cores
      powerpc: Fix feature-fixup tests for gcc 4.5
      powerpc: Disable SPARSE_IRQ by default
      powerpc: Fix compile errors in prom_init_check for gcc 4.5
      powerpc: Fix module building for gcc 4.5 and 64 bit
      powerpc/perf_event: Fix for power_pmu_disable()
Something went wrong with that request. Please try again.