Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.33-rc4

Jan 13, 2010

  1. Linus Torvalds

    Linux 2.6.33-rc4

    torvalds authored
  2. Linus Torvalds

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

    * git://git.infradead.org/battery-2.6:
      pmu_battery: Fix battery full reporting
    torvalds authored
  3. Bryn M. Reeves

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

    …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>
    bmr-cymru authored torvalds committed
  4. Linus Torvalds

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

    * '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
    torvalds authored
  5. Dave Chinner

    lib: Introduce generic list_sort function

    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>
    dchinner authored torvalds committed
  6. Dave Jones

    remove my email address from checkpatch.

    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>
    kernelslacker authored torvalds committed
  7. Linus Torvalds

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

    …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
    torvalds authored
  8. Linus Torvalds

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

    * 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
    torvalds authored
  9. Linus Torvalds

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

    …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
      ...
    torvalds authored
  10. Linus Torvalds

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

    …/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
    torvalds authored
  11. Linus Torvalds

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

    * 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
    torvalds authored
  12. Greg Ungerer

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

    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>
    gregungerer authored torvalds committed

Jan 12, 2010

  1. libata: retry link resume if necessary

    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>
    Tejun Heo authored Jeff Garzik committed
  2. ata_piix: enable 32bit PIO on SATA piix

    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>
    Tejun Heo authored Jeff Garzik committed
  3. sata_promise: don't classify overruns as HSM errors

    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>
    Mikael Pettersson authored Jeff Garzik committed
  4. ARM: Ensure ARMv6/7 mm files are built using appropriate assembler op…

    …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>
    Russell King authored
  5. ARM: Fix wrong dmb

    The __kuser_cmpxchg code uses an ARMv6 dmb instruction, rather than
    one based upon the architecture being built for.  Switch to using
    the macro provided for this purpose, which also eliminates the
    need for an ifdef.
    
    Acked-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King authored
  6. MIPS: Ignore vmlinux.*

    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Cc: linux-mips <linux-mips@linux-mips.org>
    Patchwork: http://patchwork.linux-mips.org/patch/795/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa authored ralfbaechle committed
  7. MIPS: Move vmlinux.ecoff to arch/mips/boot

    It moves to the same directory as the boot files in other formats.
    
    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Cc: linux-mips <linux-mips@linux-mips.org>
    Patchwork: http://patchwork.linux-mips.org/patch/796/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa authored ralfbaechle committed
  8. Anton Blanchard

    MIPS: cpumask_of_node() should handle -1 as a node

    pcibus_to_node can return -1 if we cannot determine which node a pci bus
    is on. If passed -1, cpumask_of_node will negatively index the lookup array
    and pull in random data:
    
    # cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
    00000000,00000003,00000000,00000000
    # cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
    64-65
    
    Change cpumask_of_node to check for -1 and return cpu_all_mask in this
    case:
    
    # cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
    ffffffff,ffffffff,ffffffff,ffffffff
    # cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
    0-127
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Cc: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Patchwork: http://patchwork.linux-mips.org/patch/831/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    antonblanchard authored ralfbaechle committed
  9. MIPS: Octeon: Use non-overflowing arithmetic in sched_clock

    With typical mult and shift values, the calculation for Octeon's sched_clock
    overflows when using 64-bit arithmetic.  Use 128-bit calculations instead.
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    To: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/849/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    David Daney authored ralfbaechle committed
  10. MIPS: Malta, PowerTV: Remove unnecessary "Linux started"

    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Cc: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/813/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa authored ralfbaechle committed
  11. MIPS: BCM63xx: Remove duplicate CONFIG_CMDLINE.

    Builtin cmdline is copied by arch_mem_init().
    
    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Cc: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/812/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa authored ralfbaechle committed
  12. MIPS: AR7: Remove unused prom_getchar()

    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Cc: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/811/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa authored ralfbaechle committed
  13. MIPS: PowerTV: Remove extra r4k_clockevent_init() call

    A call to r4k_clocksource_init() was added to plat_time_init(), but
    when init_mips_clock_source() calls the same function, boot fails in
    clockevents_register_device(). This patch removes the extraneous call.
    
    Signed-off-by: David VomLehn <dvomlehn@cisco.com>
    Patchwork: http://patchwork.linux-mips.org/patch/803/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    David VomLehn authored ralfbaechle committed
  14. MIPS: Cobalt use strlcat() for the command line arguments

    Tested with CoLo v1.22
    
    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Patchwork: http://patchwork.linux-mips.org/patch/807/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa authored ralfbaechle committed
  15. MIPS: Octeon: Add sched_clock() to csrc-octeon.c

    With the advent of function graph tracing on MIPS, Octeon needs a high
    precision sched_clock() implementation.  Without it, most timing
    numbers are reported as 0.000.
    
    This new sched_clock just uses the 64-bit cycle counter appropriately
    scaled.
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Patchwork: http://patchwork.linux-mips.org/patch/805/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    David Daney authored ralfbaechle committed
  16. MIPS: TXx9: Cleanup builtin-cmdline processing

    Since commit 898d357 (lmo) /
    6acc7d4 (kernel.org) ("Fix and enhance
    built-in kernel command line") arcs_cmdline[] does not contain built-in
    command line.  The commit introduce CONFIG_CMDLINE_BOOL and
    CONFIG_CMDLINE_OVERRIDE to control built-in command line, and now we can
    use them instead of platform-specific built-in command line processing.
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Patchwork: http://patchwork.linux-mips.org/patch/802/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Atsushi Nemoto authored ralfbaechle committed
  17. MIPS: PowerTV: simplify prom_init_cmdline() and merge into prom_init()

    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Patchwork: http://patchwork.linux-mips.org/patch/801/
    Reviewed-by: David VomLehn <dvomlehn@cisco.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa authored ralfbaechle committed
  18. MIPS: PowerTV: Remove unused platform_die()

    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Patchwork: http://patchwork.linux-mips.org/patch/800/
    Reviewed-by: David VomLehn <dvomlehn@cisco.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa authored ralfbaechle committed
  19. MIPS: PowerTV: Remove mips_machine_halt()

    mips_machine_halt() is same as mips_machine_restart().  Also delete the
    registration of _machine_halt and pm_power_off because mips_machine_halt()
    is the restart function.
    
    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Patchwork: http://patchwork.linux-mips.org/patch/798/
    Reviewed-by: David VomLehn <dvomlehn@cisco.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa authored ralfbaechle committed
  20. MIPS: PowerTV: Remove unused ptv_memsize

    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Patchwork: http://patchwork.linux-mips.org/patch/799/
    Reviewed-by: David VomLehn <dvomlehn@cisco.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa authored ralfbaechle committed
  21. MIPS: PowerTV: Remove unused prom_getcmdline()

    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Patchwork: http://patchwork.linux-mips.org/patch/797/
    Reviewed-by: David VomLehn <dvomlehn@cisco.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa authored ralfbaechle committed
  22. MIPS: AR7: Remove kgdb_enabled

    An unused leftover from the old KGDB implementation.
    
    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Patchwork: http://patchwork.linux-mips.org/patch/794/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa authored ralfbaechle committed
  23. JuliaLawall

    MIPS: Alchemy: Correct code taking the size of a pointer

    sizeof(dp) is just the size of the pointer.  Change it to the size of the
    referenced structure.
    
    A simplified version of the semantic patch that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    expression *x;
    expression f;
    type T;
    @@
    
    *f(...,(T)x,...)
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Patchwork: http://patchwork.linux-mips.org/patch/789/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    JuliaLawall authored ralfbaechle committed
Something went wrong with that request. Please try again.