Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.36-rc6
Commits on Sep 29, 2010
  1. @torvalds

    Linux 2.6.36-rc6

    torvalds authored
  2. @torvalds

    MN10300: Handle missing sys_cacheflush() when caching disabled

    David Howells authored torvalds committed
    When caching is disabled on the MN10300 arch, the sys_cacheflush()
    function is removed by conditional stuff in the makefiles, but is still
    referred to by the syscall table.
    
    Provide a null version that just returns 0 when caching is disabled (or
    -EINVAL if the arguments are silly).
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Sep 28, 2010
  1. @torvalds

    alpha: fix compile problem in arch/alpha/kernel/signal.c

    torvalds authored
    Tssk.  Apparently Al hadn't checked commit c52c2dd ("alpha: switch
    osf_sigprocmask() to use of sigprocmask()") at all. It doesn't compile.
    
    Fixed as per suggestions from Michael Cree.
    
    Reported-by: Michael Cree <mcree@orcon.net.nz>
    Cc: Al Viro <viro@ftp.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @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:
      ahci: fix module refcount breakage introduced by libahci split
  3. @htejun

    ahci: fix module refcount breakage introduced by libahci split

    htejun authored Jeff Garzik committed
    libata depends on scsi_host_template for module reference counting and
    sht's should be owned by each low level driver.  During libahci split,
    the sht was left with libahci.ko leaving the actual low level drivers
    not reference counted.  This made ahci and ahci_platform always
    unloadable even while they're being actively used.
    
    Fix it by defining AHCI_SHT() macro in ahci.h and defining a sht for
    each low level ahci driver.
    
    stable: only applicable to 2.6.35.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reported-by: Pedro Francisco <pedrogfrancisco@gmail.com>
    Tested-by: Michael Tokarev <mjt@tls.msk.ru>
    Cc: stable@kernel.org
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  4. @torvalds

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

    torvalds authored
    …kernel/git/groeck/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
      hwmon (coretemp): Fix build breakage if SMP is undefined
  5. @torvalds

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

    torvalds authored
    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI: fix pci_resource_alignment prototype
  6. @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: (47 commits)
      tcp: Fix >4GB writes on 64-bit.
      net/9p: Mount only matching virtio channels
      de2104x: fix ethtool
      tproxy: check for transparent flag in ip_route_newports
      ipv6: add IPv6 to neighbour table overflow warning
      tcp: fix TSO FACK loss marking in tcp_mark_head_lost
      3c59x: fix regression from patch "Add ethtool WOL support"
      ipv6: add a missing unregister_pernet_subsys call
      s390: use free_netdev(netdev) instead of kfree()
      sgiseeq: use free_netdev(netdev) instead of kfree()
      rionet: use free_netdev(netdev) instead of kfree()
      ibm_newemac: use free_netdev(netdev) instead of kfree()
      smsc911x: Add MODULE_ALIAS()
      net: reset skb queue mapping when rx'ing over tunnel
      br2684: fix scheduling while atomic
      de2104x: fix TP link detection
      de2104x: fix power management
      de2104x: disable autonegotiation on broken hardware
      net: fix a lockdep splat
      e1000e: 82579 do not gate auto config of PHY by hardware during nominal use
      ...
  7. hwmon (coretemp): Fix build breakage if SMP is undefined

    Guenter Roeck authored
    Commit e40cc4b introduced
    a build breakage if CONFIG_SMP is undefined. This commit
    fixes the problem.
    
    This fix is only a workaround. For a real fix, cpu_sibling_mask() should
    be defined in UP include code, eg in linux/smp.h, and asm/smp.h should not be
    included directly. This fix is currently not possible because asm/smp.h defines
    cpu_sibling_mask() unconditionally and is included directly from many source
    files.
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Tested-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Cc: Fenghua Yu <fenghua.yu@intel.com>
  8. @torvalds

    Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kerne…

    torvalds authored
    …l/git/tip/linux-2.6-tip
    
    * 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: Avoid 'constant_test_bit()' misoptimization due to cast to non-volatile
  9. @davem330

    tcp: Fix >4GB writes on 64-bit.

    davem330 authored
    Fixes kernel bugzilla #16603
    
    tcp_sendmsg() truncates iov_len to an 'int' which a 4GB write to write
    zero bytes, for example.
    
    There is also the problem higher up of how verify_iovec() works.  It
    wants to prevent the total length from looking like an error return
    value.
    
    However it does this using 'int', but syscalls return 'long' (and
    thus signed 64-bit on 64-bit machines).  So it could trigger
    false-positives on 64-bit as written.  So fix it to use 'long'.
    
    Reported-by: Olaf Bonorden <bono@onlinehome.de>
    Reported-by: Daniel Büse <dbuese@gmx.de>
    Reported-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Sep 27, 2010
  1. @torvalds

    Fix pktcdvd ioctl dev_minor range check

    Dan Rosenberg authored torvalds committed
    The PKT_CTRL_CMD_STATUS device ioctl retrieves a pointer to a
    pktcdvd_device from the global pkt_devs array.  The index into this
    array is provided directly by the user and is a signed integer, so the
    comparison to ensure that it falls within the bounds of this array will
    fail when provided with a negative index.
    
    This can be used to read arbitrary kernel memory or cause a crash due to
    an invalid pointer dereference.  This can be exploited by users with
    permission to open /dev/pktcdvd/control (on many distributions, this is
    readable by group "cdrom").
    
    Signed-off-by: Dan Rosenberg <dan.j.rosenberg@gmail.com>
    [ Rather than add a cast, just make the function take the right type -Linus ]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @torvalds

    MN10300: Default config choice GDBSTUB_TTYSM0 should be GDBSTUB_ON_TT…

    David Howells authored torvalds committed
    …YSM0
    
    The configuration choice for the port on which the GDB stub listens has
    a default of GDBSTUB_TTYSM0, but this should be GDBSTUB_ON_TTYSM0 to
    match the option.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @davem330

    net/9p: Mount only matching virtio channels

    Sven Eckelmann authored davem330 committed
    p9_virtio_create will only compare the the channel's tag characters
    against the device name till the end of the channel's tag but not till
    the end of the device name. This means that if a user defines channels
    with the tags foo and foobar then he would mount foo when he requested
    foonot and may mount foo when he requested foobar.
    
    Thus it is necessary to check both string lengths against each other in
    case of a successful partial string match.
    
    Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  4. @davem330

    de2104x: fix ethtool

    Ondrej Zary authored davem330 committed
    When the interface is up, using ethtool breaks it because:
    a) link is put down but media_timer interval is not shortened to NO_LINK
    b) rxtx is stopped but not restarted
    
    Also manual 10baseT-HD (and probably FD too - untested) mode does not work -
    the link is forced up, packets are transmitted but nothing is received.
    Changing CSR14 value to match documentation (not disabling link check) fixes this.
    
    Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
    Acked-by: Jeff Garzik <jgarzik@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  5. @davem330
  6. @uweber @davem330

    tproxy: check for transparent flag in ip_route_newports

    uweber authored davem330 committed
    as done in ip_route_connect()
    
    Signed-off-by: Ulrich Weber <uweber@astaro.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  7. @uweber @davem330

    ipv6: add IPv6 to neighbour table overflow warning

    uweber authored davem330 committed
    IPv4 and IPv6 have separate neighbour tables, so
    the warning messages should be distinguishable.
    
    [ Add a suitable message prefix on the ipv4 side as well -DaveM ]
    
    Signed-off-by: Ulrich Weber <uweber@astaro.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  8. @davem330

    tcp: fix TSO FACK loss marking in tcp_mark_head_lost

    Yuchung Cheng authored davem330 committed
    When TCP uses FACK algorithm to mark lost packets in
    tcp_mark_head_lost(), if the number of packets in the (TSO) skb is
    greater than the number of packets that should be marked lost, TCP
    incorrectly exits the loop and marks no packets lost in the skb. This
    underestimates tp->lost_out and affects the recovery/retransmission.
    This patch fargments the skb and marks the correct amount of packets
    lost.
    
    Signed-off-by: Yuchung Cheng <ycheng@google.com>
    Acked-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  9. @torvalds

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

    torvalds authored
    …/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      RDMA/cxgb3: Turn off RX coalescing for iWARP connections
  10. @torvalds

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

    torvalds authored
    * master.kernel.org:/home/rmk/linux-2.6-arm: (28 commits)
      ARM: 6411/1: vexpress: set RAM latencies to 1 cycle for PL310 on ct-ca9x4 tile
      ARM: 6409/1: davinci: map sram using MT_MEMORY_NONCACHED instead of MT_DEVICE
      ARM: 6408/1: omap: Map only available sram memory
      ARM: 6407/1: mmu: Setup MT_MEMORY and MT_MEMORY_NONCACHED L1 entries
      ARM: pxa: remove pr_<level> uses of KERN_<level>
      ARM: pxa168fb: clear enable bit when not active
      ARM: pxa: fix cpu_is_pxa*() not expanding to zero when not configured
      ARM: pxa168: fix corrected reset vector
      ARM: pxa: Use PIO for PI2C communication on Palm27x
      ARM: pxa: Fix Vpac270 gpio_power for MMC
      ARM: 6401/1: plug a race in the alignment trap handler
      ARM: 6406/1: at91sam9g45: fix i2c bus speed
      leds: leds-ns2: fix locking
      ARM: dove: fix __io() definition to use bus based offset
      dmaengine: fix interrupt clearing for mv_xor
      ARM: kirkwood: Unbreak PCIe I/O port
      ARM: Fix build error when using KCONFIG_CONFIG
      ARM: 6383/1: Implement phys_mem_access_prot() to avoid attributes aliasing
      ARM: 6400/1: at91: fix arch_gettimeoffset fallout
      ARM: 6398/1: add proc info for ARM11MPCore/Cortex-A9 from ARM
      ...
  11. @torvalds

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

    torvalds authored
    …/git/ericvh/v9fs
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
      net/9p: fix memory handling/allocation in rdma_request()
  12. @torvalds

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

    torvalds authored
    …/git/bp/bp
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      amd64_edac: Fix driver module removal
  13. @torvalds

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

    torvalds authored
    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      TOMOYO: Don't abuse sys_getpid(), sys_getppid()
  14. @torvalds

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

    torvalds authored
    …kernel/git/ickle/drm-intel
    
    * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
      drm/i915/sdvo: Handle unsupported GET_SUPPORTED_ENHANCEMENTS gracefully
      drm/i915/sdvo: Cleanup connector on error path
      drm/i915: Fix 945GM regression in e259bef
  15. @torvalds

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

    torvalds authored
    …/git/cjb/mmc
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
      mmc: sdhci-s3c: fix NULL ptr access in sdhci_s3c_remove
      mmc: sdhci-s3c: fix incorrect spinlock usage after merge
      mmc: MAINTAINERS: add myself as MMC maintainer
  16. @torvalds

    Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds authored
    …t/brodo/pcmcia-2.6
    
    * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
      pcmcia: pd6729: Fix error path
      pcmcia: preserve configuration information if request_io fails partly
  17. @torvalds

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

    torvalds authored
    * git://git.infradead.org/iommu-2.6:
      intel-iommu: Use symbolic values instead of magic numbers in Lenovo w/a
      intel-iommu: Abort IOMMU setup for igfx if BIOS gave no shadow GTT space
  18. @torvalds

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

    torvalds 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/amd-iommu: Fix rounding-bug in __unmap_single
      x86/amd-iommu: Work around S3 BIOS bug
      x86/amd-iommu: Set iommu configuration flags in enable-loop
      x86, setup: Fix earlyprintk=serial,0x3f8,115200
      x86, setup: Fix earlyprintk=serial,ttyS0,115200
  19. @torvalds

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

    torvalds 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:
      perf, x86: Catch spurious interrupts after disabling counters
      tracing/x86: Don't use mcount in kvmclock.c
      tracing/x86: Don't use mcount in pvclock.c
  20. @torvalds

    mn10300: check __get_user/__put_user results...

    Al Viro authored torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. @torvalds

    mn10300: get rid of set_fs(USER_DS) in sigframe setup

    Al Viro authored torvalds committed
    It really has no business being there; short of a serious kernel bug
    we should already have USER_DS at that point.  It shouldn't have been
    done on x86 either...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22. @torvalds

    mn10300: ->restart_block.fn needs to be reset on sigreturn

    Al Viro authored torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  23. @torvalds

    mn10300: prevent double syscall restarts

    Al Viro authored torvalds committed
    set ->orig_d0 to -1, same as what sigreturn does
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  24. @torvalds

    mn10300: avoid SIGSEGV delivery loop

    Al Viro authored torvalds committed
    force_sigsegv() is there for purpose...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.