)]}' { "log": [ { "commit": "d0b952a9837f81cd89e756b1b34293fa6e1cb59d", "tree": "fbe488bc5f407afa0e91cefb262d9e9ee69062ac", "parents": [ "d90125bfe958ed0451c6b98f831c86aba08b43d5", "47552c4e555eefe381f3d45140b59a2ea4b16486" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon Jun 19 18:55:56 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon Jun 19 18:55:56 2006 -0700" }, "message": "Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\n* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (109 commits)\n [ETHTOOL]: Fix UFO typo\n [SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer.\n [SCTP]: Send only 1 window update SACK per message.\n [SCTP]: Don\u0027t do CRC32C checksum over loopback.\n [SCTP] Reset rtt_in_progress for the chunk when processing its sack.\n [SCTP]: Reject sctp packets with broadcast addresses.\n [SCTP]: Limit association max_retrans setting in setsockopt.\n [PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate.\n [IPV6]: Sum real space for RTAs.\n [IRDA]: Use put_unaligned() in irlmp_do_discovery().\n [BRIDGE]: Add support for NETIF_F_HW_CSUM devices\n [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM\n [TG3]: Convert to non-LLTX\n [TG3]: Remove unnecessary tx_lock\n [TCP]: Add tcp_slow_start_after_idle sysctl.\n [BNX2]: Update version and reldate\n [BNX2]: Use CPU native page size\n [BNX2]: Use compressed firmware\n [BNX2]: Add firmware decompression\n [BNX2]: Allow WoL settings on new 5708 chips\n ...\n\nManual fixup for conflict in drivers/net/tulip/winbond-840.c\n" }, { "commit": "2090af718014f3d434fb8b85b00eeea01ebcec19", "tree": "97eb6e655a3c2d90c212de79b563fa35837a341f", "parents": [ "557240b48e2dc4f6fa878afc3fc767ad745ca7ed", "4b6ace7f02cddb8c363ad27bb1e5014c6791e34a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon Jun 19 18:50:43 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon Jun 19 18:50:43 2006 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6\n\n* \u0027upstream-linus\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (166 commits)\n [PATCH] net: au1000_eth: PHY framework conversion\n [PATCH] 3c5zz ethernet: fix section warnings\n [PATCH] smc ethernet: fix section mismatch warnings\n [PATCH] hp ethernet: fix section mismatches\n [PATCH] Section mismatch in drivers/net/ne.o during modpost\n [PATCH] e1000: prevent statistics from getting garbled during reset\n [PATCH] smc911x Kconfig fix\n [PATCH] forcedeth: new device ids\n [PATCH] forcedeth config: version\n [PATCH] forcedeth config: module parameters\n [PATCH] forcedeth config: diagnostics\n [PATCH] forcedeth config: move functions\n [PATCH] forcedeth config: statistics\n [PATCH] forcedeth config: csum\n [PATCH] forcedeth config: wol\n [PATCH] forcedeth config: phy\n [PATCH] forcedeth config: flow control\n [PATCH] forcedeth config: ring sizes\n [PATCH] forcedeth config: tso cleanup\n [DOC] Update bonding documentation with sysfs info\n ...\n" }, { "commit": "557240b48e2dc4f6fa878afc3fc767ad745ca7ed", "tree": "354e9de17c28b438db675f6a2b779415f1634c45", "parents": [ "5603509137940f4cbc577281cee62110d4097b1b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon Jun 19 18:16:01 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon Jun 19 18:16:01 2006 -0700" }, "message": "Add support for suspending and resuming the whole console subsystem\n\nTrying to suspend/resume with console messages flying all around is\ndoomed to failure, when the devices that the messages are trying to\ngo to are being shut down.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "c7ce1ae21223fe1f905feba272bc14b87994a57d", "tree": "cd527489396fd9def8d19416fd05c2c11f794394", "parents": [ "c5396a31b20991c856facbce18a2a56d1a14e8d0" ], "author": { "name": "Tushar Gohad", "email": "tgohad@mvista.com", "time": "Sat Jun 17 22:54:03 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 17 22:54:03 2006 -0700" }, "message": "[PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate.\n\nSigned-off-by: Tushar Gohad \u003ctgohad@mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8648b3053bff39a7ee4c711d74268079c928a657", "tree": "6de70eedf63c4b965d04040323827f1bc520ccdf", "parents": [ "00b7050426da8e7e58c889c5c80a19920d2d41b3" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Jun 17 22:06:05 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 17 22:06:05 2006 -0700" }, "message": "[NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM\n\nThe current stack treats NETIF_F_HW_CSUM and NETIF_F_NO_CSUM\nidentically so we test for them in quite a few places. For the sake\nof brevity, I\u0027m adding the macro NETIF_F_GEN_CSUM for these two. We\nalso test the disjunct of NETIF_F_IP_CSUM and the other two in various\nplaces, for that purpose I\u0027ve added NETIF_F_ALL_CSUM.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "35089bb203f44e33b6bbb6c4de0b0708f9a48921", "tree": "3e9ca3dbc12a063121c3ecba2558400307d4acd5", "parents": [ "9e1881dec9e3e8f8408551cddfda489857a7ec99" ], "author": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Tue Jun 13 22:33:04 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:30:53 2006 -0700" }, "message": "[TCP]: Add tcp_slow_start_after_idle sysctl.\n\nA lot of people have asked for a way to disable tcp_cwnd_restart(),\nand it seems reasonable to add a sysctl to do that.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3cc0e873986fe594d0e96d07259b11f755325cb2", "tree": "5d3e9a57333a2d7088a6a63c09bc97db98f480af", "parents": [ "b38dfee3d616ffadb58d4215e3ff9d1d7921031e" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Jun 09 16:13:38 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:30:22 2006 -0700" }, "message": "[NET]: Warn in __skb_trim if skb is paged\n\nIt\u0027s better to warn and fail rather than rarely triggering BUG on paths\nthat incorrectly call skb_trim/__skb_trim on a non-linear skb.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "364c6badde0dd62a0a38e5ed67f85d87d6665780", "tree": "56c8ad3e3f45fafec010da4f5858825db5dbc86c", "parents": [ "932ff279a43ab7257942cddff2595acd541cc49b" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Jun 09 16:10:40 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:30:16 2006 -0700" }, "message": "[NET]: Clean up skb_linearize\n\nThe linearisation operation doesn\u0027t need to be super-optimised. So we can\nreplace __skb_linearize with __pskb_pull_tail which does the same thing but\nis more general.\n\nAlso, most users of skb_linearize end up testing whether the skb is linear\nor not so it helps to make skb_linearize do just that.\n\nSome callers of skb_linearize also use it to copy cloned data, so it\u0027s\nuseful to have a new function skb_linearize_cow to copy the data if it\u0027s\neither non-linear or cloned.\n\nLast but not least, I\u0027ve removed the gfp argument since nobody uses it\nanymore. If it\u0027s ever needed we can easily add it back.\n\nMisc bugs fixed by this patch:\n\n* via-velocity error handling (also, no SG \u003d\u003e no frags)\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "932ff279a43ab7257942cddff2595acd541cc49b", "tree": "e60130673a20d71becdac858c2589d8dfbf3ae1f", "parents": [ "bf0857ea32addb6bc8b46383604b218b8ec09f19" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Jun 09 12:20:56 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:30:14 2006 -0700" }, "message": "[NET]: Add netif_tx_lock\n\nVarious drivers use xmit_lock internally to synchronise with their\ntransmission routines. They do so without setting xmit_lock_owner.\nThis is fine as long as netpoll is not in use.\n\nWith netpoll it is possible for deadlocks to occur if xmit_lock_owner\nisn\u0027t set. This is because if a printk occurs while xmit_lock is held\nand xmit_lock_owner is not set can cause netpoll to attempt to take\nxmit_lock recursively.\n\nWhile it is possible to resolve this by getting netpoll to use\ntrylock, it is suboptimal because netpoll\u0027s sole objective is to\nmaximise the chance of getting the printk out on the wire. So\ndelaying or dropping the message is to be avoided as much as possible.\n\nSo the only alternative is to always set xmit_lock_owner. The\nfollowing patch does this by introducing the netif_tx_lock family of\nfunctions that take care of setting/unsetting xmit_lock_owner.\n\nI renamed xmit_lock to _xmit_lock to indicate that it should not be\nused directly. I didn\u0027t provide irq versions of the netif_tx_lock\nfunctions since xmit_lock is meant to be a BH-disabling lock.\n\nThis is pretty much a straight text substitution except for a small\nbug fix in winbond. It currently uses\nnetif_stop_queue/spin_unlock_wait to stop transmission. This is\nunsafe as an IRQ can potentially wake up the queue. So it is safer to\nuse netif_tx_disable.\n\nThe hamradio bits used spin_lock_irq but it is unnecessary as\nxmit_lock must never be taken in an IRQ handler.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "100468e9c05c10fb6872751c1af523b996d6afa9", "tree": "2ad0e988897a3636cbe5353a7624232c62b0968a", "parents": [ "7c9728c393dceb724d66d696cfabce82151a78e5" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Jun 09 00:32:39 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:30:03 2006 -0700" }, "message": "[SECMARK]: Add CONNSECMARK xtables target\n\nAdd a new xtables target, CONNSECMARK, which is used to specify rules\nfor copying security marks from packets to connections, and for\ncopyying security marks back from connections to packets. This is\nsimilar to the CONNMARK target, but is more limited in scope in that\nit only allows copying of security marks to and from packets, as this\nis all it needs to do.\n\nA typical scenario would be to apply a security mark to a \u0027new\u0027 packet\nwith SECMARK, then copy that to its conntrack via CONNMARK, and then\nrestore the security mark from the connection to established and\nrelated packets on that connection.\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7c9728c393dceb724d66d696cfabce82151a78e5", "tree": "af2b67ff7c579d669d01f28af33929f780b9c1b3", "parents": [ "5e6874cdb8de94cd3c15d853a8ef9c6f4c305055" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Jun 09 00:31:46 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:30:01 2006 -0700" }, "message": "[SECMARK]: Add secmark support to conntrack\n\nAdd a secmark field to IP and NF conntracks, so that security markings\non packets can be copied to their associated connections, and also\ncopied back to packets as required. This is similar to the network\nmark field currently used with conntrack, although it is intended for\nenforcement of security policy rather than network policy.\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5e6874cdb8de94cd3c15d853a8ef9c6f4c305055", "tree": "3f289088db7512d55d6e46d1d14c5d18f07f9b4f", "parents": [ "984bc16cc92ea3c247bf34ad667cfb95331b9d3c" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Jun 09 00:30:57 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:29:59 2006 -0700" }, "message": "[SECMARK]: Add xtables SECMARK target\n\nAdd a SECMARK target to xtables, allowing the admin to apply security\nmarks to packets via both iptables and ip6tables.\n\nThe target currently handles SELinux security marking, but can be\nextended for other purposes as needed.\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "984bc16cc92ea3c247bf34ad667cfb95331b9d3c", "tree": "2342638457f43980501179056f4ba1e4e3c2c1aa", "parents": [ "c749b29fae74ed59c507d84025b3298202b42609" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Jun 09 00:29:17 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:29:57 2006 -0700" }, "message": "[SECMARK]: Add secmark support to core networking.\n\nAdd a secmark field to the skbuff structure, to allow security subsystems to\nplace security markings on network packets. This is similar to the nfmark\nfield, except is intended for implementing security policy, rather than than\nnetworking policy.\n\nThis patch was already acked in principle by Dave Miller.\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c749b29fae74ed59c507d84025b3298202b42609", "tree": "c06b1fb17cce425692f7ab40b2df8c5b00d8c931", "parents": [ "29a395eac4c320c570e73f0a90d8953d80da8359" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Jun 09 00:28:25 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:29:55 2006 -0700" }, "message": "[SECMARK]: Add SELinux exports\n\nAdd and export new functions to the in-kernel SELinux API in support of the\nnew secmark-based packet controls.\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6f68dc37759b1d6ff3b4d4a9d097605a09f8f043", "tree": "7d0be960b8c0ec5b947637a0650f1c639002103a", "parents": [ "9dadaa19cb11a8db38072a92a3f95deab7a797fb" ], "author": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Thu Jun 08 23:58:52 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:29:49 2006 -0700" }, "message": "[NET]: Fix warnings after LSM-IPSEC changes.\n\nAssignment used as truth value in xfrm_del_sa()\nand xfrm_get_policy().\n\nWrong argument type declared for security_xfrm_state_delete()\nwhen SELINUX is disabled.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c8c05a8eec6f1258f6d5cb71a44ee5dc1e989b63", "tree": "b4a04dd9e2b940cb5b2911fb67fbe49c5f8b3fbf", "parents": [ "cec6f7f39c3db7d9f6091bf2f8fc8d520f372719" ], "author": { "name": "Catherine Zhang", "email": "cxzhang@watson.ibm.com", "time": "Thu Jun 08 23:39:49 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:29:45 2006 -0700" }, "message": "[LSM-IPsec]: SELinux Authorize\n\nThis patch contains a fix for the previous patch that adds security\ncontexts to IPsec policies and security associations. In the previous\npatch, no authorization (besides the check for write permissions to\nSAD and SPD) is required to delete IPsec policies and security\nassocations with security contexts. Thus a user authorized to change\nSAD and SPD can bypass the IPsec policy authorization by simply\ndeleteing policies with security contexts. To fix this security hole,\nan additional authorization check is added for removing security\npolicies and security associations with security contexts.\n\nNote that if no security context is supplied on add or present on\npolicy to be deleted, the SELinux module allows the change\nunconditionally. The hook is called on deletion when no context is\npresent, which we may want to change. At present, I left it up to the\nmodule.\n\nLSM changes:\n\nThe patch adds two new LSM hooks: xfrm_policy_delete and\nxfrm_state_delete. The new hooks are necessary to authorize deletion\nof IPsec policies that have security contexts. The existing hooks\nxfrm_policy_free and xfrm_state_free lack the context to do the\nauthorization, so I decided to split authorization of deletion and\nmemory management of security data, as is typical in the LSM\ninterface.\n\nUse:\n\nThe new delete hooks are checked when xfrm_policy or xfrm_state are\ndeleted by either the xfrm_user interface (xfrm_get_policy,\nxfrm_del_sa) or the pfkey interface (pfkey_spddelete, pfkey_delete).\n\nSELinux changes:\n\nThe new policy_delete and state_delete functions are added.\n\nSigned-off-by: Catherine Zhang \u003ccxzhang@watson.ibm.com\u003e\nSigned-off-by: Trent Jaeger \u003ctjaeger@cse.psu.edu\u003e\nAcked-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "338fcf9886df9ad2873772197a73a57818973316", "tree": "3d58fed24e4c171110788ad479093a9b4ba27133", "parents": [ "70df2311ee3fc607e7511873d7dade5bd17d593d" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon Jun 05 21:04:39 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:29:37 2006 -0700" }, "message": "[IPV4] igmp: Fixup struct ip_mc_list::multiaddr type\n\nAll users except two expect 32-bit big-endian value. One is of\n\n\t-\u003emultiaddr \u003d -\u003emultiaddr\n\nvariety. And last one is \"%08lX\".\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ae5b7d8ba2c28d7d9835856fe0ca5f6ec95ea768", "tree": "54de467b6ee9344a51c8b254be3da933b57cc531", "parents": [ "e44ab66a75e20c02193440a5e27c16c91630109b" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 29 18:27:09 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:29:15 2006 -0700" }, "message": "[NETFILTER]: Add SIP connection tracking helper\n\nAdd SIP connection tracking helper. Originally written by\nChristian Hentschel \u003cchentschel@arnet.com.ar\u003e, some cleanup, minor\nfixes and bidirectional SIP support added by myself.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c0d4cfd96dd0cc0dbf49435898808b5553af4822", "tree": "aa8fb9afbed9da300bb22adfd3798fe7e196cee0", "parents": [ "c95261693467f0aeac7fafa69860ddfb02bc12f8" ], "author": { "name": "Jing Min Zhao", "email": "zhaojingmin@users.sourceforge.net", "time": "Mon May 29 18:26:27 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:29:11 2006 -0700" }, "message": "[NETFILTER]: H.323 helper: Add support for Call Forwarding\n\nSigned-off-by: Jing Min Zhao \u003czhaojingmin@users.sourceforge.net\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3726add76643c715d437aceda320d319153b6113", "tree": "70b343ab57ae6575ebc2828cc1e8bab24c4df120", "parents": [ "997ae831ade74bdaed4172b1c02060b9efd6e206" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 29 18:24:39 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:29:01 2006 -0700" }, "message": "[NETFILTER]: ctnetlink: fix NAT configuration\n\nThe current configuration only allows to configure one manip and overloads\nconntrack status flags with netlink semantic.\n\nSigned-off-by: Patrick Mchardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "997ae831ade74bdaed4172b1c02060b9efd6e206", "tree": "feca25f5c27c47724ecfbcc66f4f437619fb57ed", "parents": [ "39a27a35c5c1b5be499a0576a35c45a011788bf8" ], "author": { "name": "Eric Leblond", "email": "eric@inl.fr", "time": "Mon May 29 18:24:20 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:28:59 2006 -0700" }, "message": "[NETFILTER]: conntrack: add fixed timeout flag in connection tracking\n\nAdd a flag in a connection status to have a non updated timeout.\nThis permits to have connection that automatically die at a given\ntime.\n\nSigned-off-by: Eric Leblond \u003ceric@inl.fr\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "39a27a35c5c1b5be499a0576a35c45a011788bf8", "tree": "ec5383eec578c455ca5a14184dc9398bbc5f9afb", "parents": [ "6442f1cf897643d4ca597f2f7d3464b765bae960" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 29 18:23:54 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:28:57 2006 -0700" }, "message": "[NETFILTER]: conntrack: add sysctl to disable checksumming\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f3389805e53a13bd969ee1c8fc5a4137b7c6c167", "tree": "f73b639579da1f201c1886027d59960380c2296a", "parents": [ "62b7743483b402f8fb73545d5d487ca714e82766" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 29 18:21:00 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:28:51 2006 -0700" }, "message": "[NETFILTER]: x_tables: add statistic match\n\nAdd statistic match which is a combination of the nth and random matches.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "62b7743483b402f8fb73545d5d487ca714e82766", "tree": "f90e434e85c1f4391ad46310ee128ce25c1dca57", "parents": [ "957dc80ac30f3c4d53259fa936df807663ba54fa" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 29 18:20:32 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:28:49 2006 -0700" }, "message": "[NETFILTER]: x_tables: add quota match\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b59f45d0b2878ab76f8053b0973654e6621828ee", "tree": "40dc5e2ede2620f7935fb3dae0d0eb199851f611", "parents": [ "546be2405be119ef55467aace45f337a16e5d424" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat May 27 23:05:54 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:28:39 2006 -0700" }, "message": "[IPSEC] xfrm: Abstract out encapsulation modes\n\nThis patch adds the structure xfrm_mode. It is meant to represent\nthe operations carried out by transport/tunnel modes.\n\nBy doing this we allow additional encapsulation modes to be added\nwithout clogging up the xfrm_input/xfrm_output paths.\n\nCandidate modes include 4-to-6 tunnel mode, 6-to-4 tunnel mode, and\nBEET modes.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "30b6c28d2aca4669f2e609ad5d77ea2a6cf0dd3a", "tree": "eb7d8cf4f45b1030aaa17cb816fe1bbdbd35abd8", "parents": [ "898b1d16f8230fb912a0c2248df685735c6ceda3" ], "author": { "name": "Michael Chan", "email": "mchan@broadcom.com", "time": "Fri May 26 17:44:45 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:26:24 2006 -0700" }, "message": "[TG3]: Add 5786 PCI ID\n\nAdd PCI ID for BCM5786 which is a variant of 5787.\n\nSigned-off-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9593782585e0cf70babe787a8463d492a68b1744", "tree": "149401a3973036452a07bed899e70d3b92abe1bf", "parents": [ "624d1164730d58a494cc5aa4afa37d02c41e83a7" ], "author": { "name": "Chris Leech", "email": "christopher.leech@intel.com", "time": "Tue May 23 18:02:55 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:25:54 2006 -0700" }, "message": "[I/OAT]: Add a sysctl for tuning the I/OAT offloaded I/O threshold\n\nAny socket recv of less than this ammount will not be offloaded\n\nSigned-off-by: Chris Leech \u003cchristopher.leech@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "97fc2f0848c928c63c2ae619deee61a0b1107b69", "tree": "651f5ec78128605736d6c777a13697d5e58a1b62", "parents": [ "de5506e155276d385712c2aa1c2d9a27cd4ed947" ], "author": { "name": "Chris Leech", "email": "christopher.leech@intel.com", "time": "Tue May 23 17:55:33 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:25:48 2006 -0700" }, "message": "[I/OAT]: Structure changes for TCP recv offload to I/OAT\n\nAdds an async_wait_queue and some additional fields to tcp_sock, and a\ndma_cookie_t to sk_buff.\n\nSigned-off-by: Chris Leech \u003cchristopher.leech@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "de5506e155276d385712c2aa1c2d9a27cd4ed947", "tree": "219c30dab27b9aef2597d8735dfc19db8454849e", "parents": [ "db21733488f84a596faaad0d05430b3f51804692" ], "author": { "name": "Chris Leech", "email": "christopher.leech@intel.com", "time": "Tue May 23 17:50:37 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:25:46 2006 -0700" }, "message": "[I/OAT]: Utility functions for offloading sk_buff to iovec copies\n\nProvides for pinning user space pages in memory, copying to iovecs,\nand copying from sk_buffs including fragmented and chained sk_buffs.\n\nSigned-off-by: Chris Leech \u003cchristopher.leech@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db21733488f84a596faaad0d05430b3f51804692", "tree": "a2c1f6d39ce27d2e86b395f2bf536c1ab7396411", "parents": [ "57c651f74cd8383df10a648e677902849de1bc0b" ], "author": { "name": "Chris Leech", "email": "christopher.leech@intel.com", "time": "Sat Jun 17 21:24:58 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 17 21:24:58 2006 -0700" }, "message": "[I/OAT]: Setup the networking subsystem as a DMA client\n\nAttempts to allocate per-CPU DMA channels\n\nSigned-off-by: Chris Leech \u003cchristopher.leech@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "57c651f74cd8383df10a648e677902849de1bc0b", "tree": "caf432ce2828b25e17cea3cff523e481c740c65e", "parents": [ "6b00c92c4b26428cd80e966380c07103556f7b14" ], "author": { "name": "David S. Miller", "email": "davem@sunset.sfo1.dsl.speakeasy.net", "time": "Tue May 23 17:39:49 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:18:50 2006 -0700" }, "message": "[I/OAT]: Move PCI_DEVICE_ID_INTEL_IOAT to linux/pci_ids.h\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c13c8260da3155f2cefb63b0d1b7dcdcb405c644", "tree": "ecfe02fa44a423a948f5fb5ad76497da2bb7a402", "parents": [ "427abfa28afedffadfca9dd8b067eb6d36bac53f" ], "author": { "name": "Chris Leech", "email": "christopher.leech@intel.com", "time": "Tue May 23 17:18:44 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sat Jun 17 21:18:43 2006 -0700" }, "message": "[I/OAT]: DMA memcpy subsystem\n\nProvides an API for offloading memory copies to DMA devices\n\nSigned-off-by: Chris Leech \u003cchristopher.leech@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b5ed7639c9f502898af4109e778f5613dacbfd9c", "tree": "abe908c60ce1ea8f201028c9fc830cacd25c724b", "parents": [ "0638dec01e89059c853515ab71c55fd13ba5a8ea", "eb35cf60e462491249166182e3e755d3d5d91a28" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Jun 13 20:29:04 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Jun 13 20:29:04 2006 -0400" }, "message": "Merge branch \u0027master\u0027 into upstream\n" }, { "commit": "0ce030395b92270567423d57d9d432eb77df32f2", "tree": "429e8fa32b90ebf0b801846b6945480fb950572c", "parents": [ "650fb8382287f7990d5127a82a54295139224606" ], "author": { "name": "akpm@osdl.org", "email": "akpm@osdl.org", "time": "Sat May 13 08:30:52 2006 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sun Jun 11 14:02:27 2006 -0700" }, "message": "[PATCH] PCI: fix pciehp compile issue when CONFIG_ACPI is not enabled\n\nFix build error when CONFIG_ACPI not defined\n\nSigned-off-by: Kristen Carlson Accardi \u003ckristen.c.accardi@intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "57a62fed871eb2a95f296fe6c5c250ce21b81a79", "tree": "0e399966d58f7177e1c34a765e768e0865fc5813", "parents": [ "a913f50706b21c7933f53cec678bb9a1c2383499" ], "author": { "name": "Markus Lidel", "email": "Markus.Lidel@shadowconnect.com", "time": "Sat Jun 10 09:54:14 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sat Jun 10 11:02:05 2006 -0700" }, "message": "[PATCH] I2O: Bugfixes to get I2O working again\n\nFrom: Markus Lidel \u003cMarkus.Lidel@shadowconnect.com\u003e\n\n- Fixed locking of struct i2o_exec_wait in Executive-OSM\n\n- Removed LCT Notify in i2o_exec_probe() which caused freeing memory and\n accessing freed memory during first enumeration of I2O devices\n\n- Added missing locking in i2o_exec_lct_notify()\n\n- removed put_device() of I2O controller in i2o_iop_remove() which caused\n the controller structure get freed to early\n\n- Fixed size of mempool in i2o_iop_alloc()\n\n- Fixed access to freed memory in i2o_msg_get()\n\nSee http://bugzilla.kernel.org/show_bug.cgi?id\u003d6561\n\nSigned-off-by: Markus Lidel \u003cMarkus.Lidel@shadowconnect.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "bc1c116974a5c3f498112a6f175d3e4a8cd5bdbc", "tree": "69ea68db91fb871cd24a0a5c5045abbe9c77bd3a", "parents": [ "26e780e8ef1cc3ef581a07aafe2346bb5a07b4f9" ], "author": { "name": "Jens Axboe", "email": "axboe@suse.de", "time": "Thu Jun 08 08:49:06 2006 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Thu Jun 08 15:14:23 2006 -0700" }, "message": "[PATCH] elevator switching race\n\nThere\u0027s a race between shutting down one io scheduler and firing up the\nnext, in which a new io could enter and cause the io scheduler to be\ninvoked with bad or NULL data.\n\nTo fix this, we need to maintain the queue lock for a bit longer.\nUnfortunately we cannot do that, since the elevator init requires to be\nrun without the lock held. This isn\u0027t easily fixable, without also\nchanging the mempool API. So split the initialization into two parts,\nand alloc-init operation and an attach operation. Then we can\npreallocate the io scheduler and related structures, and run the attach\ninside the lock after we detach the old one.\n\nThis patch has survived 30 minutes of 1 second io scheduler switching\nwith a very busy io load.\n\nSigned-off-by: Jens Axboe \u003caxboe@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "45b35a5ced474b9fbbbfcfd5cf346c432d28d9fd", "tree": "a6570f00cb40b3e38c3db277e75547ed6f0e34d4", "parents": [ "fd0a0ac1c5393b226640a30bae753983068136b3" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Thu Jun 08 00:43:41 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Thu Jun 08 15:12:21 2006 -0700" }, "message": "[PATCH] Fix mempolicy.h build error\n\nFrom: Ralf Baechle \u003cralf@linux-mips.org\u003e\n\n\u003clinux/mempolicy.h\u003e uses struct mm_struct and relies on a definition or\ndeclaration somehow magically being dragged in which may result in a\nbuild:\n\n[...]\n CC mm/mempolicy.o\nIn file included from mm/mempolicy.c:69:\ninclude/linux/mempolicy.h:150: warning: ‘struct mm_struct’ declared inside parameter list\ninclude/linux/mempolicy.h:150: warning: its scope is only this definition or declaration, which is probably not what you want\ninclude/linux/mempolicy.h:175: warning: ‘struct mm_struct’ declared inside parameter list\nmm/mempolicy.c:622: error: conflicting types for ‘do_migrate_pages’\ninclude/linux/mempolicy.h:175: error: previous declaration of ‘do_migrate_pages’ was here\nmm/mempolicy.c:1661: error: conflicting types for ‘mpol_rebind_mm’\ninclude/linux/mempolicy.h:150: error: previous declaration of ‘mpol_rebind_mm’ was here\nmake[1]: *** [mm/mempolicy.o] Error 1\nmake: *** [mm] Error 2\n[ralf@denk linux-ip35]$\n\nIncluding \u003clinux/sched.h\u003e is a step into direction of include hell so\nfixed by adding a forward declaration of struct mm_struct instead.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "d15a88fc21ef225768ce31be16edfc9c6e2e02e3", "tree": "d4cb0a1bc97973bb947e2667ae56bc4bc2256e9d", "parents": [ "b53471711f21ba0e151075f0e1d6d531eb50f1b1", "1def630a6a49dda5bc89dfbd86656293640456f0" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Thu Jun 08 15:24:46 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Thu Jun 08 15:24:46 2006 -0400" }, "message": "Merge branch \u0027master\u0027 into upstream\n" }, { "commit": "2d7b20c1884777e66009be1a533641c19c4705f6", "tree": "2c27d46133c5e086e32af8f88915bec53d5747fb", "parents": [ "67f672f61bb75e74805046e4a301f4923b0ef753" ], "author": { "name": "Andrew Morton", "email": "akpm@osdl.org", "time": "Sun Jun 04 02:51:42 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon Jun 05 12:29:17 2006 -0700" }, "message": "[PATCH] m48t86: ia64 build fix\n\nFrom: Andrew Morton \u003cakpm@osdl.org\u003e\n\ndrivers/rtc/rtc-m48t86.c: In function `m48t86_rtc_read_time\u0027:\ndrivers/rtc/rtc-m48t86.c:51: error: structure has no member named `ia64_mv\u0027\ndrivers/rtc/rtc-m48t86.c:55: error: structure has no member named `ia64_mv\u0027\ndrivers/rtc/rtc-m48t86.c:56: error: structure has no member named `ia64_mv\u0027\ndrivers/rtc/rtc-m48t86.c:57: error: structure has no member named `ia64_mv\u0027\ndrivers/rtc/rtc-m48t86.c:58: error: structure has no member named `ia64_mv\u0027\ndrivers/rtc/rtc-m48t86.c:60: error: structure has no member named `ia64_mv\u0027\n\nreadb() and writeb() are macros on ia64.\n\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "93ff66bf1ef29881dffd6fdc344555dab03cdb42", "tree": "61c995a742fa0e2e116e679e5cdd130edf98dd46", "parents": [ "4ae9538dd02824257e8e72c053c69ad6680aba04" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Sun Jun 04 02:51:29 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon Jun 05 12:29:16 2006 -0700" }, "message": "[PATCH] Sparsemem build fix\n\nFrom: Ralf Baechle \u003cralf@linux-mips.org\u003e\n\n\u003clinux/mmzone.h\u003e uses PAGE_SIZE, PAGE_SHIFT from \u003casm/page.h\u003e without\nincluding that header itself. For some sparsemem configurations this may\nresult in build errors like:\n\n CC init/initramfs.o\nIn file included from include/linux/gfp.h:4,\n from include/linux/slab.h:15,\n from include/linux/percpu.h:4,\n from include/linux/rcupdate.h:41,\n from include/linux/dcache.h:10,\n from include/linux/fs.h:226,\n from init/initramfs.c:2:\ninclude/linux/mmzone.h:498:22: warning: \"PAGE_SHIFT\" is not defined\nIn file included from include/linux/gfp.h:4,\n from include/linux/slab.h:15,\n from include/linux/percpu.h:4,\n from include/linux/rcupdate.h:41,\n from include/linux/dcache.h:10,\n from include/linux/fs.h:226,\n from init/initramfs.c:2:\ninclude/linux/mmzone.h:526: error: `PAGE_SIZE\u0027 undeclared here (not in a function)\ninclude/linux/mmzone.h: In function `__pfn_to_section\u0027:\ninclude/linux/mmzone.h:573: error: `PAGE_SHIFT\u0027 undeclared (first use in this function)\ninclude/linux/mmzone.h:573: error: (Each undeclared identifier is reported only once\ninclude/linux/mmzone.h:573: error: for each function it appears in.)\ninclude/linux/mmzone.h: In function `pfn_valid\u0027:\ninclude/linux/mmzone.h:578: error: `PAGE_SHIFT\u0027 undeclared (first use in this function)\nmake[1]: *** [init/initramfs.o] Error 1\nmake: *** [init] Error 2\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nSeems-reasonable-to: Andy Whitcroft \u003capw@shadowen.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "760f1fce030ccc620ec430a8aff8fc604e7891ed", "tree": "d2e14b5c6d101e4b368300d2a7e6c6fd438133a8", "parents": [ "d61a3ead268084cc271d7b2aa2950fc822a37cf5" ], "author": { "name": "Andrew Morton", "email": "akpm@osdl.org", "time": "Tue May 30 21:26:03 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Wed May 31 16:27:11 2006 -0700" }, "message": "[PATCH] revert \"swsusp add check for suspension of X controlled devices\"\n\nFrom: Andrew Morton \u003cakpm@osdl.org\u003e\n\nRevert commit ff4da2e262d2509fe1bacff70dd00934be569c66.\n\nIt broke APM suspend, probably because APM doesn\u0027t switch back to a VT\nwhen suspending.\n\nTracked down by Matt Mackall \u003cmpm@selenic.com\u003e\n\nRafael sayeth:\n \"It only fixed the theoretical issue that a quick-handed user could\n switch to X after processes have been frozen and before the devices\n are suspended.\n\n With the current userland suspend tools it shouldn\u0027t be necessary.\"\n\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "e60a48f5ab35737118e19bc965c640900a842f02", "tree": "2dfc418bc3df4a73d51e45be1030f5692d0303a6", "parents": [ "2c56554ec596adadd562679ef672d83e290f1732", "7dd1d9b85cfb63eebf48fa13d3c5d25a3deb3a25" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue May 30 11:54:32 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue May 30 11:54:32 2006 -0700" }, "message": "Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart\n\n* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:\n [AGPGART] VIA PT880 Ultra support.\n [AGPGART] Fix Nforce3 suspend on amd64.\n [AGPGART] Enable SIS AGP driver on x86-64 for EM64T systems\n" }, { "commit": "ed8f9e2f047de5d9b791e390269f230a101a6a4b", "tree": "8bca1bcd3159bf35c57cefe8efc76f24039de186", "parents": [ "d2f4012f15845761bd3c6f90172e53767c11e359" ], "author": { "name": "Richard Purdie", "email": "rpurdie@rpsys.net", "time": "Mon May 29 23:31:03 2006 -0400" }, "committer": { "name": "Dmitry Torokhov", "email": "dtor_core@ameritech.net", "time": "Mon May 29 23:31:03 2006 -0400" }, "message": "Input: change from numbered to named switches\n\nRemove the numbered SW_* entries from the input system and assign names\nto the existing users.\n\nSigned-off-by: Richard Purdie \u003crpurdie@rpsys.net\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "f39b25bed373cf11a2c0490bee8b0ac430aadff4", "tree": "6221c20266907925b59ef988febd55e21f080df0", "parents": [ "d9ec5ad24ce80b7ef69a0717363db661d13aada5" ], "author": { "name": "Matthew Garrett", "email": "mjg59@srcf.ucam.org", "time": "Mon May 29 23:27:39 2006 -0400" }, "committer": { "name": "Dmitry Torokhov", "email": "dtor_core@ameritech.net", "time": "Mon May 29 23:27:39 2006 -0400" }, "message": "Input: add KEY_BATTERY keycode\n\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "4c0c2fd486b6598e37c77b5d81a08bc2d948aa7b", "tree": "5275fe083a58dece97502c64a49b99a743e865fd", "parents": [ "eb91f61b2294ccdb914df255164ada70dbbf2d58" ], "author": { "name": "Ayaz Abdulla", "email": "aabdulla@nvidia.com", "time": "Thu May 25 13:10:38 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Fri May 26 21:37:54 2006 -0400" }, "message": "[PATCH] pci_ids: add new device ids\n\nThis patch adds new device ids for MCP61 and MCP65 chips.\n\nSigned-Off-By: Ayaz Abdulla \u003caabdulla@nvidia.com\u003e\n\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "0da34b6dfe55810ae60db57e08e2af8a808c0a55", "tree": "4a62f33ee86aba9245bd1356b64a5e797cfde967", "parents": [ "3a720d726a6aa0a7cd9190f694587adf7bafdf4f" ], "author": { "name": "Brice Goglin", "email": "brice@myri.com", "time": "Tue May 23 06:10:15 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed May 24 00:27:31 2006 -0400" }, "message": "[PATCH] Add Myri-10G Ethernet driver\n\nSigned-off-by: Brice Goglin \u003cbrice@myri.com\u003e\nSigned-off-by: Andrew J. Gallatin \u003cgallatin@myri.com\u003e\n\n drivers/net/Kconfig | 17\n drivers/net/Makefile | 1\n drivers/net/myri10ge/Makefile | 5\n drivers/net/myri10ge/myri10ge.c | 2851 +++++++++++++++\n drivers/net/myri10ge/myri10ge_mcp.h | 205 +\n drivers/net/myri10ge/myri10ge_mcp_gen_header.h | 58\n include/linux/pci_ids.h | 1\n 7 files changed, 3138 insertions(+)\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "3a720d726a6aa0a7cd9190f694587adf7bafdf4f", "tree": "2162cbeb1786c8f7826c7e19850bae52395dacea", "parents": [ "d99ef36ed7e56f816a235f1af115420a81853fb9" ], "author": { "name": "Brice Goglin", "email": "brice@myri.com", "time": "Tue May 23 06:10:01 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed May 24 00:27:31 2006 -0400" }, "message": "[PATCH] Revive pci_find_ext_capability\n\nThis patch revives pci_find_ext_capability (has been disabled a couple month\nago since it was not used anywhere. See http://lkml.org/lkml/2006/1/20/247).\nIt will now be used by the myri10ge driver.\n\nSigned-off-by: Brice Goglin \u003cbrice@myri.com\u003e\nSigned-off-by: Andrew J. Gallatin \u003cgallatin@myri.com\u003e\n\n drivers/pci/pci.c | 3 +--\n include/linux/pci.h | 2 ++\n 2 files changed, 3 insertions(+), 2 deletions(-)\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "9528454f9c02fb9c359c4c42c69eed4d47407e39", "tree": "40e8c7f829b528073d2b216c3b8e6be205c76245", "parents": [ "777e1d4a0f3387933f668e7adc81384827975189", "1faadface9c5d000bb16e42c89f24859337cf2db" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue May 23 17:20:58 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue May 23 17:20:58 2006 -0400" }, "message": "Merge branch \u0027master\u0027 into upstream\n" }, { "commit": "0f0410823792ae0ecb45f2578598b115835ffdbb", "tree": "b20f362f34757b8d612d8f1c2740fca5f329d93e", "parents": [ "b471f55427ee94d6de2b33b88a7409f8cbc6b5dc" ], "author": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Tue May 23 07:46:40 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue May 23 10:35:32 2006 -0700" }, "message": "[PATCH] powerpc: wire up sys_[gs]et_robust_list\n\nSigned-off-by: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "e46e490368f87032a6e54969194413339b35a385", "tree": "eeb2daa75b5a900bd9920da6ffc2969d05e12b4a", "parents": [ "353b28bafd1b962359a866ff263a7fad833d29a1" ], "author": { "name": "Andrew Morton", "email": "akpm@osdl.org", "time": "Mon May 22 22:35:24 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue May 23 10:35:31 2006 -0700" }, "message": "[PATCH] sys_sync_file_range(): move exported flags outside __KERNEL__\n\nThese flags are needed by userspace - move them outside __KERNEL__\n\n(Pointed out by dwmw2)\n\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "7dd1d9b85cfb63eebf48fa13d3c5d25a3deb3a25", "tree": "5a840856c94644ddec417b2616fc9d2d872181bf", "parents": [ "ca2797ffaabc1f73cf8a73a30f709f0c1a6bef34" ], "author": { "name": "Magnus Kessler", "email": "Magnus.Kessler@gmx.net", "time": "Mon May 22 10:53:10 2006 +0100" }, "committer": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Mon May 22 13:56:02 2006 -0400" }, "message": "[AGPGART] VIA PT880 Ultra support.\n\nThis patch enables agpgart on a Via \"PT880 Ultra\" based motherboard\n(Asus P4V800D-X). The PCI ID of the PT880 Ultra is 0x0308 instead of\n0x0258 of the PT880.\n\nThe patched via-agp passes testgart.\n\nSigned-off-by: Magnus Kessler \u003cMagnus.Kessler@gmx.net\u003e\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\n" }, { "commit": "c9d20af62c59e49684f3882503351153964ff14b", "tree": "a8dfdcf801cd27ab2cb0b0c31b6727d77b6e184e", "parents": [ "b307e8548921c686d2eb948ca418ab2941876daa", "8a2ae70a9b4dc88c83b4644c58d06d74f2cb70c9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun May 21 18:31:53 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun May 21 18:31:53 2006 -0700" }, "message": "Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb\n\n* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (33 commits)\n V4L/DVB (3965): Fix CONFIG_VIDEO_VIVI\u003dy build bug\n V4L/DVB (3964): Bt8xx/bttv-cards.c: fix off-by-one errors\n V4L/DVB (3914): Vivi build fix\n V4L/DVB (3912): Sparc32 vivi fix\n V4L/DVB (3832): Get_dvb_firmware: download nxt2002 firmware from new driver location\n V4L/DVB (3829): Fix frequency values in the ranges structures of the LG TDVS H06xF tuners\n V4L/DVB (3826): Saa7134: Missing \u0027break\u0027 in Terratec Cinergy 400 TV initialization\n V4L/DVB (3825): Remove broken \u0027fast firmware load\u0027 from cx25840.\n V4L/DVB (3819): Cxusb-bluebird: bug-fix: power down corrupts frontend\n V4L/DVB (3813): Add support for TCL M2523_5N_E tuner.\n V4L/DVB (3804): Tweak bandselect setup fox cx24123\n V4L/DVB (3803): Various correctness fixes to tuning.\n V4L/DVB (3797): Always wait for diseqc queue to become ready before transmitting a diseqc message\n V4L/DVB (3796): Add several debug messages to cx24123 code\n V4L/DVB (3795): Fix for CX24123 \u0026 low symbol rates\n V4L/DVB (3792): Kbuild: DVB_BT8XX must select DVB_ZL10353\n V4L/DVB (3790): Use after free in drivers/media/video/em28xx/em28xx-video.c\n V4L/DVB (3788): Fix compilation with V4L1_COMPAT\n V4L/DVB (3782): Removed uneeded stuff from pwc Makefile\n V4L/DVB (3775): Add VIVI Kconfig stuff\n ...\n" }, { "commit": "e984bb43f7450312ba66fe0e67a99efa6be3b246", "tree": "54c86240172136fc81c773f71cd70eda54fed6f2", "parents": [ "ae57a856429dd932c547530df1b234eb7e642297" ], "author": { "name": "Bob Picco", "email": "bob.picco@hp.com", "time": "Sat May 20 15:00:31 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun May 21 12:59:22 2006 -0700" }, "message": "[PATCH] Align the node_mem_map endpoints to a MAX_ORDER boundary\n\nAndy added code to buddy allocator which does not require the zone\u0027s\nendpoints to be aligned to MAX_ORDER. An issue is that the buddy allocator\nrequires the node_mem_map\u0027s endpoints to be MAX_ORDER aligned. Otherwise\n__page_find_buddy could compute a buddy not in node_mem_map for partial\nMAX_ORDER regions at zone\u0027s endpoints. page_is_buddy will detect that\nthese pages at endpoints are not PG_buddy (they were zeroed out by bootmem\nallocator and not part of zone). Of course the negative here is we could\nwaste a little memory but the positive is eliminating all the old checks\nfor zone boundary conditions.\n\nSPARSEMEM won\u0027t encounter this issue because of MAX_ORDER size constraint\nwhen SPARSEMEM is configured. ia64 VIRTUAL_MEM_MAP doesn\u0027t need the logic\neither because the holes and endpoints are handled differently. This\nleaves checking alloc_remap and other arches which privately allocate for\nnode_mem_map.\n\nSigned-off-by: Bob Picco \u003cbob.picco@hp.com\u003e\nAcked-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Dave Hansen \u003chaveblue@us.ibm.com\u003e\nCc: Andy Whitcroft \u003capw@shadowen.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "1b81d6637d27a0e6a0506ecef65493b50d859cfc", "tree": "4eedb47409ac804710d9910c6485e391e87daf1a", "parents": [ "ccf06998fe179ae2cc9517ed1d75433dc0b5032d" ], "author": { "name": "Adrian Bunk", "email": "bunk@stusta.de", "time": "Sat May 20 15:00:16 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun May 21 12:59:19 2006 -0700" }, "message": "[PATCH] drivers/base/firmware_class.c: cleanups\n\n- remove the following global function that is both unused and\n unimplemented:\n - register_firmware()\n\n- make the following needlessly global function static:\n - firmware_class_uevent()\n\nSigned-off-by: Adrian Bunk \u003cbunk@stusta.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "ccf06998fe179ae2cc9517ed1d75433dc0b5032d", "tree": "88696d35b5bb168c3f7f2a3b56a683c919e33bed", "parents": [ "ba1a051319dc2bec9f43b7cef11c6e5270107fd6" ], "author": { "name": "Kumar Gala", "email": "galak@kernel.crashing.org", "time": "Sat May 20 15:00:15 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun May 21 12:59:19 2006 -0700" }, "message": "[PATCH] spi: add spi master driver for Freescale MPC83xx SPI controller\n\nThis driver supports the SPI controller on the MPC83xx SoC devices from\nFreescale. Note, this driver supports only the simple shift register SPI\ncontroller and not the descriptor based CPM or QUICCEngine SPI controller.\n\nSigned-off-by: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nSigned-off-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nCc: Greg KH \u003cgreg@kroah.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "badc48e6605ddeeb2484afae5993c859494decaa", "tree": "7da638f9bb53b1812b71e40ad6deca91d59ad301", "parents": [ "753a6c4ff4c371a3e4e3408aaba4d03f3cfde73a", "2f880b65fdbc2d4915bddc59d75a176329570fdd" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Sat May 20 00:03:38 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Sat May 20 00:03:38 2006 -0400" }, "message": "Merge branch \u0027master\u0027 into upstream\n" }, { "commit": "2c171bf13423dc5293188cea7f6c2da1720926e2", "tree": "d251705f564c8ffb081ba84c769fd2d1b229db53", "parents": [ "a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e" ], "author": { "name": "Pavel Pisa", "email": "ppisa@pikron.com", "time": "Fri May 19 21:48:03 2006 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri May 19 21:48:03 2006 +0100" }, "message": "[ARM] 3531/1: i.MX/MX1 SD/MMC ensure, that clock are stopped before new command and cleanups\n\nPatch from Pavel Pisa\n\nThere has been problems that for some paths that clock are not stopped\nduring new command programming and initiation. Result is issuing\nof incorrect command to the card. Some other problems are cleaned too.\nNoisy report of known ERRATUM #4 has been suppressed.\n\nSigned-off-by: Pavel Pisa \u003cpisa@cmp.felk.cvut.cz\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a020ed7521a9737bcf3e34eb880867c60c3c68d0", "tree": "52941e00b05df6c1bfe228fd193fdb09cf963d15", "parents": [ "ccf77cc4af5b048e20cfd9327fcc286cb69c34cc" ], "author": { "name": "David Brownell", "email": "david-b@pacbell.net", "time": "Mon Apr 03 15:49:04 2006 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue May 16 14:33:57 2006 -0700" }, "message": "[PATCH] SPI: busnum \u003d\u003d 0 needs to work\n\nWe need to be able to have a \"SPI bus 0\" matching chip numbering; but\nthat number was wrongly used to flag dynamic allocation of a bus number.\n\nThis patch resolves that issue; now negative numbers trigger dynamic alloc.\n\nIt also updates the how-to-write-a-controller-driver overview to mention\nthis stuff.\n\nSigned-off-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "ccf77cc4af5b048e20cfd9327fcc286cb69c34cc", "tree": "0a19a6948fe8bbf2128010a655e170ffebc9d8b8", "parents": [ "ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b" ], "author": { "name": "David Brownell", "email": "david-b@pacbell.net", "time": "Mon Apr 03 15:46:22 2006 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue May 16 14:33:57 2006 -0700" }, "message": "[PATCH] SPI: devices can require LSB-first encodings\n\nAdd spi_device hook for LSB-first word encoding, and update all the\n(in-tree) controller drivers to reject such devices. Eventually,\nsome controller drivers will be updated to support lsb-first encodings\non the wire; no current drivers need this.\n\nSigned-off-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b", "tree": "2d487a384f075f82444135a77330755f1755aa16", "parents": [ "025c398710ac24456f0288fc7e64f426c5c5508f" ], "author": { "name": "Kumar Gala", "email": "galak@kernel.crashing.org", "time": "Sun Apr 02 16:06:35 2006 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue May 16 14:33:57 2006 -0700" }, "message": "[PATCH] SPI: Renamed bitbang_transfer_setup to spi_bitbang_setup_transfer and export it\n\nRenamed bitbang_transfer_setup to follow convention of other exported symbols\nfrom spi-bitbang. Exported spi_bitbang_setup_transfer to allow users of\nspi-bitbang to use the function in their own setup_transfer.\n\nSigned-off-by: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nCc: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "747d844ee9a183ff3067bb1181f2a25c50649538", "tree": "0d35d9c2e3267765f328d7371b23433a5c7709c9", "parents": [ "e0c9905e87ac1bc56c9ea8f5b2934aeee53dce26" ], "author": { "name": "David Brownell", "email": "david-b@pacbell.net", "time": "Sun Apr 02 10:33:37 2006 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue May 16 14:33:56 2006 -0700" }, "message": "[PATCH] SPI: spi whitespace fixes\n\nThis removes superfluous whitespace in the \u003clinux/spi/spi.h\u003e header.\n\nSigned-off-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "4cff33f94fefcce1b3c01a9d1da6bb85fe3cbdfa", "tree": "0ef6066c4f2c0225517a6402bb04f4b4d56afd4d", "parents": [ "716f8954fb3029ca2df52a986b60af8d06f093ee" ], "author": { "name": "Imre Deak", "email": "imre.deak@nokia.com", "time": "Fri Feb 17 10:02:18 2006 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue May 16 14:33:56 2006 -0700" }, "message": "[PATCH] SPI: per-transfer overrides for wordsize and clocking\n\nSome protocols (like one for some bitmap displays) require different clock\nspeed or word size settings for each transfer in an SPI message. This adds\nthose parameters to struct spi_transfer. They are to be used when they are\nnonzero; otherwise the defaults from spi_device are to be used.\n\nThe patch also adds a setup_transfer callback to spi_bitbang, uses it for\nmessages that use those overrides, and implements it so that the pure\nbitbanging code can help resolve any questions about how it should work.\n\nSigned-off-by: Imre Deak \u003cimre.deak@nokia.com\u003e\nSigned-off-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "e6333fd4ddf7a583480017f535b9ea53c116ab81", "tree": "df1aeae28ce51103a0c9eda8f7d40e463297b2ef", "parents": [ "41e5a6ac80c600e1f8bda0a4871f0b797e097d78" ], "author": { "name": "Hua Zhong", "email": "hzhong@gmail.com", "time": "Mon May 15 09:44:22 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon May 15 11:20:56 2006 -0700" }, "message": "[PATCH] fix can_share_swap_page() when !CONFIG_SWAP\n\ncan_share_swap_page() is used to check if the page has the last reference.\nThis avoids allocating a new page for COW if it\u0027s the last page.\n\nHowever, if CONFIG_SWAP is not set, can_share_swap_page() is defined as 0,\nthus always causes a copy for the last COW page. The below simple patch\nfixes it.\n\nSigned-off-by: Hua Zhong \u003chzhong@gmail.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "39d24e64263cd3211705d3b61ea4171c65030921", "tree": "b527b1395b070180b7f930c0a89530f11bce7b3c", "parents": [ "48564e628bd7662d7a0b3ac81c41cd0e4cc36dae" ], "author": { "name": "Mike Kravetz", "email": "kravetz@us.ibm.com", "time": "Mon May 15 09:44:13 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon May 15 11:20:56 2006 -0700" }, "message": "[PATCH] add slab_is_available() routine for boot code\n\nslab_is_available() indicates slab based allocators are available for use.\nSPARSEMEM code needs to know this as it can be called at various times\nduring the boot process.\n\nSigned-off-by: Mike Kravetz \u003ckravetz@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "5e376613899076396d0c97de67ad072587267370", "tree": "ecc15c25ee4da7754aa7d137dccebab68820399e", "parents": [ "0159677857c5ada0a0a2c03a4dd59312382b73d0" ], "author": { "name": "Trent Piepho", "email": "xyzzy@speakeasy.org", "time": "Mon May 15 09:44:06 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon May 15 11:20:55 2006 -0700" }, "message": "[PATCH] symbol_put_addr() locks kernel\n\nEven since a previous patch:\n\nFix race between CONFIG_DEBUG_SLABALLOC and modules\nSun, 27 Jun 2004 17:55:19 +0000 (17:55 +0000)\nhttp://www.kernel.org/git/?p\u003dlinux/kernel/git/torvalds/old-2.6-bkcvs.git;a\u003dcommit;h\u003d92b3db26d31cf21b70e3c1eadc56c179506d8fbe\n\nThe function symbol_put_addr() will deadlock the kernel.\n\nsymbol_put_addr() would acquire modlist_lock, then while holding the lock call\ntwo functions kernel_text_address() and module_text_address() which also try\nto acquire the same lock. This deadlocks the kernel of course.\n\nThis patch changes symbol_put_addr() to not acquire the modlist_lock, it\ndoesn\u0027t need it since it never looks at the module list directly. Also, it\nnow uses core_kernel_text() instead of kernel_text_address(). The latter has\nan additional check for addr inside a module, but we don\u0027t need to do that\nsince we call module_text_address() (the same function kernel_text_address\nuses) ourselves.\n\nSigned-off-by: Trent Piepho \u003cxyzzy@speakeasy.org\u003e\nCc: Zwane Mwaikambo \u003czwane@fsmlabs.com\u003e\nAcked-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Johannes Stezenbach \u003cjs@linuxtv.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "986733e01d258c26107f1da9d8d47c718349ad2f", "tree": "5e0f04a707b8c341f79927ba6fffd0ad55d85c29", "parents": [ "3b7c8108273bed41a2fc04533cc9f2026ff38c8e" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon May 15 09:43:58 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon May 15 11:20:55 2006 -0700" }, "message": "[PATCH] RCU: introduce rcu_needs_cpu() interface\n\nWith \"Paul E. McKenney\" \u003cpaulmck@us.ibm.com\u003e\n\nIntroduce rcu_needs_cpu() interface. This can be used to tell if there\nwill be a new rcu batch on a cpu soon by looking at the curlist pointer.\nThis can be used to avoid to enter a tickless idle state where the cpu\nwould miss that a new batch is ready when rcu_start_batch would be called\non a different cpu.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: \"Paul E. McKenney\" \u003cpaulmck@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "cd41e28e2d0f198ad56840bf8ba13cb41b129bab", "tree": "a11b7e23c14625a4b019b43eecdc8fff2ee62463", "parents": [ "ea76ce526ec1af3e07f3dd9107ca93f0c82fc9c9" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@infradead.org", "time": "Sun Apr 09 15:43:41 2006 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@infradead.org", "time": "Fri May 12 19:54:53 2006 -0300" }, "message": "V4L/DVB (3774): Create V4L1 config options\n\nV4L1 API is depreciated and should be removed soon from kernel. This patch\nadds two new options, one to disable V4L1 drivers, and another to disable\nV4L1 compat module. This way, it would be easy to check what still depends\non V4L1 stuff, allowing also to test if app works fine with V4L2 only support.\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@infradead.org\u003e\n" }, { "commit": "2bf9d6d0f2dadc2a6c13684719c67dc043b9ce67", "tree": "512d855751247641aa68991b11026c1fb48736af", "parents": [ "6572b2064a54f1ed29fcbf6d16dfc5de71dfe495", "d8a5a8d7cc32e4474326e0ecc1b959063490efc9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Thu May 11 15:46:42 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Thu May 11 15:46:42 2006 -0700" }, "message": "Merge master.kernel.org:/home/rmk/linux-2.6-serial\n\n* master.kernel.org:/home/rmk/linux-2.6-serial:\n [SERIAL] 8250: add locking to console write function\n [SERIAL] Remove unconditional enable of TX irq for console\n [SERIAL] 8250: set divisor register correctly for AMD Alchemy SoC uart\n [SERIAL] AMD Alchemy UART: claim memory range\n [SERIAL] Clean up serial locking when obtaining a reference to a port\n" }, { "commit": "6572b2064a54f1ed29fcbf6d16dfc5de71dfe495", "tree": "5ab97c864956028045da27ca489d6447b2350c48", "parents": [ "f7a014af2d76a96e5af51b64f954328b700fa62f", "210525d65d33d17eb6bea6c965ce442d60d9aa8d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Thu May 11 15:35:54 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Thu May 11 15:35:54 2006 -0700" }, "message": "Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\n* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:\n [NET_SCHED]: HFSC: fix thinko in hfsc_adjust_levels()\n [IPV6]: skb leakage in inet6_csk_xmit\n [BRIDGE]: Do sysfs registration inside rtnl.\n [NET]: Do sysfs registration as part of register_netdevice.\n [TG3]: Fix possible NULL deref in tg3_run_loopback().\n [NET] linkwatch: Handle jiffies wrap-around\n [IRDA]: Switching to a workqueue for the SIR work\n [IRDA]: smsc-ircc: Minimal hotplug support.\n [IRDA]: Removing unused EXPORT_SYMBOLs\n [IRDA]: New maintainer.\n [NET]: Make netdev_chain a raw notifier.\n [IPV4]: ip_options_fragment() has no effect on fragmentation\n [NET]: Add missing operstates documentation.\n" }, { "commit": "6314410dd1e9db1c0009b0f7b56cc771a4d1e85a", "tree": "dafb5034fbeb54ee608eb0740aae561f35782880", "parents": [ "7fc5b1e3a170d865f625e609c087cf8d84fd285d", "d8e95e52a9db0e26b37f51ab5140b89da7c4b31e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Wed May 10 14:59:29 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Wed May 10 14:59:29 2006 -0700" }, "message": "Merge branch \u0027upstream\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/shemminger/netdev-2.6\n\n* \u0027upstream\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/shemminger/netdev-2.6:\n sis900: phy for FoxCon motherboard\n dl2k: use DMA_48BIT_MASK constant\n phy: mdiobus_register(): initialize all phy_map entries\n sky2: ifdown kills irq mask\n" }, { "commit": "4c1b46226ce4424a93b8ac544e37afb26c8a72c6", "tree": "9eae6412bdeebad107f190bc39f49df9957712f4", "parents": [ "64b1c2b42b555ef38c475d104f2faf3f6f93690d" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Wed May 10 12:48:57 2006 -0700" }, "committer": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Wed May 10 14:04:22 2006 -0700" }, "message": "dl2k: use DMA_48BIT_MASK constant\n\nTypo will be harder with this one.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nSigned-off-by: Stephen Hemminger \u003cshemminger@osdl.org\u003e\n" }, { "commit": "b17a7c179dd3ce7d04373fddf660eda21efc9db9", "tree": "9f141fc2919a0aab95237812f48fa3cd0a169806", "parents": [ "a50bb7b9af9a7c39b2aba15678eb686ae428718c" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Wed May 10 13:21:17 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 10 13:21:17 2006 -0700" }, "message": "[NET]: Do sysfs registration as part of register_netdevice.\n\nThe last step of netdevice registration was being done by a delayed\ncall, but because it was delayed, it was impossible to return any error\ncode if the class_device registration failed.\n\nSide effects:\n * one state in registration process is unnecessary.\n * register_netdevice can sleep inside class_device registration/hotplug\n * code in netdev_run_todo only does unregistration so it is simpler.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d324031245abbb54e4e0321004430826052b6c37", "tree": "23dda7055fce9675263fe992c3beda27f1161650", "parents": [ "6810b548b25114607e0814612d84125abccc0a4f" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Mon May 08 15:11:26 2006 -0700" }, "committer": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Mon May 08 16:00:23 2006 -0700" }, "message": "sky2: backout NAPI reschedule\n\nThis is a backout of earlier patch.\n\nThe whole rescheduling hack was a bad idea. It doesn\u0027t really solve\nthe problem and it makes the code more complicated for no good reason.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@osdl.org\u003e\n" }, { "commit": "fe9925b551a95fae6ec61470c79f8b701a2fe928", "tree": "3df1817dee3c804d155e3a1c52b6ff696bc60293", "parents": [ "1498221d51a43d5fa1a580618591497d90f957d9" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Sat May 06 17:56:03 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 06 17:56:03 2006 -0700" }, "message": "[NET]: Create netdev attribute_groups with class_device_add\n\nAtomically create attributes when class device is added. This avoids\nthe race between registering class_device (which generates hotplug\nevent), and the creation of attribute groups.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1498221d51a43d5fa1a580618591497d90f957d9", "tree": "20554a3fa474c9d09f649958b85b90a3de718477", "parents": [ "5528e568a760442e0ec8fd2dea1f0791875a066b" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Sat May 06 17:55:11 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 06 17:55:11 2006 -0700" }, "message": "[CLASS DEVICE]: add attribute_group creation\n\nExtend the support of attribute groups in class_device\u0027s to allow\ngroups to be created as part of the registration process. This allows\nnetwork device\u0027s to avoid race between registration and creating\ngroups.\n\nNote that unlike attributes that are a property of the class object,\nthe groups are a property of the class_device object. This is done\nbecause there are different types of network devices (wireless for\nexample).\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d98550e334715b2d9e45f8f0f4e1608720108640", "tree": "cd6a52960d479701cf6a29fd6535627481c5b27d", "parents": [ "f9cc8475e7595dbb41a9567f83288e2cd7445b6c", "d205819e2346d20fee41297ea6cf789c591abccf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Thu May 04 15:09:52 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Thu May 04 15:09:52 2006 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:\n [PATCH] powerpc: Use the ibm,pa-features property if available\n powerpc: Fix incorrect might_sleep in __get_user/__put_user on kernel addresses\n [PATCH] ppc32 CPM_UART: fixes and improvements\n [PATCH] ppc32 CPM_UART: Fixed break send on SCC\n [PATCH] powerpc/kprobes: fix singlestep out-of-line\n [PATCH] powerpc/pseries: avoid crash in PCI code if mem system not up\n" }, { "commit": "6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8", "tree": "e7e9dabd9d5bcf547946b3ae68e64ea68525e9d0", "parents": [ "cbdf811c77cf2906a099b8da92e9f6f335b68a73", "920e70c5c603ada05dd480ca0ccc0ae12a5fdc39" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Thu May 04 14:52:27 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Thu May 04 14:52:27 2006 -0700" }, "message": "Merge master.kernel.org:/home/rmk/linux-2.6-mmc\n\n* master.kernel.org:/home/rmk/linux-2.6-mmc:\n [MMC] Move set_ios debugging into mmc.c\n [MMC] Correct mmc_request_done comments\n [MMC] PXA: reduce the number of lines PXAMCI debug uses\n [MMC] PXA and i.MX: don\u0027t avoid sending stop command on error\n [MMC] extend data timeout for writes\n [ARM] 3485/1: i.MX: MX1 SD/MMC fix of unintentional double start possibility\n" }, { "commit": "cbdf811c77cf2906a099b8da92e9f6f335b68a73", "tree": "c4f96893936eddb31c60476ea4e776499d9046df", "parents": [ "936ef1d48ac9a9fc90746bacd93624969711775a", "98232d504db0a1f91ecaa93686ed3bf61963103b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Thu May 04 13:25:40 2006 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Thu May 04 13:25:40 2006 -0400" }, "message": "Merge branch \u0027splice\u0027 of git://brick.kernel.dk/data/git/linux-2.6-block\n\n* \u0027splice\u0027 of git://brick.kernel.dk/data/git/linux-2.6-block:\n [PATCH] compat_sys_vmsplice: one-off in UIO_MAXIOV check\n [PATCH] splice: redo page lookup if add_to_page_cache() returns -EEXIST\n [PATCH] splice: rename remaining info variables to pipe\n [PATCH] splice: LRU fixups\n [PATCH] splice: fix unlocking of page on error -\u003eprepare_write()\n" }, { "commit": "7582e9d17edbabab6cbe59467c5d1b5e8c04fca8", "tree": "ba48a25b3d885892e988302fe84eac477797b6d9", "parents": [ "2354feaeb2acb78f6aabdf8410d55b44492a7949" ], "author": { "name": "Jing Min Zhao", "email": "zhaojingmin@users.sourceforge.net", "time": "Wed May 03 23:19:59 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 03 23:19:59 2006 -0700" }, "message": "[NETFILTER]: H.323 helper: Change author\u0027s email address\n\nSigned-off-by: Jing Min Zhao \u003czhaojingmin@users.sourceforge.net\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1432873af7ae29d4bb3c56114c05b539d078ca62", "tree": "cf4f72608d2e10f7ff786b9d60067963f1ab4ca9", "parents": [ "bfc4ee39fdbb2deb8864785d5e5bc5cdd3b31a69" ], "author": { "name": "Jens Axboe", "email": "axboe@suse.de", "time": "Wed May 03 10:35:26 2006 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@nelson.home.kernel.dk", "time": "Thu May 04 06:55:12 2006 +0200" }, "message": "[PATCH] splice: LRU fixups\n\nNick says that the current construct isn\u0027t safe. This goes back to the\noriginal, but sets PIPE_BUF_FLAG_LRU on user pages as well as they all\nseem to be on the LRU in the first place.\n\nSigned-off-by: Jens Axboe \u003caxboe@suse.de\u003e\n" }, { "commit": "6e1976961c9bd9a3dc368139fab1883961efc879", "tree": "5fd5795260072c15be659349462abad4fe8ef7e3", "parents": [ "61f5657c50341198ff05e375e6f1fc0476556562" ], "author": { "name": "Vitaly Bordug", "email": "vbordug@ru.mvista.com", "time": "Sat Apr 29 23:06:00 2006 +0400" }, "committer": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Wed May 03 23:06:44 2006 +1000" }, "message": "[PATCH] ppc32 CPM_UART: fixes and improvements\n\nA number of small issues are fixed, and added the header file, missed from the\noriginal series. With this, driver should be pretty stable as tested among\nboth platform-device-driven and \"old way\" boards. Also added missing GPL\nstatement , and updated year field on existing ones to reflect\ncode update.\n\nSigned-off-by: Vitaly Bordug \u003cvbordug@ru.mvista.com\u003e\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\n" }, { "commit": "1fb5fef9b80d9a3b5368e22031627afd1585487b", "tree": "54f07a532b5b2622b8642156bbcaeca637fcdb8f", "parents": [ "1a2e8a6f8ec0a068911a882a19e0912a0c89be6e", "330ab71619bacc4d4494227a6cfc9b7f5500403d" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue May 02 14:33:57 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue May 02 14:33:57 2006 -0400" }, "message": "Merge branch \u0027master\u0027 into upstream\n" }, { "commit": "37be4e7809e0581db85387e126ae4da68c3d6286", "tree": "a3543202fa066bc930e09b9e36d32ab74fd38967", "parents": [ "81d38428df26377c91e7e193aa4d2fdfdcda300a" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Tue May 02 17:24:59 2006 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue May 02 17:24:59 2006 +0100" }, "message": "[MMC] extend data timeout for writes\n\nThe CSD contains a \"read2write factor\" which determines the multiplier to\nbe applied to the read timeout to obtain the write timeout. We were\nignoring this parameter, resulting in the possibility for writes being\ntimed out too early.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "330ab71619bacc4d4494227a6cfc9b7f5500403d", "tree": "43a9045011116f1afa506b80de1ede9872f45935", "parents": [ "a893b99be71f1d669b74f840e3a683dd077d007b" ], "author": { "name": "Jens Axboe", "email": "axboe@suse.de", "time": "Tue May 02 15:29:57 2006 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@suse.de", "time": "Tue May 02 15:29:57 2006 +0200" }, "message": "[PATCH] vmsplice: restrict stealing a little more\n\nApply the same rules as the anon pipe pages, only allow stealing\nif no one else is using the page.\n\nSigned-off-by: Jens Axboe \u003caxboe@suse.de\u003e\n" }, { "commit": "a893b99be71f1d669b74f840e3a683dd077d007b", "tree": "79591f70b57ef4504dc5c9584b7d8fcaa04faede", "parents": [ "7591489a8fbee83f19bacc75756989a6a4d0389c" ], "author": { "name": "Jens Axboe", "email": "axboe@suse.de", "time": "Tue May 02 15:03:27 2006 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@suse.de", "time": "Tue May 02 15:03:27 2006 +0200" }, "message": "[PATCH] splice: fix page LRU accounting\n\nCurrently we rely on the PIPE_BUF_FLAG_LRU flag being set correctly\nto know whether we need to fiddle with page LRU state after stealing it,\nhowever for some origins we just don\u0027t know if the page is on the LRU\nlist or not.\n\nSo remove PIPE_BUF_FLAG_LRU and do this check/add manually in pipe_to_file()\ninstead.\n\nSigned-off-by: Jens Axboe \u003caxboe@suse.de\u003e\n" }, { "commit": "532f57da408c5a5710075d17047e2d97bdfd22f3", "tree": "3fb378bea1816f637aeeed0df805d0c30969cfc3", "parents": [ "46c5ea3c9ae7fbc6e52a13c92e59d4fc7f4ca80a", "2ad312d2093ae506ae0fa184d8d026b559083087" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon May 01 21:43:05 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon May 01 21:43:05 2006 -0700" }, "message": "Merge branch \u0027audit.b10\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current\n\n* \u0027audit.b10\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:\n [PATCH] Audit Filter Performance\n [PATCH] Rework of IPC auditing\n [PATCH] More user space subject labels\n [PATCH] Reworked patch for labels on user space messages\n [PATCH] change lspp ipc auditing\n [PATCH] audit inode patch\n [PATCH] support for context based audit filtering, part 2\n [PATCH] support for context based audit filtering\n [PATCH] no need to wank with task_lock() and pinning task down in audit_syscall_exit()\n [PATCH] drop task argument of audit_syscall_{entry,exit}\n [PATCH] drop gfp_mask in audit_log_exit()\n [PATCH] move call of audit_free() into do_exit()\n [PATCH] sockaddr patch\n [PATCH] deal with deadlocks in audit_free()\n" }, { "commit": "46c5ea3c9ae7fbc6e52a13c92e59d4fc7f4ca80a", "tree": "4ab2c54a0b0d9621ed42c032cc67d93638c8681c", "parents": [ "9817d207dc13e3a9fc0287bbd36bdfa3cffe5ed4" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 02 05:12:22 2006 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon May 01 20:48:32 2006 -0700" }, "message": "[NETFILTER] x_tables: fix compat related crash on non-x86\n\nWhen iptables userspace adds an ipt_standard_target, it calculates the size\nof the entire entry as:\n\nsizeof(struct ipt_entry) + XT_ALIGN(sizeof(struct ipt_standard_target))\n\nipt_standard_target looks like this:\n\n struct xt_standard_target\n {\n struct xt_entry_target target;\n int verdict;\n };\n\nxt_entry_target contains a pointer, so when compiled for 64 bit the\nstructure gets an extra 4 byte of padding at the end. On 32 bit\narchitectures where iptables aligns to 8 byte it will also have 4\nbyte padding at the end because it is only 36 bytes large.\n\nThe compat_ipt_standard_fn in the kernel adjusts the offsets by\n\n sizeof(struct ipt_standard_target) - sizeof(struct compat_ipt_standard_target),\n\nwhich will always result in 4, even if the structure from userspace\nwas already padded to a multiple of 8. On x86 this works out by\naccident because userspace only aligns to 4, on all other\narchitectures this is broken and causes incorrect adjustments to\nthe size and following offsets.\n\nThanks to Linus for lots of debugging help and testing.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "9817d207dc13e3a9fc0287bbd36bdfa3cffe5ed4", "tree": "38f87e68f1cd36159fe5b9c03e9047b2fe374324", "parents": [ "cf105601df49ba0ea5ac04a6154c6c1442994c74", "7afa6fd037e51e95d322990cb127bb2b1217251a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon May 01 18:33:40 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon May 01 18:33:40 2006 -0700" }, "message": "Merge branch \u0027splice\u0027 of git://brick.kernel.dk/data/git/linux-2.6-block\n\n* \u0027splice\u0027 of git://brick.kernel.dk/data/git/linux-2.6-block:\n [PATCH] vmsplice: allow user to pass in gift pages\n [PATCH] pipe: enable atomic copying of pipe data to/from user space\n [PATCH] splice: call handle_ra_miss() on failure to lookup page\n [PATCH] Add -\u003esplice_read/splice_write to def_blk_fops\n [PATCH] pipe: introduce -\u003epin() buffer operation\n [PATCH] splice: fix bugs in pipe_to_file()\n [PATCH] splice: fix bugs with stealing regular pipe pages\n" }, { "commit": "7afa6fd037e51e95d322990cb127bb2b1217251a", "tree": "dbe4052947bff32a6ada378576b8d7669c581cf4", "parents": [ "f6762b7ad8edd6abc802542ce845d3bc8adcb92f" ], "author": { "name": "Jens Axboe", "email": "axboe@suse.de", "time": "Mon May 01 20:02:33 2006 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@suse.de", "time": "Mon May 01 20:02:33 2006 +0200" }, "message": "[PATCH] vmsplice: allow user to pass in gift pages\n\nIf SPLICE_F_GIFT is set, the user is basically giving this pages away to\nthe kernel. That means we can steal them for eg page cache uses instead\nof copying it.\n\nThe data must be properly page aligned and also a multiple of the page size\nin length.\n\nSigned-off-by: Jens Axboe \u003caxboe@suse.de\u003e\n" }, { "commit": "f6762b7ad8edd6abc802542ce845d3bc8adcb92f", "tree": "c941aaf7295f8efecaf42aa86112649b9b6f23a9", "parents": [ "e27dedd84c119e2f7af54fcde3293be5ad812103" ], "author": { "name": "Jens Axboe", "email": "axboe@suse.de", "time": "Mon May 01 20:02:05 2006 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@suse.de", "time": "Mon May 01 20:02:05 2006 +0200" }, "message": "[PATCH] pipe: enable atomic copying of pipe data to/from user space\n\nThe pipe -\u003emap() method uses kmap() to virtually map the pages, which\nis both slow and has known scalability issues on SMP. This patch enables\natomic copying of pipe pages, by pre-faulting data and using kmap_atomic()\ninstead.\n\nlmbench bw_pipe and lat_pipe measurements agree this is a Good Thing. Here\nare results from that on a UP machine with highmem (1.5GiB of RAM), running\nfirst a UP kernel, SMP kernel, and SMP kernel patched.\n\nVanilla-UP:\nPipe bandwidth: 1622.28 MB/sec\nPipe bandwidth: 1610.59 MB/sec\nPipe bandwidth: 1608.30 MB/sec\nPipe latency: 7.3275 microseconds\nPipe latency: 7.2995 microseconds\nPipe latency: 7.3097 microseconds\n\nVanilla-SMP:\nPipe bandwidth: 1382.19 MB/sec\nPipe bandwidth: 1317.27 MB/sec\nPipe bandwidth: 1355.61 MB/sec\nPipe latency: 9.6402 microseconds\nPipe latency: 9.6696 microseconds\nPipe latency: 9.6153 microseconds\n\nPatched-SMP:\nPipe bandwidth: 1578.70 MB/sec\nPipe bandwidth: 1579.95 MB/sec\nPipe bandwidth: 1578.63 MB/sec\nPipe latency: 9.1654 microseconds\nPipe latency: 9.2266 microseconds\nPipe latency: 9.1527 microseconds\n\nSigned-off-by: Jens Axboe \u003caxboe@suse.de\u003e\n" }, { "commit": "f84d751994441292593523c7069ed147176f6cab", "tree": "a1a0c4836289df86bb62e7eae5c80c66fca1643a", "parents": [ "0568b409c74f7a125d92a09a3f386785700ef688" ], "author": { "name": "Jens Axboe", "email": "axboe@suse.de", "time": "Mon May 01 19:59:03 2006 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@suse.de", "time": "Mon May 01 19:59:03 2006 +0200" }, "message": "[PATCH] pipe: introduce -\u003epin() buffer operation\n\nThe -\u003emap() function is really expensive on highmem machines right now,\nsince it has to use the slower kmap() instead of kmap_atomic(). Splice\nrarely needs to access the virtual address of a page, so it\u0027s a waste\nof time doing it.\n\nIntroduce -\u003epin() to take over the responsibility of making sure the\npage data is valid. -\u003emap() is then reduced to just kmap(). That way we\ncan also share a most of the pipe buffer ops between pipe.c and splice.c\n\nSigned-off-by: Jens Axboe \u003caxboe@suse.de\u003e\n" }, { "commit": "0568b409c74f7a125d92a09a3f386785700ef688", "tree": "79125b2f4755e98949f0d941a0092e5d3367bbff", "parents": [ "46e678c96bbd775abd05d3ddbe2fd334794f9157" ], "author": { "name": "Jens Axboe", "email": "axboe@suse.de", "time": "Mon May 01 19:50:48 2006 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@suse.de", "time": "Mon May 01 19:50:48 2006 +0200" }, "message": "[PATCH] splice: fix bugs in pipe_to_file()\n\nFound by Oleg Nesterov \u003coleg@tv-sign.ru\u003e, fixed by me.\n\n- Only allow full pages to go to the page cache.\n- Check page !\u003d buf-\u003epage instead of using PIPE_BUF_FLAG_STOLEN.\n- Remember to clear \u0027stolen\u0027 if add_to_page_cache() fails.\n\nAnd as a cleanup on that:\n\n- Make the bottom fall-through logic a little less convoluted. Also make\n the steal path hold an extra reference to the page, so we don\u0027t have\n to differentiate between stolen and non-stolen at the end.\n\nSigned-off-by: Jens Axboe \u003caxboe@suse.de\u003e\n" }, { "commit": "1f4a90670bacbf61f2fcc19a9e0e78748c932a25", "tree": "e3203c99f883439125892af1afefe95fe753ba09", "parents": [ "0d262424b07582a3aa3afa85af645bd436a94a39", "b276764091cf241cf0b31e8cb76c67dcf9a9c1d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon May 01 08:14:03 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon May 01 08:14:03 2006 -0700" }, "message": "Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\n* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:\n [TG3]: Update version and reldate\n [TG3]: Fix bug in nvram write\n [TG3]: Add reset_phy parameter to chip reset functions\n [TG3]: Reset chip when changing MAC address\n [TG3]: Add phy workaround\n [TG3]: Call netif_carrier_off() during phy reset\n [IPV6]: Fix race in route selection.\n [XFRM]: fix incorrect xfrm_policy_afinfo_lock use\n [XFRM]: fix incorrect xfrm_state_afinfo_lock use\n [TCP]: Fix unlikely usage in tcp_transmit_skb()\n [XFRM]: fix softirq-unsafe xfrm typemap-\u003elock use\n [IPSEC]: Fix IP ID selection\n [NET]: use hlist_unhashed()\n [IPV4]: inet_init() -\u003e fs_initcall\n [NETLINK]: cleanup unused macro in net/netlink/af_netlink.c\n [PKT_SCHED] netem: fix loss\n [X25]: fix for spinlock recurse and spinlock lockup with timer handler\n" }, { "commit": "073115d6b29c7910feaa08241c6484637f5ca958", "tree": "5fd32da9f54b3c12b65d3c0142fb9bdf87dc01c3", "parents": [ "ce29b682e228c70cdc91a1b2935c5adb2087bab8" ], "author": { "name": "Steve Grubb", "email": "sgrubb@redhat.com", "time": "Sun Apr 02 17:07:33 2006 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 01 06:10:04 2006 -0400" }, "message": "[PATCH] Rework of IPC auditing\n\n1) The audit_ipc_perms() function has been split into two different\nfunctions:\n - audit_ipc_obj()\n - audit_ipc_set_perm()\n\nThere\u0027s a key shift here... The audit_ipc_obj() collects the uid, gid,\nmode, and SElinux context label of the current ipc object. This\naudit_ipc_obj() hook is now found in several places. Most notably, it\nis hooked in ipcperms(), which is called in various places around the\nipc code permforming a MAC check. Additionally there are several places\nwhere *checkid() is used to validate that an operation is being\nperformed on a valid object while not necessarily having a nearby\nipcperms() call. In these locations, audit_ipc_obj() is called to\nensure that the information is captured by the audit system.\n\nThe audit_set_new_perm() function is called any time the permissions on\nthe ipc object changes. In this case, the NEW permissions are recorded\n(and note that an audit_ipc_obj() call exists just a few lines before\neach instance).\n\n2) Support for an AUDIT_IPC_SET_PERM audit message type. This allows\nfor separate auxiliary audit records for normal operations on an IPC\nobject and permissions changes. Note that the same struct\naudit_aux_data_ipcctl is used and populated, however there are separate\naudit_log_format statements based on the type of the message. Finally,\nthe AUDIT_IPC block of code in audit_free_aux() was extended to handle\naux messages of this new type. No more mem leaks I hope ;-)\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "ce29b682e228c70cdc91a1b2935c5adb2087bab8", "tree": "39e3e5b345748bec1c2d21962407689cdb1b7dab", "parents": [ "e7c3497013a7e5496ce3d5fd3c73b5cf5af7a56e" ], "author": { "name": "Steve Grubb", "email": "sgrubb@redhat.com", "time": "Sat Apr 01 18:29:34 2006 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 01 06:10:01 2006 -0400" }, "message": "[PATCH] More user space subject labels\n\nHi,\n\nThe patch below builds upon the patch sent earlier and adds subject label to\nall audit events generated via the netlink interface. It also cleans up a few\nother minor things.\n\nSigned-off-by: Steve Grubb \u003csgrubb@redhat.com\u003e\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "e7c3497013a7e5496ce3d5fd3c73b5cf5af7a56e", "tree": "2a57da5e958011b300256988e414387b1455660c", "parents": [ "9c7aa6aa74fa8a5cda36e54cbbe4fffe0214497d" ], "author": { "name": "Steve Grubb", "email": "sgrubb@redhat.com", "time": "Mon Apr 03 09:08:13 2006 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 01 06:09:58 2006 -0400" }, "message": "[PATCH] Reworked patch for labels on user space messages\n\nThe below patch should be applied after the inode and ipc sid patches.\nThis patch is a reworking of Tim\u0027s patch that has been updated to match\nthe inode and ipc patches since its similar.\n\n[updated:\n\u003e Stephen Smalley also wanted to change a variable from isec to tsec in the\n\u003e user sid patch. ]\n\nSigned-off-by: Steve Grubb \u003csgrubb@redhat.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "9c7aa6aa74fa8a5cda36e54cbbe4fffe0214497d", "tree": "1e1489ed5080ea4aff6206bfa904f549de8e56ca", "parents": [ "1b50eed9cac0e8e5e4d3a522d8aa267f7f8f8acb" ], "author": { "name": "Steve Grubb", "email": "sgrubb@redhat.com", "time": "Fri Mar 31 15:22:49 2006 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 01 06:09:56 2006 -0400" }, "message": "[PATCH] change lspp ipc auditing\n\nHi,\n\nThe patch below converts IPC auditing to collect sid\u0027s and convert to context\nstring only if it needs to output an audit record. This patch depends on the\ninode audit change patch already being applied.\n\nSigned-off-by: Steve Grubb \u003csgrubb@redhat.com\u003e\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "1b50eed9cac0e8e5e4d3a522d8aa267f7f8f8acb", "tree": "c66a1c3be846e34f1aac5db640b7ccb8770e8a80", "parents": [ "3dc7e3153eddfcf7ba8b50628775ba516e5f759f" ], "author": { "name": "Steve Grubb", "email": "sgrubb@redhat.com", "time": "Mon Apr 03 14:06:13 2006 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 01 06:09:53 2006 -0400" }, "message": "[PATCH] audit inode patch\n\nPreviously, we were gathering the context instead of the sid. Now in this patch,\nwe gather just the sid and convert to context only if an audit event is being\noutput.\n\nThis patch brings the performance hit from 146% down to 23%\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "376bd9cb357ec945ac893feaeb63af7370a6e70b", "tree": "7e2848792982dfe30e19a600a41fa5cb49ee6e6e", "parents": [ "97e94c453073a2aba4bb5e0825ddc5e923debf11" ], "author": { "name": "Darrel Goeddel", "email": "dgoeddel@trustedcs.com", "time": "Fri Feb 24 15:44:05 2006 -0600" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 01 06:06:24 2006 -0400" }, "message": "[PATCH] support for context based audit filtering\n\nThe following patch provides selinux interfaces that will allow the audit\nsystem to perform filtering based on the process context (user, role, type,\nsensitivity, and clearance). These interfaces will allow the selinux\nmodule to perform efficient matches based on lower level selinux constructs,\nrather than relying on context retrievals and string comparisons within\nthe audit module. It also allows for dominance checks on the mls portion\nof the contexts that are impossible with only string comparisons.\n\nSigned-off-by: Darrel Goeddel \u003cdgoeddel@trustedcs.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "5411be59db80333039386f3b1ccfe5eb9023a916", "tree": "77873af4b7557768c3c48b56e7ae4508be4a70a5", "parents": [ "e495149b173d8e133e1f6f2eb86fd97be7e92010" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 29 20:23:36 2006 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 01 06:06:18 2006 -0400" }, "message": "[PATCH] drop task argument of audit_syscall_{entry,exit}\n\n... it\u0027s always current, and that\u0027s a good thing - allows simpler locking.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" } ], "next": "68ac64cd3fd89fdaa091701f6ab98a9065e9b1b5" }