)]}' { "log": [ { "commit": "ca8f4fb21d08747013cce9cf1840aa5bfc31f2d8", "tree": "f18de0412ec64d7aa4a26ff85d0ad1c57263dbff", "parents": [ "9a5d2bd99e0dfe9a31b3c160073ac445ba3d773f" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Mon Apr 09 00:24:02 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 13:09:19 2012 -0400" }, "message": "skbuff: struct ubuf_info callback type safety\n\nThe skb struct ubuf_info callback gets passed struct ubuf_info\nitself, not the arg value as the field name and the function signature\nseem to imply. Rename the arg field to ctx to match usage,\nadd documentation and change the callback argument type\nto make usage clear and to have compiler check correctness.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9a5d2bd99e0dfe9a31b3c160073ac445ba3d773f", "tree": "e91d28ce1852c8a7016065ee2184dd2531d56892", "parents": [ "1716a96101c49186bb0b8491922fd3e69030235f" ], "author": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Sun Apr 08 10:01:44 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 13:06:47 2012 -0400" }, "message": "ppp: Fix race condition with queue start/stop\n\nCommit e675f0cc9a872fd152edc0c77acfed19bf28b81e (\"ppp: Don\u0027t stop and\nrestart queue on every TX packet\") introduced a race condition which\ncould leave the net queue stopped even when the channel is no longer\nbusy. By calling netif_stop_queue() from ppp_start_xmit(), based on the\nreturn value from ppp_xmit_process() but *after* all the locks have been\ndropped, we could potentially do so *after* the channel has actually\nfinished transmitting and attempted to re-wake the queue.\n\nFix this by moving the netif_stop_queue() into ppp_xmit_process() under\nthe xmit lock. I hadn\u0027t done this previously, because it gets called\nfrom other places than ppp_start_xmit(). But I now think it\u0027s the better\noption. The net queue *should* be stopped if the channel becomes\ncongested due to writes from pppd, anyway.\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1716a96101c49186bb0b8491922fd3e69030235f", "tree": "43794d2f033f439d25c63b1796e138d65fd746a8", "parents": [ "d62f8dbb5b7771910f7c4657345df8ac93acb832" ], "author": { "name": "Gao feng", "email": "gaofeng@cn.fujitsu.com", "time": "Fri Apr 06 00:13:10 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 12:58:29 2012 -0400" }, "message": "ipv6: fix problem with expired dst cache\n\nIf the ipv6 dst cache which copy from the dst generated by ICMPV6 RA packet.\nthis dst cache will not check expire because it has no RTF_EXPIRES flag.\nSo this dst cache will always be used until the dst gc run.\n\nChange the struct dst_entry,add a union contains new pointer from and expires.\nWhen rt6_info.rt6i_flags has no RTF_EXPIRES flag,the dst.expires has no use.\nwe can use this field to point to where the dst cache copy from.\nThe dst.from is only used in IPV6.\n\nrt6_check_expired check if rt6_info.dst.from is expired.\n\nip6_rt_copy only set dst.from when the ort has flag RTF_ADDRCONF\nand RTF_DEFAULT.then hold the ort.\n\nip6_dst_destroy release the ort.\n\nAdd some functions to operate the RTF_EXPIRES flag and expires(from) together.\nand change the code to use these new adding functions.\n\nChanges from v5:\nmodify ip6_route_add and ndisc_router_discovery to use new adding functions.\n\nOnly set dst.from when the ort has flag RTF_ADDRCONF\nand RTF_DEFAULT.then hold the ort.\n\nSigned-off-by: Gao feng \u003cgaofeng@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d62f8dbb5b7771910f7c4657345df8ac93acb832", "tree": "57c8ccf2bbd0006869da282b3bfea2e126f3fff7", "parents": [ "5f614e6b7005685b3e34da0742f79389c858c7e1" ], "author": { "name": "Kim Lilliestierna XX", "email": "kim.xx.lilliestierna@stericsson.com", "time": "Thu Apr 12 08:18:09 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:44 2012 -0400" }, "message": "caif_hsi: use dev_dbg not dev_err for reporting\n\nUse dev_dbg instead of dev_err for reporting in cfhsi_wakeup_cb.\n\nSigned-off-by: Kim Lilliestierna \u003ckim.xx.lilliestierna@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5f614e6b7005685b3e34da0742f79389c858c7e1", "tree": "1172afa7c435c9627ee8ae5c919bd530a4460d70", "parents": [ "5c699fb7d88d360023f3b3f5291cbf5b59883a1b" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Thu Apr 12 08:18:08 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:44 2012 -0400" }, "message": "caif-hsi: Free flip_buffer at shutdown\n\nFix memory leak of RX flip-buffer.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5c699fb7d88d360023f3b3f5291cbf5b59883a1b", "tree": "a9b6b8d502fd4d2e1487a207d3200df8764ec9fa", "parents": [ "c9be48dc8bb22f1f6e6ff1560b2b28e925a0b815" ], "author": { "name": "Tomasz Gregorek", "email": "tomasz.gregorek@stericsson.com", "time": "Thu Apr 12 08:18:07 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:44 2012 -0400" }, "message": "caif: Fix memory leakage in the chnl_net.c.\n\nAdded kfree_skb() calls in the chnk_net.c file on\nthe error paths.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c9be48dc8bb22f1f6e6ff1560b2b28e925a0b815", "tree": "b8f42aa6aed3289bf8dfd4b9a036efea93e1df0b", "parents": [ "d1f224ae186b834af647661ffaf403a817c050ce" ], "author": { "name": "James Chapman", "email": "jchapman@katalix.com", "time": "Tue Apr 10 00:10:43 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:44 2012 -0400" }, "message": "l2tp: don\u0027t overwrite source address in l2tp_ip_bind()\n\nApplications using L2TP/IP sockets want to be able to bind() an L2TP/IP\nsocket to set the local tunnel id while leaving the auto-assigned source\naddress alone. So if no source address is supplied, don\u0027t overwrite\nthe address already stored in the socket.\n\nSigned-off-by: James Chapman \u003cjchapman@katalix.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d1f224ae186b834af647661ffaf403a817c050ce", "tree": "ba97e12cf85c7f81e4829928ffdd5b4aad3e1fe7", "parents": [ "31304165ffb888483e0f7c805876f25f493a3049" ], "author": { "name": "James Chapman", "email": "jchapman@katalix.com", "time": "Tue Apr 10 00:10:42 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:44 2012 -0400" }, "message": "l2tp: fix refcount leak in l2tp_ip sockets\n\nThe l2tp_ip socket close handler does not update the module refcount\ncorrectly which prevents module unload after the first bind() call on\nan L2TPv3 IP encapulation socket.\n\nSigned-off-by: James Chapman \u003cjchapman@katalix.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "31304165ffb888483e0f7c805876f25f493a3049", "tree": "fc3d9973f4887f47adf414df483fa466056352e7", "parents": [ "89eb06f11c314c2ab4ec59039715dc021933a7a0" ], "author": { "name": "Torsten Kaiser", "email": "just.for.lkml@googlemail.com", "time": "Mon Apr 09 05:14:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:44 2012 -0400" }, "message": "net: Fix misplaced parenthesis in virtio_net.c\n\nCommit 2e57b79ccef1ff1422fdf45a9b28fe60f8f084f7 misplaced its\nparenthesis and now tx_fifo_errors will only be incremented if an\nENOMEM error is not written to the syslog.\n\nCorrect the parenthesis and indentation to the original goal of\ncounting all non ENOMEM errors and ratelimiting only the messages.\n\nSigned-of-by: Torsten Kaiser \u003cjust.for.lkml@googlemail.com\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "89eb06f11c314c2ab4ec59039715dc021933a7a0", "tree": "f31d003d58aff5d798e028ee9be2d1867cc2128b", "parents": [ "03478756b1b9298686ca9c8793e484ae39eb4649" ], "author": { "name": "Julia Lawall", "email": "Julia.Lawall@lip6.fr", "time": "Sun Apr 08 22:41:10 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:44 2012 -0400" }, "message": "net/key/af_key.c: add missing kfree_skb\n\nAt the point of this error-handling code, alloc_skb has succeded, so free\nthe resulting skb by jumping to the err label.\n\nSigned-off-by: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "03478756b1b9298686ca9c8793e484ae39eb4649", "tree": "9f40562042ebf12858a535c625fa99fd23f14553", "parents": [ "7d3d43dab4e978d8d9ad1acf8af15c9b1c4b0f0f" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri Apr 06 15:35:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:43 2012 -0400" }, "message": "phonet: Sort out initiailziation and cleanup code.\n\nRecently an oops was reported in phonet if there was a failure during\nnetwork namespace creation.\n\n[ 163.733755] ------------[ cut here ]------------\n[ 163.734501] kernel BUG at include/net/netns/generic.h:45!\n[ 163.734501] invalid opcode: 0000 [#1] PREEMPT SMP\n[ 163.734501] CPU 2\n[ 163.734501] Pid: 19145, comm: trinity Tainted: G W 3.4.0-rc1-next-20120405-sasha-dirty #57\n[ 163.734501] RIP: 0010:[\u003cffffffff824d6062\u003e] [\u003cffffffff824d6062\u003e] phonet_pernet+0x182/0x1a0\n[ 163.734501] RSP: 0018:ffff8800674d5ca8 EFLAGS: 00010246\n[ 163.734501] RAX: 000000003fffffff RBX: 0000000000000000 RCX: ffff8800678c88d8\n[ 163.734501] RDX: 00000000003f4000 RSI: ffff8800678c8910 RDI: 0000000000000282\n[ 163.734501] RBP: ffff8800674d5cc8 R08: 0000000000000000 R09: 0000000000000000\n[ 163.734501] R10: 0000000000000000 R11: 0000000000000000 R12: ffff880068bec920\n[ 163.734501] R13: ffffffff836b90c0 R14: 0000000000000000 R15: 0000000000000000\n[ 163.734501] FS: 00007f055e8de700(0000) GS:ffff88007d000000(0000) knlGS:0000000000000000\n[ 163.734501] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\n[ 163.734501] CR2: 00007f055e6bb518 CR3: 0000000070c16000 CR4: 00000000000406e0\n[ 163.734501] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n[ 163.734501] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n[ 163.734501] Process trinity (pid: 19145, threadinfo ffff8800674d4000, task ffff8800678c8000)\n[ 163.734501] Stack:\n[ 163.734501] ffffffff824d5f00 ffffffff810e2ec1 ffff880067ae0000 00000000ffffffd4\n[ 163.734501] ffff8800674d5cf8 ffffffff824d667a ffff880067ae0000 00000000ffffffd4\n[ 163.734501] ffffffff836b90c0 0000000000000000 ffff8800674d5d18 ffffffff824d707d\n[ 163.734501] Call Trace:\n[ 163.734501] [\u003cffffffff824d5f00\u003e] ? phonet_pernet+0x20/0x1a0\n[ 163.734501] [\u003cffffffff810e2ec1\u003e] ? get_parent_ip+0x11/0x50\n[ 163.734501] [\u003cffffffff824d667a\u003e] phonet_device_destroy+0x1a/0x100\n[ 163.734501] [\u003cffffffff824d707d\u003e] phonet_device_notify+0x3d/0x50\n[ 163.734501] [\u003cffffffff810dd96e\u003e] notifier_call_chain+0xee/0x130\n[ 163.734501] [\u003cffffffff810dd9d1\u003e] raw_notifier_call_chain+0x11/0x20\n[ 163.734501] [\u003cffffffff821cce12\u003e] call_netdevice_notifiers+0x52/0x60\n[ 163.734501] [\u003cffffffff821cd235\u003e] rollback_registered_many+0x185/0x270\n[ 163.734501] [\u003cffffffff821cd334\u003e] unregister_netdevice_many+0x14/0x60\n[ 163.734501] [\u003cffffffff823123e3\u003e] ipip_exit_net+0x1b3/0x1d0\n[ 163.734501] [\u003cffffffff82312230\u003e] ? ipip_rcv+0x420/0x420\n[ 163.734501] [\u003cffffffff821c8515\u003e] ops_exit_list+0x35/0x70\n[ 163.734501] [\u003cffffffff821c911b\u003e] setup_net+0xab/0xe0\n[ 163.734501] [\u003cffffffff821c9416\u003e] copy_net_ns+0x76/0x100\n[ 163.734501] [\u003cffffffff810dc92b\u003e] create_new_namespaces+0xfb/0x190\n[ 163.734501] [\u003cffffffff810dca21\u003e] unshare_nsproxy_namespaces+0x61/0x80\n[ 163.734501] [\u003cffffffff810afd1f\u003e] sys_unshare+0xff/0x290\n[ 163.734501] [\u003cffffffff8187622e\u003e] ? trace_hardirqs_on_thunk+0x3a/0x3f\n[ 163.734501] [\u003cffffffff82665539\u003e] system_call_fastpath+0x16/0x1b\n[ 163.734501] Code: e0 c3 fe 66 0f 1f 44 00 00 48 c7 c2 40 60 4d 82 be 01 00 00 00 48 c7 c7 80 d1 23 83 e8 48 2a c4 fe e8 73 06 c8 fe 48 85 db 75 0e \u003c0f\u003e 0b 0f 1f 40 00 eb fe 66 0f 1f 44 00 00 48 83 c4 10 48 89 d8\n[ 163.734501] RIP [\u003cffffffff824d6062\u003e] phonet_pernet+0x182/0x1a0\n[ 163.734501] RSP \u003cffff8800674d5ca8\u003e\n[ 163.861289] ---[ end trace fb5615826c548066 ]---\n\nAfter investigation it turns out there were two issues.\n1) Phonet was not implementing network devices but was using register_pernet_device\n instead of register_pernet_subsys.\n\n This was allowing there to be cases when phonenet was not initialized and\n the phonet net_generic was not set for a network namespace when network\n device events were being reported on the netdevice_notifier for a network\n namespace leading to the oops above.\n\n2) phonet_exit_net was implementing a confusing and special case of handling all\n network devices from going away that it was hard to see was correct, and would\n only occur when the phonet module was removed.\n\n Now that unregister_netdevice_notifier has been modified to synthesize unregistration\n events for the network devices that are extant when called this confusing special\n case in phonet_exit_net is no longer needed.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.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": "7d3d43dab4e978d8d9ad1acf8af15c9b1c4b0f0f", "tree": "5a61ca199992bc951138750209bbfa588f4d271b", "parents": [ "ecca5c3acc0d0933d89abc44e60afb0cc8170e35" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri Apr 06 15:33:35 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:43 2012 -0400" }, "message": "net: In unregister_netdevice_notifier unregister the netdevices.\n\nWe already synthesize events in register_netdevice_notifier and synthesizing\nevents in unregister_netdevice_notifier allows to us remove the need for\nspecial case cleanup code.\n\nThis change should be safe as it adds no new cases for existing callers\nof unregiser_netdevice_notifier to handle.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ecca5c3acc0d0933d89abc44e60afb0cc8170e35", "tree": "e765a76f8bf07717b4c446193bc4e2601b4fd038", "parents": [ "174808af90a06ee59ffedd60c00c252f1f887f25", "026ee1f66aaa7f01b617a0ba89ac4b531f9603f1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 14:15:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 14:15:21 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge fixes from Andrew Morton.\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (14 patches)\n panic: fix stack dump print on direct call to panic()\n drivers/rtc/rtc-pl031.c: enable clock on all ST variants\n Revert \"mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()\"\n hugetlb: fix race condition in hugetlb_fault()\n drivers/rtc/rtc-twl.c: use static register while reading time\n drivers/rtc/rtc-s3c.c: add placeholder for driver private data\n drivers/rtc/rtc-s3c.c: fix compilation error\n MAINTAINERS: add PCDP console maintainer\n memcg: do not open code accesses to res_counter members\n drivers/rtc/rtc-efi.c: fix section mismatch warning\n drivers/rtc/rtc-r9701.c: reset registers if invalid values are detected\n drivers/char/random.c: fix boot id uniqueness race\n memcg: fix broken boolen expression\n memcg: fix up documentation on global LRU\n" }, { "commit": "174808af90a06ee59ffedd60c00c252f1f887f25", "tree": "5e026fdc0d2b4d66c0a79267e5755e10d6d04bd8", "parents": [ "778c2dee6f134bf0472ed45eedaee53b4f336afb", "5d949944229b0a08e218723be231731cd86b94f3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 14:04:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 14:04:33 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Fix bluetooth userland regression reported by Keith Packard, from\n Gustavo Padovan.\n\n 2) Revert ath9k PS idle change, from Sujith Manoharan.\n\n 3) Correct default TCP memory limits (again), from Eric Dumazet.\n\n 4) Fix tcp_rcv_rtt_update() accidental use of unscaled RTT, from Neal\n Cardwell.\n\n 5) We made a facility for layers like wireless to say how much tailroom\n they need in the SKB for link layer stuff such as wireless\n encryption etc., but TCP works hard to fill every SKB out to the end\n defeating this specification.\n\n This leads to every TCP packet getting reallocated by the wireless\n code in order to have the right amount of tailroom available.\n\n Fix TCP to only fill SKBs out to the real amount of data area it\n asked for during the allocation, this way it won\u0027t eat into the\n slack added for the device\u0027s tailroom needs.\n\n Reported by Marc Merlin and fixed by Eric Dumazet.\n\n 6) Leaks, endian bugs, and new device IDs in bluetooth from Santosh\n Nayak, João Paulo Rechi Vita, Cho, Yu-Chen, Andrei Emeltchenko,\n AceLan Kao, and Andrei Emeltchenko.\n\n 7) OOPS on tty_close fix in bluetooth\u0027s hci_ldisc from Johan Hovold.\n\n 8) netfilter erroneously scales TCP window twice, fix from Changli Gao.\n\n 9) Memleak fix in wext-core from Julia Lawall.\n\n10) Consistently handle invalid TCP packets in ipv4 vs. ipv6 conntrack,\n from Jozsef Kadlecsik.\n\n11) Validate IP header length properly in netfilter conntrack\u0027s\n ipv4_get_l4proto().\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (39 commits)\n NFC: Fix the LLCP Tx fragmentation loop\n rtlwifi: Add missing DMA buffer unmapping for PCI drivers\n rtlwifi: Preallocate USB read buffers and eliminate kalloc in read routine\n tcp: avoid order-1 allocations on wifi and tx path\n net: allow pskb_expand_head() to get maximum tailroom\n bridge: Do not send queries on multicast group leaves\n MAINTAINERS: Mark NATSEMI driver as orphan\u0027d.\n tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample\n tcp: restore correct limit\n Revert \"ath9k: fix going to full-sleep on PS idle\"\n rt2x00: Fix rfkill_polling register function.\n bcma: fix build error on MIPS; implicit pcibios_enable_device\n netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net\n netfilter: nf_ct_ipv4: packets with wrong ihl are invalid\n netfilter: nf_ct_ipv4: handle invalid IPv4 and IPv6 packets consistently\n net/wireless/wext-core.c: add missing kfree\n rtlwifi: Fix oops on rate-control failure\n mac80211: Convert WARN_ON to WARN_ON_ONCE\n rtlwifi: rtl8192de: Fix firmware initialization\n nl80211: ensure interface is up in various APIs\n ...\n" }, { "commit": "778c2dee6f134bf0472ed45eedaee53b4f336afb", "tree": "8f2d50f1876aeb142f0642ebfc2c39bf877cb222", "parents": [ "e42bd6e4a666709fc3a56cf4577c1f6fdb1c193f", "173fa4eccc39b04fbc0b569fabac6dbcec33507a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:58:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:58:23 2012 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm fixes from Dave Airlie:\n \"Mostly exynos and intel.\n\n Intel has 3 regression fixers (more info in intel merge commit), along\n with some other make hw work fixes, exynos has some cleanups and an\n ioctl fix.\n\n A couple of radeon fixes, couple of build fixes, and a savage\n userspace interface possible overflow fix.\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux: (23 commits)\n drm/exynos: fixed exynos broken ioctl\n drm/i915: clear fencing tracking state when retiring requests\n drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv\n drm/exynos: fix struct for operation callback functions to driver name\n drm/exynos: use define instead of default_win member in struct mixer_context\n drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR\n drm/exynos: remove unused codes in hdmi and mixer\n drm/exynos: remove unnecessary type conversion of hdmi and mixer\n drm/i915: make rc6 module parameter read-only\n drm/i915: implement ColorBlt w/a\n drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g\n Revert \"drm/i915: reenable gmbus on gen3+ again\"\n drm/radeon: only add the mm i2c bus if the hw_i2c module param is set\n vgaarb.h: fix build warnings\n drm/i915: properly compute dp dithering for user-created modes\n drm/radeon/kms: fix DVO setup on some r4xx chips\n drm/savage: fix integer overflows in savage_bci_cmdbuf()\n drm/radeon: replace udelay with mdelay for long timeouts\n drm/i915: Finish any pending operations on the framebuffer before disabling\n drm/i915: Removed IVB forced enable of sprite dest key.\n ...\n" }, { "commit": "e42bd6e4a666709fc3a56cf4577c1f6fdb1c193f", "tree": "e2596e735f3f0373072ffc9ce8cd5ae246b6d84c", "parents": [ "7e066489726b52bea419085e5b8929e1e89f57a8", "afbaa90b80b1ec66e5137cc3824746bfdf559b18" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:56 2012 -0700" }, "message": "Merge tag \u0027md-3.4-fixes\u0027 of git://neil.brown.name/md\n\nPull a few more fixes for md from NeilBrown:\n \"Two are tagged for -stable. They can cause an oops, but very rarely.\"\n\n* tag \u0027md-3.4-fixes\u0027 of git://neil.brown.name/md:\n md/bitmap: prevent bitmap_daemon_work running while initialising bitmap\n md/raid1,raid10: Fix calculation of \u0027vcnt\u0027 when processing error recovery.\n MD: Bitmap version cleanup.\n" }, { "commit": "026ee1f66aaa7f01b617a0ba89ac4b531f9603f1", "tree": "536bca88c7ee8475eb33b0b8a654bd13b8fd64a9", "parents": [ "2f3972168353d355854d6381f1f360ce83b723e5" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Thu Apr 12 12:49:17 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "panic: fix stack dump print on direct call to panic()\n\nCommit 6e6f0a1f0fa6 (\"panic: don\u0027t print redundant backtraces on oops\")\ncauses a regression where no stack trace will be printed at all for the\ncase where kernel code calls panic() directly while not processing an\noops, and of course there are 100\u0027s of instances of this type of call.\n\nThe original commit executed the check (!oops_in_progress), but this will\nalways be false because just before the dump_stack() there is a call to\nbust_spinlocks(1), which does the following:\n\n void __attribute__((weak)) bust_spinlocks(int yes)\n {\n\tif (yes) {\n\t\t++oops_in_progress;\n\nThe proper way to resolve the problem that original commit tried to\nsolve is to avoid printing a stack dump from panic() when the either of\nthe following conditions is true:\n\n 1) TAINT_DIE has been set (this is done by oops_end())\n This indicates and oops has already been printed.\n 2) oops_in_progress \u003e 1\n This guards against the rare case where panic() is invoked\n a second time, or in between oops_begin() and oops_end()\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nCc: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t[3.3+]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2f3972168353d355854d6381f1f360ce83b723e5", "tree": "78d1013f792083ca34925fba1ae30e71c7bbd1d5", "parents": [ "41c93088127df2579e8ca64010929ec9e41d5543" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Thu Apr 12 12:49:16 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/rtc/rtc-pl031.c: enable clock on all ST variants\n\nThe ST variants of the PL031 all require bit 26 in the control register\nto be set before they work properly. Discovered this when testing on\nthe Nomadik board where it would suprisingly just stand still.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nCc: Mian Yousaf Kaukab \u003cmian.yousaf.kaukab@stericsson.com\u003e\nCc: Alessandro Rubini \u003crubini@unipv.it\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "41c93088127df2579e8ca64010929ec9e41d5543", "tree": "5bbfded1934fc94facbfa892a59874703aa6922a", "parents": [ "66aebce747eaf9bc456bf1f1b217d8db843031d0" ], "author": { "name": "Ying Han", "email": "yinghan@google.com", "time": "Thu Apr 12 12:49:16 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "Revert \"mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()\"\n\nThis reverts commit c38446cc65e1f2b3eb8630c53943b94c4f65f670.\n\nBefore the commit, the code makes senses to me but not after the commit.\nThe \"nr_reclaimed\" is the number of pages reclaimed by scanning through\nthe memcg\u0027s lru lists. The \"nr_to_reclaim\" is the target value for the\nwhole function. For example, we like to early break the reclaim if\nreclaimed 32 pages under direct reclaim (not DEF_PRIORITY).\n\nAfter the reverted commit, the target \"nr_to_reclaim\" is decremented each\ntime by \"nr_reclaimed\" but we still use it to compare the \"nr_reclaimed\".\nIt just doesn\u0027t make sense to me...\n\nSigned-off-by: Ying Han \u003cyinghan@google.com\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "66aebce747eaf9bc456bf1f1b217d8db843031d0", "tree": "460c0268105191b2d581f42d5534dc952d565a17", "parents": [ "f3ec434c69ac7f447ff6e6389c19727c9f002087" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Thu Apr 12 12:49:15 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "hugetlb: fix race condition in hugetlb_fault()\n\nThe race is as follows:\n\nSuppose a multi-threaded task forks a new process (on cpu A), thus\nbumping up the ref count on all the pages. While the fork is occurring\n(and thus we have marked all the PTEs as read-only), another thread in\nthe original process (on cpu B) tries to write to a huge page, taking an\naccess violation from the write-protect and calling hugetlb_cow(). Now,\nsuppose the fork() fails. It will undo the COW and decrement the ref\ncount on the pages, so the ref count on the huge page drops back to 1.\nMeanwhile hugetlb_cow() also decrements the ref count by one on the\noriginal page, since the original address space doesn\u0027t need it any\nmore, having copied a new page to replace the original page. This\nleaves the ref count at zero, and when we call unlock_page(), we panic.\n\n\tfork on CPU A\t\t\t\tfault on CPU B\n\t\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\t\t\t\t\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\t...\n\tdown_write(\u0026parent-\u003emmap_sem);\n\tdown_write_nested(\u0026child-\u003emmap_sem);\n\t...\n\twhile duplicating vmas\n\t\tif error\n\t\t\tbreak;\n\t...\n\tup_write(\u0026child-\u003emmap_sem);\n\tup_write(\u0026parent-\u003emmap_sem);\t\t...\n\t\t\t\t\t\tdown_read(\u0026parent-\u003emmap_sem);\n\t\t\t\t\t\t...\n\t\t\t\t\t\tlock_page(page);\n\t\t\t\t\t\thandle COW\n\t\t\t\t\t\tpage_mapcount(old_page) \u003d\u003d 2\n\t\t\t\t\t\talloc and prepare new_page\n\t...\n\thandle error\n\tpage_remove_rmap(page);\n\tput_page(page);\n\t...\n\t\t\t\t\t\tfold new_page into pte\n\t\t\t\t\t\tpage_remove_rmap(page);\n\t\t\t\t\t\tput_page(page);\n\t\t\t\t\t\t...\n\t\t\t\toops \u003d\u003d\u003e\tunlock_page(page);\n\t\t\t\t\t\tup_read(\u0026parent-\u003emmap_sem);\n\nThe solution is to take an extra reference to the page while we are\nholding the lock on it.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f3ec434c69ac7f447ff6e6389c19727c9f002087", "tree": "4b60b41bb31b52c979a8c5e5fd45aad913a8bf03", "parents": [ "c3cba9281ba39f3aef377fe52890e2d8f1e6dae3" ], "author": { "name": "Konstantin Shlyakhovoy", "email": "x0155534@ti.com", "time": "Thu Apr 12 12:49:15 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/rtc/rtc-twl.c: use static register while reading time\n\nRTC stores time and date in several registers. Due to the fact that\nthese registers can\u0027t be read instantaneously, there is a chance that\nreading from counting registers gives an error of one minute, one hour,\none day, etc.\n\nTo address this issue, the RTC has hardware support to copy the RTC\ncounting registers to static shadowed registers. The current\nimplementation does not use this feature, and in a stress test, we can\nreproduce this error at a rate of around two times per 300000 readings.\n\nFix the implementation to ensure that the right snapshot of time is\ncaptured.\n\nSigned-off-by: Konstantin Shlyakhovoy \u003cx0155534@ti.com\u003e\nSigned-off-by: Nishanth Menon \u003cnm@ti.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Benoit Cousson \u003cb-cousson@ti.com\u003e\nCc: linux-omap \u003clinux-omap@vger.kernel.org\u003e\nAcked-by: Mykola Oleksiienko \u003cx0174904@ti.com\u003e\nAcked-by: Oleksandr Dmytryshyn \u003coleksandr.dmytryshyn@ti.com\u003e\nAcked-by: Graeme Gregory \u003cgg@slimlogic.co.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c3cba9281ba39f3aef377fe52890e2d8f1e6dae3", "tree": "b5c9a43711be9a96c7689b39868beef266ac04a5", "parents": [ "cd1e6f9e53e1a673a489826729709aaffa8ad621" ], "author": { "name": "Tushar Behera", "email": "tushar.behera@linaro.org", "time": "Thu Apr 12 12:49:14 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/rtc/rtc-s3c.c: add placeholder for driver private data\n\nDriver data field is a pointer, hence assigning that to an integer results\nin compilation warnings.\n\nFixes following compilation warnings:\n\n drivers/rtc/rtc-s3c.c: In function `s3c_rtc_get_driver_data\u0027:\n drivers/rtc/rtc-s3c.c:452:3: warning: return makes integer from pointer without a cast [enabled by default]\n drivers/rtc/rtc-s3c.c: At top level:\n drivers/rtc/rtc-s3c.c:674:3: warning: initialization makes pointer from integer without a cast [enabled by default]\n drivers/rtc/rtc-s3c.c:674:3: warning: (near initialization for `s3c_rtc_dt_match[1].data\u0027) [enabled by default]\n drivers/rtc/rtc-s3c.c:677:3: warning: initialization makes pointer from integer without a cast [enabled by default]\n drivers/rtc/rtc-s3c.c:677:3: warning: (near initialization for `s3c_rtc_dt_match[2].data\u0027) [enabled by default]\n drivers/rtc/rtc-s3c.c:680:3: warning: initialization makes pointer from integer without a cast [enabled by default]\n drivers/rtc/rtc-s3c.c:680:3: warning: (near initialization for `s3c_rtc_dt_match[3].data\u0027) [enabled by default]\n\nSigned-off-by: Tushar Behera \u003ctushar.behera@linaro.org\u003e\nCc: Heiko Stuebner \u003cheiko@sntech.de\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cd1e6f9e53e1a673a489826729709aaffa8ad621", "tree": "ad21faabe2c6e2211c302bf449fd0cae5e28aa0a", "parents": [ "3971dae51d7cccf4c8197786b050b3a65ace01f0" ], "author": { "name": "Tushar Behera", "email": "tushar.behera@linaro.org", "time": "Thu Apr 12 12:49:14 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/rtc/rtc-s3c.c: fix compilation error\n\nFix this error:\n\n drivers/rtc/rtc-s3c.c: At top level:\n drivers/rtc/rtc-s3c.c:671:3: error: request for member `data\u0027 in something not a structure or union\n drivers/rtc/rtc-s3c.c:674:3: error: request for member `data\u0027 in something not a structure or union\n drivers/rtc/rtc-s3c.c:677:3: error: request for member `data\u0027 in something not a structure or union\n drivers/rtc/rtc-s3c.c:680:3: error: request for member `data\u0027 in something not a structure or union\n\nSigned-off-by: Tushar Behera \u003ctushar.behera@linaro.org\u003e\nCc: Heiko Stuebner \u003cheiko@sntech.de\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3971dae51d7cccf4c8197786b050b3a65ace01f0", "tree": "400eb88881c4910561c6f0ee880269ea8f38564d", "parents": [ "569530fb1b40ab2d2ca147ee79898ac807ebdf90" ], "author": { "name": "Khalid Aziz", "email": "khalid@hp.com", "time": "Thu Apr 12 12:49:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "MAINTAINERS: add PCDP console maintainer\n\nAdd missing maintainer info for PCDP console code.\n\nSigned-off-by: Khalid Aziz \u003ckhalid.aziz@hp.com\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "569530fb1b40ab2d2ca147ee79898ac807ebdf90", "tree": "e9f4f9a04a9a8f2a94a919aff55629f8946b30f4", "parents": [ "32050017cf3bf2b983571a90351328b4f66e463d" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Thu Apr 12 12:49:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "memcg: do not open code accesses to res_counter members\n\nWe should use the accessor res_counter_read_u64 for that.\n\nAlthough a purely cosmetic change is sometimes better delayed, to avoid\nconflicting with other people\u0027s work, we are starting to have people\ntouching this code as well, and reproducing the open code behavior\nbecause that\u0027s the standard \u003d)\n\nTime to fix it, then.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "32050017cf3bf2b983571a90351328b4f66e463d", "tree": "2d74014af20316dcc0b7eeaef7a341d89b414472", "parents": [ "bb58da08f01ee12561867fcd4385b82679ae7f6c" ], "author": { "name": "Jan Beulich", "email": "JBeulich@suse.com", "time": "Thu Apr 12 12:49:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/rtc/rtc-efi.c: fix section mismatch warning\n\nefi_rtc_init() uses platform_driver_probe(), so there\u0027s no need to also\nset efi_rtc_driver\u0027s probe member (as it won\u0027t be used anyway). This\nfixes a modpost section mismatch warning (as efi_rtc_probe() validly is\n__init).\n\nSigned-off-by: Jan Beulich \u003cjbeulich@suse.com\u003e\nCc: Matthew Garrett \u003cmjg@redhat.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bb58da08f01ee12561867fcd4385b82679ae7f6c", "tree": "892e60c551aa5be4046fe20402c0cb9d2950a978", "parents": [ "44e4360fa3384850d65dd36fb4e6e5f2f112709b" ], "author": { "name": "Andreas Dumberger", "email": "andreas.dumberger@tqs.de", "time": "Thu Apr 12 12:49:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/rtc/rtc-r9701.c: reset registers if invalid values are detected\n\nhwclock refuses to set date/time if RTC registers contain invalid\nvalues. Check the date/time register values at probe time and\ninitialize them to make hwclock happy.\n\nSigned-off-by: Andreas Dumberger \u003candreas.dumberger@tqs.de\u003e\nSigned-off-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "44e4360fa3384850d65dd36fb4e6e5f2f112709b", "tree": "bca5390346511ef308933b9968cdc43ec8569b7f", "parents": [ "d833049bd20570cbbadeb5228c579f9f3aaa4e03" ], "author": { "name": "Mathieu Desnoyers", "email": "mathieu.desnoyers@efficios.com", "time": "Thu Apr 12 12:49:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/char/random.c: fix boot id uniqueness race\n\n/proc/sys/kernel/random/boot_id can be read concurrently by userspace\nprocesses. If two (or more) user-space processes concurrently read\nboot_id when sysctl_bootid is not yet assigned, a race can occur making\nboot_id differ between the reads. Because the whole point of the boot id\nis to be unique across a kernel execution, fix this by protecting this\noperation with a spinlock.\n\nGiven that this operation is not frequently used, hitting the spinlock\non each call should not be an issue.\n\nSigned-off-by: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nCc: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Greg Kroah-Hartman \u003cgreg@kroah.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d833049bd20570cbbadeb5228c579f9f3aaa4e03", "tree": "2995af0705ce161cba50739048e90b89ea3991e2", "parents": [ "6252efcc3626bdcde1c1c2d8a83be0bc66b8cc2c" ], "author": { "name": "Kirill A. Shutemov", "email": "kirill@shutemov.name", "time": "Thu Apr 12 12:49:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:11 2012 -0700" }, "message": "memcg: fix broken boolen expression\n\naction !\u003d CPU_DEAD || action !\u003d CPU_DEAD_FROZEN is always true.\n\nSigned-off-by: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6252efcc3626bdcde1c1c2d8a83be0bc66b8cc2c", "tree": "594d74c5a9b06f289d105130cd81055267f67144", "parents": [ "45852766a0212c2d4f0d7faa71eedbd6c1d70452" ], "author": { "name": "Ying Han", "email": "yinghan@google.com", "time": "Thu Apr 12 12:49:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:11 2012 -0700" }, "message": "memcg: fix up documentation on global LRU\n\nIn v3.3-rc1, the global LRU was removed in commit 925b7673cce3 (\"mm:\nmake per-memcg LRU lists exclusive\"). The patch fixes up the memcg\ndocs.\n\nI left the swap session to someone who has better understanding of\n\u0027memory+swap\u0027.\n\nSigned-off-by: Ying Han \u003cyinghan@google.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7e066489726b52bea419085e5b8929e1e89f57a8", "tree": "b144712e5200002b55b45f362ffa1fd53d0389c6", "parents": [ "4abb663b641ee21024906dae45af7de50ebad2d8", "6fa6c8e25e95bdc73e92e4c96b8e3299169b616e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:49:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:49:56 2012 -0700" }, "message": "Merge tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull irqdomain bug fixes from Grant Likely:\n \"This branch fixes a bug in irq_create_mapping() where an error return\n from irq_alloc_desc_from() gets ignored.\n\n It also removes irq_virq_count to fix a bug on powerpc where the\n irqdomain code does not find irqs allocated above the CONFIG_NR_IRQS\n boundary.\n\n The remaining patches get rid of an completely pointless export and\n fix some minor bugs in the irqdomain debug output.\"\n\n* tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n irq_domain: Move irq_virq_count into NOMAP revmap\n irqdomain: Fix debugfs formatting\n irq_domain: correct the debugfs file name\n irq: Kill pointless irqd_to_hw export\n irq/irq_domain: Quit ignoring error returns from irq_alloc_desc_from().\n" }, { "commit": "4abb663b641ee21024906dae45af7de50ebad2d8", "tree": "4c12141a8abd046dde464f50aa837eb9ae854918", "parents": [ "5ba7026b4467b55fedddf73d093ef3322e8e5b52", "0e3d0f3d960bf5b895adcf9ffc79d2077f1411d5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:49:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:49:07 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull input updates from Dmitry Torokhov:\n \"Just a few small fixes...\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: da9052 - fix memory leak in da9052_onkey_probe()\n Input: gpio_mouse - use linux/gpio.h rather than asm/gpio.h\n Input: trackpoint - use psmouse_fmt() for messages\n Input: elantech - v4 is a clickpad, with only one button\n Input: elantech - reset touchpad before configuring it\n Input: sentelic - filter taps in absolute mode\n Input: tps6507x-ts - fix MODULE_ALIAS to match driver name\n" }, { "commit": "5ba7026b4467b55fedddf73d093ef3322e8e5b52", "tree": "6f0206c39fafc0441423517b490e3efd07f94645", "parents": [ "45852766a0212c2d4f0d7faa71eedbd6c1d70452", "b1349f2536efcb592927ab6f8687c36c3c124f6b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:07:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:07:39 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull vfs fixes from Al Viro:\n \"Regression fix in mtdchar_open(), fix for a really old leak\n (almost never hit in practice - it\u0027s a b0rken failure exit in\n simple_fill_super()) and a typo fix in vfs.txt (misspelled\n method type).\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n typo fix in Documentation/filesystems/vfs.txt\n dentry leak in simple_fill_super() failure exit\n fix breakage in mtdchar_open(), sanitize failure exits\n" }, { "commit": "173fa4eccc39b04fbc0b569fabac6dbcec33507a", "tree": "5d73a6eb84c6f029f0934c0548b641471a23decb", "parents": [ "19e5c4e72c7287491f0da64e26b6b7175942f502", "490aa60ee7e884febf4818234d5c97669665db9a" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 17:42:01 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 17:42:01 2012 +0100" }, "message": "Merge branch \u0027exynos-drm-fixes\u0027 of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes\n\n* \u0027exynos-drm-fixes\u0027 of git://git.infradead.org/users/kmpark/linux-samsung:\n drm/exynos: fixed exynos broken ioctl\n drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv\n drm/exynos: fix struct for operation callback functions to driver name\n drm/exynos: use define instead of default_win member in struct mixer_context\n drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR\n drm/exynos: remove unused codes in hdmi and mixer\n drm/exynos: remove unnecessary type conversion of hdmi and mixer\n drm/exynos: add format list of plane\n drm/exynos: fixed duplicated page allocation bug.\n drm/exynos: fixed page align and code clean.\n" }, { "commit": "19e5c4e72c7287491f0da64e26b6b7175942f502", "tree": "e6dd9e513b68ec8febd77e7779fb831190a6a9be", "parents": [ "46783150a6552f9513f08e62cfcc07125d6e502b", "15a13bbdffb0d6288a5dd04aee9736267da1335f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 13:01:57 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 17:41:10 2012 +0100" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-intel-fixes\n\nDaniel Vetter writes:\n3 regression fixes:\n- disable gmbus again, too broken for 3.4, we\u0027ll try again for 3.5\n- dp bandwidth computation fix, we\u0027ve lost the 6bpc dithering flag\n sometimes, this is a 3.3 regression (maybe even earlier for some\n configurations).\n- fix resume regression caused by the gen2/3 fencing fix merged into -rc2.\n\nAnd a few other fixes:\n- gpu hang fix for i845 (Chris)\n- sprite fix (Armin Reese)\n- crtc disable vs. scanlinewait race fix (Chris)\n- rc6 module option read-only, it confused testers (Jesse)\n- fbc related blitter death hw workaround, note that we disable fbc on snb\n by default anyway.\n\nWith these fixes we have one 3.4 regression outstanding: One of the\ncleanup patches for the interlaced support managed to confuse the lvds\npanel fitter when upscaling. The root-cause is still unclear, but test\npatches are awaiting feedback from the reporter.\n\n* \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel:\n drm/i915: clear fencing tracking state when retiring requests\n drm/i915: make rc6 module parameter read-only\n drm/i915: implement ColorBlt w/a\n drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g\n Revert \"drm/i915: reenable gmbus on gen3+ again\"\n drm/i915: properly compute dp dithering for user-created modes\n drm/i915: Finish any pending operations on the framebuffer before disabling\n drm/i915: Removed IVB forced enable of sprite dest key.\n" }, { "commit": "5d949944229b0a08e218723be231731cd86b94f3", "tree": "5aaf18d11ee4a3486ec7469971f326eb5811679b", "parents": [ "a21d45726acacc963d8baddf74607d9b74e2b723", "b4838d12e1f3cb48c2489a0b08733b5dbf848297" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 12 09:55:22 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 12 09:55:22 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "490aa60ee7e884febf4818234d5c97669665db9a", "tree": "63f7a78e6ec706953ef7005241b97c15b6cb3870", "parents": [ "677e84c1b5c8533ea351a9556308071ca47a1eb2" ], "author": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 16:42:54 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 16:42:54 2012 +0900" }, "message": "drm/exynos: fixed exynos broken ioctl\n\nthis patch removes the pointer of uint64_t *edid. it should be just\na uint64_t.\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "15a13bbdffb0d6288a5dd04aee9736267da1335f", "tree": "7cc3e8326352191e8171bf448ed9c4684eb670f7", "parents": [ "f57f9c167af7cb3fd315e6a8ebe194a8aea0832a" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Apr 12 01:27:57 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Apr 12 09:02:37 2012 +0200" }, "message": "drm/i915: clear fencing tracking state when retiring requests\n\nThis fixes a resume regression introduced in\n\ncommit 7dd4906586274f3945f2aeaaa5a33b451c3b4bba\nAuthor: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nDate: Wed Mar 21 10:48:18 2012 +0000\n\n drm/i915: Mark untiled BLT commands as fenced on gen2/3\n\nwhich fixed fencing tracking for untiled blt commands.\n\nA side effect of that patch was that now also untiled objects have a\nnon-zero obj-\u003elast_fenced_seqno to track when a fence can be set up\nafter a pipelined tiling change. Unfortunately this was only cleared\nby the fence setup and teardown code, resulting in tons of untiled but\ninactive objects with non-zero last_fenced_seqno.\n\nNow after resume we completely reset the seqno tracking, both on the\ndriver side (by setting dev_priv-\u003enext_seqno \u003d 1) and on the hw side\n(by allocating a new hws page, which contains the seqnos). Hilarity\nand indefinite waits ensued from the stale seqnos in\nobj-\u003elast_fenced_seqno from before the suspend.\n\nThe fix is to properly clear the fencing tracking state like we\nalready do for the normal gpu rendering while moving objects off the\nactive list.\n\nReported-and-tested-by: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "6fa6c8e25e95bdc73e92e4c96b8e3299169b616e", "tree": "34dc13fb2448eab4916f55edd10dfa34c36505df", "parents": [ "15e06bf64f686befd2030da867a3dad965b96cc0" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Feb 15 15:06:08 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Apr 12 00:37:48 2012 -0600" }, "message": "irq_domain: Move irq_virq_count into NOMAP revmap\n\nThis patch replaces the old global setting of irq_virq_count that is only\nused by the NOMAP mapping and instead uses a revmap_data property so that\nthe maximum NOMAP allocation can be set per NOMAP irq_domain.\n\nThere is exactly one user of irq_virq_count in-tree right now: PS3.\nAlso, irq_virq_count is only useful for the NOMAP mapping. So,\ninstead of having a single global irq_virq_count values, this change\ndrops it entirely and added a max_irq argument to irq_domain_add_nomap().\nThat makes it a property of an individual nomap irq domain instead of\na global system settting.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nTested-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Milton Miller \u003cmiltonm@bga.com\u003e\n" }, { "commit": "afbaa90b80b1ec66e5137cc3824746bfdf559b18", "tree": "8c0307e41849eef28146343efc4fed75f83a30f1", "parents": [ "f4380a915823dbed0bf8e3cf502ebcf2b7c7f833" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Thu Apr 12 16:05:06 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Thu Apr 12 16:05:06 2012 +1000" }, "message": "md/bitmap: prevent bitmap_daemon_work running while initialising bitmap\n\nIf a bitmap is added while the array is active, it is possible\nfor bitmap_daemon_work to run while the bitmap is being\ninitialised.\nThis is particularly a problem if bitmap_daemon_work sees\nbitmap-\u003efilemap as non-NULL before it has been filled in properly.\nSo hold bitmap_info.mutex while filling in -\u003efilemap\nto prevent problems.\n\nThis patch is suitable for any -stable kernel, though it might not\napply cleanly before about 3.1.\n\nCc: stable@vger.kernel.org\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "f4380a915823dbed0bf8e3cf502ebcf2b7c7f833", "tree": "1326179e1f715f33495066b2fe4b99acf1bbdd96", "parents": [ "9e41dd35b39c2cf40767332b8f914d7afe25cc40" ], "author": { "name": "majianpeng", "email": "majianpeng@gmail.com", "time": "Thu Apr 12 16:04:47 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Thu Apr 12 16:04:47 2012 +1000" }, "message": "md/raid1,raid10: Fix calculation of \u0027vcnt\u0027 when processing error recovery.\n\nIf r1bio-\u003esectors % 8 !\u003d 0,then the memcmp and a later\nmemcpy will omit the last bio_vec.\n\nThis is suitable for any stable kernel since 3.1 when bad-block\nmanagement was introduced.\n\nCc: stable@vger.kernel.org\nSigned-off-by: majianpeng \u003cmajianpeng@gmail.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "9e41dd35b39c2cf40767332b8f914d7afe25cc40", "tree": "b694a4d27b3fd7beb1881d5ad993303fe7309c59", "parents": [ "5020ad7d143ccfcf8149974096220d59e5572120" ], "author": { "name": "Andrei Warkentin", "email": "andrey.warkentin@gmail.com", "time": "Thu Apr 12 15:55:21 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Thu Apr 12 15:55:21 2012 +1000" }, "message": "MD: Bitmap version cleanup.\n\nbitmap_new_disk_sb() would still create V3 bitmap superblock\nwith host-endian layout.\n\nPerhaps I\u0027m confused, but shouldn\u0027t bitmap_new_disk_sb() be\ncreating a V4 bitmap superblock instead, that is portable,\nas per comment in bitmap.h?\n\nSigned-off-by: Andrei Warkentin \u003candrey.warkentin@gmail.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "677e84c1b5c8533ea351a9556308071ca47a1eb2", "tree": "38ab6a72f214433ef294403b6c5cdb3dd25afb0a", "parents": [ "578b6065adc8805a8774e4bf3145e18de123f8b2" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:27 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:27 2012 +0900" }, "message": "drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv\n\nThe struct exynos_drm_manager has to exist for exynos drm sub driver\nusing encoder and connector. If it isn\u0027t NULL to member of struct\nexynos_drm_subdrv, will create encoder and connector else will not. And\nthe is_local member also doesn\u0027t need.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "578b6065adc8805a8774e4bf3145e18de123f8b2", "tree": "88e563c3edb1fea30c8cb71836e45cd3e0420726", "parents": [ "a2ee151b6b6863d108552de82e02b77166ca23a8" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:26 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:26 2012 +0900" }, "message": "drm/exynos: fix struct for operation callback functions to driver name\n\nThe mixer driver and hdmi driver have each operation callback functions\nand they is registered to hdmi common driver. Their struct names in hdmi\ncommon driver include display, manager and overlay. It confuses to\nappear whose operation and two driver cannot register same operation\ncallback functions at the same time. Use their struct names to driver\nname.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "a2ee151b6b6863d108552de82e02b77166ca23a8", "tree": "9e1ec043e025cd89415d0731a8aa039b54d0c544", "parents": [ "a634dd54c05636a89a272e27e59118374065975e" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:25 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:24 2012 +0900" }, "message": "drm/exynos: use define instead of default_win member in struct mixer_context\n\nThe default_win member in struct mixer_context isn\u0027t change its value\nafter initialized to 0, so it\u0027s better using to define.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "a634dd54c05636a89a272e27e59118374065975e", "tree": "efae3c63bb5dfb3530dbac391e76e14f1cb675f9", "parents": [ "46da222be7873bd1c79fa110d6988a2b826f7dee" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:24 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:21 2012 +0900" }, "message": "drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR\n\nHDMI_OVERLAY_NUMBER is specific of mixer driver and be used \"windows\nlayer\" term in exynos user manaual, so rename it.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "46da222be7873bd1c79fa110d6988a2b826f7dee", "tree": "3f537ffba07d760ff3bfb08a6d464c15be7cbcaf", "parents": [ "f9309d1bf220122659328040db47eede32514656" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:23 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:18 2012 +0900" }, "message": "drm/exynos: remove unused codes in hdmi and mixer\n\nSome members in struct mixer_context aren\u0027t used and the define\nHDMI_OVERLAY_NUMBER is unused in hdmi driver, remove them.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "f9309d1bf220122659328040db47eede32514656", "tree": "e611a15e167289b1496eefb612a7afeec9afebb3", "parents": [ "6b1c762da98fd0d475a4539f94541aec91a8de30" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:22 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:16 2012 +0900" }, "message": "drm/exynos: remove unnecessary type conversion of hdmi and mixer\n\nWhen the void pointer type variable is assigned to the specific pointer\ntype variable, don\u0027t need to do type conversion.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "0e3d0f3d960bf5b895adcf9ffc79d2077f1411d5", "tree": "af1258e22b8ded4e7d4d0f123b06335c9c7cb1d4", "parents": [ "55158c886a0c43765140673d2343d3119d34a25a" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Wed Apr 11 20:55:18 2012 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Apr 11 22:15:04 2012 -0700" }, "message": "Input: da9052 - fix memory leak in da9052_onkey_probe()\n\nIf, in drivers/input/misc/da9052_onkey.c::da9052_onkey_probe(), the\ncall to either kzalloc() or input_allocate_device() fails then we will\nreturn -ENOMEM from the function without freeing the other allocation\nthat may have succeeded, thus we leak either the memory allocated for\n\u0027onkey\u0027 or the memory allocated for \u0027input_dev\u0027 if one succeeds and\nthe other fails.\nFix that by jumping to the \u0027err_free_mem\u0027 label at the end of the\nfunction that properly cleans up rather than returning directly.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "45852766a0212c2d4f0d7faa71eedbd6c1d70452", "tree": "52d7087c519e01c5ff488c7d191c7307168f6937", "parents": [ "f549e088b806f44b6ab6eeef0cb71ced1d2488dd", "fae2e0fb24c61ca68c98d854a34732549ebc1854" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 20:56:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 20:56:28 2012 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc fixes from Benjamin Herrenschmidt:\n \"Fixes for two nasty regression affecting powerpc in 3.4.\"\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc: Fix typo in runlatch code\n powerpc: Fix page fault with lockdep regression\n" }, { "commit": "f549e088b806f44b6ab6eeef0cb71ced1d2488dd", "tree": "1dc4d7745d3ad67d1ab467455aeec1f58b9af5cf", "parents": [ "70f33fa5863458ec9f1ae3aabdb9c2401598ec3d", "0559d8dc13a1cd68b5e64c0b61659f36c7b5c89f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 13:24:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 13:24:52 2012 -0700" }, "message": "Merge tag \u0027rdma-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\nPull infiniband fixes from Roland Dreier:\n \"Fix a regression in the /sys/class/infiniband/.../rate attribute --\n old kernels used to just return something, even if the underlying\n value was out-of-bounds, while 3.4-rc1 returned EINVAL to userspace.\n This breaks some applications that check for the error, so go back to\n the old behavior.\"\n\n* tag \u0027rdma-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n IB/core: Don\u0027t return EINVAL from sysfs rate attribute for invalid speeds\n IB/mlx4: Don\u0027t return an invalid speed when a port is down\n" }, { "commit": "f57f9c167af7cb3fd315e6a8ebe194a8aea0832a", "tree": "5a7be1cbce225f51aff28e6e79020dd842649242", "parents": [ "80e829fade4eea5f07c410df6a551c42e2d0ca9c" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Apr 11 09:39:02 2012 -0700" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Apr 11 21:36:38 2012 +0200" }, "message": "drm/i915: make rc6 module parameter read-only\n\nPeople have been getting confused and thinking this is a runtime control.\n\nCc: stable@vger.kernel.org\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "b4838d12e1f3cb48c2489a0b08733b5dbf848297", "tree": "45d6df434bb8235c42cbbe975ed58ee3d1e76319", "parents": [ "673f7786e205c87b5d978c62827b9a66d097bebb" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Apr 10 19:43:03 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 11 15:09:33 2012 -0400" }, "message": "NFC: Fix the LLCP Tx fragmentation loop\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "673f7786e205c87b5d978c62827b9a66d097bebb", "tree": "4ecbf9e03f1b150f3b91be22ffaaac37dae34c4b", "parents": [ "a7959c1394d4126a70a53b914ce4105f5173d0aa" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Mon Mar 26 10:48:20 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 11 15:01:45 2012 -0400" }, "message": "rtlwifi: Add missing DMA buffer unmapping for PCI drivers\n\nIn https://bugzilla.kernel.org/show_bug.cgi?id\u003d42976, a system with driver\nrtl8192se used as an AP suffers from \"Out of SW-IOMMU space\" errors. These\nare caused by the DMA buffers used for beacons never being unmapped.\n\nThis bug was also reported at\nhttps://bugs.launchpad.net/ubuntu/+source/linux/+bug/961618\n\nReported-and-Tested-by: Da Xue \u003cda@lessconfused.com\u003e\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nCc: Stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a7959c1394d4126a70a53b914ce4105f5173d0aa", "tree": "62374a9502df20d3f5f949793ad870755f58c4b7", "parents": [ "011afa1ed8c408d694957d2474d89dc81a60b70c" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Mon Mar 19 15:44:31 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 11 15:01:44 2012 -0400" }, "message": "rtlwifi: Preallocate USB read buffers and eliminate kalloc in read routine\n\nThe current version of rtlwifi for USB operations uses kmalloc to\nacquire a 32-bit buffer for each read of the device. When\n_usb_read_sync() is called with the rcu_lock held, the result is\na \"sleeping function called from invalid context\" BUG. This is\nreported for two cases in https://bugzilla.kernel.org/show_bug.cgi?id\u003d42775.\nThe first case has the lock originating from within rtlwifi and could\nbe fixed by rearranging the locking; however, the second originates from\nwithin mac80211. The kmalloc() call is removed from _usb_read_sync()\nby creating a ring buffer pointer in the private area and\nallocating the buffer data in the probe routine.\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nCc: Stable \u003cstable@vger.kernel.org\u003e [This version good for 3.3+ - different patch for 3.2 - 2.6.39]\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "70f33fa5863458ec9f1ae3aabdb9c2401598ec3d", "tree": "cab932fad832093ab383f291aab82b1b0f3593e9", "parents": [ "a1ada086062101533eb0f841d3884137688091ec", "e72d5c7e9c831f6e393c71dcd62acafbac2b58d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 11:08:20 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 11:08:20 2012 -0700" }, "message": "Merge branch \u0027stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\nPull arch/tile fixes from Chris Metcalf:\n \"This is one important change from Srivatsa Bhat that got dropped when\n I put together my pull request for -rc2, plus a trivial change to\n remove a compiler warning.\"\n\n* \u0027stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n arch/tile: avoid unused variable warning in proc.c for tilegx\n tile/CPU hotplug: Add missing call to notify_cpu_starting()\n" }, { "commit": "a1ada086062101533eb0f841d3884137688091ec", "tree": "3dd45239db0eaaf7693e5bae75f0c8b61466bb6e", "parents": [ "39f86a608a3e0f0164bd1540acf87696cfdfb5bb", "fae3d88a5c56c3f836e95c4516da883a48612437" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 11:07:38 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 11:07:38 2012 -0700" }, "message": "Merge tag \u0027sound-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound fixes from Takashi Iwai:\n - A series of fixes for Conexant 20549 HD-audio codec chip\n - A workaround for HDMI hotplug debug prints that annoyed people\n - A fix for the new support of platform DAPM contexts\n - Many driver-specific minor fixes\n\n* tag \u0027sound-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: hda - hide HDMI/ELD printks unless snd.debug\u003d2\n ALSA: sound/isa/sscape.c: add missing resource-release code\n sound: sound/oss/msnd_pinnacle.c: add vfrees\n ALSA: hda - clean up CX20549 test mixer setup\n ALSA: hda - CX20549 doesn\u0027t need pin_amp_workaround.\n ALSA: hda - Remove CD control from model\u003dbenq for CX20549\n ALSA: hda - fix record volume controls of CX20459 (\"Venice\")\n ALSA: hda - Rename capture sources of CX20549 to match common conventions\n ALSA: hda - Fix proc output for ADC amp values of CX20549\n ASoC: tegra: fix i2s compilation when !CONFIG_DEBUG_FS\n ASoC: set idle_bias_off\u003d1 for all platform DAPM contexts\n ASoC: imx-audmux: Check for NULL pointer\n ASoC: imx-audmux: Fix ssi port numbers in sysfs\n ASoC: ak4642: fixup: mute needs +1 step\n MAINTAINERS: Don\u0027t list everyone working on Wolfson drivers\n MAINTAINERS: Add missing ASoC OMAP co-maintainer\n ASoC: pxa: pxa2xx-i2s: add io.h for IOMEM macro\n ASoC: tegra: ensure clocks are enabled when touching registers\n ASoC: sgtl5000: Enable VAG when DAC/ADC up\n ALSA: asihpi - fix return value of hpios_locked_mem_alloc()\n" }, { "commit": "39f86a608a3e0f0164bd1540acf87696cfdfb5bb", "tree": "a8a88fd3dda891fd89aa9058ec798aa12d04bc16", "parents": [ "1b6150fe82de8a555b0200d20bb5e3752fbe4160", "ed0ee0ce0a3224dab5caa088a5f8b6df25924276" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 11:05:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 11:05:34 2012 -0700" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media\n\nPull media fixes from Mauro Carvalho Chehab:\n\n - dvb core: there is a regression found when used with xine. For\n whatever unknown reason, xine (and xine-lib clients) wants that the\n frontend to tell what frequency he is using even before the PLL lock\n (or at least, it expects a non-zero frequency).\n\n On DVB, the frequency is only actually known after a frequency\n zig-zag seek, done by the DVB core. Anyway, the fix was trivial.\n That solves Fedora BZ#808871.\n\n - ivtv: fix a regression when selecting the language channel\n\n - uvc: fix a race-related crash\n\n - it913x: fixes firmware loading\n\n - two trivial patches (a dependency issue at a radio driver at sound\n Kconfig, and a warning fix on dvb).\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:\n [media] uvcvideo: Fix race-related crash in uvc_video_clock_update()\n [media] Drivers/media/radio: Fix build error\n [media] dvb_frontend: fix compiler warning\n [media] it913x: fix firmware loading errors\n [media] ivtv: Fix AUDIO_(BILINGUAL_)CHANNEL_SELECT regression\n [media] dvb_frontend: regression fix: userspace ABI broken for xine\n" }, { "commit": "1b6150fe82de8a555b0200d20bb5e3752fbe4160", "tree": "d03b71e1b87b60d1a9dfbade34156e930f1be1bd", "parents": [ "92ae03f2ef99fbc23bfa9080d6b58f25227bd7ef", "ca9248d8337d525c2d2b26a1d8314478d15707fb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 11:04:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 11:04:45 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes\n\nPull GFS2 fixes from Steven Whitehouse\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:\n GFS2: Allow caching of rindex glock\n GFS2: Make sure rindex is uptodate before starting transactions\n GFS2: use depends instead of select in kconfig\n GFS2: put glock reference in error patch of read_rindex_entry\n" }, { "commit": "e72d5c7e9c831f6e393c71dcd62acafbac2b58d0", "tree": "0738f5a2e71bffa4c7b17cc4217f254cb0e39432", "parents": [ "d1640130cda146ed925f12434bfe579ee7d80a1c" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Wed Apr 11 12:45:20 2012 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Wed Apr 11 12:45:20 2012 -0400" }, "message": "arch/tile: avoid unused variable warning in proc.c for tilegx\n\nUntil we push the unaligned access support for tilegx, it\u0027s silly\nto have arch/tile/kernel/proc.c generate a warning about an unused\nvariable. Extend the #ifdef to cover all the code and data for now.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "92ae03f2ef99fbc23bfa9080d6b58f25227bd7ef", "tree": "bccc4d78e8d7fb56f62189c3c25f73cdf01a5f5a", "parents": [ "79549c6dfda0603dba9a70a53467ce62d9335c33" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 06 14:32:32 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 09:41:28 2012 -0700" }, "message": "x86: merge 32/64-bit versions of \u0027strncpy_from_user()\u0027 and speed it up\n\nThis merges the 32- and 64-bit versions of the x86 strncpy_from_user()\nby just rewriting it in C rather than the ancient inline asm versions\nthat used lodsb/stosb and had been duplicated for (trivial) differences\nbetween the 32-bit and 64-bit versions.\n\nWhile doing that, it also speeds them up by doing the accesses a word at\na time. Finally, the new routines also properly handle the case of\nhitting the end of the address space, which we have never done correctly\nbefore (fs/namei.c has a hack around it for that reason).\n\nDespite all these improvements, it actually removes more lines than it\nadds, due to the de-duplication. Also, we no longer export (or define)\nthe legacy __strncpy_from_user() function (that was defined to not do\nthe user permission checks), since it\u0027s not actually used anywhere, and\nthe user address space checks are built in to the new code.\n\nOther architecture maintainers have been notified that the old hack in\nfs/namei.c will be going away in the 3.5 merge window, in case they\ncopied the x86 approach of being a bit cavalier about the end of the\naddress space.\n\nCc: linux-arch@vger.kernel.org\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "79549c6dfda0603dba9a70a53467ce62d9335c33", "tree": "88de05761354d81916b6a929ae9ef2fa1b51e3e5", "parents": [ "923e9a1399b620d063cd88537c64561bc3d5f905" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Apr 09 21:03:50 2012 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 08:20:11 2012 -0700" }, "message": "cred: copy_process() should clear child-\u003ereplacement_session_keyring\n\nkeyctl_session_to_parent(task) sets -\u003ereplacement_session_keyring,\nit should be processed and cleared by key_replace_session_keyring().\n\nHowever, this task can fork before it notices TIF_NOTIFY_RESUME and\nthe new child gets the bogus -\u003ereplacement_session_keyring copied by\ndup_task_struct(). This is obviously wrong and, if nothing else, this\nleads to put_cred(already_freed_cred).\n\nchange copy_creds() to clear this member. If copy_process() fails\nbefore this point the wrong -\u003ereplacement_session_keyring doesn\u0027t\nmatter, exit_creds() won\u0027t be called.\n\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a21d45726acacc963d8baddf74607d9b74e2b723", "tree": "7cd7e1409ac0242148a0a8117956d08572eb32cf", "parents": [ "87151b8689d890dfb495081f7be9b9e257f7a2df" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 10 20:30:48 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 11 10:11:12 2012 -0400" }, "message": "tcp: avoid order-1 allocations on wifi and tx path\n\nMarc Merlin reported many order-1 allocations failures in TX path on its\nwireless setup, that dont make any sense with MTU\u003d1500 network, and non\nSG capable hardware.\n\nAfter investigation, it turns out TCP uses sk_stream_alloc_skb() and\nused as a convention skb_tailroom(skb) to know how many bytes of data\npayload could be put in this skb (for non SG capable devices)\n\nNote : these skb used kmalloc-4096 (MTU\u003d1500 + MAX_HEADER +\nsizeof(struct skb_shared_info) being above 2048)\n\nLater, mac80211 layer need to add some bytes at the tail of skb\n(IEEE80211_ENCRYPT_TAILROOM \u003d 18 bytes) and since no more tailroom is\navailable has to call pskb_expand_head() and request order-1\nallocations.\n\nThis patch changes sk_stream_alloc_skb() so that only\nsk-\u003esk_prot-\u003emax_header bytes of headroom are reserved, and use a new\nskb field, avail_size to hold the data payload limit.\n\nThis way, order-0 allocations done by TCP stack can leave more than 2 KB\nof tailroom and no more allocation is performed in mac80211 layer (or\nany layer needing some tailroom)\n\navail_size is unioned with mark/dropcount, since mark will be set later\nin IP stack for output packets. Therefore, skb size is unchanged.\n\nReported-by: Marc MERLIN \u003cmarc@merlins.org\u003e\nTested-by: Marc MERLIN \u003cmarc@merlins.org\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "87151b8689d890dfb495081f7be9b9e257f7a2df", "tree": "cb12becc26090b9fd9275f25cee851ffb40d931f", "parents": [ "996304bbea3d2a094b7ba54c3bd65d3fffeac57b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 10 20:08:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 11 10:10:43 2012 -0400" }, "message": "net: allow pskb_expand_head() to get maximum tailroom\n\nMarc Merlin reported many order-1 allocations failures in TX path on its\nwireless setup, that dont make any sense with MTU\u003d1500 network, and non\nSG capable hardware.\n\nTurns out part of the problem comes from pskb_expand_head() not using\nksize() to get exact head size given by kmalloc(). Doing the same thing\nthan __alloc_skb() allows more tailroom in skb and can prevent future\nreallocations.\n\nAs a bonus, struct skb_shared_info becomes cache line aligned.\n\nReported-by: Marc MERLIN \u003cmarc@merlins.org\u003e\nTested-by: Marc MERLIN \u003cmarc@merlins.org\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "996304bbea3d2a094b7ba54c3bd65d3fffeac57b", "tree": "e015e32637366870b52882e95759d5f2d4c95ba5", "parents": [ "09d208ec74b804b9dcd0b1cd9c21dfd592760807" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Apr 04 01:01:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 11 09:43:13 2012 -0400" }, "message": "bridge: Do not send queries on multicast group leaves\n\nAs it stands the bridge IGMP snooping system will respond to\ngroup leave messages with queries for remaining membership.\nThis is both unnecessary and undesirable. First of all any\nmulticast routers present should be doing this rather than us.\nWhat\u0027s more the queries that we send may end up upsetting other\nmulticast snooping swithces in the system that are buggy.\n\nIn fact, we can simply remove the code that send these queries\nbecause the existing membership expiry mechanism doesn\u0027t rely\non them anyway.\n\nSo this patch simply removes all code associated with group\nqueries in response to group leave messages.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "80e829fade4eea5f07c410df6a551c42e2d0ca9c", "tree": "c347937e2a2d83b0e9154b33866a0bfdc99251b3", "parents": [ "27c1cbd06a7620b354cbb363834f3bb8df4f410d" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat Mar 31 11:21:57 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Apr 11 12:16:53 2012 +0200" }, "message": "drm/i915: implement ColorBlt w/a\n\nAccording to an internal workaround master list, we need to set bit 5\nof register 9400 to avoid issues with color blits.\n\nTesting shows that this seems to fix the blitter hangs when fbc is\nenabled on snb, thanks to Chris Wilson for figuring this out.\n\nTested-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nTested-by: Michael \"brot\" Groh \u003cmichael.groh@minad.de\u003e\nAcked-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "27c1cbd06a7620b354cbb363834f3bb8df4f410d", "tree": "0c65a9e811897758f568b73ee0466b1f5fa66f19", "parents": [ "6a562e3daee217ce99fe0e31150acd89a5b22606" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Apr 09 13:59:46 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Apr 11 12:14:24 2012 +0200" }, "message": "drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g\n\nThe 845g shares the errata with i830 whereby executing a command\nwithin 2 cachelines of the end of the ringbuffer may cause a GPU hang.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "6a562e3daee217ce99fe0e31150acd89a5b22606", "tree": "1503bbee0b49118ea47d3fbb9573c5fdffaf32cf", "parents": [ "c4867936474183332db4c19791a65fdad6474fd5" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 09 21:10:38 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Apr 11 12:11:23 2012 +0200" }, "message": "Revert \"drm/i915: reenable gmbus on gen3+ again\"\n\nThis reverts commit c3dfefa0a6d235bd465309e12f4c56ea16e71111.\n\ngmbus in 3.4 has simply too many known issues:\n- gmbus is too noisy, we need to rework the logging:\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d48248\n- zero-length writes cause an OOPS, and they are\n userspace-triggerable:\n https://lkml.org/lkml/2012/3/30/176\n- same for zero-length reads:\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d48269\n\nWe can try again for 3.5.\n\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "46783150a6552f9513f08e62cfcc07125d6e502b", "tree": "fd34912299b2e6fedd7e5fd1c2bba57b083b8437", "parents": [ "6069a4c988d75c0fb309fa7da0909df2a222a65e" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Apr 10 12:14:27 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Apr 11 09:36:53 2012 +0100" }, "message": "drm/radeon: only add the mm i2c bus if the hw_i2c module param is set\n\nIt seems it can corrupt the monitor EDID in certain cases on certain\nboards when running sensors detect. It\u0027s rarely used anyway outside\nof AIW boards.\n\nhttp://lists.lm-sensors.org/pipermail/lm-sensors/2012-April/035847.html\nhttp://lists.freedesktop.org/archives/xorg/2011-January/052239.html\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6069a4c988d75c0fb309fa7da0909df2a222a65e", "tree": "9d41616713da1f2baf6c31e45fe17b4e993106ef", "parents": [ "afceb9319f21b18ee3bc15ee9a5f92e18ef8a8c9" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Mon Jan 30 11:43:52 2012 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Apr 11 09:36:00 2012 +0100" }, "message": "vgaarb.h: fix build warnings\n\nFix build warnings by providing a struct stub since no fields of\nthe struct are used:\n\ninclude/linux/vgaarb.h:66:9: warning: \u0027struct pci_dev\u0027 declared inside parameter list\ninclude/linux/vgaarb.h:66:9: warning: its scope is only this definition or declaration, which is probably not what you want\ninclude/linux/vgaarb.h:99:34: warning: \u0027struct pci_dev\u0027 declared inside parameter list\ninclude/linux/vgaarb.h:109:6: warning: \u0027struct pci_dev\u0027 declared inside parameter list\ninclude/linux/vgaarb.h:121:8: warning: \u0027struct pci_dev\u0027 declared inside parameter list\ninclude/linux/vgaarb.h:140:37: warning: \u0027struct pci_dev\u0027 declared inside parameter list\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "15e06bf64f686befd2030da867a3dad965b96cc0", "tree": "769d3c6192d1eeff58fd84d5e6c4667f2952d26c", "parents": [ "ac5830a33f5b25eae1dc0708b3e7a3d270a6c07f" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Apr 11 00:26:25 2012 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Apr 11 01:01:45 2012 -0600" }, "message": "irqdomain: Fix debugfs formatting\n\nThis patch fixes the irq_domain_mapping debugfs output to pad pointer\nvalues with leading zeros so that pointer values are displayed\ncorrectly. Otherwise you get output similar to \"0x 5e0000000000000\".\nAlso, when the irq_domain is set to \u0027null\u0027\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: David Daney \u003cdavid.daney@cavium.com\u003e\nCc: Mika Westerberg \u003cmika.westerberg@linux.intel.com\u003e\n" }, { "commit": "ac5830a33f5b25eae1dc0708b3e7a3d270a6c07f", "tree": "8e3bf52b942d432f8ebb79b8ad3c2eae1c06a744", "parents": [ "a699e4e49ec3fb62c4a44394357d14081df10bef" ], "author": { "name": "Mika Westerberg", "email": "mika.westerberg@linux.intel.com", "time": "Tue Apr 10 15:25:42 2012 +0300" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 10 22:39:17 2012 -0600" }, "message": "irq_domain: correct the debugfs file name\n\nThe actual name of the irq_domain mapping debugfs file is\n\"irq_domain_mapping\" not \"virq_mapping\".\n\nSigned-off-by: Mika Westerberg \u003cmika.westerberg@linux.intel.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "a699e4e49ec3fb62c4a44394357d14081df10bef", "tree": "4a64e6fd8bc6a71fe7212a69f552f4aef3bd473c", "parents": [ "5b7526e3a640e491075557acaa842c59c652c0c3" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 03 07:11:04 2012 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 10 22:39:17 2012 -0600" }, "message": "irq: Kill pointless irqd_to_hw export\n\nIt makes no sense to export this trivial function. Make it a static inline\ninstead.\n\nThis patch also drops virq_to_hw from arch/c6x since it is unused by that\narchitecture.\n\nv2: Move irq_hw_number_t into types.h to fix ARM build failure\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "5b7526e3a640e491075557acaa842c59c652c0c3", "tree": "43b3d5d33078b4683482b25559735e1e5d719a72", "parents": [ "0034102808e0dbbf3a2394b82b1bb40b5778de9e" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Thu Apr 05 16:52:13 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 10 22:39:16 2012 -0600" }, "message": "irq/irq_domain: Quit ignoring error returns from irq_alloc_desc_from().\n\nIn commit 4bbdd45a (irq_domain/powerpc: eliminate irq_map; use\nirq_alloc_desc() instead) code was added that ignores error returns\nfrom irq_alloc_desc_from() by (silently) casting the return value to\nunsigned. The negitive value error return now suddenly looks like a\nvalid irq number.\n\nCommits cc79ca69 (irq_domain: Move irq_domain code from powerpc to\nkernel/irq) and 1bc04f2c (irq_domain: Add support for base irq and\nhwirq in legacy mappings) move this code to its current location in\nirqdomain.c\n\nThe result of all of this is a null pointer dereference OOPS if one of\nthe error cases is hit.\n\nThe fix: Don\u0027t cast away the negativeness of the return value and then\ncheck for errors.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nAcked-by: Rob Herring \u003crob.herring@calxeda.com\u003e\n[grant.likely: dropped addition of new \u0027irq\u0027 variable]\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "09d208ec74b804b9dcd0b1cd9c21dfd592760807", "tree": "d8b51cc9111d235bdec3c5f8055222a140cee2ad", "parents": [ "18a223e0b9ec8979320ba364b47c9772391d6d05" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 21:10:43 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 21:10:43 2012 -0400" }, "message": "MAINTAINERS: Mark NATSEMI driver as orphan\u0027d.\n\nAfter discussion with Tim Hockin.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fae2e0fb24c61ca68c98d854a34732549ebc1854", "tree": "cc45de0142a2314fadfaeb0360676f14c09b38f5", "parents": [ "08f1ec8a594c60bf3856e3c45b6d15fd691d90bb" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 11 10:42:15 2012 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 11 10:42:15 2012 +1000" }, "message": "powerpc: Fix typo in runlatch code\n\nCommit fe1952fc0afb9a2e4c79f103c08aef5d13db1873\n\"powerpc: Rework runlatch code\" has a nasty typo\nwhere it uses \"TLF_RUNLATCH\" instead of \"_TLF_RUNLATCH\"\n(bit number instead of bit mask), causing some flags to\nbe potentially lost such as _TLF_RESTORE_SIGMASK\n\n(Brown paper bag for me ! We should be able to make\nthat break at compile time with a bit of magic, any\nvolunteer ?)\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "923e9a1399b620d063cd88537c64561bc3d5f905", "tree": "5d7aec3e06664c7f96726b9439a42a565bcc86ab", "parents": [ "94fb175c0414902ad9dbd956addf3a5feafbc85b" ], "author": { "name": "Kees Cook", "email": "keescook@chromium.org", "time": "Tue Apr 10 13:26:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 16:14:40 2012 -0700" }, "message": "Smack: build when CONFIG_AUDIT not defined\n\nThis fixes builds where CONFIG_AUDIT is not defined and\nCONFIG_SECURITY_SMACK\u003dy.\n\nThis got introduced by the stack-usage reducation commit 48c62af68a40\n(\"LSM: shrink the common_audit_data data union\").\n\nSigned-off-by: Kees Cook \u003ckeescook@chromium.org\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "94fb175c0414902ad9dbd956addf3a5feafbc85b", "tree": "5d3c37abe78f072e92072f2079a98303c92cf16e", "parents": [ "a9e1e53bcfb29b3b503a5e75ce498d9a64f32c1e", "a2bd1140a264b561e38d99e656cd843c2d840e86" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 15:30:16 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 15:30:16 2012 -0700" }, "message": "Merge tag \u0027dmaengine-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine\n\nPull dmaengine fixes from Dan Williams:\n\n1/ regression fix for Xen as it now trips over a broken assumption\n about the dma address size on 32-bit builds\n\n2/ new quirk for netdma to ignore dma channels that cannot meet\n netdma alignment requirements\n\n3/ fixes for two long standing issues in ioatdma (ring size overflow)\n and iop-adma (potential stack corruption)\n\n* tag \u0027dmaengine-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:\n netdma: adding alignment check for NETDMA ops\n ioatdma: DMA copy alignment needed to address IOAT DMA silicon errata\n ioat: ring size variables need to be 32bit to avoid overflow\n iop-adma: Corrected array overflow in RAID6 Xscale(R) test.\n ioat: fix size of \u0027completion\u0027 for Xen\n" }, { "commit": "18a223e0b9ec8979320ba364b47c9772391d6d05", "tree": "0028fe1163490ced0dcf3d72384fba0e37cf085e", "parents": [ "5fb84b1428b271f8767e0eb3fcd7231896edfaa4" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Tue Apr 10 07:59:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:47:09 2012 -0400" }, "message": "tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample\n\nFix a code path in tcp_rcv_rtt_update() that was comparing scaled and\nunscaled RTT samples.\n\nThe intent in the code was to only use the \u0027m\u0027 measurement if it was a\nnew minimum. However, since \u0027m\u0027 had not yet been shifted left 3 bits\nbut \u0027new_sample\u0027 had, this comparison would nearly always succeed,\nleading us to erroneously set our receive-side RTT estimate to the \u0027m\u0027\nsample when that sample could be nearly 8x too high to use.\n\nThe overall effect is to often cause the receive-side RTT estimate to\nbe significantly too large (up to 40% too large for brief periods in\nmy tests).\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5fb84b1428b271f8767e0eb3fcd7231896edfaa4", "tree": "4e27fb488ee9a0ecc4fca1c736dc5415cebbe59c", "parents": [ "ecd159fc5f415fa742d5daa5b43200606e6ad493" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 10 00:56:42 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:39:26 2012 -0400" }, "message": "tcp: restore correct limit\n\nCommit c43b874d5d714f (tcp: properly initialize tcp memory limits) tried\nto fix a regression added in commits 4acb4190 \u0026 3dc43e3,\nbut still get it wrong.\n\nResult is machines with low amount of memory have too small tcp_rmem[2]\nvalue and slow tcp receives : Per socket limit being 1/1024 of memory\ninstead of 1/128 in old kernels, so rcv window is capped to small\nvalues.\n\nFix this to match comment and previous behavior.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Jason Wang \u003cjasowang@redhat.com\u003e\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ecd159fc5f415fa742d5daa5b43200606e6ad493", "tree": "3f2996088bdf0d275d6b5fdb3cc184f80a12e21f", "parents": [ "f68e556e23d1a4176b563bcb25d8baf2c5313f91", "6ba900676bec8baaf61aa2f85b7345c0e65774d9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:38:31 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:38:31 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net\n" }, { "commit": "011afa1ed8c408d694957d2474d89dc81a60b70c", "tree": "fe9ed121a9570d254c79d63957613459b01d0a2c", "parents": [ "e2bc7c5f3cb8756865aa0ab140d2288f61599dda" ], "author": { "name": "Sujith Manoharan", "email": "c_manoha@qca.qualcomm.com", "time": "Tue Apr 10 12:26:11 2012 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Apr 10 14:14:34 2012 -0400" }, "message": "Revert \"ath9k: fix going to full-sleep on PS idle\"\n\nThis reverts commit c1afdaff90538ef085b756454f12b29575411214.\n\nUsers have reported connection failures in 3.3.1 and suspend/resume\nfailures in 3.4-rcX. Revert this commit for now - PS IDLE can be\nfixed in a clean manner later on.\n\nCc: stable@vger.kernel.org\nSigned-off-by: Sujith Manoharan \u003cc_manoha@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "e2bc7c5f3cb8756865aa0ab140d2288f61599dda", "tree": "7cdbfbba1912292d50dcf72f51b5c11982ccab30", "parents": [ "58f743ee06d400a887a3e30353c69c3151eb64df" ], "author": { "name": "Chen, Chien-Chia", "email": "machen@suse.com", "time": "Thu Mar 29 18:21:47 2012 +0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Apr 10 14:14:28 2012 -0400" }, "message": "rt2x00: Fix rfkill_polling register function.\n\n Move rt2x00rfkill_register(rt2x00dev) to rt2x00lib_probe_dev\n function. It fixes of starting rfkill_poll function at the\n right time if sets hard rfkill block and reboot. rt2x00mac_rfkill_poll\n should be starting before bringing up the wireless interface.\n\nSigned-off-by: Chen, Chien-Chia \u003cmachen@suse.com\u003e\nAcked-by: Helmut Schaa \u003chelmut.schaa@googlemail.com\u003e\nCC: Kevin Chou \u003ckevin.chou@mediatek.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "58f743ee06d400a887a3e30353c69c3151eb64df", "tree": "ddb5174602cecc7ba30833796fed436997bedbce", "parents": [ "7ab2485b69571a3beb0313c591486626c3374c85" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Mar 25 20:02:55 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Apr 10 14:13:30 2012 -0400" }, "message": "bcma: fix build error on MIPS; implicit pcibios_enable_device\n\nThe following is seen during allmodconfig builds for MIPS:\n\ndrivers/bcma/driver_pci_host.c:518:2: error: implicit declaration\nof function \u0027pcibios_enable_device\u0027 [-Werror\u003dimplicit-function-declaration]\ncc1: some warnings being treated as errors\nmake[3]: *** [drivers/bcma/driver_pci_host.o] Error 1\n\nMost likey introduced by commit 49dc9577155576b10ff79f0c1486c816b01f58bf\n\n \"bcma: add PCIe host controller\"\n\nAdd the header instead of implicitly assuming it will be present.\nSounds like a good idea, but that alone doesn\u0027t fix anything.\n\nThe real problem is that the Kconfig has settings related to whether\nPCI is possible, i.e.\n\n config BCMA_HOST_PCI_POSSIBLE\n bool\n depends on BCMA \u0026\u0026 PCI \u003d y\n default y\n\n config BCMA_HOST_PCI\n bool \"Support for BCMA on PCI-host bus\"\n depends on BCMA_HOST_PCI_POSSIBLE\n\n...but what is missing is that BCMA_DRIVER_PCI_HOSTMODE doesn\u0027t\nhave any dependencies on the above. Add one.\n\nCC: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nCC: John W. Linville \u003clinville@tuxdriver.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a9e1e53bcfb29b3b503a5e75ce498d9a64f32c1e", "tree": "c2e862c9232ea24b27c98b1791ba1368c8e8654e", "parents": [ "53cb430755f7dd36e42fa02603d166a07f3d94cd", "d657784b70ef653350d7aa49da90a8484c29da7d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 10:28:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 10:28:26 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc\n\nPull sparc fixes from David Miller:\n\n1) Build fix for LEON, from Sam Ravnborg.\n\n2) Make the sparc side changes that go along with the infrastructure to\n retry faults when blocking on a disk transfer. From Kautuk Consul.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:\n sparc32,leon: fix leon build\n sparc/mm/fault_32.c: Port OOM changes to do_sparc_fault\n sparc/mm/fault_64.c: Port OOM changes to do_sparc64_fault\n" }, { "commit": "53cb430755f7dd36e42fa02603d166a07f3d94cd", "tree": "d8225505f87f64959bd496027c8556078b6d6cf3", "parents": [ "0682490d5ff6c27d4e07b62d71aeadb8bc08c2c9", "c0d78c23423ee6ec774ac53f129e61839dde1908" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 10:26:41 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 10:26:41 2012 -0700" }, "message": "Merge tag \u0027regulator-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\nPull a regulator build fix from Mark Brown:\n \"Fix a build warning in the anatop driver for 3.4\n\n This is a trivial rename to stop the build system complaining that\n we\u0027re referencing things we shouldn\u0027t be.\"\n\n* tag \u0027regulator-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:\n regulator: anatop: fix \u0027anatop_regulator\u0027 name collision\n" }, { "commit": "c4867936474183332db4c19791a65fdad6474fd5", "tree": "1c6c943a8186935b42e02e9adc521cc506cf4e85", "parents": [ "14667a4bde4361b7ac420d68a2e9e9b9b2df5231" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 10 10:42:36 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 10 19:23:02 2012 +0200" }, "message": "drm/i915: properly compute dp dithering for user-created modes\n\nWe\u0027ve only computed whether we need to fall back to 6bpc due to dp\nlink bandwidth constrains in mode_valid, but not mode_fixup. Under\nvarious circumstances X likes to create new modes which then lack\nproper 6bpc flags (if required), resulting in mode_fixup failures and\nultimately black screens.\n\nChris Wilson pointed out that we still get things wrong for bpp \u003e 24,\nbut that should be fixed in another patch (and it\u0027ll be easier because\nthis patch consolidates the logic).\n\nThe likely culprit for this regression is\n\ncommit 3d794f87238f74d80e78a7611c7fbde8a54c85c2\nAuthor: Keith Packard \u003ckeithp@keithp.com\u003e\nDate: Wed Jan 25 08:16:25 2012 -0800\n\n drm/i915: Force explicit bpp selection for intel_dp_link_required\n\nv2: Fix indentation and tune down the too bold claim that this should\nfix the world. Both noticed by Chris Wilson.\n\nv3: Try to really git add things.\n\nReported-and-tested-by: Brice Goglin \u003cBrice.Goglin@ens-lyon.org\u003e\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d48170\nCc: stable@kernel.org\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "55158c886a0c43765140673d2343d3119d34a25a", "tree": "165a86e662f36c4ca98e89487e93ce5e35d04af9", "parents": [ "fb16395ee65d22882a0af30850cbf5c9b9a2962c" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Apr 10 09:03:03 2012 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Apr 10 09:05:27 2012 -0700" }, "message": "Input: gpio_mouse - use linux/gpio.h rather than asm/gpio.h\n\nDirect usage of the asm include has long been deprecated by the\nintroduction of gpiolib.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "0682490d5ff6c27d4e07b62d71aeadb8bc08c2c9", "tree": "0f830089234ecc2a66dbaca3eb7a4d30efd23583", "parents": [ "3a48d1c08fe0db79b8647b7042e6a077588b374a", "657b12d3a1508a3f06f7afe21d5dda7252279520" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 08:09:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 08:09:34 2012 -0700" }, "message": "Merge branch \u0027for-3.4-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml\n\nPull UML fixes from Richard Weinberger.\n\n* \u0027for-3.4-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:\n um: uml_setup_stubs\u0027: warning: unused variable \u0027pages\u0027\n um: Use asm-generic/switch_to.h\n um: Disintegrate asm/system.h\n um: switch cow_user.h to htobe{32,64}/betoh{32,64}\n um: several x86 hw-dependent crypto modules won\u0027t build on uml\n um: fix linker script generation\n" }, { "commit": "3a48d1c08fe0db79b8647b7042e6a077588b374a", "tree": "2467fb15faf39c237e40b331161f13a90d877565", "parents": [ "258f742635360175564e9470eb060ff4d4b984e7" ], "author": { "name": "Kristen Carlson Accardi", "email": "kristen@linux.intel.com", "time": "Tue Apr 10 14:15:41 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 08:09:03 2012 -0700" }, "message": "i2c: prevent spurious interrupt on Designware controllers\n\nDon\u0027t call i2c_enable on resume because it causes a spurious\ninterrupt.\n\nSigned-off-by: Kristen Carlson Accardi \u003ckristen@linux.intel.com\u003e\nSigned-off-by: Kirill A. Shutemov \u003ckirill.shutemov@linux.intel.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fae3d88a5c56c3f836e95c4516da883a48612437", "tree": "eb08d977ab3da42c466062ba237e05b4e4a1ae5f", "parents": [ "38be95dd3d314bd393a26f6e441ae2c57ef7f064" ], "author": { "name": "Fengguang Wu", "email": "fengguang.wu@intel.com", "time": "Tue Apr 10 17:00:35 2012 +0800" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Apr 10 14:53:55 2012 +0200" }, "message": "ALSA: hda - hide HDMI/ELD printks unless snd.debug\u003d2\n\nAlso remove two warnings when CONFIG_SND_DEBUG is not set:\n\nsound/pci/hda/patch_hdmi.c: In function ‘hdmi_intrinsic_event’:\nsound/pci/hda/patch_hdmi.c:761:6: warning: unused variable ‘eldv’ [-Wunused-variable]\nsound/pci/hda/patch_hdmi.c:760:6: warning: unused variable ‘pd’ [-Wunused-variable]\n\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "ca9248d8337d525c2d2b26a1d8314478d15707fb", "tree": "7b419d409416939ca951e56efdd2f4e8b9ae2607", "parents": [ "5e2f7d617b574dadf3ad125e4821ce1b180b1626" ], "author": { "name": "Bob Peterson", "email": "rpeterso@redhat.com", "time": "Tue Apr 10 08:56:04 2012 -0400" }, "committer": { "name": "Steven Whitehouse", "email": "swhiteho@redhat.com", "time": "Tue Apr 10 13:49:53 2012 +0100" }, "message": "GFS2: Allow caching of rindex glock\n\nThis patch allows caching of the rindex glock. We were previously\nsetting the GL_NOCACHE bit when the glock was released. That forced\nthe rindex inode to be invalidated, which caused us to re-read\nrindex at the next access. However, it caused the glock to be\nunnecessarily bounced around the cluster. This patch allows\nthe glock to remain cached, but it still causes the rindex to be\nre-read once it has been written to by gfs2_grow.\n\nBen and I have tested single-node gfs2_grow cases and I\u0027ve tested\nclustered gfs2_grow cases on my four-node cluster.\n\nSigned-off-by: Bob Peterson \u003crpeterso@redhat.com\u003e\nSigned-off-by: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\n" }, { "commit": "6ba900676bec8baaf61aa2f85b7345c0e65774d9", "tree": "7074065c1308041ec4d4a99f51dda2290aed9bca", "parents": [ "07153c6ec074257ade76a461429b567cff2b3a1e" ], "author": { "name": "Gao feng", "email": "gaofeng@cn.fujitsu.com", "time": "Sat Apr 07 16:08:28 2012 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Apr 10 13:00:38 2012 +0200" }, "message": "netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net\n\nin function nf_conntrack_init_net,when nf_conntrack_timeout_init falied,\nwe should call nf_conntrack_ecache_fini to do rollback.\nbut the current code calls nf_conntrack_timeout_fini.\n\nSigned-off-by: Gao feng \u003cgaofeng@cn.fujitsu.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "07153c6ec074257ade76a461429b567cff2b3a1e", "tree": "ca918b6b18835b650ad4a9fed8bc08b1e6c6d273", "parents": [ "8430eac2f6a3c2adce22d490e2ab8bb50d59077a" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Tue Apr 03 22:02:01 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Apr 10 12:50:49 2012 +0200" }, "message": "netfilter: nf_ct_ipv4: packets with wrong ihl are invalid\n\nIt was reported that the Linux kernel sometimes logs:\n\nklogd: [2629147.402413] kernel BUG at net / netfilter /\nnf_conntrack_proto_tcp.c: 447!\nklogd: [1072212.887368] kernel BUG at net / netfilter /\nnf_conntrack_proto_tcp.c: 392\n\nipv4_get_l4proto() in nf_conntrack_l3proto_ipv4.c and tcp_error() in\nnf_conntrack_proto_tcp.c should catch malformed packets, so the errors\nat the indicated lines - TCP options parsing - should not happen.\nHowever, tcp_error() relies on the \"dataoff\" offset to the TCP header,\ncalculated by ipv4_get_l4proto(). But ipv4_get_l4proto() does not check\nbogus ihl values in IPv4 packets, which then can slip through tcp_error()\nand get caught at the TCP options parsing routines.\n\nThe patch fixes ipv4_get_l4proto() by invalidating packets with bogus\nihl value.\n\nThe patch closes netfilter bugzilla id 771.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "afceb9319f21b18ee3bc15ee9a5f92e18ef8a8c9", "tree": "3e874864cea99e260b48f5b0717317510e7cdf15", "parents": [ "6587eb82617f7913c13e750e73e13fa9c829863c" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Apr 03 17:05:41 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 10 10:27:46 2012 +0100" }, "message": "drm/radeon/kms: fix DVO setup on some r4xx chips\n\nSome r4xx chips have the wrong frev in the\nDVOEncoderControl table. It should always be 1\non r4xx. Fixes modesetting on DVO on r4xx chips\nwith the bad frev.\n\nReported by twied on #radeon.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6587eb82617f7913c13e750e73e13fa9c829863c", "tree": "47795de3efba773e42336c954b8f15675c156536", "parents": [ "4de833c337509916b7931982734d858191cf0700" ], "author": { "name": "Xi Wang", "email": "xi.wang@gmail.com", "time": "Fri Apr 06 17:38:24 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 10 10:22:51 2012 +0100" }, "message": "drm/savage: fix integer overflows in savage_bci_cmdbuf()\n\nSince cmdbuf-\u003esize and cmdbuf-\u003enbox are from userspace, a large value\nwould overflow the allocation size, leading to out-of-bounds access.\n\nSigned-off-by: Xi Wang \u003cxi.wang@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4de833c337509916b7931982734d858191cf0700", "tree": "f5eeaeff34fe4f8b2a51ee3a6817a1fa4dcae68c", "parents": [ "258f742635360175564e9470eb060ff4d4b984e7" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Apr 05 12:58:22 2012 -0600" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 10 10:21:00 2012 +0100" }, "message": "drm/radeon: replace udelay with mdelay for long timeouts\n\nSome architectures require that delays longer than a few\nmiliseconds are called through mdelay. This was triggered\non ARM randconfig builds.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Mathieu Poirier \u003cmathieu.poirier@linaro.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fb16395ee65d22882a0af30850cbf5c9b9a2962c", "tree": "f4b98bfbf8dd9d044e646fcb2b30975dc73dc0b7", "parents": [ "e3dde4fba94e0ba5e1fd79ea9e5389eea1f0cfec" ], "author": { "name": "JJ Ding", "email": "dgdunix@gmail.com", "time": "Tue Apr 10 00:25:01 2012 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Apr 10 00:40:39 2012 -0700" }, "message": "Input: trackpoint - use psmouse_fmt() for messages\n\nUse psmouse_*() macros introduced in commit b5d21704361ee.\n\nSigned-off-by: JJ Ding \u003cdgdunix@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "e3dde4fba94e0ba5e1fd79ea9e5389eea1f0cfec", "tree": "8f266e19a8d0124c3166c908ffe6bf9c0624a0dd", "parents": [ "a67ada7a7239b78250c1594b0e02ca68eae848dc" ], "author": { "name": "JJ Ding", "email": "jj_ding@emc.com.tw", "time": "Tue Apr 10 00:30:12 2012 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Apr 10 00:40:35 2012 -0700" }, "message": "Input: elantech - v4 is a clickpad, with only one button\n\nAdd pointer and buttonpad properties for v4 hardware.\n\nAlso, Jachiet reported that on Asus UX31, right button has no effect.\nIt turns out v4 has only one button, the right-button effect is\nimplemented with software when Windows driver is installed, or in\nfirmware when touchpad is in relative mode. So remove BTN_RIGHT\nwhile at it.\n\nReported-by: Jachiet Louis \u003clouis@jachiet.com\u003e\nSigned-off-by: JJ Ding \u003cjj_ding@emc.com.tw\u003e\nReviewed-by: Chase Douglas \u003cchase.douglas@canonical.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "a67ada7a7239b78250c1594b0e02ca68eae848dc", "tree": "f46f0240f415e1217bb487e8b4a119334bfde697", "parents": [ "d626dad58f02e13730ded6ac84d6a9e53123f0e8" ], "author": { "name": "JJ Ding", "email": "jj_ding@emc.com.tw", "time": "Tue Apr 10 00:29:12 2012 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Apr 10 00:40:31 2012 -0700" }, "message": "Input: elantech - reset touchpad before configuring it\n\nAcer VH40 has a Fn key toggling the touchpad on and off, but it\u0027s\nimplemented in system firmware, and the EC chip has to receive\nreset command to activate this function. Also when this machine\nwakes up after resume, psmouse_reset is necessary to bring the\ntouchpad back on.\n\nSigned-off-by: JJ Ding \u003cjj_ding@emc.com.tw\u003e\nReviewed-by: Chase Douglas \u003cchase.douglas@canonical.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" } ], "next": "08f1ec8a594c60bf3856e3c45b6d15fd691d90bb" }