)]}' { "log": [ { "commit": "e2f1f072db8db81e6b5bcbfcf409bb5c91dc9329", "tree": "a19138de5bf57a0dab684a44fc214cf1f2833846", "parents": [ "e4f67addf158f98f8197e08974966b18480dc751" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Mon Nov 19 22:41:45 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 20 13:43:28 2012 -0500" }, "message": "sit: allow to configure 6rd tunnels via netlink\n\nThis patch add the support of 6RD tunnels management via netlink.\nNote that netdev_state_change() is now called when 6RD parameters are updated.\n\n6RD parameters are updated only if there is at least one 6RD attribute.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e4f67addf158f98f8197e08974966b18480dc751", "tree": "01f1a199c7d875c89d3b8f4345ec3d0f03d0cbe7", "parents": [ "ff33c0e1885cda44dd14c79f70df4706f83582a0" ], "author": { "name": "David Stevens", "email": "dlstevens@us.ibm.com", "time": "Tue Nov 20 02:50:14 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 20 13:41:28 2012 -0500" }, "message": "add DOVE extensions for VXLAN\n\nThis patch provides extensions to VXLAN for supporting Distributed\nOverlay Virtual Ethernet (DOVE) networks. The patch includes:\n\n\t+ a dove flag per VXLAN device to enable DOVE extensions\n\t+ ARP reduction, whereby a bridge-connected VXLAN tunnel endpoint\n\t\tanswers ARP requests from the local bridge on behalf of\n\t\tremote DOVE clients\n\t+ route short-circuiting (aka L3 switching). Known destination IP\n\t\taddresses use the corresponding destination MAC address for\n\t\tswitching rather than going to a (possibly remote) router first.\n\t+ netlink notification messages for forwarding table and L3 switching\n\t\tmisses\n\nChanges since v2\n\t- combined bools into \"u32 flags\"\n\t- replaced loop with !is_zero_ether_addr()\n\nSigned-off-by: David L Stevens \u003cdlstevens@us.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "73f7ef435934e952c1d70d83d69921ea5d1f6bd4", "tree": "a5d0bbe5e1154eaec96f859507e90bae4b34d0b9", "parents": [ "d328b836823cd4a76611a45f52e208f8ce3d75d7" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri Nov 16 03:02:58 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 18 20:30:55 2012 -0500" }, "message": "sysctl: Pass useful parameters to sysctl permissions\n\n- Current is implicitly avaiable so passing current-\u003ensproxy isn\u0027t useful.\n- The ctl_table_header is needed to find how the sysctl table is connected\n to the rest of sysctl.\n- ctl_table_root is avaiable in the ctl_table_header so no need to it.\n\nWith these changes it becomes possible to write a version of\nnet_sysctl_permission that takes into account the network namespace of\nthe sysctl table, an important feature in extending the user namespace.\n\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nSigned-off-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d328b836823cd4a76611a45f52e208f8ce3d75d7", "tree": "73c874c9e1c5c328d198c15d79eff0ad4bbd52af", "parents": [ "2407dc25f741cf73853e0521ce9257531c9fc61d" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri Nov 16 03:02:57 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 18 20:30:55 2012 -0500" }, "message": "userns: make each net (net_ns) belong to a user_ns\n\nThe user namespace which creates a new network namespace owns that\nnamespace and all resources created in it. This way we can target\ncapability checks for privileged operations against network resources to\nthe user_ns which created the network namespace in which the resource\nlives. Privilege to the user namespace which owns the network\nnamespace, or any parent user namespace thereof, provides the same\nprivilege to the network resource.\n\nThis patch is reworked from a version originally by\nSerge E. Hallyn \u003cserge.hallyn@canonical.com\u003e\n\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2407dc25f741cf73853e0521ce9257531c9fc61d", "tree": "423a867f35d847b7870edefb7d86fe63290c4613", "parents": [ "75fe83c32248d99e6d5fe64155e519b78bb90481" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri Nov 16 03:02:56 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 18 20:30:55 2012 -0500" }, "message": "netns: Deduplicate and fix copy_net_ns when !CONFIG_NET_NS\n\nThe copy of copy_net_ns used when the network stack is not\nbuilt is broken as it does not return -EINVAL when attempting\nto create a new network namespace. We don\u0027t even have\na previous network namespace.\n\nSince we need a copy of copy_net_ns in net/net_namespace.h that is\navailable when the networking stack is not built at all move the\ncorrect version of copy_net_ns from net_namespace.c into net_namespace.h\nLeaving us with just 2 versions of copy_net_ns. One version for when\nwe compile in network namespace suport and another stub for all other\noccasions.\n\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "67f4efdce7d85282fbd5832cddc80a07eb89b6d6", "tree": "9a1771ef13b27abdf8cf172e5b7556ab93e5c48c", "parents": [ "c53aa5058ad5ca8876a47d6639ad4d4f2c5ed584", "f4a75d2eb7b1e2206094b901be09adb31ba63681" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 17 22:00:43 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 17 22:00:43 2012 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nMinor line offset auto-merges.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0cad3ff40486e341715cac3b5ef7b135fa0ba316", "tree": "937b8c6fc8b28f6e556212c9deee726799f1f783", "parents": [ "1d567e19cc9810a9bd67b1ccab54b68d86dadb76", "5576646f3c1abd60d72d19829de6f5d8c2ca8ecf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 16 15:26:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 16 15:26:38 2012 -0800" }, "message": "Merge branch \u0027akpm\u0027 (Fixes from Andrew)\n\nMerge misc fixes from Andrew Morton.\n\n* emailed patches from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (12 patches)\n revert \"mm: fix-up zone present pages\"\n tmpfs: change final i_blocks BUG to WARNING\n tmpfs: fix shmem_getpage_gfp() VM_BUG_ON\n mm: highmem: don\u0027t treat PKMAP_ADDR(LAST_PKMAP) as a highmem address\n mm: revert \"mm: vmscan: scale number of pages reclaimed by reclaim/compaction based on failures\"\n rapidio: fix kernel-doc warnings\n swapfile: fix name leak in swapoff\n memcg: fix hotplugged memory zone oops\n mips, arc: fix build failure\n memcg: oom: fix totalpages calculation for memory.swappiness\u003d\u003d0\n mm: fix build warning for uninitialized value\n mm: add anon_vma_lock to validate_mm()\n" }, { "commit": "5576646f3c1abd60d72d19829de6f5d8c2ca8ecf", "tree": "600e8d1df6536bbeb0b15b51f137d37a94f69843", "parents": [ "0f3c42f522dc1ad7e27affc0a4aa8c790bce0a66" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Fri Nov 16 14:15:06 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 16 14:33:04 2012 -0800" }, "message": "revert \"mm: fix-up zone present pages\"\n\nRevert commit 7f1290f2f2a4 (\"mm: fix-up zone present pages\")\n\nThat patch tried to fix a issue when calculating zone-\u003epresent_pages,\nbut it caused a regression on 32bit systems with HIGHMEM. With that\nchange, reset_zone_present_pages() resets all zone-\u003epresent_pages to\nzero, and fixup_zone_present_pages() is called to recalculate\nzone-\u003epresent_pages when the boot allocator frees core memory pages into\nbuddy allocator. Because highmem pages are not freed by bootmem\nallocator, all highmem zones\u0027 present_pages becomes zero.\n\nVarious options for improving the situation are being discussed but for\nnow, let\u0027s return to the 3.6 code.\n\nCc: Jianguo Wu \u003cwujianguo@huawei.com\u003e\nCc: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nCc: Petr Tesarik \u003cptesarik@suse.cz\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nTested-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2ca3cb50edc351875df13d083524f524cdeb3054", "tree": "41b01168f2fc8a532e60f90ad33de854090d38cc", "parents": [ "f58b59c1df3cb990d644018e1461cd4acd3c1700" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@infradead.org", "time": "Fri Nov 16 14:14:56 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 16 14:33:04 2012 -0800" }, "message": "rapidio: fix kernel-doc warnings\n\nFix rapidio kernel-doc warnings:\n\n Warning(drivers/rapidio/rio.c:415): No description found for parameter \u0027local\u0027\n Warning(drivers/rapidio/rio.c:415): Excess function parameter \u0027lstart\u0027 description in \u0027rio_map_inb_region\u0027\n Warning(include/linux/rio.h:290): No description found for parameter \u0027switches\u0027\n Warning(include/linux/rio.h:290): No description found for parameter \u0027destid_table\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@infradead.org\u003e\nCc: Matt Porter \u003cmporter@kernel.crashing.org\u003e\nAcked-by: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bea8c150a7efbc0f204e709b7274fe273f55e0d3", "tree": "fab695d7d18c5bbc9a42bccd793456826e392754", "parents": [ "18f694271b86ee279e88208550cc49fee206b544" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Fri Nov 16 14:14:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 16 14:33:04 2012 -0800" }, "message": "memcg: fix hotplugged memory zone oops\n\nWhen MEMCG is configured on (even when it\u0027s disabled by boot option),\nwhen adding or removing a page to/from its lru list, the zone pointer\nused for stats updates is nowadays taken from the struct lruvec. (On\nmany configurations, calculating zone from page is slower.)\n\nBut we have no code to update all the lruvecs (per zone, per memcg) when\na memory node is hotadded. Here\u0027s an extract from the oops which\nresults when running numactl to bind a program to a newly onlined node:\n\n BUG: unable to handle kernel NULL pointer dereference at 0000000000000f60\n IP: __mod_zone_page_state+0x9/0x60\n Pid: 1219, comm: numactl Not tainted 3.6.0-rc5+ #180 Bochs Bochs\n Process numactl (pid: 1219, threadinfo ffff880039abc000, task ffff8800383c4ce0)\n Call Trace:\n __pagevec_lru_add_fn+0xdf/0x140\n pagevec_lru_move_fn+0xb1/0x100\n __pagevec_lru_add+0x1c/0x30\n lru_add_drain_cpu+0xa3/0x130\n lru_add_drain+0x2f/0x40\n ...\n\nThe natural solution might be to use a memcg callback whenever memory is\nhotadded; but that solution has not been scoped out, and it happens that\nwe do have an easy location at which to update lruvec-\u003ezone. The lruvec\npointer is discovered either by mem_cgroup_zone_lruvec() or by\nmem_cgroup_page_lruvec(), and both of those do know the right zone.\n\nSo check and set lruvec-\u003ezone in those; and remove the inadequate\nattempt to set lruvec-\u003ezone from lruvec_init(), which is called before\nNODE_DATA(node) has been allocated in such cases.\n\nAh, there was one exceptionr. For no particularly good reason,\nmem_cgroup_force_empty_list() has its own code for deciding lruvec.\nChange it to use the standard mem_cgroup_zone_lruvec() and\nmem_cgroup_get_lru_size() too. In fact it was already safe against such\nan oops (the lru lists in danger could only be empty), but we\u0027re better\nproofed against future changes this way.\n\nI\u0027ve marked this for stable (3.6) since we introduced the problem in 3.5\n(now closed to stable); but I have no idea if this is the only fix\nneeded to get memory hotadd working with memcg in 3.6, and received no\nanswer when I enquired twice before.\n\nReported-by: Tang Chen \u003ctangchen@cn.fujitsu.com\u003e\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Wen Congyang \u003cwency@cn.fujitsu.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fa0cbbf145aabbf29c6f28f8a11935c0b0fd86fc", "tree": "fd2626b68b0f78afa128d7772c49f066e339bd3a", "parents": [ "f4bcd79c88d25508643084e6fed25920485db0eb" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Mon Nov 12 17:53:04 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 16 10:15:35 2012 -0800" }, "message": "mm, oom: reintroduce /proc/pid/oom_adj\n\nThis is mostly a revert of 01dc52ebdf47 (\"oom: remove deprecated oom_adj\")\nfrom Davidlohr Bueso.\n\nIt reintroduces /proc/pid/oom_adj for backwards compatibility with earlier\nkernels. It simply scales the value linearly when /proc/pid/oom_score_adj\nis written.\n\nThe major difference is that its scheduled removal is no longer included\nin Documentation/feature-removal-schedule.txt. We do warn users with a\nsingle printk, though, to suggest the more powerful and supported\n/proc/pid/oom_score_adj interface.\n\nReported-by: Artem S. Tashkinov \u003ct.artem@lycos.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f4bcd79c88d25508643084e6fed25920485db0eb", "tree": "f51f5c1761a4ab40b5c5b630852f070c61fe4d5a", "parents": [ "5a0c02ba1a3bcd0de9353767b5ee83d2c7d76227", "6658d6a5957662d0b9b2da8cc2466de2dad09a1a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 16 10:08:45 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 16 10:08:45 2012 -0800" }, "message": "Merge tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC fixes from Olof Johansson:\n \"We\u0027ve been sitting on this longer than we meant to due to travel and\n other activities, but the number of patches is luckily not that high.\n\n Biggest changes are from a batch of OMAP bugfixes, but there are a few\n for the broader set of SoCs too (bcm2835, pxa, highbank, tegra, at91\n and i.MX).\n\n The OMAP patches contain some fixes for MUSB/PHY on omap4 which ends\n up being a bit on the large side but needed for legacy (non-DT)\n platforms. Beyond that there are a handful of hwmod/pm changes.\n\n So, fairly noncontroversial stuff all in all, and as usual around this\n time the fixes are well targeted at specific problems.\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: imx: ehci: fix host power mask bit\n ARM i.MX: fix error-valued pointer dereference in clk_register_gate2()\n ARM: at91/usbh: fix overcurrent gpio setup\n ARM: at91/AT91SAM9G45: fix crypto peripherals irq issue due to sparse irq support\n ARM: boot: Fix usage of kecho\n ARM: OMAP: ocp2scp: create omap device for ocp2scp\n ARM: OMAP4: add _dev_attr_ to ocp2scp for representing usb_phy\n drivers: bus: ocp2scp: add pdata support\n irqchip: irq-bcm2835: Add terminating entry for of_device_id table\n ARM: highbank: retry wfi on reset request\n ARM: OMAP4: PM: fix regulator name for VDD_MPU\n ARM: OMAP4: hwmod data: do not enable or reset the McPDM during kernel init\n ARM: OMAP2+: hwmod: add flag to prevent hwmod code from touching IP block during init\n ARM: dt: tegra: fix length of pad control and mux registers\n ARM: OMAP: hwmod: wait for sysreset complete after enabling hwmod\n ARM: OMAP2+: clockdomain: Fix OMAP4 ISS clk domain to support only SWSUP\n ARM: pxa/spitz_pm: Fix hang when resuming from STR\n ARM: pxa: hx4700: Fix backlight PWM device number\n ARM: OMAP2+: PM: add missing newline to VC warning message\n" }, { "commit": "545b29019c8959c805abfe8194d47e989f1a6e5f", "tree": "120f88abf0b4b2317072579c667fddfccb930fe5", "parents": [ "130cd273d4a46a3011b1cc739f5d2af78779d666", "d3976a53ce1f4763cb910d047e8763e4c696e5f7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 16 12:42:43 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 16 12:42:43 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/nf-next\n\nConflicts:\n\tnet/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c\n\nMinor conflict due to some IS_ENABLED conversions done\nin net-next.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "57260e4088894de25bb1837d529708c3ec705a69", "tree": "e7072aed15b203197549099371db55c5d4bc3c0a", "parents": [ "2d4d07b97c0b774ea9ce2a2105818208d3df7241", "3d5e2abe6e265acc5e1fda810301243e9bac92b2" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Nov 16 16:42:59 2012 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Nov 16 16:42:59 2012 +0100" }, "message": "Merge tag \u0027imx-fixes-rc\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into fixes\n\nFrom Sascha Hauer \u003cs.hauer@pengutronix.de\u003e:\n\nARM i.MX fixes for 3.7-rc\n\n* tag \u0027imx-fixes-rc\u0027 of git://git.pengutronix.de/git/imx/linux-2.6:\n ARM: imx: ehci: fix host power mask bit\n ARM i.MX: fix error-valued pointer dereference in clk_register_gate2()\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "130cd273d4a46a3011b1cc739f5d2af78779d666", "tree": "508374445793be54ac9ee9a4d9b1bda24aa4beb5", "parents": [ "d4d0d3557b4d6ee735fbec275803d637ee26b42d" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Mon Nov 05 05:28:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 16 01:47:40 2012 -0500" }, "message": "ipv6: export IP6_RT_PRIO_* to userland\n\nThe kernel uses some default metric when routes are managed. For example, a\nstatic route added with a metric set to 0 is inserted in the kernel with\nmetric 1024 (IP6_RT_PRIO_USER).\nIt is useful for routing daemons to know these values, to be able to set routes\nwithout interfering with what the kernel does.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f191a1d17f227032c159e5499809f545402b6dc6", "tree": "48fc87a0b34bd2da06fedcd7e5e3ed6b08f7a3ac", "parents": [ "c6b641a4c6b32f39db678c2441cb1ef824110d74" ], "author": { "name": "Vlad Yasevich", "email": "vyasevic@redhat.com", "time": "Thu Nov 15 08:49:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 15 17:39:51 2012 -0500" }, "message": "net: Remove code duplication between offload structures\n\nMove the offload callbacks into its own structure.\n\nSigned-off-by: Vlad Yasevich \u003cvyasevic@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c6b641a4c6b32f39db678c2441cb1ef824110d74", "tree": "251c4f988a2aca2b9b031afe192f3ae4705d3692", "parents": [ "808a8f884554f93315f663b2694addb4a177c578" ], "author": { "name": "Vlad Yasevich", "email": "vyasevic@redhat.com", "time": "Thu Nov 15 08:49:22 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 15 17:39:24 2012 -0500" }, "message": "ipv6: Pull IPv6 GSO registration out of the module\n\nSing GSO support is now separate, pull it out of the module\nand make it its own init call.\nRemove the cleanup functions as they are no longer called.\n\nSigned-off-by: Vlad Yasevich \u003cvyasevic@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8663e02aba154e04679c9bb1665af52021d32547", "tree": "901900f79125e60134c2663b409c2d8170870dfb", "parents": [ "d1da932ed4ecad2a14cbcc01ed589d617d0f0f09" ], "author": { "name": "Vlad Yasevich", "email": "vyasevic@redhat.com", "time": "Thu Nov 15 08:49:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 15 17:36:18 2012 -0500" }, "message": "ipv6: Separate tcp offload functionality\n\nPull TCPv6 offload functionality into its won file in preparation\nfor moving it out of the module.\n\nSigned-off-by: Vlad Yasevich \u003cvyasevic@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3336288a9feaa809839adbaf05778dc2f16665dc", "tree": "f536f807902ea4268cc211054a1b234776f5f858", "parents": [ "bca49f843eac59cbb1ddd1f4a5d65fcc23b62efd" ], "author": { "name": "Vlad Yasevich", "email": "vyasevic@redhat.com", "time": "Thu Nov 15 08:49:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 15 17:36:17 2012 -0500" }, "message": "ipv6: Switch to using new offload infrastructure.\n\nSwitch IPv6 protocol to using the new GRO/GSO calls and data.\n\nSigned-off-by: Vlad Yasevich \u003cvyasevic@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bca49f843eac59cbb1ddd1f4a5d65fcc23b62efd", "tree": "b3b0e256222b968854154c90ab32bf42b640d1c5", "parents": [ "8ca896cfdd17f32f5aa2747644733ebf3725360d" ], "author": { "name": "Vlad Yasevich", "email": "vyasevic@redhat.com", "time": "Thu Nov 15 08:49:14 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 15 17:36:17 2012 -0500" }, "message": "ipv4: Switch to using the new offload infrastructure.\n\nSwitch IPv4 code base to using the new GRO/GSO calls and data.\n\nSigned-off-by: Vlad Yasevich \u003cvyasevic@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8ca896cfdd17f32f5aa2747644733ebf3725360d", "tree": "64a6ad61af635285a26a039f42bdc78ae8855979", "parents": [ "de27d001d187721de775ed9e0c485aa6f517c745" ], "author": { "name": "Vlad Yasevich", "email": "vyasevic@redhat.com", "time": "Thu Nov 15 08:49:13 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 15 17:36:17 2012 -0500" }, "message": "ipv6: Add new offload registration infrastructure.\n\nCreate a new data structure for IPv6 protocols that holds GRO/GSO\ncallbacks and a new array to track the protocols that register GRO/GSO.\n\nSigned-off-by: Vlad Yasevich \u003cvyasevic@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "de27d001d187721de775ed9e0c485aa6f517c745", "tree": "08947ffb402922f7384e61563d201761171fdbb1", "parents": [ "22061d8014455b01eb018bd6c35a1b3040ccc230" ], "author": { "name": "Vlad Yasevich", "email": "vyasevic@redhat.com", "time": "Thu Nov 15 08:49:12 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 15 17:36:17 2012 -0500" }, "message": "net: Add net protocol offload registration infrustructure\n\nCreate a new data structure for IPv4 protocols that holds GRO/GSO\ncallbacks and a new array to track the protocols that register GRO/GSO.\n\nSigned-off-by: Vlad Yasevich \u003cvyasevic@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22061d8014455b01eb018bd6c35a1b3040ccc230", "tree": "179242661e78e2621c02719cea9cf6e838f9b32a", "parents": [ "62532da9d5f47a7ced3b965aa73ffd5b1afbeb79" ], "author": { "name": "Vlad Yasevich", "email": "vyasevic@redhat.com", "time": "Thu Nov 15 08:49:11 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 15 17:36:17 2012 -0500" }, "message": "net: Switch to using the new packet offload infrustructure\n\nConvert to using the new GSO/GRO registration mechanism and new\npacket offload structure.\n\nSigned-off-by: Vlad Yasevich \u003cvyasevic@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "62532da9d5f47a7ced3b965aa73ffd5b1afbeb79", "tree": "520e8ca8c90116fb4f92db0c356474abed905c79", "parents": [ "efad0c14b720ec3791c95e0658c3990fbc124366" ], "author": { "name": "Vlad Yasevich", "email": "vyasevic@redhat.com", "time": "Thu Nov 15 08:49:10 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 15 17:36:16 2012 -0500" }, "message": "net: Add generic packet offload infrastructure.\n\nCreate a new data structure to contain the GRO/GSO callbacks and add\na new registration mechanism.\n\nSinged-off-by: Vlad Yasevich \u003cvyasevic@redhat.com\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "93532c8a4890871aa0d84dd91b80dad9f58542e0", "tree": "548718307a2cd396cd40c4d70157af5a8e3de6a2", "parents": [ "77b67063bb6bce6d475e910d3b886a606d0d91f7" ], "author": { "name": "Igor Mazanov", "email": "i.mazanov@gmail.com", "time": "Thu Nov 15 21:07:00 2012 +0400" }, "committer": { "name": "Mike Turquette", "email": "mturquette@linaro.org", "time": "Thu Nov 15 11:38:34 2012 -0800" }, "message": "clk: remove inline usage from clk-provider.h\n\nUsers of GCC 4.7 have reported compiler errors due to having inline\napplied to function declarations in clk-provider.h. The definitions\nexist in drivers/clk/clk.c. An example error:\n\nIn file included from arch/arm/mach-omap2/clockdomain.c:25:0:\narch/arm/mach-omap2/clockdomain.c: In function ‘clkdm_clk_disable’:\ninclude/linux/clk-provider.h:338:12: error: inlining failed in call to always_inline ‘__clk_get_enable_count’: function body not available\narch/arm/mach-omap2/clockdomain.c:1001:28: error: called from here\nmake[1]: *** [arch/arm/mach-omap2/clockdomain.o] Error 1\nmake: *** [arch/arm/mach-omap2] Error 2\n\nThis patch removes the use of inline from include/linux/clk-provider.h\nbut keeps the function definitions in drivers/clk/clk.c as inlined since\nthey are one-liners.\n\nSigned-off-by: Igor Mazanov \u003ci.mazanov@gmail.com\u003e\nAcked-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\nSigned-off-by: Mike Turquette \u003cmturquette@linaro.org\u003e\n[mturquette@linaro.org: improved subject, added changelog]\n" }, { "commit": "549985ee9c723fea8fd7759b5046fb8249896d50", "tree": "9207050df4ddd14cd94ab216dd5e006cba98d544", "parents": [ "1fb19aa730e400e474b562c55227849060549733" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Wed Nov 14 09:07:56 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 14 22:09:06 2012 -0500" }, "message": "cpsw: simplify the setup of the register pointers\n\nInstead of having a host of different register offsets in the device tree,\nthis patch simplifies the CPSW code by letting the driver set the proper\nregister offsets automatically, based on the CPSW version.\n\nSigned-off-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: Mugunthan V N \u003cmugunthanvnm@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b092d92a68ac4f88c637cc7ca6074646ca120193", "tree": "e2606a69dab1e3cb944512a53aa9733a788e4950", "parents": [ "0b3ba0553a9ef578dd289d9eed65cbd3b4823211", "5bdf502dd9c8fd60dddaabfb9a3dc1671302afd2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 14 22:06:57 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 14 22:06:57 2012 -0500" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next\n\nJohn W. Linville says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nIncluded is a Bluetooth pull -- Gustavo says:\n\n\"These are the Bluetooth bits for inclusion in 3.8, there is basically one big\nthing here which is the High Speed patches from Andrei, he did a lot of work on\nA2MP and management of AMP devices. The rest are mostly clean up and bug\nfixes.\"\n\nAlso included is an NFC pull -- Samuel says:\n\n\"With this one we have:\n\n- pn544 p2p support.\n- pn544 physical and HCI layers separation. We are getting the pn544 driver\n ready to support non i2c physical layers.\n- LLCP SNL (Service Name Lookup). This is the NFC p2p service discovery\n protocol.\n- LLCP datagram sockets (connection less) support.\n- IDR library usage for NFC devices indexes assignement.\n- NFC netlink extension for setting and getting LLCP link characteristics.\n- Various code style fixes and cleanups spread over the pn533, LLCP, HCI and\n pn544 code.\"\n\nThere are a couple of mac80211 pulls as well -- Johannes says:\n\n\"Please pull my mac80211-next tree to get the first round of new features\nfor 3.8. We have:\n * finally, the mac80211 multi-channel work\n * scan improvements:\n - bg scan\n - scan flush\n - forced AP scan\n * cfg80211 tracing\n * a bit of new code to allow implementing SAE (secure authentication of\n equals) in managed mode\n\nAlong with a few random improvements, features and fixes.\"\n\nand...\n\n\"Please pull from mac80211-next (per below pull request) to get a few\nupdates. Most important is probably the fix for the WDS regression that\nmy previous pull request introduced. Other than that, I have some\ntracing code, two mesh updates and a change to allow drivers to\ncalculate the AES CMAC subkeys without having to implement the GF_mulx\noperation themselves.\"\n\nOn top of that are the usual updates to iwlwifi, ath9k, rt2x00,\nbrcmfmac, mwifiex, and a few others here and there. Of note is the\naddition of the ar5523 driver, ported from an original FreeBSD driver.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3d567e0e291c4ffd041cf653aea3c38a1d5f4620", "tree": "254bcf81a4d14eae666ea18f05f19458f81bb372", "parents": [ "f37234160233561f2a2e3332272ae5b3725b620b" ], "author": { "name": "Nithin Nayak Sujir", "email": "nsujir@broadcom.com", "time": "Wed Nov 14 14:44:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 14 22:04:28 2012 -0500" }, "message": "tg3: Set 10_100_ONLY flag for additional 10/100 Mbps devices\n\n- Also refactor the conditional to use the existing tg3_pci_tbl array.\n- Set flags in the driver_data field of the pci_device_id structure to\nidentify these devices.\n- Add PCI_DEVICE_SUB() to pci.h to declare PCI 4-part IDs to match these\ndevices.\n\nSigned-off-by: Nithin Nayak Sujir \u003cnsujir@broadcom.com\u003e\nSigned-off-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "befe2aa1b2c7b9b7e20e97906f99b58475608867", "tree": "1d06510d521ee10652a90815bc5431d7f0c8bb1f", "parents": [ "c38cc4b599c2fe5815af4b0c6acac48e904977b4" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Wed Nov 14 05:14:02 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 14 22:02:38 2012 -0500" }, "message": "ipip/rtnl: add IFLA_IPTUN_PMTUDISC on dump\n\nThis parameter was missing in the dump.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cfa323b6b98f44ddf46cc987f74a23dcab697134", "tree": "b504ffdbbe3f351acc108a4d9f69d5fe6b42a8a3", "parents": [ "96800ee73c00e7c590be545cbe75e4a894985af0" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Wed Nov 14 05:13:58 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 14 22:02:37 2012 -0500" }, "message": "ip6tnl/rtnl: add IFLA_IPTUN_PROTO on dump\n\nIPv6 tunnels can have three mode: 4in6, 6in6 and xin6.\nThis information was missing in the netlink message.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1007dd1aa50b0403df370834f647abef1722925c", "tree": "cd36018c9fa1ae353e7e27f1080950d19d44eaa5", "parents": [ "a2e01a65cd7135dab26d27d4b589b2e5358bec99" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Nov 13 07:53:08 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 14 20:20:44 2012 -0500" }, "message": "bridge: add root port blocking\n\nThis is Linux bridge implementation of root port guard.\nIf BPDU is received from a leaf (edge) port, it should not\nbe elected as root port.\n\nWhy would you want to do this?\nIf using STP on a bridge and the downstream bridges are not fully\ntrusted; this prevents a hostile guest for rerouting traffic.\n\nWhy not just use netfilter?\nNetfilter does not track of follow spanning tree decisions.\nIt would be difficult and error prone to try and mirror STP\nresolution in netfilter module.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a2e01a65cd7135dab26d27d4b589b2e5358bec99", "tree": "3b51f10fa3e17cb734daba83b94d7466ac348a67", "parents": [ "cd7537326e617e71b5a84b205b755bc86bee8d06" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Nov 13 07:53:07 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 14 20:20:44 2012 -0500" }, "message": "bridge: implement BPDU blocking\n\nThis is Linux bridge implementation of STP protection\n(Cisco BPDU guard/Juniper BPDU block). BPDU block disables\nthe bridge port if a STP BPDU packet is received.\n\nWhy would you want to do this?\nIf running Spanning Tree on bridge, hostile devices on the network\nmay send BPDU and cause network failure. Enabling bpdu block\nwill detect and stop this.\n\nHow to recover the port?\nThe port will be restarted if link is brought down, or\nremoved and reattached. For example:\n # ip li set dev eth0 down; ip li set dev eth0 up\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "25c71c75ac87508528db053b818944f3650dd7a6", "tree": "6415de59be04019fa15a3e7cb2c53d1ecc930c48", "parents": [ "c75ea260400aaea8100caa012a0b1958ca094840" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Nov 13 07:53:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 14 20:20:44 2012 -0500" }, "message": "bridge: bridge port parameters over netlink\n\nExpose bridge port parameter over netlink. By switching to a nested\nmessage, this can be used for other bridge parameters.\n\nThis changes IFLA_PROTINFO attribute from one byte to a full nested\nset of attributes. This is safe for application interface because the\nold message used IFLA_PROTINFO and new one uses\n IFLA_PROTINFO | NLA_F_NESTED.\n\nThe code adapts to old format requests, and therefore stays\ncompatible with user mode RSTP daemon. Since the type field\nfor nested and unnested attributes are different, and the old\ncode in libnetlink doesn\u0027t do the mask, it is also safe to use\nwith old versions of bridge monitor command.\n\nNote: although mode is only a boolean, treating it as a\nfull byte since in the future someone will probably want to add more\nvalues (like macvlan has).\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e086cadc08e259150b2ab8f7f4a16dbf9e3c2f22", "tree": "38ef29e21c125dcb9f8fd75749416e4839c84469", "parents": [ "aa0010f880ab542da3ad0e72992f2dc518ac68a0" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Sun Nov 11 21:52:34 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 14 18:49:50 2012 -0500" }, "message": "net: unify for_each_ip_tunnel_rcu()\n\nThe defitions of for_each_ip_tunnel_rcu() are same,\nso unify it. Also, don\u0027t hide the parameter \u0027t\u0027.\n\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aa0010f880ab542da3ad0e72992f2dc518ac68a0", "tree": "fe030d13bb1fcbf6071b268f06c068e2a7a50b0e", "parents": [ "bf0098f22ca7b59e8844ac6882bbae230d34b98d" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Sun Nov 11 21:52:33 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 14 18:49:50 2012 -0500" }, "message": "net: convert __IPTUNNEL_XMIT() to an inline function\n\n__IPTUNNEL_XMIT() is an ugly macro, convert it to a static\ninline function, so make it more readable.\n\nIPTUNNEL_XMIT() is unused, just remove it.\n\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5bdf502dd9c8fd60dddaabfb9a3dc1671302afd2", "tree": "1547396386999c30cb6bd6768d1ba6dc1926ff2a", "parents": [ "bf0098f22ca7b59e8844ac6882bbae230d34b98d", "38141fcfaad34a388e61a7a7e98d521330e049d6" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Nov 14 13:33:43 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Nov 14 13:33:43 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n" }, { "commit": "5cb04436eef62aa8f5c482f8ec8deba391dea465", "tree": "068d69d9f28c14ae515c1a6a02bcfdc04093d248", "parents": [ "24a372cd0b87c15f8d98275d045326249155af55" ], "author": { "name": "Hannes Frederic Sowa", "email": "hannes@stressinduktion.org", "time": "Tue Nov 06 16:46:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 13 14:27:45 2012 -0500" }, "message": "ipv6: add knob to send unsolicited ND on link-layer address change\n\nThis patch introduces a new knob ndisc_notify. If enabled, the kernel\nwill transmit an unsolicited neighbour advertisement on link-layer address\nchange to update the neighbour tables of the corresponding hosts more quickly.\n\nThis is the equivalent to arp_notify in ipv4 world.\n\nSigned-off-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d4185bbf62a5d8d777ee445db1581beb17882a07", "tree": "024b0badbd7c970b1983be6d8c345cc4a290cb31", "parents": [ "c075b13098b399dc565b4d53f42047a8d40ed3ba", "a375413311b39005ef281bfd71ae8f4e3df22e97" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 10 18:32:51 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 10 18:32:51 2012 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c\n\nMinor conflict between the BCM_CNIC define removal in net-next\nand a bug fix added to net. Based upon a conflict resolution\npatch posted by Stephen Rothwell.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b251f0f399e275b027d6541cfbac1d2a3206b44a", "tree": "e56d5dd46ee3a8cd3063a9109fe8f53990714909", "parents": [ "2b1768f39aebfcccdc5b948eb4962918a5a64581", "a375413311b39005ef281bfd71ae8f4e3df22e97" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 10 22:03:49 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 10 22:03:49 2012 +0100" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n \"Bug fixes galore, mostly in drivers as is often the case:\n\n 1) USB gadget and cdc_eem drivers need adjustments to their frame size\n lengths in order to handle VLANs correctly. From Ian Coolidge.\n\n 2) TIPC and several network drivers erroneously call tasklet_disable\n before tasklet_kill, fix from Xiaotian Feng.\n\n 3) r8169 driver needs to apply the WOL suspend quirk to more chipsets,\n fix from Cyril Brulebois.\n\n 4) Fix multicast filters on RTL_GIGA_MAC_VER_35 r8169 chips, from\n Nathan Walp.\n\n 5) FDB netlink dumps should use RTM_NEWNEIGH as the message type, not\n zero. From John Fastabend.\n\n 6) Fix smsc95xx tx checksum offload on big-endian, from Steve\n Glendinning.\n\n 7) __inet_diag_dump() needs to repsect and report the error value\n returned from inet_diag_lock_handler() rather than ignore it.\n Otherwise if an inet diag handler is not available for a particular\n protocol, we essentially report success instead of giving an error\n indication. Fix from Cyrill Gorcunov.\n\n 8) When the QFQ packet scheduler sees TSO/GSO packets it does not\n handle things properly, and in fact ends up corrupting it\u0027s\n datastructures as well as mis-schedule packets. Fix from Paolo\n Valente.\n\n 9) Fix oopser in skb_loop_sk(), from Eric Leblond.\n\n 10) CXGB4 passes partially uninitialized datastructures in to FW\n commands, fix from Vipul Pandya.\n\n 11) When we send unsolicited ipv6 neighbour advertisements, we should\n send them to the link-local allnodes multicast address, as per\n RFC4861. Fix from Hannes Frederic Sowa.\n\n 12) There is some kind of bug in the usbnet\u0027s kevent deferral\n mechanism, but more immediately when it triggers an uncontrolled\n stream of kernel messages spam the log. Rate limit the error log\n message triggered when this problem occurs, as sending thousands\n of error messages into the kernel log doesn\u0027t help matters at all,\n and in fact makes further diagnosis more difficult.\n\n From Steve Glendinning.\n\n 13) Fix gianfar restore from hibernation, from Wang Dongsheng.\n\n 14) The netlink message attribute sizes are wrong in the ipv6 GRE\n driver, it was using the size of ipv4 addresses instead of ipv6\n ones :-) Fix from Nicolas Dichtel.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:\n gre6: fix rtnl dump messages\n gianfar: ethernet vanishes after restoring from hibernation\n usbnet: ratelimit kevent may have been dropped warnings\n ipv6: send unsolicited neighbour advertisements to all-nodes\n net: usb: cdc_eem: Fix rx skb allocation for 802.1Q VLANs\n usb: gadget: g_ether: fix frame size check for 802.1Q\n cxgb4: Fix initialization of SGE_CONTROL register\n isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES\n cxgb4: Initialize data structures before using.\n af-packet: fix oops when socket is not present\n pkt_sched: enable QFQ to support TSO/GSO\n net: inet_diag -- Return error code if protocol handler is missed\n net: bnx2x: Fix typo in bnx2x driver\n smsc95xx: fix tx checksum offload for big endian\n rtnetlink: Use nlmsg type RTM_NEWNEIGH from dflt fdb dump\n ptp: update adjfreq callback description\n r8169: allow multicast packets on sub-8168f chipset.\n r8169: Fix WoL on RTL8168d/8111d.\n drivers/net: use tasklet_kill in device remove/close process\n tipc: do not use tasklet_disable before tasklet_kill\n" }, { "commit": "2b1768f39aebfcccdc5b948eb4962918a5a64581", "tree": "f92c98ef10cf1ded4985050589413946aa8f0e6c", "parents": [ "affd9a8dbc22beadae1186aa060685d6f6a06792", "226f7cea949303a3e1911999a9a2c71b0a708e73" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 10 21:58:34 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 10 21:58:34 2012 +0100" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc\n\nPull sparc fixes from David Miller:\n \"Several build/bug fixes for sparc, including:\n\n 1) Configuring a mix of static vs. modular sparc64 crypto modules\n didn\u0027t work, remove an ill-conceived attempt to only have to build\n the device match table for these drivers once to fix the problem.\n\n Reported by Meelis Roos.\n\n 2) Make the montgomery multiple/square and mpmul instructions actually\n usable in 32-bit tasks. Essentially this involves providing 32-bit\n userspace with a way to use a 64-bit stack when it needs to.\n\n 3) Our sparc64 atomic backoffs don\u0027t yield cpu strands properly on\n Niagara chips. Use pause instruction when available to achieve\n this, otherwise use a benign instruction we know blocks the strand\n for some time.\n\n 4) Wire up kcmp\n\n 5) Fix the build of various drivers by removing the unnecessary\n blocking of OF_GPIO when SPARC.\n\n 6) Fix unintended regression wherein of_address_to_resource stopped\n being provided. Fix from Andreas Larsson.\n\n 7) Fix NULL dereference in leon_handle_ext_irq(), also from Andreas\n Larsson.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:\n sparc64: Fix build with mix of modular vs. non-modular crypto drivers.\n sparc: Support atomic64_dec_if_positive properly.\n of/address: sparc: Declare of_address_to_resource() as an extern function for sparc again\n sparc32, leon: Check for existent irq_map entry in leon_handle_ext_irq\n sparc: Add sparc support for platform_get_irq()\n sparc: Allow OF_GPIO on sparc.\n qlogicpti: Fix build warning.\n sparc: Wire up sys_kcmp.\n sparc64: Improvde documentation and readability of atomic backoff code.\n sparc64: Use pause instruction when available.\n sparc64: Fix cpu strand yielding.\n sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads.\n" }, { "commit": "0020dd0b8c03c55a15c5bf372082be4a54d84622", "tree": "78f920d0dd8622194bab7ebfd39e904c6eb46207", "parents": [ "a1c2d60889d633ffecfa9f1f7ac0bdb474b7484e", "ab277bbf662ef17ffb7fd8dd7a462a34e326e492" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 10 06:56:21 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 10 06:56:21 2012 +0100" }, "message": "Merge tag \u0027stable/for-linus-3.7-rc5-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\nPull Xen fixes from Konrad Rzeszutek Wilk:\n \"There are three ARM compile fixes (we forgot to export certain\n functions and if the drivers are built as an module - we go belly-up).\n\n There is also an mismatch of irq_enter() / exit_idle() calls sequence\n which were fixed some time ago in other piece of codes, but failed to\n appear in the Xen code.\n\n Lastly a fix for to help in the field with troubleshooting in case we\n cannot get the appropriate parameter and also fallback code when\n working with very old hypervisors.\"\n\nBug-fixes:\n - Fix compile issues on ARM.\n - Fix hypercall fallback code for old hypervisors.\n - Print out which HVM parameter failed if it fails.\n - Fix idle notifier call after irq_enter.\n\n* tag \u0027stable/for-linus-3.7-rc5-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen/arm: Fix compile errors when drivers are compiled as modules (export more).\n xen/arm: Fix compile errors when drivers are compiled as modules.\n xen/generic: Disable fallback build on ARM.\n xen/events: fix RCU warning, or Call idle notifier after irq_enter()\n xen/hvm: If we fail to fetch an HVM parameter print out which flag it is.\n xen/hypercall: fix hypercall fallback code for very old hypervisors\n" }, { "commit": "c075b13098b399dc565b4d53f42047a8d40ed3ba", "tree": "e7d443ab220da2f1e9f5d48373bc50754a70ce5d", "parents": [ "ba3e3f50a0e5de76fc0684d856394931f2bc39fa" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Fri Nov 09 06:10:01 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 09 19:36:20 2012 -0500" }, "message": "ip6tnl: advertise tunnel param via rtnl\n\nIt is usefull for daemons that monitor link event to have the full parameters of\nthese interfaces when a rtnl message is sent.\nIt allows also to dump them via rtnetlink.\n\nIt is based on what is done for GRE tunnels.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0974658da47cb399b76794057823bf3cd22acf37", "tree": "9db7dbe10459d9c7de24d3afd7ba6a82fe9fef33", "parents": [ "465b1678ebdf5dbd9bc0502358ae472343351c2c" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Fri Nov 09 06:09:59 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 09 19:36:20 2012 -0500" }, "message": "ipip: advertise tunnel param via rtnl\n\nIt is usefull for daemons that monitor link event to have the full parameters of\nthese interfaces when a rtnl message is sent.\nIt allows also to dump them via rtnetlink.\n\nIt is based on what is done for GRE tunnels.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0bce04be442cf4d6e4ba9dac2f0a4c5ee88af5c5", "tree": "97c771cc2cafbad347b0ef71eafd957ca06357a9", "parents": [ "20424d85f8a07090fd32c6fad343f91b63c730b0" ], "author": { "name": "Andreas Larsson", "email": "andreas@gaisler.com", "time": "Tue Nov 06 00:12:03 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 09 16:30:50 2012 -0800" }, "message": "of/address: sparc: Declare of_address_to_resource() as an extern function for sparc again\n\nThis bug-fix makes sure that of_address_to_resource is defined extern for sparc\nso that the sparc-specific implementation of of_address_to_resource() is once\nagain used when including include/linux/of_address.h in a sparc context. A\nnumber of drivers in mainline relies on this function working for sparc.\n\nThe bug was introduced in a850a7554442f08d3e910c6eeb4ee216868dda1e, \"of/address:\nadd empty static inlines for !CONFIG_OF\". Contrary to that commit title, the\nstatic inlines are added for !CONFIG_OF_ADDRESS, and CONFIG_OF_ADDRESS is never\ndefined for sparc. This is good behavior for the other functions in\ninclude/linux/of_address.h, as the extern functions defined in\ndrivers/of/address.c only gets linked when OF_ADDRESS is configured. However,\nfor of_address_to_resource there exists a sparc-specific implementation in\narch/sparc/arch/sparc/kernel/of_device_common.c\n\nSolution suggested by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n\nSigned-off-by: Andreas Larsson \u003candreas@gaisler.com\u003e\nAcked-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c48c8d51c29efba160a1b27555d97f6ee0d049a6", "tree": "9ca7974ddca9a91bc300ff46d6058818c362ce59", "parents": [ "d77807230e1ef30dbdee85aa24d27073a14dd168" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Nov 07 02:37:24 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 09 16:28:37 2012 -0500" }, "message": "Fix the wanxl firmware to include missing constants\n\nFix the wanxl firmware to include missing constants such as PARITY_NONE. It\nshould be #including the linux/hdlc/ioctl.h header.\n\nTo make this work, we also have to guard parts of ioctl.h with !__ASSEMBLY__.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d77807230e1ef30dbdee85aa24d27073a14dd168", "tree": "0e8b34dfba6998d885327571f1bc83cb50e0383a", "parents": [ "bdd4f8cbd2c9b9dc7e51c668fd9043ac0af4243d" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Nov 07 02:37:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 09 16:27:51 2012 -0500" }, "message": "UAPI: (Scripted) Disintegrate include/linux/hdlc\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\nAcked-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nAcked-by: Dave Jones \u003cdavej@redhat.com\u003e\nAcked-by: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a4275153cc77b726b9a0595d56e216158a4c4167", "tree": "b8f287c20209f033de659d8ce75ec0ae16208c07", "parents": [ "9ca72adc1818d6e8d5f76baef71889be14ac4cd4", "0aa55c2367f082876f92660312214cd20c6a024b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 09 21:32:33 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 09 21:32:33 2012 +0100" }, "message": "Merge tag \u0027mmc-fixes-for-3.7-rc5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\nPull MMC fixes from Chris Ball:\n - sdhci: fix a NULL dereference at resume-time, seen on OLPC XO-4\n - sdhci: fix against 3.7-rc1 for UHS modes without a vqmmc regulator\n - sdhci-of-esdhc: disable CMD23 on boards where it\u0027s broken\n - sdhci-s3c: fix against 3.7-rc1 for card detection with runtime PM\n - dw_mmc, omap_hsmmc: fix potential NULL derefs, compiler warnings\n\n* tag \u0027mmc-fixes-for-3.7-rc5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n mmc: sdhci-s3c: fix the card detection in runtime-pm\n mmc: sdhci-s3c: use clk_prepare_enable and clk_disable_unprepare\n mmc: dw_mmc: constify dw_mci_idmac_ops in exynos back-end\n mmc: dw_mmc: fix modular build for exynos back-end\n mmc: sdhci: fix NULL dereference in sdhci_request() tuning\n mmc: sdhci: fix IS_ERR() checking of regulator_get()\n mmc: fix sdhci-dove probe/removal\n mmc: sh_mmcif: fix use after free\n mmc: sdhci-pci: fix \u0027Invalid iomem size\u0027 error message condition\n mmc: mxcmmc: Fix MODULE_ALIAS\n mmc: omap_hsmmc: fix NULL pointer dereference for dt boot\n mmc: omap_hsmmc: fix host reference after mmc_free_host\n mmc: dw_mmc: fix multiple drv_data NULL dereferences\n mmc: dw_mmc: enable controller interrupt before calling mmc_start_host\n mmc: sdhci-of-esdhc: disable CMD23 for some Freescale SoCs\n mmc: dw_mmc: remove _dev_info compile warning\n mmc: dw_mmc: convert the variable type of irq\n" }, { "commit": "a80a6b85b428e6ce12a8363bb1f08d44c50f3252", "tree": "250a57516ef79c94119b27ceeab4ef7d3360e6c3", "parents": [ "c24f9f195edf8c7f78eff1081cdadd26bd272ee3" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Thu Nov 08 15:53:35 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 09 06:41:46 2012 +0100" }, "message": "revert \"epoll: support for disabling items, and a self-test app\"\n\nRevert commit 03a7beb55b9f (\"epoll: support for disabling items, and a\nself-test app\") pending resolution of the issues identified by Michael\nKerrisk, copied below.\n\nWe\u0027ll revisit this for 3.8.\n\n: I\u0027ve taken a look at this patch as it currently stands in 3.7-rc1, and\n: done a bit of testing. (By the way, the test program\n: tools/testing/selftests/epoll/test_epoll.c does not compile...)\n:\n: There are one or two places where the behavior seems a little strange,\n: so I have a question or two at the end of this mail. But other than\n: that, I want to check my understanding so that the interface can be\n: correctly documented.\n:\n: Just to go though my understanding, the problem is the following\n: scenario in a multithreaded application:\n:\n: 1. Multiple threads are performing epoll_wait() operations,\n: and maintaining a user-space cache that contains information\n: corresponding to each file descriptor being monitored by\n: epoll_wait().\n:\n: 2. At some point, a thread wants to delete (EPOLL_CTL_DEL)\n: a file descriptor from the epoll interest list, and\n: delete the corresponding record from the user-space cache.\n:\n: 3. The problem with (2) is that some other thread may have\n: previously done an epoll_wait() that retrieved information\n: about the fd in question, and may be in the middle of using\n: information in the cache that relates to that fd. Thus,\n: there is a potential race.\n:\n: 4. The race can\u0027t solved purely in user space, because doing\n: so would require applying a mutex across the epoll_wait()\n: call, which would of course blow thread concurrency.\n:\n: Right?\n:\n: Your solution is the EPOLL_CTL_DISABLE operation. I want to\n: confirm my understanding about how to use this flag, since\n: the description that has accompanied the patches so far\n: has been a bit sparse\n:\n: 0. In the scenario you\u0027re concerned about, deleting a file\n: descriptor means (safely) doing the following:\n: (a) Deleting the file descriptor from the epoll interest list\n: using EPOLL_CTL_DEL\n: (b) Deleting the corresponding record in the user-space cache\n:\n: 1. It\u0027s only meaningful to use this EPOLL_CTL_DISABLE in\n: conjunction with EPOLLONESHOT.\n:\n: 2. Using EPOLL_CTL_DISABLE without using EPOLLONESHOT in\n: conjunction is a logical error.\n:\n: 3. The correct way to code multithreaded applications using\n: EPOLL_CTL_DISABLE and EPOLLONESHOT is as follows:\n:\n: a. All EPOLL_CTL_ADD and EPOLL_CTL_MOD operations should\n: should EPOLLONESHOT.\n:\n: b. When a thread wants to delete a file descriptor, it\n: should do the following:\n:\n: [1] Call epoll_ctl(EPOLL_CTL_DISABLE)\n: [2] If the return status from epoll_ctl(EPOLL_CTL_DISABLE)\n: was zero, then the file descriptor can be safely\n: deleted by the thread that made this call.\n: [3] If the epoll_ctl(EPOLL_CTL_DISABLE) fails with EBUSY,\n: then the descriptor is in use. In this case, the calling\n: thread should set a flag in the user-space cache to\n: indicate that the thread that is using the descriptor\n: should perform the deletion operation.\n:\n: Is all of the above correct?\n:\n: The implementation depends on checking on whether\n: (events \u0026 ~EP_PRIVATE_BITS) \u003d\u003d 0\n: This replies on the fact that EPOLL_CTL_AD and EPOLL_CTL_MOD always\n: set EPOLLHUP and EPOLLERR in the \u0027events\u0027 mask, and EPOLLONESHOT\n: causes those flags (as well as all others in ~EP_PRIVATE_BITS) to be\n: cleared.\n:\n: A corollary to the previous paragraph is that using EPOLL_CTL_DISABLE\n: is only useful in conjunction with EPOLLONESHOT. However, as things\n: stand, one can use EPOLL_CTL_DISABLE on a file descriptor that does\n: not have EPOLLONESHOT set in \u0027events\u0027 This results in the following\n: (slightly surprising) behavior:\n:\n: (a) The first call to epoll_ctl(EPOLL_CTL_DISABLE) returns 0\n: (the indicator that the file descriptor can be safely deleted).\n: (b) The next call to epoll_ctl(EPOLL_CTL_DISABLE) fails with EBUSY.\n:\n: This doesn\u0027t seem particularly useful, and in fact is probably an\n: indication that the user made a logic error: they should only be using\n: epoll_ctl(EPOLL_CTL_DISABLE) on a file descriptor for which\n: EPOLLONESHOT was set in \u0027events\u0027. If that is correct, then would it\n: not make sense to return an error to user space for this case?\n\nCc: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\nCc: \"Paton J. Lewis\" \u003cpalewis@adobe.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a4477c4ddb5d3552b4d204f49047bdbb097c4450", "tree": "0506bf5d24cc197cb43e3cab8109171e655d4196", "parents": [ "f1e0b5b4f1eae56a3192688177f36e2bdf0e01ac" ], "author": { "name": "Li RongQing", "email": "roy.qing.li@gmail.com", "time": "Wed Nov 07 21:56:33 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 08 21:16:08 2012 -0500" }, "message": "ipv6: remove rt6i_peer_genid from rt6_info and its handler\n\n6431cbc25f(Create a mechanism for upward inetpeer propagation into routes)\nintroduces these codes, but this mechanism is never enabled since\nrt6i_peer_genid always is zero whether it is not assigned or assigned by\nrt6_peer_genid(). After 5943634fc5 (ipv4: Maintain redirect and PMTU info\nin struct rtable again), the ipv4 related codes of this mechanism has been\nremoved, I think we maybe able to remove them now.\n\nSigned-off-by: Li RongQing \u003croy.qing.li@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5920cd3a41f1aefc30e9ce86384fc2fe9f5fe0c0", "tree": "cecc965a19e1ffe6957d8dcf2e55566562f93e0c", "parents": [ "7da716aee2532399e213a14f656d304098f67a11" ], "author": { "name": "Paul Chavent", "email": "Paul.Chavent@onera.fr", "time": "Tue Nov 06 23:10:47 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 07 18:54:30 2012 -0500" }, "message": "packet: tx_ring: allow the user to choose tx data offset\n\nThe tx data offset of packet mmap tx ring used to be :\n(TPACKET2_HDRLEN - sizeof(struct sockaddr_ll))\n\nThe problem is that, with SOCK_RAW socket, the payload (14 bytes after\nthe beginning of the user data) is misaligned.\n\nThis patch allows to let the user gives an offset for it\u0027s tx data if\nhe desires.\n\nSet sock option PACKET_TX_HAS_OFF to 1, then specify in each frame of\nyour tx ring tp_net for SOCK_DGRAM, or tp_mac for SOCK_RAW.\n\nSigned-off-by: Paul Chavent \u003cpaul.chavent@onera.fr\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8e2b36ea6e3abc613cbbdb41692fbd2f9ee18996", "tree": "b1d0ea90512b95b4b282081c134f275c11a6d425", "parents": [ "517cb9f1bb0afd38bebe9b0af1b524b8a65afdb4" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Nov 06 22:55:31 2012 +0100" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Wed Nov 07 15:02:55 2012 -0500" }, "message": "mmc: dw_mmc: constify dw_mci_idmac_ops in exynos back-end\n\nThe of_device_id match data is now marked as const and\nmust not be modified. This changes the dw_mmc to mark\nall pointers passing the dw_mci_drv_data or dw_mci_dma_ops\nstructures as const, and also marks the static definitions\nas const.\n\ndrivers/mmc/host/dw_mmc-exynos.c: In function \u0027dw_mci_exynos_probe\u0027:\ndrivers/mmc/host/dw_mmc-exynos.c:234:11: warning: assignment discards \u0027const\u0027 qualifier from pointer target type [enabled by default]\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nCc: Will Newton \u003cwill.newton@imgtec.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "63ef5d8c28b2a944f104d854254941e7375c85a3", "tree": "f4102bfc4ab13f0ec07d28a635170373160e522d", "parents": [ "00956ea360c3825ac9fd337758e07e193f66d1d9" ], "author": { "name": "Jerry Huang", "email": "Chang-Ming.Huang@freescale.com", "time": "Thu Oct 25 13:47:19 2012 +0800" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Wed Nov 07 14:55:29 2012 -0500" }, "message": "mmc: sdhci-of-esdhc: disable CMD23 for some Freescale SoCs\n\nCMD23 causes lots of errors in kernel on some freescale SoCs\n(P1020, P1021, P1022, P1024, P1025 and P4080) when MMC card used,\nwhich is because these controllers does not support CMD23,\neven on the SoCs which declares CMD23 is supported.\nTherefore, we\u0027ll not use CMD23.\n\nSigned-off-by: Jerry Huang \u003cChang-Ming.Huang@freescale.com\u003e\nSigned-off-by: Shaohui Xie \u003cShaohui.Xie@freescale.com\u003e\nAcked-by: Anton Vorontsov \u003ccbouatmailru@gmail.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "d676188e44680c2f2eb114a24b3b32e56165f079", "tree": "91637c2ddf6004337629587049a7f14ff44fcccd", "parents": [ "ddffeb8c4d0331609ef2581d84de4d763607bd37" ], "author": { "name": "Seungwon Jeon", "email": "tgih.jun@samsung.com", "time": "Fri Sep 28 14:21:59 2012 +0900" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Wed Nov 07 14:50:16 2012 -0500" }, "message": "mmc: dw_mmc: convert the variable type of irq\n\nEven though platform_get_irq returns error, \u0027host-\u003eirq\u0027\nalways has an unsigned value. Less-than-zero comparison\nof an unsigned value is never true. Type of \u0027unsigned int\u0027\nwill be changed for \u0027int\u0027.\n\nSigned-off-by: Seungwon Jeon \u003ctgih.jun@samsung.com\u003e\nAcked-by: Will Newton \u003cwill.newton@imgtec.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "0133370f93eae5ed3c0f16d9da2b7add7dda6076", "tree": "2aa05fa73993988e10d173c0cfa825061b2c2a0d", "parents": [ "3d70f8c617a436c7146ecb81df2265b4626dfe89" ], "author": { "name": "Kishon Vijay Abraham I", "email": "kishon@ti.com", "time": "Fri Nov 02 13:44:46 2012 +0530" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Wed Nov 07 09:35:53 2012 -0800" }, "message": "drivers: bus: ocp2scp: add pdata support\n\nocp2scp was not having pdata support which makes *musb* fail for non-dt\nboot in OMAP platform. The pdata will have information about the devices\nthat is connected to ocp2scp. ocp2scp driver will now make use of this\ninformation to create the devices that is attached to ocp2scp.\n\nThis is needed to fix MUSB regression caused by commit c9e4412a\n(arm: omap: phy: remove unused functions from omap-phy-internal.c)\n\nSigned-off-by: Kishon Vijay Abraham I \u003ckishon@ti.com\u003e\nAcked-by: Felipe Balbi \u003cbalbi@ti.com\u003e\n[tony@atomide.com: updated comments for regression info]\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "6d877e6b85691e0b2b22e90aeb9b86c3dafcfc6b", "tree": "f6902d9a2a84abc7d13203bf18b978f7ef1d16cc", "parents": [ "cf47a83fb06e42ae1b572ed68326068c7feaceae" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Fri Oct 19 15:01:46 2012 -0400" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Nov 07 10:40:33 2012 -0500" }, "message": "xen/hvm: If we fail to fetch an HVM parameter print out which flag it is.\n\nMakes it easier to troubleshoot in the field.\n\nAcked-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\n[v1: Use macro per Ian\u0027s suggestion]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "0547fad2dd7ccaaf3c914ba49073fa37e4e241eb", "tree": "5434c18a01f9c4591c74e0bda596f1d4b29ddd6b", "parents": [ "ef468d234753aff7afa96075d3be135b0df1ded0" ], "author": { "name": "Ming Lei", "email": "ming.lei@canonical.com", "time": "Tue Nov 06 04:53:04 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 07 03:53:38 2012 -0500" }, "message": "usbnet: introduce usbnet_{read|write}_cmd_nopm\n\nThis patch introduces the below two helpers to prepare for solving\nthe usbnet runtime PM problem, which may cause some network utilities\n(ifconfig, ethtool,...) touch a suspended device.\n\n\tusbnet_read_cmd_nopm()\n\tusbnet_write_cmd_nopm()\n\nThe above two helpers should be called by usbnet resume/suspend\ncallback to avoid deadlock.\n\nSigned-off-by: Ming Lei \u003cming.lei@canonical.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "87f4d7c1d36f44b0822053b7e5dedc31fdd0ab99", "tree": "8dd58336991f514e7dcb00358e7e630f8718614e", "parents": [ "0481776b7a70f09acf7d9d97c288c3a8403fbfe4" ], "author": { "name": "Jacob Keller", "email": "jacob.e.keller@intel.com", "time": "Thu Nov 01 12:30:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 03 15:27:07 2012 -0400" }, "message": "ptp: update adjfreq callback description\n\nThis patch updates the adjfreq callback description to include a note that the\ndelta in ppb is always relative to the base frequency, and not to the current\nfrequency of the hardware clock.\n\nSigned-off-by: Jacob Keller \u003cjacob.e.keller@intel.com\u003e\nCC: stable@vger.kernel.org [v3.5+]\nCC: Richard Cochran \u003crichard.cochran@gmail.com\u003e\nCC: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4f99ad51292078cc47343c17d3870764588cff73", "tree": "e5aa4440012b2d13b95164100cac5495b22d8637", "parents": [ "4d44a9abaadcb078cf60fe3b763eb9bc2b6cbe8b" ], "author": { "name": "Antonio Quartulli", "email": "ordex@autistici.org", "time": "Tue Oct 30 04:08:41 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 03 15:05:25 2012 -0400" }, "message": "if_ether.h: add B.A.T.M.A.N.-Advanced Ethertype\n\nAdd Ethertype 0x4305 (not an officially registered id).\nThis Ethertype is used by every frame generated by B.A.T.M.A.N.-Advanced. Its\ndefinition is currently batman-adv local only and since it is not officially\nregistered it is better to make its definition kernel-wide so that we avoid\ncollisions given by future unofficial uses of the same Ethertype.\n\nSigned-off-by: Antonio Quartulli \u003cordex@autistici.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "94e187c01512c9cf29e2ff54bf1a1b045f38293d", "tree": "2149f4652fb0fc997ce5728f9574e1ab5351f0e5", "parents": [ "6da025fa23bb10c82f80de319c837ed2b02306e4" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Mon Oct 29 00:13:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 03 14:59:05 2012 -0400" }, "message": "ipv6: introduce ip6_rt_put()\n\nAs suggested by Eric, we could introduce a helper function\nfor ipv6 too, to avoid checking if rt is NULL before\ndst_release().\n\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6da025fa23bb10c82f80de319c837ed2b02306e4", "tree": "64992521a7fa74c04eff45fffc88dd56dfb10ba7", "parents": [ "b26ddd813031666293c95e84c997eb8b1f97bd38" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Sun Oct 28 22:33:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 03 14:59:04 2012 -0400" }, "message": "ipv4: avoid a test in ip_rt_put()\n\nWe can save a test in ip_rt_put(), considering dst_release() accepts\na NULL parameter, and dst is first element in rtable.\n\nAdd a BUILD_BUG_ON() to catch any change that could break this\nassertion.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Cong Wang \u003camwang@redhat.com\u003e\nAcked-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b26ddd813031666293c95e84c997eb8b1f97bd38", "tree": "598f6fb4ac28998d9ac1101d297558199fb6e980", "parents": [ "1a9408355e91c21eaf4626386d65988a0ad7dc21" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Mon Oct 29 08:32:13 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 03 14:54:55 2012 -0400" }, "message": "sctp: Clean up type-punning in sctp_cmd_t union\n\nLots of points in the sctp_cmd_interpreter function treat the sctp_cmd_t arg as\na void pointer, even though they are written as various other types. Theres no\nneed for this as doing so just leads to possible type-punning issues that could\ncause crashes, and if we remain type-consistent we can actually just remove the\nvoid * member of the union entirely.\n\nChange Notes:\n\nv2)\n\t* Dropped chunk that modified SCTP_NULL to create a marker pattern\n\t should anyone try to use a SCTP_NULL() assigned sctp_arg_t, Assigning\n\t to .zero provides the same effect and should be faster, per Vlad Y.\n\nv3)\n\t* Reverted part of V2, opting to use memset instead of .zero, so that\n\t the entire union is initalized thus avoiding the i164 speculative load\n\t problems previously encountered, per Dave M.. Also rewrote\n\t SCTP_[NO]FORCE so as to use common infrastructure a little more\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\nCC: Vlad Yasevich \u003cvyasevich@gmail.com\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCC: linux-sctp@vger.kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "398f382c0a5bd62f0f31871e844700e1b9fd1ad3", "tree": "c1456d193eb4089de48f9aed8459fbf806433563", "parents": [ "e6c022a4fa2d2d9ca9d0a7ac3b05ad988f39fc30" ], "author": { "name": "Daniel Borkmann", "email": "dxchgb@gmail.com", "time": "Sun Oct 28 08:27:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 03 14:50:15 2012 -0400" }, "message": "pktgen: clean up ktime_t helpers\n\nSome years ago, the ktime_t helper functions ktime_now() and ktime_lt()\nhave been introduced. Instead of defining them inside pktgen.c, they\nshould either use ktime_t library functions or, if not available, they\nshould be defined in ktime.h, so that also others can benefit from them.\nktime_compare() is introduced with a similar notion as in timespec_compare().\n\nSigned-off-by: Daniel Borkmann \u003cdaniel.borkmann@tik.ee.ethz.ch\u003e\nCc: Cong Wang \u003cxiyou.wangcong@gmail.com\u003e\nCc: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e6c022a4fa2d2d9ca9d0a7ac3b05ad988f39fc30", "tree": "6dcd4e2dfc7895f33329fb16653a93f7d52f4bd7", "parents": [ "25b1e67921f448cdddf70042ba233ffe43d33a9c" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Sat Oct 27 23:16:46 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 03 14:45:00 2012 -0400" }, "message": "tcp: better retrans tracking for defer-accept\n\nFor passive TCP connections using TCP_DEFER_ACCEPT facility,\nwe incorrectly increment req-\u003eretrans each time timeout triggers\nwhile no SYNACK is sent.\n\nSYNACK are not sent for TCP_DEFER_ACCEPT that were established (for\nwhich we received the ACK from client). Only the last SYNACK is sent\nso that we can receive again an ACK from client, to move the req into\naccept queue. We plan to change this later to avoid the useless\nretransmit (and potential problem as this SYNACK could be lost)\n\nTCP_INFO later gives wrong information to user, claiming imaginary\nretransmits.\n\nDecouple req-\u003eretrans field into two independent fields :\n\nnum_retrans : number of retransmit\nnum_timeout : number of timeouts\n\nnum_timeout is the counter that is incremented at each timeout,\nregardless of actual SYNACK being sent or not, and used to\ncompute the exponential timeout.\n\nIntroduce inet_rtx_syn_ack() helper to increment num_retrans\nonly if -\u003ertx_syn_ack() succeeded.\n\nUse inet_rtx_syn_ack() from tcp_check_req() to increment num_retrans\nwhen we re-send a SYNACK in answer to a (retransmitted) SYN.\nPrior to this patch, we were not counting these retransmits.\n\nChange tcp_v[46]_rtx_synack() to increment TCP_MIB_RETRANSSEGS\nonly if a synack packet was successfully queued.\n\nReported-by: Yuchung Cheng \u003cycheng@google.com\u003e\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Julian Anastasov \u003cja@ssi.bg\u003e\nCc: Vijay Subramanian \u003csubramanian.vijay@gmail.com\u003e\nCc: Elliott Hughes \u003cenh@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0f89a5733a8d28174c7adeb1fdc20ac11439e766", "tree": "9978014f4520a13a238dfefe35405bac441ccc0d", "parents": [ "a315b5a6d40bac87c7878bef65291ecbf853546a", "c454e6111d1ef4268fe98e87087216e51c2718c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 02 20:48:41 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 02 20:48:41 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n \"First post-Sandy pull request\"\n\n 1) Fix antenna gain handling and initialization of chan-\u003emax_reg_power\n in wireless, from Felix Fietkau.\n\n 2) Fix nexthop handling in H.232 conntrack helper, from Julian\n Anastasov.\n\n 3) Only process 80211 mesh config header in certain kinds of frames,\n from Javier Cardona.\n\n 4) 80211 management frame header length needs to be validated, from\n Johannes Berg.\n\n 5) Don\u0027t access free\u0027d SKBs in ath9k driver, from Felix Fietkay.\n\n 6) Test for permanent state correctly in VXLAN driver, from Stephen\n Hemminger.\n\n 7) BNX2X bug fixes from Yaniv Rosner and Dmitry Kravkov.\n\n 8) Fix off by one errors in bonding, from Nikolay ALeksandrov.\n\n 9) Fix divide by zero in TCP-Illinois congestion control. From Jesper\n Dangaard Brouer.\n\n10) TCP metrics code says \"Yo dawg, I heard you like sizeof, so I did a\n sizeof of a sizeof, so you can size your size\" Fix from Julian\n Anastasov.\n\n11) Several drivers do mdiobus_free without first doing an\n mdiobus_unregister leading to stray pointer references. Fix from\n Peter Senna Tschudin.\n\n12) Fix OOPS in l2tp_eth_create() error path, it\u0027s another danling\n pointer kinda situation. Fix from Tom Parkin.\n\n13) Hardware driven by the vmxnet driver can\u0027t handle larger than 16K\n fragments, so split them up when necessary. From Eric Dumazet.\n\n14) Handle zero length data length in tcp_send_rcvq() properly. Fix\n from Pavel Emelyanov.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (38 commits)\n tcp-repair: Handle zero-length data put in rcv queue\n vmxnet3: must split too big fragments\n l2tp: fix oops in l2tp_eth_create() error path\n cxgb4: Fix unable to get UP event from the LLD\n drivers/net/phy/mdio-bitbang.c: Call mdiobus_unregister before mdiobus_free\n drivers/net/ethernet/nxp/lpc_eth.c: Call mdiobus_unregister before mdiobus_free\n bnx2x: fix HW initialization using fw 7.8.x\n tcp: Fix double sizeof in new tcp_metrics code\n net: fix divide by zero in tcp algorithm illinois\n net: sctp: Fix typo in net/sctp\n bonding: fix second off-by-one error\n bonding: fix off-by-one error\n bnx2x: Disable FCoE for 57840 since not yet supported by FW\n bnx2x: Fix no link on 577xx 10G-baseT\n bnx2x: Fix unrecognized SFP+ module after driver is loaded\n bnx2x: Fix potential incorrect link speed provision\n bnx2x: Restore global registers back to default.\n bnx2x: Fix link down in 57712 following LFA\n bnx2x: Fix 57810 1G-KR link against certain switches.\n ixgbe: PTP get_ts_info missing software support\n ...\n" }, { "commit": "2bc80059fe19229e68a306ce12f5e61e80b92c5c", "tree": "388e36afe1abdd453fea0d164a9468adbcc61d5d", "parents": [ "46acc460c07b5c74287560a00b6cbc6111136ab6" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Nov 01 09:12:02 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 02 21:34:05 2012 -0400" }, "message": "eth: Rename and properly align br_reserved_address array\n\nSince this array is no longer part of the bridge driver, it should\nhave an \u0027eth\u0027 prefix not \u0027br\u0027.\n\nWe also assume that either it\u0027s 16-bit-aligned or the architecture has\nefficient unaligned access. Ensure the first of these is true by\nexplicitly aligning it.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "46acc460c07b5c74287560a00b6cbc6111136ab6", "tree": "c6fea173bd0ec28ba4eb5790cd2601a60bcbcc3e", "parents": [ "4197f24b5bd8be03e84d23920e90f6a1313f4b79" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Nov 01 09:11:11 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 02 21:34:05 2012 -0400" }, "message": "eth: Make is_link_local() consistent with other address tests\n\nFunction name should include \u0027_ether_addr\u0027.\nReturn type should be bool.\nParameter name should be \u0027addr\u0027 not \u0027dest\u0027 (also matching kernel-doc).\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "25121173f7b1e4ac3fc692df6e7b8c52ec36abba", "tree": "5d52c2fe88397dae0ee799c194d46bf641b0a902", "parents": [ "e19d6763cc300fcb706bd291b24ac06be71e1ce6" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu Nov 01 09:16:28 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 02 21:29:57 2012 -0400" }, "message": "skb: api to report errors for zero copy skbs\n\nOrphaning frags for zero copy skbs needs to allocate data in atomic\ncontext so is has a chance to fail. If it does we currently discard\nthe skb which is safe, but we don\u0027t report anything to the caller,\nso it can not recover by e.g. disabling zero copy.\n\nAdd an API to free skb reporting such errors: this is used\nby tun in case orphaning frags fails.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e19d6763cc300fcb706bd291b24ac06be71e1ce6", "tree": "05608ee69740360480b4c66a368eb21987993058", "parents": [ "202975b4c522c197e4e2269d389aafbf056a4c37" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu Nov 01 09:16:22 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 02 21:29:57 2012 -0400" }, "message": "skb: report completion status for zero copy skbs\n\nEven if skb is marked for zero copy, net core might still decide\nto copy it later which is somewhat slower than a copy in user context:\nbesides copying the data we need to pin/unpin the pages.\n\nAdd a parameter reporting such cases through zero copy callback:\nif this happens a lot, device can take this into account\nand switch to copying in user context.\n\nThis patch updates all users but ignores the passed value for now:\nit will be used by follow-up patches.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "66b6a0c979e88810e753e528dd0b9aef30ba21a1", "tree": "a6d89319a80abcdac4da1602dce5d4249358b1ca", "parents": [ "d9b482c8ba1973a189f2d4c8175d405b87fbf2d7", "95a7d76897c1e7243d4137037c66d15cbf2cce76" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 02 13:26:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 02 13:26:11 2012 -0700" }, "message": "Merge tag \u0027stable/for-linus-3.7-rc4-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\nPull Xen bugfixes from Konrad Rzeszutek Wilk:\n - Use appropriate macros instead of hand-rolling our own (ARM).\n - Fixes if FB/KBD closed unexpectedly.\n - Fix memory leak in /dev/gntdev ioctl calls.\n - Fix overflow check in xenbus_file_write.\n - Document cleanup.\n - Performance optimization when migrating guests.\n\n* tag \u0027stable/for-linus-3.7-rc4-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen/mmu: Use Xen specific TLB flush instead of the generic one.\n xen/arm: use the __HVC macro\n xen/xenbus: fix overflow check in xenbus_file_write()\n xen-kbdfront: handle backend CLOSED without CLOSING\n xen-fbfront: handle backend CLOSED without CLOSING\n xen/gntdev: don\u0027t leak memory from IOCTL_GNTDEV_MAP_GRANT_REF\n x86: remove obsolete comment from asm/xen/hypervisor.h\n" }, { "commit": "d9b482c8ba1973a189f2d4c8175d405b87fbf2d7", "tree": "87d1f517365b7ec2113255fd537472d28b9697a4", "parents": [ "c660b8f944f1815494a76935148571276fa47462" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Tue Oct 30 14:45:57 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 02 12:44:51 2012 -0700" }, "message": "hashtable: introduce a small and naive hashtable\n\nThis hashtable implementation is using hlist buckets to provide a simple\nhashtable to prevent it from getting reimplemented all over the kernel.\n\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\n[ Merging this now, so that subsystems can start applying Sasha\u0027s\n patches that use this - Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "121d1e0941e05c64ee4223064dd83eb24e871739", "tree": "a5b841774451210d2d53db14b7cd907cd47f12d4", "parents": [ "6229b75d8da5a4eed7bb668de757e252986c2305" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Tue Oct 30 01:08:49 2012 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Nov 02 12:26:32 2012 +0100" }, "message": "netfilter: ipv6: add getsockopt to retrieve origdst\n\nuserspace can query the original ipv4 destination address of a REDIRECTed\nconnection via\ngetsockopt(m_sock, SOL_IP, SO_ORIGINAL_DST, \u0026m_server_addr, \u0026addrsize)\n\nbut for ipv6 no such option existed.\n\nThis adds getsockopt(..., IPPROTO_IPV6, IP6T_SO_ORIGINAL_DST, ...).\n\nWithout this, userspace needs to parse /proc or use ctnetlink, which\nappears to be overkill.\n\nThis uses option number 80 for IP6T_SO_ORIGINAL_DST, which is spare,\nto use the same number we use in the IPv4 socket option SO_ORIGINAL_DST.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "cc535dfb6a85b42218307c43f60668d7bd6f4318", "tree": "168228e4048e5050a71c311f3d2b6af7349f9954", "parents": [ "b77bc2069d1e437d5a1a71bb5cfcf4556ee40015" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Mon Oct 29 04:53:27 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 01 12:41:34 2012 -0400" }, "message": "rtnl/ipv4: use netconf msg to advertise rp_filter status\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "00ab94eeaf6c1ad38ad7368c5148fed31403c8a2", "tree": "e76e94fe6e4ff9ac7b48dfedd0584bf2bb5164de", "parents": [ "78ca0b287314ad6b7b06161b3ff9b13e8a8bcce0" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Mon Oct 29 08:45:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 01 12:21:32 2012 -0400" }, "message": "cpts: specify the input clock frequency via DT\n\nThis patch adds a way to configure the CPTS input clock scaling factors\nvia the device tree.\n\nSigned-off-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "78ca0b287314ad6b7b06161b3ff9b13e8a8bcce0", "tree": "99ab480436bf31cb253c334f57b5b9b039ad9f0a", "parents": [ "6b60393e08f9263c7b129d54eeb261e8f970175c" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Mon Oct 29 08:45:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 01 12:21:32 2012 -0400" }, "message": "cpsw: add a DT field for the active time stamping port\n\nBecause time stamping on both external ports of the switch simultaneously\nis positively useless from the application\u0027s point of view, this patch\nprovides a DT configuration method to choose the active port.\n\nSigned-off-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6b60393e08f9263c7b129d54eeb261e8f970175c", "tree": "dbd08a4fec51b2bc82f7e6dcd4342c85adc7ebe2", "parents": [ "87c0e764d43aca7f8bae8bfa86c50fa715e80050" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Mon Oct 29 08:45:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 01 12:21:32 2012 -0400" }, "message": "cpsw: add a DT field for the cpts offset\n\nSigned-off-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "65f8f9a1c1db831e5159e3e3e50912d1f214cd0c", "tree": "13dc8b15ea17738a2208b959a5c3a88a75aa922c", "parents": [ "dd87b22f9096863adfd5daf281beb0a83379bd8f" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Wed Oct 31 06:27:25 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 01 11:41:35 2012 -0400" }, "message": "time: remove the timecompare code.\n\nThis patch removes the timecompare code from the kernel. The top five\nreasons to do this are:\n\n1. There are no more users of this code.\n2. The original idea was a bit weak.\n3. The original author has disappeared.\n4. The code was not general purpose but tuned to a particular hardware,\n5. There are better ways to accomplish clock synchronization.\n\nSigned-off-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nAcked-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nTested-by: Bob Liu \u003clliubbo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "215b13dd288c2e1e4461c1530a801f5f83e8cd90", "tree": "f4963077f13ab200a676636fe2d48993e73a2a8a", "parents": [ "a24006ed12616bde1bbdb26868495906a212d8dc" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Wed Oct 31 06:19:07 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 01 11:41:34 2012 -0400" }, "message": "ptp: add an ioctl to compare PHC time with system time\n\nThis patch adds an ioctl for PTP Hardware Clock (PHC) devices that allows\nuser space to measure the time offset between the PHC and the system\nclock. Rather than hard coding any kind of estimation algorithm into the\nkernel, this patch takes the more flexible approach of just delivering\nan array of raw clock readings. In that way, the user space clock servo\nmay be adapted to new and different hardware clocks.\n\nSigned-off-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nAcked-by: Jacob Keller \u003cjacob.e.keller@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8c23f406c6d86808726ace580657186bc3b44587", "tree": "4a319a6d9b7c37166f10bd8d8af5e5f78b6abb12", "parents": [ "1e207eb1c3f0e8b690401f02fe08e7b53903f010", "87da7e66a40532b743cd50972fcf85a1f15b14ea" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 01 08:27:02 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 01 08:27:02 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull KVM fix from Marcelo Tosatti.\n\n* git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: x86: fix vcpu-\u003emmio_fragments overflow\n" }, { "commit": "a8fc92778080c845eaadc369a0ecf5699a03bef0", "tree": "2d83a965c40765c52195e32a903bd8c7678f014d", "parents": [ "96442e42429e5f268ab97a3586c7694a3acc55a7" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Nov 01 02:01:48 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 01 11:17:15 2012 -0400" }, "message": "sk-filter: Add ability to get socket filter program (v2)\n\nThe SO_ATTACH_FILTER option is set only. I propose to add the get\nability by using SO_ATTACH_FILTER in getsockopt. To be less\nirritating to eyes the SO_GET_FILTER alias to it is declared. This\nability is required by checkpoint-restore project to be able to\nsave full state of a socket.\n\nThere are two issues with getting filter back.\n\nFirst, kernel modifies the sock_filter-\u003ecode on filter load, thus in\norder to return the filter element back to user we have to decode it\ninto user-visible constants. Fortunately the modification in question\nis interconvertible.\n\nSecond, the BPF_S_ALU_DIV_K code modifies the command argument k to\nspeed up the run-time division by doing kernel_k \u003d reciprocal(user_k).\nBad news is that different user_k may result in same kernel_k, so we\ncan\u0027t get the original user_k back. Good news is that we don\u0027t have\nto do it. What we need to is calculate a user2_k so, that\n\n reciprocal(user2_k) \u003d\u003d reciprocal(user_k) \u003d\u003d kernel_k\n\ni.e. if it\u0027s re-loaded back the compiled again value will be exactly\nthe same as it was. That said, the user2_k can be calculated like this\n\n user2_k \u003d reciprocal(kernel_k)\n\nwith an exception, that if kernel_k \u003d\u003d 0, then user2_k \u003d\u003d 1.\n\nThe optlen argument is treated like this -- when zero, kernel returns\nthe amount of sock_fprog elements in filter, otherwise it should be\nlarge enough for the sock_fprog array.\n\nchanges since v1:\n* Declared SO_GET_FILTER in all arch headers\n* Added decode of vlan-tag codes\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cde8b15f1aabe327038ee4e0e11dd6b798572f69", "tree": "920146d9cb4e1918c1e4b5063ce23de675f5988f", "parents": [ "c8d68e6be1c3b242f1c598595830890b65cea64a" ], "author": { "name": "Jason Wang", "email": "jasowang@redhat.com", "time": "Wed Oct 31 19:46:01 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 01 11:14:08 2012 -0400" }, "message": "tuntap: add ioctl to attach or detach a file form tuntap device\n\nSometimes usespace may need to active/deactive a queue, this could be done by\ndetaching and attaching a file from tuntap device.\n\nThis patch introduces a new ioctls - TUNSETQUEUE which could be used to do\nthis. Flag IFF_ATTACH_QUEUE were introduced to do attaching while\nIFF_DETACH_QUEUE were introduced to do the detaching.\n\nSigned-off-by: Jason Wang \u003cjasowang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bbb009941efaece3898910a862f6d23aa55d6ba8", "tree": "c7006844fcac3a77c6e1057b09b3a6fed047058c", "parents": [ "6e914fc70793f540015bd99744cd456b8d7fdfbd" ], "author": { "name": "Jason Wang", "email": "jasowang@redhat.com", "time": "Wed Oct 31 19:45:59 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 01 11:14:08 2012 -0400" }, "message": "tuntap: introduce multiqueue flags\n\nAdd flags to be used by creating multiqueue tuntap device.\n\nSigned-off-by: Jason Wang \u003cjasowang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "33046957cd71e524e3cb2a209d9e1363ac6cf3d6", "tree": "235ef88db6e26c13aa62b5f84659b63ee11b90c5", "parents": [ "08f05c49749ee655bef921d12160960a273aad47", "16c2e1fae8d60a9d6d16e009a76ba3472568e094" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 31 15:38:32 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 31 15:38:32 2012 -0700" }, "message": "Merge tag \u0027sound-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound fixes from Takashi Iwai:\n \"This contains unexpectedly many changes in a wide range due to the\n fixes for races at disconnection of USB audio devices. In the end, we\n end up covering fairly core parts of sound subsystem.\n\n Other than that, just a few usual small fixes.\"\n\n* tag \u0027sound-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: ice1724: Fix rate setup after resume\n ALSA: Avoid endless sleep after disconnect\n ALSA: Add a reference counter to card instance\n ALSA: usb-audio: Fix races at disconnection in mixer_quirks.c\n ALSA: usb-audio: Use rwsem for disconnect protection\n ALSA: usb-audio: Fix races at disconnection\n ALSA: PCM: Fix some races at disconnection\n ASoC: omap-dmic: Correct functional clock name\n ASoC: zoom2: Fix compile error by including correct header files\n ALSA: hda - Fix mute-LED setup for HP dv5 laptop\n" }, { "commit": "87da7e66a40532b743cd50972fcf85a1f15b14ea", "tree": "e553258648881176136774013f0fecff876644bb", "parents": [ "35fd3dc58da675d659513384221349ef90749a01" ], "author": { "name": "Xiao Guangrong", "email": "xiaoguangrong@linux.vnet.ibm.com", "time": "Wed Oct 24 14:07:59 2012 +0800" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Wed Oct 31 20:36:30 2012 -0200" }, "message": "KVM: x86: fix vcpu-\u003emmio_fragments overflow\n\nAfter commit b3356bf0dbb349 (KVM: emulator: optimize \"rep ins\" handling),\nthe pieces of io data can be collected and write them to the guest memory\nor MMIO together\n\nUnfortunately, kvm splits the mmio access into 8 bytes and store them to\nvcpu-\u003emmio_fragments. If the guest uses \"rep ins\" to move large data, it\nwill cause vcpu-\u003emmio_fragments overflow\n\nThe bug can be exposed by isapc (-M isapc):\n\n[23154.818733] general protection fault: 0000 [#1] SMP DEBUG_PAGEALLOC\n[ ......]\n[23154.858083] Call Trace:\n[23154.859874] [\u003cffffffffa04f0e17\u003e] kvm_get_cr8+0x1d/0x28 [kvm]\n[23154.861677] [\u003cffffffffa04fa6d4\u003e] kvm_arch_vcpu_ioctl_run+0xcda/0xe45 [kvm]\n[23154.863604] [\u003cffffffffa04f5a1a\u003e] ? kvm_arch_vcpu_load+0x17b/0x180 [kvm]\n\nActually, we can use one mmio_fragment to store a large mmio access then\nsplit it when we pass the mmio-exit-info to userspace. After that, we only\nneed two entries to store mmio info for the cross-mmio pages access\n\nSigned-off-by: Xiao Guangrong \u003cxiaoguangrong@linux.vnet.ibm.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "810b6d7638a288216f99bd190470d67061c8bd88", "tree": "5c8dd20b10cf4d7d40d286c9b3dd71d6dedaf78c", "parents": [ "f7b4fb22b838f895ce9fa994f0ef4f7f541f5266", "ac61d515f14fd205d8c917a34b27a767b4fe9e05" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 31 14:25:33 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 31 14:26:44 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next\n\nJeff Kirsher says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nThis series contains updates to ixgbe, ixgbevf, igbvf, igb and\nnetworking core (bridge). Most notably is the addition of support\nfor local link multicast addresses in SR-IOV mode to the networking\ncore.\n\nAlso note, the ixgbe patch \"ixgbe: Add support for pipeline reset\" and\n\"ixgbe: Fix return value from macvlan filter function\" is revised based\non community feedback.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f3335031b9452baebfe49b8b5e55d3fe0c4677d1", "tree": "c73f4d2827d3b58b4866488a35b4b462e52713ba", "parents": [ "0f6ae8f14e7a6a068e9a98a0d3484ffa6bf2c6bb" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Sat Oct 27 02:26:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 31 14:00:15 2012 -0400" }, "message": "net: filter: add vlan tag access\n\nBPF filters lack ability to access skb-\u003evlan_tci\n\nThis patch adds two new ancillary accessors :\n\nSKF_AD_VLAN_TAG (44) mapped to vlan_tx_tag_get(skb)\n\nSKF_AD_VLAN_TAG_PRESENT (48) mapped to vlan_tx_tag_present(skb)\n\nThis allows libpcap/tcpdump to use a kernel filter instead of\nhaving to fallback to accept all packets, then filter them in\nuser space.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSuggested-by: Ani Sinha \u003cani@aristanetworks.com\u003e\nSuggested-by: Daniel Borkmann \u003cdanborkmann@iogearbox.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ecd5cf5dc5b07bc57aedf4c92453d6c343e3d840", "tree": "1e1b88386c2f7ceaabf56d362bf3b7789c91f9e1", "parents": [ "9add4d8174907c9977ad29cf6e71460829ec954e" ], "author": { "name": "Willem de Bruijn", "email": "willemb@google.com", "time": "Fri Oct 26 11:52:08 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 31 13:56:40 2012 -0400" }, "message": "net: compute skb-\u003erxhash if nic hash may be 3-tuple\n\nNetwork device drivers can communicate a Toeplitz hash in skb-\u003erxhash,\nbut devices differ in their hashing capabilities. All compute a 5-tuple\nhash for TCP over IPv4, but for other connection-oriented protocols,\nthey may compute only a 3-tuple. This breaks RPS load balancing, e.g.,\nfor TCP over IPv6 flows. Additionally, for GRE and other tunnels,\nthe kernel computes a 5-tuple hash over the inner packet if possible,\nbut devices do not.\n\nThis patch recomputes the rxhash in software in all cases where it\ncannot be certain that a 5-tuple was computed. Device drivers can avoid\nrecomputation by setting the skb-\u003el4_rxhash flag.\n\nRecomputing adds cycles to each packet when RPS is enabled or the\npacket arrives over a tunnel. A comparison of 200x TCP_STREAM between\ntwo servers running unmodified netnext with rxhash computation\nin hardware vs software (using ethtool -K eth0 rxhash [on|off]) shows\nhow much time is spent in __skb_get_rxhash in this worst case:\n\n 0.03% swapper [kernel.kallsyms] [k] __skb_get_rxhash\n 0.03% swapper [kernel.kallsyms] [k] __skb_get_rxhash\n 0.05% swapper [kernel.kallsyms] [k] __skb_get_rxhash\n\nWith 200x TCP_RR it increases to\n\n 0.10% netperf [kernel.kallsyms] [k] __skb_get_rxhash\n 0.10% netperf [kernel.kallsyms] [k] __skb_get_rxhash\n 0.10% netperf [kernel.kallsyms] [k] __skb_get_rxhash\n\nI considered having the patch explicitly skips recomputation when it knows\nthat it will not improve the hash (TCP over IPv4), but that conditional\ncomplicates code without saving many cycles in practice, because it has\nto take place after flow dissector.\n\nSigned-off-by: Willem de Bruijn \u003cwillemb@google.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "815cccbf10b27115fb3e5827bef26768616e5e27", "tree": "c8c4a2a2bc95bc89926c91c67c98b020be1efaa7", "parents": [ "2469ffd723f76ac2d3ce3d4f31ee31ee0a06cd38" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Wed Oct 24 08:13:09 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 31 13:18:29 2012 -0400" }, "message": "ixgbe: add setlink, getlink support to ixgbe and ixgbevf\n\nThis adds support for the net device ops to manage the embedded\nhardware bridge on ixgbe devices. With this patch the bridge\nmode can be toggled between VEB and VEPA to support stacking\nmacvlan devices or using the embedded switch without any SW\ncomponent in 802.1Qbg/br environments.\n\nAdditionally, this adds source address pruning to the ixgbevf\ndriver to prune any frames sent back from a reflective relay on\nthe switch. This is required because the existing hardware does\nnot support this. Without it frames get pushed into the stack\nwith its own src mac which is invalid per 802.1Qbg VEPA\ndefinition.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2469ffd723f76ac2d3ce3d4f31ee31ee0a06cd38", "tree": "d385b74ac144c06e11e70e2ace08b00b3433d77f", "parents": [ "e5a55a898720096f43bc24938f8875c0a1b34cd7" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Wed Oct 24 08:13:03 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 31 13:18:29 2012 -0400" }, "message": "net: set and query VEB/VEPA bridge mode via PF_BRIDGE\n\nHardware switches may support enabling and disabling the\nloopback switch which puts the device in a VEPA mode defined\nin the IEEE 802.1Qbg specification. In this mode frames are\nnot switched in the hardware but sent directly to the switch.\nSR-IOV capable NICs will likely support this mode I am\naware of at least two such devices. Also I am told (but don\u0027t\nhave any of this hardware available) that there are devices\nthat only support VEPA modes. In these cases it is important\nat a minimum to be able to query these attributes.\n\nThis patch adds an additional IFLA_BRIDGE_MODE attribute that can be\nset and dumped via the PF_BRIDGE:{SET|GET}LINK operations. Also\nanticipating bridge attributes that may be common for both embedded\nbridges and software bridges this adds a flags attribute\nIFLA_BRIDGE_FLAGS currently used to determine if the command or event\nis being generated to/from an embedded bridge or software bridge.\nFinally, the event generation is pulled out of the bridge module and\ninto rtnetlink proper.\n\nFor example using the macvlan driver in VEPA mode on top of\nan embedded switch requires putting the embedded switch into\na VEPA mode to get the expected results.\n\n\t-------- --------\n | VEPA | | VEPA | \u003c-- macvlan vepa edge relays\n -------- --------\n | |\n | |\n ------------------\n | VEPA | \u003c-- embedded switch in NIC\n ------------------\n |\n |\n -------------------\n | external switch | \u003c-- shiny new physical\n\t------------------- switch with VEPA support\n\nA packet sent from the macvlan VEPA at the top could be\nloopbacked on the embedded switch and never seen by the\nexternal switch. So in order for this to work the embedded\nswitch needs to be set in the VEPA state via the above\ndescribed commands.\n\nBy making these attributes nested in IFLA_AF_SPEC we allow\nfuture extensions to be made as needed.\n\nCC: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e5a55a898720096f43bc24938f8875c0a1b34cd7", "tree": "aff4a209c158a6bee5d974647ec8726f2b9a81c0", "parents": [ "a932657f51eadb8280166e82dc7034dfbff3985a" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Wed Oct 24 08:12:57 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 31 13:18:28 2012 -0400" }, "message": "net: create generic bridge ops\n\nThe PF_BRIDGE:RTM_{GET|SET}LINK nlmsg family and type are\ncurrently embedded in the ./net/bridge module. This prohibits\nthem from being used by other bridging devices. One example\nof this being hardware that has embedded bridging components.\n\nIn order to use these nlmsg types more generically this patch\nadds two net_device_ops hooks. One to set link bridge attributes\nand another to dump the current bride attributes.\n\n\tndo_bridge_setlink()\n\tndo_bridge_getlink()\n\nCC: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "06272911485850b4a336122958c50af0f8ea7c13", "tree": "ce1e4ada8e6adc9cb9235cd0b50ed1350604a02a", "parents": [ "e657e078d3dfa9f96976db7a2b5fd7d7c9f1f1a6", "6fe7cc71bbf3a0bc28c9cec3c00bc11e81344412" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Oct 31 13:10:01 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Oct 31 13:10:01 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "95a7d76897c1e7243d4137037c66d15cbf2cce76", "tree": "d70ce3f79c8c5f7824ff277b2ab424ab975fdf2c", "parents": [ "c8d258a7b2b6633b79cad4464e8dfb3dc328d897" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Oct 31 12:38:31 2012 -0400" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Oct 31 12:38:31 2012 -0400" }, "message": "xen/mmu: Use Xen specific TLB flush instead of the generic one.\n\nAs Mukesh explained it, the MMUEXT_TLB_FLUSH_ALL allows the\nhypervisor to do a TLB flush on all active vCPUs. If instead\nwe were using the generic one (which ends up being xen_flush_tlb)\nwe end up making the MMUEXT_TLB_FLUSH_LOCAL hypercall. But\nbefore we make that hypercall the kernel will IPI all of the\nvCPUs (even those that were asleep from the hypervisor\nperspective). The end result is that we needlessly wake them\nup and do a TLB flush when we can just let the hypervisor\ndo it correctly.\n\nThis patch gives around 50% speed improvement when migrating\nidle guest\u0027s from one host to another.\n\nOracle-bug: 14630170\n\nCC: stable@vger.kernel.org\nTested-by: Jingjie Jiang \u003cjingjie.jiang@oracle.com\u003e\nSuggested-by: Mukesh Rathor \u003cmukesh.rathor@oracle.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "2df4f26167ab6adc7d2648f57f433ff461965fc8", "tree": "3f583ae3f4b4f8b81046c75cd4f882a03c44b13a", "parents": [ "bc909421a9c7083fcde795846d22b36a51a7be54", "ed30be077e705e0dff53bfc51d23feb8aeeab78f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 30 19:48:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 30 19:48:48 2012 -0700" }, "message": "Merge tag \u0027md-3.7-fixes\u0027 of git://neil.brown.name/md\n\nPull md fixes from NeilBrown:\n \"Some fixes for md in 3.7\n - one recently introduced crash for dm-raid10 with discard\n - one bug in new functionality that has been around for a few\n releases.\n - minor bug in md\u0027s \u0027faulty\u0027 personality\n\n and UAPI disintegration for md.\"\n\n* tag \u0027md-3.7-fixes\u0027 of git://neil.brown.name/md:\n MD RAID10: Fix oops when creating RAID10 arrays via dm-raid.c\n md/raid1: Fix assembling of arrays containing Replacements.\n md faulty: use disk_stack_limits()\n UAPI: (Scripted) Disintegrate include/linux/raid\n" }, { "commit": "a0830dbd4e42b38aefdf3fb61ba5019a1a99ea85", "tree": "4dc74b708a07b56d12ed72a34d0a2e0cb8c8b9d4", "parents": [ "888ea7d5ac6815ba16b3b3a20f665a92c7af6724" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Oct 16 13:05:59 2012 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Oct 30 11:07:10 2012 +0100" }, "message": "ALSA: Add a reference counter to card instance\n\nFor more strict protection for wild disconnections, a refcount is\nintroduced to the card instance, and let it up/down when an object is\nreferred via snd_lookup_*() in the open ops.\n\nThe free-after-last-close check is also changed to check this refcount\ninstead of the empty list, too.\n\nReported-by: Matthieu CASTET \u003cmatthieu.castet@parrot.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "b3343a2a2c95b3b7ed4f6596e860c4276ba46217", "tree": "62eb61890a46176e7176b94ffcdccecfc95dd261", "parents": [ "a30134053c3c4a14049037ee41b74ab3fe57cf9e" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Tue Sep 18 00:01:12 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Mon Oct 29 22:31:49 2012 -0700" }, "message": "net, ixgbe: handle link local multicast addresses in SR-IOV mode\n\nIn SR-IOV mode the PF driver acts as the uplink port and is\nused to send control packets e.g. lldpad, stp, etc.\n\n eth0.1 eth0.2 eth0\n VF VF PF\n | | | \u003c-- stand-in for uplink\n | | |\n --------------------------\n | Embedded Switch |\n --------------------------\n |\n MAC \u003c-- uplink\n\nBut the embedded switch is setup to forward multicast addresses\nto all interfaces both VFs and PF and onto the physical link.\nThis results in reserved MAC addresses used by control protocols\nto be forwarded over the switch onto the VF.\n\nIn the LLDP case the PF sends an LLDPDU and it is currently\nbeing forwarded to all the VFs who then see the PF as a peer.\nThis is incorrect.\n\nThis patch adds the multicast addresses to the RAR table in the\nhardware to prevent this behavior.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Phil Schmitt \u003cphillip.j.schmitt@intel.com\u003e\nTested-by: Sibai Li \u003csibai.li@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "ab3d59d265e772e734c36fe738809cb1a910f566", "tree": "b6d29908d3d45b078d025341b1cc272ba4c0a6d0", "parents": [ "42d36074e53eadfd79e6db518b5caf8fba914f8b", "8c6e30936a7893a85f6222084f0f26aceb81137a" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Oct 29 16:05:51 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Oct 29 16:05:51 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n\nConflicts:\n\tdrivers/net/wireless/mwifiex/cfg80211.c\n" }, { "commit": "e298c79efcf7b88fded994a03375589d8b726ce7", "tree": "ca430a7220b7ee30c1a0aa09b5e2c1511c9d0e4c", "parents": [ "d1f10302568221c20628200bc8baa426c55f61c0", "52feb444a90304eb13c03115bb9758101dbb9254" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Oct 29 14:52:37 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Oct 29 14:52:37 2012 -0400" }, "message": "Merge tag \u0027nfc-next-3.8-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0\n\nThis is the first NFC pull request for 3.8\n\nWith this one we have:\n\n- pn544 p2p support.\n- pn544 physical and HCI layers separation. We are getting the pn544 driver\n ready to support non i2c physical layers.\n- LLCP SNL (Service Name Lookup). This is the NFC p2p service discovery\n protocol.\n- LLCP datagram sockets (connection less) support.\n- IDR library usage for NFC devices indexes assignement.\n- NFC netlink extension for setting and getting LLCP link characteristics.\n- Various code style fixes and cleanups spread over the pn533, LLCP, HCI and\n pn544 code.\n" }, { "commit": "d1f10302568221c20628200bc8baa426c55f61c0", "tree": "5eeb95d847924ec587e5e9a47ea2d2275d37635f", "parents": [ "9b34f40c20111ba658f88e1669598db494be1fbc", "1724ffbc7439de679d536163e03f54f35574d449" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Oct 29 14:52:04 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Oct 29 14:52:04 2012 -0400" }, "message": "Merge branch \u0027for-john\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next\n" }, { "commit": "efec22b4689bbfdbed26367219e981fcc946b9a6", "tree": "eee6bb1c6109dd52e4bb6113ab61ad8d5dfa8047", "parents": [ "f89ff6441df06abc2d95f3ef67525923032d6283", "6dbda2d00d466225f9db1dc695ff852443f28832" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Oct 29 14:14:48 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Oct 29 14:14:48 2012 -0400" }, "message": "Merge branch \u0027for-john\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211\n" }, { "commit": "52feb444a90304eb13c03115bb9758101dbb9254", "tree": "6cf939501bc6c51d46649a51d8cd45c3e9dea015", "parents": [ "f31652a58bee6ef145c066c8d0ae6d0b11dca1e8" ], "author": { "name": "Thierry Escande", "email": "thierry.escande@linux.intel.com", "time": "Wed Oct 17 14:43:39 2012 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Oct 29 00:25:11 2012 +0100" }, "message": "NFC: Extend netlink interface for LTO, RW, and MIUX parameters support\n\nNFC_CMD_LLC_GET_PARAMS: request LTO, RW, and MIUX parameters for a device\n\nNFC_CMD_LLC_SET_PARAMS: set one or more of LTO, RW, and MIUX parameters for\na device. LTO must be set before the link is up otherwise -EINPROGRESS is\nreturned. RW and MIUX can be set at anytime and will be passed in subsequent\nCONNECT and CC messages. If one of the passed parameters is wrong none is\nset and -EINVAL is returned.\n\nSigned-off-by: Thierry Escande \u003cthierry.escande@linux.intel.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "edc9e748934cf406cab708ca5dda7bd3c0f0a1db", "tree": "0c7e4b1aa6f747ca24f09bd4a8752032a4d22834", "parents": [ "76f8f6cb76b110aaace90b6208b1ceb46bd78b7f" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Thu Oct 25 22:28:52 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 28 19:05:00 2012 -0400" }, "message": "rtnl/ipv4: use netconf msg to advertise forwarding status\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "f3a1bfb11ccbc72d44f0b58c92115a40128979c3" }