24 Mar, 2008

1 commit


23 Mar, 2008

4 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
    RDMA/nes: Fix MSS calculation on RDMA path

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
    Revert "ide-tape: schedule driver for removal after 6 months"
    ide: mark "hdx=remap" and "hdx=remap63" kernel parameters as obsoleted
    ide: mark "hdx=[driver_name]" and "hdx=scsi" kernel parameters as obsoleted
    ide: Documentation/ide/ide.txt fixes
    ide: mark special "ide0=" kernel parameters as obsoleted
    ide: remove commented out entries from ide_pio_blacklist[]

    Linus Torvalds
     
  • Suppressing uevents turned out to be a bad idea as it screws up the
    order of events, making user space very confused. Change the system to
    use sysfs groups instead.

    This is a regression that, for some odd reason, has gone unnoticed for
    some time. It confuses hal so that the block devices (which have the
    mmc device as a parent) are not registered. End result being that
    desktop magic when cards are inserted won't work.

    Signed-off-by: Pierre Ossman
    Signed-off-by: Linus Torvalds

    Pierre Ossman
     
  • PNP_MAX_MEM and PNP_MAX_PORT are mainly used to size tables of PNP
    device resources. In 2.6.24, we increased their values to accomodate
    ACPI devices that have many resources:

    2.6.23 2.6.24
    ------ ------
    PNP_MAX_MEM 4 12
    PNP_MAX_PORT 8 40

    However, ISAPNP also used these constants as the size of parts of the
    logical device register set. This register set is fixed by hardware,
    so increasing the constants meant that we were reading and writing
    unintended parts of the register set.

    This patch changes ISAPNP to use the correct register set sizes (the
    same values we used prior to 2.6.24).

    Signed-off-by: Bjorn Helgaas
    Signed-off-by: Linus Torvalds

    Bjorn Helgaas
     

22 Mar, 2008

6 commits


21 Mar, 2008

7 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (46 commits)
    [NET] ifb: set separate lockdep classes for queue locks
    [IPV6] KCONFIG: Fix description about IPV6_TUNNEL.
    [TCP]: Fix shrinking windows with window scaling
    netpoll: zap_completion_queue: adjust skb->users counter
    bridge: use time_before() in br_fdb_cleanup()
    [TG3]: Fix build warning on sparc32.
    MAINTAINERS: bluez-devel is subscribers-only
    audit: netlink socket can be auto-bound to pid other than current->pid (v2)
    [NET]: Fix permissions of /proc/net
    [SCTP]: Fix a race between module load and protosw access
    [NETFILTER]: ipt_recent: sanity check hit count
    [NETFILTER]: nf_conntrack_h323: logical-bitwise & confusion in process_setup()
    [RT2X00] drivers/net/wireless/rt2x00/rt2x00dev.c: remove dead code, fix warning
    [IPV4]: esp_output() misannotations
    [8021Q]: vlan_dev misannotations
    xfrm: ->eth_proto is __be16
    [IPV4]: ipv4_is_lbcast() misannotations
    [SUNRPC]: net/* NULL noise
    [SCTP]: fix misannotated __sctp_rcv_asconf_lookup()
    [PKT_SCHED]: annotate cls_u32
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25:
    sh: Use relative paths for mach/cpu symlinks.
    SH: Use newer, non-deprecated __SPIN_LOCK_UNLOCKED macro.
    sh: Fix more user header breakage from sh64 integration.
    sh: Fix uImage build error.
    sh: Fix up the timer IRQ definition for SH7203.
    sh: Fix up the address error exception handler for SH-2.
    serial: sh-sci: Fix fifo stall on SH7760/SH7780/SH7785 SCIF.

    Linus Torvalds
     
  • [ 10.536424] =======================================================
    [ 10.536424] [ INFO: possible circular locking dependency detected ]
    [ 10.536424] 2.6.25-rc3-devel #3
    [ 10.536424] -------------------------------------------------------
    [ 10.536424] swapper/0 is trying to acquire lock:
    [ 10.536424] (&dev->queue_lock){-+..}, at: []
    dev_queue_xmit+0x175/0x2f3
    [ 10.536424]
    [ 10.536424] but task is already holding lock:
    [ 10.536424] (&p->tcfc_lock){-+..}, at: [] tcf_mirred+0x20/0x178
    [act_mirred]
    [ 10.536424]
    [ 10.536424] which lock already depends on the new lock.

    lockdep warns of locking order while using ifb with sch_ingress and
    act_mirred: ingress_lock, tcfc_lock, queue_lock (usually queue_lock
    is at the beginning). This patch is only to tell lockdep that ifb is
    a different device (e.g. from eth) and has its own pair of queue
    locks. (This warning is a false-positive in common scenario of using
    ifb; yet there are possible situations, when this order could be
    dangerous; lockdep should warn in such a case.) (With suggestions by
    David S. Miller)

    Reported-and-tested-by: Denys Fedoryshchenko
    Signed-off-by: Jarek Poplawski
    Acked-by: Jamal Hadi Salim
    Signed-off-by: David S. Miller

    Jarek Poplawski
     
  • Sparc MAC address support should be protected consistently
    with CONFIG_SPARC, but there was a stray CONFIG_SPARC64
    case.

    Bump driver version and release date.

    Reported by Andrew Morton.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
    firewire: fix panic in handle_at_packet

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
    [SCSI] a100u2w: fix bitmap lookup routine
    [SCSI] fix media change events for polled devices
    [SCSI] sd, sr: do not emit change event at device add
    [SCSI] mpt fusion: Power Management fixes for MPT SAS PCI-E controllers
    [SCSI] gdth: Allocate sense_buffer to prevent NULL pointer dereference
    [SCSI] arcmsr: fix iounmap error for Type B adapter
    [SCSI] isd200: Allocate sense_buffer for hacked up scsi_cmnd
    [SCSI] fix bsg queue oops with iscsi logout
    [SCSI] Fix dependency problems in SCSI drivers
    [SCSI] advansys: Fix bug in AdvLoadMicrocode

    Linus Torvalds
     
  • This fixes a use-after-free bug in the handling of split transactions.
    The AT DMA handler of the request was occasionally executed after the
    AR DMA handler of the response. The AT DMA handler then accessed an
    already freed packet.

    Reported by Johannes Berg.
    http://bugzilla.kernel.org/show_bug.cgi?id=9617

    Signed-off-by: Stefan Richter
    Tested-by: Johannes Berg
    Signed-off-by: Jarod Wilson

    Stefan Richter
     

20 Mar, 2008

22 commits