[TuxOnIce-devel] [SCM] TuxOnIce, tracking HEAD. branch, combined, updated. v2.6.39-rc5-5367-g6c7780d

Nigel Cunningham nigelc at hera.kernel.org
Wed May 4 00:29:39 EDT 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "TuxOnIce, tracking HEAD.".

The branch, combined has been updated
       via  6c7780deea4513bcd607b0dbaff63e5079ca2619 (commit)
       via  609cfda586c7fe3e5d1a02c51edb587506294167 (commit)
       via  9a6cd4b45a1372b04bb4c3307f1ce79a0a2e2fa9 (commit)
       via  bab0dcc717e28f76f10337a26ed5a14adcd786ce (commit)
       via  497ff0344432d1c4ab493ce163a87410064b8d91 (commit)
       via  5933f2ae353a93b1d3b501bc63c925531849bbc7 (commit)
       via  ff538818f4a82c4cf02d2d6bd6ac5c7360b9d41d (commit)
       via  6c8c44462ac8ac3f95929328f0c56e9e8b6dd524 (commit)
       via  d946092000698fd204d82a9d239103c656fb63bf (commit)
       via  6fdbab9d93e04bfe71f2b3fde485d092e2ffe3ec (commit)
       via  41c31f318a5209922d051e293c61e4724daad11c (commit)
       via  7806a49ab625ebeb1709e5e87299b64932b807a7 (commit)
       via  983960b159a75621855283030d92a80bea92e071 (commit)
       via  b9269dc7bfdf8c985971c09f2dcb2aa04ad7986d (commit)
       via  a38647837a411f7df79623128421eef2118b5884 (commit)
       via  badb02953aac4af9993163e2a87be60f10700db9 (commit)
       via  94b2c363dcf732a4edab4ed66041cb36e7f28fbf (commit)
       via  7cfd260910b881250cde76ba92ebe3cbf8493a8f (commit)
       via  a05d2ad1c1f391c7f514a1d1e09b5417968a7d07 (commit)
       via  2be19102b71c1a45d37fec50303791daa1a06869 (commit)
       via  e20a2d205c05cef6b5783df339a7d54adeb50962 (commit)
       via  2b5a4ace664cfe05c17bee60c4da66263a05fccf (commit)
       via  eee9700c5dd8fbac517c8c1e85c60b688bc311a9 (commit)
       via  686f13bb17784fbf8595a59ff4e4bd707d5ae66f (commit)
       via  b3c914aa84f4e4bbb3efc8f41c359d96e5e932d2 (commit)
       via  8333a46ad3877485e4d67ef499c6dda36bfd1f9a (commit)
       via  16b345d89686ca0482a9ca741a1167def1abdd7f (commit)
       via  bfd36103ec26599557c2bd3225a1f1c9267f8fcb (commit)
       via  b3b270054b80e6195b1d2b2ce082239911261839 (commit)
       via  68972efa657040f891c7eda07c7da8c8dd576788 (commit)
       via  f325757ab2812b42da4d690cf8da73c0e678368c (commit)
       via  1501b6764f0c363a9f1d72f9d422841f81f1bd8c (commit)
       via  f61583941667c96d61fc6991b9f23307f9bfa87e (commit)
       via  bf283707d5fb174ec09215ae19860ad04ba7b67a (commit)
       via  acad9853b95df6a3887f52e0ec88e4a77119ee28 (commit)
       via  f5346668150c37094b42cc2d07ec5fd1451eb980 (commit)
       via  0c9c99a765321104cc5f9c97f949382a9ba4927e (commit)
       via  b7b4d3426d2b5ecab21578eb20d8e456a1aace8f (commit)
       via  c919c2a073c5d2e076e52a56b44281d922721b61 (commit)
       via  26fc8775b51484d8c0a671198639c6d5ae60533e (commit)
       via  f69475142136c8ad9b9c717aea2ff907aed9f863 (commit)
       via  9bc21848b1d6cb8389d927196b16c9950b5e21e9 (commit)
       via  9fdcdbb0d84922e7ccda2f717a04ea62629f7e18 (commit)
       via  7833aa05b8db63484b43b4b4c389cd4533140afb (commit)
       via  c0a56e64aec331f33ead29ba493ee184d9bdc840 (commit)
       via  3f602b08dec32c418fc391fc838db357aab84f8a (commit)
       via  0972ddb2373d5e127aabdcabd8305eff0242cd0b (commit)
       via  8c61d9d611cb5b290f1b4ac57c4631acfd6e3b5a (commit)
       via  9ac067a84efbc7f5570d4d93c3b303001d5e8b38 (commit)
       via  953a12cc2889d1be92e80a2d0bab5ffef4942300 (commit)
       via  e39aece7d41119c3d63f390420e00ab4d2a526a9 (commit)
       via  13f172ff26563995049abe73f6eeba828de3c09d (commit)
       via  1ed3aad141fe595673c20225a9e004730088be52 (commit)
       via  f01cb5fbea1c1613621f9f32f385e12c1a29dde0 (commit)
       via  cb771838715b1c470bc5735bdae709b33b18e0ad (commit)
       via  e74fbd030223e29d269f4be17e3dce6de38f4c28 (commit)
       via  e965c05dabdabb85af0187952ccd75e43995c4b3 (commit)
       via  e2a85aecebc03d165bc2dcd233deadd5dd97ea9f (commit)
       via  a9cf73ea7ff78f52662c8658d93c226effbbedde (commit)
       via  069f40fc07f6df3da325e7ea1698a0d6247983d5 (commit)
       via  b25026981aecde3685dd0e45ad980fff9f528daa (commit)
       via  243e6df4ed919880d079d717641ad699c6530a03 (commit)
       via  10e99777e926907e43fa57ec1208c3f7787fd290 (commit)
       via  10022a6c66e199d8f61d9044543f38785713cbbd (commit)
       via  2430af8b7fa37ac0be102c77f9dc6ee669d24ba9 (commit)
       via  6f4d6dc167a001267eeff18bdea0ce3e9108c662 (commit)
       via  c6914a6f261aca0c9f715f883a353ae7ff51fe83 (commit)
       via  2232d31bf18ba02f5cd632bbfc3466aeca394c75 (commit)
       via  a429b51930e64dd355840c37251a563000d7c10b (commit)
       via  f21ca5fff6e548833fa5ee8867239a8378623150 (commit)
       via  b79f44c16a4e2181b1d6423afe746745d5e949ff (commit)
       via  7a74aeb022b34a8fa8ef00545e66cf0568b5ddf6 (commit)
       via  7caa2316bf0434f1150f58cb576542987a0466d7 (commit)
      from  7615642c1f24ae9af4a37a172ffdecc34c93435c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6c7780deea4513bcd607b0dbaff63e5079ca2619
Merge: 7615642 609cfda
Author: Nigel Cunningham <nigel at tuxonice.net>
Date:   Wed May 4 14:29:31 2011 +1000

    Merge branch 'stable' into combined

commit 609cfda586c7fe3e5d1a02c51edb587506294167
Merge: 9a6cd4b b9269dc
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 3 09:25:42 2011 -0700

    Merge branch 'stable/bug-fixes-for-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
    
    * 'stable/bug-fixes-for-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen: mask_rw_pte mark RO all pagetable pages up to pgt_buf_top
      xen/mmu: Add workaround "x86-64, mm: Put early page table high"

commit 9a6cd4b45a1372b04bb4c3307f1ce79a0a2e2fa9
Merge: bab0dcc 0c9c99a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 3 09:24:44 2011 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
      mmc: sdhci: Check mrq != NULL in sdhci_tasklet_finish
      mmc: sdhci: Check mrq->cmd in sdhci_tasklet_finish
      mmc: tmio: fix .set_ios(MMC_POWER_UP) handling
      mmc: fix a race between card-detect rescan and clock-gate work instances
      mmc: omap: Fix possible NULL pointer deref
      mmc: core: mmc_add_card(): fix missing break in switch statement
      mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()

commit bab0dcc717e28f76f10337a26ed5a14adcd786ce
Merge: 497ff03 7806a49 94b2c36
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 3 09:23:44 2011 -0700

    Merge branches 'x86-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/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, reboot: Fix relocations in reboot_32.S
      x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
      x86, AMD: Fix APIC timer erratum 400 affecting K8 Rev.A-E processors
    
    * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      genirq: Fix typo CONFIG_GENIRC_IRQ_SHOW_LEVEL

commit 497ff0344432d1c4ab493ce163a87410064b8d91
Merge: 5933f2a bf28370
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 2 20:26:32 2011 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: wm831x-ts - move BTN_TOUCH reporting to data transfer
      Input: wm831x-ts - allow IRQ flags to be specified
      Input: wm831x-ts - fix races with IRQ management

commit 5933f2ae353a93b1d3b501bc63c925531849bbc7
Merge: adadfe4 ff53881
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 2 18:00:43 2011 -0700

    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: (47 commits)
      sysctl: net: call unregister_net_sysctl_table where needed
      Revert: veth: remove unneeded ifname code from veth_newlink()
      smsc95xx: fix reset check
      tg3: Fix failure to enable WoL by default when possible
      networking: inappropriate ioctl operation should return ENOTTY
      amd8111e: trivial typo spelling: Negotitate -> Negotiate
      ipv4: don't spam dmesg with "Using LC-trie" messages
      af_unix: Only allow recv on connected seqpacket sockets.
      mii: add support of pause frames in mii_get_an
      net: ftmac100: fix scheduling while atomic during PHY link status change
      usbnet: Transfer of maintainership
      usbnet: add support for some Huawei modems with cdc-ether ports
      bnx2: cancel timer on device removal
      iwl4965: fix "Received BA when not expected"
      iwlagn: fix "Received BA when not expected"
      dsa/mv88e6131: fix unknown multicast/broadcast forwarding on mv88e6085
      usbnet: Resubmit interrupt URB if device is open
      iwl4965: fix "TX Power requested while scanning"
      iwlegacy: led stay solid on when no traffic
      b43: trivial: update module info about ucode16_mimo firmware
      ...

commit ff538818f4a82c4cf02d2d6bd6ac5c7360b9d41d
Author: Lucian Adrian Grijincu <lucian.grijincu at gmail.com>
Date:   Sun May 1 01:44:01 2011 +0000

    sysctl: net: call unregister_net_sysctl_table where needed
    
    ctl_table_headers registered with register_net_sysctl_table should
    have been unregistered with the equivalent unregister_net_sysctl_table
    
    Signed-off-by: Lucian Adrian Grijincu <lucian.grijincu at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 6c8c44462ac8ac3f95929328f0c56e9e8b6dd524
Author: Jiri Pirko <jpirko at redhat.com>
Date:   Sat Apr 30 01:28:17 2011 +0000

    Revert: veth: remove unneeded ifname code from veth_newlink()
    
    84c49d8c3e4abefb0a41a77b25aa37ebe8d6b743 ("veth: remove unneeded
    ifname code from veth_newlink()") caused regression on veth
    creation. This patch reverts the original one.
    
    Reported-by: Michał Mirosław <mirqus at gmail.com>
    Signed-off-by: Jiri Pirko <jpirko at redhat.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit d946092000698fd204d82a9d239103c656fb63bf
Author: Rabin Vincent <rabin at rab.in>
Date:   Sat Apr 30 08:29:27 2011 +0000

    smsc95xx: fix reset check
    
    The reset loop check should check the MII_BMCR register value for
    BMCR_RESET rather than for MII_BMCR (the register address, which also
    happens to be zero).
    
    Signed-off-by: Rabin Vincent <rabin at rab.in>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 6fdbab9d93e04bfe71f2b3fde485d092e2ffe3ec
Author: Rafael J. Wysocki <rjw at sisk.pl>
Date:   Thu Apr 28 11:02:15 2011 +0000

    tg3: Fix failure to enable WoL by default when possible
    
    tg3 is supposed to enable WoL by default on adapters which support
    that, but it fails to do so unless the adapter's
    /sys/devices/.../power/wakeup file contains 'enabled' during the
    initialization of the adapter.  Fix that by making tg3 use
    device_set_wakeup_enable() to enable wakeup automatically whenever
    WoL should be enabled by default.
    
    Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 41c31f318a5209922d051e293c61e4724daad11c
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Wed Apr 27 22:04:51 2011 +0000

    networking: inappropriate ioctl operation should return ENOTTY
    
    ioctl() calls against a socket with an inappropriate ioctl operation
    are incorrectly returning EINVAL rather than ENOTTY:
    
      [ENOTTY]
          Inappropriate I/O control operation.
    
    BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=33992
    
    Signed-off-by: Lifeng Sun <lifongsun at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 7806a49ab625ebeb1709e5e87299b64932b807a7
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Mon May 2 14:33:24 2011 -0700

    x86, reboot: Fix relocations in reboot_32.S
    
    The use of base for %ebx in this file is arbitrary, *except* that we
    also use it to compute the real-mode segment.  Therefore, make it so
    that r_base really is the true address to which %ebx points.
    
    This resolves kernel bugzilla 33302.
    
    Reported-and-tested-by: Alexey Zaytsev <alexey.zaytsev at gmail.com>
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Link: http://lkml.kernel.org/n/tip-08os5wi3yq1no0y4i5m4z7he@git.kernel.org

commit 983960b159a75621855283030d92a80bea92e071
Author: Joe Perches <joe at perches.com>
Date:   Mon May 2 09:59:29 2011 +0000

    amd8111e: trivial typo spelling: Negotitate -> Negotiate
    
    Signed-off-by: Joe Perches <joe at perches.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit b9269dc7bfdf8c985971c09f2dcb2aa04ad7986d
Author: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date:   Tue Apr 12 12:19:49 2011 +0100

    xen: mask_rw_pte mark RO all pagetable pages up to pgt_buf_top
    
    mask_rw_pte is currently checking if a pfn is a pagetable page if it
    falls in the range pgt_buf_start - pgt_buf_end but that is incorrect
    because pgt_buf_end is a moving target: pgt_buf_top is the real
    boundary.
    
    Acked-by: "H. Peter Anvin" <hpa at zytor.com>
    Signed-off-by: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>

commit a38647837a411f7df79623128421eef2118b5884
Author: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
Date:   Fri Apr 29 11:34:00 2011 -0400

    xen/mmu: Add workaround "x86-64, mm: Put early page table high"
    
    As a consequence of the commit:
    
    commit 4b239f458c229de044d6905c2b0f9fe16ed9e01e
    Author: Yinghai Lu <yinghai at kernel.org>
    Date:   Fri Dec 17 16:58:28 2010 -0800
    
        x86-64, mm: Put early page table high
    
    it causes the Linux kernel to crash under Xen:
    
    mapping kernel into physical memory
    Xen: setup ISA identity maps
    about to get started...
    (XEN) mm.c:2466:d0 Bad type (saw 7400000000000001 != exp 1000000000000000) for mfn b1d89 (pfn bacf7)
    (XEN) mm.c:3027:d0 Error while pinning mfn b1d89
    (XEN) traps.c:481:d0 Unhandled invalid opcode fault/trap [#6] on VCPU 0 [ec=0000]
    (XEN) domain_crash_sync called from entry.S
    (XEN) Domain 0 (vcpu#0) crashed on cpu#0:
    ...
    
    The reason is that at some point init_memory_mapping is going to reach
    the pagetable pages area and map those pages too (mapping them as normal
    memory that falls in the range of addresses passed to init_memory_mapping
    as argument). Some of those pages are already pagetable pages (they are
    in the range pgt_buf_start-pgt_buf_end) therefore they are going to be
    mapped RO and everything is fine.
    Some of these pages are not pagetable pages yet (they fall in the range
    pgt_buf_end-pgt_buf_top; for example the page at pgt_buf_end) so they
    are going to be mapped RW.  When these pages become pagetable pages and
    are hooked into the pagetable, xen will find that the guest has already
    a RW mapping of them somewhere and fail the operation.
    The reason Xen requires pagetables to be RO is that the hypervisor needs
    to verify that the pagetables are valid before using them. The validation
    operations are called "pinning" (more details in arch/x86/xen/mmu.c).
    
    In order to fix the issue we mark all the pages in the entire range
    pgt_buf_start-pgt_buf_top as RO, however when the pagetable allocation
    is completed only the range pgt_buf_start-pgt_buf_end is reserved by
    init_memory_mapping. Hence the kernel is going to crash as soon as one
    of the pages in the range pgt_buf_end-pgt_buf_top is reused (b/c those
    ranges are RO).
    
    For this reason, this function is introduced which is called _after_
    the init_memory_mapping has completed (in a perfect world we would
    call this function from init_memory_mapping, but lets ignore that).
    
    Because we are called _after_ init_memory_mapping the pgt_buf_[start,
    end,top] have all changed to new values (b/c another init_memory_mapping
    is called). Hence, the first time we enter this function, we save
    away the pgt_buf_start value and update the pgt_buf_[end,top].
    
    When we detect that the "old" pgt_buf_start through pgt_buf_end
    PFNs have been reserved (so memblock_x86_reserve_range has been called),
    we immediately set out to RW the "old" pgt_buf_end through pgt_buf_top.
    
    And then we update those "old" pgt_buf_[end|top] with the new ones
    so that we can redo this on the next pagetable.
    
    Acked-by: "H. Peter Anvin" <hpa at zytor.com>
    Reviewed-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
    [v1: Updated with Jeremy's comments]
    [v2: Added the crash output]
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>

commit badb02953aac4af9993163e2a87be60f10700db9
Merge: 7cfd260 16b345d
Author: David S. Miller <davem at davemloft.net>
Date:   Mon May 2 12:21:47 2011 -0700

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit 94b2c363dcf732a4edab4ed66041cb36e7f28fbf
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sat Apr 30 22:56:20 2011 +0200

    genirq: Fix typo CONFIG_GENIRC_IRQ_SHOW_LEVEL
    
    commit ab7798ffcf98b11a9525cf65bacdae3fd58d357f ("genirq: Expand generic
    show_interrupts()") added the Kconfig option GENERIC_IRQ_SHOW_LEVEL to
    accomodate PowerPC, but this doesn't actually enable the functionality due
    to a typo in the #ifdef check.
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Cc: Linux/PPC Development <linuxppc-dev at lists.ozlabs.org>
    Link: http://lkml.kernel.org/r/%3Calpine.DEB.2.00.1104302251370.19068%40ayla.of.borg%3E
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 7cfd260910b881250cde76ba92ebe3cbf8493a8f
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date:   Sun May 1 02:04:11 2011 +0000

    ipv4: don't spam dmesg with "Using LC-trie" messages
    
    fib_trie_table() is called during netns creation and
    Chromium uses clone(CLONE_NEWNET) to sandbox renderer process.
    
    Don't print anything.
    
    Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit a05d2ad1c1f391c7f514a1d1e09b5417968a7d07
Author: Eric W. Biederman <ebiederm at xmission.com>
Date:   Sun Apr 24 01:54:57 2011 +0000

    af_unix: Only allow recv on connected seqpacket sockets.
    
    This fixes the following oops discovered by Dan Aloni:
    > Anyway, the following is the output of the Oops that I got on the
    > Ubuntu kernel on which I first detected the problem
    > (2.6.37-12-generic). The Oops that followed will be more useful, I
    > guess.
    
    >[ 5594.669852] BUG: unable to handle kernel NULL pointer dereference
    > at           (null)
    > [ 5594.681606] IP: [<ffffffff81550b7b>] unix_dgram_recvmsg+0x1fb/0x420
    > [ 5594.687576] PGD 2a05d067 PUD 2b951067 PMD 0
    > [ 5594.693720] Oops: 0002 [#1] SMP
    > [ 5594.699888] last sysfs file:
    
    The bug was that unix domain sockets use a pseduo packet for
    connecting and accept uses that psudo packet to get the socket.
    In the buggy seqpacket case we were allowing unconnected
    sockets to call recvmsg and try to receive the pseudo packet.
    
    That is always wrong and as of commit 7361c36c5 the pseudo
    packet had become enough different from a normal packet
    that the kernel started oopsing.
    
    Do for seqpacket_recv what was done for seqpacket_send in 2.5
    and only allow it on connected seqpacket sockets.
    
    Cc: stable at kernel.org
    Tested-by: Dan Aloni <dan at aloni.org>
    Signed-off-by: Eric W. Biederman <ebiederm at xmission.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 2be19102b71c1a45d37fec50303791daa1a06869
Author: Yinghai Lu <yinghai at kernel.org>
Date:   Sun May 1 19:12:04 2011 +0200

    x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
    
    numa_cleanup_meminfo() trims each memblk between low (0) and
    high (max_pfn) limits and discards empty ones.  However, the
    emptiness detection incorrectly used equality test.  If the
    start of a memblk is higher than max_pfn, it is empty but fails
    the equality test and doesn't get discarded.
    
    The condition triggers when max_pfn is lower than start of a
    NUMA node and results in memory misconfiguration - leading to
    WARN_ON()s and other funnies.  The bug was discovered in devel
    branch where 32bit too uses this code path for NUMA init.  If a
    node is above the addressing limit, max_pfn ends up lower than
    the node triggering this problem.
    
    The failure hasn't been observed on x86-64 but is still possible
    with broken hardware e820/NUMA info.  As the fix is very low
    risk, it would be better to apply it even for 64bit.
    
    Fix it by using >= instead of ==.
    
    Signed-off-by: Yinghai Lu <yinghai at kernel.org>
    [ Extracted the actual fix from the original patch and rewrote patch description. ]
    Signed-off-by: Tejun Heo <tj at kernel.org>
    Link: http://lkml.kernel.org/r/20110501171204.GO29280@htj.dyndns.org
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit e20a2d205c05cef6b5783df339a7d54adeb50962
Author: Boris Ostrovsky <ostr at amd64.org>
Date:   Fri Apr 29 17:47:43 2011 -0400

    x86, AMD: Fix APIC timer erratum 400 affecting K8 Rev.A-E processors
    
    Older AMD K8 processors (Revisions A-E) are affected by erratum
    400 (APIC timer interrupts don't occur in C states greater than
    C1). This, for example, means that X86_FEATURE_ARAT flag should
    not be set for these parts.
    
    This addresses regression introduced by commit
    b87cf80af3ba4b4c008b4face3c68d604e1715c6 ("x86, AMD: Set ARAT
    feature on AMD processors") where the system may become
    unresponsive until external interrupt (such as keyboard input)
    occurs. This results, for example, in time not being reported
    correctly, lack of progress on the system and other lockups.
    
    Reported-by: Joerg-Volker Peetz <jvpeetz at web.de>
    Tested-by: Joerg-Volker Peetz <jvpeetz at web.de>
    Acked-by: Borislav Petkov <borislav.petkov at amd.com>
    Signed-off-by: Boris Ostrovsky <Boris.Ostrovsky at amd.com>
    Cc: stable at kernel.org
    Link: http://lkml.kernel.org/r/1304113663-6586-1-git-send-email-ostr@amd64.org
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 2b5a4ace664cfe05c17bee60c4da66263a05fccf
Author: artpol <artpol84 at gmail.com>
Date:   Wed Apr 27 17:49:14 2011 +0000

    mii: add support of pause frames in mii_get_an
    
    Add support of pause frames advertise in mii_get_an. This provides all drivers
    that use mii_ethtool_gset to represent their own and Link partner flow control
    abilities in ethtool.
    
    Signed-off-by: Artem Polyakov <artpol84 at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit eee9700c5dd8fbac517c8c1e85c60b688bc311a9
Author: Adam Jaremko <adam.jaremko at gmail.com>
Date:   Thu Apr 28 07:41:18 2011 +0000

    net: ftmac100: fix scheduling while atomic during PHY link status change
    
    Signed-off-by: Adam Jaremko <adam.jaremko at gmail.com>
    Acked-by: Po-Yu Chuang <ratbert at faraday-tech.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 686f13bb17784fbf8595a59ff4e4bd707d5ae66f
Author: Oliver Neukum <oliver at neukum.org>
Date:   Fri Apr 29 14:15:53 2011 +0200

    usbnet: Transfer of maintainership
    
    Somebody has to do it, however unfortunate be the cause.
    
    Signed-off-by: Oliver Neukum <oneukum at suse.de>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit b3c914aa84f4e4bbb3efc8f41c359d96e5e932d2
Author: Dan Williams <dcbw at redhat.com>
Date:   Wed Apr 27 09:54:28 2011 +0000

    usbnet: add support for some Huawei modems with cdc-ether ports
    
    Some newer Huawei devices (T-Mobile Rocket, others) have cdc-ether
    compatible ports, so recognize and expose them.
    
    Signed-off-by: Dan Williams <dcbw at redhat.com>
    Acked-by: Oliver Neukum <oneukum at suse.de>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 8333a46ad3877485e4d67ef499c6dda36bfd1f9a
Author: Neil Horman <nhorman at tuxdriver.com>
Date:   Tue Apr 26 10:30:11 2011 +0000

    bnx2: cancel timer on device removal
    
    This oops was recently reported to me:
    
    invalid opcode: 0000 [#1] SMP
    last sysfs file:
    /sys/devices/pci0000:00/0000:00:01.0/0000:01:0d.0/0000:02:05.0/device
    CPU 1
    Modules linked in: bnx2(+) sunrpc ipv6 dm_mirror dm_region_hash dm_log sg
    microcode serio_raw amd64_edac_mod edac_core edac_mce_amd k8temp i2c_piix4
    shpchp ext4 mbcache jbd2 sd_mod crc_t10dif mptsas mptscsih mptbase
    scsi_transport_sas radeon ttm drm_kms_helper drm hwmon i2c_algo_bit i2c_core
    dm_mod [last unloaded: bnx2]
    
    Modules linked in: bnx2(+) sunrpc ipv6 dm_mirror dm_region_hash dm_log sg
    microcode serio_raw amd64_edac_mod edac_core edac_mce_amd k8temp i2c_piix4
    shpchp ext4 mbcache jbd2 sd_mod crc_t10dif mptsas mptscsih mptbase
    scsi_transport_sas radeon ttm drm_kms_helper drm hwmon i2c_algo_bit i2c_core
    dm_mod [last unloaded: bnx2]
    Pid: 23900, comm: pidof Not tainted 2.6.32-130.el6.x86_64 #1 BladeCenter LS21
    -[797251Z]-
    RIP: 0010:[<ffffffffa058b270>]  [<ffffffffa058b270>] 0xffffffffa058b270
    RSP: 0018:ffff880002083e48  EFLAGS: 00010246
    RAX: ffff880002083e90 RBX: ffff88007ccd4000 RCX: 0000000000000000
    RDX: 0000000000000100 RSI: dead000000200200 RDI: ffff8800007b8700
    RBP: ffff880002083ed0 R08: ffff88000208db40 R09: 0000022d191d27c8
    R10: 0000000000000000 R11: 0000000000000000 R12: ffff8800007b9bc8
    R13: ffff880002083e90 R14: ffff8800007b8700 R15: ffffffffa058b270
    FS:  00007fbb3bcf7700(0000) GS:ffff880002080000(0000) knlGS:0000000000000000
    CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
    CR2: 0000000001664a98 CR3: 0000000060395000 CR4: 00000000000006e0
    DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
    Process pidof (pid: 23900, threadinfo ffff8800007e8000, task ffff8800091c0040)
    Stack:
     ffffffff81079f77 ffffffff8109e010 ffff88007ccd5c20 ffff88007ccd5820
    <0> ffff88007ccd5420 ffff8800007e9fd8 ffff8800007e9fd8 0000010000000000
    <0> ffff88007ccd5020 ffff880002083e90 ffff880002083e90 ffffffff8102a00d
    Call Trace:
     <IRQ>
     [<ffffffff81079f77>] ? run_timer_softirq+0x197/0x340
     [<ffffffff8109e010>] ? tick_sched_timer+0x0/0xc0
     [<ffffffff8102a00d>] ? lapic_next_event+0x1d/0x30
     [<ffffffff8106f737>] __do_softirq+0xb7/0x1e0
     [<ffffffff81092cc0>] ? hrtimer_interrupt+0x140/0x250
     [<ffffffff81185f90>] ? filldir+0x0/0xe0
     [<ffffffff8100c2cc>] call_softirq+0x1c/0x30
     [<ffffffff8100df05>] do_softirq+0x65/0xa0
     [<ffffffff8106f525>] irq_exit+0x85/0x90
     [<ffffffff814e3340>] smp_apic_timer_interrupt+0x70/0x9b
     [<ffffffff8100bc93>] apic_timer_interrupt+0x13/0x20
     <EOI>
     [<ffffffff81211ba5>] ? selinux_file_permission+0x45/0x150
     [<ffffffff81262a75>] ? _atomic_dec_and_lock+0x55/0x80
     [<ffffffff812050c6>] security_file_permission+0x16/0x20
     [<ffffffff811861c1>] vfs_readdir+0x71/0xe0
     [<ffffffff81186399>] sys_getdents+0x89/0xf0
     [<ffffffff8100b172>] system_call_fastpath+0x16/0x1b
    
    It occured during some stress testing, in which the reporter was repeatedly
    removing and modprobing the bnx2 module while doing various other random
    operations on the bnx2 registered net device.  Noting that this error occured on
    a serdes based device, we noted that there were a few ethtool operations (most
    notably self_test and set_phys_id) that have execution paths that lead into
    bnx2_setup_serdes_phy.  This function is notable because it executes a mod_timer
    call, which starts the bp->timer running.  Currently bnx2 is setup to assume
    that this timer only nees to be stopped when bnx2_close or bnx2_suspend is
    called.  Since the above ethtool operations are not gated on the net device
    having been opened however, that assumption is incorrect, and can lead to the
    timer still running after the module has been removed, leading to the oops above
    (as well as other simmilar oopses).
    
    Fix the problem by ensuring that the timer is stopped when pci_device_unregister
    is called.
    
    Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
    Reported-by: Hushan Jia <hjia at redhat.com>
    CC: Michael Chan <mchan at broadcom.com>
    CC: "David S. Miller" <davem at davemloft.net>
    Acked-by: Michael Chan <mchan at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 16b345d89686ca0482a9ca741a1167def1abdd7f
Author: Stanislaw Gruszka <sgruszka at redhat.com>
Date:   Fri Apr 29 17:51:56 2011 +0200

    iwl4965: fix "Received BA when not expected"
    
    Need to use broadcast sta_id for management frames, otherwise we broke
    BA session in the firmware and get messages like that:
    
    "Received BA when not expected"
    
    or (on older kernels):
    
    "BA scd_flow 0 does not match txq_id 10"
    
    This fix regression introduced in 2.6.35 during station management
    code rewrite by:
    
    commit 2a87c26bbe9587baeb9e56d3ce0b4971bd777643
    Author: Johannes Berg <johannes.berg at intel.com>
    Date:   Fri Apr 30 11:30:45 2010 -0700
    
        iwlwifi: use iwl_find_station less
    
    Signed-off-by: Stanislaw Gruszka <sgruszka at redhat.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit bfd36103ec26599557c2bd3225a1f1c9267f8fcb
Author: Stanislaw Gruszka <sgruszka at redhat.com>
Date:   Fri Apr 29 17:51:06 2011 +0200

    iwlagn: fix "Received BA when not expected"
    
    Need to use broadcast sta_id for management frames, otherwise we broke
    BA session in the firmware and get messages like that:
    
    "Received BA when not expected"
    
    or (on older kernels):
    
    "BA scd_flow 0 does not match txq_id 10"
    
    This fix regression introduced in 2.6.35 during station management
    code rewrite by:
    
    commit 2a87c26bbe9587baeb9e56d3ce0b4971bd777643
    Author: Johannes Berg <johannes.berg at intel.com>
    Date:   Fri Apr 30 11:30:45 2010 -0700
    
        iwlwifi: use iwl_find_station less
    
    Patch partially resolve:
    https://bugzilla.kernel.org/show_bug.cgi?id=16691
    However, there are still 11n performance problems on 4965 and 5xxx
    devices that need to be investigated.
    
    Cc: stable at kernel.org # 2.6.35+
    Signed-off-by: Stanislaw Gruszka <sgruszka at redhat.com>
    Acked-by: Johannes Berg <johannes at sipsolutions.net>
    Acked-by: Wey-Yi Guy <wey-yi.w.guy at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit b3b270054b80e6195b1d2b2ce082239911261839
Author: Peter Korsgaard <jacmet at sunsite.dk>
Date:   Tue Apr 26 01:45:41 2011 +0000

    dsa/mv88e6131: fix unknown multicast/broadcast forwarding on mv88e6085
    
    The 88e6085 has a few differences from the other devices in the port
    control registers, causing unknown multicast/broadcast packets to get
    dropped when using the standard port setup.
    
    At the same time update kconfig to clarify that the mv88e6085 is now
    supported.
    
    Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
    Acked-by: Lennert Buytenhek <buytenh at wantstofly.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 68972efa657040f891c7eda07c7da8c8dd576788
Author: Paul Stewart <pstew at chromium.org>
Date:   Thu Apr 28 05:43:37 2011 +0000

    usbnet: Resubmit interrupt URB if device is open
    
    Resubmit interrupt URB if device is open.  Use a flag set in
    usbnet_open() to determine this state.  Also kill and free
    interrupt URB in usbnet_disconnect().
    
    [Rebased off git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git]
    
    Signed-off-by: Paul Stewart <pstew at chromium.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit f325757ab2812b42da4d690cf8da73c0e678368c
Author: Stanislaw Gruszka <sgruszka at redhat.com>
Date:   Thu Apr 28 11:36:54 2011 +0200

    iwl4965: fix "TX Power requested while scanning"
    
    Fix the following:
    
    WARNING: at drivers/net/wireless/iwlegacy/iwl-4965.c:1128 \
    iwl4965_send_tx_power+0x61/0x102 [iwl4965]() Hardware name: [...]
    TX Power requested while scanning!
    
    Pid: 5723, comm: kworker/u:28 Not tainted 2.6.39-0.rc4.4.fc14.x86_64 #1
    Call Trace:
     [<ffffffff8104e27b>] warn_slowpath_common+0x85/0x9d
     [<ffffffffa02782e0>] ? iwl4965_show_temperature+0x49/0x49 [iwl4965]
     [<ffffffff8104e336>] warn_slowpath_fmt+0x46/0x48
     [<ffffffffa027712f>] iwl4965_send_tx_power+0x61/0x102 [iwl4965]
     [<ffffffff81477e05>] ? mutex_lock+0x36/0x50
     [<ffffffffa0278337>] iwl4965_bg_txpower_work+0x57/0x73 [iwl4965]
     [<ffffffff810647f3>] process_one_work+0x18d/0x286
     [<ffffffff81065a5e>] worker_thread+0xfd/0x181
     [<ffffffff81065961>] ? manage_workers.clone.16+0x172/0x172
     [<ffffffff81069036>] kthread+0x82/0x8a
     [<ffffffff81480524>] kernel_thread_helper+0x4/0x10
     [<ffffffff81068fb4>] ? kthread_worker_fn+0x14b/0x14b
     [<ffffffff81480520>] ? gs_change+0x13/0x13
    
    Reported-and-tested-by: Paul Bolle <pebolle at tiscali.nl>
    Signed-off-by: Stanislaw Gruszka <sgruszka at redhat.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 1501b6764f0c363a9f1d72f9d422841f81f1bd8c
Author: Wey-Yi Guy <wey-yi.w.guy at intel.com>
Date:   Mon Apr 25 11:12:57 2011 -0700

    iwlegacy: led stay solid on when no traffic
    
    commit 5ed540aecc2aae92d5c97b9a9306a5bf88ad5574 change the led behavior
    for iwlwifi driver; the side effect cause led blink all the time.
    
    Modify the led blink table to fix this problem
    
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit f61583941667c96d61fc6991b9f23307f9bfa87e
Author: Rafał Miłecki <zajec5 at gmail.com>
Date:   Tue Apr 19 22:49:29 2011 +0200

    b43: trivial: update module info about ucode16_mimo firmware
    
    Signed-off-by: Rafał Miłecki <zajec5 at gmail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit bf283707d5fb174ec09215ae19860ad04ba7b67a
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date:   Wed Apr 27 23:09:26 2011 -0700

    Input: wm831x-ts - move BTN_TOUCH reporting to data transfer
    
    Don't report BTN_TOUCH until we've got data as some less robust applications
    can be confused by getting a touch event by itself and it doesn't seem
    unreasonable for them to expect coordinates along with a touch.
    
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit acad9853b95df6a3887f52e0ec88e4a77119ee28
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date:   Wed Apr 27 23:08:51 2011 -0700

    Input: wm831x-ts - allow IRQ flags to be specified
    
    This allows maximum flexibility for configuring the direct GPIO based
    interrupts.
    
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit f5346668150c37094b42cc2d07ec5fd1451eb980
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date:   Wed Apr 27 23:08:34 2011 -0700

    Input: wm831x-ts - fix races with IRQ management
    
    If the WM831x pen down and data IRQs run in parallel it is possible for the
    data and pen down IRQs to deadlock themselves as one is part way through
    disabling its operation while the other is part way through enabling. Fix
    this by always disabling the pen down interrupt while data is active and
    vice versa.  When a changeover is required we disable the IRQ that is to
    be stopped then schedule work that will enable the new IRQ.
    
    We need to handle the data flow in the data IRQ as the readback from the
    device needs to be ordered correctly with the IRQ for robust operation.
    
    This also fixes an issue when using the built in IRQs due to enable_irq()
    not being valid from interrupt context on an interrupt controller with bus
    operations like the built in IRQ controller - this issue may also have
    affected other interrupt controllers.  We can't rely on having the data
    and pen down IRQs available via GPIOs on the CPU on every system.
    
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit 0c9c99a765321104cc5f9c97f949382a9ba4927e
Author: Chris Ball <cjb at laptop.org>
Date:   Wed Apr 27 17:35:31 2011 -0400

    mmc: sdhci: Check mrq != NULL in sdhci_tasklet_finish
    
    It seems that under certain circumstances the sdhci_tasklet_finish()
    call can be entered with mrq set to NULL, causing the system to crash
    with a NULL pointer de-reference.
    
    Seen on S3C6410 system.  Based on a patch by Dimitris Papastamos.
    
    Reported-by: Dimitris Papastamos <dp at opensource.wolfsonmicro.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Chris Ball <cjb at laptop.org>

commit b7b4d3426d2b5ecab21578eb20d8e456a1aace8f
Author: Ben Dooks <ben-linux at fluff.org>
Date:   Wed Apr 27 14:24:19 2011 +0100

    mmc: sdhci: Check mrq->cmd in sdhci_tasklet_finish
    
    It seems that under certain circumstances that the sdhci_tasklet_finish()
    call can be entered with mrq->cmd set to NULL, causing the system to crash
    with a NULL pointer de-reference.
    
    Unable to handle kernel NULL pointer dereference at virtual address 00000000
    PC is at sdhci_tasklet_finish+0x34/0xe8
    LR is at sdhci_tasklet_finish+0x24/0xe8
    
    Seen on S3C6410 system.
    
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Chris Ball <cjb at laptop.org>

commit c919c2a073c5d2e076e52a56b44281d922721b61
Author: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Date:   Thu Apr 21 09:09:59 2011 +0200

    mmc: tmio: fix .set_ios(MMC_POWER_UP) handling
    
    The aggressive clock gating for TMIO MMC patch has broken switching
    interface power on, using MFD or platform callbacks. Restore the
    ios->power_mode == MMC_POWER_UP && ios->clock == 0 case handling.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
    Signed-off-by: Chris Ball <cjb at laptop.org>

commit 26fc8775b51484d8c0a671198639c6d5ae60533e
Author: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Date:   Fri Apr 15 20:08:19 2011 +0200

    mmc: fix a race between card-detect rescan and clock-gate work instances
    
    Currently there is a race in the MMC core between a card-detect
    rescan work and the clock-gating work, scheduled from a command
    completion. Fix it by removing the dedicated clock-gating mutex
    and using the MMC standard locking mechanism instead.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
    Cc: Simon Horman <horms at verge.net.au>
    Cc: Magnus Damm <damm at opensource.se>
    Acked-by: Linus Walleij <linus.walleij at linaro.org>
    Cc: <stable at kernel.org>
    Signed-off-by: Chris Ball <cjb at laptop.org>

commit f69475142136c8ad9b9c717aea2ff907aed9f863
Author: Michael Buesch <mb at bu3sch.de>
Date:   Mon Apr 11 17:00:44 2011 -0400

    mmc: omap: Fix possible NULL pointer deref
    
    Either OMAP_MMC_STAT_CARD_ERR or OMAP_MMC_STAT_END_OF_CMD might fire
    if there is no host->cmd pointer.
    
    Check for a valid host->cmd pointer before calling mmc_omap_cmd_done().
    
    Signed-off-by: Michael Buesch <mb at bu3sch.de>
    Acked-by: Tony Lindgren <tony at atomide.com>
    Signed-off-by: Chris Ball <cjb at laptop.org>

commit 9bc21848b1d6cb8389d927196b16c9950b5e21e9
Author: Michał Mirosław <mirq-linux at rere.qmqm.pl>
Date:   Sat Apr 9 08:16:47 2011 +0200

    mmc: core: mmc_add_card(): fix missing break in switch statement
    
    Fixes a cosmetic bug that affects printk() for SD-combo cards.
    
    Reported-by: Prashanth Bhat <prashanth.bhat at manipal.net>
    Signed-off-by: Michał Mirosław <mirq-linux at rere.qmqm.pl>
    Signed-off-by: Chris Ball <cjb at laptop.org>

commit 9fdcdbb0d84922e7ccda2f717a04ea62629f7e18
Author: Chris Ball <cjb at laptop.org>
Date:   Tue Mar 29 00:46:12 2011 -0400

    mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()
    
    If pci_ioremap_bar() fails during probe, we "goto release;" and free the
    host, but then we return 0 -- which tells sdhci_pci_probe() that the probe
    succeeded.  Since we think the probe succeeded, when we unload sdhci we'll
    go to sdhci_pci_remove_slot() and it will try to dereference slot->host,
    which is now NULL because we freed it in the error path earlier.
    
    The patch simply sets ret appropriately, so that sdhci_pci_probe() will
    detect the failure immediately and bail out.
    
    Signed-off-by: Chris Ball <cjb at laptop.org>
    Cc: <stable at kernel.org>

commit 7833aa05b8db63484b43b4b4c389cd4533140afb
Author: Steffen Klassert <steffen.klassert at secunet.com>
Date:   Mon Apr 25 19:41:21 2011 +0000

    xfrm: Check for the new replay implementation if an esn state is inserted
    
    IPsec extended sequence numbers can be used only with the new
    anti-replay window implementation. So check if the new implementation
    is used if an esn state is inserted and return an error if it is not.
    
    Signed-off-by: Steffen Klassert <steffen.klassert at secunet.com>
    Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c0a56e64aec331f33ead29ba493ee184d9bdc840
Author: Steffen Klassert <steffen.klassert at secunet.com>
Date:   Mon Apr 25 19:40:23 2011 +0000

    esp6: Fix scatterlist initialization
    
    When we use IPsec extended sequence numbers, we may overwrite
    the last scatterlist of the associated data by the scatterlist
    for the skb. This patch fixes this by placing the scatterlist
    for the skb right behind the last scatterlist of the associated
    data. esp4 does it already like that.
    
    Signed-off-by: Steffen Klassert <steffen.klassert at secunet.com>
    Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 3f602b08dec32c418fc391fc838db357aab84f8a
Author: Steffen Klassert <steffen.klassert at secunet.com>
Date:   Mon Apr 25 19:39:24 2011 +0000

    xfrm: Fix replay window size calculation on initialization
    
    On replay initialization, we compute the size of the replay
    buffer to see if the replay window fits into the buffer.
    This computation lacks a mutliplication by 8 because we need
    the size in bit, not in byte. So we might return an error
    even though the replay window would fit into the buffer.
    This patch fixes this issue.
    
    Signed-off-by: Steffen Klassert <steffen.klassert at secunet.com>
    Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 0972ddb2373d5e127aabdcabd8305eff0242cd0b
Author: Held Bernhard <berny156 at gmx.de>
Date:   Sun Apr 24 22:07:32 2011 +0000

    net: provide cow_metrics() methods to blackhole dst_ops
    
    Since commit 62fa8a846d7d (net: Implement read-only protection and COW'ing
    of metrics.) the kernel throws an oops.
    
    [  101.620985] BUG: unable to handle kernel NULL pointer dereference at
               (null)
    [  101.621050] IP: [<          (null)>]           (null)
    [  101.621084] PGD 6e53c067 PUD 3dd6a067 PMD 0
    [  101.621122] Oops: 0010 [#1] SMP
    [  101.621153] last sysfs file: /sys/devices/virtual/ppp/ppp/uevent
    [  101.621192] CPU 2
    [  101.621206] Modules linked in: l2tp_ppp pppox ppp_generic slhc
    l2tp_netlink l2tp_core deflate zlib_deflate twofish_x86_64
    twofish_common des_generic cbc ecb sha1_generic hmac af_key
    iptable_filter snd_pcm_oss snd_mixer_oss snd_seq snd_seq_device loop
    snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_intel snd_hda_codec
    snd_pcm snd_timer snd i2c_i801 iTCO_wdt psmouse soundcore snd_page_alloc
    evdev uhci_hcd ehci_hcd thermal
    [  101.621552]
    [  101.621567] Pid: 5129, comm: openl2tpd Not tainted 2.6.39-rc4-Quad #3
    Gigabyte Technology Co., Ltd. G33-DS3R/G33-DS3R
    [  101.621637] RIP: 0010:[<0000000000000000>]  [<          (null)>]   (null)
    [  101.621684] RSP: 0018:ffff88003ddeba60  EFLAGS: 00010202
    [  101.621716] RAX: ffff88003ddb5600 RBX: ffff88003ddb5600 RCX:
    0000000000000020
    [  101.621758] RDX: ffffffff81a69a00 RSI: ffffffff81b7ee61 RDI:
    ffff88003ddb5600
    [  101.621800] RBP: ffff8800537cd900 R08: 0000000000000000 R09:
    ffff88003ddb5600
    [  101.621840] R10: 0000000000000005 R11: 0000000000014b38 R12:
    ffff88003ddb5600
    [  101.621881] R13: ffffffff81b7e480 R14: ffffffff81b7e8b8 R15:
    ffff88003ddebad8
    [  101.621924] FS:  00007f06e4182700(0000) GS:ffff88007fd00000(0000)
    knlGS:0000000000000000
    [  101.621971] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
    [  101.622005] CR2: 0000000000000000 CR3: 0000000045274000 CR4:
    00000000000006e0
    [  101.622046] DR0: 0000000000000000 DR1: 0000000000000000 DR2:
    0000000000000000
    [  101.622087] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7:
    0000000000000400
    [  101.622129] Process openl2tpd (pid: 5129, threadinfo
    ffff88003ddea000, task ffff88003de9a280)
    [  101.622177] Stack:
    [  101.622191]  ffffffff81447efa ffff88007d3ded80 ffff88003de9a280
    ffff88007d3ded80
    [  101.622245]  0000000000000001 ffff88003ddebbb8 ffffffff8148d5a7
    0000000000000212
    [  101.622299]  ffff88003dcea000 ffff88003dcea188 ffffffff00000001
    ffffffff81b7e480
    [  101.622353] Call Trace:
    [  101.622374]  [<ffffffff81447efa>] ? ipv4_blackhole_route+0x1ba/0x210
    [  101.622415]  [<ffffffff8148d5a7>] ? xfrm_lookup+0x417/0x510
    [  101.622450]  [<ffffffff8127672a>] ? extract_buf+0x9a/0x140
    [  101.622485]  [<ffffffff8144c6a0>] ? __ip_flush_pending_frames+0x70/0x70
    [  101.622526]  [<ffffffff8146fbbf>] ? udp_sendmsg+0x62f/0x810
    [  101.622562]  [<ffffffff813f98a6>] ? sock_sendmsg+0x116/0x130
    [  101.622599]  [<ffffffff8109df58>] ? find_get_page+0x18/0x90
    [  101.622633]  [<ffffffff8109fd6a>] ? filemap_fault+0x12a/0x4b0
    [  101.622668]  [<ffffffff813fb5c4>] ? move_addr_to_kernel+0x64/0x90
    [  101.622706]  [<ffffffff81405d5a>] ? verify_iovec+0x7a/0xf0
    [  101.622739]  [<ffffffff813fc772>] ? sys_sendmsg+0x292/0x420
    [  101.622774]  [<ffffffff810b994a>] ? handle_pte_fault+0x8a/0x7c0
    [  101.622810]  [<ffffffff810b76fe>] ? __pte_alloc+0xae/0x130
    [  101.622844]  [<ffffffff810ba2f8>] ? handle_mm_fault+0x138/0x380
    [  101.622880]  [<ffffffff81024af9>] ? do_page_fault+0x189/0x410
    [  101.622915]  [<ffffffff813fbe03>] ? sys_getsockname+0xf3/0x110
    [  101.622952]  [<ffffffff81450c4d>] ? ip_setsockopt+0x4d/0xa0
    [  101.622986]  [<ffffffff813f9932>] ? sockfd_lookup_light+0x22/0x90
    [  101.623024]  [<ffffffff814b61fb>] ? system_call_fastpath+0x16/0x1b
    [  101.623060] Code:  Bad RIP value.
    [  101.623090] RIP  [<          (null)>]           (null)
    [  101.623125]  RSP <ffff88003ddeba60>
    [  101.623146] CR2: 0000000000000000
    [  101.650871] ---[ end trace ca3856a7d8e8dad4 ]---
    [  101.651011] __sk_free: optmem leakage (160 bytes) detected.
    
    The oops happens in dst_metrics_write_ptr()
    include/net/dst.h:124: return dst->ops->cow_metrics(dst, p);
    
    dst->ops->cow_metrics is NULL and causes the oops.
    
    Provide cow_metrics() methods, like we did in commit 214f45c91bb
    (net: provide default_advmss() methods to blackhole dst_ops)
    
    Signed-off-by: Held Bernhard <berny156 at gmx.de>
    Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 8c61d9d611cb5b290f1b4ac57c4631acfd6e3b5a
Author: Hans Petter Selasky <hselasky at c2i.net>
Date:   Sun Apr 24 22:35:19 2011 -0700

    cdc_ncm: fix short packet issue on some devices
    
    The default maximum transmit length for NCM USB frames should be so
    that a short packet happens at the end if the device supports a length
    greater than the defined maximum. This is achieved by adding 4 bytes
    to the maximum length so that the existing logic can fit a short
    packet there.
    
    Signed-off-by: Hans Petter Selasky <hselasky at c2i.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 9ac067a84efbc7f5570d4d93c3b303001d5e8b38
Merge: e39aece 953a12c
Author: David S. Miller <davem at davemloft.net>
Date:   Sun Apr 24 11:51:04 2011 -0700

    Merge branch 'davem.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6

commit 953a12cc2889d1be92e80a2d0bab5ffef4942300
Author: François Romieu <romieu at fr.zoreil.com>
Date:   Sun Apr 24 17:38:48 2011 +0200

    r8169: don't request firmware when there's no userspace.
    
    The firmware is cached during the first successfull call to open() and
    released once the network device is unregistered. The driver uses the
    cached firmware between open() and unregister_netdev().
    
    So far the firmware is optional : a failure to load the firmware does
    not prevent open() to success. It is thus necessary to 1) unregister
    all 816x / 810[23] devices and 2) force a driver probe to issue a new
    firmware load.
    
    Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
    Fixed-by: Ciprian Docan <docan at eden.rutgers.edu>
    Cc: Realtek linux nic maintainers <nic_swsd at realtek.com>

commit e39aece7d41119c3d63f390420e00ab4d2a526a9
Author: Vladislav Zolotarov <vladz at broadcom.com>
Date:   Sat Apr 23 07:44:46 2011 +0000

    bnx2x: fix UDP csum offload
    
    Fixed packets parameters for FW in UDP checksum offload flow.
    
    Do not dereference TCP headers on non TCP frames.
    Reported-by: Eric Dumazet <eric.dumazet at gmail.com>
    
    Signed-off-by: Dmitry Kravkov <dmitry at broadcom.com>
    Signed-off-by: Eilon Greenstein <eilong at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 13f172ff26563995049abe73f6eeba828de3c09d
Author: Neil Horman <nhorman at tuxdriver.com>
Date:   Fri Apr 22 08:10:59 2011 +0000

    netconsole: fix deadlock when removing net driver that netconsole is using (v2)
    
    A deadlock was reported to me recently that occured when netconsole was being
    used in a virtual guest.  If the virtio_net driver was removed while netconsole
    was setup to use an interface that was driven by that driver, the guest
    deadlocked.  No backtrace was provided because netconsole was the only console
    configured, but it became clear pretty quickly what the problem was.  In
    netconsole_netdev_event, if we get an unregister event, we call
    __netpoll_cleanup with the target_list_lock held and irqs disabled.
    __netpoll_cleanup can, if pending netpoll packets are waiting call
    cancel_delayed_work_sync, which is a sleeping path.  the might_sleep call in
    that path gets triggered, causing a console warning to be issued.  The
    netconsole write handler of course tries to take the target_list_lock again,
    which we already hold, causing deadlock.
    
    The fix is pretty striaghtforward.  Simply drop the target_list_lock and
    re-enable irqs prior to calling __netpoll_cleanup, the re-acquire the lock, and
    restart the loop.  Confirmed by myself to fix the problem reported.
    
    Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
    CC: "David S. Miller" <davem at davemloft.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 1ed3aad141fe595673c20225a9e004730088be52
Merge: f01cb5f 069f40f
Author: David S. Miller <davem at davemloft.net>
Date:   Fri Apr 22 13:21:38 2011 -0700

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit f01cb5fbea1c1613621f9f32f385e12c1a29dde0
Author: David S. Miller <davem at davemloft.net>
Date:   Thu Apr 21 21:17:25 2011 -0700

    Revert "bridge: Forward reserved group addresses if !STP"
    
    This reverts commit 1e253c3b8a1aeed51eef6fc366812f219b97de65.
    
    It breaks 802.3ad bonding inside of a bridge.
    
    The commit was meant to support transport bridging, and specifically
    virtual machines bridged to an ethernet interface connected to a
    switch port wiht 802.1x enabled.
    
    But this isn't the way to do it, it breaks too many other things.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit cb771838715b1c470bc5735bdae709b33b18e0ad
Author: Tim Gardner <timg at tpi.com>
Date:   Wed Apr 20 09:00:49 2011 +0000

    atl1c: Fix work event interrupt/task races
    
    The mechanism used to initiate work events from the interrupt
    handler has a classic read/modify/write race between the interrupt
    handler that sets the condition, and the worker task that reads and
    clears the condition. Close these races by using atomic
    bit fields.
    
    Cc: stable at kernel.org
    Cc: Jie Yang <jie.yang at atheros.com>
    Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit e74fbd030223e29d269f4be17e3dce6de38f4c28
Author: Ivan Vecera <ivecera at redhat.com>
Date:   Thu Apr 21 00:20:04 2011 +0000

    be2net: increment work_counter in be_worker
    
    The commit 609ff3b ("be2net: add code to display temperature of ASIC")
    adds support to display temperature of ASIC but there is missing
    increment of work_counter in be_worker. Because of this 1) the
    function be_cmd_get_die_temperature is called every 1 second instead
    of every 32 seconds 2) be_cmd_get_die_temperature is called, although
    it is not supported.  This patch fixes this bug.
    
    Signed-off-by: Ivan Vecera <ivecera at redhat.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit e965c05dabdabb85af0187952ccd75e43995c4b3
Author: Thomas Egerer <thomas.egerer at secunet.com>
Date:   Wed Apr 20 22:56:02 2011 +0000

    ipv6: Remove hoplimit initialization to -1
    
    The changes introduced with git-commit a02e4b7d ("ipv6: Demark default
    hoplimit as zero.") missed to remove the hoplimit initialization. As a
    result, ipv6_get_mtu interprets the return value of dst_metric_raw
    (-1) as 255 and answers ping6 with this hoplimit.  This patche removes
    the line such that ping6 is answered with the hoplimit value
    configured via sysctl.
    
    Signed-off-by: Thomas Egerer <thomas.egerer at secunet.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit e2a85aecebc03d165bc2dcd233deadd5dd97ea9f
Author: Andrea Galbusera <gizero at gmail.com>
Date:   Thu Apr 21 02:21:21 2011 +0000

    powerpc: Fix multicast problem in fs_enet driver
    
    mac-fec.c was setting individual UDP address registers instead of multicast
    group address registers when joining a multicast group.
    This prevented from correctly receiving UDP multicast packets.
    According to datasheet, replaced hash_table_high and hash_table_low
    with grp_hash_table_high and grp_hash_table_low respectively.
    Also renamed hash_table_* with grp_hash_table_* in struct fec declaration
    for 8xx: these registers are used only for multicast there.
    
    Tested on a MPC5121 based board.
    Build tested also against mpc866_ads_defconfig.
    
    Signed-off-by: Andrea Galbusera <gizero at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit a9cf73ea7ff78f52662c8658d93c226effbbedde
Author: Shan Wei <shanwei at cn.fujitsu.com>
Date:   Tue Apr 19 22:52:49 2011 +0000

    ipv6: udp: fix the wrong headroom check
    
    At this point, skb->data points to skb_transport_header.
    So, headroom check is wrong.
    
    For some case:bridge(UFO is on) + eth device(UFO is off),
    there is no enough headroom for IPv6 frag head.
    But headroom check is always false.
    
    This will bring about data be moved to there prior to skb->head,
    when adding IPv6 frag header to skb.
    
    Signed-off-by: Shan Wei <shanwei at cn.fujitsu.com>
    Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 069f40fc07f6df3da325e7ea1698a0d6247983d5
Author: Stanislaw Gruszka <sgruszka at redhat.com>
Date:   Wed Apr 20 16:01:46 2011 +0200

    iwl4965: fix skb usage after free
    
    Since
    
    commit a120e912eb51e347f36c71b60a1d13af74d30e83
    Author: Stanislaw Gruszka <sgruszka at redhat.com>
    Date:   Fri Feb 19 15:47:33 2010 -0800
    
        iwlwifi: sanity check before counting number of tfds can be free
    
    we use skb->data after calling ieee80211_tx_status_irqsafe(), which
    could free skb instantly.
    
    On current kernels I do not observe practical problems related with
    bug, but on 2.6.35.y it cause random system hangs when stressing
    wireless link, making bisection of other problems impossible.
    
    Signed-off-by: Stanislaw Gruszka <sgruszka at redhat.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit b25026981aecde3685dd0e45ad980fff9f528daa
Author: Stanislaw Gruszka <sgruszka at redhat.com>
Date:   Wed Apr 20 15:57:14 2011 +0200

    iwlwifi: fix skb usage after free
    
    Since
    
    commit a120e912eb51e347f36c71b60a1d13af74d30e83
    Author: Stanislaw Gruszka <sgruszka at redhat.com>
    Date:   Fri Feb 19 15:47:33 2010 -0800
    
        iwlwifi: sanity check before counting number of tfds can be free
    
    we use skb->data after calling ieee80211_tx_status_irqsafe(), which
    could free skb instantly.
    
    On current kernels I do not observe practical problems related with
    bug, but on 2.6.35.y it cause random system hangs when stressing
    wireless link.
    
    Cc: stable at kernel.org # 2.6.32+
    Signed-off-by: Stanislaw Gruszka <sgruszka at redhat.com>
    Acked-by: Wey-Yi Guy <wey-yi.w.guy at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 243e6df4ed919880d079d717641ad699c6530a03
Author: Johannes Berg <johannes.berg at intel.com>
Date:   Tue Apr 19 20:44:04 2011 +0200

    mac80211: fix SMPS debugfs locking
    
    The locking with SMPS requests means that the
    debugs file should lock the mgd mutex, not the
    iflist mutex. Calls to __ieee80211_request_smps()
    need to hold that mutex, so add an assertion.
    
    This has always been wrong, but for some reason
    never been noticed, probably because the locking
    error only happens while unassociated.
    
    Cc: stable at kernel.org [2.6.34+]
    Signed-off-by: Johannes Berg <johannes.berg at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 10e99777e926907e43fa57ec1208c3f7787fd290
Merge: 2232d31 a429b51
Author: John W. Linville <linville at tuxdriver.com>
Date:   Wed Apr 20 15:56:44 2011 -0400

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

commit 10022a6c66e199d8f61d9044543f38785713cbbd
Author: Oliver Hartkopp <socketcan at hartkopp.net>
Date:   Wed Apr 20 01:57:15 2011 +0000

    can: add missing socket check in can/raw release
    
    v2: added space after 'if' according code style.
    
    We can get here with a NULL socket argument passed from userspace,
    so we need to handle it accordingly.
    
    Thanks to Dave Jones pointing at this issue in net/can/bcm.c
    
    Signed-off-by: Oliver Hartkopp <socketcan at hartkopp.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 2430af8b7fa37ac0be102c77f9dc6ee669d24ba9
Author: Jiri Bohac <jbohac at suse.cz>
Date:   Tue Apr 19 02:09:55 2011 +0000

    bonding: 802.3ad - fix agg_device_up
    
    The slave member of struct aggregator does not necessarily point
    to a slave which is part of the aggregator. It points to the
    slave structure containing the aggregator structure, while
    completely different slaves (or no slaves at all) may be part of
    the aggregator.
    
    The agg_device_up() function wrongly uses agg->slave to find the state
    of the aggregator.  Use agg->lag_ports->slave instead. The bug has
    been introduced by commit 4cd6fe1c6483cde93e2ec91f58b7af9c9eea51ad
    ("bonding: fix link down handling in 802.3ad mode").
    
    Signed-off-by: Jiri Bohac <jbohac at suse.cz>
    Signed-off-by: Jay Vosburgh <fubar at us.ibm.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 6f4d6dc167a001267eeff18bdea0ce3e9108c662
Author: Breno Leitao <leitao at linux.vnet.ibm.com>
Date:   Tue Apr 19 09:39:22 2011 +0000

    ehea: Fix a DLPAR bug on ehea_rereg_mrs().
    
    We are currently continuing if ehea_restart_qps() fails, when we
    do a memory DLPAR (remove or add more memory to the system).
    
    This patch just let the NAPI disabled if the ehea_restart_qps()
    fails.
    
    Signed-off-by: Breno Leitao <leitao at linux.vnet.ibm.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c6914a6f261aca0c9f715f883a353ae7ff51fe83
Author: Dave Jones <davej at redhat.com>
Date:   Tue Apr 19 20:36:59 2011 -0700

    can: Add missing socket check in can/bcm release.
    
    We can get here with a NULL socket argument passed from userspace,
    so we need to handle it accordingly.
    
    Signed-off-by: Dave Jones <davej at redhat.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 2232d31bf18ba02f5cd632bbfc3466aeca394c75
Author: Felix Fietkau <nbd at openwrt.org>
Date:   Fri Apr 15 00:41:43 2011 +0200

    ath9k: fix the return value of ath_stoprecv
    
    The patch 'ath9k_hw: fix stopping rx DMA during resets' added code to detect
    a condition where rx DMA was stopped, but the MAC failed to enter the idle
    state. This condition requires a hardware reset, however the return value
    of ath_stoprecv was 'true' in that case, which allowed it to skip the reset
    when issuing a fast channel change.
    
    Signed-off-by: Felix Fietkau <nbd at openwrt.org>
    Reported-by: Paul Stewart <pstew at google.com>
    Cc: stable at kernel.org
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit a429b51930e64dd355840c37251a563000d7c10b
Author: Ruiyi Zhang <Ruiyi.zhang at atheros.com>
Date:   Mon Apr 18 11:04:30 2011 +0800

    Bluetooth: Only keeping SAR bits when retransmitting one frame.
    
    When retrasmitting one frame, only SAR bits in control field should
    be kept.
    
    Signed-off-by: Ruiyi Zhang <Ruiyi.zhang at atheros.com>
    Signed-off-by: Gustavo F. Padovan <padovan at profusion.mobi>

commit f21ca5fff6e548833fa5ee8867239a8378623150
Author: Luiz Augusto von Dentz <luiz.dentz-von at nokia.com>
Date:   Fri Apr 8 17:10:41 2011 +0300

    Bluetooth: fix shutdown on SCO sockets
    
    shutdown should wait for SCO link to be properly disconnected before
    detroying the socket, otherwise an application using the socket may
    assume link is properly disconnected before it really happens which
    can be a problem when e.g synchronizing profile switch.
    
    Signed-off-by: Luiz Augusto von Dentz <luiz.dentz-von at nokia.com>
    Signed-off-by: Gustavo F. Padovan <padovan at profusion.mobi>

commit b79f44c16a4e2181b1d6423afe746745d5e949ff
Author: Vinicius Costa Gomes <vinicius.gomes at openbossa.org>
Date:   Mon Apr 11 18:46:55 2011 -0300

    Bluetooth: Fix keeping the command timer running
    
    In the teardown path the reset command is sent to the controller,
    this event causes the command timer to be reactivated.
    
    So the timer is removed in two situations, when the adapter isn't
    marked as UP and when we know that some command has been sent.
    
    Reported-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Vinicius Costa Gomes <vinicius.gomes at openbossa.org>
    Signed-off-by: Gustavo F. Padovan <padovan at profusion.mobi>

commit 7a74aeb022b34a8fa8ef00545e66cf0568b5ddf6
Author: Ville Tervo <ville.tervo at nokia.com>
Date:   Thu Apr 7 14:59:50 2011 +0300

    Bluetooth: Fix refcount balance for hci connection
    
    hci_io_capa_reply_evt() holds reference for hciconnection. It's useless since
    hci_io_capa_request_evt()/hci_simple_pair_complete_evt() already protects the
    connection. In addition it leaves connection open after failed SSP pairing.
    
    Signed-off-by: Ville Tervo <ville.tervo at nokia.com>
    Signed-off-by: Gustavo F. Padovan <padovan at profusion.mobi>

commit 7caa2316bf0434f1150f58cb576542987a0466d7
Author: Daniel Halperin <dhalperi at cs.washington.edu>
Date:   Wed Apr 6 12:47:25 2011 -0700

    iwlwifi: fix frame injection for HT channels
    
    For some reason, sending QoS configuration causes transmission to stop
    after a single frame on HT channels when not associated. Removing the
    extra QoS configuration has no effect on station mode, and fixes
    injection mode.
    
    Signed-off-by: Daniel Halperin <dhalperi at cs.washington.edu>
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy at intel.com>

-----------------------------------------------------------------------

Summary of changes:
 MAINTAINERS                                  |    2 +-
 arch/powerpc/include/asm/8xx_immap.h         |    4 +-
 arch/x86/kernel/cpu/amd.c                    |    2 +-
 arch/x86/kernel/reboot_32.S                  |   12 ++--
 arch/x86/mm/numa_64.c                        |    2 +-
 arch/x86/xen/mmu.c                           |  125 +++++++++++++++++++++++++-
 drivers/input/touchscreen/wm831x-ts.c        |   75 +++++++++++++---
 drivers/mmc/core/bus.c                       |    1 +
 drivers/mmc/core/host.c                      |    9 +-
 drivers/mmc/host/omap.c                      |    2 +-
 drivers/mmc/host/sdhci-pci.c                 |    1 +
 drivers/mmc/host/sdhci.c                     |    9 ++-
 drivers/mmc/host/tmio_mmc_pio.c              |   10 +-
 drivers/net/amd8111e.c                       |    2 +-
 drivers/net/atl1c/atl1c.h                    |    6 +-
 drivers/net/atl1c/atl1c_main.c               |   14 +--
 drivers/net/benet/be_main.c                  |    1 +
 drivers/net/bnx2.c                           |    2 +
 drivers/net/bnx2x/bnx2x_cmn.c                |   34 +++++--
 drivers/net/bonding/bond_3ad.c               |    7 +-
 drivers/net/ehea/ehea_main.c                 |    9 ++-
 drivers/net/fs_enet/mac-fec.c                |    8 +-
 drivers/net/ftmac100.c                       |    8 +-
 drivers/net/mii.c                            |    4 +
 drivers/net/netconsole.c                     |    8 ++
 drivers/net/r8169.c                          |   99 +++++++++++++++------
 drivers/net/tg3.c                            |    8 ++-
 drivers/net/usb/cdc_ether.c                  |   14 +++-
 drivers/net/usb/cdc_ncm.c                    |    4 +-
 drivers/net/usb/smsc95xx.c                   |    2 +-
 drivers/net/usb/usbnet.c                     |    8 ++
 drivers/net/veth.c                           |   12 +++
 drivers/net/wireless/ath/ath9k/recv.c        |    2 +-
 drivers/net/wireless/b43/main.c              |    1 +
 drivers/net/wireless/iwlegacy/iwl-4965-tx.c  |   28 ++++--
 drivers/net/wireless/iwlegacy/iwl-led.c      |   20 ++++-
 drivers/net/wireless/iwlegacy/iwl4965-base.c |    8 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c  |    7 +--
 drivers/net/wireless/iwlwifi/iwl-agn-tx.c    |   27 ++++--
 include/linux/mfd/wm831x/pdata.h             |    2 +
 include/linux/mmc/host.h                     |    1 -
 include/linux/usb/usbnet.h                   |    1 +
 kernel/irq/proc.c                            |    2 +-
 net/bluetooth/hci_core.c                     |    5 +-
 net/bluetooth/hci_event.c                    |    2 -
 net/bluetooth/l2cap_core.c                   |    1 +
 net/bluetooth/sco.c                          |    9 ++
 net/bridge/br_input.c                        |    2 +-
 net/can/bcm.c                                |    7 ++-
 net/can/raw.c                                |    7 ++-
 net/core/dev.c                               |    6 +-
 net/dsa/Kconfig                              |    4 +-
 net/dsa/mv88e6131.c                          |   26 +++++-
 net/ipv4/devinet.c                           |    2 +-
 net/ipv4/fib_trie.c                          |    3 -
 net/ipv4/route.c                             |    7 ++
 net/ipv6/addrconf.c                          |    2 +-
 net/ipv6/esp6.c                              |    2 +-
 net/ipv6/route.c                             |    8 ++-
 net/ipv6/udp.c                               |    2 +-
 net/mac80211/cfg.c                           |    2 +
 net/mac80211/debugfs_netdev.c                |    4 +-
 net/unix/af_unix.c                           |   16 +++-
 net/xfrm/xfrm_replay.c                       |    2 +-
 net/xfrm/xfrm_user.c                         |    3 +
 65 files changed, 557 insertions(+), 168 deletions(-)


hooks/post-receive
-- 
TuxOnIce, tracking HEAD.


More information about the TuxOnIce-devel mailing list