Skip to content
Commits on May 26, 2007
  1. Linux 2.6.22-rc3

    It's that time of the year again.  Summer starts in the US, and people
    want to sit at the beach with a new -rc candidate.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Linus Torvalds committed May 25, 2007
  2. fix compat console unimap regression

    Why is it that since the 2f1a2cc console
    UTF-8 fixes went into 2.6.22-rc1, the PowerMac G5 shows only inverse video
    question marks for the text on tty2-6? whereas tty1 is fine, and so is x86.
    
    No fault of that patch: by removing the old fallback behaviour, it reveals
    that 32-bit setfont running on 64-bit kernels has only really worked on
    the current console, the rest getting faked by that inadequate fallback.
    
    Bring the compat do_unimap_ioctl into line with the main one: PIO_UNIMAP
    and GIO_UNIMAP apply to the specified tty, not redirected to fg_console.
    Use the same checks, and most particularly, remember to check access_ok:
    con_set_unimap and con_get_unimap are using __get_user and __put_user.
    
    And the compat vt_check should ask for the same capability as the main
    one, CAP_SYS_TTY_CONFIG rather than CAP_SYS_ADMIN.  Added in vt_ioctl's
    vc_cons_allocated check for safety, though failure may well be impossible.
    
    Signed-off-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Hugh Dickins committed with Linus Torvalds May 26, 2007
Commits on May 25, 2007
  1. Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/g…

    …it/roland/infiniband
    
    * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
      IPoIB/cm: Drain cq in ipoib_cm_dev_stop()
      IPoIB/cm: Fix timeout check in ipoib_cm_dev_stop()
      IB/ehca: Fix number of send WRs reported for new QP
      IB/mlx4: Initialize send queue entry ownership bits
      IB/mlx4: Don't allocate RQ doorbell if using SRQ
    Linus Torvalds committed May 25, 2007
  2. Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…

    …nel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      pata_hpt37x: Further improvements based on the IDE updates and vendor drivers
      pata: Trivia
      [libata] sata_via, pata_via: Add PCI IDs.
      [libata] Fix decoding of 6-byte commands
      libata: sata_sis fixes
      Fix build failure for drivers/ata/pata_scc.c
      [libata] sata_mv: add TODO list
      [libata] sata_promise: fix flags typo
    Linus Torvalds committed May 25, 2007
  3. @Alan-Cox

    pata_hpt37x: Further improvements based on the IDE updates and vendor…

    … drivers
    
    Better DPLL use and calibration
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Alan-Cox committed with Jeff Garzik May 25, 2007
  4. @Alan-Cox

    pata: Trivia

    Typo/comment fixes
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Alan-Cox committed with Jeff Garzik May 25, 2007
  5. [PATCH] ocfs2: use generic_segment_checks

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
    Christoph Hellwig committed with Mark Fasheh May 18, 2007
  6. ocfs2: fix inode leak

    We weren't cleaning up our inode reference on error in
    ocfs2_reserve_local_alloc_bits(). Add a check for error return and iput() if
    need be. Move the code to set the alloc context inode info to the end of the
    function so we don't have any possibility of passing back a bad pointer.
    
    Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
    Mark Fasheh committed May 9, 2007
  7. @typherno

    [PATCH] ocfs2: use zero_user_page

    Use zero_user_page() instead of open-coding it.
    
    Signed-off-by: Nate Diller <nate.diller@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
    typherno committed with Mark Fasheh May 10, 2007
  8. ocfs2: unmap_mapping_range() in ocfs2_truncate()

    We weren't calling this before, but since ocfs2 handles the entire truncate
    operation, we should.
    
    Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
    Mark Fasheh committed May 14, 2007
  9. ocfs2: trylock in ocfs2_readpage()

    Similarly to the page lock / cluster lock inversion in ocfs2_readpage, we
    can deadlock on ip_alloc_sem. We can down_read_trylock() instead and just
    return AOP_TRUNCATED_PAGE if the operation fails.
    
    Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
    Mark Fasheh committed May 14, 2007
  10. [libata] sata_via, pata_via: Add PCI IDs.

    Supplied by VIA.
    
    Also, convert named constants to hex values in the pata_via
    PCI ID table.  (standard libata policy for PCI device IDs, which are
    considered simply arbitrary hex numbers, without a need to create a
    single-use constant in linux/pci_ids.h)
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Jeff Garzik committed May 25, 2007
  11. [libata] Fix decoding of 6-byte commands

    The code for parsing 6-byte SCSI command LBAs
    missed the top 5 bits (the MSB).
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Jeff Garzik committed May 25, 2007
  12. @UweKoziolek

    libata: sata_sis fixes

    The sata_sis driver supports SATA and PATA ports. The broken support
    of both types in one controller is fixed.
    
    Signed-off-by: Uwe Koziolek <uwe.koziolek@gmx.net>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    UweKoziolek committed with Jeff Garzik May 25, 2007
  13. @tbreeds

    Fix build failure for drivers/ata/pata_scc.c

    The commit d4b2bab added deadline support
    to prereset and reset methods to libbata the pata_scc driver wasn't
    converted.  This patch is a naive attempt to bring this driver up to
    scratch.
    
    Build failures are:
    drivers/ata/pata_scc.c: In function 'scc_pata_prereset':
    drivers/ata/pata_scc.c:870: error: too few arguments to function 'ata_std_prereset'
    drivers/ata/pata_scc.c: In function 'scc_error_handler':
    drivers/ata/pata_scc.c:916: warning: passing argument 2 of 'ata_bmdma_drive_eh' from incompatible pointer type
    drivers/ata/pata_scc.c:916: warning: passing argument 3 of 'ata_bmdma_drive_eh' from incompatible pointer type
    drivers/ata/pata_scc.c: In function 'scc_pata_prereset':
    drivers/ata/pata_scc.c:871: warning: control reaches end of non-void function
    
    On a releated note scc_bus_post_reset() is (AFACT) identical to
    ata_bus_post_reset(), would a patch to make ata_bus_post_reset() assesable
    to drivers be accepted?
    
    Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
    Acked-by: Tejun Heo <htejun@gmail.com>
    Cc: Akira Iguchi <akira2.iguchi@toshiba.co.jp>
    Cc: Jeff Garzik <jgarzik@pobox.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    tbreeds committed with Jeff Garzik May 23, 2007
  14. [libata] sata_mv: add TODO list

    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Jeff Garzik committed May 24, 2007
  15. [libata] sata_promise: fix flags typo

    A stray comma makes all the difference.  Change to '|' as these flags
    should be or'd together.
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Jeff Garzik committed May 24, 2007
  16. Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/…

    …davem/net-2.6
    
    * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
      [XFRM]: Allow packet drops during larval state resolution.
      [CASSINI]: Check pci_set_mwi() return value.
      [NET]: "wrong timeout value" in sk_wait_data() v2
      [NETFILTER]: nf_nat_h323: call set_h225_addr instead of set_h225_addr_hook
      [NETFILTER]: nf_conntrack_h323: add missing T.120 address in OLCA
      [NETFILTER]: nf_conntrack_h323: remove unnecessary process of Information signal
      [NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access
      [NETFILTER]: nf_conntrack_h323: fix ASN.1 types
      [NETFILTER]: nf_conntrack_ftp: fix newline sequence number calculation
      [NETFILTER]: nf_conntrack_ftp: fix newline sequence number update
      [NET_SCHED]: sch_htb: fix event cache time calculation
      [DCCP]: Fix build warning when debugging is disabled.
      [TIPC]: Fixed erroneous introduction of for_each_netdev
      [RTNETLINK]: Fix sending netlink message when replace route.
      [TR]: Use menuconfig objects.
      [ARCNET]: Use menuconfig objects.
      [TIPC]: Use menuconfig objects.
      [SCTP]: Use menuconfig objects.
      [IPVS]: Use menuconfig objects.
      [DCCP]: Use menuconfig objects.
      ...
    Linus Torvalds committed May 24, 2007
  17. Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…

    …nel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      pata_via: Handle laptops via DMI
      libata: -ENODEV during prereset isn't an error
      libata: don't consider 0xff as port empty if SStatus is available
      ata_piix: add short 40c quirk for Acer Aspire 2030, take #2
      pata_sis: Fix and clean up some timing setups
      hpt3x2n: Correct revision boundary
    Linus Torvalds committed May 24, 2007
  18. [XFRM]: Allow packet drops during larval state resolution.

    The current IPSEC rule resolution behavior we have does not work for a
    lot of people, even though technically it's an improvement from the
    -EAGAIN buisness we had before.
    
    Right now we'll block until the key manager resolves the route.  That
    works for simple cases, but many folks would rather packets get
    silently dropped until the key manager resolves the IPSEC rules.
    
    We can't tell these folks to "set the socket non-blocking" because
    they don't have control over the non-block setting of things like the
    sockets used to resolve DNS deep inside of the resolver libraries in
    libc.
    
    With that in mind I coded up the patch below with some help from
    Herbert Xu which provides packet-drop behavior during larval state
    resolution, controllable via sysctl and off by default.
    
    This lays the framework to either:
    
    1) Make this default at some point or...
    
    2) Move this logic into xfrm{4,6}_policy.c and implement the
       ARP-like resolution queue we've all been dreaming of.
       The idea would be to queue packets to the policy, then
       once the larval state is resolved by the key manager we
       re-resolve the route and push the packets out.  The
       packets would timeout if the rule didn't get resolved
       in a certain amount of time.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    David S. Miller committed May 24, 2007
  19. [CASSINI]: Check pci_set_mwi() return value.

    Signed-off-by: David S. Miller <davem@davemloft.net>
    David S. Miller committed May 24, 2007
  20. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …it/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] acpi_get_sysname() should be __init
      [IA64] Cleanup acpi header to reuse the generic _PDC defines
      [IA64] Fix using uninitialized data in _PDC setup
      [IA64] start_secondary() and smp_callin() should be __cpuinit
    Linus Torvalds committed May 24, 2007
  21. @Alan-Cox

    pata_via: Handle laptops via DMI

    Oh the joy of saving a fraction of a cent using short 40 wire cables and
    not faking 80wire
    
    Teach the VIA driver that there are some systems we need to know are
    magically wired for high speeds.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Tested-by: Francis Russell <FrancisRussell@btinternet.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Alan-Cox committed with Jeff Garzik May 23, 2007
  22. @htejun

    libata: -ENODEV during prereset isn't an error

    During prereset, -ENODEV return from ata_wait_ready() is not an error.
    This causes unnecessary bug message on controllers which uses 0xff to
    indicate empty port.  Fix it.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Cc: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun committed with Jeff Garzik May 23, 2007
  23. @htejun

    libata: don't consider 0xff as port empty if SStatus is available

    Some SATA controllers (sata_sil) use 0xff to indicate port not ready
    status, not port empty.  As libata interprets 0xff as port empty, this
    causes unnecessary reset failure and retry.  Don't consider 0xff as
    port empty if SStatus is available and indicates that port is online.
    
    Signed-off-by: tejun Heo <htejun@gmail.com>
    Cc: Paul Mundt <lethal@linux-sh.org>
    Cc: Indan Zupancic <indan@nul.nu>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun committed with Jeff Garzik May 23, 2007
  24. @htejun

    ata_piix: add short 40c quirk for Acer Aspire 2030, take #2

    Acer Aspire 2023WLMi uses short 40c cable.  Add quirk for it.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Cc: Steve H. <mail.pandor@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun committed with Jeff Garzik May 22, 2007
  25. @Alan-Cox

    pata_sis: Fix and clean up some timing setups

    - Rename sis_port_base to sis_old_port_base() so nobody uses it for new
    generation controllers in error.
    - Use byte size operations where it is cleaner for mode setup
    - Fix a couple of masking errors on certai chip revs when setting speeds
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Alan-Cox committed with Jeff Garzik May 21, 2007
  26. @Alan-Cox

    hpt3x2n: Correct revision boundary

    We have a revision that isn't correctly claimed as two drivers both go
    for it: Fix the test accordingly. Noticed originally by Bill Nottingham.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Alan-Cox committed with Jeff Garzik May 21, 2007
Commits on May 24, 2007
  1. @davem330

    [NET]: "wrong timeout value" in sk_wait_data() v2

    sys_setsockopt() do not check properly timeout values for
    SO_RCVTIMEO/SO_SNDTIMEO, for example it's possible to set negative timeout
    values. POSIX do not defines behaviour for sys_setsockopt in case negative
    timeouts, but requires that setsockopt() shall fail with -EDOM if the send and
    receive timeout values are too big to fit into the timeout fields in the socket
    structure.
    In current implementation negative timeout can lead to error messages like
    "schedule_timeout: wrong timeout value".
    
    Proposed patch:
    - checks tv_usec and returns -EDOM if it is wrong
    - do not allows to set negative timeout values (sets 0 instead) and outputs
    ratelimited information message about such attempts.
    
    Signed-off-By: Vasily Averin <vvs@sw.ru>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Vasily Averin committed with davem330 May 24, 2007
  2. Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetoot…

    …h-2.6
    David S. Miller committed May 24, 2007
  3. @davem330

    [NETFILTER]: nf_nat_h323: call set_h225_addr instead of set_h225_addr…

    …_hook
    
    They're the same.
    
    Signed-off-by: Jing Min Zhao <zhaojingmin@vivecode.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Jing Min Zhao committed with davem330 May 24, 2007
  4. @davem330

    [NETFILTER]: nf_conntrack_h323: add missing T.120 address in OLCA

    Add missing process of T.120 address in OpenLogicalChannelAck signal.
    
    Signed-off-by: Jing Min Zhao <zhaojingmin@vivecode.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Jing Min Zhao committed with davem330 May 24, 2007
  5. @davem330

    [NETFILTER]: nf_conntrack_h323: remove unnecessary process of Informa…

    …tion signal
    
    According to the implementation of H.323, it's not necessary to check
    the addresses in Information signals.
    
    Signed-off-by: Jing Min Zhao <zhaojingmin@vivecode.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Jing Min Zhao committed with davem330 May 24, 2007
  6. @davem330

    [NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address …

    …access
    
    Update get_h225_addr() to meet the changes in ASN.1 types. It was using
    field ip6 to access IPv6 TransportAddress, it should be ip according the
    ASN.1 definition.
    
    Signed-off-by: Jing Min Zhao <zhaojingmin@vivecode.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Jing Min Zhao committed with davem330 May 24, 2007
  7. @davem330

    [NETFILTER]: nf_conntrack_h323: fix ASN.1 types

    1. Add support for decoding IPv6 address. I know it was manually added in
       the header file, but not in the template file. That wouldn't work.
    2. Add missing support for decoding T.120 address in OLCA.
    3. Remove unnecessary decoding of Information signal.
    
    Signed-off-by: Jing Min Zhao <zhaojingmin@vivecode.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Jing Min Zhao committed with davem330 May 24, 2007
Something went wrong with that request. Please try again.