11 Jan, 2007

3 commits

  • Revert previous attempts at messing with the linux banner string and
    simply use a separate format string for proc.

    Signed-off-by: Roman Zippel
    Acked-by: Olaf Hering
    Acked-by: Jean Delvare
    Cc: Andrey Borzenkov
    Cc: Andrew Morton
    Cc: Andy Whitcroft
    Cc: Herbert Poetzl
    Signed-off-by: Linus Torvalds

    Roman Zippel
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
    [IPV4] devinet: inetdev_init out label moved after RCU assignment
    [INET]: style updates for the inet_sock->is_icsk assignment fix
    [SCTP]: Fix err_hdr assignment in sctp_init_cause.
    [NETFILTER]: tcp conntrack: fix IP_CT_TCP_FLAG_CLOSE_INIT value
    [NETFILTER]: nf_nat: fix hanging connections when loading the NAT module
    [NETFILTER]: arp_tables: fix userspace compilation
    [NETFILTER]: nf_conntrack_ipv6: fix crash when handling fragments

    Linus Torvalds
     
  • This patch adds myself as maintainer of the sata_promise
    libata driver.

    Signed-off-by: Mikael Pettersson
    Signed-off-by: Linus Torvalds

    Mikael Pettersson
     

10 Jan, 2007

16 commits

  • * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
    IB/mthca: Don't execute QUERY_QP firmware command for QP in RESET state
    IB/ehca: Use proper GFP_ flags for get_zeroed_page()
    IB/mthca: Fix PRM compliance problem in atomic-send completions
    RDMA/ucma: Don't report events with invalid user context
    RDMA/ucma: Fix struct ucma_event leak when backlog is full
    RDMA/iwcm: iWARP connection timeouts shouldn't be reported as rejects
    IB/iser: Return error code when PDUs may not be sent
    IB/mthca: Fix off-by-one in FMR handling on memfree

    Linus Torvalds
     
  • inetdev_init out label moved after RCU assignment
    (final suggestion by Herbert Xu)

    Signed-off-by: Jarek Poplawski
    Acked-by: Herbert Xu
    Signed-off-by: David S. Miller

    Jarek Poplawski
     
  • A quick patch to change the inet_sock->is_icsk assignment to better fit with
    existing kernel coding style.

    Signed-off-by: Paul Moore
    Signed-off-by: Arnaldo Carvalho de Melo
    Signed-off-by: David S. Miller

    Paul Moore
     
  • The subh->err_hdr should point to the error header, not the data.

    Signed-off-by: Vlad Yasevich
    Signed-off-by: Sridhar Samudrala
    Signed-off-by: David S. Miller

    Vlad Yasevich
     
  • IP_CT_TCP_FLAG_CLOSE_INIT is a flag and should have a value of 0x4 instead
    of 0x3, which is IP_CT_TCP_FLAG_WINDOW_SCALE | IP_CT_TCP_FLAG_SACK_PERM.

    Signed-off-by: Patrick McHardy
    Signed-off-by: David S. Miller

    Patrick McHardy
     
  • When loading the NAT module, existing connection tracking entries don't
    have room for NAT information allocated and packets are dropped, causing
    hanging connections. They really should be entered into the NAT table
    as NULL mappings, but the current allocation scheme doesn't allow this.

    For now simply accept those packets to avoid the hanging connections.

    Signed-off-by: Patrick McHardy
    Signed-off-by: David S. Miller

    Patrick McHardy
     
  • The included patch translates arpt_counters to xt_counters, making
    userspace arptables compile against recent kernels.

    Signed-off-by: Bart De Schuymer
    Signed-off-by: Patrick McHardy
    Signed-off-by: David S. Miller

    Bart De Schuymer
     
  • When IPv6 connection tracking splits up a defragmented packet into
    its original fragments, the packets are taken from a list and are
    passed to the network stack with skb->next still set. This causes
    dev_hard_start_xmit to treat them as GSO fragments, resulting in
    a use after free when connection tracking handles the next fragment.

    Signed-off-by: Patrick McHardy
    Signed-off-by: David S. Miller

    Patrick McHardy
     
  • If a QP being queried is in the RESET state, don't execute the
    QUERY_QP firmware command (because it will fail).

    Signed-off-by: Dotan Barak
    Signed-off-by: Roland Dreier

    Dotan Barak
     
  • Here is a patch for ehca to use proper flag, ie. GFP_ATOMIC
    resp. GFP_KERNEL, when calling get_zeroed_page() to prevent "Bug:
    scheduling while atomic...". This error does not cause a kernel panic
    but makes ipoib un-usable afterwards. It is reproducible on
    2.6.20-rc4 if one does ifconfig down during a flood ping test. I have
    not observed this error in earlier releases incl. 2.6.20-rc1.

    This error occurs when a qp event/irq is received and ehca event
    handler allocates a control block/page to obtain HCA error data block.
    Use of GFP_ATOMIC when in interrupt context prevents this issue.

    Signed-off-by Hoang-Nam Nguyen
    Signed-off-by: Roland Dreier

    Hoang-Nam Nguyen
     
  • * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
    [ALSA] version 1.0.14rc1
    [ALSA] usbaudio - Fix kobject_add() error at reconnection
    [ALSA] usb: usbmixer error path fix
    [ALSA] _snd_cmipci_uswitch_put doesn't set zero flags
    [ALSA] hda-codec - Fix NULL dereference in generic hda code
    [ALSA] hda_intel: ALSA HD Audio patch for Intel ICH9
    [ALSA] usb-audio: work around wrong frequency in CM6501 descriptors
    [ALSA] Fix potential NULL pointer dereference in echoaudio midi
    [ALSA] Audio: Add nvidia HD Audio controllers of MCP67 support to hda_intel.c

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
    [TCP]: Fix iov_len calculation in tcp_v4_send_ack().
    [NETFILTER]: nf_conntrack_netbios_ns: fix uninitialized member in expectation
    [TG3]: Add PHY workaround for 5755M.
    [BNX2]: Update version and reldate.
    [BNX2]: Fix bug in bnx2_nvram_write().
    [BNX2]: Fix 5709 Serdes detection.
    [BNX2]: Don't apply CRC PHY workaround to 5709.
    NetLabel: correct CIPSO tag handling when adding new DOI definitions
    NetLabel: correct locking in selinux_netlbl_socket_setsid()
    [Bluetooth] Correct SCO buffer for Broadcom based Dell laptops
    [Bluetooth] Correct SCO buffer for Broadcom based HP laptops
    [Bluetooth] Correct SCO buffer size for another ThinkPad laptop
    [Bluetooth] Handle device registration failures
    [Bluetooth] Fix uninitialized return value for RFCOMM sendmsg()
    [Bluetooth] More checks if DLC is still attached to the TTY
    [Bluetooth] Add packet size checks for CAPI messages
    [X25]: Trivial, SOCK_DEBUG's in x25_facilities missing newlines
    [INET]: Fix incorrect "inet_sock->is_icsk" assignment.

    Linus Torvalds
     
  • * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
    pcnet_cs : add new id
    chelsio: error path fix
    s390: iucv Kconfig help description changes
    s390: qeth driver fixes: atomic context fixups
    s390: qeth driver fixes: packet socket
    s390: qeth driver fixes: VLAN hdr, perf stats
    forcedeth: sideband management fix
    Revert "[PATCH] e1000: disable TSO on the 82544 with slab debugging"
    qeth: fix uaccess handling and get rid of unused variable
    qla3xxx: Add delay to NVRAM register access.
    qla3xxx: Remove NETIF_F_LLTX from driver features.
    ixgb: Write RA register high word first, increment version
    ixgb: Maybe stop TX if not enough free descriptors
    ixgb: Fix early TSO completion
    [PATCH] ipw2100: Fix dropping fragmented small packet problem
    [PATCH] ieee80211: WLAN_GET_SEQ_SEQ fix (select correct region)

    Linus Torvalds
     
  • * 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
    [POWERPC] Fix bugs in the hypervisor call stats code
    [POWERPC] Fix corruption in hcall9
    [POWERPC] iSeries: fix setup initcall
    [POWERPC] iSeries: fix viopath initialisation
    [POWERPC] iSeries: fix lpevents initialisation
    [POWERPC] iSeries: fix proc/iSeries initialisation
    [POWERPC] iSeries: fix mf proc initialisation
    [POWERPC] disable PReP and EFIKA during make oldconfig
    [POWERPC] Fix mpc52xx serial driver to work for arch/ppc again
    [POWERPC] Don't include powerpc/sysdev/rom.o for arch/ppc builds
    [POWERPC] Fix mpc52xx fdt to use correct device_type for sound devices
    [POWERPC] 52xx: Don't use device_initcall to probe of_platform_bus
    [POWERPC] Add legacy iSeries to ppc64_defconfig
    [POWERPC] Update ppc64_defconfig
    [POWERPC] Fix manual assembly WARN_ON() in enter_rtas().
    [POWERPC] Avoid calling get_irq_server() with a real, not virtual irq.
    [POWERPC] Fix unbalanced uses of of_node_put
    [POWERPC] Fix bogus BUG_ON() in in hugetlb_get_unmapped_area()

    Linus Torvalds
     
  • * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
    [S390] locking problem with __cpcmd.
    [S390] don't call handle_mm_fault() if in an atomic context.
    [S390] Fix vmalloc area size calculation.
    [S390] Fix cpu hotplug (missing 'online' attribute).
    [S390] cio: use barrier() in stsch_reset.
    [S390] memory detection misses 128k.

    Linus Torvalds
     
  • The sis96x SMBus PCI device depends on two different quirks to run
    in a specific order. Apart from being fragile, this was found to
    actually break on (at least) recent FC4, FC5, and FC6 kernels. This
    patch fixes the quirks so that they work without relying on the
    compiler and/or linker to put them in any specific order.

    http://lists.lm-sensors.org/pipermail/lm-sensors/2006-April/015962.html
    https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=189719

    I tested this patch.

    Signed-off-by: Mark M. Hoffman
    Cc: Andrew Morton
    Cc: Adrian Bunk
    Cc: Greg K-H
    Cc: Jean Delvare
    Signed-off-by: Linus Torvalds

    Mark M. Hoffman
     

09 Jan, 2007

21 commits