)]}' { "log": [ { "commit": "a715dea3c8e9ef2771c534e05ee1d36f65987e64", "tree": "7734586473abed25f7ec4b8423adbdba3d829a61", "parents": [ "4910ac6c526d2868adcb5893e0c428473de862b5" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Sun Mar 27 14:57:26 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 28 22:26:32 2011 -0700" }, "message": "net: Always allocate at least 16 skb frags regardless of page size\n\nWhen analysing performance of the cxgb3 on a ppc64 box I noticed that\nwe weren\u0027t doing much GRO merging. It turns out we are limited by the\nnumber of SKB frags:\n\n#define MAX_SKB_FRAGS (65536/PAGE_SIZE + 2)\n\nWith a 4kB page size we have 18 frags, but with a 64kB page size we\nonly have 3 frags.\n\nI ran a single stream TCP bandwidth test to compare the performance of\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "673e63c688f43104c73aad8ea4237f7ad41fa14d", "tree": "3d11c6f74a5d0823020db8642c3f2cf062347afb", "parents": [ "b5845f9834d8f4c79d324bc59b99dbcf0a40f428" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Tue Mar 22 23:54:49 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 27 23:35:24 2011 -0700" }, "message": "net: fix ethtool-\u003eset_flags not intended -EINVAL return value\n\nAfter commit d5dbda23804156ae6f35025ade5307a49d1db6d7 \"ethtool: Add\nsupport for vlan accleration.\", drivers that have NETIF_F_HW_VLAN_TX,\nand/or NETIF_F_HW_VLAN_RX feature, but do not allow enable/disable vlan\nacceleration via ethtool set_flags, always return -EINVAL from that\nfunction. Fix by returning -EINVAL only if requested features do not\nmatch current settings and can not be changed by driver.\n\nChange any driver that define ethtool-\u003eset_flags to use\nethtool_invalid_flags() to avoid similar problems in the future\n(also on drivers that do not have the problem).\n\nTested with modified (to reproduce this bug) myri10ge driver.\n\nCc: stable@kernel.org # 2.6.37+\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "53914b67993c724cec585863755c9ebc8446e83b", "tree": "851d031dd41a74c7e03436ca7c98455fee1c598e", "parents": [ "3b261ade4224852ed841ecfd13876db812846e96" ], "author": { "name": "Oliver Hartkopp", "email": "socketcan@hartkopp.net", "time": "Tue Mar 22 08:27:25 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 27 23:34:59 2011 -0700" }, "message": "can: make struct proto const\n\ncan_ioctl is the only reason for struct proto to be non-const.\nscript/check-patch.pl suggests struct proto be const.\n\nSetting the reference to the common can_ioctl() in all CAN protocols directly\nremoves the need to make the struct proto writable in af_can.c\n\nSigned-off-by: Kurt Van Dijck \u003ckurt.van.dijck@eia.be\u003e\nSigned-off-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e0bccd315db0c2f919e7fcf9cb60db21d9986f52", "tree": "8cf512f43221087f964c0f55c7665e293e96921b", "parents": [ "be20250c13f88375345ad99950190685eda51eb8" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Sun Mar 20 06:48:05 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 27 17:59:04 2011 -0700" }, "message": "rose: Add length checks to CALL_REQUEST parsing\n\nDefine some constant offsets for CALL_REQUEST based on the description\nat \u003chttp://www.techfest.com/networking/wan/x25plp.htm\u003e and the\ndefinition of ROSE as using 10-digit (5-byte) addresses. Use them\nconsistently. Validate all implicit and explicit facilities lengths.\nValidate the address length byte rather than either trusting or\nassuming its value.\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e433430a0ca9cc1b851a83ac3b305e955b64880a", "tree": "129e0c5db7e5643352ac55a920b5d6c5ef65fb66", "parents": [ "3bc07321ccc236f693ce1b6a8786f0a2e38bb87e" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Tue Mar 15 21:09:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 27 17:55:01 2011 -0700" }, "message": "dst: Clone child entry in skb_dst_pop\n\nWe clone the child entry in skb_dst_pop before we call\nskb_dst_drop(). Otherwise we might kill the child right\nbefore we return it to the caller.\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6df59a84eccd4cad7fcefda3e0c5e55239a3b2dd", "tree": "7d23038ad450413eb4238f14707e1f0dce29638a", "parents": [ "37e826c513883099c298317bad1b3b677b2905fb" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Fri Mar 25 01:28:45 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 25 01:28:45 2011 -0700" }, "message": "route: Take the right src and dst addresses in ip_route_newports\n\nWhen we set up the flow informations in ip_route_newports(), we take\nthe address informations from the the rt_key_src and rt_key_dst fields\nof the rtable. They appear to be empty. So take the address\ninformations from rt_src and rt_dst instead. This issue was introduced\nby commit 5e2b61f78411be25f0b84f97d5b5d312f184dfd1 (\"ipv4: Remove\nflowi from struct rtable.\")\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "37e826c513883099c298317bad1b3b677b2905fb", "tree": "a032cfe69e0cde179d86eba157cf9dc85d67df86", "parents": [ "436c3b66ec9824a633724ae42de1c416af4f2063" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 24 18:06:47 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 24 18:06:47 2011 -0700" }, "message": "ipv4: Fix nexthop caching wrt. scoping.\n\nMove the scope value out of the fib alias entries and into fib_info,\nso that we always use the correct scope when recomputing the nexthop\ncached source address.\n\nReported-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "436c3b66ec9824a633724ae42de1c416af4f2063", "tree": "8da6452386b6e900c4226c9b67694d1ea21e847e", "parents": [ "f7594d42944c0dfca90318f50978a4bdf8504086" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 24 17:42:21 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 24 17:42:21 2011 -0700" }, "message": "ipv4: Invalidate nexthop cache nh_saddr more correctly.\n\nAny operation that:\n\n1) Brings up an interface\n2) Adds an IP address to an interface\n3) Deletes an IP address from an interface\n\ncan potentially invalidate the nh_saddr value, requiring\nit to be recomputed.\n\nPerform the recomputation lazily using a generation ID.\n\nReported-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ef352e7cdf714596f51ad18809404edeaa50e8fd", "tree": "6323cffca24cba664cd57a7245eb78647c48b914", "parents": [ "8c64b4cc0201cf05b218ea3271a2abb4f86acb7b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Mar 24 00:13:14 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 24 00:13:14 2011 -0700" }, "message": "net_sched: fix THROTTLED/RUNNING race\n\ncommit fd245a4adb52 (net_sched: move TCQ_F_THROTTLED flag)\nadded a race.\n\nqdisc_watchdog() is run from softirq, so special care should be taken or\nwe can lose one state transition (THROTTLED/RUNNING)\n\nPrior to fd245a4adb52, we were manipulating q-\u003eflags (qdisc-\u003eflags \u0026\u003d\n~TCQ_F_THROTTLED;) and this manipulation could only race with\nqdisc_warn_nonwc().\n\nSince we want to avoid atomic ops in qdisc fast path - it was the\nmeaning of commit 371121057607e (QDISC_STATE_RUNNING dont need atomic\nbit ops) - fix is to move THROTTLE bit into \u0027state\u0027 field, this one\nbeing manipulated with SMP and IRQ safe operations.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c1b43dca137f2154845122417fba86d4bae67182", "tree": "36237582bfd5baf0e9a3ccea5377b949be289440", "parents": [ "1679200f91da6a054b06954c9bd3eeed29b6731f" ], "author": { "name": "Eli Cohen", "email": "eli@mellanox.co.il", "time": "Tue Mar 22 22:38:41 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 23 12:24:23 2011 -0700" }, "message": "mlx4: Add blue flame support for kernel consumers\n\nUsing blue flame can improve latency by allowing the HW to more efficiently\naccess the WQE. This patch presents two functions that are used to allocate or\nrelease HW resources for using blue flame; the caller need to supply a struct\nmlx4_bf object when allocating resources. Consumers that make use of this API\nshould post doorbells to the UAR object pointed by the initialized struct\nmlx4_bf;\n\nSigned-off-by: Eli Cohen \u003celi@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1679200f91da6a054b06954c9bd3eeed29b6731f", "tree": "a447268debe479a257cfff4c7e5e86151eef6583", "parents": [ "b12d93d63c3217f0ec923ff938b12a744e242ffa" ], "author": { "name": "Yevgeny Petrilin", "email": "yevgenyp@mellanox.co.il", "time": "Tue Mar 22 22:38:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 23 12:24:22 2011 -0700" }, "message": "mlx4_en: Enabling new steering\n\nThe mlx4_en module now uses the new steering mechanism.\nThe RX packets are now steered through the MCG table instead\nof Mac table for unicast, and default entry for multicast.\nThe feature is enabled through INIT_HCA\n\nSigned-off-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0345584e0b8be3735a950d17c7e463db20c6ce27", "tree": "f49fd3824c1f3b620d456c40539f9b1b88832b69", "parents": [ "725c89997e03d71b09ea3c17c997da0712b9d835" ], "author": { "name": "Yevgeny Petrilin", "email": "yevgenyp@mellanox.co.il", "time": "Tue Mar 22 22:38:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 23 12:24:21 2011 -0700" }, "message": "mlx4: generalization of multicast steering.\n\nThe same packet steering mechanism would be used both for IB and Ethernet,\nBoth multicasts and unicasts.\nThis commit prepares the general infrastructure for this.\n\nSigned-off-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "725c89997e03d71b09ea3c17c997da0712b9d835", "tree": "d141987aec9ae90d43e3f44e3facee921ec6f526", "parents": [ "14c07b1358ede1664652bb9b28d9ace5fe6f7f92" ], "author": { "name": "Yevgeny Petrilin", "email": "yevgenyp@mellanox.co.il", "time": "Tue Mar 22 22:38:07 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 23 12:24:20 2011 -0700" }, "message": "mlx4_en: Reporting HW revision in ethtool -i\n\nHW revision is derived from device ID and rev id.\n\nSigned-off-by: Eugenia Emantayev \u003ceugenia@mellanox.co.il\u003e\nSigned-off-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "14c07b1358ede1664652bb9b28d9ace5fe6f7f92", "tree": "05fa72b9680e85923d938edd8e4963bbac0b629b", "parents": [ "1fb9876e9bf895ea4127ff17180f1b2ab37771b6" ], "author": { "name": "Yevgeny Petrilin", "email": "yevgenyp@mellanox.co.il", "time": "Tue Mar 22 22:37:59 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 23 12:24:19 2011 -0700" }, "message": "mlx4: Wake on LAN support\n\nThe driver queries the FW for WOL support.\nEthtool get/set_wol is implemented accordingly.\nOnly magic packets are supported at the time.\n\nSigned-off-by: Igor Yarovinsky \u003cigory@mellanox.co.il\u003e\nSigned-off-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0b7ca5a928e2271bbc225e9e1ac1f22e9fbee54f", "tree": "8a24efdb4ceb6f28a8d49e942f80d397c06f4a5f", "parents": [ "908222655b38005483d64385e06341a38647fdf1" ], "author": { "name": "Yevgeny Petrilin", "email": "yevgenyp@mellanox.co.il", "time": "Tue Mar 22 22:37:47 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 23 12:24:18 2011 -0700" }, "message": "mlx4: Changing interrupt scheme\n\nAdding a pool of MSI-X vectors and EQs that can be used explicitly by mlx4_core\ncustomers (mlx4_ib, mlx4_en). The consumers will assign their own names to the\ninterrupt vectors. Those vectors are not opened at mlx4 device initialization,\nopened by demand.\nChanged the max number of possible EQs according to the new scheme, no longer relies on\non number of cores.\nThe new functionality is exposed through mlx4_assign_eq() and mlx4_release_eq().\nCustomers that do not use the new API will get completion vectors as before.\n\nSigned-off-by: Markuze Alex \u003cmarkuze@mellanox.co.il\u003e\nSigned-off-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6a1fef6d000944911df0f160f366111daa10740a", "tree": "905c6f7f078b0fcb8427d28f7a4bd23082316f1f", "parents": [ "9c7a4f9ce651383c73dfdff3d7e21d5f9572c4ec" ], "author": { "name": "Sriram", "email": "srk@ti.com", "time": "Tue Mar 22 02:31:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 19:25:05 2011 -0700" }, "message": "net: davinci_emac:Fix translation logic for buffer descriptor\n\nWith recent changes to the driver(switch to new cpdma layer),\nthe support for buffer descriptor address translation logic\nis broken. This affects platforms where the physical address of\nthe descriptors as seen by the DMA engine is different from the\nphysical address.\n\nOriginal Patch adding translation logic support:\nCommit: ad021ae8862209864dc8ebd3b7d3a55ce84b9ea2\n\nSigned-off-by: Sriramakrishnan A G \u003csrk@ti.com\u003e\nTested-By: Sekhar Nori \u003cnsekhar@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9c7a4f9ce651383c73dfdff3d7e21d5f9572c4ec", "tree": "5286988a4c78be842ea164c24e1acf932d19b4a0", "parents": [ "db138908ccff404b9920f18f6244f4bff2368c04" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Tue Mar 22 19:17:36 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 19:17:36 2011 -0700" }, "message": "ipv6: ip6_route_output does not modify sk parameter, so make it const\n\nThis avoids explicit cast to avoid \u0027discards qualifiers\u0027\ncompiler warning in a netfilter patch that i\u0027ve been working on.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db138908ccff404b9920f18f6244f4bff2368c04", "tree": "18734f9b833a5f1134fc138a00d9223fc2afa028", "parents": [ "04024b937a6e9b7d4320b5853557cea3930d528c", "8bc8aecdc5e26cfda12dbd6867af4aa67836da6a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 14:36:18 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 14:36:18 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "e6abbaa2725a43cf5d26c4c2a5dc6c0f6029ea19", "tree": "65d9d9deb7259322e83fc750b98f4ad9f7a51f56", "parents": [ "74cb3c108bc0f599a4eb40980db8580cfba725c9" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Sat Mar 19 12:13:49 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 01:06:32 2011 -0700" }, "message": "ipv4: fix route deletion for IPs on many subnets\n\nAlex Sidorenko reported for problems with local\nroutes left after IP addresses are deleted. It happens\nwhen same IPs are used in more than one subnet for the\ndevice.\n\n\tFix fib_del_ifaddr to restrict the checks for duplicate\nlocal and broadcast addresses only to the IFAs that use\nour primary IFA or another primary IFA with same address.\nAnd we expect the prefsrc to be matched when the routes\nare deleted because it is possible they to differ only by\nprefsrc. This patch prevents local and broadcast routes\nto be leaked until their primary IP is deleted finally\nfrom the box.\n\n\tAs the secondary address promotion needs to delete\nthe routes for all secondaries that used the old primary IFA,\nadd option to ignore these secondaries from the checks and\nto assume they are already deleted, so that we can safely\ndelete the route while these IFAs are still on the device list.\n\nReported-by: Alex Sidorenko \u003calexandre.sidorenko@hp.com\u003e\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "27660515a21bf913e3208ded3f27abd0529fae0e", "tree": "e07baa50f459b227eff6aa0dfbb6041f501bfb90", "parents": [ "736561a01f11114146b1b7f82d486fa9c95828ef" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Fri Mar 18 16:56:34 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 01:00:26 2011 -0700" }, "message": "net: implement dev_disable_lro() hw_features compatibility\n\nImplement compatibility with new hw_features for dev_disable_lro().\nThis is a transition path - dev_disable_lro() should be later\nintegrated into netdev_fix_features() after all drivers are converted.\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "736561a01f11114146b1b7f82d486fa9c95828ef", "tree": "804709a3163df1c6e33e2a1da5ec91f719bce17c", "parents": [ "f40f94fc6c3b5a5542d5ed976e9ff69a3b463802" ], "author": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Mon Mar 21 15:18:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 21 20:39:24 2011 -0700" }, "message": "IPVS: Use global mutex in ip_vs_app.c\n\nAs part of the work to make IPVS network namespace aware\n__ip_vs_app_mutex was replaced by a per-namespace lock,\nipvs-\u003eapp_mutex. ipvs-\u003eapp_key is also supplied for debugging purposes.\n\nUnfortunately this implementation results in ipvs-\u003eapp_key residing\nin non-static storage which at the very least causes a lockdep warning.\n\nThis patch takes the rather heavy-handed approach of reinstating\n__ip_vs_app_mutex which will cover access to the ipvs-\u003elist_head\nof all network namespaces.\n\n[ 12.610000] IPVS: Creating netns size\u003d2456 id\u003d0\n[ 12.630000] IPVS: Registered protocols (TCP, UDP, SCTP, AH, ESP)\n[ 12.640000] BUG: key ffff880003bbf1a0 not in .data!\n[ 12.640000] ------------[ cut here ]------------\n[ 12.640000] WARNING: at kernel/lockdep.c:2701 lockdep_init_map+0x37b/0x570()\n[ 12.640000] Hardware name: Bochs\n[ 12.640000] Pid: 1, comm: swapper Tainted: G W 2.6.38-kexec-06330-g69b7efe-dirty #122\n[ 12.650000] Call Trace:\n[ 12.650000] [\u003cffffffff8102e685\u003e] warn_slowpath_common+0x75/0xb0\n[ 12.650000] [\u003cffffffff8102e6d5\u003e] warn_slowpath_null+0x15/0x20\n[ 12.650000] [\u003cffffffff8105967b\u003e] lockdep_init_map+0x37b/0x570\n[ 12.650000] [\u003cffffffff8105829d\u003e] ? trace_hardirqs_on+0xd/0x10\n[ 12.650000] [\u003cffffffff81055ad8\u003e] debug_mutex_init+0x38/0x50\n[ 12.650000] [\u003cffffffff8104bc4c\u003e] __mutex_init+0x5c/0x70\n[ 12.650000] [\u003cffffffff81685ee7\u003e] __ip_vs_app_init+0x64/0x86\n[ 12.660000] [\u003cffffffff81685a3b\u003e] ? ip_vs_init+0x0/0xff\n[ 12.660000] [\u003cffffffff811b1c33\u003e] T.620+0x43/0x170\n[ 12.660000] [\u003cffffffff811b1e9a\u003e] ? register_pernet_subsys+0x1a/0x40\n[ 12.660000] [\u003cffffffff81685a3b\u003e] ? ip_vs_init+0x0/0xff\n[ 12.660000] [\u003cffffffff81685a3b\u003e] ? ip_vs_init+0x0/0xff\n[ 12.660000] [\u003cffffffff811b1db7\u003e] register_pernet_operations+0x57/0xb0\n[ 12.660000] [\u003cffffffff81685a3b\u003e] ? ip_vs_init+0x0/0xff\n[ 12.670000] [\u003cffffffff811b1ea9\u003e] register_pernet_subsys+0x29/0x40\n[ 12.670000] [\u003cffffffff81685f19\u003e] ip_vs_app_init+0x10/0x12\n[ 12.670000] [\u003cffffffff81685a87\u003e] ip_vs_init+0x4c/0xff\n[ 12.670000] [\u003cffffffff8166562c\u003e] do_one_initcall+0x7a/0x12e\n[ 12.670000] [\u003cffffffff8166583e\u003e] kernel_init+0x13e/0x1c2\n[ 12.670000] [\u003cffffffff8128c134\u003e] kernel_thread_helper+0x4/0x10\n[ 12.670000] [\u003cffffffff8128ad40\u003e] ? restore_args+0x0/0x30\n[ 12.680000] [\u003cffffffff81665700\u003e] ? kernel_init+0x0/0x1c2\n[ 12.680000] [\u003cffffffff8128c130\u003e] ? kernel_thread_helper+0x0/0x1global0\n\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Julian Anastasov \u003cja@ssi.bg\u003e\nCc: Hans Schillstrom \u003chans@schillstrom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "20246a800389fe5442675c59863fec5a4f520c7c", "tree": "6a713be7255b973dfbf3178c64ae0e7ce94f7695", "parents": [ "8aa525a9340da4227797a06221ca08399006635f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Mar 21 18:12:54 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 21 18:12:54 2011 -0700" }, "message": "snmp: SNMP_UPD_PO_STATS_BH() always called from softirq\n\nWe dont need to test if we run from softirq context, we definitely are.\n\nThis saves few instructions in ip_rcv() \u0026 ip_rcv_finish()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a454f0ccefbfdbfc0e1aa8a5f8010af5e48b8845", "tree": "359fdf6dbff1494ffe3d5cc8861fb0c0b72cc831", "parents": [ "0e24d34a5b95226cfc335817aefd9cf9744e5659" ], "author": { "name": "Wei Yongjun", "email": "yjwei@cn.fujitsu.com", "time": "Mon Mar 21 18:08:28 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 21 18:08:28 2011 -0700" }, "message": "xfrm: Fix initialize repl field of struct xfrm_state\n\nCommit \u0027xfrm: Move IPsec replay detection functions to a separate file\u0027\n (9fdc4883d92d20842c5acea77a4a21bb1574b495)\nintroduce repl field to struct xfrm_state, and only initialize it\nunder SA\u0027s netlink create path, the other path, such as pf_key,\nipcomp/ipcomp6 etc, the repl field remaining uninitialize. So if\nthe SA is created by pf_key, any input packet with SA\u0027s encryption\nalgorithm will cause panic.\n\n int xfrm_input()\n {\n ...\n x-\u003erepl-\u003eadvance(x, seq);\n ...\n }\n\nThis patch fixed it by introduce new function __xfrm_init_state().\n\nPid: 0, comm: swapper Not tainted 2.6.38-next+ #14 Bochs Bochs\nEIP: 0060:[\u003cc078e5d5\u003e] EFLAGS: 00010206 CPU: 0\nEIP is at xfrm_input+0x31c/0x4cc\nEAX: dd839c00 EBX: 00000084 ECX: 00000000 EDX: 01000000\nESI: dd839c00 EDI: de3a0780 EBP: dec1de88 ESP: dec1de64\n DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068\nProcess swapper (pid: 0, ti\u003ddec1c000 task\u003dc09c0f20 task.ti\u003dc0992000)\nStack:\n 00000000 00000000 00000002 c0ba27c0 00100000 01000000 de3a0798 c0ba27c0\n 00000033 dec1de98 c0786848 00000000 de3a0780 dec1dea4 c0786868 00000000\n dec1debc c074ee56 e1da6b8c de3a0780 c074ed44 de3a07a8 dec1decc c074ef32\nCall Trace:\n [\u003cc0786848\u003e] xfrm4_rcv_encap+0x22/0x27\n [\u003cc0786868\u003e] xfrm4_rcv+0x1b/0x1d\n [\u003cc074ee56\u003e] ip_local_deliver_finish+0x112/0x1b1\n [\u003cc074ed44\u003e] ? ip_local_deliver_finish+0x0/0x1b1\n [\u003cc074ef32\u003e] NF_HOOK.clone.1+0x3d/0x44\n [\u003cc074ef77\u003e] ip_local_deliver+0x3e/0x44\n [\u003cc074ed44\u003e] ? ip_local_deliver_finish+0x0/0x1b1\n [\u003cc074ec03\u003e] ip_rcv_finish+0x30a/0x332\n [\u003cc074e8f9\u003e] ? ip_rcv_finish+0x0/0x332\n [\u003cc074ef32\u003e] NF_HOOK.clone.1+0x3d/0x44\n [\u003cc074f188\u003e] ip_rcv+0x20b/0x247\n [\u003cc074e8f9\u003e] ? ip_rcv_finish+0x0/0x332\n [\u003cc072797d\u003e] __netif_receive_skb+0x373/0x399\n [\u003cc0727bc1\u003e] netif_receive_skb+0x4b/0x51\n [\u003ce0817e2a\u003e] cp_rx_poll+0x210/0x2c4 [8139cp]\n [\u003cc072818f\u003e] net_rx_action+0x9a/0x17d\n [\u003cc0445b5c\u003e] __do_softirq+0xa1/0x149\n [\u003cc0445abb\u003e] ? __do_softirq+0x0/0x149\n\nSigned-off-by: Wei Yongjun \u003cyjwei@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "858022aa6fad90ec86c567cbf54682a61dd39a01", "tree": "8ba025c5fd7a563559ba683f5ea8d19c54a3cd12", "parents": [ "6e9d592f02f657361168c94e22d9602cad71a09c" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Fri Mar 18 09:33:02 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Mar 21 15:19:48 2011 -0400" }, "message": "wireless: fix 80211 kernel-doc warnings\n\nFix many of each of these warnings:\n\nWarning(include/net/cfg80211.h:519): No description found for parameter \u0027rxrate\u0027\nWarning(include/net/mac80211.h:1163): bad line:\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5e0c1eb7e6b61998c7ecd39b7f69a15773d894d4", "tree": "4fba9a1410925d0a6d7a8a39aa8cc447e6f9251c", "parents": [ "b26fa4e0275426450238a14158bc1db24bb696e6" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Sun Mar 20 15:33:26 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Sun Mar 20 15:33:26 2011 +0100" }, "message": "netfilter: ipset: fix address ranges at hash:*port* types\n\nThe hash:*port* types with IPv4 silently ignored when address ranges\nwith non TCP/UDP were added/deleted from the set and used the first\naddress from the range only.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "b51bdad63046d1d5a4807630cc8c02845cf67893", "tree": "98d739a27b27268306e65c558dbdc9e771f8d874", "parents": [ "6b1e960fdbd75dcd9bcc3ba5ff8898ff1ad30b6e" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Fri Mar 18 08:50:37 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 18 15:14:45 2011 -0700" }, "message": "headers: use __aligned_xx types for userspace\n\nNow that we finally have __aligned_xx exported to userspace, convert\nthe headers that get exported over to the proper type.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3a7da39d165e0c363c294feec119db1427032afd", "tree": "901e54990fdd90d6f90d27533c36e61858216e34", "parents": [ "5e5069b41d5b82bcadc1dbf73f48476b428c102f" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Mar 17 07:34:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 18 15:13:11 2011 -0700" }, "message": "ethtool: Compat handling for struct ethtool_rxnfc\n\nThis structure was accidentally defined such that its layout can\ndiffer between 32-bit and 64-bit processes. Add compat structure\ndefinitions and an ioctl wrapper function.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nCc: stable@kernel.org [2.6.30+]\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "99759619b27662d1290901228d77a293e6e83200", "tree": "e76841fa3f59ebfc3975ff40bbc14363d0fdc5d3", "parents": [ "b061c59c27e0385e53c961d9fbd18c1c078d9823", "65d8defe2e13fbebd74f96d2b5ca9aad435e6648" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:56:44 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:56:44 2011 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:\n PCI: label: remove #include of ACPI header to avoid warnings\n PCI: label: Fix compilation error when CONFIG_ACPI is unset\n PCI: pre-allocate additional resources to devices only after successful allocation of essential resources.\n PCI: introduce reset_resource()\n PCI: data structure agnostic free list function\n PCI: refactor io size calculation code\n PCI: do not create quirk I/O regions below PCIBIOS_MIN_IO for ICH\n PCI hotplug: acpiphp: set current_state to D0 in register_slot\n PCI: Export ACPI _DSM provided firmware instance number and string name to sysfs\n PCI: add more checking to ICH region quirks\n PCI: aer-inject: Override PCIe AER Mask Registers\n PCI: fix tlan build when CONFIG_PCI is not enabled\n PCI: remove quirk for pre-production systems\n PCI: Avoid potential NULL pointer dereference in pci_scan_bridge\n PCI/lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs\n PCI: sysfs: Fix failure path for addition of \"vpd\" attribute\n" }, { "commit": "b061c59c27e0385e53c961d9fbd18c1c078d9823", "tree": "56240ef8e98e9e4712ee58aa8e6e3d51f6ab001f", "parents": [ "99f4065bac7b8c3f829334b4218a5c2e68cbe440", "568a60eda2e90a11bb3d7f8ef3f6800e9b60d4e5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:56:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:56:02 2011 -0700" }, "message": "Merge branch \u0027spi/next\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027spi/next\u0027 of git://git.secretlab.ca/git/linux-2.6: (34 commits)\n spi/dw_spi: move dw_spi.h into drivers/spi\n spi/dw_spi: Fix missing header\n gpio/langwell: Clear edge bit before handling\n gpio/langwell: Simplify demux loop\n gpio/langwell: Convert irq name space\n gpio/langwell: Fix broken irq_eoi change.\n gpio; Make Intel chipset gpio drivers depend on x86\n gpio/cs5535-gpio: Fix section mismatch\n spi/rtc-{ds1390,ds3234,m41t94}: Use spi_get_drvdata() for SPI devices\n spi/davinci: Support DMA transfers larger than 65535 words\n spi/davinci: Use correct length parameter to dma_map_single calls\n gpio: Use __devexit at necessary places\n gpio: add MODULE_DEVICE_TABLE to pch_gpio and ml_ioh_gpio\n gpio/mcp23s08: support mcp23s17 variant\n of_mmc_spi: add card detect irq support\n spi/omap_mcspi: catch xfers of non-multiple SPI word size\n spi/omap_mcspi: Off-by-one error in finding the right divisor\n gpio/pca953x: Fix wrong pointer type\n spi/pl022: rid dangling labels\n spi: add support for SuperH SPI\n ...\n" }, { "commit": "f539abece1b7e36fae6add4f9ea29203d40badcb", "tree": "786c08f3131a1871ece13343c3fa3832930c1408", "parents": [ "3f6f7e6d57b8a0ae2810ae7aac70c51b6f2a6304", "24ff6663ccfdaf088dfa7acae489cb11ed4f43c4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:51:11 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:51:11 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n fs: call security_d_instantiate in d_obtain_alias V2\n lose \u0027mounting_here\u0027 argument in -\u003ed_manage()\n don\u0027t pass \u0027mounting_here\u0027 flag to follow_down()\n change the locking order for namespace_sem\n fix deadlock in pivot_root()\n vfs: split off vfsmount-related parts of vfs_kern_mount()\n Some fixes for pstore\n kill simple_set_mnt()\n" }, { "commit": "8f627a8a881481598c2591c3acc122fb9be7bac4", "tree": "06497d25e30824500aeaf8c736c45b070f121234", "parents": [ "fd57ed021990157ee5b3997c3f21c734093a9e23", "5d630e43284fdb0613e4e7e7dd906f27bc25b6af" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:50:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:50:27 2011 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.infradead.org/ubifs-2.6\n\n* \u0027linux-next\u0027 of git://git.infradead.org/ubifs-2.6: (25 commits)\n UBIFS: clean-up commentaries\n UBIFS: save 128KiB or more RAM\n UBIFS: allocate orphans scan buffer on demand\n UBIFS: allocate lpt dump buffer on demand\n UBIFS: allocate ltab checking buffer on demand\n UBIFS: allocate scanning buffer on demand\n UBIFS: allocate dump buffer on demand\n UBIFS: do not check data crc by default\n UBIFS: simplify UBIFS Kconfig menu\n UBIFS: print max. index node size\n UBIFS: handle allocation failures in UBIFS write path\n UBIFS: use max_write_size during recovery\n UBIFS: use max_write_size for write-buffers\n UBIFS: introduce write-buffer size field\n UBI: incorporate LEB offset information\n UBIFS: incorporate maximum write size\n UBI: provide LEB offset information\n UBI: incorporate maximum write size\n UBIFS: fix LEB number in printk\n UBIFS: restrict world-writable debugfs files\n ...\n" }, { "commit": "d3e458d78167102cc961237cfceef6fffc80c0b3", "tree": "e9195c1294daf053614e63ac52b0b44a28479017", "parents": [ "f2e1fbb5f2177227f71c4fc0491e531dd7acd385", "d351cf4603edb2a5bfa9a48d06c425511c63f2a3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:46:37 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:46:37 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (308 commits)\n ALSA: sound/pci/asihpi: check adapter index in hpi_ioctl\n ALSA: aloop - Fix possible IRQ lock inversion\n ALSA: sound/core: merge list_del()/list_add_tail() to list_move_tail()\n ALSA: ctxfi - use list_move() instead of list_del()/list_add() combination\n ALSA: firewire - msleep needs delay.h\n ALSA: firewire-lib, firewire-speakers: handle packet queueing errors\n ALSA: firewire-lib: allocate DMA buffer separately\n ALSA: firewire-lib: use no-info SYT for packets without SYT sample\n ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver\n ALSA: hda - Remove an unused variable in patch_realtek.c\n ALSA: hda - pin-adc-mux-dmic auto-configuration of 92HD8X codecs\n ALSA: hda - fix digital mic selection in mixer on 92HD8X codecs\n ALSA: hda - Move default input-src selection to init part\n ALSA: hda - Initialize special cases for input src in init phase\n ALSA: ctxfi - Clear input settings before initialization\n ALSA: ctxfi - Fix SPDIF status retrieval\n ALSA: ctxfi - Fix incorrect SPDIF status bit mask\n ALSA: ctxfi - Fix microphone boost codes/comments\n ALSA: atiixp - Fix wrong time-out checks during ac-link reset\n ALSA: intel8x0m: append \u0027m\u0027 to \"r_intel8x0\"\n ...\n" }, { "commit": "619297855aa16646246ea4b1f6e05f1b2455c808", "tree": "a07fe1b24c372f5eabf244555db41fdf574c1205", "parents": [ "e16b396ce314b2bcdfe6c173fe075bf8e3432368", "1ef1d1c2353967e2d61ecaddf76edfd058a778b4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:38:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:38:34 2011 -0700" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)\n trace, filters: Initialize the match variable in process_ops() properly\n trace, documentation: Fix branch profiling location in debugfs\n oprofile, s390: Cleanups\n oprofile, s390: Remove hwsampler_files.c and merge it into init.c\n perf: Fix tear-down of inherited group events\n perf: Reorder \u0026 optimize perf_event_context to remove alignment padding on 64 bit builds\n perf: Handle stopped state with tracepoints\n perf: Fix the software events state check\n perf, powerpc: Handle events that raise an exception without overflowing\n perf, x86: Use INTEL_*_CONSTRAINT() for all PEBS event constraints\n perf, x86: Clean up SandyBridge PEBS events\n perf lock: Fix sorting by wait_min\n perf tools: Version incorrect with some versions of grep\n perf evlist: New command to list the names of events present in a perf.data file\n perf script: Add support for H/W and S/W events\n perf script: Add support for dumping symbols\n perf script: Support custom field selection for output\n perf script: Move printing of \u0027common\u0027 data from print_event and rename\n perf tracing: Remove print_graph_cpu and print_graph_proc from trace-event-parse\n perf script: Change process_event prototype\n ...\n" }, { "commit": "e16b396ce314b2bcdfe6c173fe075bf8e3432368", "tree": "640f0f56f2ea676647af4eb42d32fa56be2ee549", "parents": [ "7fd23a24717a327a66f3c32d11a20a2f169c824f", "e6e8dd5055a974935af1398c8648d4a9359b0ecb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:37:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:37:40 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)\n doc: CONFIG_UNEVICTABLE_LRU doesn\u0027t exist anymore\n Update cpuset info \u0026 webiste for cgroups\n dcdbas: force SMI to happen when expected\n arch/arm/Kconfig: remove one to many l\u0027s in the word.\n asm-generic/user.h: Fix spelling in comment\n drm: fix printk typo \u0027sracth\u0027\n Remove one to many n\u0027s in a word\n Documentation/filesystems/romfs.txt: fixing link to genromfs\n drivers:scsi Change printk typo initate -\u003e initiate\n serial, pch uart: Remove duplicate inclusion of linux/pci.h header\n fs/eventpoll.c: fix spelling\n mm: Fix out-of-date comments which refers non-existent functions\n drm: Fix printk typo \u0027failled\u0027\n coh901318.c: Change initate to initiate.\n mbox-db5500.c Change initate to initiate.\n edac: correct i82975x error-info reported\n edac: correct i82975x mci initialisation\n edac: correct commented info\n fs: update comments to point correct document\n target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c\n ...\n\nTrivial conflict in fs/eventpoll.c (spelling vs addition)\n" }, { "commit": "7fd23a24717a327a66f3c32d11a20a2f169c824f", "tree": "62a731f3edac9e58427fc27396ad5da8804fa579", "parents": [ "0a95d92c0054e74fb79607ac2df958b7bf295706", "65b06194c9c9f41bc07ac6a6d42edb4b9e43fea4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:35:30 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:35:30 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (48 commits)\n HID: add support for Logitech Driving Force Pro wheel\n HID: hid-ortek: remove spurious reference\n HID: add support for Ortek PKB-1700\n HID: roccat-koneplus: vorrect mode of sysfs attr \u0027sensor\u0027\n HID: hid-ntrig: init settle and mode check\n HID: merge hid-egalax into hid-multitouch\n HID: hid-multitouch: Send events per slot if CONTACTCOUNT is missing\n HID: ntrig remove if and drop an indent\n HID: ACRUX - activate the device immediately after binding\n HID: ntrig: apply NO_INIT_REPORTS quirk\n HID: hid-magicmouse: Correct touch orientation direction\n HID: ntrig don\u0027t dereference unclaimed hidinput\n HID: Do not create input devices for feature reports\n HID: bt hidp: send Output reports using SET_REPORT on the Control channel\n HID: hid-sony.c: Fix sending Output reports to the Sixaxis\n HID: add support for Keytouch IEC 60945\n HID: Add HID Report Descriptor to sysfs\n HID: add IRTOUCH infrared USB to hid_have_special_driver\n HID: kernel oops in out_cleanup in function hidinput_connect\n HID: Add teletext/color keys - gyration remote - EU version (GYAR3101CKDE)\n ...\n" }, { "commit": "568a60eda2e90a11bb3d7f8ef3f6800e9b60d4e5", "tree": "625f09d2944b7359ff5dfe845a8482e58581dfb4", "parents": [ "46165a3d00db7526fb43a3dfe5c01a4aa7e236af" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Feb 28 12:47:12 2011 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Mar 18 10:26:52 2011 -0600" }, "message": "spi/dw_spi: move dw_spi.h into drivers/spi\n\ninclude/linux/dw_spi.h only includes driver internal data. It doesn\u0027t\nexpose a platform_data configuration structure or similar (at least\nnothing in-tree). This patch moves the header into drivers/spi so\nthat the scope is limited to only the dw_spi_*.c driver files\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Feng Tang \u003cfeng.tang@intel.com\u003e\nCc: spi-devel-general@lists.sourceforge.net\n" }, { "commit": "46165a3d00db7526fb43a3dfe5c01a4aa7e236af", "tree": "33516584a1bf2d109bebdc74a686b3f8936391bd", "parents": [ "84bead6c38b0374e6e7db06b3097f0e700b8f148" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Fri Mar 18 10:41:17 2011 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Mar 18 09:50:50 2011 -0600" }, "message": "spi/dw_spi: Fix missing header\n\nCurrently, build on PPC dies with:\nIn file included from drivers/spi/dw_spi_mmio.c:16:\ninclude/linux/spi/dw_spi.h:147: error: field ‘tx_sgl’ has incomplete type\ninclude/linux/spi/dw_spi.h:149: error: field ‘rx_sgl’ has incomplete type\n\nAdd linux/scatterlist.h include to dw_spi.h, because we need to know\nthe contents of the structure.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "1aed3e4204dd787d53b3cd6363eb63bb4900c38e", "tree": "503582fa9f7fa68a1da7af3770d3a627d041fb52", "parents": [ "7cc90cc3ffe22a0d81b8d605b20a82ec7911012d" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Mar 18 09:09:02 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Mar 18 10:01:59 2011 -0400" }, "message": "lose \u0027mounting_here\u0027 argument in -\u003ed_manage()\n\nit\u0027s always false...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "7cc90cc3ffe22a0d81b8d605b20a82ec7911012d", "tree": "a870fc960dd10a12be6fb905ea266c65547c11bb", "parents": [ "b12cea9198fa99ffd3de1776c323bc7464d26b44" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Mar 18 09:04:20 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Mar 18 09:04:20 2011 -0400" }, "message": "don\u0027t pass \u0027mounting_here\u0027 flag to follow_down()\n\nit\u0027s always false now\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "d351cf4603edb2a5bfa9a48d06c425511c63f2a3", "tree": "b03ea3cfd3ca3974237563cf87328386c3d49ff1", "parents": [ "433e8327caf9f7c0432b2f2f6684a5b79cfe18e9", "4a122c10fbfe9020df469f0f669da129c5757671" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Mar 18 07:39:08 2011 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Mar 18 07:39:08 2011 +0100" }, "message": "Merge branch \u0027topic/misc\u0027 into for-linus\n" }, { "commit": "0df0914d414a504b975f3cc66ace0c16ef55b7f3", "tree": "c97ffa357943a8b226cdec1b9632c4cede813205", "parents": [ "6899608533410557e6698cb9d4ff6df553916e98", "05f689400ea5fa3d71af82f910c8b140f87ad1f3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 19:28:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 19:28:15 2011 -0700" }, "message": "Merge branch \u0027omap-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6\n\n* \u0027omap-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits)\n omap: zoom: host should not pull up wl1271\u0027s irq line\n arm: plat-omap: iommu: fix request_mem_region() error path\n OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430\n omap4: mux: Remove duplicate mux modes\n omap: iovmm: don\u0027t check \u0027da\u0027 to set IOVMF_DA_FIXED flag\n omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set\n omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected\n omap4: board-omap4panda: Initialise the serial pads\n omap3: board-3430sdp: Initialise the serial pads\n omap4: board-4430sdp: Initialise the serial pads\n omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init\n omap2+: mux: Remove the use of IDLE flag\n omap2+: Add separate list for dynamic pads to mux\n perf: add OMAP support for the new power events\n OMAP4: Add IVA OPP enteries.\n OMAP4: Update Voltage Rail Values for MPU, IVA and CORE\n OMAP4: Enable 800 MHz and 1 GHz MPU-OPP\n OMAP3+: OPP: Replace voltage values with Macros\n OMAP3: wdtimer: Fix CORE idle transition\n Watchdog: omap_wdt: add fine grain runtime-pm\n ...\n\nFix up various conflicts in\n - arch/arm/mach-omap2/board-omap3evm.c\n - arch/arm/mach-omap2/clock3xxx_data.c\n - arch/arm/mach-omap2/usb-musb.c\n - arch/arm/plat-omap/include/plat/usb.h\n - drivers/usb/musb/musb_core.h\n" }, { "commit": "6899608533410557e6698cb9d4ff6df553916e98", "tree": "b392548a6757d08ec7b1395925499e032c174411", "parents": [ "411f5c7a502769ccc0377c5ba36cb0b283847ba8", "92c260f755c42337c550d8ac1f8ccd1b32bffb20" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 19:13:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 19:13:18 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://codeaurora.org/quic/kernel/davidb/linux-msm\n\n* \u0027for-linus\u0027 of git://codeaurora.org/quic/kernel/davidb/linux-msm: (46 commits)\n msm: scm: Check for interruption immediately\n msm: scm: Fix improper register assignment\n msm: scm: Mark inline asm as volatile\n msm: iommu: Enable HTW L2 redirection on MSM8960\n msm: iommu: Don\u0027t read from write-only registers\n msm: iommu: Remove dependency on IDR\n msm: iommu: Use ASID tagging instead of VMID tagging\n msm: iommu: Rework clock logic and add IOMMU bus clock control\n msm: iommu: Clock control for the IOMMU driver\n msm: mdp: Set the correct pack pattern for XRGB/ARGB\n msm_fb: Fix framebuffer console\n msm: mdp: Add support for RGBX 8888 image format.\n video: msmfb: Put the partial update magic value into the fix_screen struct.\n msm: clock: Migrate to clkdev\n msm: clock: Remove references to clk_ops_pcom\n msm: headsmp.S: Fix section mismatch\n msm: Use explicit GPLv2 licenses\n msm: iommu: Enable IOMMU support for MSM8960\n msm: iommu: Generalize platform data for multiple targets\n msm: iommu: Create a Kconfig item for the IOMMU driver\n ...\n" }, { "commit": "411f5c7a502769ccc0377c5ba36cb0b283847ba8", "tree": "2c3a29671e3f923de48c55f94194849264a7bf53", "parents": [ "6d7ed21d17e640b120b902a314143e5ef4917a70", "9ced9f03d12d7539e86b0bff5bc750153c976c34" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 19:08:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 19:08:06 2011 -0700" }, "message": "Merge branch \u0027devel-stable\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel-stable\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)\n davinci: DM644x EVM: register MUSB device earlier\n davinci: add spi devices on tnetv107x evm\n davinci: add ssp config for tnetv107x evm board\n davinci: add tnetv107x ssp platform device\n spi: add ti-ssp spi master driver\n mfd: add driver for sequencer serial port\n ARM: EXYNOS4: Implement Clock gating for System MMU\n ARM: EXYNOS4: Enhancement of System MMU driver\n ARM: EXYNOS4: Add support for gpio interrupts\n ARM: S5P: Add function to register gpio interrupt bank data\n ARM: S5P: Cleanup S5P gpio interrupt code\n ARM: EXYNOS4: Add missing GPYx banks\n ARM: S3C64XX: Fix section mismatch from cpufreq init\n ARM: EXYNOS4: Add keypad device to the SMDKV310\n ARM: EXYNOS4: Update clocks for keypad\n ARM: EXYNOS4: Update keypad base address\n ARM: EXYNOS4: Add keypad device helpers\n ARM: EXYNOS4: Add support for SATA on ARMLEX4210\n plat-nomadik: make GPIO interrupts work with cpuidle ApSleep\n mach-u300: define a dummy filter function for coh901318\n ...\n\nFix up various conflicts in\n - arch/arm/mach-exynos4/cpufreq.c\n - arch/arm/mach-mxs/gpio.c\n - drivers/net/Kconfig\n - drivers/tty/serial/Kconfig\n - drivers/tty/serial/Makefile\n - drivers/usb/gadget/fsl_mxc_udc.c\n - drivers/video/Kconfig\n" }, { "commit": "6d7ed21d17e640b120b902a314143e5ef4917a70", "tree": "87d00d7057dd9c57175f3367715d18b1958f096a", "parents": [ "ec0afc9311adcfb10b90e547c23250f63939f990", "bafc8205dc7bf2488175008deedc14ff4939d174", "9c9585e0e96f8340d704256db00b2ec28240c36e", "bfddc1c325d1e092d9fb1b5b03a05b818f82d35f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 18:48:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 18:48:35 2011 -0700" }, "message": "Merge branches \u0027defcfg\u0027, \u0027drivers\u0027 and \u0027cyberpro-next\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027defcfg\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: 6647/1: add Versatile Express defconfig\n ARM: 6644/1: mach-ux500: update the U8500 defconfig\n\n* \u0027drivers\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: 6764/1: pl011: factor out FIFO to TTY code\n ARM: 6763/1: pl011: add optional RX DMA to PL011 v2\n ARM: 6758/1: amba: support pm ops\n ARM: amba: make amba_driver id_table const\n ARM: amba: make internal ID table handling const\n ARM: amba: make probe() functions take const id tables\n ARM: 6662/1: amba: make amba_bustype non-static\n ARM: mmci: add dmaengine-based DMA support\n ARM: mmci: no need for separate host-\u003edata_xfered\n ARM: mmci: avoid unnecessary switch to data available PIO interrupts\n ARM: mmci: no need to call flush_dcache_page() with sg_miter API\n ARM: mmci: avoid reporting too many completed bytes on fifo overrun\n ALSA: AACI: make fifo variables more explanitory\n ALSA: AACI: no need to call snd_pcm_period_elapsed() for each period\n ALSA: AACI: use snd_pcm_lib_period_bytes()\n ALSA: AACI: clean up AACI announcement printk\n ALSA: AACI: fix channel mask selection\n ALSA: AACI: fix number of channels for record\n ALSA: AACI: fix multiple IRQ claiming\n\n* \u0027cyberpro-next\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n VIDEO: cyberpro: remove unused cyber2000fb_get_fb_var()\n VIDEO: cyberpro: remove useless function extreg pointers\n VIDEO: cyberpro: update handling of device structures\n VIDEO: cyberpro: add support for video capture I2C\n VIDEO: cyberpro: make \u0027reg_b0_lock\u0027 always present\n VIDEO: cyberpro: add I2C support\n VIDEO: cyberpro: select lowest multipler/divisor for PLL\n" }, { "commit": "ec0afc9311adcfb10b90e547c23250f63939f990", "tree": "2093d2668898a8a03f30acbfd5568e65b8c086b9", "parents": [ "804f18536984939622ddca60ab6b25743e0ec68d", "776e58ea3d3735f85678155398241d2513afa67a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 18:40:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 18:40:35 2011 -0700" }, "message": "Merge branch \u0027kvm-updates/2.6.39\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/2.6.39\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (55 commits)\n KVM: unbreak userspace that does not sets tss address\n KVM: MMU: cleanup pte write path\n KVM: MMU: introduce a common function to get no-dirty-logged slot\n KVM: fix rcu usage in init_rmode_* functions\n KVM: fix kvmclock regression due to missing clock update\n KVM: emulator: Fix permission checking in io permission bitmap\n KVM: emulator: Fix io permission checking for 64bit guest\n KVM: SVM: Load %gs earlier if CONFIG_X86_32_LAZY_GS\u003dn\n KVM: x86: Remove useless regs_page pointer from kvm_lapic\n KVM: improve comment on rcu use in irqfd_deassign\n KVM: MMU: remove unused macros\n KVM: MMU: cleanup page alloc and free\n KVM: MMU: do not record gfn in kvm_mmu_pte_write\n KVM: MMU: move mmu pages calculated out of mmu lock\n KVM: MMU: set spte accessed bit properly\n KVM: MMU: fix kvm_mmu_slot_remove_write_access dropping intermediate W bits\n KVM: Start lock documentation\n KVM: better readability of efer_reserved_bits\n KVM: Clear async page fault hash after switching to real mode\n KVM: VMX: Initialize vm86 TSS only once.\n ...\n" }, { "commit": "804f18536984939622ddca60ab6b25743e0ec68d", "tree": "82d96cd5f49876970afdd78b891875fd4c6df344", "parents": [ "5a39837f76b7ded29afdf6ed2c2d5e56107179b7", "b3e96c0c756211e805c6941d4a6e5f6e1995cb6b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 18:37:42 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 18:37:42 2011 -0700" }, "message": "Merge branch \u0027stable/xen.pm.bug-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/xen.pm.bug-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen: use freeze/restore/thaw PM events for suspend/resume/chkpt\n xen: xenbus PM events support\n" }, { "commit": "474a00ee1306eb7e82329fdc28b6471a99facba1", "tree": "d0fc3e01d030b3ce3706beee01382a0819f854c8", "parents": [ "054cfaacf88865bff1dd58d305443d5d6c068a08" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Mar 17 21:31:32 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Mar 17 21:31:32 2011 -0400" }, "message": "kill simple_set_mnt()\n\nnot needed anymore, since all users (-\u003eget_sb() instances) are gone.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "5a39837f76b7ded29afdf6ed2c2d5e56107179b7", "tree": "1b5af6b3d87788df23458f45f96071552905c3e3", "parents": [ "514af9f7904ab65a6763b4b0bf51f1c7081026cb", "3b7bcdf2823a59438301a73af8d0d31439a8f3d9", "44626e4a3bd764283193e14e64f9324e48b4bfd8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 18:27:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 18:27:49 2011 -0700" }, "message": "Merge branches \u0027stable/irq.fairness\u0027 and \u0027stable/irq.ween_of_nr_irqs\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/irq.fairness\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen: events: Remove redundant clear of l2i at end of round-robin loop\n xen: events: Make round-robin scan fairer by snapshotting each l2 word once only\n xen: events: Clean up round-robin evtchn scan.\n xen: events: Make last processed event channel a per-cpu variable.\n xen: events: Process event channels notifications in round-robin order.\n\n* \u0027stable/irq.ween_of_nr_irqs\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen: events: Fix compile error if CONFIG_SMP is not defined.\n xen: events: correct locking in xen_irq_from_pirq\n xen: events: propagate irq allocation failure instead of panicking\n xen: events: do not workaround too-small nr_irqs\n xen: events: remove use of nr_irqs as upper bound on number of pirqs\n xen: events: dynamically allocate irq info structures\n xen: events: maintain a list of Xen interrupts\n xen: events: push setup of irq\u003c-\u003e{evtchn,ipi,virq,pirq} maps into irq_info init functions\n xen: events: turn irq_info constructors into initialiser functions\n xen: events: use per-cpu variable for cpu_evtchn_mask\n xen: events: refactor GSI pirq bindings functions\n xen: events: rename restore_cpu_pirqs -\u003e restore_pirqs\n xen: events: remove unused public functions\n xen: events: fix xen_map_pirq_gsi error return\n xen: events: simplify comment\n xen: events: separate two unrelated halves of if condition\n\nFix up trivial conflicts in drivers/xen/events.c\n" }, { "commit": "514af9f7904ab65a6763b4b0bf51f1c7081026cb", "tree": "37a401ec2fe1f58c7a246657afecb8aeaa2c002d", "parents": [ "c55d267de274d308927b60c3e740c1a826832317", "bbd5a762b4c56609ad4c501298556ab1f00710cc", "ca47ceaa2c407bbddd395c1807b616042365bd65" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 18:16:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 18:16:36 2011 -0700" }, "message": "Merge branches \u0027stable/hvc-console\u0027, \u0027stable/gntalloc.v6\u0027 and \u0027stable/balloon\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/hvc-console\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen/hvc: Disable probe_irq_on/off from poking the hvc-console IRQ line.\n\n* \u0027stable/gntalloc.v6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen: gntdev: fix build warning\n xen/p2m/m2p/gnttab: do not add failed grant maps to m2p override\n xen-gntdev: Add cast to pointer\n xen-gntdev: Fix incorrect use of zero handle\n xen: change xen/[gntdev/gntalloc] to default m\n xen-gntdev: prevent using UNMAP_NOTIFY_CLEAR_BYTE on read-only mappings\n xen-gntdev: Avoid double-mapping memory\n xen-gntdev: Avoid unmapping ranges twice\n xen-gntdev: Use map-\u003evma for checking map validity\n xen-gntdev: Fix unmap notify on PV domains\n xen-gntdev: Fix memory leak when mmap fails\n xen/gntalloc,gntdev: Add unmap notify ioctl\n xen-gntalloc: Userspace grant allocation driver\n xen-gntdev: Support mapping in HVM domains\n xen-gntdev: Add reference counting to maps\n xen-gntdev: Use find_vma rather than iterating our vma list manually\n xen-gntdev: Change page limit to be global instead of per-open\n\n* \u0027stable/balloon\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (24 commits)\n xen-gntdev: Use ballooned pages for grant mappings\n xen-balloon: Add interface to retrieve ballooned pages\n xen-balloon: Move core balloon functionality out of module\n xen/balloon: Remove pr_info\u0027s and don\u0027t alter retry_count\n xen/balloon: Protect against CPU exhaust by event/x process\n xen/balloon: Migration from mod_timer() to schedule_delayed_work()\n xen/balloon: Removal of driver_pages\n" }, { "commit": "c55d267de274d308927b60c3e740c1a826832317", "tree": "21b53a8c725d9f9650f60d94b349459d5b8dae10", "parents": [ "61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb", "bc898c97f7ba24def788d9f80786cf028a197122" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 17:54:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 17:54:40 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (170 commits)\n [SCSI] scsi_dh_rdac: Add MD36xxf into device list\n [SCSI] scsi_debug: add consecutive medium errors\n [SCSI] libsas: fix ata list corruption issue\n [SCSI] hpsa: export resettable host attribute\n [SCSI] hpsa: move device attributes to avoid forward declarations\n [SCSI] scsi_debug: Logical Block Provisioning (SBC3r26)\n [SCSI] sd: Logical Block Provisioning update\n [SCSI] Include protection operation in SCSI command trace\n [SCSI] hpsa: fix incorrect PCI IDs and add two new ones (2nd try)\n [SCSI] target: Fix volume size misreporting for volumes \u003e 2TB\n [SCSI] bnx2fc: Broadcom FCoE offload driver\n [SCSI] fcoe: fix broken fcoe interface reset\n [SCSI] fcoe: precedence bug in fcoe_filter_frames()\n [SCSI] libfcoe: Remove stale fcoe-netdev entries\n [SCSI] libfcoe: Move FCOE_MTU definition from fcoe.h to libfcoe.h\n [SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument\n [SCSI] fcoe, libfc: initialize EM anchors list and then update npiv EMs\n [SCSI] Revert \"[SCSI] libfc: fix exchange being deleted when the abort itself is timed out\"\n [SCSI] libfc: Fixing a memory leak when destroying an interface\n [SCSI] megaraid_sas: Version and Changelog update\n ...\n\nFix up trivial conflicts due to whitespace differences in\ndrivers/scsi/libsas/{sas_ata.c,sas_scsi_host.c}\n" }, { "commit": "61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb", "tree": "2c6b7a4357ba85f7be027bd492da9bf8d7c6acb2", "parents": [ "77aa56ba09b7416764aec2e3f7b41e023cf30602", "bdce2595a2f539c6fdedd8f2bd281326b627bba3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 17:42:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 17:42:14 2011 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:\n [CPUFREQ] pcc-cpufreq: remove duplicate statements\n [CPUFREQ] Remove the pm_message_t argument from driver suspend\n [CPUFREQ] Remove unneeded locks\n [CPUFREQ] Remove old, deprecated per cpu ondemand/conservative sysfs files\n [CPUFREQ] Remove deprecated sysfs file sampling_rate_max\n [CPUFREQ] powernow-k8: The table index is not worth displaying\n [CPUFREQ] calculate delay after dbs_check_cpu\n [CPUFREQ] Add documentation for sampling_down_factor\n [CPUFREQ] drivers/cpufreq: Remove unnecessary semicolons\n" }, { "commit": "179198373cf374f0ef793f1023c1cdd83b53674d", "tree": "9c7f9e82b936864b9d8cf91b3d4121a3c8d2671c", "parents": [ "374e55251cacfb68d331bb8a574b2de8160aacc2", "8e26de238fd794c8ea56a5c98bf67c40cfeb051d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 17:40:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 17:40:00 2011 -0700" }, "message": "Merge branch \u0027nfs-for-2.6.39\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027nfs-for-2.6.39\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (54 commits)\n RPC: killing RPC tasks races fixed\n xprt: remove redundant check\n SUNRPC: Convert struct rpc_xprt to use atomic_t counters\n SUNRPC: Ensure we always run the tk_callback before tk_action\n sunrpc: fix printk format warning\n xprt: remove redundant null check\n nfs: BKL is no longer needed, so remove the include\n NFS: Fix a warning in fs/nfs/idmap.c\n Cleanup: Factor out some cut-and-paste code.\n cleanup: save 60 lines/100 bytes by combining two mostly duplicate functions.\n NFS: account direct-io into task io accounting\n gss:krb5 only include enctype numbers in gm_upcall_enctypes\n RPCRDMA: Fix FRMR registration/invalidate handling.\n RPCRDMA: Fix to XDR page base interpretation in marshalling logic.\n NFSv4: Send unmapped uid/gids to the server when using auth_sys\n NFSv4: Propagate the error NFS4ERR_BADOWNER to nfs4_do_setattr\n NFSv4: cleanup idmapper functions to take an nfs_server argument\n NFSv4: Send unmapped uid/gids to the server if the idmapper fails\n NFSv4: If the server sends us a numeric uid/gid then accept it\n NFSv4.1: reject zero layout with zeroed stripe unit\n ...\n" }, { "commit": "978ca164bd9f30bd51f71dad86d8c3797f7add76", "tree": "e7cbd50aa6b2709ea27a59bc2adafe2ff27e8a33", "parents": [ "02e4c627d862427653fc088ce299746ea7d85600", "d34a6ecd45c1362d388af8d83ed329c609d1712b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 17:21:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 17:21:32 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (38 commits)\n amd64_edac: Fix decode_syndrome types\n amd64_edac: Fix DCT argument type\n amd64_edac: Fix ranges signedness\n amd64_edac: Drop local variable\n amd64_edac: Fix PCI config addressing types\n amd64_edac: Fix DRAM base macros\n amd64_edac: Fix node id signedness\n amd64_edac: Drop redundant declarations\n amd64_edac: Enable driver on F15h\n amd64_edac: Adjust ECC symbol size to F15h\n amd64_edac: Simplify scrubrate setting\n PCI: Rename CPU PCI id define\n amd64_edac: Improve DRAM address mapping\n amd64_edac: Sanitize -\u003eread_dram_ctl_register\n amd64_edac: Adjust sys_addr to chip select conversion routine to F15h\n amd64_edac: Beef up early exit reporting\n amd64_edac: Revamp online spare handling\n amd64_edac: Fix channel interleave removal\n amd64_edac: Correct node interleaving removal\n amd64_edac: Add support for interleaved region swapping\n ...\n\nFix up trivial conflict in include/linux/pci_ids.h due to\nAMD_15H_NB_MISC being renamed as AMD_15H_NB_F3 next to the new\nAMD_15H_NB_LINK entry.\n" }, { "commit": "02e4c627d862427653fc088ce299746ea7d85600", "tree": "e756f329f8f5e4546c9f62c3493903895227f5b6", "parents": [ "4b0e976c663e808822adf51274f948e8a4986f06", "ead9a638c8f7a4f6471a130c854afafeccbb0824" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 17:10:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 17:10:19 2011 -0700" }, "message": "Merge branch \u0027for-linus/2639/i2c-1\u0027 of git://git.fluff.org/bjdooks/linux\n\n* \u0027for-linus/2639/i2c-1\u0027 of git://git.fluff.org/bjdooks/linux:\n i2c-mpc: Add support for 64bit system\n i2c: add driver for Freescale i.MX28\n i2c: tegra: Add i2c support\n" }, { "commit": "4b0e976c663e808822adf51274f948e8a4986f06", "tree": "64ee15cbaafc283248dfac5dc7bccbc65b9159e0", "parents": [ "19520fc1ee36164808e6f084bd95e8178e2db231", "112e75466f63997d0f4c3c13ecf999e36aea692f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 17:09:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 17:09:29 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:\n watchdog: booke_wdt: clean up status messages\n watchdog: cleanup spaces before tabs\n watchdog: convert to DEFINE_PCI_DEVICE_TABLE\n watchdog: Xen watchdog driver\n watchdog: Intel SCU Watchdog Timer Driver for Moorestown and Medfield platforms.\n watchdog: jz4740_wdt - fix magic character checking\n watchdog: add JZ4740 watchdog driver\n watchdog: it87_wdt: Add support for IT8721F watchdog\n watchdog: hpwdt: build hpwdt as module by default with NMI_DECODING enabled\n watchdog: hpwdt: Fix a couple of typos\n" }, { "commit": "19520fc1ee36164808e6f084bd95e8178e2db231", "tree": "abf66f8c2a2b35e574e9452673263614fc50c63f", "parents": [ "c8def554d031664e984323f6a5d667f070717776", "d668a8b022a201e65ec5e301a9e6dff78987550c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 16:59:38 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 16:59:38 2011 -0700" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (44 commits)\n hwmon: (lineage-pem): Fix in1 voltage alarm sysfs attributes\n hwmon/f71882fg: Add support for f71808e\n hwmon/f71882fg: Add support for f71869f and f71869e\n hwmon/f71882fg: Add support for f71889ed\n hwmon/f71882fg: Break out test for auto pwm\u0027s controlled by digital readings\n hwmon/f71882fg: Separate temp beep sysfs attr from the other temp sysfs attr\n hwmon/f71882fg: Remove bogus temp2_type for certain models\n hwmon/f71882fg: Make number of temps configurable\n hwmon/f71882fg: Make creation of in sysfs attributes more generic\n hwmon/f71882fg: Only allow negative auto point temps if fan_neg_temp is enabled\n hwmon/f71882fg: Fix temp1 sensor type reporting\n hwmon: (w83627ehf) Display correct temperature sensor labels for systems with NCT6775F\n hwmon: (w83627ehf) Add fan debounce support for NCT6775F and NCT6776F\n hwmon: (w83627ehf) Update Kconfig for W83677HG-B, NCT6775F and NCT6776F\n hwmon: (w83627ehf) Store rpm instead of raw fan speed data\n hwmon: (w83627ehf) Use 16 bit fan count registers if supported\n hwmon: (w83627ehf) Add support for Nuvoton NCT6775F and NCT6776F\n hwmon: (w83627ehf) Permit enabling SmartFan IV mode if configured at startup\n hwmon: (w83627ehf) Convert register arrays to 16 bit, and convert access to pointers\n hwmon: (w83627ehf) Remove references to datasheets which no longer exist\n ...\n" }, { "commit": "ef2b4b95a63a1d23958dcb99eb2c6898eddc87d0", "tree": "0a22745dba03926768552aa3006b166995e5342d", "parents": [ "7b7adc4a016a1decb806eb71ecab98721fa7f146" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Fri Mar 18 00:16:35 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 16:31:13 2011 -0700" }, "message": "mm: PageBuddy and mapcount robustness\n\nChange the _mapcount value indicating PageBuddy from -2 to -128 for\nmore robusteness against page_mapcount() undeflows.\n\nUse reset_page_mapcount instead of __ClearPageBuddy in bad_page to\nignore the previous retval of PageBuddy().\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nReported-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2dd22997679a88874c131f6e6ffb963e6d43b3a6", "tree": "bfe1707dda7e755b8b550c6796e2649813bcfbb9", "parents": [ "36885ff0e6563687e6152da6d311abbf83c0198f", "7b7adc4a016a1decb806eb71ecab98721fa7f146" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Mar 17 13:46:58 2011 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Mar 17 13:48:06 2011 -0600" }, "message": "Merge remote-tracking branch \u0027origin\u0027 into spi/next\n\nPull in Linus\u0027 tree to pick up changes required for the langwell gpio fixes\n" }, { "commit": "7b7adc4a016a1decb806eb71ecab98721fa7f146", "tree": "0a6f9a6e5659faa94604fbc575382a18f143c657", "parents": [ "31598e8713ef501c8f6aad2e2ec8a9457e8877c1", "289d6b0e287e0acd85f3e6b7ea6c2cb5c234909a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 10:11:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 10:11:25 2011 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32: (40 commits)\n unicore32: rewrite arch-specific tlb.h to use asm-generic version\n unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEs\n unicore32: replace unicore32-specific iomap functions with generic lib implementation\n unicore32 machine related: add frame buffer driver for pkunity-v3 soc\n unicore32 machine related files: add i2c bus drivers for pkunity-v3 soc\n unicore32 io: redefine __REG(x) and re-use readl/writel funcs\n unicore32 i8042 upgrade and bugfix: adjust resource request region type\n unicore32 upgrade to v2.6.38-rc5: add one more paramter for pte_alloc_map call\n unicore32 i8042: adjust io funcs of i8042-unicore32io.h\n unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASE\n unicore32: modify function names and parameters for irq_chips\n unicore32: remove unused lines in arch/unicore32/include/asm/irq.h\n unicore32 time.c: change calculate method for clock_event_device\n unicore32: ADD MAINTAINER for unicore32 architecture\n unicore32 machine related files: ps2 driver\n unicore32 machine related files: pci bus handling\n unicore32 machine related files: hardware registers\n unicore32 machine related files: core files\n unicore32 additional architecture files: boot process\n unicore32 additional architecture files: low-level lib: misc\n ...\n\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "241eb95600be194f6b59b85c0bf41194694ebdf1", "tree": "51bbff74bde1c3a8c0027ebc98251071ace60de9", "parents": [ "fd34b0dee4d237ce9332cc62b03adebfe4fa9f9d", "3d44ae402a4e35cf88784d443046c8fbe25c674b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 09:57:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 09:57:10 2011 -0700" }, "message": "Merge branch \u0027sh-latest\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* \u0027sh-latest\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (34 commits)\n sh: Convert to generic show_interrupts.\n sh: Wire up new fhandle and clock_adjtime syscalls.\n sh: modify platform_device for sh_eth driver\n sh: add GETHER\u0027s platform_device in board-sh7757lcr\n sh: update sh7757lcr_defconfig\n sh: add platform_device of tmio_mmc and sh_mmcif to sh7757lcr\n sh: dmaengine support for SH7757\n sh: add mmc clock in clock-sh7757\n sh: add spi_board_info in sh7757lcr\n sh: add platform_device for SPI\n sh: add USB_ARCH_HAS_EHCI and OHCI for SH7757\n sh: Rename cpuidle states to fit general conventions\n serial: sh-sci: fix deadlock when resuming from S3 sleep\n sh: Enable CONFIG_GCOV_PROFILE_ALL for sh\n sh: Fix up async PCIe probing on SMP.\n serial: sh-sci: Kill off the special earlyprintk device.\n serial: sh-sci: Use dev_name() for region reservations.\n serial: sh-sci: Fix up earlyprintk port mapping.\n serial: sh-sci: Limit early console to one device.\n serial: sh-sci: Fix up break timer scheduling race.\n ...\n" }, { "commit": "fd34b0dee4d237ce9332cc62b03adebfe4fa9f9d", "tree": "fa37676f7f696be7104ea116ab9c72dc8bbbc70e", "parents": [ "40c7f2112ce18fa5eb6dc209c50dd0f046790191", "c9ac1361d2258a667672cf531cd840807daba4f1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 09:56:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 09:56:43 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:\n fbdev: sh_mobile_lcdc: Add YUV framebuffer support\n viafb: split pll configs up\n viafb: remove duplicated clock storage\n viafb: always return the best possible clock\n viafb: remove duplicated clock information\n fbdev: sh_mobile_lcdcfb: add backlight support\n viafb: factor lcd scaling parameters out\n viafb: strip some structures\n viafb: remove unused data_mode and device_type\n viafb: kill lcd_panel_id\n video via: make local variables static\n video via: fix iomem access\n video/via: drop deprecated (and unused) i2c_adapter.id\n" }, { "commit": "a8de240a9074b72b156d9e6d53f00076e6cd5f03", "tree": "9436ca858870ce89af75703b61a2c25889db354e", "parents": [ "e020c6800c9621a77223bf2c1ff68180e41e8ebf" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Mar 15 19:56:30 2011 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 17 12:38:59 2011 -0400" }, "message": "SUNRPC: Convert struct rpc_xprt to use atomic_t counters\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "40c7f2112ce18fa5eb6dc209c50dd0f046790191", "tree": "2da6636f3a1d005902d3f2afb533cb6acafce606", "parents": [ "b04d0a90908cdb733e490486287e1ba8c568ffb0", "c87a8d8dcd2587c203f3dd8a3c5c15d1e128ec0d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 09:11:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 09:11:39 2011 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (177 commits)\n drm/radeon: fixup refcounts in radeon dumb create ioctl.\n drm: radeon: *_cs_packet_parse_vline() cleanup\n radeon: merge list_del()/list_add_tail() to list_move_tail()\n drm: Retry i2c transfer of EDID block after failure\n drm/radeon/kms: fix typo in atom overscan setup\n drm: Hold the mode mutex whilst probing for sysfs status\n drm/nouveau: fix __nouveau_fence_wait performance\n drm/nv40: attempt to reserve just enough vram for all 32 channels\n drm/nv50: check for vm traps on every gr irq\n drm/nv50: decode vm faults some more\n drm/nouveau: add nouveau_enum_find() util function\n drm/nouveau: properly handle pushbuffer check failures\n drm/nvc0: remove vm hack forcing large/small pages to not share a PDE\n drm/i915: disable opregion lid detection for now.\n drm/i915: Only wait on a pending flip if we intend to write to the buffer\n drm/i915/dp: Sanity check eDP existence\n drm: add cap bit to denote if dumb ioctl is available or not.\n drm/core: add ioctl to query device/driver capabilities\n drm/radeon/kms: allow max clock of 340 Mhz on hdmi 1.3+\n drm/radeon/kms: add cayman pci ids\n ...\n" }, { "commit": "f86368493ec038218e8663cc1b6e5393cd8e008a", "tree": "d4108bd01616b4cd511a314ea3b5dfc8ba50bd23", "parents": [ "217ece6129f2d3b4fdd18d9e79be9e43d8d14a42" ], "author": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Feb 03 15:07:07 2011 +0200" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu Mar 17 13:08:30 2011 -0300" }, "message": "KVM: Fix race between nmi injection and enabling nmi window\n\nThe interrupt injection logic looks something like\n\n if an nmi is pending, and nmi injection allowed\n inject nmi\n if an nmi is pending\n request exit on nmi window\n\nthe problem is that \"nmi is pending\" can be set asynchronously by\nthe PIT; if it happens to fire between the two if statements, we\nwill request an nmi window even though nmi injection is allowed. On\nSVM, this has disasterous results, since it causes eflags.TF to be\nset in random guest code.\n\nThe fix is simple; make nmi_pending synchronous using the standard\nvcpu-\u003erequests mechanism; this ensures the code above is completely\nsynchronous wrt nmi_pending.\n\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "217ece6129f2d3b4fdd18d9e79be9e43d8d14a42", "tree": "b2bbd81042f48e862e0c0b8743edc932102640bb", "parents": [ "34bb10b79de7df118de832f6832efb630e646577" ], "author": { "name": "Rik van Riel", "email": "riel@redhat.com", "time": "Tue Feb 01 09:53:28 2011 -0500" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu Mar 17 13:08:29 2011 -0300" }, "message": "KVM: use yield_to instead of sleep in kvm_vcpu_on_spin\n\nInstead of sleeping in kvm_vcpu_on_spin, which can cause gigantic\nslowdowns of certain workloads, we instead use yield_to to get\nanother VCPU in the same KVM guest to run sooner.\n\nThis seems to give a 10-15% speedup in certain workloads.\n\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "34bb10b79de7df118de832f6832efb630e646577", "tree": "2284a88be869a13a55b0435eafa572cde9ae53aa", "parents": [ "77c100c83e84316ced2507c5799f79c2c80bc6b9" ], "author": { "name": "Rik van Riel", "email": "riel@redhat.com", "time": "Tue Feb 01 09:52:41 2011 -0500" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu Mar 17 13:08:29 2011 -0300" }, "message": "KVM: keep track of which task is running a KVM vcpu\n\nKeep track of which task is running a KVM vcpu. This helps us\nfigure out later what task to wake up if we want to boost a\nvcpu that got preempted.\n\nUnfortunately there are no guarantees that the same task\nalways keeps the same vcpu, so we can only track the task\nacross a single \"run\" of the vcpu.\n\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "f58c9df78c0360f0eb3852b9cc3a61e689bc2dd1", "tree": "378a97ad8e857d73ae6762312c7bcb1cf5efd4bc", "parents": [ "fafc3dbaac6447ab8f78d2f7f32a521b24fc6b36" ], "author": { "name": "Huang Ying", "email": "ying.huang@intel.com", "time": "Sun Jan 30 11:15:49 2011 +0800" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu Mar 17 13:08:27 2011 -0300" }, "message": "mm: remove is_hwpoison_address\n\nUnused.\n\nSigned-off-by: Huang Ying \u003cying.huang@intel.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "69ebb83e13e514222b0ae4f8bd813a17679ed876", "tree": "62ccc7ee1e840d0a6cc01a9fc1c44a5f4e6f1edd", "parents": [ "0014bd990e69063b0fb78940b35439d7980ce3ee" ], "author": { "name": "Huang Ying", "email": "ying.huang@intel.com", "time": "Sun Jan 30 11:15:48 2011 +0800" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu Mar 17 13:08:27 2011 -0300" }, "message": "mm: make __get_user_pages return -EHWPOISON for HWPOISON page optionally\n\nMake __get_user_pages return -EHWPOISON for HWPOISON page only if\nFOLL_HWPOISON is specified. With this patch, the interested callers\ncan distinguish HWPOISON pages from general FAULT pages, while other\ncallers will still get -EFAULT for all these pages, so the user space\ninterface need not to be changed.\n\nThis feature is needed by KVM, where UCR MCE should be relayed to\nguest for HWPOISON page, while instruction emulation and MMIO will be\ntried for general FAULT page.\n\nThe idea comes from Andrew Morton.\n\nSigned-off-by: Huang Ying \u003cying.huang@intel.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "0014bd990e69063b0fb78940b35439d7980ce3ee", "tree": "56d4576cc07954eb304abaf602aba44a6aa2a4f1", "parents": [ "91c9c3eda4f3066980d13a6907ef84f3a99364bd" ], "author": { "name": "Huang Ying", "email": "ying.huang@intel.com", "time": "Sun Jan 30 11:15:47 2011 +0800" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu Mar 17 13:08:27 2011 -0300" }, "message": "mm: export __get_user_pages\n\nIn most cases, get_user_pages and get_user_pages_fast should be used\nto pin user pages in memory. But sometimes, some special flags except\nFOLL_GET, FOLL_WRITE and FOLL_FORCE are needed, for example in\nfollowing patch, KVM needs FOLL_HWPOISON. To support these users,\n__get_user_pages is exported directly.\n\nThere are some symbol name conflicts in infiniband driver, fixed them too.\n\nSigned-off-by: Huang Ying \u003cying.huang@intel.com\u003e\nCC: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCC: Michel Lespinasse \u003cwalken@google.com\u003e\nCC: Roland Dreier \u003croland@kernel.org\u003e\nCC: Ralph Campbell \u003cinfinipath@qlogic.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "3cba41307a2b1344ab8c1b9f55202d1e9d7bf81b", "tree": "87191d63557cc722906ceaec98a1f8f148cf1fcc", "parents": [ "6b7e2d0991489559a1df4500d77f7b76c4607ed0" ], "author": { "name": "Xiao Guangrong", "email": "xiaoguangrong@cn.fujitsu.com", "time": "Wed Jan 12 15:41:22 2011 +0800" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu Mar 17 13:08:26 2011 -0300" }, "message": "KVM: make make_all_cpus_request() lockless\n\nNow, we have \u0027vcpu-\u003emode\u0027 to judge whether need to send ipi to other\ncpus, this way is very exact, so checking request bit is needless,\nthen we can drop the spinlock let it\u0027s collateral\n\nSigned-off-by: Xiao Guangrong \u003cxiaoguangrong@cn.fujitsu.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "6b7e2d0991489559a1df4500d77f7b76c4607ed0", "tree": "b82e941c3ca4d519c71577ad21807af4d02b0679", "parents": [ "d48ead8b0b48862a87138d04efb7580a1a25beb5" ], "author": { "name": "Xiao Guangrong", "email": "xiaoguangrong@cn.fujitsu.com", "time": "Wed Jan 12 15:40:31 2011 +0800" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu Mar 17 13:08:26 2011 -0300" }, "message": "KVM: Add \"exiting guest mode\" state\n\nCurrently we keep track of only two states: guest mode and host\nmode. This patch adds an \"exiting guest mode\" state that tells\nus that an IPI will happen soon, so unless we need to wait for the\nIPI, we can avoid it completely.\n\nAlso\n1: No need atomically to read/write -\u003emode in vcpu\u0027s thread\n\n2: reorganize struct kvm_vcpu to make -\u003emode and -\u003erequests\n in the same cache line explicitly\n\nSigned-off-by: Xiao Guangrong \u003cxiaoguangrong@cn.fujitsu.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "cb293250c71fa85de3ef378d7383ddecf248c32d", "tree": "8be3dc0b929e5f63c4a60d4917f3599db7c77612", "parents": [ "41d8bfaba70311c2fa0666554ef160ea8ffc9daf" ], "author": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Wed Jan 19 18:22:11 2011 +0100" }, "committer": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Thu Mar 17 14:46:25 2011 +0100" }, "message": "PCI: Rename CPU PCI id define\n\nWith increasing number of PCI function ids, add the PCI function id\nin the define name instead of its symbolic name in the BKDG for more\nclarity.\n\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\n" }, { "commit": "65b06194c9c9f41bc07ac6a6d42edb4b9e43fea4", "tree": "c095f23260dc30d54e023195a6167313efeb9cc9", "parents": [ "b4a65f4ef59b0ce36ccd518cd2b696afdd932d96", "0ff1731a1ae51e8e48cd559d70db536281c47f8e", "4875ac114d8bce99838a9b0ee7c3f5469cc6352e", "7b2a64c96ad53c4299f7e6ddf8c2f99cb48940a9", "61c29f5b1856f90bf0a87d83cfa035a11986d2c5", "0ae43810976bc969ee158510c4acbe70ed136e61", "5623a24a80814fe471e777f12b9dbbb0f77e002e" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Mar 17 14:31:46 2011 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Mar 17 14:31:46 2011 +0100" }, "message": "Merge branches \u0027dragonrise\u0027, \u0027hidraw-feature\u0027, \u0027multitouch\u0027, \u0027ntrig\u0027, \u0027roccat\u0027, \u0027upstream\u0027 and \u0027upstream-fixes\u0027 into for-linus\n" }, { "commit": "8df341cf251f3b77eaaef66f806570e74ab44452", "tree": "66dacceda331b1ef32772a1b4c63c7f1f4c96d1a", "parents": [ "eb4316dd0a96a74104e5b921e640e73a99b56795", "ec6b426c4dbb9eef40375c389746cab7e931a584" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Mar 17 13:38:41 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Mar 17 13:38:41 2011 +0100" }, "message": "Merge branch \u0027core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent\n" }, { "commit": "9c9585e0e96f8340d704256db00b2ec28240c36e", "tree": "e644bda53c5a1c36a4066c09601566bf20e88ad1", "parents": [ "5d350cba486de34eff99d0394d8fb436af54522e", "c8ebae37034c0ead62eb4df8ef88e999ddb8d5cf", "ba74ec7f6b2bf9e1b5d0f2c5cef08766944cb2c8", "29772c4e28cbb33ea1f8c6dcd130ebf190b91d85" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Mar 17 11:04:51 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Mar 17 11:04:51 2011 +0000" }, "message": "Merge branches \u0027aaci\u0027, \u0027mmci-dma\u0027, \u0027pl\u0027 and \u0027pl011\u0027 into drivers\n" }, { "commit": "1d2a1959fe534279cf37aba20b08c24c20840e52", "tree": "67c0b9aa7fe22a44bf0b4af88947799203eb8f67", "parents": [ "5a79ce76e9bb8f4b2cd8106ee36d15ee05013bcf", "054cfaacf88865bff1dd58d305443d5d6c068a08" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu Mar 17 16:44:08 2011 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu Mar 17 16:44:08 2011 +0900" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest\n" }, { "commit": "92c260f755c42337c550d8ac1f8ccd1b32bffb20", "tree": "6d04fefc1adeecabfb2b00c201e0db78fa2b5529", "parents": [ "8e76a80960bf06c245160a484d5a363ca6b520bb", "05e34754518b6a90d5c392790c032575fab12d66" ], "author": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Wed Mar 16 22:13:16 2011 -0700" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Wed Mar 16 22:13:16 2011 -0700" }, "message": "Merge remote branch \u0027rmk/for-linus\u0027 into for-linus\n\n* rmk/for-linus: (1557 commits)\n ARM: 6806/1: irq: introduce entry and exit functions for chained handlers\n ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas\n ARM: 6747/1: P2V: Thumb2 support\n ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump\n ARM: 6796/1: Footbridge: Fix I/O mappings for NOMMU mode\n ARM: 6784/1: errata: no automatic Store Buffer drain on Cortex-A9\n ARM: 6772/1: errata: possible fault MMU translations following an ASID switch\n ARM: 6776/1: mach-ux500: activate fix for errata 753970\n ARM: 6794/1: SPEAr: Append UL to device address macros.\n ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h files\n ARM: 6792/1: SPEAr: Replace SIZE macro\u0027s with SZ_4K macros\n ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code\n ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry\n ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci\n ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h\n ARM: 6787/1: SPEAr: Reorder #includes in .h \u0026 .c files.\n ARM: 6681/1: SPEAr: add debugfs support to clk API\n ARM: 6703/1: SPEAr: update clk API support\n ARM: 6679/1: SPEAr: make clk API functions more generic\n ARM: 6737/1: SPEAr: formalized timer support\n ...\n\nConflicts:\n\tarch/arm/mach-msm/board-msm7x27.c\n\tarch/arm/mach-msm/board-msm7x30.c\n\tarch/arm/mach-msm/board-qsd8x50.c\n\tarch/arm/mach-msm/board-sapphire.c\n\tarch/arm/mach-msm/include/mach/memory.h\n" }, { "commit": "054cfaacf88865bff1dd58d305443d5d6c068a08", "tree": "39cd85f0f5966ed8c501740359b1d03d48f5ea41", "parents": [ "dc113c1f1d4b47af1b1ca701c5a39e24d296c2ac", "1a102ff92579edeff5e3d5d3c76ca49977898f00" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 19:09:57 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 19:09:57 2011 -0700" }, "message": "Merge branch \u0027mnt_devname\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027mnt_devname\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n vfs: bury -\u003eget_sb()\n nfs: switch NFS from -\u003eget_sb() to -\u003emount()\n nfs: stop mangling -\u003emnt_devname on NFS\n vfs: new superblock methods to override /proc/*/mount{s,info}\n nfs: nfs_do_{ref,sub}mount() superblock argument is redundant\n nfs: make nfs_path() work without vfsmount\n nfs: store devname at disconnected NFS roots\n nfs: propagate devname to nfs{,4}_get_root()\n" }, { "commit": "242e5d06be2ad2633c85313a37862e03f4450a46", "tree": "9a75e5efed6ee9a4f5d9769b851ab503c1fb5ef2", "parents": [ "4c5811bf463b0ef82fabbd1708f8bb2d753aeb18", "afe997a183ecc0be72652c7a5ce2152bdf91724e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 19:01:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 19:01:29 2011 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:\n [IA64] tioca: Fix assignment from incompatible pointer warnings\n [IA64] mca.c: Fix cast from integer to pointer warning\n [IA64] setup.c Typo fix \"Architechtuallly\"\n [IA64] Add CONFIG_MISC_DEVICES\u003dy to configs that need it.\n [IA64] disable interrupts at end of ia64_mca_cpe_int_handler()\n [IA64] Add DMA_ERROR_CODE define.\n pstore: fix build warning for unused return value from sysfs_create_file\n pstore: X86 platform interface using ACPI/APEI/ERST\n pstore: new filesystem interface to platform persistent storage\n" }, { "commit": "ce443ab5fd536941da1d529ba3963324f941fc29", "tree": "5551778e3ae1d623410ad98cbeefe941fc29dd28", "parents": [ "d10e4a660d11212a41ac5d2c116a655e25e2d38a" ], "author": { "name": "GuanXuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Sat Feb 26 21:39:10 2011 +0800" }, "committer": { "name": "GuanXuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Thu Mar 17 09:19:20 2011 +0800" }, "message": "unicore32 machine related: add frame buffer driver for pkunity-v3 soc\n\nchange from original version -- by advice of Paul Mundt\n1. remove videomemorysize definitions\n2. remove unifb_enable and unifb_setup\n3. use dev_warn instead of printk in fb driver\n4. remove judgement for FB_ACCEL_PUV3_UNIGFX\n5. adjust clk_get and clk_set_rate calls\n6. add resources definitions\n7. remove unifb_option\n8. adjust register for platform_device\n9. adjust unifb_ops position and unifb_regs assignment position\n\nSigned-off-by: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "7f509a9ef7af0d6ac852d49eb87ed2b9857821cc", "tree": "b6e1eb8c435cf14ce5626a33ab2da36aee9f791c", "parents": [ "38f5bf84bd588a82890f5ab32cba3317555a73e1" ], "author": { "name": "GuanXuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Sat Jan 15 18:08:09 2011 +0800" }, "committer": { "name": "GuanXuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Thu Mar 17 09:19:05 2011 +0800" }, "message": "asm-generic headers: add arch-specific __strnlen_user calling in uaccess.h\n\nThis patch changes the implementation of strnlen_user in include/asm-generic/uaccess.h.\nOriginally, it calls strlen() function directly, which may not correctly handle the access of\nuser space in most mmu-enabled architectures.\nNew __strnlen_user is added for using as an architecture specific function.\n\nSigned-off-by: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nReviewed-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "38f5bf84bd588a82890f5ab32cba3317555a73e1", "tree": "22bc45ed49028fb809ba678227e4a54801cec135", "parents": [ "d232b128e28f54cd8811dd4f6d8b72ffb12cc0a1" ], "author": { "name": "GuanXuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Sat Jan 15 18:07:08 2011 +0800" }, "committer": { "name": "GuanXuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Thu Mar 17 09:19:04 2011 +0800" }, "message": "asm-generic headers: add ftrace.h\n\nThis patch adds ftrace.h into asm-generic headers.\nThe file content could be empty in most architectures.\n\nSigned-off-by: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "d232b128e28f54cd8811dd4f6d8b72ffb12cc0a1", "tree": "9480c7a3a06e29779fc2e90832a31e71f7ac0894", "parents": [ "7dc59bdde7063323b6a70c2f0fadb399ede8038d" ], "author": { "name": "GuanXuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Sat Jan 15 18:06:44 2011 +0800" }, "committer": { "name": "GuanXuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Thu Mar 17 09:19:04 2011 +0800" }, "message": "asm-generic headers: add sizes.h\n\nThis patch adds sizes.h into asm-generic headers.\nOnly 32-bit version supported.\n\nSigned-off-by: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "7dc59bdde7063323b6a70c2f0fadb399ede8038d", "tree": "e288e1bbcb1ed68ad36514e82f8090acea4d17e0", "parents": [ "521cb40b0c44418a4fd36dc633f575813d59a43d" ], "author": { "name": "GuanXuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Tue Feb 22 19:06:43 2011 +0800" }, "committer": { "name": "GuanXuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Thu Mar 17 09:19:03 2011 +0800" }, "message": "asm-generic: fix inX/outX functions for architectures that have PCI\n\nThe definitions for the PC-style PIO functions in asm-generic/io.h were\nmeant as dummies so you could compile code on architectures without\nISA and PCI buses. However, unicore32 actually wants to use them\nwith a real PCI bus, so they need to be defined to actually address\nthe register window holding the I/O ports.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "4c5811bf463b0ef82fabbd1708f8bb2d753aeb18", "tree": "ff37d31217c3804ca05de21a55a9b5ca1ca818b2", "parents": [ "f74b9444192c60603020c61d7915b72893137edc", "9f15444fefdb33509132ff5c9be60cb315c44cb2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 17:28:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 17:28:10 2011 -0700" }, "message": "Merge branch \u0027devicetree/next\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027devicetree/next\u0027 of git://git.secretlab.ca/git/linux-2.6: (21 commits)\n tty: serial: altera_jtaguart: Add device tree support\n tty: serial: altera_uart: Add devicetree support\n dt: eliminate of_platform_driver shim code\n dt: Eliminate of_platform_{,un}register_driver\n dt/serial: Eliminate users of of_platform_{,un}register_driver\n dt/usb: Eliminate users of of_platform_{,un}register_driver\n dt/video: Eliminate users of of_platform_{,un}register_driver\n dt/net: Eliminate users of of_platform_{,un}register_driver\n dt/sound: Eliminate users of of_platform_{,un}register_driver\n dt/spi: Eliminate users of of_platform_{,un}register_driver\n dt: uartlite: merge platform and of_platform driver bindings\n dt: xilinx_hwicap: merge platform and of_platform driver bindings\n ipmi: convert OF driver to platform driver\n leds/leds-gpio: merge platform_driver with of_platform_driver\n dt/sparc: Eliminate users of of_platform_{,un}register_driver\n dt/powerpc: Eliminate users of of_platform_{,un}register_driver\n dt/powerpc: move of_bus_type infrastructure to ibmebus\n drivercore/dt: add a match table pointer to struct device\n dt: Typo fix.\n altera_ps2: Add devicetree support\n ...\n" }, { "commit": "f74b9444192c60603020c61d7915b72893137edc", "tree": "8b1d16d373234038c2b045c9ceb3c33b93059e8a", "parents": [ "7a6362800cb7d1d618a697a650c7aaed3eb39320", "4ba8216cd90560bc402f52076f64d8546e8aefcb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 17:21:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 17:21:00 2011 -0700" }, "message": "Merge branch \u0027config\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl\n\n* \u0027config\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:\n BKL: That\u0027s all, folks\n fs/locks.c: Remove stale FIXME left over from BKL conversion\n ipx: remove the BKL\n appletalk: remove the BKL\n x25: remove the BKL\n ufs: remove the BKL\n hpfs: remove the BKL\n drivers: remove extraneous includes of smp_lock.h\n tracing: don\u0027t trace the BKL\n adfs: remove the big kernel lock\n" }, { "commit": "7a6362800cb7d1d618a697a650c7aaed3eb39320", "tree": "087f9bc6c13ef1fad4b392c5cf9325cd28fa8523", "parents": [ "6445ced8670f37cfc2c5e24a9de9b413dbfc788d", "ceda86a108671294052cbf51660097b6534672f5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 16:29:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 16:29:25 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)\n bonding: enable netpoll without checking link status\n xfrm: Refcount destination entry on xfrm_lookup\n net: introduce rx_handler results and logic around that\n bonding: get rid of IFF_SLAVE_INACTIVE netdev-\u003epriv_flag\n bonding: wrap slave state work\n net: get rid of multiple bond-related netdevice-\u003epriv_flags\n bonding: register slave pointer for rx_handler\n be2net: Bump up the version number\n be2net: Copyright notice change. Update to Emulex instead of ServerEngines\n e1000e: fix kconfig for crc32 dependency\n netfilter ebtables: fix xt_AUDIT to work with ebtables\n xen network backend driver\n bonding: Improve syslog message at device creation time\n bonding: Call netif_carrier_off after register_netdevice\n bonding: Incorrect TX queue offset\n net_sched: fix ip_tos2prio\n xfrm: fix __xfrm_route_forward()\n be2net: Fix UDP packet detected status in RX compl\n Phonet: fix aligned-mode pipe socket buffer header reserve\n netxen: support for GbE port settings\n ...\n\nFix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c\nwith the staging updates.\n" }, { "commit": "6445ced8670f37cfc2c5e24a9de9b413dbfc788d", "tree": "7c98481159008a4080cda929ea8c7bc7598a2c39", "parents": [ "e6bee325e49f17c65c1fd66e9e8b348c85788341", "12bb12fac06d6212be9a5ed282c5670d4e90747f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 15:19:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 15:19:35 2011 -0700" }, "message": "Merge branch \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6\n\n* \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (961 commits)\n staging: hv: fix memory leaks\n staging: hv: Remove NULL check before kfree\n Staging: hv: Get rid of vmbus_child_dev_add()\n Staging: hv: Change the signature for vmbus_child_device_register()\n Staging: hv: Get rid of vmbus_cleanup() function\n Staging: hv: Get rid of vmbus_dev_rm() function\n Staging: hv: Change the signature for vmbus_on_isr()\n Staging: hv: Eliminate vmbus_event_dpc()\n Staging: hv: Get rid of the function vmbus_msg_dpc()\n Staging: hv: Change the signature for vmbus_cleanup()\n Staging: hv: Simplify root device management\n staging: rtl8192e: Don\u0027t copy dev pointer to skb\n staging: rtl8192e: Pass priv to cmdpkt functions\n staging: rtl8192e: Pass priv to firmware download functions\n staging: rtl8192e: Pass priv to rtl8192_interrupt\n staging: rtl8192e: Pass rtl8192_priv to dm functions\n staging: rtl8192e: Pass ieee80211_device to callbacks\n staging: rtl8192e: Pass ieee80211_device to callbacks\n staging: rtl8192e: Pass ieee80211_device to callbacks\n staging: rtl8192e: Pass ieee80211_device to callbacks\n ...\n" }, { "commit": "e6bee325e49f17c65c1fd66e9e8b348c85788341", "tree": "bcc9e5d8e82efa9009edd481a837cc3626360091", "parents": [ "a5e6b135bdff649e4330f98e2e80dbb1984f7e77", "6ae705b23be8da52d3163be9d81e9b767876aaf9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 15:11:04 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 15:11:04 2011 -0700" }, "message": "Merge branch \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)\n pch_uart: reference clock on CM-iTC\n pch_phub: add new device ML7213\n n_gsm: fix UIH control byte : P bit should be 0\n n_gsm: add a documentation\n serial: msm_serial_hs: Add MSM high speed UART driver\n tty_audit: fix tty_audit_add_data live lock on audit disabled\n tty: move cd1865.h to drivers/staging/tty/\n Staging: tty: fix build with epca.c driver\n pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()\n Staging: generic_serial: fix double locking bug\n nozomi: don\u0027t use flush_scheduled_work()\n tty/serial: Relax the device_type restriction from of_serial\n MAINTAINERS: Update HVC file patterns\n tty: phase out of ioctl file pointer for tty3270 as well\n tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile\n pch_uart: Fix DMA channel miss-setting issue.\n pch_uart: fix exclusive access issue\n pch_uart: fix auto flow control miss-setting issue\n pch_uart: fix uart clock setting issue\n pch_uart : Use dev_xxx not pr_xxx\n ...\n\nFix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied\ntwice, then changes to the same area in one branch)\n" }, { "commit": "a5e6b135bdff649e4330f98e2e80dbb1984f7e77", "tree": "475bfb1163c59d1370fd77415255afba768f9520", "parents": [ "971f115a50afbe409825c9f3399d5a3b9aca4381", "9d90c8d9cde929cbc575098e825d7c29d9f45054" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 15:05:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 15:05:40 2011 -0700" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (50 commits)\n printk: do not mangle valid userspace syslog prefixes\n efivars: Add Documentation\n efivars: Expose efivars functionality to external drivers.\n efivars: Parameterize operations.\n efivars: Split out variable registration\n efivars: parameterize efivars\n efivars: Make efivars bin_attributes dynamic\n efivars: move efivars globals into struct efivars\n drivers:misc: ti-st: fix debugging code\n kref: Fix typo in kref documentation\n UIO: add PRUSS UIO driver support\n Fix spelling mistakes in Documentation/zh_CN/SubmittingPatches\n firmware: Fix unaligned memory accesses in dmi-sysfs\n firmware: Add documentation for /sys/firmware/dmi\n firmware: Expose DMI type 15 System Event Log\n firmware: Break out system_event_log in dmi-sysfs\n firmware: Basic dmi-sysfs support\n firmware: Add DMI entry types to the headers\n Driver core: convert platform_{get,set}_drvdata to static inline functions\n Translate linux-2.6/Documentation/magic-number.txt into Chinese\n ...\n" }, { "commit": "971f115a50afbe409825c9f3399d5a3b9aca4381", "tree": "cb42dc07a032e325f22b64d961587c081225c6d6", "parents": [ "2e270d84223262a38d4755c61d55f5c73ea89e56", "500132a0f26ad7d9916102193cbc6c1b1becb373" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 15:04:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 15:04:26 2011 -0700" }, "message": "Merge branch \u0027usb-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* \u0027usb-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (172 commits)\n USB: Add support for SuperSpeed isoc endpoints\n xhci: Clean up cycle bit math used during stalls.\n xhci: Fix cycle bit calculation during stall handling.\n xhci: Update internal dequeue pointers after stalls.\n USB: Disable auto-suspend for USB 3.0 hubs.\n USB: Remove bogus USB_PORT_STAT_SUPER_SPEED symbol.\n xhci: Return canceled URBs immediately when host is halted.\n xhci: Fixes for suspend/resume of shared HCDs.\n xhci: Fix re-init on power loss after resume.\n xhci: Make roothub functions deal with device removal.\n xhci: Limit roothub ports to 15 USB3 \u0026 31 USB2 ports.\n xhci: Return a USB 3.0 hub descriptor for USB3 roothub.\n xhci: Register second xHCI roothub.\n xhci: Change xhci_find_slot_id_by_port() API.\n xhci: Refactor bus suspend state into a struct.\n xhci: Index with a port array instead of PORTSC addresses.\n USB: Set usb_hcd-\u003estate and flags for shared roothubs.\n usb: Make core allocate resources per PCI-device.\n usb: Store bus type in usb_hcd, not in driver flags.\n usb: Change usb_hcd-\u003ebandwidth_mutex to a pointer.\n ...\n" }, { "commit": "7ca64e2d2859e96a325c28678b5fdb5e17a5764b", "tree": "8988c72fd55317e1c9f6b8da8f1d62f7ec1ecb8c", "parents": [ "326c86deaed54ad1b364fcafe5073f563671eb58" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Mar 10 21:13:05 2011 +0100" }, "committer": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Wed Mar 16 17:54:33 2011 -0400" }, "message": "[CPUFREQ] Remove the pm_message_t argument from driver suspend\n\nNone of the existing cpufreq drivers uses the second argument of\nits .suspend() callback (which isn\u0027t useful anyway), so remove it.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\n" }, { "commit": "e8951251b89440644a39f2512b4f265973926b41", "tree": "f33ec13af306e2a8bdcbf6f62e34d450c1aa2bdc", "parents": [ "ef598549b28014ec2ea7574d4e793728e0e33d02" ], "author": { "name": "Thomas Renninger", "email": "trenn@suse.de", "time": "Thu Mar 03 21:31:26 2011 +0100" }, "committer": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Wed Mar 16 17:54:32 2011 -0400" }, "message": "[CPUFREQ] Remove old, deprecated per cpu ondemand/conservative sysfs files\n\nMarked deprecated for quite a whilte now...\n\nSigned-off-by: Thomas Renninger \u003ctrenn@suse.de\u003e\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\nCC: cpufreq@vger.kernel.org\n" }, { "commit": "ead9a638c8f7a4f6471a130c854afafeccbb0824", "tree": "b35b8551f9ec08e8d32a9c41bc994b019f939a39", "parents": [ "db811ca0f48578f9940f49f284ac81e336b264ad", "0724d46417545aa3035d88fb8885dffe68817a8c", "a8da7fecb6010222fe495cc2b4330b99bca20c61" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed Mar 16 20:59:01 2011 +0000" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed Mar 16 20:59:01 2011 +0000" }, "message": "Merge branches \u0027for-2639/i2c/i2c-tegra\u0027, \u0027for-2639/i2c/i2c-mpc\u0027 and \u0027for-2639/i2c/i2c-imx\u0027 into for-linus/2639/i2c-1\n" }, { "commit": "1a102ff92579edeff5e3d5d3c76ca49977898f00", "tree": "5585d724c8a996b770bb7a621563a7535a8c0496", "parents": [ "011949811b946bd3b72fca71200f197c6168a5f8" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 16 09:07:58 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 16 16:48:06 2011 -0400" }, "message": "vfs: bury -\u003eget_sb()\n\nThis is an ex-parrot.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "c7f404b40a3665d9f4e9a927cc5c1ee0479ed8f9", "tree": "2d6fa2bef00efa759f36b17f3be0d4fab3ac9bb5", "parents": [ "f8ad9c4bae99854c961ca79ed130a0d11d9ab53c" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 16 06:59:40 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 16 16:48:06 2011 -0400" }, "message": "vfs: new superblock methods to override /proc/*/mount{s,info}\n\na) -\u003eshow_devname(m, mnt) - what to put into devname columns in mounts,\nmountinfo and mountstats\nb) -\u003eshow_path(m, mnt) - what to put into relative path column in mountinfo\n\nLeaving those NULL gives old behaviour. NFS switched to using those.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "8a4eb5734e8d1dc60a8c28576bbbdfdcc643626d", "tree": "ed4cd2f9a2a04a30994a8f8964a81834c895c0c9", "parents": [ "2d7011ca79f1a8792e04d131b8ea21db179ab917" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Sat Mar 12 03:14:39 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 16 12:53:54 2011 -0700" }, "message": "net: introduce rx_handler results and logic around that\n\nThis patch allows rx_handlers to better signalize what to do next to\nit\u0027s caller. That makes skb-\u003edeliver_no_wcard no longer needed.\n\nkernel-doc for rx_handler_result is taken from Nicolas\u0027 patch.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nReviewed-by: Nicolas de Pesloüan \u003cnicolas.2p.debian@free.fr\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c7853aea57d8e850b0979e7bdcbcabdcbbdd9e37", "tree": "2cfd0f35cdd1a115e672f78653b34fdced4bd251", "parents": [ "76ca07832842100b14a31ad8996dab7b0c28aa42" ], "author": { "name": "Kazuhiro SUZUKI", "email": "kaz@jp.fujitsu.com", "time": "Fri Feb 18 14:43:07 2011 -0800" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Mar 16 13:06:29 2011 -0400" }, "message": "xen: xenbus PM events support\n\nMake xenbus frontend device subscribe to PM events\nto receive suspend/resume/freeze/thaw/restore\nnotifications.\n\nSigned-off-by: Kenji Wakamiya \u003cwkenji@jp.fujitsu.com\u003e\nSigned-off-by: Kazuhiro Suzuki \u003ckaz@jp.fujitsu.com\u003e\nSigned-off-by: Shriram Rajagopalan \u003crshriram@cs.ubc.ca\u003e\nAcked-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\n[shriram--minor mods and improved commit message]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "afe997a183ecc0be72652c7a5ce2152bdf91724e", "tree": "307ec69f546700d1aac7a9bc23853f6e4ae875a0", "parents": [ "4897313a62cf0b106e9e861bf7350a9cfc0715d0", "168f2e14319aba3125946649604e858cbae85be6" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Wed Mar 16 09:58:31 2011 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Wed Mar 16 09:58:31 2011 -0700" }, "message": "Pull pstorev4 into release branch\n" }, { "commit": "27b92d4ff2be2359a21ff4acde5b63563ff720e2", "tree": "49691b22fe1318aa68d5ebdff74795f004f0cf8f", "parents": [ "5de0ee574be8f6922a6c33f2fbc7e9b130a2f626", "e58a8947b0264ec1f43ce5deef563b72acf1284f" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Mar 16 17:38:41 2011 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Mar 16 17:38:41 2011 +0100" }, "message": "Merge branch \u0027topic/asoc\u0027 into for-linus\n" } ], "next": "fc82e1d59a24cbac01c49d4eb3b28d6abc26a5f4" }