Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
tag: v2.6.33-rc4-gi…
Commits on Jan 14, 2010
  1. @torvalds

    Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm: change drm set mode messages as DRM_DEBUG
      drm: fix crtc no modes printf + typo
      drm/radeon/kms: only evict to GTT if CP is ready
      drm/radeon/kms: Fix crash getting TV info with no BIOS.
      drm/radeon/kms/rv100: reject modes > 135 Mhz on DVI (v2)
      drm/radeon/kms/r6xx+: make irq handler less verbose
      drm/radeon/kms: fix up LVDS handling on macs (v2)
  2. @ozbenh @torvalds

    zlib: Fix build of powerpc boot wrapper

    ozbenh authored torvalds committed
    Commit ac4c2a3 broke the build
    of all powerpc boot wrappers.
    
    It attempts to add an include of autoconf.h but used the wrong
    path for it. It also adds -D__KERNEL__ to our boot wrapper, both
    things that we pretty much didn't do on purpose so far.
    
    We want our boot wrapper to remain independent enough of the kernel
    for various reasons, one of them being that you can "wrap" an existing
    kernel at distro install time which allows to ship one kernel image
    and a set of boot wrappers for different platforms, the wrappers
    don't have to be built out of the same kernel build tree.
    
    It's also incorrect to do what the patch does in our boot environment
    since we may not have a proper alignment exception handler which means
    we may not be able to fixup the few cases where an unaligned access will
    need SW emulation (depends on the core variant, could be when crossing
    page or segment boundaries for example).
    
    This patch fixes it by putting the old code back in and using the
    new "fancy" variant only when CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
    is set, which happens not to be set on powerpc since we don't include
    autoconf.h. It also reverts the changes to our boot wrapper Makefile.
    
    This means that x86 should, afaik, keep the optimisations since its
    boot wrapper does include autoconf.h and define __KERNEL__ (though I
    doubt they make that much different outside of slow embedded processors).
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

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

    torvalds authored
    …/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: wacom: Add BTN_TOOL_FINGER for pad button reporting
      HID: add device IDs for new model of Apple Wireless Keyboard
      HID: fix pad button definition in hid-wacom
      HID: Support 171 byte variant of Samsung USB IR receiver
      HID: blacklist ET&T TC5UH touchscreen controller
  4. @torvalds

    Merge branch 'for-33' of git://repo.or.cz/linux-kbuild

    torvalds authored
    * 'for-33' of git://repo.or.cz/linux-kbuild:
      Makefile: do not override LC_CTYPE
      kbuild: really fix bzImage build with non-bash sh
  5. @OGAWAHirofumi @torvalds

    vfs: Fix vmtruncate() regression

    OGAWAHirofumi authored torvalds committed
    If __block_prepare_write() was failed in block_write_begin(), the
    allocated blocks can be outside of ->i_size.
    
    But new truncate_pagecache() in vmtuncate() does nothing if new < old.
    It means the above usage is not working anymore.
    
    So, this patch fixes it by removing "new < old" check. It would need
    more cleanup/change. But, now -rc and truncate working is in progress,
    so, this tried to fix it minimum change.
    
    Acked-by: Nick Piggin <npiggin@suse.de>
    Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Jan 13, 2010
  1. @torvalds

    Merge branch 'fasync-helper'

    torvalds authored
    * fasync-helper:
      fasync: split 'fasync_helper()' into separate add/remove functions
  2. @michal42

    Makefile: do not override LC_CTYPE

    michal42 authored
    Setting LC_CTYPE=C breaks localized messages in some setups. With only
    LC_COLLATE=C and LC_NUMERIC=C, we get almost all we need, except for not
    so defined character classes and tolower()/toupper(). The former is not
    a big issue, because we can assume that e.g. [:alpha:] will always
    include a-zA-Z and we only ever process ASCII input. The latter seems
    only affect arch/sh/tools/gen-mach-types, which we can handle separately.
    
    So after this patch the meaning of ranges like [a-z], the behavior of
    sort and join, etc. should be the same everywhere and at the same time
    gcc should be able to print localized waring and error messages.
    LC_NUMERIC=C might not be necessary, but setting it doesn't hurt.
    
    Reported-by: Simon Horman <horms@verge.net.au>
    Reported-by: Sergei Trofimovich <slyfox@inbox.ru>
    Acked-by: H. Peter Anvin <hpa@zytor.com>
    Tested-by: Simon Horman <horms@verge.net.au>
    Tested-by: Masami Hiramatsu <mhiramat@redhat.com>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  3. @jrn @michal42

    kbuild: really fix bzImage build with non-bash sh

    jrn authored michal42 committed
    In an x86 build with CONFIG_KERNEL_LZMA enabled and dash as sh,
    arch/x86/boot/compressed/vmlinux.bin.lzma ends with
    '\xf0\x7d\x39\x00' (16 bytes) instead of the 4 bytes intended and
    the resulting vmlinuz fails to boot.  This improves on the
    previous behavior, in which the file contained the characters
    '-ne ' as well, but not by much.
    
    Previous commits replaced "echo -ne" first with "/bin/echo -ne",
    then "printf" in the hope of improving portability, but none of
    these commands is guaranteed to support hexadecimal escapes on
    POSIX systems.  So use the shell to convert from hexadecimal to
    octal.
    
    With this change, an LZMA-compressed kernel built with dash as sh
    boots correctly again.
    
    Reported-by: Sebastian Dalfuß <sd@sedf.de>
    Reported-by: Oliver Hartkopp <oliver@hartkopp.net>
    Reported-by: Michael Guntsche <mike@it-loops.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Cc: Michael Tokarev <mjt@tls.msk.ru>
    Cc: Alek Du <alek.du@intel.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  4. @PrzemoF

    HID: wacom: Add BTN_TOOL_FINGER for pad button reporting

    PrzemoF authored Jiri Kosina committed
    Without this patch xf86-input-wacom driver wasn't able to properly recognise
    pad button events. It was also causing some problems with button mapping.
    
    Signed-off-by: Przemo Firszt <przemo@firszt.eu>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  5. HID: add device IDs for new model of Apple Wireless Keyboard

    Christian Schuerer-Waldheim authored Jiri Kosina committed
    Added device IDs for the new model of the Apple Wireless Keyboard
    (November 2009).
    
    Signed-off-by: Christian Schuerer-Waldheim <csw@xray.at>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  6. @PrzemoF

    HID: fix pad button definition in hid-wacom

    PrzemoF authored Jiri Kosina committed
    This fix is required for xorg driver to recognise 2 pad buttons
    
    Signed-off-by: Przemo Firszt <przemo@firszt.eu>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  7. Merge remote branch 'korg/drm-radeon-next' into drm-linus

    Dave Airlie authored
    * korg/drm-radeon-next
      drm/radeon/kms: only evict to GTT if CP is ready
      drm/radeon/kms: Fix crash getting TV info with no BIOS.
      drm/radeon/kms/rv100: reject modes > 135 Mhz on DVI (v2)
      drm/radeon/kms/r6xx+: make irq handler less verbose
      drm/radeon/kms: fix up LVDS handling on macs (v2)
  8. @hidave

    drm: change drm set mode messages as DRM_DEBUG

    hidave authored Dave Airlie committed
    Following drm info repeat 207 times during one hour, it's quite annoying
    [ 1266.286747] [drm] TV-19: set mode NTSC 480i 0
    
    Change from DRM_INFO to DRM_DEBUG
    
    Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  9. drm: fix crtc no modes printf + typo

    Dave Airlie authored
    Toralf Förster pointed out the typo, the fact I forget the if
    statement is purely personal fail.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  10. @torvalds

    Linux 2.6.33-rc4

    torvalds authored
  11. @torvalds

    Merge git://git.infradead.org/battery-2.6

    torvalds authored
    * git://git.infradead.org/battery-2.6:
      pmu_battery: Fix battery full reporting
  12. @bmr-cymru @torvalds

    [SCSI] megaraid_sas: remove sysfs poll_mode_io world writeable permis…

    bmr-cymru authored torvalds committed
    …sions
    
    /sys/bus/pci/drivers/megaraid_sas/poll_mode_io defaults to being
    world-writable, which seems bad (letting any user affect kernel driver
    behavior).
    
    This turns off group and user write permissions, so that on typical
    production systems only root can write to it.
    
    Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. @torvalds

    Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

    torvalds authored
    * 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
      OMAP: DSS2: OMAPFB: fix crash when panel driver was not loaded
      OMAP: DSS2: Reject scaling settings when they cannot be supported
      OMAP: DSS2: Make check-delay-loops consistent
      OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem()
      video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c
      OMAP: DSS2: Fix compile warning
      MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry
      MAINTAINERS: change omapfb maintainer
      OMAP: OMAPFB: add dummy release function for omapdss
      OMAP: OMAPFB: fix clk_get for RFBI
      OMAP: DSS2: RFBI: convert to new kfifo API
      OMAP: DSS2: Fix crash when panel doesn't define enable_te()
      OMAP: DSS2: Collect interrupt statistics
      OMAP: DSS2: DSI: print debug DCS cmd in hex
      OMAP: DSS2: DSI: fix VC channels in send_short and send_null
  14. @dchinner @torvalds

    lib: Introduce generic list_sort function

    dchinner authored torvalds committed
    There are two copies of list_sort() in the tree already, one in the DRM
    code, another in ubifs.  Now XFS needs this as well.  Create a generic
    list_sort() function from the ubifs version and convert existing users
    to it so we don't end up with yet another copy in the tree.
    
    Signed-off-by: Dave Chinner <david@fromorbit.com>
    Acked-by: Dave Airlie <airlied@redhat.com>
    Acked-by: Artem Bityutskiy <dedekind@infradead.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. @kernelslacker @torvalds

    remove my email address from checkpatch.

    kernelslacker authored torvalds committed
    Maybe this will stop people emailing me about it.
    
    Signed-off-by: Dave Jones <davej@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. @torvalds

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      libata: retry link resume if necessary
      ata_piix: enable 32bit PIO on SATA piix
      sata_promise: don't classify overruns as HSM errors
  17. @torvalds

    Merge master.kernel.org:/home/rmk/linux-2.6-arm

    torvalds authored
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: Ensure ARMv6/7 mm files are built using appropriate assembler options
      ARM: Fix wrong dmb
      ARM: 5874/1: serial21285: fix disable_irq-from-interrupt-handler deadlock
      ARM: 5873/1: ARM: Fix the reset logic for ARM RealView boards
      ARM: 5872/1: ARM: include needed linux/cpu.h in asm/cpu.h
      ARM: 5871/1: arch/arm: Fix build failure for lpd7a404_defconfig caused by missing includes
      ARM: 5870/1: arch/arm: Fix build failure for defconfigs without CONFIG_ISA_DMA_API set
      ARM: 5868/1: ARM: fix "BUG: using smp_processor_id() in preemptible code"
      ARM: 5867/1: Update U300 defconfig
      ARM: 5866/1: arm ptrace: use unsigned types for kernel pt_regs
      [ARM] pxa: fix strange characters in zaurus gpio .desc
      ARM: add missing recvmmsg syscall number
      [ARM] pxa: fix compiler warnings of unused variable 'id' in cpu_is_pxa9*()
      [ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *'
      [ARM] pxa: enable L2 if present in XSC3
      [ARM] pxa: do not enable L2 after MMU is enabled
  18. @torvalds

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…

    torvalds authored
    …linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (22 commits)
      MIPS: Ignore vmlinux.*
      MIPS: Move vmlinux.ecoff to arch/mips/boot
      MIPS: cpumask_of_node() should handle -1 as a node
      MIPS: Octeon: Use non-overflowing arithmetic in sched_clock
      MIPS: Malta, PowerTV: Remove unnecessary "Linux started"
      MIPS: BCM63xx: Remove duplicate CONFIG_CMDLINE.
      MIPS: AR7: Remove unused prom_getchar()
      MIPS: PowerTV: Remove extra r4k_clockevent_init() call
      MIPS: Cobalt use strlcat() for the command line arguments
      MIPS: Octeon: Add sched_clock() to csrc-octeon.c
      MIPS: TXx9: Cleanup builtin-cmdline processing
      MIPS: PowerTV: simplify prom_init_cmdline() and merge into prom_init()
      MIPS: PowerTV: Remove unused platform_die()
      MIPS: PowerTV: Remove mips_machine_halt()
      MIPS: PowerTV: Remove unused ptv_memsize
      MIPS: PowerTV: Remove unused prom_getcmdline()
      MIPS: AR7: Remove kgdb_enabled
      MIPS: Alchemy: Correct code taking the size of a pointer
      MIPS: BCM63xx: Fix whitespace damaged board_bcm963xx.c
      MIPS: VR41xx: Use strlcat() for the command line arguments
      ...
  19. @torvalds

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

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda - Fix ALC861-VD capture source mixer
      ALSA: ac97: add AC97 STMicroelectronics' codecs
      ALSA: ac97: Add Dell Dimension 2400 to Headphone/Line Jack Sense blacklist
      ASoC: Fix WM8350 DSP mode B configuration
      sbawe: fix memory detection part 2
      sound: oss: off by one bug
      ALSA: usb-audio - Avoid Oops after disconnect
      ALSA: test off by one in setsamplerate()
      ALSA: atiixp: Specify codec for Foxconn RC4107MA-RS2
  20. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)
      sky2: Fix oops in sky2_xmit_frame() after TX timeout
      Documentation/3c509: document ethtool support
      af_packet: Don't use skb after dev_queue_xmit()
      vxge: use pci_dma_mapping_error to test return value
      netfilter: ebtables: enforce CAP_NET_ADMIN
      e1000e: fix and commonize code for setting the receive address registers
      e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value
      e1000e: perform 10/100 adaptive IFS only on parts that support it
      e1000e: don't accumulate PHY statistics on PHY read failure
      e1000e: call pci_save_state() after pci_restore_state()
      netxen: update version to 4.0.72
      netxen: fix set mac addr
      netxen: fix smatch warning
      netxen: fix tx ring memory leak
      tcp: update the netstamp_needed counter when cloning sockets
      TI DaVinci EMAC: Handle emac module clock correctly.
      dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips
      ixgbe: Fix compiler warning about variable being used uninitialized
      netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()
      mv643xx_eth: don't include cache padding in rx desc buffer size
      ...
    
    Fix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c
  21. @gregungerer @torvalds

    m68knommu: fix definitions of __pa() and __va()

    gregungerer authored torvalds committed
    Fix compilation breakage of all m68knommu targets:
    
      CC      arch/m68knommu/kernel/asm-offsets.s
    In file included from include/linux/sched.h:77,
                     from arch/m68knommu/kernel/asm-offsets.c:12:
    include/linux/percpu.h: In function 'per_cpu_ptr_to_phys':
    include/linux/percpu.h:161: error: implicit declaration of function 'virt_to_phy
    
    This is broken in linux-2.6.33-rc3.
    
    Change the definitions of __pa() and __va() to not use virt_to_phys()
    and phys_to_virt(). Trivial 1:1 conversion required for the non-MMU case.
    
    A side effect if this is that the m68knommu can now use asm/virtconvert.h
    for the definition of virt_to_phys() and phys_to_virt().
    
    Also cleaned up the definition of page_to_phys() when moving into
    virtconvert.h.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22. drm/radeon/kms: only evict to GTT if CP is ready

    Dave Airlie authored
    Testing GTT ready might be more correct but cp.ready
    works fine and has been tested on irc by 2-3 ppl.
    
    fixes bug k.org 15035 and fd.o 25733
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  23. drm/radeon/kms: Fix crash getting TV info with no BIOS.

    Michel Dänzer authored Dave Airlie committed
    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  24. drm/radeon/kms/rv100: reject modes > 135 Mhz on DVI (v2)

    Alex Deucher authored Dave Airlie committed
    Due to heat issues.  Fixes fdo bug 25992
    
    v2: fix typo noticed by Maarten Maathuis
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  25. drm/radeon/kms/r6xx+: make irq handler less verbose

    Alex Deucher authored Dave Airlie committed
    Unhandled vectors can be safely ignored, no need
    to spam the kernel log by default.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  26. drm/radeon/kms: fix up LVDS handling on macs (v2)

    Alex Deucher authored Dave Airlie committed
    Based on radeonfb code and recent ddx fix.
    
    v2: minor formatting fix from Michel Dänzer
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Reviewed-by: Michel Dänzer <michel@daenzer.net>
    Tested-by: Michel Dänzer <michel@daenzer.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on Jan 12, 2010
  1. libata: retry link resume if necessary

    Tejun Heo authored Jeff Garzik committed
    Interestingly, when SIDPR is used in ata_piix, writes to DET in
    SControl sometimes get ignored leading to detection failure.  Update
    sata_link_resume() such that it reads back SControl after clearing DET
    and retry if it's not clear.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reported-by: fengxiangjun <fengxiangjun@neusoft.com>
    Reported-by: Jim Faulkner <jfaulkne@ccs.neu.edu>
    Cc: stable@kernel.org
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  2. ata_piix: enable 32bit PIO on SATA piix

    Tejun Heo authored Jeff Garzik committed
    Commit 871af12 enabled 32bit PIO for
    PATA piix but didn't for SATA.  There's no reason not to use 32bit PIO
    on SATA piix.  Enable it.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  3. sata_promise: don't classify overruns as HSM errors

    Mikael Pettersson authored Jeff Garzik committed
    When sata_promise encounters an overrun or underrun error it
    translates that to a libata AC_ERR_HSM, causing a hard reset.
    Since over/under-runs were thought to be rare and transient,
    this action seemed reasonable.
    
    Unfortunately it turns out that the controller throws overrun
    errors when e.g. hal polls a CD or DVD writer containing blank
    media, causing long sequences of hard resets and retries before
    EH finally gives up.
    
    This patch updates sata_promise to classify over/under-runs as
    AC_ERR_OTHER instead. This allows libata EH and upper layers to
    retry or fail the operation as they see fit without the disruption
    caused by repeated hard resets.
    
    This fixes a problem using a DVD-RAM drive with sata_promise,
    reported by Thomas Schorpp. I also tested it on a DVD-RW drive.
    
    Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
    Tested-by: thomas schorpp <thomas.schorpp@googlemail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  4. ARM: Ensure ARMv6/7 mm files are built using appropriate assembler op…

    Russell King authored
    …tions
    
    A kernel with both ARMv6 and ARMv7 selected results in build errors.
    Fix this by specifying the proper architectures for these assembly
    files.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Something went wrong with that request. Please try again.