{"shas":[["5c1e688388f629e8d8e88183b5ebc21e209252aa","c65a0fb7e74ffd2c9fc3a0f9aacb0f6a24b0a68b@kasperkp.dk","tg3: fix VLAN tagging regression\n\ncommit 92cd3a17ce9c719abb4c28dee3438e0c641f8de4\n    tg3: Simplify tx bd assignments\n\nbroke VLAN tagging on outbound packets.\nIt ifdef'ed BCM_KERNEL_SUPPORTS_8021Q, but this\nis not set anywhere. So vlan never gets set, and\nall packets are sent with vlan=0.\n\nv2: We can just remove the test. vlan_tx_tag_present\nis valid regardless of whether the 802.1q module\nis built.\n\nTested on BCM5721 rev 11.\n\nSigned-off-by: Kasper Pedersen <kernel@kasperkp.dk>\nSigned-off-by: David S. Miller <davem@davemloft.net>","Kasper Pedersen"],["b811ce9104a7f7663ddae4f7795a194a103b8f90","e6047e445db6578741afb14ef640164ef6b65e4f@intel.com","ixgbe: fix possible null buffer error\n\nIt seems that at least one PPC machine would occasionally give a (valid) 0 as\nthe return value from dma_map, this caused the ixgbe code to not work\ncorrectly.  A fix is pending in the PPC tree to not return 0 from dma map, but\nwe can also fix the driver to make sure we don't mess up in other arches as\nwell.\n\nThis patch is applicable to all current stable kernels.\n\nRef: https://bugzilla.redhat.com/show_bug.cgi?id=683611\n\nReported-by: Neil Horman <nhorman@redhat.com>\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\nCC: Alexander Duyck <alexander.h.duyck@intel.com>\nCC: stable@kernel.org\nTested-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>\nTested-by: Phil Schmitt <phillip.j.schmitt@intel.com>\nSigned-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>\nSigned-off-by: David S. Miller <davem@davemloft.net>","Jesse Brandeburg"],["d11bb4462c4cc6ddd45c6927c617ad79fa6fb8fc","209b351814c2aa2d43085ca51a9830225b84821b@cn.fujitsu.com","blk-cgroup: be able to remove the record of unplugged device\n\nThe bug is we're not able to remove the device from blkio cgroup's\nper-device control files if it gets unplugged.\n\nTo reproduce the bug:\n\n  # mount -t cgroup -o blkio xxx /cgroup\n  # cd /cgroup\n  # echo \"8:0 1000\" > blkio.throttle.read_bps_device\n  # unplug the device\n  # cat blkio.throttle.read_bps_device\n  8:0\t1000\n  # echo \"8:0 0\" > blkio.throttle.read_bps_device\n  -bash: echo: write error: No such device\n\nAfter patching, the device removal will succeed.\n\nThanks for the comments of Paul, Zefan, and Vivek.\n\nSigned-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>\nCc: Li Zefan <lizf@cn.fujitsu.com>\nCc: Paul Menage <paul@paulmenage.org>\nAcked-by: Vivek Goyal <vgoyal@redhat.com>\nCc: Jens Axboe <axboe@kernel.dk>\nCc: <stable@kernel.org>\nSigned-off-by: Andrew Morton <akpm@linux-foundation.org>\nSigned-off-by: Jens Axboe <axboe@kernel.dk>","Wanlong Gao"],["6c4867f6469964e34c5f4ee229a2a7f71a34c7ff","ba8663d9c5073e61af2259b99f112acc94146ce3@osadl.org","floppy: use del_timer_sync() in init cleanup\n\nWhen no floppy is found the module code can be released while a timer\nfunction is pending or about to be executed.\n\nCPU0                                  CPU1\n\t\t\t\t      floppy_init()\ntimer_softirq()\n   spin_lock_irq(&base->lock);\n   detach_timer();\n   spin_unlock_irq(&base->lock);\n   -> Interrupt\n\t\t\t\t\tdel_timer();\n\t\t\t\t        return -ENODEV;\n                                      module_cleanup();\n   <- EOI\n   call_timer_fn();\n   OOPS\n\nUse del_timer_sync() to prevent this.\n\nSigned-off-by: Carsten Emde <C.Emde@osadl.org>\nSigned-off-by: Thomas Gleixner <tglx@linutronix.de>\nCc: Jens Axboe <axboe@kernel.dk>\nCc: <stable@kernel.org>\nSigned-off-by: Andrew Morton <akpm@linux-foundation.org>\nSigned-off-by: Jens Axboe <axboe@kernel.dk>","Carsten Emde"],["561dac2d410ffac0b57a23b85ae0a623c1a076ca","7e9c653c8ec3abfdd967a0616fd143ca77e7b405@cn.fujitsu.com","fib:fix BUG_ON in fib_nl_newrule when add new fib rule\n\nadd new fib rule can cause BUG_ON happen\nthe reproduce shell is\nip rule add pref 38\nip rule add pref 38\nip rule add to 192.168.3.0/24 goto 38\nip rule del pref 38\nip rule add to 192.168.3.0/24 goto 38\nip rule add pref 38\n\nthen the BUG_ON will happen\ndel BUG_ON and use (ctarget == NULL) identify whether this rule is unresolved\n\nSigned-off-by: Gao feng <gaofeng@cn.fujitsu.com>\nSigned-off-by: Eric Dumazet <eric.dumazet@gmail.com>\nSigned-off-by: David S. Miller <davem@davemloft.net>","Gao feng"],["bcf66bf54aabffc150acd1c99e0f4bc51935eada","66deb1d63f85161cc287ce2bac0c65cb5ae958a7@secunet.com","xfrm: Perform a replay check after return from async codepaths\n\nWhen asyncronous crypto algorithms are used, there might be many\npackets that passed the xfrm replay check, but the replay advance\nfunction is not called yet for these packets. So the replay check\nfunction would accept a replay of all of these packets. Also the\nsystem might crash if there are more packets in async processing\nthan the size of the anti replay window, because the replay advance\nfunction would try to update the replay window beyond the bounds.\n\nThis pach adds a second replay check after resuming from the async\nprocessing to fix these issues.\n\nSigned-off-by: Steffen Klassert <steffen.klassert@secunet.com>\nAcked-by: Herbert Xu <herbert@gondor.apana.org.au>\nSigned-off-by: David S. Miller <davem@davemloft.net>","Steffen Klassert"],["eb4866d0066ffd5446751c102d64feb3318d8bd1","bfcdf3e6ca6cef45543bfbb57509c92aec9a39fb@linux.vnet.ibm.com","make /proc/$pid/numa_maps gather_stats() take variable page size\n\nWe need to teach the numa_maps code about transparent huge pages.  The\nfirst step is to teach gather_stats() that the pte it is dealing with\nmight represent more than one page.\n\nNote that will we use this in a moment for transparent huge pages since\nthey have use a single pmd_t which _acts_ as a \"surrogate\" for a bunch\nof smaller pte_t's.\n\nI'm a _bit_ unhappy that this interface counts in hugetlbfs page sizes\nfor hugetlbfs pages and PAGE_SIZE for normal pages.  That means that to\nfigure out how many _bytes_ \"dirty=1\" means, you must first know the\nhugetlbfs page size.  That's easier said than done especially if you\ndon't have visibility in to the mount.\n\nBut, that's probably a discussion for another day especially since it\nwould change behavior to fix it.  But, just in case anyone wonders why\nthis patch only passes a '1' in the hugetlb case...\n\nSigned-off-by: Dave Hansen <dave@linux.vnet.ibm.com>\nAcked-by: Hugh Dickins <hughd@google.com>\nAcked-by: David Rientjes <rientjes@google.com>\nSigned-off-by: Linus Torvalds <torvalds@linux-foundation.org>","Dave Hansen"],["3200a8aaab0c9ccdc0f59b0dac2d4a47029137fa","bfcdf3e6ca6cef45543bfbb57509c92aec9a39fb@linux.vnet.ibm.com","break out numa_maps gather_pte_stats() checks\n\ngather_pte_stats() does a number of checks on a target page\nto see whether it should even be considered for statistics.\nThis breaks that code out in to a separate function so that\nwe can use it in the transparent hugepage case in the next\npatch.\n\nSigned-off-by: Dave Hansen <dave@linux.vnet.ibm.com>\nAcked-by: Hugh Dickins <hughd@google.com>\nReviewed-by: Christoph Lameter <cl@gentwo.org>\nAcked-by: David Rientjes <rientjes@google.com>\nSigned-off-by: Linus Torvalds <torvalds@linux-foundation.org>","Dave Hansen"],["32ef43848f283e0ef945d3c67e851c143fea3970","bfcdf3e6ca6cef45543bfbb57509c92aec9a39fb@linux.vnet.ibm.com","teach /proc/$pid/numa_maps about transparent hugepages\n\nThis is modeled after the smaps code.\n\nIt detects transparent hugepages and then does a single gather_stats()\nfor the page as a whole.  This has two benifits:\n 1. It is more efficient since it does many pages in a single shot.\n 2. It does not have to break down the huge page.\n\nSigned-off-by: Dave Hansen <dave@linux.vnet.ibm.com>\nAcked-by: Hugh Dickins <hughd@google.com>\nAcked-by: David Rientjes <rientjes@google.com>\nSigned-off-by: Linus Torvalds <torvalds@linux-foundation.org>","Dave Hansen"],["808bf29b9195c52239b9aaeda7c6082a0ddf07c6","dace7423e438e9d50a283477134876fe17cd3341@sysgo.com","init: carefully handle loglevel option on kernel cmdline.\n\nWhen a malformed loglevel value (for example \"${abc}\") is passed on the\nkernel cmdline, the loglevel itself is being set to 0.\n\nThat then suppresses all following messages, including all the errors\nand crashes caused by other malformed cmdline options.  This could make\ndebugging process quite tricky.\n\nThis patch leaves the previous value of loglevel if the new value is\nincorrect and reports an error code in this case.\n\nSigned-off-by: Alexander Sverdlin <alexander.sverdlin@sysgo.com>\nSigned-off-by: Linus Torvalds <torvalds@linux-foundation.org>","Alexander Sverdlin"],["fed678dc8a8b839c8189b5d889a94e865cd327dd","69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org","Merge branch 'for-linus' of git://git.kernel.dk/linux-block\n\n* 'for-linus' of git://git.kernel.dk/linux-block:\n  floppy: use del_timer_sync() in init cleanup\n  blk-cgroup: be able to remove the record of unplugged device\n  block: Don't check QUEUE_FLAG_SAME_COMP in __blk_complete_request\n  mm: Add comment explaining task state setting in bdi_forker_thread()\n  mm: Cleanup clearing of BDI_pending bit in bdi_forker_thread()\n  block: simplify force plug flush code a little bit\n  block: change force plug flush call order\n  block: Fix queue_flag update when rq_affinity goes from 2 to 1\n  block: separate priority boosting from REQ_META\n  block: remove READ_META and WRITE_META\n  xen-blkback: fixed indentation and comments\n  xen-blkback: Don't disconnect backend until state switched to XenbusStateClosed.","Linus Torvalds"],["e5b26a88f13dfe3162acd50490c0c8504af81b26","69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org","Merge git://github.com/davem330/net\n\n* git://github.com/davem330/net: (27 commits)\n  xfrm: Perform a replay check after return from async codepaths\n  fib:fix BUG_ON in fib_nl_newrule when add new fib rule\n  ixgbe: fix possible null buffer error\n  tg3: fix VLAN tagging regression\n  net: pxa168: Fix build errors by including interrupt.h\n  netconsole: switch init_netconsole() to late_initcall\n  gianfar: Fix overflow check and return value for gfar_get_cls_all()\n  ppp_generic: fix multilink fragment MTU calculation (again)\n  GRETH: avoid overwrite IP-stack's IP-frags checksum\n  GRETH: RX/TX bytes were never increased\n  ipv6: fix a possible double free\n  b43: Fix beacon problem in ad-hoc mode\n  Bluetooth: add support for 2011 mac mini\n  Bluetooth: Add MacBookAir4,1 support\n  Bluetooth: Fixed BT ST Channel reg order\n  r8169: do not enable the TBI for anything but the original 8169.\n  r8169: remove erroneous processing of always set bit.\n  r8169: fix WOL setting for 8105 and 8111evl\n  r8169: add MODULE_FIRMWARE for the firmware of 8111evl\n  r8169: fix the reset setting for 8111evl\n  ...","Linus Torvalds"],["9c1f8594df4814ebfd6822ca3c9444fb3445888d","54c4a333fa12d5afeed41b942e93e34dc37c3466@tukaani.org","XZ: Fix incorrect XZ_BUF_ERROR\n\nxz_dec_run() could incorrectly return XZ_BUF_ERROR if all of the\nfollowing was true:\n\n - The caller knows how many bytes of output to expect and only provides\n   that much output space.\n\n - When the last output bytes are decoded, the caller-provided input\n   buffer ends right before the LZMA2 end of payload marker.  So LZMA2\n   won't provide more output anymore, but it won't know it yet and thus\n   won't return XZ_STREAM_END yet.\n\n - A BCJ filter is in use and it hasn't left any unfiltered bytes in the\n   temp buffer.  This can happen with any BCJ filter, but in practice\n   it's more likely with filters other than the x86 BCJ.\n\nThis fixes <https://bugzilla.redhat.com/show_bug.cgi?id=735408> where\nSquashfs thinks that a valid file system is corrupt.\n\nThis also fixes a similar bug in single-call mode where the uncompressed\nsize of a block using BCJ + LZMA2 was 0 bytes and caller provided no\noutput space.  Many empty .xz files don't contain any blocks and thus\ndon't trigger this bug.\n\nThis also tweaks a closely related detail: xz_dec_bcj_run() could call\nxz_dec_lzma2_run() to decode into temp buffer when it was known to be\nuseless.  This was harmless although it wasted a minuscule number of CPU\ncycles.\n\nSigned-off-by: Lasse Collin <lasse.collin@tukaani.org>\nCc: stable <stable@kernel.org>\nSigned-off-by: Linus Torvalds <torvalds@linux-foundation.org>","Lasse Collin"],["d93dc5c4478c1fd5de85a3e8aece9aad7bbae044","69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org","Linux 3.1-rc7","Linus Torvalds"]],"ref":"refs/heads/master","size":14,"head":"d93dc5c4478c1fd5de85a3e8aece9aad7bbae044","push_id":43565658}