Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Dec 29, 2010
  1. Linux 2.6.37-rc8

    authored
Commits on Dec 28, 2010
  1. Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    authored
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      ring_buffer: Off-by-one and duplicate events in ring_buffer_read_page
  2. Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    authored
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86/microcode: Fix double vfree() and remove redundant pointer checks before vfree()
  3. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c
  4. Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/ke…

    authored
    …rnel/git/mchehab/linux-2.6
    
    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
      [media] v4l: soc-camera: fix multiple simultaneous user case
  5. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/cjb/mmc
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
      mmc: Fix re-probing with PM_POST_RESTORE notification
      mmc: atmel-mci: fix multiblock SDIO transfers
      mmc: at91_mci: fix multiblock SDIO transfers
  6. @kaloz

    ARM: fix IXP4xx build failure

    kaloz authored committed
    arm: export dma_set_coherent_mask
    
    While a regression was fixed with commit 710224f (arm: fix
    "arm: fix pci_set_consistent_dma_mask for dmabounce devices"), a
    new one was introduced as dma_set_coherent_mask wasn't exported
    for modules. This patch takes care for this issue.
    
    Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
    Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @ASDarwish

    RAMOOPS: Don't overflow over non-allocated regions

    ASDarwish authored committed
    The current code mis-calculates the ramoops header size, leading to an
    overflow over the next record at best, or over a non-allocated region at
    worst.  Fix that calculation.
    
    Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
    Acked-by: Marco Stornelli <marco.stornelli@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Dec 27, 2010
  1. Merge branch 'nommu-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    authored
    …linux/kernel/git/lethal/nommu-2.6
    
    * 'nommu-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/nommu-2.6:
      nommu: Provide stubbed alloc/free_vm_area() implementation.
      nommu: Fix up vmalloc_node() symbol export regression.
  2. Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/lin…

    authored
    …ux/kernel/git/lethal/sh-2.6
    
    * 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: intc: Initialize radix tree gfp mask explicitly.
      sh: Fix up SH7201 clkfwk build.
      sh: mach-se: Fix up SE7206 build.
      sh: Fix up SH4-202 clkfwk build.
  3. Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    authored
    …linux/kernel/git/lethal/fbdev-2.6
    
    * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
      fbdev: sh_mobile_lcdc: increase maximum framebuffer size to support 1080p
      video: imxfb: Fix the maximum value for yres
      fb: fix overlapping test off-by-one.
      fbdev: sh-mobile: retrieve and propagate display sizes from EDID
      fbdev: sh-mobile: restore display size configuration
  4. Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    authored
    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      pata_cs5536: avoid implicit MSR API inclusion on x86-64
  5. @lyakh @pmundt

    fbdev: sh_mobile_lcdc: increase maximum framebuffer size to support 1…

    lyakh authored pmundt committed
    …080p
    
    LCDC hardware can support 1920x1080 formats, adjust the driver to cover them.
    Besides, instead of guessing some "reasonable" validity checks, only verify
    values in .fb_check_var(), that we are sure, we cannot support.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  6. @pmundt

    video: imxfb: Fix the maximum value for yres

    Fabio Estevam authored pmundt committed
    MX27 and MX25 have 10 bits in the YMAX field of LCDC Size Register.
    
    Fix the maximum value for yres.
    
    Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  7. @jjuhl

    x86/microcode: Fix double vfree() and remove redundant pointer checks…

    jjuhl authored Ingo Molnar committed
    … before vfree()
    
    In arch/x86/kernel/microcode_intel.c::generic_load_microcode()
    we have  this:
    
    	while (leftover) {
    		...
    		if (get_ucode_data(mc, ucode_ptr, mc_size) ||
    		    microcode_sanity_check(mc) < 0) {
    			vfree(mc);
    			break;
    		}
    		...
    	}
    
    	if (mc)
    		vfree(mc);
    
    This will cause a double free of 'mc'. This patch fixes that by
    just  removing the vfree() call in the loop since 'mc' will be
    freed nicely just  after we break out of the loop.
    
    There's also a second change in the patch. I noticed a lot of
    checks for  pointers being NULL before passing them to vfree().
    That's completely  redundant since vfree() deals gracefully with
    being passed a NULL pointer.  Removing the redundant checks
    yields a nice size decrease for the object  file.
    
    Size before the patch:
       text    data     bss     dec     hex filename
       4578     240    1032    5850    16da arch/x86/kernel/microcode_intel.o
    Size after the patch:
       text    data     bss     dec     hex filename
       4489     240     984    5713    1651 arch/x86/kernel/microcode_intel.o
    
    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    Acked-by: Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
    Cc: Shaohua Li <shaohua.li@intel.com>
    LKML-Reference: <alpine.LNX.2.00.1012251946100.10759@swampdragon.chaosbits.net>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  8. pata_cs5536: avoid implicit MSR API inclusion on x86-64

    Jeff Garzik authored Jeff Garzik committed
    We don't need or want MSR usage here, on x86-64.
    x86-64 was disabled intentionally in Kconfig, but commit
    9272dcc changed that.
    
    drivers/ata/pata_cs5536.c:47:1: warning: "rdmsr" redefined
    In file included from arch/x86/include/asm/irqflags.h:60,
                     from include/linux/irqflags.h:15,
                     from arch/x86/include/asm/system.h:11,
                     from arch/x86/include/asm/processor.h:17,
                     from include/linux/prefetch.h:14,
                     from include/linux/list.h:7,
                     from include/linux/module.h:9,
                     from drivers/ata/pata_cs5536.c:33:
    arch/x86/include/asm/paravirt.h:146:1: warning: this is the location of the previous definition
    drivers/ata/pata_cs5536.c:48:1: warning: "wrmsr" redefined
    arch/x86/include/asm/paravirt.h:154:1: warning: this is the location of the previous definition
    
    Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Commits on Dec 26, 2010
  1. @lenb
  2. @rjwysocki @lenb

    ACPI / ACPICA: Disable GPEs during initialization

    rjwysocki authored lenb committed
    GPEs with corresponding _Lxx/_Exx control methods need to be disabled
    during initialization in case they have been enabled by the BIOS, so
    that they don't fire up until they are enabled by acpi_update_gpes().
    
    References: https://bugzilla.kernel.org/show_bug.cgi?id=25412
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Len Brown <len.brown@intel.com>
  3. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
      ipv4: dont create routes on down devices
      epic100: hamachi: yellowfin: Fix skb allocation size
      sundance: Fix oopses with corrupted skb_shared_info
      Revert "ipv4: Allow configuring subnets as local addresses"
      USB: mcs7830: return negative if auto negotiate fails
      irda: prevent integer underflow in IRLMP_ENUMDEVICES
      tcp: fix listening_get_next()
      atl1c: Do not use legacy PCI power management
      mac80211: fix mesh forwarding
      MAINTAINERS: email address change
      net: Fix range checks in tcf_valid_offset().
      net_sched: sch_sfq: fix allot handling
      hostap: remove netif_stop_queue from init
      mac80211/rt2x00: add ieee80211_tx_status_ni()
      typhoon: memory corruption in typhoon_get_drvinfo()
      net: Add USB PID for new MOSCHIP USB ethernet controller MCS7832 variant
      net_sched: always clone skbs
      ipv6: Fragment locally generated tunnel-mode IPSec6 packets as needed.
      netlink: fix gcc -Wconversion compilation warning
      asix: add USB ID for Logitec LAN-GTJ U2A
      ...
  4. @davem330

    ipv4: dont create routes on down devices

    Eric Dumazet authored davem330 committed
    In ip_route_output_slow(), instead of allowing a route to be created on
    a not UPed device, report -ENETUNREACH immediately.
    
    # ip tunnel add mode ipip remote 10.16.0.164 local
    10.16.0.72 dev eth0
    # (Note : tunl1 is down)
    # ping -I tunl1 10.1.2.3
    PING 10.1.2.3 (10.1.2.3) from 192.168.18.5 tunl1: 56(84) bytes of data.
    (nothing)
    # ./a.out tunl1
    # ip tunnel del tunl1
    Message from syslogd@shelby at Dec 22 10:12:08 ...
      kernel: unregister_netdevice: waiting for tunl1 to become free.
    Usage count = 3
    
    After patch:
    # ping -I tunl1 10.1.2.3
    connect: Network is unreachable
    
    Reported-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Reviewed-by: Octavian Purdila <opurdila@ixiacom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  5. @davem330

    epic100: hamachi: yellowfin: Fix skb allocation size

    Jarek Poplawski authored davem330 committed
    Joel Soete reported oopses during pppoe over sundance NIC, caused by
    a bug in skb allocation and dma mapping code, where skb_reserve()
    bytes weren't taken into account. As a followup to the patch:
    "sundance: Fix oopses with corrupted skb_shared_info" very similar
    code is fixed here for three other drivers.
    
    Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
    Cc: Joel Soete <soete.joel@scarlet.be>
    Cc: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  6. @davem330

    sundance: Fix oopses with corrupted skb_shared_info

    Jarek Poplawski authored davem330 committed
    Joel Soete reported oopses at the beginning of pppoe connections since
    v2.6.35. After debugging the bug was found in sundance skb allocation
    and dma mapping code, where skb_reserve() bytes aren't taken into
    account. This is an old bug, only uncovered by some change in 2.6.35.
    
    Initial debugging patch by: Eric Dumazet <eric.dumazet@gmail.com>
    
    Reported-by: Joel Soete <soete.joel@scarlet.be>
    Tested-by: Joel Soete <soete.joel@scarlet.be>
    Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
    Cc: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  7. @lyakh

    [media] v4l: soc-camera: fix multiple simultaneous user case

    lyakh authored Mauro Carvalho Chehab committed
    A recent patch has introduced a regression, whereby a second open of an
    soc-camera video device breaks the running capture. This patch fixes this bug
    by guaranteeing, that video buffers get initialised only during the first open
    of the device node.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Commits on Dec 25, 2010
  1. @lenb

    Revert "ACPI battery: update status upon sysfs query"

    lenb authored
    This reverts commit 3138b32.
    
    as it caused a crash upon battery removal:
    https://bugzilla.kernel.org/show_bug.cgi?id=25302
    
    Signed-off-by: Len Brown <len.brown@intel.com>
Commits on Dec 24, 2010
  1. Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6

    authored
    * 'merge' of git://git.secretlab.ca/git/linux-2.6:
      spi/mpc52xx-spi: fix annotation for remove()-pointer
      spi/fsl_espi: fix wrong setting of the address in the command buffer
      spi/fsl_espi: change the read behaviour of the SPIRF
      of/i2c: Fix request module by alias
      powerpc/mpc5200: include fs.h in mpc52xx_gpt.c
  2. Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    authored
    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      libata: issue DIPM enable commands with LPM state updated
      libata: no special completion processing for EH commands
      pata_mpc52xx: driver needs BMDMA
      pata_cs5536: Add support for non-X86_32 platforms
      libata-sff: fix HSM_ST_ERR handling in __ata_sff_port_intr()
  3. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/tj/percpu
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
      percpu: print out alloc information with KERN_DEBUG instead of KERN_INFO
      kthread_work: make lockdep happy
  4. Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixe…

    authored
    …s-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] fix up documentation for change in ->queuecommand to lockless calling
      [SCSI] bfa: rename log_level to bfa_log_level
  5. libata: issue DIPM enable commands with LPM state updated

    Tejun Heo authored Jeff Garzik committed
    Low level drivers may behave differently depending on the current
    link->lpm_policy.  During ata_eh_set_lpm(), DIPM enable commands are
    issued after the successful completion of ap->ops->set_lpm(), which
    means that the controller is already in the target state.  This causes
    DIPM enable commands to be processed with mismatching controller power
    state and link->lpm_policy value.
    
    In ahci, link->lpm_policy is used to ignore certain PHY events if LPM
    is enabled; however, as DIPM commands are issued with stale
    link->lpm_policy, they sometimes end up triggering these conditions
    and get aborted leading to LPM configuration failure.
    
    Fix it by updating link->lpm_policy before issuing DIPM enable
    commands.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reported-by: Kyle McMartin <kyle@mcmartin.ca>
    Cc: stable@kernel.org
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  6. libata: no special completion processing for EH commands

    Tejun Heo authored Jeff Garzik committed
    ata_qc_complete() contains special handling for certain commands.  For
    example, it schedules EH for device revalidation after certain
    configurations are changed.  These shouldn't be applied to EH
    commands but they were.
    
    In most cases, it doesn't cause an actual problem because EH doesn't
    issue any command which would trigger special handling; however, ACPI
    can issue such commands via _GTF which can cause weird interactions.
    
    Restructure ata_qc_complete() such that EH commands are always passed
    on to __ata_qc_complete().
    
    stable: Please apply to -stable only after 2.6.38 is released.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reported-by: Kyle McMartin <kyle@mcmartin.ca>
    Cc: stable@kernel.org
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  7. pata_mpc52xx: driver needs BMDMA

    Wolfram Sang authored Jeff Garzik committed
    Found by this build-error if BMDMA is disabled:
    
    drivers/ata/pata_mpc52xx.c: In function 'mpc52xx_ata_init_one':
    drivers/ata/pata_mpc52xx.c:662: error: 'ata_bmdma_interrupt' undeclared (first use in this function)
    ...
    
    Move the Kconfig entry to the proper location as needed since
    9a7780c (libata-sff: make BMDMA optional)
    
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  8. @lzufalcon

    pata_cs5536: Add support for non-X86_32 platforms

    lzufalcon authored Jeff Garzik committed
    pata_cs5536 does work on the other platforms(e.g. Loongson, a MIPS
    variant), so, remove the dependency of X86_32 and fix the building
    errors under the other platforms via only reserving the X86_32 specific
    parts for X86_32.
    
    pata_amd also supports cs5536 IDE controller, but this one saves about
    33k for the compressed kernel image(vmlinuz for MIPS).
    
    Signed-off-by: Zhang Le <r0bertz@gentoo.org>
    Signed-off-by: Chen Jie <chenj@lemote.com>
    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  9. libata-sff: fix HSM_ST_ERR handling in __ata_sff_port_intr()

    Tejun Heo authored Jeff Garzik committed
    While separating out BMDMA irq handler from SFF, commit c3b2889
    (libata-sff: separate out BMDMA irq handler) incorrectly made
    __ata_sff_port_intr() consider an IRQ to be an idle one if the host
    state was transitioned to HSM_ST_ERR by ata_bmdma_port_intr().
    
    This makes BMDMA drivers ignore IRQs reporting host bus error which
    leads to timeouts instead of triggering EH immediately.  Fix it by
    making __ata_sff_port_intr() consider the IRQ to be an idle one iff
    the state is HSM_ST_IDLE.  This is equivalent to adding HSM_ST_ERR to
    the "break"ing case but less error-prone.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reported-by: Antonio Toma <antonio.toma@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  10. @pmundt

    sh: intc: Initialize radix tree gfp mask explicitly.

    pmundt authored
    Presently the root node is initialized by way of kzalloc on the parent
    data structure, which by chance happens to do the bulk of what an
    explicit initialization does with GFP_NOWAIT semantics. This however is
    more by luck than by design, and as we ideally want to permit radix node
    allocations access to the emergency pools anyways, add in the proper
    initializer with the desired mask.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  11. spi/mpc52xx-spi: fix annotation for remove()-pointer

    Wolfram Sang authored Grant Likely committed
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Something went wrong with that request. Please try again.