)]}' { "log": [ { "commit": "1942c518ca017f376b267a7c5e78c15d37202442", "tree": "9ead5443adf15f2264240c928ff2514349fdcade", "parents": [ "3c4d05c8056724aff3abc20650807dd828fded54" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 09 06:23:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 09 14:14:08 2011 -0500" }, "message": "inet_diag: Generalize inet_diag dump and get_exact calls\n\nIntroduce two callbacks in inet_diag_handler -- one for dumping all\nsockets (with filters) and the other one for dumping a single sk.\n\nReplace direct calls to icsk handlers with indirect calls to callbacks\nprovided by handlers.\n\nMake existing TCP and DCCP handlers use provided helpers for icsk-s.\n\nThe UDP diag module will provide its own.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3c4d05c8056724aff3abc20650807dd828fded54", "tree": "5aed510034ceed980de3409587cbce8845229e77", "parents": [ "8d07d1518a074a08b90be02eee5ee15e60ac9779" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 09 06:23:00 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 09 14:14:08 2011 -0500" }, "message": "inet_diag: Introduce the inet socket dumping routine\n\nThe existing inet_csk_diag_fill dumps the inet connection sock info\ninto the netlink inet_diag_message. Prepare this routine to be able\nto dump only the inet_sock part of a socket if the icsk part is missing.\n\nThis will be used by UDP diag module when dumping UDP sockets.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8d07d1518a074a08b90be02eee5ee15e60ac9779", "tree": "2409c19b8dc9b5cedf4160900e87ea987c2f892a", "parents": [ "efb3cb428dcde2356802b3f93e152efa7abc5a62" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 09 06:22:44 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 09 14:14:08 2011 -0500" }, "message": "inet_diag: Introduce the byte-code run on an inet socket\n\nThe upcoming UDP module will require exactly this ability, so just\nmove the existing code to provide one.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b005ab4ef8805dc4604848c9d2ccca9d71f8fc46", "tree": "c0a057c74dae2fbcc3118a69b0ca3ed5504d3029", "parents": [ "87c22ea52e1bb467f58b3e9a71509fccb70c7bd3" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 09 06:21:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 09 14:14:08 2011 -0500" }, "message": "inet_diag: Export inet diag cookie checking routine\n\nThe netlink diag susbsys stores sk address bits in the nl message\nas a \"cookie\" and uses one when dumps details about particular\nsocket.\n\nThe same will be required for udp diag module, so introduce a heler\nin inet_diag module\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7b35eadd7eee2e0b42421ce3efbc30f1c3c745e5", "tree": "068ff7b5ba08d957978a63fedad6c2d86af48ed2", "parents": [ "a73ed26bbae7327370c5bd298f07de78df9e3466" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 09 06:21:16 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 09 14:14:07 2011 -0500" }, "message": "inet_diag: Remove indirect sizeof from inet diag handlers\n\nThere\u0027s an info_size value stored on inet_diag_handler, but for existing\ncode this value is effectively constant, so just use sizeof(struct tcp_info)\nwhere required.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a73ed26bbae7327370c5bd298f07de78df9e3466", "tree": "3c7a04e638261cdd16c324ecd07e303e72fac3b9", "parents": [ "0221cd51543972782af558c527e4ac58b32049fa" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Dec 09 02:46:45 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 09 13:46:15 2011 -0500" }, "message": "sch_red: generalize accurate MAX_P support to RED/GRED/CHOKE\n\nNow RED uses a Q0.32 number to store max_p (max probability), allow\nRED/GRED/CHOKE to use/report full resolution at config/dump time.\n\nOld tc binaries are non aware of new attributes, and still set/get Plog.\n\nNew tc binary set/get both Plog and max_p for backward compatibility,\nthey display \"probability value\" if they get max_p from new kernels.\n\n# tc -d qdisc show dev ...\n...\nqdisc red 10: parent 1:1 limit 360Kb min 30Kb max 90Kb ecn ewma 5\nprobability 0.09 Scell_log 15\n\nMake sure we avoid potential divides by 0 in reciprocal_value(), if\n(max_th - min_th) is big.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8af2a218de38f51ea4b4fa48cac1273319ae260c", "tree": "07a4557322b79878096172355fb02ab2bae3f432", "parents": [ "57459185a19b0246866479522b77cbb9732201d1" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Dec 08 06:06:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:52:43 2011 -0500" }, "message": "sch_red: Adaptative RED AQM\n\nAdaptative RED AQM for linux, based on paper from Sally FLoyd,\nRamakrishna Gummadi, and Scott Shenker, August 2001 :\n\nhttp://icir.org/floyd/papers/adaptiveRed.pdf\n\nGoal of Adaptative RED is to make max_p a dynamic value between 1% and\n50% to reach the target average queue : (max_th - min_th) / 2\n\nEvery 500 ms:\n if (avg \u003e target and max_p \u003c\u003d 0.5)\n increase max_p : max_p +\u003d alpha;\n else if (avg \u003c target and max_p \u003e\u003d 0.01)\n decrease max_p : max_p *\u003d beta;\n\ntarget :[min_th + 0.4*(min_th - max_th),\n min_th + 0.6*(min_th - max_th)].\nalpha : min(0.01, max_p / 4)\nbeta : 0.9\nmax_P is a Q0.32 fixed point number (unsigned, with 32 bits mantissa)\n\nChanges against our RED implementation are :\n\nmax_p is no longer a negative power of two (1/(2^Plog)), but a Q0.32\nfixed point number, to allow full range described in Adatative paper.\n\nTo deliver a random number, we now use a reciprocal divide (thats really\na multiply), but this operation is done once per marked/droped packet\nwhen in RED_BETWEEN_TRESH window, so added cost (compared to previous\nAND operation) is near zero.\n\ndump operation gives current max_p value in a new TCA_RED_MAX_P\nattribute.\n\nExample on a 10Mbit link :\n\ntc qdisc add dev $DEV parent 1:1 handle 10: est 1sec 8sec red \\\n limit 400000 min 30000 max 90000 avpkt 1000 \\\n burst 55 ecn adaptative bandwidth 10Mbit\n\n# tc -s -d qdisc show dev eth3\n...\nqdisc red 10: parent 1:1 limit 400000b min 30000b max 90000b ecn\nadaptative ewma 5 max_p\u003d0.113335 Scell_log 15\n Sent 50414282 bytes 34504 pkt (dropped 35, overlimits 1392 requeues 0)\n rate 9749Kbit 831pps backlog 72056b 16p requeues 0\n marked 1357 early 35 pdrop 0 other 0\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "348a1443cc4303c72cf1ee3b26e476fec8e7b5fa", "tree": "da134720dcdf4ce0cf8ba0f49cd9ee6b5dd0036b", "parents": [ "5b9ea6e022e9ba0fe39cb349ac40361f78d5da5b" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Dec 08 04:11:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:52:42 2011 -0500" }, "message": "vlan: introduce functions to do mass addition/deletion of vids by another device\n\nIntroduce functions handy to copy vlan ids from one driver\u0027s list to\nanother.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b9ea6e022e9ba0fe39cb349ac40361f78d5da5b", "tree": "11f0de492ee799fd4174f79ac6aae4c3533beb25", "parents": [ "87002b03baabd2b8f6281ab6411ed88d24958de1" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Dec 08 04:11:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:52:42 2011 -0500" }, "message": "vlan: introduce vid list with reference counting\n\nThis allows to keep track of vids needed to be in rx vlan filters of\ndevices even if they are used in bond/team etc.\n\nvlan_info as well as vlan_group previously was, is allocated when first\nvid is added and dealocated whan last vid is deleted.\n\nvlan_group definition is moved to private header.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "87002b03baabd2b8f6281ab6411ed88d24958de1", "tree": "0e5730c0d1ba887488ba420d4ea89a230f272c51", "parents": [ "8e586137e6b63af1e881b328466ab5ffbe562510" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Dec 08 04:11:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:52:42 2011 -0500" }, "message": "net: introduce vlan_vid_[add/del] and use them instead of direct [add/kill]_vid ndo calls\n\nThis patch adds wrapper for ndo_vlan_rx_add_vid/ndo_vlan_rx_kill_vid\nfunctions. Check for NETIF_F_HW_VLAN_FILTER feature is done in this\nwrapper.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8e586137e6b63af1e881b328466ab5ffbe562510", "tree": "da0767e1b1361aa24bd32f485453079e31854c0c", "parents": [ "7da82c06ded105bf601bfa0eafc92e84eb0ceeed" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Dec 08 19:52:37 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:52:37 2011 -0500" }, "message": "net: make vlan ndo_vlan_rx_[add/kill]_vid return error value\n\nLet caller know the result of adding/removing vlan id to/from vlan\nfilter.\n\nIn some drivers I make those functions to just return 0. But in those\nwhere there is able to see if hw setup went correctly, return value is\nset appropriately.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7da82c06ded105bf601bfa0eafc92e84eb0ceeed", "tree": "68d8787014addfab287626fcf36446437df9c7aa", "parents": [ "6626873980475f303367f7b709f4703b571cf854" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Dec 08 04:11:15 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:51:30 2011 -0500" }, "message": "vlan: rename vlan_dev_info to vlan_dev_priv\n\nAs this structure is priv, name it approprietely. Also for pointer to it\nuse name \"vlan\".\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "959327c7842e8621e28b89acea7d57ff02b60972", "tree": "b00de195fa401186228796abdcd16812862fbf4d", "parents": [ "f84ea779c25dabc90956f1c329e5e5c501ea96cc", "b835c0f47f725d864bf2545f10c733b754bb6d51" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 06 21:10:05 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 06 21:10:05 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "091c0f86bad6bb0b003dff2f6195508e29548648", "tree": "d04ef2b42ae456c2f281728413405c2e6af34880", "parents": [ "4fb1db334aa2569281481a09840650e7be28161d", "ddf6e0e50723b62ac76ed18eb53e9417c6eefba7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 06 11:54:33 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 06 11:54:33 2011 -0800" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n ftrace: Fix hash record accounting bug\n perf: Fix parsing of __print_flags() in TP_printk()\n jump_label: jump_label_inc may return before the code is patched\n ftrace: Remove force undef config value left for testing\n tracing: Restore system filter behavior\n tracing: fix event_subsystem ref counting\n" }, { "commit": "126fdc3249c9ced2a0d20f916858fec26a445f61", "tree": "3472fb17cbe27014ee45c70535dc96ad7ae28195", "parents": [ "d366477a52f1df29fa066ffb18e4e6101ee2ad04" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Tue Dec 06 07:58:21 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 06 13:58:01 2011 -0500" }, "message": "inet_diag: Introduce new inet_diag_req header\n\nThis one coinsides with the sock_diag_req in the beginning and\ncontains only used fields from its previous analogue.\n\nThe existing code is patched to use the _compat version of it\nfor now.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d366477a52f1df29fa066ffb18e4e6101ee2ad04", "tree": "267a65f626108423f73ef6dc0040b3b3171f7b45", "parents": [ "f13c95f0e255e6d21762259875295cc212e6bc32" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Tue Dec 06 07:58:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 06 13:58:01 2011 -0500" }, "message": "sock_diag: Initial skeleton\n\nWhen receiving the SOCK_DIAG_BY_FAMILY message we have to find the\nhandler for provided family and pass the nl message to it.\n\nThis patch describes an infrastructure to work with such nandlers\nand implements stubs for AF_INET(6) ones.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8d34172dfdb762a306cdf58b547aa10d798622ec", "tree": "5ad5bbd9117ea444eb06b0519c61f77576818d79", "parents": [ "7f1fb60c4fc9fb29fbb406ac8c4cfb4e59e168d6" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Tue Dec 06 07:57:06 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 06 13:58:01 2011 -0500" }, "message": "sock_diag: Introduce new message type\n\nThis type will run the family+protocol based socket dumping.\nAlso prepare the stub function for it.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7f1fb60c4fc9fb29fbb406ac8c4cfb4e59e168d6", "tree": "c099fd6899f382c439e29aed54c912ee95453324", "parents": [ "d5f43c1ea4260807a894150b680fa0a0dd386259" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Tue Dec 06 07:56:43 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 06 13:57:36 2011 -0500" }, "message": "inet_diag: Partly rename inet_ to sock_\n\nThe ultimate goal is to get the sock_diag module, that works in\nfamily+protocol terms. Currently this is suitable to do on the\ninet_diag basis, so rename parts of the code. It will be moved\nto sock_diag.c later.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d39aeaf260e7d1ec6a677beed230a0406d0069a6", "tree": "1f5881fc037eaf55e83d56b09cfb194274419ce4", "parents": [ "40e4783ee62ac656a9a0fa3b512b6aee4f07d2d1", "d7a4858c0fde8383f7aa494eda0fba6bef3f2fec" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Dec 06 10:47:12 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Dec 06 10:47:12 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n" }, { "commit": "45e713efe2fa574b6662e7fb63fae9497c5e03d4", "tree": "c22ff1bcc6641c8f950a2ffa257649794238ee35", "parents": [ "232ea344550c4a099d35d9df552509d6748a31c0", "61ed26e388ac67da262bb1a95d0474e4cabd4b0d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 05 16:54:15 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 05 16:54:15 2011 -0800" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n intr_remapping: Fix section mismatch in ir_dev_scope_init()\n intel-iommu: Fix section mismatch in dmar_parse_rmrr_atsr_dev()\n x86, amd: Fix up numa_node information for AMD CPU family 15h model 0-0fh northbridge functions\n x86, AMD: Correct align_va_addr documentation\n x86/rtc, mrst: Don\u0027t register a platform RTC device for for Intel MID platforms\n x86/mrst: Battery fixes\n x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode\n x86: Fix \"Acer Aspire 1\" reboot hang\n x86/mtrr: Resolve inconsistency with Intel processor manual\n x86: Document rdmsr_safe restrictions\n x86, microcode: Fix the failure path of microcode update driver init code\n Add TAINT_FIRMWARE_WORKAROUND on MTRR fixup\n x86/mpparse: Account for bus types other than ISA and PCI\n x86, mrst: Change the pmic_gpio device type to IPC\n mrst: Added some platform data for the SFI translations\n x86,mrst: Power control commands update\n x86/reboot: Blacklist Dell OptiPlex 990 known to require PCI reboot\n x86, UV: Fix UV2 hub part number\n x86: Add user_mode_vm check in stack_overflow_check\n" }, { "commit": "232ea344550c4a099d35d9df552509d6748a31c0", "tree": "2b4a1c351d290537fdf18cc5bed78bf43536f175", "parents": [ "40c043b077c6e377c8440d71563c055d0c4f0f0a", "dc440d10e1668b15fe704a23adb9b53fbbb24a44" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 05 16:54:00 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 05 16:54:00 2011 -0800" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf: Fix loss of notification with multi-event\n perf, x86: Force IBS LVT offset assignment for family 10h\n perf, x86: Disable PEBS on SandyBridge chips\n trace_events_filter: Use rcu_assign_pointer() when setting ftrace_event_call-\u003efilter\n perf session: Fix crash with invalid CPU list\n perf python: Fix undefined symbol problem\n perf/x86: Enable raw event access to Intel offcore events\n perf: Don\u0027t use -ENOSPC for out of PMU resources\n perf: Do not set task_ctx pointer in cpuctx if there are no events in the context\n perf/x86: Fix PEBS instruction unwind\n oprofile, x86: Fix crash when unloading module (nmi timer mode)\n oprofile: Fix crash when unloading module (hr timer mode)\n" }, { "commit": "7125faceabe43067293d0c9e2ef7154ecea51721", "tree": "9de559e9280843d02d9a70976fbad23428161189", "parents": [ "35337c834124d2893b7fe4ba683c7639e6c37e0c", "4cecf6d401a01d054afc1e5f605bcbfe553cb9b9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 05 16:50:24 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 05 16:50:24 2011 -0800" }, "message": "Merge branch \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n sched, x86: Avoid unnecessary overflow in sched_clock\n sched: Fix buglet in return_cfs_rq_runtime()\n sched: Avoid SMT siblings in select_idle_sibling() if possible\n sched: Set the command name of the idle tasks in SMP kernels\n sched, rt: Provide means of disabling cross-cpu bandwidth sharing\n sched: Document wait_for_completion_*() return values\n sched_fair: Fix a typo in the comment describing update_sd_lb_stats\n sched: Add a comment to effective_load() since it\u0027s a pain\n" }, { "commit": "63afe12f4be3b08597ae41ce7c0837bfc106b0ac", "tree": "c434034afbb125f4cd65b22777ded6c0fd359d70", "parents": [ "5d91c2d00a0fc10448f49b52b344e5619b99765a" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Sun Dec 04 11:22:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 05 18:27:56 2011 -0500" }, "message": "if_ether.h: Add IEEE 802.1 Local Experimental Ethertype 1.\n\nAdd EthType 0x88b5.\nThis Ethertype value is available for public use for prototype and\nvendor-specific protocol development,as defined in Amendment 802a\nto IEEE Std 802.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "27b14b56af081ec7edeefb3a38b2c9577cc5ef48", "tree": "841e01c8d64fdf08b88c8a76de3272b4630ed145", "parents": [ "cb59974742aea24adf6637eb0c4b8e7b48bca6fb" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Tue Nov 01 09:09:35 2011 +0800" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Dec 05 13:28:45 2011 -0500" }, "message": "tracing: Restore system filter behavior\n\nThough not all events have field \u0027prev_pid\u0027, it was allowed to do this:\n\n # echo \u0027prev_pid \u003d\u003d 100\u0027 \u003e events/sched/filter\n\nbut commit 75b8e98263fdb0bfbdeba60d4db463259f1fe8a2 (tracing/filter: Swap\nentire filter of events) broke it without any reason.\n\nLink: http://lkml.kernel.org/r/4EAF46CF.8040408@cn.fujitsu.com\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "f62ef5f3e9cff065aa845e2b7f487e1810b8e57e", "tree": "a519167c3e222ff162c66f5ace104a54562732de", "parents": [ "8360ee2f74bda2b794bdf4e23ab19d8b4e93807f" ], "author": { "name": "Andreas Herrmann", "email": "andreas.herrmann3@amd.com", "time": "Fri Dec 02 08:21:43 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Dec 05 18:13:11 2011 +0100" }, "message": "x86, amd: Fix up numa_node information for AMD CPU family 15h model 0-0fh northbridge functions\n\nI\u0027ve received complaints that the numa_node attribute for family\n15h model 00-0fh (e.g. Interlagos) northbridge functions shows\n-1 instead of the proper node ID.\n\nCorrect this with attached quirks (similar to quirks for other\nAMD CPU families used in multi-socket systems).\n\nSigned-off-by: Andreas Herrmann \u003candreas.herrmann3@amd.com\u003e\nCc: Frank Arnold \u003cfrank.arnold@amd.com\u003e\nCc: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\nLink: http://lkml.kernel.org/r/20111202072143.GA31916@alberich.amd.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "10c6db110d0eb4466b59812c49088ab56218fc2e", "tree": "d1d4e8debcf7415df49ce691b4c3da7443919f11", "parents": [ "16e5294e5f8303756a179cf218e37dfb9ed34417" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Sat Nov 26 02:47:31 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Dec 05 09:33:03 2011 +0100" }, "message": "perf: Fix loss of notification with multi-event\n\nWhen you do:\n $ perf record -e cycles,cycles,cycles noploop 10\n\nYou expect about 10,000 samples for each event, i.e., 10s at\n1000samples/sec. However, this is not what\u0027s happening. You\nget much fewer samples, maybe 3700 samples/event:\n\n$ perf report -D | tail -15\nAggregated stats:\n TOTAL events: 10998\n MMAP events: 66\n COMM events: 2\n SAMPLE events: 10930\ncycles stats:\n TOTAL events: 3644\n SAMPLE events: 3644\ncycles stats:\n TOTAL events: 3642\n SAMPLE events: 3642\ncycles stats:\n TOTAL events: 3644\n SAMPLE events: 3644\n\nOn a Intel Nehalem or even AMD64, there are 4 counters capable\nof measuring cycles, so there is plenty of space to measure those\nevents without multiplexing (even with the NMI watchdog active).\nAnd even with multiplexing, we\u0027d expect roughly the same number\nof samples per event.\n\nThe root of the problem was that when the event that caused the buffer\nto become full was not the first event passed on the cmdline, the user\nnotification would get lost. The notification was sent to the file\ndescriptor of the overflowed event but the perf tool was not polling\non it. The perf tool aggregates all samples into a single buffer,\ni.e., the buffer of the first event. Consequently, it assumes\nnotifications for any event will come via that descriptor.\n\nThe seemingly straight forward solution of moving the waitq into the\nringbuffer object doesn\u0027t work because of life-time issues. One could\nperf_event_set_output() on a fd that you\u0027re also blocking on and cause\nthe old rb object to be freed while its waitq would still be\nreferenced by the blocked thread -\u003e FAIL.\n\nTherefore link all events to the ringbuffer and broadcast the wakeup\nfrom the ringbuffer object to all possible events that could be waited\nupon. This is rather ugly, and we\u0027re open to better solutions but it\nworks for now.\n\nReported-by: Stephane Eranian \u003ceranian@google.com\u003e\nFinished-by: Stephane Eranian \u003ceranian@google.com\u003e\nReviewed-by: Stephane Eranian \u003ceranian@google.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/20111126014731.GA7030@quad\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "117632e64d2a5f464e491fe221d7169a3814a77b", "tree": "88f3a036305da54a62835d900553dda9bc846a8f", "parents": [ "c2e4e25afcc8ae1835a6100089f1f9fd3a362430" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Dec 03 21:39:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 04 13:20:39 2011 -0500" }, "message": "tcp: take care of misalignments\n\nWe discovered that TCP stack could retransmit misaligned skbs if a\nmalicious peer acknowledged sub MSS frame. This currently can happen\nonly if output interface is non SG enabled : If SG is enabled, tcp\nbuilds headless skbs (all payload is included in fragments), so the tcp\ntrimming process only removes parts of skb fragments, header stay\naligned.\n\nSome arches cant handle misalignments, so force a head reallocation and\nshrink headroom to MAX_TCP_HEADER.\n\nDont care about misaligments on x86 and PPC (or other arches setting\nNET_IP_ALIGN to 0)\n\nThis patch introduces __pskb_copy() which can specify the headroom of\nnew head, and pskb_copy() becomes a wrapper on top of __pskb_copy()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ccb1352e76cff0524e7ccb2074826a092dd13016", "tree": "9122ceff5d75ec64e327a9fad4ad2013744c2999", "parents": [ "75f2811c6460ccc59d83c66059943ce9c9f81a18" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Tue Oct 25 19:26:31 2011 -0700" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sat Dec 03 09:35:17 2011 -0800" }, "message": "net: Add Open vSwitch kernel components.\n\nOpen vSwitch is a multilayer Ethernet switch targeted at virtualized\nenvironments. In addition to supporting a variety of features\nexpected in a traditional hardware switch, it enables fine-grained\nprogrammatic extension and flow-based control of the network.\nThis control is useful in a wide variety of applications but is\nparticularly important in multi-server virtualization deployments,\nwhich are often characterized by highly dynamic endpoints and the need\nto maintain logical abstractions for multiple tenants.\n\nThe Open vSwitch datapath provides an in-kernel fast path for packet\nforwarding. It is complemented by a userspace daemon, ovs-vswitchd,\nwhich is able to accept configuration from a variety of sources and\ntranslate it into packet processing rules.\n\nSee http://openvswitch.org for more information and userspace\nutilities.\n\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "396cf9430505cfba529a2f2a037d782719fa5844", "tree": "d628b40d09c5e608d1bd41ac14f64774c8fddf10", "parents": [ "b4e16611c4e1cd98765269c8fdaf43f96baa57b1" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Fri Nov 18 13:15:54 2011 -0800" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sat Dec 03 09:35:09 2011 -0800" }, "message": "vlan: Move vlan_set_encap_proto() to vlan header file\n\nOpen vSwitch needs this function for vlan handling.\n\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "b4e16611c4e1cd98765269c8fdaf43f96baa57b1", "tree": "3ca0f230d24748d51726c7e5bb392529a8d65009", "parents": [ "86b1309c7e411b7c25dc0dc7a092582a4d291044" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sat Nov 19 16:21:37 2011 -0800" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sat Dec 03 09:35:08 2011 -0800" }, "message": "genetlink: Add rcu_dereference_genl and genl_dereference.\n\nThis adds rcu_dereference_genl and genl_dereference, which are genl\nvariants of the RTNL functions to enforce proper locking with lockdep\nand sparse.\n\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "86b1309c7e411b7c25dc0dc7a092582a4d291044", "tree": "b2557cbe0441d1d762e87a56e105bff6581c13e9", "parents": [ "263ba61d3b19508dfb003c215ec5d23f882b4f87" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Thu Nov 10 19:14:51 2011 -0800" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sat Dec 03 09:35:07 2011 -0800" }, "message": "genetlink: Add lockdep_genl_is_held().\n\nOpen vSwitch uses genl_mutex locking to protect datapath\ndata-structures like flow-table, flow-actions. Following patch adds\nlockdep_genl_is_held() which is used for rcu annotation to prove\nlocking.\n\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "b3613118eb30a589d971e4eccbbb2a1314f5dfd4", "tree": "868c1ee59e1b5c19a4f2e43716400d0001a994e5", "parents": [ "7505afe28c16a8d386624930a018d0052c75d687", "5983fe2b29df5885880d7fa3b91aca306c7564ef" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 02 13:49:21 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 02 13:49:21 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "0efebaa72d3b8cf377c45930c78e1a0969d6355a", "tree": "d2ca6e400a32d502160b4dc0678d57805f6e9ae7", "parents": [ "5983fe2b29df5885880d7fa3b91aca306c7564ef", "cf54d47c13c2b171f946289de445102c676d4258" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 02 08:10:51 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 02 08:10:51 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: hda - Fix S3/S4 problem on machines with VREF-pin mute-LED\n ALSA: hda_intel - revert a quirk that affect VIA chipsets\n ALSA: hda - Avoid touching mute-VREF pin for IDT codecs\n firmware: Sigma: Fix endianess issues\n firmware: Sigma: Skip header during CRC generation\n firmware: Sigma: Prevent out of bounds memory access\n ALSA: usb-audio - Support for Roland GAIA SH-01 Synthesizer\n ASoC: Supply dcs_codes for newer WM1811 revisions\n ASoC: Error out if we can\u0027t generate a LRCLK at all for WM8994\n ASoC: Correct name of Speyside Main Speaker widget\n ASoC: skip resume of soc-audio devices without codecs\n ASoC: cs42l51: Fix off-by-one for reg_cache_size\n ASoC: drop support for PlayPaq with WM8510\n ASoC: mpc8610: tell the CS4270 codec that it\u0027s the master\n ASoC: cs4720: use snd_soc_cache_sync()\n ASoC: SAMSUNG: Fix build error\n ASoC: max9877: Update register if either val or val2 is changed\n ASoC: Fix wrong define for AD1836_ADC_WORD_OFFSET\n" }, { "commit": "5983fe2b29df5885880d7fa3b91aca306c7564ef", "tree": "c9d968a776b7d1f8dc446d2857f6cefddec6edb0", "parents": [ "5611cc4572e889b62a7b4c72a413536bf6a9c416", "3ced1be5490f5c415d51a1e5918beeb9239d546b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 01 20:09:08 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 01 20:09:08 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (73 commits)\n netfilter: Remove ADVANCED dependency from NF_CONNTRACK_NETBIOS_NS\n ipv4: flush route cache after change accept_local\n sch_red: fix red_change\n Revert \"udp: remove redundant variable\"\n bridge: master device stuck in no-carrier state forever when in user-stp mode\n ipv4: Perform peer validation on cached route lookup.\n net/core: fix rollback handler in register_netdevice_notifier\n sch_red: fix red_calc_qavg_from_idle_time\n bonding: only use primary address for ARP\n ipv4: fix lockdep splat in rt_cache_seq_show\n sch_teql: fix lockdep splat\n net: fec: Select the FEC driver by default for i.MX SoCs\n isdn: avoid copying too long drvid\n isdn: make sure strings are null terminated\n netlabel: Fix build problems when IPv6 is not enabled\n sctp: better integer overflow check in sctp_auth_create_key()\n sctp: integer overflow in sctp_auth_create_key()\n ipv6: Set mcast_hops to IPV6_DEFAULT_MCASTHOPS when -1 was given.\n net: Fix corruption in /proc/*/net/dev_mcast\n mac80211: fix race between the AGG SM and the Tx data path\n ...\n" }, { "commit": "65698610f58153eb7621be3fb4f57ca318b19c60", "tree": "0a75e810c5b2572a82d9b7c6ce5e68d3629431c9", "parents": [ "84f9307c5da84a7c8513e7607dc8427d2cbd63e3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 01 14:16:04 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 01 14:16:04 2011 -0500" }, "message": "net: Make ndo_neigh_destroy return void.\n\nThe return value isn\u0027t used.\n\nSuggested by Ben Hucthings.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a367c3a82557cd11a04949ef2160658987fa772", "tree": "bec35118af9683ded1f4a8430fa66a9d63d78ed7", "parents": [ "d7d75960ea74e524d75ba8b067523471f39a7bf3" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Wed Nov 30 23:41:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 01 13:09:31 2011 -0500" }, "message": "can: cc770: add driver core for the Bosch CC770 and Intel AN82527\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7bc0f28c7a0cd19f40e5a6e4d0a117db9a4e4cd5", "tree": "4cdbf530b8ed94f73907327dd21f8303085cfc09", "parents": [ "99d2f47aa9d3ad40daa6ee0770e91b95b71082f0" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Wed Nov 30 12:20:26 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@drr.davemloft.net", "time": "Wed Nov 30 23:18:35 2011 -0500" }, "message": "netem: rate extension\n\nCurrently netem is not in the ability to emulate channel bandwidth. Only static\ndelay (and optional random jitter) can be configured.\n\nTo emulate the channel rate the token bucket filter (sch_tbf) can be used. But\nTBF has some major emulation flaws. The buffer (token bucket depth/rate) cannot\nbe 0. Also the idea behind TBF is that the credit (token in buckets) fills if\nno packet is transmitted. So that there is always a \"positive\" credit for new\npackets. In real life this behavior contradicts the law of nature where\nnothing can travel faster as speed of light. E.g.: on an emulated 1000 byte/s\nlink a small IPv4/TCP SYN packet with ~50 byte require ~0.05 seconds - not 0\nseconds.\n\nNetem is an excellent place to implement a rate limiting feature: static\ndelay is already implemented, tfifo already has time information and the\nuser can skip TBF configuration completely.\n\nThis patch implement rate feature which can be configured via tc. e.g:\n\n\ttc qdisc add dev eth0 root netem rate 10kbit\n\nTo emulate a link of 5000byte/s and add an additional static delay of 10ms:\n\n\ttc qdisc add dev eth0 root netem delay 10ms rate 5KBps\n\nNote: similar to TBF the rate extension is bounded to the kernel timing\nsystem. Depending on the architecture timer granularity, higher rates (e.g.\n10mbit/s and higher) tend to transmission bursts. Also note: further queues\nliving in network adaptors; see ethtool(8).\n\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@drr.davemloft.net\u003e\n" }, { "commit": "da6a8fa0275e2178c44a875374cae80d057538d1", "tree": "6a9df6b3b9e268ca463fdb47d9041883acc923ea", "parents": [ "869759b9e4160fb8a8d25bc3b4ce3b658523aebb" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Mon Jul 25 00:01:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 18:48:03 2011 -0500" }, "message": "neigh: Add device constructor/destructor capability.\n\nIf the neigh entry has device private state, it will need\nconstructor/destructor ops.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "596b9b68ef118f7409afbc78487263e08ef96261", "tree": "0def3e591a0d5ede89e85339e35da3072f09330c", "parents": [ "5b8b0060cbd6332ae5d1fa0bec0e8e211248d0e7" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Mon Jul 25 00:01:25 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 18:46:43 2011 -0500" }, "message": "neigh: Add infrastructure for allocating device neigh privates.\n\nnetdev-\u003eneigh_priv_len records the private area length.\n\nThis will trigger for neigh_table objects which set tbl-\u003eentry_size\nto zero, and the first instances of this will be forthcoming.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8cd7920370a3715ccbd1c98bf33f172b8837dc0b", "tree": "6ee969f2a1e235ed37348f841c3f15a03cfdff1e", "parents": [ "57db53b07429c0d648f48727dd6c7c2b64c5708d", "f7bc83d87d242917ca0ee041ed509f57f361dd56" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 29 14:43:22 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 29 14:43:22 2011 -0800" }, "message": "Merge branch \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM: Update comments describing device power management callbacks\n PM / Sleep: Update documentation related to system wakeup\n PM / Runtime: Make documentation follow the new behavior of irq_safe\n PM / Sleep: Correct inaccurate information in devices.txt\n PM / Domains: Document how PM domains are used by the PM core\n PM / Hibernate: Do not leak memory in error/test code paths\n" }, { "commit": "114cf5802165ee93e3ab461c9c505cd94a08b800", "tree": "88208dddd7c1e90f5e1a840ad0ad7afcea991050", "parents": [ "927fbec13e40648d3c87cbb1daaac5b1fb9c8775" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Mon Nov 28 16:33:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 12:46:19 2011 -0500" }, "message": "bql: Byte queue limits\n\nNetworking stack support for byte queue limits, uses dynamic queue\nlimits library. Byte queue limits are maintained per transmit queue,\nand a dql structure has been added to netdev_queue structure for this\npurpose.\n\nConfiguration of bql is in the tx-\u003cn\u003e sysfs directory for the queue\nunder the byte_queue_limits directory. Configuration includes:\nlimit_min, bql minimum limit\nlimit_max, bql maximum limit\nhold_time, bql slack hold time\n\nAlso under the directory are:\nlimit, current byte limit\ninflight, current number of bytes on the queue\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c5d67bd78c5dc540e3461c36fb3d389fbe0de4c3", "tree": "e0536d39c7f01adc4b6041806aea15deccee8a8b", "parents": [ "7346649826382b769cfadf4a2fe8a84d060c55e9" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Mon Nov 28 16:32:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 12:46:19 2011 -0500" }, "message": "net: Add netdev interfaces for recording sends/comp\n\nAdd interfaces for drivers to call for recording number of packets and\nbytes at send time and transmit completion. Also, added a function to\n\"reset\" a queue. These will be used by Byte Queue Limits.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7346649826382b769cfadf4a2fe8a84d060c55e9", "tree": "0241cce453992881f61d3fbc4f9baf7eb0578135", "parents": [ "75957ba36c05b979701e9ec64b37819adc12f830" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Mon Nov 28 16:32:44 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 12:46:19 2011 -0500" }, "message": "net: Add queue state xoff flag for stack\n\nCreate separate queue state flags so that either the stack or drivers\ncan turn on XOFF. Added a set of functions used in the stack to determine\nif a queue is really stopped (either by stack or driver)\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "75957ba36c05b979701e9ec64b37819adc12f830", "tree": "c980b8489d6c09cc71ce80f61fb892e3c8806c96", "parents": [ "85c10f28286148ee5cdba1d22c81936ff160596e" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Mon Nov 28 16:32:35 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 12:46:19 2011 -0500" }, "message": "dql: Dynamic queue limits\n\nImplementation of dynamic queue limits (dql). This is a libary which\nallows a queue limit to be dynamically managed. The goal of dql is\nto set the queue limit, number of objects to the queue, to be minimized\nwithout allowing the queue to be starved.\n\ndql would be used with a queue which has these properties:\n\n1) Objects are queued up to some limit which can be expressed as a\n count of objects.\n2) Periodically a completion process executes which retires consumed\n objects.\n3) Starvation occurs when limit has been reached, all queued data has\n actually been consumed but completion processing has not yet run,\n so queuing new data is blocked.\n4) Minimizing the amount of queued data is desirable.\n\nA canonical example of such a queue would be a NIC HW transmit queue.\n\nThe queue limit is dynamic, it will increase or decrease over time\ndepending on the workload. The queue limit is recalculated each time\ncompletion processing is done. Increases occur when the queue is\nstarved and can exponentially increase over successive intervals.\nDecreases occur when more data is being maintained in the queue than\nneeded to prevent starvation. The number of extra objects, or \"slack\",\nis measured over successive intervals, and to avoid hysteresis the\nlimit is only reduced by the miminum slack seen over a configurable\ntime period.\n\ndql API provides routines to manage the queue:\n- dql_init is called to intialize the dql structure\n- dql_reset is called to reset dynamic values\n- dql_queued called when objects are being enqueued\n- dql_avail returns availability in the queue\n- dql_completed is called when objects have be consumed in the queue\n\nConfiguration consists of:\n- max_limit, maximum limit\n- min_limit, minimum limit\n- slack_hold_time, time to measure instances of slack before reducing\n queue limit\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bda63586bc5929e97288cdb371bb6456504867ed", "tree": "3e3bf8635b430858b44e43dd8b8c8cfd682fe8c5", "parents": [ "c56935bdc0a8edf50237d3b0205133a5b0adc604" ], "author": { "name": "Lars-Peter Clausen", "email": "lars@metafoo.de", "time": "Mon Nov 28 09:44:16 2011 +0100" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Nov 29 11:59:50 2011 +0000" }, "message": "firmware: Sigma: Fix endianess issues\n\nCurrently the SigmaDSP firmware loader only works correctly on little-endian\nsystems. Fix this by using the proper endianess conversion functions.\n\nSigned-off-by: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "4f718a29fe4908c2cea782f751e9805319684e2b", "tree": "e4d9d630d4200a40bcc96b2a168828f8fb4ed1df", "parents": [ "fc8e6e8668e74fbf8e00d6e143d7f43b20f73f32" ], "author": { "name": "Lars-Peter Clausen", "email": "lars@metafoo.de", "time": "Mon Nov 28 09:44:14 2011 +0100" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Nov 29 11:53:53 2011 +0000" }, "message": "firmware: Sigma: Prevent out of bounds memory access\n\nThe SigmaDSP firmware loader currently does not perform enough boundary size\nchecks when processing the firmware. As a result it is possible that a\nmalformed firmware can cause an out of bounds memory access.\n\nThis patch adds checks which ensure that both the action header and the payload\nare completely inside the firmware data boundaries before processing them.\n\nSigned-off-by: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "5cac98dd06bc43a7baab3523184f70fd359e9f35", "tree": "454623a8d7ba16e94b97d9e3107f0ac4c43164d9", "parents": [ "c4860ba2e11261a541632ceee8267ca490d9eb98" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Sun Nov 27 21:14:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 28 18:07:29 2011 -0500" }, "message": "net: Fix corruption in /proc/*/net/dev_mcast\n\nI just hit this during my testing. Isn\u0027t there another bug lurking?\n\nBUG kmalloc-8: Redzone overwritten\n\nINFO: 0xc0000000de9dec48-0xc0000000de9dec4b. First byte 0x0 instead of 0xcc\nINFO: Allocated in .__seq_open_private+0x30/0xa0 age\u003d0 cpu\u003d5 pid\u003d3896\n\t.__kmalloc+0x1e0/0x2d0\n\t.__seq_open_private+0x30/0xa0\n\t.seq_open_net+0x60/0xe0\n\t.dev_mc_seq_open+0x4c/0x70\n\t.proc_reg_open+0xd8/0x260\n\t.__dentry_open.clone.11+0x2b8/0x400\n\t.do_last+0xf4/0x950\n\t.path_openat+0xf8/0x480\n\t.do_filp_open+0x48/0xc0\n\t.do_sys_open+0x140/0x250\n\tsyscall_exit+0x0/0x40\n\ndev_mc_seq_ops uses dev_seq_start/next/stop but only allocates\nsizeof(struct seq_net_private) of private data, whereas it expects\nsizeof(struct dev_iter_state):\n\nstruct dev_iter_state {\n\tstruct seq_net_private p;\n\tunsigned int pos; /* bucket \u003c\u003c BUCKET_SPACE + offset */\n};\n\nCreate dev_seq_open_ops and use it so we don\u0027t have to expose\nstruct dev_iter_state.\n\n[ Problem added by commit f04565ddf52e4 (dev: use name hash for\n dev_seq_ops) -Eric ]\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f7bc83d87d242917ca0ee041ed509f57f361dd56", "tree": "653cda4900d19c8193141dd3f9035f24a933c7ba", "parents": [ "fafba48d4dd6fcbb1fd7ac4ab0ba22ef45b9796c" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Nov 23 21:20:32 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Nov 28 22:14:55 2011 +0100" }, "message": "PM: Update comments describing device power management callbacks\n\nThe comments describing device power management callbacks in\ninclude/pm.h are outdated and somewhat confusing, so make them\nreflect the reality more accurately.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "dca7e9430cb3e492437a5ce891b8b3e315c147ca", "tree": "a7503e86e20e649074bbaccd5272d61a51425e2e", "parents": [ "d3c1597b8d1ba0447ce858c7c385eabcf69f2c8f" ], "author": { "name": "Thomas Pedersen", "email": "thomas@cozybit.com", "time": "Thu Nov 24 17:15:24 2011 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 28 14:44:06 2011 -0500" }, "message": "{nl,cfg,mac}80211: implement dot11MeshHWMPperrMinInterval\n\nAs per 802.11mb 13.9.11.3\n\nSigned-off-by: Thomas Pedersen \u003cthomas@cozybit.com\u003e\nSigned-off-by: Javier Cardona \u003cjavier@cozybit.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "1d9d9213d526f2f4ef9a3aa198a29a0b1a670fa1", "tree": "34eadd9e3544cbb01c6768dee820d5430db10edc", "parents": [ "6fd67e937ece538e0ab766df96a9895e6fd622df" ], "author": { "name": "Simon Wunderlich", "email": "simon.wunderlich@s2003.tu-chemnitz.de", "time": "Fri Nov 18 14:20:43 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 28 14:36:21 2011 -0500" }, "message": "wireless: Add NoAck per tid support\n\nThis patch contains the configuration changes in nl80211/cfg80211.\n\nSigned-off-by: Simon Wunderlich \u003csiwu@hrz.tu-chemnitz.de\u003e\nSigned-off-by: Mathias Kretschmer \u003cmathias.kretschmer@fokus.fraunhofer.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "cb3599926e3e7b3678583195effa61a03026ab0e", "tree": "775419d69e8732ba3f4933d3b7a07e98ae555458", "parents": [ "4244cb482e8eab18142162a27c8829a04585863a", "f6f8285132907757ef84ef8dae0a1244b8cde6ac" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 28 11:27:57 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 28 11:27:57 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:\n pstore: pass allocated memory region back to caller\n" }, { "commit": "39338b56382ac640614851a80e0bd71994cc664d", "tree": "c319e23181be286b1d320c29f755a81e5ef61172", "parents": [ "8b7ff200010600ef7cd9d002f9f8f97edfc7578e", "eb1852b10593dc3ca73e02bf9ac4753a5a464905" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 28 14:11:18 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 28 14:11:18 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n" }, { "commit": "c28800a9c3caaf387d85ac665a25ebe99e480295", "tree": "401ba805709a65a9f5c1919b3dc763c70b64b38f", "parents": [ "ce8f55c2a0ff652480c12a4f1f22ff5ce15e3a22", "27c9cd7e601632b3794e1c3344d37b86917ffb43" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 28 08:43:52 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 28 08:43:52 2011 -0800" }, "message": "Merge branch \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n hrtimer: Fix extra wakeups from __remove_hrtimer()\n timekeeping: add arch_offset hook to ktime_get functions\n clocksource: Avoid selecting mult values that might overflow when adjusted\n time: Improve documentation of timekeeeping_adjust()\n" }, { "commit": "60d6fe99e4a507f77b63c090eb8aacb67e21687a", "tree": "52473d54554d44fbaf2b020fd203965b934ccaeb", "parents": [ "559a9f1d354b577af28f84181751820ff7d29feb" ], "author": { "name": "Amir Vadai", "email": "amirv@mellanox.co.il", "time": "Sat Nov 26 19:55:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 27 17:17:04 2011 -0500" }, "message": "net/mlx4_en: adding loopback support\n\nDevice must be in promiscuous mode or DMAC must be same as the host MAC, or\nelse packet will be dropped by the HW rx filtering.\n\nSigned-off-by: Amir Vadai \u003camirv@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "559a9f1d354b577af28f84181751820ff7d29feb", "tree": "e148a9161da5a03d8778e05d1492955f8d38e0ac", "parents": [ "f0ab34f011d805ce5b1a341409c9c26f0fc8252b" ], "author": { "name": "Oren Duer", "email": "oren@mellanox.co.il", "time": "Sat Nov 26 19:55:15 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 27 17:17:04 2011 -0500" }, "message": "net/mlx4_en: fix WOL handlers were always looking at port2 capability bit\n\nThere are 2 capability bits for WOL, one for each port.\nWOL handlers were looking only on the second bit, regardless of the port.\n\nSigned-off-by: Oren Duer \u003coren@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "876f6e67d1c617c098c67934a8d00b065bb9688b", "tree": "1d66f498806971c4369f6d152046bcb163ee528f", "parents": [ "fd4f862717ece652a76b4bb6c6d2c9656dbf0f7e" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@mellanox.com", "time": "Sat Nov 26 19:54:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 27 17:17:03 2011 -0500" }, "message": "net/mlx4: move RSS related definitions to be global\n\nTowards adding RSS support for IB drivers/application who use\nthe mlx4 HW, make the RSS related definitions global and change\nthe mlx4_en driver to use them.\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: Shlomo Pongratz \u003cshlomop@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "49f5ed4250c757cb19d953fcac2737a35ca14d76", "tree": "065c6a559b1b8b0a81f62f100804694a05659484", "parents": [ "021ac8d387594bdf51d9a279b2f9e9defb614c9b" ], "author": { "name": "chas williams - CONTRACTOR", "email": "chas@cmf.nrl.navy.mil", "time": "Tue Nov 22 12:51:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 16:40:30 2011 -0500" }, "message": "atm: eliminate atm_guess_pdu2truesize()\n\nSigned-off-by: Chas Williams - CONTRACTOR \u003cchas@cmf.nrl.navy.mil\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "072bc80156729f853e8bcafe1b17c48c74462887", "tree": "fd48bf8aa8e730a75ea40375275e75afa0d2994e", "parents": [ "b30f8bdcfa7dd05f4268348f3388ff903132f28e" ], "author": { "name": "Ben Dooks", "email": "ben@simtec.co.uk", "time": "Mon Nov 21 08:57:57 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:59:39 2011 -0500" }, "message": "eeprom_93cx6: Add write support\n\nAdd support for writing data to EEPROM.\n\nSigned-off-by: Ben Dooks \u003cben@simtec.co.uk\u003e\nCc: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Linux Kernel \u003clinux-kernel@vger.kernel.org\u003e\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b30f8bdcfa7dd05f4268348f3388ff903132f28e", "tree": "6781a42fe2cfe8eacc2ba981cab8cec594f7bfef", "parents": [ "e9008ee99c77207b2f6aee67e5f849b1e1400a11" ], "author": { "name": "Ben Dooks", "email": "ben@simtec.co.uk", "time": "Mon Nov 21 08:57:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:59:38 2011 -0500" }, "message": "eeprom_93cx6: Add data direction control.\n\nSome devices need to know if the data is to be output or read, so add a\ndata direction into the eeprom structure to tell the driver whether the\ndata line should be driven.\n\nThe user in this case is the Micrel KS8851 which has a direction\ncontrol for the EEPROM data line and thus needs to know whether\nto drive it (writing) or to tristate it for receiving.\n\nSigned-off-by: Ben Dooks \u003cben@simtec.co.uk\u003e\nCc: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Jean Delvare \u003ckhali@linux-fr.org\u003e\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d11ead75672d655652dbfc1b1a2c359e5b65536d", "tree": "5b70f38a5650839c104a3a2355794f7dd726e164", "parents": [ "34a430d7bd26b35ca3a7d3fc83663de8ea6e33f6" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Fri Nov 25 14:40:26 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:48:16 2011 -0500" }, "message": "net: Use IS_ENABLED() in netdevice.h as appropriate\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "34a430d7bd26b35ca3a7d3fc83663de8ea6e33f6", "tree": "8646a156a13e68babdc8daa85bec607c68bc7800", "parents": [ "3d825ede8c79a4799a6a3c34719551c7c1908b96" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Fri Nov 25 14:38:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:48:16 2011 -0500" }, "message": "dsa: Allow core and drivers to be built as modules\n\nChange the kconfig types to tristate and adjust the condition for\ndeclaring net_device::dsa_ptr to allow for this.\n\nAdjust the makefile so that if NET_DSA_MV88E6123_61_65\u003dy and\nNET_DSA_MV88E6131\u003dm or vice versa then both drivers are built-in. We\ncould leave these options as bool and make NET_DSA_MV88E6XXX a\nuser-selected option, but that would break existing configurations.\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cf50dcc24f82a6dc2bce523eec2a979eb1b106e2", "tree": "579bd064fc0ee8475ca5c8e5d5f6295b82247c3a", "parents": [ "6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Fri Nov 25 14:32:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:48:14 2011 -0500" }, "message": "dsa: Change dsa_uses_{dsa, trailer}_tags() into inline functions\n\neth_type_trans() will use these functions if DSA is enabled, which\nblocks building DSA as a module.\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c", "tree": "cd71e597bbbe677820bb229c6aedbad412758959", "parents": [ "d6f03f29f7cdf064289f941bf0b838348e996e65", "fc0b927d9a5024e138c4318fe19a590f23e3eeec" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:47:03 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:47:03 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tnet/ipv4/inet_diag.c\n" }, { "commit": "9b82e65d65c90faecc408bcdc14a0229736ed193", "tree": "2cf5fd4f4df01c6488afd0046325405381a73e36", "parents": [ "8174a06eba10a43375d1dd6f74c58a71519e3be5", "e6af578c5305be693a1bc7f4dc7b51dd82d41425" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 20:19:31 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 20:19:31 2011 -0800" }, "message": "Merge git://github.com/rustyrussell/linux\n\n* git://github.com/rustyrussell/linux:\n virtio-pci: make reset operation safer\n virtio-mmio: Correct the name of the guest features selector\n virtio: add HAS_IOMEM dependency to MMIO platform bus driver\n" }, { "commit": "e6af578c5305be693a1bc7f4dc7b51dd82d41425", "tree": "7276a130a2d2eddf84660ec2573298e26611a442", "parents": [ "fe1a7fe2c4456679b3402f04268bdfafca7b127a" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu Nov 17 17:41:15 2011 +0200" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Nov 24 13:04:48 2011 +1030" }, "message": "virtio-pci: make reset operation safer\n\nvirtio pci device reset actually just does an I/O\nwrite, which in PCI is really posted, that is it\ncan complete on CPU before the device has received it.\n\nFurther, interrupts might have been pending on\nanother CPU, so device callback might get invoked after reset.\n\nThis conflicts with how drivers use reset, which is typically:\n\treset\n\tunregister\na callback running after reset completed can race with\nunregister, potentially leading to use after free bugs.\n\nFix by flushing out the write, and flushing pending interrupts.\n\nThis assumes that device is never reset from\nits vq/config callbacks, or in parallel with being\nadded/removed, document this assumption.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "fe1a7fe2c4456679b3402f04268bdfafca7b127a", "tree": "e792020a75a1cd7b2b8d4d41aae7c223d1ade046", "parents": [ "bd20817f733ceb0291e0449106307ffc939006ba" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Tue Nov 15 16:17:18 2011 +0200" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Nov 24 13:04:47 2011 +1030" }, "message": "virtio-mmio: Correct the name of the guest features selector\n\nGuest features selector spelling mistake.\n\nCc: Pawel Moll \u003cpawel.moll@arm.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: virtualization@lists.linux-foundation.org\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "09521577ca7718b6c83f095ca4f0d474b01a8378", "tree": "56bbc5f0ac255f36a0935d3ba4e0a4702203dc66", "parents": [ "de7badf1adc7cc95269ac4b435da23c169018a3e", "4cac2eb158c6da0c761689345c6cc5df788a6292" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 14:58:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 14:58:46 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:\n PCI hotplug: shpchp: don\u0027t blindly claim non-AMD 0x7450 device IDs\n PCI: pciehp: wait 100 ms after Link Training check\n PCI: pciehp: wait 1000 ms before Link Training check\n PCI: pciehp: Retrieve link speed after link is trained\n PCI: Let PCI_PRI depend on PCI\n PCI: Fix compile errors with PCI_ATS and !PCI_IOV\n PCI / ACPI: Make acpiphp ignore root bridges using PCIe native hotplug\n" }, { "commit": "5907c5f8adbd0bb7ab69124520304e5b25c8eb5e", "tree": "c3e1bc99f41c74b369293c74a1752e57e538f706", "parents": [ "0a2c986557b964453f8deeaf56f6d88bf3e65e92", "eff245c82f115059648cdce95dd68bb940f2b006" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 09:50:05 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 09:50:05 2011 -0800" }, "message": "Merge branch \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n i2c: Make i2cdev_notifier_call static\n i2c: Delete ANY_I2C_BUS\n i2c: Fix device name for 10-bit slave address\n i2c-algo-bit: Generate correct i2c address sequence for 10-bit target\n" }, { "commit": "0a2c986557b964453f8deeaf56f6d88bf3e65e92", "tree": "7b27e1afff3e5380826d62b2f5bb50533ade4fec", "parents": [ "2d0f2400a49be3a177695eda381d91fec18cbd0e", "780dc9ba4eb682a89be48d5b814feae6722a19e0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 09:49:39 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 09:49:39 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:\n regulator: TPS65910: Fix VDD1/2 voltage selector count\n" }, { "commit": "780dc9ba4eb682a89be48d5b814feae6722a19e0", "tree": "5ddac04630d0bcaf0405c4f5f08793ca68c3439c", "parents": [ "cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37" ], "author": { "name": "Afzal Mohammed", "email": "afzal@ti.com", "time": "Tue Nov 08 18:54:10 2011 +0530" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed Nov 23 14:03:52 2011 +0000" }, "message": "regulator: TPS65910: Fix VDD1/2 voltage selector count\n\nCount of selector voltage is required for regulator_set_voltage\nto work via set_voltage_sel. VDD1/2 currently have it as zero,\nso regulator_set_voltage won\u0027t work for VDD1/2.\nUpdate count (n_voltages) for VDD1/2.\n\nOutput Voltage \u003d (step value * 12.5 mV + 562.5 mV) * gain\n\nWith above expr, number of voltages that can be selected is\nstep value count * gain count\n\nconstant for gain count will be called VDD1_2_NUM_VOLT_COARSE\n\nexisting constant for step value count is VDD1_2_NUM_VOLTS,\nuse VDD1_2_NUM_VOLT_FINE instead to make clear that step value\nis not the only component in deciding selectable voltage count\n\nSigned-off-by: Afzal Mohammed \u003cafzal@ti.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "67820021dc9c8da37f773025190280f55f3626d4", "tree": "44957ea27a84752357b502b6b36abe64d39c6a39", "parents": [ "cbb44514048a250647c6c6b3df27ff62cb71f7d5" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Nov 23 11:33:07 2011 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed Nov 23 11:33:07 2011 +0100" }, "message": "i2c: Delete ANY_I2C_BUS\n\nLast piece of code using ANY_I2C_BUS was deleted almost 2 years ago,\nso ANY_I2C_BUS can go away as well.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "1f2149c1df50c8c712950872675f46e6e44629f0", "tree": "a33a556696e27611b6b38cdcbb6de9315f483bd4", "parents": [ "84b405011166e663fe9ef56c29b1d76f59b35568" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Nov 22 10:57:41 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 16:43:32 2011 -0500" }, "message": "net: remove netdev_alloc_page and use __GFP_COLD\n\nGiven we dont use anymore the struct net_device *dev argument, and this\ninterface brings litle benefit, remove netdev_{alloc|free}_page(), to\ndebloat include/linux/skbuff.h a bit.\n\n(Some drivers used a mix of these interfaces and alloc_pages())\n\nWhen allocating a page given to device for DMA transfer (device to\nmemory), it makes sense to use a cold one (__GFP_COLD)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nCC: Dimitris Michailidis \u003cdm@chelsio.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4e3fd7a06dc20b2d8ec6892233ad2012968fe7b6", "tree": "da3fbec7672ac6b967dfa31cec6c88f468a57fa2", "parents": [ "40ba84993d66469d336099c5af74c3da5b73e28d" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon Nov 21 03:39:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 16:43:32 2011 -0500" }, "message": "net: remove ipv6_addr_copy()\n\nC assignment can handle struct in6_addr copying.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5eccdf5e06eb67779716ae26142402a1ae9b012c", "tree": "1e4d46e97b4d5bdfb4e33fc452e68e129c4dfe1a", "parents": [ "20e994a05b33b186a22a3b9e922df4cce644daac" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Nov 21 06:53:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 16:37:01 2011 -0500" }, "message": "tc: comment spelling fixes\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5bc1421e34ecfe0bd4b26dc3232b7d5e25179144", "tree": "783ed95187915c06757a260b637308919b35d5a0", "parents": [ "202ff1c26c768efeead20b388556eda265dc8352" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Tue Nov 22 05:10:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 15:22:23 2011 -0500" }, "message": "net: add network priority cgroup infrastructure (v4)\n\nThis patch adds in the infrastructure code to create the network priority\ncgroup. The cgroup, in addition to the standard processes file creates two\ncontrol files:\n\n1) prioidx - This is a read-only file that exports the index of this cgroup.\nThis is a value that is both arbitrary and unique to a cgroup in this subsystem,\nand is used to index the per-device priority map\n\n2) priomap - This is a writeable file. On read it reports a table of 2-tuples\n\u003cname:priority\u003e where name is the name of a network interface and priority is\nindicates the priority assigned to frames egresessing on the named interface and\noriginating from a pid in this cgroup\n\nThis cgroup allows for skb priority to be set prior to a root qdisc getting\nselected. This is benenficial for DCB enabled systems, in that it allows for any\napplication to use dcb configured priorities so without application modification\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nCC: Robert Love \u003crobert.w.love@intel.com\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "570e57bcbcc4df5581b1e9c806ab2b16e96ea7d3", "tree": "ce1275a45614d7249b2fbf55f87f423a409e7b50", "parents": [ "a2d7ec58ac09f30ab726f216827f7c7095b2a98f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Nov 21 19:51:34 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 15:15:57 2011 -0500" }, "message": "atm: use SKB_TRUESIZE() in atm_guess_pdu2truesize()\n\nSKB_TRUESIZE() provides a better approximation of expected skb truesize.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "515db09338704a6ad7d27b5f1e33820d3052edd2", "tree": "74f915531710303397d34069b325c2be7a5ac93c", "parents": [ "30be52e44fd4276d768efffb55d424fb682e6505", "cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Nov 22 14:05:46 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Nov 22 14:05:46 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux\n\nConflicts:\n\tdrivers/net/wireless/iwlegacy/iwl-debugfs.c\n\tdrivers/net/wireless/iwlegacy/iwl-rx.c\n\tdrivers/net/wireless/iwlegacy/iwl-scan.c\n\tdrivers/net/wireless/iwlegacy/iwl-tx.c\n\tinclude/net/bluetooth/bluetooth.h\n" }, { "commit": "e25ba0ce039d1c5cae0b0057e4b9e228dc6744bd", "tree": "3f5d705161f24c6a9dc36c1947ce7f81e53db41b", "parents": [ "af36d15f58a3560617f1497ae011c3192049e40e", "62e4a76987eab2b7fa952546614bc83e5bfc9d3e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 22 08:54:15 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 22 08:54:15 2011 -0800" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n NFS: Revert pnfs ugliness from the generic NFS read code path\n SUNRPC: destroy freshly allocated transport in case of sockaddr init error\n NFS: Fix a regression in the referral code\n nfs: move nfs_file_operations declaration to bottom of file.c (try #2)\n nfs: when attempting to open a directory, fall back on normal lookup (try #5)\n" }, { "commit": "8ba8ed54de4dd79bb88ab6cd7dbf2e83d58d6d57", "tree": "d4d1c687f1b7f58783103b43a04618d8e4019bba", "parents": [ "bbbc4791cd48ac12996e43c0033b504c79b53639", "468e6a20afaccb67e2a7d7f60d301f90e1c6f301" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 22 08:22:48 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 22 08:22:48 2011 -0800" }, "message": "Merge branch \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux\n\n* \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:\n writeback: remove vm_dirties and task-\u003edirties\n writeback: hard throttle 1000+ dd on a slow USB stick\n mm: Make task in balance_dirty_pages() killable\n" }, { "commit": "3b9abc7e48561b0b140ee267e190bc1031f82ff3", "tree": "ec5d8174f89cb8555c74eb3eb770054aa22fc724", "parents": [ "0cda56962b883cd5e7aa036350e5a0283a88c590", "0c73c08ec73dbe080b9ec56696ee21d32754d918" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 20:36:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 20:36:46 2011 -0800" }, "message": "Merge branch \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\n* \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n TTY: ldisc, wait for ldisc infinitely in hangup\n TTY: ldisc, move wait idle to caller\n TTY: ldisc, allow waiting for ldisc arbitrarily long\n Revert \"tty/serial: Prevent drop of DCD on suspend for Tegra UARTs\"\n RS485: fix inconsistencies in the meaning of some variables\n pch_uart: Fix DMA resource leak issue\n serial,mfd: Fix CMSPAR setup\n tty/serial: Prevent drop of DCD on suspend for Tegra UARTs\n pch_uart: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor\n pch_uart: Support new device LAPIS Semiconductor ML7831 IOH\n pch_uart: Fix hw-flow control issue\n tty: hvc_dcc: Fix duplicate character inputs\n jsm: Change maintainership\n" }, { "commit": "0cda56962b883cd5e7aa036350e5a0283a88c590", "tree": "acb54a8550f3d768a45ad297761f8f6cba90d19e", "parents": [ "b0d81664a0092d8f6df7742b5aee6fcfd326b36c", "91a13c281d7d4648c0b32dede11a0144c4e7984c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 20:36:26 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 20:36:26 2011 -0800" }, "message": "Merge branch \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\n* \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:\n drivers/base/node.c: fix compilation error with older versions of gcc\n uio: documentation fixups\n device.h: Fix struct member documentation\n" }, { "commit": "a2d7ec58ac09f30ab726f216827f7c7095b2a98f", "tree": "1b733090406abc18c42308e84703dcb703e15125", "parents": [ "9205fd9ccab8ef51ad771c1917eed7b2f2225d45" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Nov 18 17:32:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 16:38:08 2011 -0500" }, "message": "netfilter: use jump_label for nf_hooks\n\nOn configs where CONFIG_JUMP_LABEL\u003dy, we can replace in fast path a\nload/compare/conditional jump by a single jump with no dcache reference.\n\nJump target is modified as soon as nf_hooks[pf][hook] switches from\nempty state to non empty states. jump_label state is kept outside of\nnf_hooks array so has no cost on cpu caches.\n\nThis patch removes the test on CONFIG_NETFILTER_DEBUG : No need to call\nnf_hook_slow() at all if nf_hooks[pf][hook] is empty, this didnt give\nuseful information, but slowed down things a lot.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nCC: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7e7c8926b2f4e3453b8aeb39cd814d2af3fec24f", "tree": "e22df42bf84d6ea3cb67ae0e332d7d7d10cca4b4", "parents": [ "dd76986b0e398978ca32dd60c1b7dc50ab4e9ae1" ], "author": { "name": "Ben Greear", "email": "greearb@candelatech.com", "time": "Fri Nov 18 11:31:59 2011 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 21 16:22:06 2011 -0500" }, "message": "wireless: Support ht-capabilities over-rides.\n\nThis allows users to disable features such as HT, HT40,\nand to modify the MCS, AMPDU, and AMSDU settings for\ndrivers that support it.\n\nThe MCS, AMPDU, and AMSDU features that may be disabled are\nare reported in the phy-info netlink message as a mask.\n\nAttemping to disable features that are not supported will\ntake no affect, but will not return errors. This is to aid\nbackwards compatibility in user-space apps that may not be\nclever enough to deal with parsing the the capabilities mask.\n\nThis patch only enables the infrastructure. An additional\npatch will enable the feature in mac80211.\n\nSigned-off-by: Ben Greear \u003cgreearb@candelatech.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8b60b07805d557542160d852874fa6a1b969184e", "tree": "74b96b63c62cf7cef9684c19bda8f8d51ceabe0d", "parents": [ "4713e962c5d98901890c446843ae4e0a9d37b7b3" ], "author": { "name": "Luis R. Rodriguez", "email": "mcgrof@qca.qualcomm.com", "time": "Tue Oct 11 10:59:02 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 21 16:20:41 2011 -0500" }, "message": "cfg80211: process regulatory DFS region for countries\n\nThe wireless-regdb now has support for mapping a country to\none DFS region. CRDA sends this to us now so process it\nso we can provide that hint to drivers. This will later be\nused by code for processing DFS in a way that meets the\ncriteria for the DFS region the country belongs to.\n\nSigned-off-by: Luis R. Rodriguez \u003cmcgrof@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "37f07023d30708b5da091fe6d6be9b60783c6d82", "tree": "e4f576abd841cdeddc6cbdc9da6b083277784295", "parents": [ "b8ffdbd05f8692cdadccd04464271e48b1e8d439" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu Nov 17 14:30:55 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 15:27:19 2011 -0500" }, "message": "net: Change mii to ethtool advertisement function names\n\nThis patch implements advice by Ben Hutchings to change the mii side of\nthe function names to look more like the register whose values they\nconvert. New LPA translation functions have been added as well.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c292fe4aae5aa5c089633bc40342d27c8275306a", "tree": "84c6898327eb35c3c20c1728eaff8ca19094ddeb", "parents": [ "7758c4d6e9371efa04a1cf1b124bbf9cc43e830e", "224736d9113ab4a7cf3f05c05377492bd99b4b02" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 12:11:13 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 12:11:13 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n libceph: Allocate larger oid buffer in request msgs\n ceph: initialize root dentry\n ceph: fix iput race when queueing inode work\n" }, { "commit": "efd0bf97deeddd9ba53daabfc470a1399c6b0b2d", "tree": "eec56da5fbc796bac7c67f1990a18f5e0a304059", "parents": [ "f8a15af093b19b86d56933c8757cee298d0f32a8", "6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 13:50:33 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 13:50:33 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nThe forcedeth changes had a conflict with the conversion over\nto atomic u64 statistics in net-next.\n\nThe libertas cfg.c code had a conflict with the bss reference\ncounting fix by John Linville in net-next.\n\nConflicts:\n\tdrivers/net/ethernet/nvidia/forcedeth.c\n\tdrivers/net/wireless/libertas/cfg.c\n" }, { "commit": "6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82", "tree": "54dd0130534a0e20195f45ece12421c604064d01", "parents": [ "a4cc3889f7e2c3f2fd15b492822c889fed5e1800", "9cc20b268a5a14f5e57b8ad405a83513ab0d78dc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:59:33 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:59:33 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (86 commits)\n ipv4: fix redirect handling\n ping: dont increment ICMP_MIB_INERRORS\n sky2: fix hang in napi_disable\n sky2: enforce minimum ring size\n bonding: Don\u0027t allow mode change via sysfs with slaves present\n f_phonet: fix page offset of first received fragment\n stmmac: fix pm functions avoiding sleep on spinlock\n stmmac: remove spin_lock in stmmac_ioctl.\n stmmac: parameters auto-tuning through HW cap reg\n stmmac: fix advertising 1000Base capabilties for non GMII iface\n stmmac: use mdelay on timeout of sw reset\n sky2: version 1.30\n sky2: used fixed RSS key\n sky2: reduce default Tx ring size\n sky2: rename up/down functions\n sky2: pci posting issues\n sky2: fix hang on shutdown (and other irq issues)\n r6040: fix check against MCRO_HASHEN bit in r6040_multicast_list\n MAINTAINERS: change email address for shemminger\n pch_gbe: Move #include of module.h\n ...\n" }, { "commit": "a4cc3889f7e2c3f2fd15b492822c889fed5e1800", "tree": "d455a7392bc48aa44f61346e09b9cab63522d5b9", "parents": [ "bb893d15b564f7711b60e0bc12966d049980582d", "95ef1e52922cf75b1ea2eae54ef886f2cc47eecb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:57:43 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:57:43 2011 -0800" }, "message": "Merge branch \u0027kvm-updates/3.2\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/3.2\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM guest: prevent tracing recursion with kvmclock\n Revert \"KVM: PPC: Add support for explicit HIOR setting\"\n KVM: VMX: Check for automatic switch msr table overflow\n KVM: VMX: Add support for guest/host-only profiling\n KVM: VMX: add support for switching of PERF_GLOBAL_CTRL\n KVM: s390: announce SYNC_MMU\n KVM: s390: Fix tprot locking\n KVM: s390: handle SIGP sense running intercepts\n KVM: s390: Fix RUNNING flag misinterpretation\n" }, { "commit": "2d360fcbd851b7f9f8c23b1c30b2f3c060fa43e6", "tree": "8228db95030b82921c90b95f353441946af3a677", "parents": [ "a767835f6dc85277e40fbfe69a29c18817d6c00b", "501a708f18ef911328ffd39f39738b8a7862aa8e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:33:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:33:02 2011 -0800" }, "message": "Merge branch \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM / Suspend: Fix bug in suspend statistics update\n PM / Hibernate: Fix the early termination of test modes\n PM / shmobile: Fix build of sh7372_pm_init() for CONFIG_PM unset\n PM Sleep: Do not extend wakeup paths to devices with ignore_children set\n PM / driver core: disable device\u0027s runtime PM during shutdown\n PM / devfreq: correct Kconfig dependency\n PM / devfreq: fix use after free in devfreq_remove_device\n PM / shmobile: Avoid restoring the INTCS state during initialization\n PM / devfreq: Remove compiler error after irq.h update\n PM / QoS: Properly use the WARN() macro in dev_pm_qos_add_request()\n PM / Clocks: Only disable enabled clocks in pm_clk_suspend()\n ARM: mach-shmobile: sh7372 A3SP no_suspend_console fix\n PM / shmobile: Don\u0027t skip debugging output in pd_power_up()\n" }, { "commit": "a5c86e986f0b2fe779f13cf53ce6e9f467b03950", "tree": "754679947f1e0b014d90ea526eef4f89b9f2afef", "parents": [ "208f6f6068836e10d526e87fef6ca4364f4ec068" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Sat Nov 19 02:33:57 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 19 06:15:59 2011 -0500" }, "message": "hugetlb: remove dummy definitions of HPAGE_MASK and HPAGE_SIZE\n\nDummy, non-zero definitions for HPAGE_MASK and HPAGE_SIZE were added in\n51c6f666fceb (\"mm: ZAP_BLOCK causes redundant work\") to avoid a divide\nby zero in generic kernel code.\n\nThat code has since been removed, but probably should never have been\nadded in the first place: we don\u0027t want HPAGE_SIZE to act like PAGE_SIZE\nfor code that is working with hugepages, for example, when the\ndependency on CONFIG_HUGETLB_PAGE has not been fulfilled.\n\nBecause hugepage size can differ from architecture to architecture, each\nis required to have their own definitions for both HPAGE_MASK and\nHPAGE_SIZE. This is always done in arch/*/include/asm/page.h.\n\nSo, just remove the dummy and dangerous definitions since they are no\nlonger needed and reveals the correct dependencies. Tested on\narchitectures using the definitions with allyesconfig: x86 (even with\nthp), hppa, mips, powerpc, s390, sh3, sh4, sparc, and sparc64, and with\ndefconfig on ia64.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "208f6f6068836e10d526e87fef6ca4364f4ec068", "tree": "b9558820a176572b529ca6c1473b7c5ddb4b08ec", "parents": [ "ab5c5f639bba89d1103deae447836edf41e37659", "ea441d1104cf1efb471fa81bc91e9fd1e6ae29fd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 19 06:06:39 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 19 06:06:39 2011 -0500" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n new helper: mount_subtree()\n switch create_mnt_ns() to saner calling conventions, fix double mntput() in nfs\n btrfs: fix double mntput() in mount_subvol()\n" }, { "commit": "bdb6e697b2a76c541960b86ab8fda88f3de1adf2", "tree": "0bd09da4195a4059ab8e353278c2a58757126eff", "parents": [ "805dc1d60fb0d4a8b7730748a11dc2688b8f6cf6" ], "author": { "name": "Dinesh Kumar Sharma", "email": "dinesh.sharma@stericsson.com", "time": "Fri Nov 18 01:22:05 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 18 14:37:40 2011 -0500" }, "message": "Phonet: set the pipe handle using setsockopt\n\nThis provides flexibility to set the pipe handle\nusing setsockopt. The pipe can be enabled (if disabled) later\nusing ioctl.\n\nSigned-off-by: Hemant Ramdasi \u003chemant.ramdasi@stericsson.com\u003e\nSigned-off-by: Dinesh Kumar Sharma \u003cdinesh.sharma@stericsson.com\u003e\nAcked-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "56c978f1da1f630ef18aa668a9748c6c23ab819b", "tree": "6215afe05067bed4dc95b165d813db29df34cde4", "parents": [ "ae641949df01b85117845bec45328eab6d6fada1" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Nov 18 02:20:05 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 18 14:37:09 2011 -0500" }, "message": "net: Remove LL_ALLOCATED_SPACE\n\nnet: Remove LL_ALLOCATED_SPACE\n\nThe macro LL_ALLOCATED_SPACE was ill-conceived. It applies the\nalignment to the sum of needed_headroom and needed_tailroom. As\nthe amount that is then reserved for head room is needed_headroom\nwith alignment, this means that the tail room left may be too small.\n\nNow that all uses of LL_ALLOCATED_SPACE have been removed, this\npatch finally removes the macro itself.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b6844523839779030430ff28f036f83e2a3f43e6", "tree": "0af97f08911fab7e1351646172b1805c287ea300", "parents": [ "15bd1cfb3055d866614cdaf38e43201936264e50", "99cb2ddcc617f43917e94a4147aa3ccdb2bcd77e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 18 13:18:07 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 18 13:18:07 2011 -0200" }, "message": "Merge branch \u0027stable/for-linus-fixes-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/for-linus-fixes-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen-gntalloc: signedness bug in add_grefs()\n xen-gntalloc: integer overflow in gntalloc_ioctl_alloc()\n xen-gntdev: integer overflow in gntdev_alloc_map()\n xen:pvhvm: enable PVHVM VCPU placement when using more than 32 CPUs.\n xen/balloon: Avoid OOM when requesting highmem\n xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCI\n xen: map foreign pages for shared rings by updating the PTEs directly\n" }, { "commit": "15bd1cfb3055d866614cdaf38e43201936264e50", "tree": "020261b5a984684201a39e661934aa5dcdf82f83", "parents": [ "9545eb61e5bb70055fd9358f25f95387f7398cba", "019ceb7d5d252ce71001a157cf29f4ac28501b72" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 18 09:34:35 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 18 09:34:35 2011 -0200" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: add missed trace_block_plug\n paride: fix potential information leak in pg_read()\n bio: change some signed vars to unsigned\n block: avoid unnecessary plug list flush\n cciss: auto engage SCSI mid layer at driver load time\n loop: cleanup set_status interface\n include/linux/bio.h: use a static inline function for bio_integrity_clone()\n loop: prevent information leak after failed read\n block: Always check length of all iov entries in blk_rq_map_user_iov()\n The Windows driver .inf disables ASPM on all cciss devices. Do the same.\n backing-dev: ensure wakeup_timer is deleted\n block: Revert \"[SCSI] genhd: add a new attribute \"alias\" in gendisk\"\n" }, { "commit": "adc9300e78e6091a7eaa1821213836379d4dbaa8", "tree": "b2d075990b32e8c21129851bf1b1adf4cdc441f1", "parents": [ "d6f144830bdfa5fcf116e9ab8fc6a60d23fa623d" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Nov 17 03:13:26 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 17 17:06:08 2011 -0500" }, "message": "net: use jump_label to shortcut RPS if not setup\n\nMost machines dont use RPS/RFS, and pay a fair amount of instructions in\nnetif_receive_skb() / netif_rx() / get_rps_cpu() just to discover\nRPS/RFS is not setup.\n\nAdd a jump_label named rps_needed.\n\nIf no device rps_map or global rps_sock_flow_table is setup,\nnetif_receive_skb() / netif_rx() do a single instruction instead of many\nones, including conditional jumps.\n\njmp +0 (if CONFIG_JUMP_LABEL\u003dy)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f6f8285132907757ef84ef8dae0a1244b8cde6ac", "tree": "f3d3b37349e79251cfe16ef0f39e0b4af1a266b1", "parents": [ "cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37" ], "author": { "name": "Kees Cook", "email": "keescook@chromium.org", "time": "Thu Nov 17 12:58:07 2011 -0800" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Thu Nov 17 12:58:07 2011 -0800" }, "message": "pstore: pass allocated memory region back to caller\n\nThe buf_lock cannot be held while populating the inodes, so make the backend\npass forward an allocated and filled buffer instead. This solves the following\nbacktrace. The effect is that \"buf\" is only ever used to notify the backends\nthat something was written to it, and shouldn\u0027t be used in the read path.\n\nTo replace the buf_lock during the read path, isolate the open/read/close\nloop with a separate mutex to maintain serialized access to the backend.\n\nNote that is is up to the pstore backend to cope if the (*write)() path is\ncalled in the middle of the read path.\n\n[ 59.691019] BUG: sleeping function called from invalid context at .../mm/slub.c:847\n[ 59.691019] in_atomic(): 0, irqs_disabled(): 1, pid: 1819, name: mount\n[ 59.691019] Pid: 1819, comm: mount Not tainted 3.0.8 #1\n[ 59.691019] Call Trace:\n[ 59.691019] [\u003c810252d5\u003e] __might_sleep+0xc3/0xca\n[ 59.691019] [\u003c810a26e6\u003e] kmem_cache_alloc+0x32/0xf3\n[ 59.691019] [\u003c810b53ac\u003e] ? __d_lookup_rcu+0x6f/0xf4\n[ 59.691019] [\u003c810b68b1\u003e] alloc_inode+0x2a/0x64\n[ 59.691019] [\u003c810b6903\u003e] new_inode+0x18/0x43\n[ 59.691019] [\u003c81142447\u003e] pstore_get_inode.isra.1+0x11/0x98\n[ 59.691019] [\u003c81142623\u003e] pstore_mkfile+0xae/0x26f\n[ 59.691019] [\u003c810a2a66\u003e] ? kmem_cache_free+0x19/0xb1\n[ 59.691019] [\u003c8116c821\u003e] ? ida_get_new_above+0x140/0x158\n[ 59.691019] [\u003c811708ea\u003e] ? __init_rwsem+0x1e/0x2c\n[ 59.691019] [\u003c810b67e8\u003e] ? inode_init_always+0x111/0x1b0\n[ 59.691019] [\u003c8102127e\u003e] ? should_resched+0xd/0x27\n[ 59.691019] [\u003c8137977f\u003e] ? _cond_resched+0xd/0x21\n[ 59.691019] [\u003c81142abf\u003e] pstore_get_records+0x52/0xa7\n[ 59.691019] [\u003c8114254b\u003e] pstore_fill_super+0x7d/0x91\n[ 59.691019] [\u003c810a7ff5\u003e] mount_single+0x46/0x82\n[ 59.691019] [\u003c8114231a\u003e] pstore_mount+0x15/0x17\n[ 59.691019] [\u003c811424ce\u003e] ? pstore_get_inode.isra.1+0x98/0x98\n[ 59.691019] [\u003c810a8199\u003e] mount_fs+0x5a/0x12d\n[ 59.691019] [\u003c810b9174\u003e] ? alloc_vfsmnt+0xa4/0x14a\n[ 59.691019] [\u003c810b9474\u003e] vfs_kern_mount+0x4f/0x7d\n[ 59.691019] [\u003c810b9d7e\u003e] do_kern_mount+0x34/0xb2\n[ 59.691019] [\u003c810bb15f\u003e] do_mount+0x5fc/0x64a\n[ 59.691019] [\u003c810912fb\u003e] ? strndup_user+0x2e/0x3f\n[ 59.691019] [\u003c810bb3cb\u003e] sys_mount+0x66/0x99\n[ 59.691019] [\u003c8137b537\u003e] sysenter_do_call+0x12/0x26\n\nSigned-off-by: Kees Cook \u003ckeescook@chromium.org\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "8b258cc8ac229aa7d5dcb7cc34cb35d9124498ac", "tree": "9615636b05b04035af0c8eb11ee9711aa2b868a6", "parents": [ "af8db1508f2c9f3b6e633e2d2d906c6557c617f9" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Nov 17 21:39:33 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Nov 17 21:39:33 2011 +0100" }, "message": "PM Sleep: Do not extend wakeup paths to devices with ignore_children set\n\nCommit 4ca46ff3e0d8c234cb40ebb6457653b59584426c (PM / Sleep: Mark\ndevices involved in wakeup signaling during suspend) introduced\nthe power.wakeup_path field in struct dev_pm_info to mark devices\nwhose children are enabled to wake up the system from sleep states,\nso that power domains containing the parents that provide their\nchildren with wakeup power and/or relay their wakeup signals are not\nturned off. Unfortunately, that introduced a PM regression on SH7372\nwhose power consumption in the system \"memory sleep\" state increased\nas a result of it, because it prevented the power domain containing\nthe I2C controller from being turned off when some children of that\ncontroller were enabled to wake up the system, although the\ncontroller was not necessary for them to signal wakeup.\n\nTo fix this issue use the observation that devices whose\npower.ignore_children flag is set for runtime PM should be treated\nanalogously during system suspend. Namely, they shouldn\u0027t be\nincluded in wakeup paths going through their children. Since the\nSH7372 I2C controller\u0027s power.ignore_children flag is set, doing so\nwill restore the previous behavior of that SOC.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "e11c259f745889b55bc5596ca78271f2f5cf08d2", "tree": "5025f0bf9093e84d0643beb9097249c176dbbea7", "parents": [ "8d26784cf0d04c1238e906efdd5de76439cb0a1e", "b4487c2d0edaf1332d7a9f11b5661044955ef5e2" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Nov 17 13:11:43 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Nov 17 13:11:43 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tinclude/net/bluetooth/bluetooth.h\n" } ], "next": "bb75c627fb0dfb8c0ab75d3033709ff928896e16" }