Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.33-rc4-gi…

Jan 14, 2010

  1. Linus Torvalds

    Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] tape_char: add missing compat_ptr conversion
      [S390] zcrypt: add sanity check before copy_from_user()
      [S390] unwire sys_recvmmsg again
      [S390] con3215: remove empty ioctl function
      [S390] dasd: add proper compat pointer conversion for symmetrix ioctl
      [S390] mmap: add missing compat_ptr conversion to both mmap compat syscalls
      [S390] bug: implement arch specific __WARN macro
      [S390] Move __cpu_logical_map to smp.c
      [S390] tape_block: remove ioctl function
      [S390] smp: remove volatile type quilifier from __cpu_logical_map
      [S390] smp: setup smp_processor_id early
      [S390] use helpers for rlimits
      [S390] fs3270: add missing compat ptr conversion
      [S390] vmcp: add missing compat ptr conversion
      [S390] cio: add missing compat ptr conversion
      [S390] dasd: add missing compat ptr conversion
      [S390] remove superfluous TIF_USEDFPU bit
      [S390] duplicate SIGTRAP on signal delivery.
      [S390] clear TIF_SINGLE_STEP for new process.
      [S390] fix loading of PER control registers for utrace.
    torvalds authored
  2. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits)
      net: fix build erros with CONFIG_BUG=n, CONFIG_GENERIC_BUG=n
      ipv6: skb_dst() can be NULL in ipv6_hop_jumbo().
      tg3: Update copyright and driver version
      tg3: Disable 5717 serdes and B0 support
      tg3: Add reliable serdes detection for 5717 A0
      tg3: Fix std rx prod ring handling
      tg3: Fix std prod ring nicaddr for 5787 and 57765
      sfc: Fix conditions for MDIO self-test
      sfc: Fix polling for slow MCDI operations
      e1000e: workaround link issues on busy hub in half duplex on 82577/82578
      e1000e: MDIO slow mode should always be done for 82577
      ixgbe: update copyright dates
      ixgbe: Do not attempt to perform interrupts in netpoll when down
      cfg80211: fix refcount imbalance when wext is disabled
      mac80211: fix queue selection for data frames on monitor interfaces
      iwlwifi: silence buffer overflow warning
      iwlwifi: disable tx on beacon update notification
      iwlwifi: fix iwl_queue_used bug when read_ptr == write_ptr
      mac80211: fix endian error
      mac80211: add missing sanity checks for action frames
      ...
    torvalds authored
  3. net: fix build erros with CONFIG_BUG=n, CONFIG_GENERIC_BUG=n

    Fixed build errors introduced by commit 7ad6848 (ip: fix mc_loop
    checks for tunnels with multicast outer addresses)
    
    Signed-off-by: Octavian Purdila <opurdila@ixiacom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Octavian Purdila authored davem330 committed
  4. davem330

    ipv6: skb_dst() can be NULL in ipv6_hop_jumbo().

    This fixes CERT-FI FICORA #341748
    
    Discovered by Olli Jarva and Tuomo Untinen from the CROSS
    project at Codenomicon Ltd.
    
    Just like in CVE-2007-4567, we can't rely upon skb_dst() being
    non-NULL at this point.  We fixed that in commit
    e76b2b2 ("[IPV6]: Do no rely on
    skb->dst before it is assigned.")
    
    However commit 483a47d ("ipv6: added
    net argument to IP6_INC_STATS_BH") put a new version of the same bug
    into this function.
    
    Complicating analysis further, this bug can only trigger when network
    namespaces are enabled in the build.  When namespaces are turned off,
    the dev_net() does not evaluate it's argument, so the dereference
    would not occur.
    
    So, for a long time, namespaces couldn't be turned on unless SYSFS was
    disabled.  Therefore, this code has largely been disabled except by
    people turning it on explicitly for namespace development.
    
    With help from Eugene Teo <eugene@redhat.com>
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 authored
  5. tg3: Update copyright and driver version

    This patch updates the copyright notice for 2010 and updates the version
    number to 3.106.
    
    Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
    Reviewed-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Matt Carlson authored davem330 committed
  6. tg3: Disable 5717 serdes and B0 support

    The B0 revision of the 5717 will not get enough testing by the time
    2.6.33 ships.  Since the kernel is already at RC3, serdes support
    will require too many patches to fix.  For these reasons, this patch
    disables 5717 serdes support and will refuse to attach to all 5717
    devices that are later than an A0 revision.
    
    Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
    Reviewed-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Matt Carlson authored davem330 committed
  7. tg3: Add reliable serdes detection for 5717 A0

    The serdes status bit does not work as intended for the 5717 A0.
    This patch implements an alternative detection scheme that will only be
    valid for A0 revisions.
    
    Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
    Reviewed-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Matt Carlson authored davem330 committed
  8. tg3: Fix std rx prod ring handling

    There are some tg3 devices that require the driver to post new rx
    buffers in smaller increments.  Commit
    4361935, "tg3: Consider
    rx_std_prod_idx a hw mailbox" changed how the driver tracks the rx
    producer ring updates, but it does not make any special considerations
    for the above-mentioned devices.  For those devices, it is possible for
    the driver to hit the special case path, which updates the hardware
    mailbox register but skips updating the shadow software mailbox member.
    If the special case path represents the final mailbox update for this
    ISR iteration, the hardware and software mailbox values will be out of
    sync.  Ultimately, this will cause the driver to use a stale mailbox
    value on the next iteration, which will appear to the hardware as a
    large rx buffer update.  Bad things ensue.
    
    The fix is to update the software shadow mailbox member when the special
    case path is taken.
    
    Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
    Reviewed-by: Michael Chan <mchan@broadcom.com>
    Reported-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Matt Carlson authored davem330 committed
  9. tg3: Fix std prod ring nicaddr for 5787 and 57765

    Commit 87668d3, titled "tg3: Don't
    touch RCB nic addresses", tried to avoid assigning the nic address of
    the standard producer ring.  Unfortunately, the default nic address is
    not correct for the 5787, the 5755M, or the 57765.  This patch
    reenables the old behavior and opts out of the assignment only
    for the 5717.
    
    Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
    Reviewed-by: Michael Chan <mchan@broadcom.com>
    Tested-by: Chow Loong Jin <hyperair@ubuntu.com>
    Tested-by: Dmitry Torokhov <dtor@mail.ru>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Matt Carlson authored davem330 committed
  10. sfc: Fix conditions for MDIO self-test

    The MDIO self-test should not be run on boards without an MDIO PHY,
    such as SFN5122F-R3 and later revisions.  It should also not try to
    address a specific MMD in an MDIO clause 22 PHY.  Check the
    mode_support field to decide which mode to use, if any.
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Ben Hutchings authored davem330 committed
  11. sfc: Fix polling for slow MCDI operations

    When the interface is down and we are using polled mode for MCDI
    operations, we busy-wait for completion for approximately 1 jiffy
    using udelay() and then back off to schedule().  But the completion
    will not wake the task, since we are using polled mode!  We must use
    schedule_timeout_uninterruptible() instead.
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Ben Hutchings authored davem330 committed
  12. e1000e: workaround link issues on busy hub in half duplex on 82577/82578

    This patch removes a delay in hardware after every received packet allowing
    more time for transmitted packets to go out in between received packets in
    half duplex.
    
    Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Bruce Allan authored davem330 committed
  13. e1000e: MDIO slow mode should always be done for 82577

    A previous 82577 workaround that set the MDIO access speed to slow mode for
    every PHY register read/write when the cable is unplugged should instead
    set the access mode to always be slow before any PHY register access.
    Since the mode bit gets cleared when the PHY is reset, set the mode after
    every PHY reset.
    
    Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Bruce Allan authored davem330 committed
  14. ixgbe: update copyright dates

    Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Shannon Nelson authored davem330 committed
  15. ixgbe: Do not attempt to perform interrupts in netpoll when down

    This patch resolves issues seen when running netconsole and rebooting via
    reboot -f.  The issue was due to the fact that we were attempting to
    perform interrupt actions when the q_vectors and rings had already been
    freed via the ixgbe_shutdown routines.
    
    Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
    Acked-by:  Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Alexander Duyck authored davem330 committed
  16. Linus Torvalds

    Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/peop…

    …le/ianc/linux-2.6
    
    * 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6:
      xen: fix hang on suspend.
    torvalds authored
  17. Linus Torvalds

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

    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm: change drm set mode messages as DRM_DEBUG
      drm: fix crtc no modes printf + typo
      drm/radeon/kms: only evict to GTT if CP is ready
      drm/radeon/kms: Fix crash getting TV info with no BIOS.
      drm/radeon/kms/rv100: reject modes > 135 Mhz on DVI (v2)
      drm/radeon/kms/r6xx+: make irq handler less verbose
      drm/radeon/kms: fix up LVDS handling on macs (v2)
    torvalds authored
  18. Benjamin Herrenschmidt

    zlib: Fix build of powerpc boot wrapper

    Commit ac4c2a3 broke the build
    of all powerpc boot wrappers.
    
    It attempts to add an include of autoconf.h but used the wrong
    path for it. It also adds -D__KERNEL__ to our boot wrapper, both
    things that we pretty much didn't do on purpose so far.
    
    We want our boot wrapper to remain independent enough of the kernel
    for various reasons, one of them being that you can "wrap" an existing
    kernel at distro install time which allows to ship one kernel image
    and a set of boot wrappers for different platforms, the wrappers
    don't have to be built out of the same kernel build tree.
    
    It's also incorrect to do what the patch does in our boot environment
    since we may not have a proper alignment exception handler which means
    we may not be able to fixup the few cases where an unaligned access will
    need SW emulation (depends on the core variant, could be when crossing
    page or segment boundaries for example).
    
    This patch fixes it by putting the old code back in and using the
    new "fancy" variant only when CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
    is set, which happens not to be set on powerpc since we don't include
    autoconf.h. It also reverts the changes to our boot wrapper Makefile.
    
    This means that x86 should, afaik, keep the optimisations since its
    boot wrapper does include autoconf.h and define __KERNEL__ (though I
    doubt they make that much different outside of slow embedded processors).
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    ozbenh authored torvalds committed
  19. Linus Torvalds

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

    …/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: wacom: Add BTN_TOOL_FINGER for pad button reporting
      HID: add device IDs for new model of Apple Wireless Keyboard
      HID: fix pad button definition in hid-wacom
      HID: Support 171 byte variant of Samsung USB IR receiver
      HID: blacklist ET&T TC5UH touchscreen controller
    torvalds authored
  20. Linus Torvalds

    Merge branch 'for-33' of git://repo.or.cz/linux-kbuild

    * 'for-33' of git://repo.or.cz/linux-kbuild:
      Makefile: do not override LC_CTYPE
      kbuild: really fix bzImage build with non-bash sh
    torvalds authored
  21. OGAWA Hirofumi

    vfs: Fix vmtruncate() regression

    If __block_prepare_write() was failed in block_write_begin(), the
    allocated blocks can be outside of ->i_size.
    
    But new truncate_pagecache() in vmtuncate() does nothing if new < old.
    It means the above usage is not working anymore.
    
    So, this patch fixes it by removing "new < old" check. It would need
    more cleanup/change. But, now -rc and truncate working is in progress,
    so, this tried to fix it minimum change.
    
    Acked-by: Nick Piggin <npiggin@suse.de>
    Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    OGAWAHirofumi authored torvalds committed

Jan 13, 2010

  1. Linus Torvalds

    Merge branch 'fasync-helper'

    * fasync-helper:
      fasync: split 'fasync_helper()' into separate add/remove functions
    torvalds authored
  2. [S390] tape_char: add missing compat_ptr conversion

    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens authored Martin Schwidefsky committed
  3. [S390] zcrypt: add sanity check before copy_from_user()

    It's not obvious that copy_from_user() is called with a sane length
    parameter here. Even though it currently seems to be correct better
    add a check to prevent stack corruption / exploits.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens authored Martin Schwidefsky committed
  4. [S390] unwire sys_recvmmsg again

    sys_recvmmsg is reachable via sys_socketcall. So unwire it again since
    there is no point in having two entry points for it.
    Also put it to the ignore list so we don't get reminded anymore in order
    to wire it up.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens authored Martin Schwidefsky committed
  5. [S390] con3215: remove empty ioctl function

    ...instead of adding a compat ioctl function which would do nothing
    as well.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens authored Martin Schwidefsky committed
  6. [S390] dasd: add proper compat pointer conversion for symmetrix ioctl

    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens authored Martin Schwidefsky committed
  7. [S390] mmap: add missing compat_ptr conversion to both mmap compat sy…

    …scalls
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens authored Martin Schwidefsky committed
  8. [S390] bug: implement arch specific __WARN macro

    This one will trap, generates shorter code and emits better debug data
    than the generic version.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens authored Martin Schwidefsky committed
  9. [S390] Move __cpu_logical_map to smp.c

    Finally move it to the place where it belongs to and make get rid of
    it for !CONFIG_SMP.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens authored Martin Schwidefsky committed
  10. [S390] tape_block: remove ioctl function

    This is just a complicated construct which always returns -EINVAL.
    Just remove it.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens authored Martin Schwidefsky committed
  11. [S390] smp: remove volatile type quilifier from __cpu_logical_map

    Remove pointless qualifier.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens authored Martin Schwidefsky committed
  12. [S390] smp: setup smp_processor_id early

    smp_processor_id() is supposed to work before setup_arch() gets called.
    Before that smp_processor_id() may return just an arbitrary value that
    is contained in the uninitialized boot lowcore.
    So provide the arch function which will override the weak function in
    init/main.c.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens authored Martin Schwidefsky committed
  13. [S390] use helpers for rlimits

    Make sure compiler won't do weird things with limits. E.g. fetching
    them twice may return 2 different values after writable limits are
    implemented.
    
    I.e. either use rlimit helpers added in
    3e10e71
    or ACCESS_ONCE if not applicable.
    
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: linux390@de.ibm.com
    Cc: linux-s390@vger.kernel.org
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Jiri Slaby authored Martin Schwidefsky committed
  14. [S390] fs3270: add missing compat ptr conversion

    Add missing compat ptr conversion including two additional
    whitespace changes that aren't worth a separate patch.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens authored Martin Schwidefsky committed
Something went wrong with that request. Please try again.