)]}' { "log": [ { "commit": "7cbca67c073263c179f605bdbbdc565ab29d801d", "tree": "124ce8c81f3e033790416d3d16bd23e2f7bfed07", "parents": [ "1d5d236d309ab90fa6aedf712f586b3595721373" ], "author": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Tue Mar 25 09:37:42 2008 +0900" }, "committer": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Tue Mar 25 10:24:01 2008 +0900" }, "message": "[IPV6]: Support Source Address Selection API (RFC5014).\n\nSigned-off-by: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\n" }, { "commit": "1d5d236d309ab90fa6aedf712f586b3595721373", "tree": "983a6d65f59e8e4151ffbc6b60cd6275a5ec5c1d", "parents": [ "6b75d0908185bf853b188afa6f269426f6554c5b" ], "author": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Mon Mar 10 10:56:55 2008 -0400" }, "committer": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Tue Mar 25 10:24:01 2008 +0900" }, "message": "[IPV6]: Use bitfields for hop_limit and mcast_hops.\n\nSave some bits for future extensions.\n\nSigned-off-by: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\n" }, { "commit": "4725474584d6aa2f07b3d47442dfbc4f6544f65e", "tree": "9b18781df63041ead3805c0a4d5eea1a847329d1", "parents": [ "c8cdaf998df221b01134a051aba38c570105061b" ], "author": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Mon Mar 10 04:41:33 2008 -0400" }, "committer": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Tue Mar 25 10:23:59 2008 +0900" }, "message": "[IPV6]: Convert cork.hop_limit and cork.tclass into u8 instead of int.\n\nValues of those fields are always between 0 and 255 (inclusive),\nso use u8 and save some memory on 32bit systems.\n\nSigned-off-by: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\n" }, { "commit": "c8cdaf998df221b01134a051aba38c570105061b", "tree": "1335a3a0b377621f1c38adbdade34abd6b621c94", "parents": [ "a9b05723ffa2e427b0257b81ea74363fcd7c304f" ], "author": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Mon Mar 10 04:30:37 2008 -0400" }, "committer": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Tue Mar 25 10:23:59 2008 +0900" }, "message": "[IPV4,IPV6]: Share cork.rt between IPv4 and IPv6.\n\nSigned-off-by: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\n" }, { "commit": "310afe86af8ddd96a06b75aa61ef1af233f80e89", "tree": "f0ce0387b079a69a6bfef396001389dacab41d35", "parents": [ "cc32e05416b4023a5466a2f66e3c02236a771c5b" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Mar 23 22:06:51 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 23 22:06:51 2008 -0700" }, "message": "[NET]: include/linux/udp.h - remove duplicate include\n\nRemove duplicate #include \u003clinux/types.h\u003e\nCombine #ifdef __KERNEL__ blocks\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cc32e05416b4023a5466a2f66e3c02236a771c5b", "tree": "8120aa4075ecde38ae9ce487c597aeab1f1e9d70", "parents": [ "414f69d8a6ff0b30e7ea5ce10534b19f851e172e" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Mar 23 22:05:44 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 23 22:05:44 2008 -0700" }, "message": "[NET]: include/linux/igmp.h - remove duplicate include\n\nRemoved duplicate #include \u003clinux/skbuff.h\u003e\t\nCombined #ifdef __KERNEL__ blocks\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "414f69d8a6ff0b30e7ea5ce10534b19f851e172e", "tree": "68571d884332019912b37036284e710bac4e5708", "parents": [ "7d164be8aa4392fe55474f4608547f2097e07c41" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Mar 23 22:04:31 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 23 22:04:31 2008 -0700" }, "message": "[NET]: include/linux/atalk.h - remove duplicate include\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "76fef2b6bffa13ad7ccd54c0493b053295721b9a", "tree": "f4509477d413398b7155fb3c35453ab26bd81bce", "parents": [ "817bc4db7794d6dc6594265ddea88d2b839cf2f8", "ef8500457b29eed13d03ff19af36d810308e57b7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 22 18:22:42 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 22 18:22:42 2008 -0700" }, "message": "Merge branch \u0027upstream-net26\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6\n\nConflicts:\n\n\tdrivers/s390/net/qeth_main.c\n" }, { "commit": "0098b7273e968fb9989a6e1e4e4c024cd081fe0d", "tree": "6169be4b1e74ef7b9cc19d72bd50ec6c77064411", "parents": [ "fc8717baa8f52dd8d1b90df9008300ef3ec794ed" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Sat Mar 22 17:18:47 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 22 17:18:47 2008 -0700" }, "message": "[NET]: NPROTO is redundant; it\u0027s equal to AF_MAX/PF_MAX.\n\nDaveM pointed out NPROTO exposed to userspace, so keep it around,\njust make sure it stays in sync.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ec3c0982a2dd1e671bad8e9d26c28dcba0039d87", "tree": "11a3cd7c530e4225a4c3d4c3f3cc54eb7d2e0e4f", "parents": [ "e4c78840284f3f51b1896cf3936d60a6033c4d2c" ], "author": { "name": "Patrick McManus", "email": "mcmanus@ducksong.com", "time": "Fri Mar 21 16:33:01 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 21 16:33:01 2008 -0700" }, "message": "[TCP]: TCP_DEFER_ACCEPT updates - process as established\n\nChange TCP_DEFER_ACCEPT implementation so that it transitions a\nconnection to ESTABLISHED after handshake is complete instead of\nleaving it in SYN-RECV until some data arrvies. Place connection in\naccept queue when first data packet arrives from slow path.\n\nBenefits:\n - established connection is now reset if it never makes it\n to the accept queue\n\n - diagnostic state of established matches with the packet traces\n showing completed handshake\n\n - TCP_DEFER_ACCEPT timeouts are expressed in seconds and can now be\n enforced with reasonable accuracy instead of rounding up to next\n exponential back-off of syn-ack retry.\n\nSigned-off-by: Patrick McManus \u003cmcmanus@ducksong.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "82cc1a7a56872056af0ead6c7d695aa223f36695", "tree": "0891cf854a40cac90fc4fec3bd6b5ecb213d4452", "parents": [ "a25606c845856e5ca5ed54d23cab077e3a49bf10" ], "author": { "name": "Peter P Waskiewicz Jr", "email": "peter.p.waskiewicz.jr@intel.com", "time": "Fri Mar 21 03:43:19 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 21 03:43:19 2008 -0700" }, "message": "[NET]: Add per-connection option to set max TSO frame size\n\nUpdate: My mailer ate one of Jarek\u0027s feedback mails... Fixed the\nparameter in netif_set_gso_max_size() to be u32, not u16. Fixed the\nwhitespace issue due to a patch import botch. Changed the types from\nu32 to unsigned int to be more consistent with other variables in the\narea. Also brought the patch up to the latest net-2.6.26 tree.\n\nUpdate: Made gso_max_size container 32 bits, not 16. Moved the\nlocation of gso_max_size within netdev to be less hotpath. Made more\nconsistent names between the sock and netdev layers, and added a\ndefine for the max GSO size.\n\nUpdate: Respun for net-2.6.26 tree.\n\nUpdate: changed max_gso_frame_size and sk_gso_max_size from signed to\nunsigned - thanks Stephen!\n\nThis patch adds the ability for device drivers to control the size of\nthe TSO frames being sent to them, per TCP connection. By setting the\nnetdevice\u0027s gso_max_size value, the socket layer will set the GSO\nframe size based on that value. This will propogate into the TCP\nlayer, and send TSO\u0027s of that size to the hardware.\n\nThis can be desirable to help tune the bursty nature of TSO on a\nper-adapter basis, where one may have 1 GbE and 10 GbE devices\ncoexisting in a system, one running multiqueue and the other not, etc.\n\nThis can also be desirable for devices that cannot support full 64 KB\nTSO\u0027s, but still want to benefit from some level of segmentation\noffloading.\n\nSigned-off-by: Peter P Waskiewicz Jr \u003cpeter.p.waskiewicz.jr@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "577f99c1d08cf9cbdafd4e858dd13ff04d855090", "tree": "0f726bbda9b18d311d4c95198bbd96cb7ac01db0", "parents": [ "26c0f03f6b77c513cb7bc37b73a06819bdbb791b", "2f633928cbba8a5858bb39b11e7219a41b0fbef5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 18 00:37:55 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 18 00:37:55 2008 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\n\tdrivers/net/wireless/rt2x00/rt2x00dev.c\n\tnet/8021q/vlan_dev.c\n" }, { "commit": "2f633928cbba8a5858bb39b11e7219a41b0fbef5", "tree": "9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22", "parents": [ "5e226e4d9016daee170699f8a4188a5505021756", "bde4f8fa8db2abd5ac9c542d76012d0fedab050f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 17 23:44:31 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 17 23:44:31 2008 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n" }, { "commit": "0ff9663c88ac5efdb5c8ac21c0bd7f993a4e3849", "tree": "b6eae1c0146d6b44143f6af715c4ec98d21abdc2", "parents": [ "27724426a9000086993a8107a11cff276c4bd4d4" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Mar 17 22:48:46 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 17 22:48:46 2008 -0700" }, "message": "[IPV4]: ipv4_is_lbcast() misannotations\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0382b9c35469be273ed10fa374496a924055a3c8", "tree": "a71ff964e57ab8308bca073505aacfd7a3b4a764", "parents": [ "e6f1cebf71c4e7aae7dfa43414ce2631291def9f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Mar 17 22:46:46 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 17 22:46:46 2008 -0700" }, "message": "[PKT_SCHED]: annotate cls_u32\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bde4f8fa8db2abd5ac9c542d76012d0fedab050f", "tree": "1be905db5b97da31358851aee538fa19ea6381c4", "parents": [ "84841384ec6ec57544b76e564514d3f9eb6c1901", "c40e7cb89f9d36924131ef708ff1f16a76611add" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 17 09:52:24 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 17 09:52:24 2008 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n ahci: Add Marvell 6121 SATA support\n pata_ali: use atapi_cmd_type() to determine cmd type instead of transfer size\n ahci: implement skip_host_reset parameter\n ahci: request all PCI BARs\n devres: implement pcim_iomap_regions_request_all()\n libata-acpi: improve dock event handling\n" }, { "commit": "916fbfb7ae5f8c8f86399794d89e6d273df8826b", "tree": "0b3982923e2b4114b83f67cfca9b950004caef9c", "parents": [ "233f112042d0b50170212dbff99c3b34b8773cd3" ], "author": { "name": "Tejun Heo", "email": "htejun@gmail.com", "time": "Wed Mar 12 15:26:34 2008 +0900" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Mar 17 08:26:44 2008 -0400" }, "message": "devres: implement pcim_iomap_regions_request_all()\n\nSome drivers need to reserve all PCI BARs to prevent other drivers\nmisusing unoccupied BARs. pcim_iomap_regions_request_all() requests\nall BARs and iomap specified BARs.\n\nSigned-off-by: Tejun Heo \u003chtejun@gmail.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Jeff Garzik \u003cjeff@garzik.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "4265f161b6bb7b31163671329b1142b9023bf4e3", "tree": "1494768aaf38407ca8f1336f6ae80301b27135bb", "parents": [ "da74e89d40995600b3b07ac500084920247687ce" ], "author": { "name": "Christian Borntraeger", "email": "borntraeger@de.ibm.com", "time": "Fri Mar 14 14:17:05 2008 +0100" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Mar 17 22:58:21 2008 +1100" }, "message": "virtio: fix race in enable_cb\n\nThere is a race in virtio_net, dealing with disabling/enabling the callback.\nI saw the following oops:\n\nkernel BUG at /space/kvm/drivers/virtio/virtio_ring.c:218!\nillegal operation: 0001 [#1] SMP\nModules linked in: sunrpc dm_mod\nCPU: 2 Not tainted 2.6.25-rc1zlive-host-10623-gd358142-dirty #99\nProcess swapper (pid: 0, task: 000000000f85a610, ksp: 000000000f873c60)\nKrnl PSW : 0404300180000000 00000000002b81a6 (vring_disable_cb+0x16/0x20)\n R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:0 CC:3 PM:0 EA:3\nKrnl GPRS: 0000000000000001 0000000000000001 0000000010005800 0000000000000001\n 000000000f3a0900 000000000f85a610 0000000000000000 0000000000000000\n 0000000000000000 000000000f870000 0000000000000000 0000000000001237\n 000000000f3a0920 000000000010ff74 00000000002846f6 000000000fa0bcd8\nKrnl Code: 00000000002b819a: a7110001 tmll %r1,1\n 00000000002b819e: a7840004 brc 8,2b81a6\n 00000000002b81a2: a7f40001 brc 15,2b81a4\n \u003e00000000002b81a6: a51b0001 oill %r1,1\n 00000000002b81aa: 40102000 sth %r1,0(%r2)\n 00000000002b81ae: 07fe bcr 15,%r14\n 00000000002b81b0: eb7ff0380024 stmg %r7,%r15,56(%r15)\n 00000000002b81b6: a7f13e00 tmll %r15,15872\nCall Trace:\n([\u003c000000000fa0bcd0\u003e] 0xfa0bcd0)\n [\u003c00000000002b8350\u003e] vring_interrupt+0x5c/0x6c\n [\u003c000000000010ab08\u003e] do_extint+0xb8/0xf0\n [\u003c0000000000110716\u003e] ext_no_vtime+0x16/0x1a\n [\u003c0000000000107e72\u003e] cpu_idle+0x1c2/0x1e0\n\nThe problem can be triggered with a high amount of host-\u003eguest traffic.\nI think its the following race:\n\npoll says netif_rx_complete\npoll calls enable_cb\nenable_cb opens the interrupt mask\na new packet comes, an interrupt is triggered----\\\nenable_cb sees that there is more work |\nenable_cb disables the interrupt |\n . V\n . interrupt is delivered\n . skb_recv_done does atomic napi test, ok\n some waiting disable_cb is called-\u003echeck fails-\u003ebang!\n .\npoll would do napi check\npoll would do disable_cb\n\nThe fix is to let enable_cb not disable the interrupt again, but expect the\ncaller to do the cleanup if it returns false. In that case, the interrupt is\nonly disabled, if the napi test_set_bit was successful.\n\nSigned-off-by: Christian Borntraeger \u003cborntraeger@de.ibm.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e (cleaned up doco)\n" }, { "commit": "3e94794355724f77dc6cbb5ad956f7c72d8313a4", "tree": "9a8bf2a3c2ead985b9f386fb196db0918da48270", "parents": [ "cfdfa86536d2fbc8102780ec15faea185e957d3d" ], "author": { "name": "Magnus Damm", "email": "magnus.damm@gmail.com", "time": "Fri Feb 22 19:55:15 2008 +0900" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Mar 17 07:49:27 2008 -0400" }, "message": "smc91x: introduce platform data flags V2\n\nThis patch introduces struct smc91x_platdata and modifies the driver so\nbus width is checked during run time using SMC_nBIT() instead of\nSMC_CAN_USE_nBIT.\n\nV2 keeps static configuration lean using SMC_DYNAMIC_BUS_CONFIG.\n\nSigned-off-by: Magnus Damm \u003cdamm@igel.co.jp\u003e\nAcked-by: Nicolas Pitre \u003cnico@cam.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "9b89ca7a3847c0d5b1e86e83f4860a866f28a89b", "tree": "48b3614f3a4d9915d52248d5d505699153817405", "parents": [ "dba92d3bc49c036056a48661d2d8fefe4c78375a" ], "author": { "name": "Marc Dionne", "email": "marc.c.dionne@gmail.com", "time": "Fri Mar 14 13:11:29 2008 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 14 09:49:57 2008 -0700" }, "message": "struct export_operations: adjust comments to match current members\n\nThe comments in the definition of struct export_operations don\u0027t match the\ncurrent members.\n\nAdd a comment for the 2 new functions and remove 2 comments for unused ones.\n\nSigned-off-by: Marc Dionne \u003cmarc.c.dionne@gmail.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e7ec2e3230633a858af1b0b359f6c4670dbeb997", "tree": "c43dbd7f6cab0ac066c039697528312d802617ef", "parents": [ "068edceb7e73c05f77e204442ea8f86e238575da" ], "author": { "name": "Michael Buesch", "email": "mb@bu3sch.de", "time": "Mon Mar 10 17:26:32 2008 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Mar 13 19:32:32 2008 -0400" }, "message": "ssb: Add SPROM/invariants support for PCMCIA devices\n\nThis adds support for reading/writing the SPROM invariants\nfor PCMCIA based devices.\n\nSigned-off-by: Michael Buesch \u003cmb@bu3sch.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "cc74d96f47b0d916840f92092595e3be9731e047", "tree": "0fa90374b3c0620a2028e7aa7ec28e40c4283039", "parents": [ "93d74463d018ddf05c169ad399e62e90e0f82fc0" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Mar 12 21:48:03 2008 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Mar 13 10:21:09 2008 -0700" }, "message": "PCI: fix issue with busses registering multiple times in sysfs\n\nPCI busses can be registered multiple times, so we need to detect if we\nhave registered our bus structure in sysfs already. If so, don\u0027t do it\nagain.\n\nThanks to Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e for reporting\nthe problem, and to Linus for poking me to get me to believe that it was\na real problem.\n\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "c463be3520065ef8c05e3cbdf946c69604e91ceb", "tree": "08b8e881a92ac116ef1182e0e6127a0fcd2d0739", "parents": [ "609eb39c8d8a8d2930780428f6cbe2f63eb84734", "31bf111944e31b64a7b692f9d660f71c5ff3d419" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 12 17:00:35 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 12 17:00:35 2008 -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: (22 commits)\n [POWERPC] Fix large hash table allocation on Cell blades\n [POWERPC] Export empty_zero_page\n [POWERPC] Fix viodasd driver with scatterlist debug\n [POWERPC] Fix arch/powerpc/platforms/powermac/pic.c when !CONFIG_ADB_PMU\n [POWERPC] Fix drivers/macintosh/mediabay.c when !CONFIG_ADB_PMU\n [POWERPC] Fix undefined pmu_sys_suspended compilation error\n [POWERPC] Fix build of modular drivers/macintosh/apm_emu.c\n [POWERPC] Fix sleep on some powerbooks\n [POWERPC] Fix bogus test for unassigned PCI resources\n [POWERPC] Fix zImage-dtb.initrd build error\n [POWERPC] Add __ucmpdi2 for 64-bit comparisons in 32-bit kernels\n [POWERPC] spufs: fix rescheduling of non-runnable contexts\n [POWERPC] spufs: don\u0027t (ab)use SCHED_IDLE\n [POWERPC] QE: Make qe_get_firmware_info reentrant\n [POWERPC] 83xx: Make 83xx perfmon support selectable\n [PPC] 8xx: swap bug-fix\n [POWERPC] 85xx: sbc8548 - Fix incorrect PCI-X and PCI interrupt map\n [POWERPC] QE: Fix QE firmware uploading limit\n [POWERPC] 8xx: Fix wrapper platform for adder875, and combine defconfigs.\n [POWERPC] 8xx: fix swap\n ...\n" }, { "commit": "a99d9a6ebdf8328d5c61ca9f1038f4815e25720e", "tree": "1c33016cd5c5d7c8a2443fc0124c876539182cdb", "parents": [ "07c941d00087581c9553661c2c4fb593da37f525" ], "author": { "name": "Tony Breeds", "email": "tony@bakeyournoodle.com", "time": "Wed Mar 12 10:48:48 2008 +1100" }, "committer": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Thu Mar 13 10:09:27 2008 +1100" }, "message": "[POWERPC] Fix drivers/macintosh/mediabay.c when !CONFIG_ADB_PMU\n\nWhen building drivers/macintosh/mediabay.c if CONFIG_ADB_PMU isn\u0027t\ndefined we get:\n\ndrivers/built-in.o: In function `media_bay_step\u0027:\nmediabay.c:(.text+0x92b84): undefined reference to `pmu_suspend\u0027\nmediabay.c:(.text+0x92c08): undefined reference to `pmu_resume\u0027\n\nCreate empty place holders in that scenario.\n\nSigned-off-by: Tony Breeds \u003ctony@bakeyournoodle.com\u003e\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\n" }, { "commit": "07c941d00087581c9553661c2c4fb593da37f525", "tree": "cf42b46916b39b02d31d2013b9d57eb38762d574", "parents": [ "620a245978d007279bc5c7c64e15f5f63af9af98" ], "author": { "name": "Tony Breeds", "email": "tony@bakeyournoodle.com", "time": "Wed Mar 12 10:48:48 2008 +1100" }, "committer": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Thu Mar 13 10:09:27 2008 +1100" }, "message": "[POWERPC] Fix undefined pmu_sys_suspended compilation error\n\npmu_sys_suspended is declared extern when:\n\tdefined(CONFIG_PM_SLEEP) \u0026\u0026 defined(CONFIG_PPC32)\nbut only defined when:\n\tdefined(CONFIG_SUSPEND) \u0026\u0026 defined(CONFIG_PPC32)\nwhich is wrong. Let\u0027s fix that.\n\nSigned-off-by: Tony Breeds \u003ctony@bakeyournoodle.com\u003e\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\n" }, { "commit": "609eb39c8d8a8d2930780428f6cbe2f63eb84734", "tree": "0cf74a0e6e64531b31c5a1c9d45fbcb88f5e4d1f", "parents": [ "123d43acd2e55cd7db792d17c7e906db42cada42", "22626216c46f2ec86287e75ea86dd9ac3df54265" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 12 13:08:09 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 12 13:08:09 2008 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits)\n [SCTP]: Fix local_addr deletions during list traversals.\n net: fix build with CONFIG_NET\u003dn\n [TCP]: Prevent sending past receiver window with TSO (at last skb)\n rt2x00: Add new D-Link USB ID\n rt2x00: never disable multicast because it disables broadcast too\n libertas: fix the \u0027compare command with itself\u0027 properly\n drivers/net/Kconfig: fix whitespace for GELIC_WIRELESS entry\n [NETFILTER]: nf_queue: don\u0027t return error when unregistering a non-existant handler\n [NETFILTER]: nfnetlink_queue: fix EPERM when binding/unbinding and instance 0 exists\n [NETFILTER]: nfnetlink_log: fix EPERM when binding/unbinding and instance 0 exists\n [NETFILTER]: nf_conntrack: replace horrible hack with ksize()\n [NETFILTER]: nf_conntrack: add \\n to \"expectation table full\" message\n [NETFILTER]: xt_time: fix failure to match on Sundays\n [NETFILTER]: nfnetlink_log: fix computation of netlink skb size\n [NETFILTER]: nfnetlink_queue: fix computation of allocated size for netlink skb.\n [NETFILTER]: nfnetlink: fix ifdef in nfnetlink_compat.h\n [NET]: include \u003clinux/types.h\u003e into linux/ethtool.h for __u* typedef\n [NET]: Make /proc/net a symlink on /proc/self/net (v3)\n RxRPC: fix rxrpc_recvmsg()\u0027s returning of msg_name\n net/enc28j60: oops fix\n ...\n" }, { "commit": "a8ae50ba9336ff77d0df0943ac27b79ba0a5a521", "tree": "4a8c8ea37b2c3011b553b540afe66373ebf16e2b", "parents": [ "0738c4bb8f2a8bf15178f852494643b0981f578b" ], "author": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Wed Mar 12 17:52:56 2008 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 12 12:34:37 2008 -0700" }, "message": "Remove \u003clinux/genhd.h\u003e from user-visible headers.\n\nIt was all wrapped in \u0027#ifdef CONFIG_BLOCK\u0027 anyway, so userspace was\ngetting nothing useful out of it. And the special #ifndef __KERNEL__\nversion of \u0027struct partition\u0027 makes me inclined to promote an attitude\nof violence...\n\nStick some comments on some of the #endifs too, while we\u0027re at it.\n\nSigned-off-by: David Woodhouse \u003cdwmw2@infradead.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0738c4bb8f2a8bf15178f852494643b0981f578b", "tree": "929e985eb01594298dab4c1278d3aec9b0ec4c18", "parents": [ "baadac8b10c5ac15ce3d26b68fa266c8889b163f" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Wed Mar 12 16:51:31 2008 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 12 12:34:37 2008 -0700" }, "message": "nommu: Provide is_vmalloc_addr() stub.\n\nIntroduced in commit-id 9e2779fa281cfda13ac060753d674bbcaa23367e and\nifdef\u0027ed out for nommu in 8ca3ed87db062201e1fa15b64a9214e193fc3a8a, both\napproaches end up breaking the nommu build in different ways. An\nimpressive feat for a 2-liner.\n\nCurrent is_vmalloc_addr() users fall in to two camps:\n\n\t- Determining whether to use vfree()/kfree()\n\t- Whether to do vmlist traversal (only /proc/kcore).\n\nSince we don\u0027t support /proc/kcore on nommu, that leaves the\nvfree()/kfree() determination use cases. nommu vfree() happens to be a\nwrapper to kfree() anyways, so is_vmalloc_addr() can always return 0\nand end up with the right behaviour.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ba73d4c84a7344f1b5635c2b4e96796e8c13a126", "tree": "d4a3e2cfc5f3a046a2b9baa898f0c201c75ba898", "parents": [ "b8ad0cbc58f703972e9e37c4e2a8081dd7e6a551", "deedf504302ff747985db081352e045ff7087a11" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 11 19:17:18 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 11 19:17:18 2008 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.26\n" }, { "commit": "2b752acd91ecee926483b5f64a8f8bfe06e081fb", "tree": "8cc17b38613bc75ecd18fdb4cd345a20b1644924", "parents": [ "f5dbb55b995b77d396fe2204495a0af3e24d28c2", "15c4a4e2f1337a442fe6c66266a8829afc8ff96f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Mon Mar 10 18:45:23 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Mon Mar 10 18:45:23 2008 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:\n USB:Update mailing list information in documentation\n USB: fix ehci unlink regressions\n USB: new ftdi_sio device id\n USB: Remove __KERNEL__ check from non-exported gadget.h.\n USB: g_printer.h does not need to be \"unifdef\"ed.\n USB: fsl_usb2_udc: fix broken Kconfig\n USB: option: add novatel device ids\n USB: usbaudio: handle kcalloc failure\n USB: cypress_m8: add UPS Powercom (0d9f:0002)\n USB: drivers/usb/storage/sddr55.c: fix uninitialized var warnings\n USB: fix usb-serial generic recursive lock\n" }, { "commit": "ee215ca3b21dd73bec95dcaaa8c89e64cff6cbf8", "tree": "8e557460f0cf557d26d5f59991ebffc3402b10e9", "parents": [ "aeb24d2fb08653a39abb50281b1ffa2d2a6879ab", "e88a0c2ca81207a75afe5bbb8020541dabf606ac" ], "author": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Mon Mar 10 18:04:00 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Mon Mar 10 18:04:00 2008 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:\n drivers: fix dma_get_required_mask\n firmware: provide stubs for the FW_LOADER\u003dn case\n nozomi: fix initialization and early flow control access\n sysdev: fix problem with sysdev_class being re-registered\n" }, { "commit": "60fdd931d577fcca351930fda4cde26ce07d35af", "tree": "f22c0ecfd9074fd1c9cb67273490d7e2702435a1", "parents": [ "593672582e71a688cf8c3fc1c59ec7c44d3799e5" ], "author": { "name": "Alex Dubov", "email": "oakad@yahoo.com", "time": "Mon Mar 10 11:43:43 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Mon Mar 10 18:01:19 2008 -0700" }, "message": "memstick: add support for JMicron jmb38x MemoryStick host controller\n\nSigned-off-by: Alex Dubov \u003coakad@yahoo.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "92b22d935fed1e4d88b9b6f9a674ab2a4272ee78", "tree": "021bfaaf98ce4af76c6761142fe6bcf3621fbd01", "parents": [ "2a4f2568c22a381d7568314052c1dd40f6d3680a" ], "author": { "name": "Alex Dubov", "email": "oakad@yahoo.com", "time": "Mon Mar 10 11:43:40 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Mon Mar 10 18:01:18 2008 -0700" }, "message": "tifm: fix the MemoryStick host fifo handling code\n\nAdditional input received from JMicron on MemoryStick host interfaces showed\nthat some assumtions in fifo handling code were incorrect. This patch also\nfixes data corruption used to occure during PIO transfers.\n\nSigned-off-by: Alex Dubov \u003coakad@yahoo.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d114ad54ffb020dc781b6159c1c2f391c6ec418f", "tree": "fbb4d6c263583bf3ec5de167124fd87cd28c2914", "parents": [ "e1f19995f55294fbb00ea22ba85d7b0d80ba3813" ], "author": { "name": "Alex Dubov", "email": "oakad@yahoo.com", "time": "Mon Mar 10 11:43:38 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Mon Mar 10 18:01:18 2008 -0700" }, "message": "memstick: add memstick_suspend/resume_host methods\n\nBus driver may need to be informed that host is being suspended/resumed.\n\nSigned-off-by: Alex Dubov \u003coakad@yahoo.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e1f19995f55294fbb00ea22ba85d7b0d80ba3813", "tree": "0369d9e9a142000964d3204cb128c826986c94af", "parents": [ "b614ce8b3c697947d75685f0b9f2059307dde715" ], "author": { "name": "Alex Dubov", "email": "oakad@yahoo.com", "time": "Mon Mar 10 11:43:37 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Mon Mar 10 18:01:18 2008 -0700" }, "message": "memstick: introduce correct definitions in the header\n\nThanks to some input from kind people at JMicron it is now possible to have\nmore correct definitions of protocol structures and bit field semantics.\n\nSigned-off-by: Alex Dubov \u003coakad@yahoo.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9f9351bbe34a9b12966b1fb6f7c21cfe128340c1", "tree": "b2ec103365f0b553c17f2ec240ae62f147081d36", "parents": [ "f4299e1943d0c9ce29a6c5dc7c7674a82a17b315" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Mon Mar 10 11:43:34 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Mon Mar 10 18:01:17 2008 -0700" }, "message": "rename DECLARE_PCI_DEVICE_TABLE to DEFINE_PCI_DEVICE_TABLE\n\nThis macro is used to define tables, not to declare them.\n\nCc: Greg KH \u003cgreg@kroah.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "20f590df4fbb962d1f8fcb12c4b4e790c7054045", "tree": "bfd1dbf8c5df7f1af409fd83948f840d8d260107", "parents": [ "e61062587d0484c3852e822e844416c728362438" ], "author": { "name": "Robert P. J. Day", "email": "rpjday@crashcourse.ca", "time": "Fri Mar 07 11:40:07 2008 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Mar 10 16:42:26 2008 -0700" }, "message": "USB: Remove __KERNEL__ check from non-exported gadget.h.\n\nSince the header file gadget.h isn\u0027t being exported to userspace,\nthere seems to be little point having a __KERNEL__ proprocessor check.\n\nSigned-off-by: Robert P. J. Day \u003crpjday@crashcourse.ca\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "e61062587d0484c3852e822e844416c728362438", "tree": "bcf3c3323d6469a4be17e343e2c24101a3434ab2", "parents": [ "33635efafef6994891496c266dc9f48c2987ec96" ], "author": { "name": "Robert P. J. Day", "email": "rpjday@crashcourse.ca", "time": "Fri Mar 07 11:02:00 2008 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Mar 10 16:42:26 2008 -0700" }, "message": "USB: g_printer.h does not need to be \"unifdef\"ed.\n\nSince the header file g_printer.h doesn\u0027t depend on __KERNEL__,\nthere\u0027s no need to unifdef it in the Kbuild file.\n\nSigned-off-by: Robert P. J. Day \u003crpjday@crashcourse.ca\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "b5e85dee2a5433246d5b7488918a1a0ad22c046a", "tree": "8fec53615252e64608a74044b97df2d7e15cc49c", "parents": [ "e621e69137b24fdbbe7ad28214e8d81e614c25b7" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Mar 10 16:41:06 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 10 16:41:06 2008 -0700" }, "message": "[NETFILTER]: nfnetlink: fix ifdef in nfnetlink_compat.h\n\nUse __KERNEL__ instead of __KERNEL to make sure the headers are not\nusable by the kernel.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fbab976d7ce4556d4212d554f766dae461d22e16", "tree": "31328b2b8ced734069c577f6ad6a98ce561af270", "parents": [ "661b4e89daf10e3f65a1086fd95c7a84720ccdd2" ], "author": { "name": "James Bottomley", "email": "James.Bottomley@HansenPartnership.com", "time": "Fri Mar 07 08:57:54 2008 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Mar 10 16:33:33 2008 -0700" }, "message": "firmware: provide stubs for the FW_LOADER\u003dn case\n\nlibsas has a case where it uses the firmware loader to provide services,\nbut doesn\u0027t want to select it all the time. This currently causes a\ncompile failure in libsas if FW_LOADER\u003dn. Fix this by providing error\nstubs for the firmware loader API in the FW_LOADER\u003dn case.\n\nSigned-off-by: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nCc: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "10a398d04c4a1fc395840f4d040493375f562302", "tree": "02096fe81b70e2baf8db35ebc9d303a1b13029c3", "parents": [ "a79017660ea4597ec489fab3b5aaf71dd776dfc7" ], "author": { "name": "Roman Zippel", "email": "zippel@linux-m68k.org", "time": "Tue Mar 04 15:14:26 2008 -0800" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sun Mar 09 08:42:57 2008 +0100" }, "message": "time: remove obsolete CLOCK_TICK_ADJUST\n\nThe first version of the ntp_interval/tick_length inconsistent usage patch was\nrecently merged as bbe4d18ac2e058c56adb0cd71f49d9ed3216a405\n\nhttp://git.kernel.org/gitweb.cgi?p\u003dlinux/kernel/git/torvalds/linux-2.6.git;a\u003dcommit;h\u003dbbe4d18ac2e058c56adb0cd71f49d9ed3216a405\n\nWhile the fix did greatly improve the situation, it was correctly pointed out\nby Roman that it does have a small bug: If the users change clocksources after\nthe system has been running and NTP has made corrections, the correctoins made\nagainst the old clocksource will be applied against the new clocksource,\ncausing error.\n\nThe second attempt, which corrects the issue in the NTP_INTERVAL_LENGTH\ndefinition has also made it up-stream as commit\ne13a2e61dd5152f5499d2003470acf9c838eab84\n\nhttp://git.kernel.org/gitweb.cgi?p\u003dlinux/kernel/git/torvalds/linux-2.6.git;a\u003dcommit;h\u003de13a2e61dd5152f5499d2003470acf9c838eab84\n\nRoman has correctly pointed out that CLOCK_TICK_ADJUST is calculated\nbased on the PIT\u0027s frequency, and isn\u0027t really relevant to non-PIT\ndriven clocksources (that is, clocksources other then jiffies and pit).\n\nThis patch reverts both of those changes, and simply removes\nCLOCK_TICK_ADJUST.\n\nThis does remove the granularity error correction for users of PIT and Jiffies\nclocksource users, but the granularity error but for the majority of users, it\nshould be within the 500ppm range NTP can accommodate for.\n\nFor systems that have granularity errors greater then 500ppm, the\n\"ntp_tick_adj\u003d\" boot option can be used to compensate.\n\n[johnstul@us.ibm.com: provided changelog]\n[mattilinnanvuori@yahoo.com: maek ntp_tick_adj static]\nSigned-off-by: Roman Zippel \u003czippel@linux-m68k.org\u003e\nAcked-by: john stultz \u003cjohnstul@us.ibm.com\u003e\nSigned-off-by: Matti Linnanvuori \u003cmattilinnanvuori@yahoo.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: mingo@elte.hu\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "38332cb98772f5ea757e6486bed7ed0381cb5f98", "tree": "5690b915ed9e9a64e67520df70329081900dca85", "parents": [ "e48af19f56eb47a1f908ee8f16df9d246f955b21" ], "author": { "name": "Segher Boessenkool", "email": "segher@kernel.crashing.org", "time": "Tue Mar 04 14:59:54 2008 -0800" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sun Mar 09 08:42:57 2008 +0100" }, "message": "time: prevent the loop in timespec_add_ns() from being optimised away\n\nSince some architectures don\u0027t support __udivdi3().\n\nSigned-off-by: Segher Boessenkool \u003csegher@kernel.crashing.org\u003e\nCc: john stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "bb799dcadd60796ab13d32a698d92bfb92ce0d5c", "tree": "fb696ba0dccecfb5370856c3322e78f0c2cf5f48", "parents": [ "bb641ab496d5b8eb835ae1933926fdf23feb5260", "989a7241df87526bfef0396567e71ebe53a84ae4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Fri Mar 07 13:49:32 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Fri Mar 07 13:49:32 2008 -0800" }, "message": "Merge branch \u0027slab-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm\n\n* \u0027slab-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm:\n slub: fix typo in Documentation/vm/slub.txt\n slab: NUMA slab allocator migration bugfix\n slub: Do not cross cacheline boundaries for very small objects\n slab - use angle brackets for include of kmalloc_sizes.h\n slab numa fallback logic: Do not pass unfiltered flags to page allocator\n slub statistics: Fix check for DEACTIVATE_REMOTE_FREES\n" }, { "commit": "4c1aa6f8b9686ddc7221f0f3b63f9b7dd1467543", "tree": "8774d2a82e5a3682e863eb9e1ae34fd7aed8ac94", "parents": [ "5d49c101a126808a38f2a1f4eedc1fd28233e37f", "4e99a1ff3410c627a428d5ddb6cd2e7bc908a486" ], "author": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Fri Mar 07 12:08:07 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Fri Mar 07 12:08:07 2008 -0800" }, "message": "Merge branch \u0027hotfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027hotfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n NFS: Fix dentry revalidation for NFSv4 referrals and mountpoint crossings\n NFS: Fix the fsid revalidation in nfs_update_inode()\n SUNRPC: Fix a nfs4 over rdma transport oops\n NFS: Fix an f_mode/f_flags confusion in fs/nfs/write.c\n" }, { "commit": "c37dcd334c0b0a46a90cfa13b9f69e2aaa89bc09", "tree": "0792bbc64fff676c76a696a76a9f703cd9500145", "parents": [ "ee1a2c564f67407947e89f1dac75ac0af0ba88c7" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 06 12:34:50 2008 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 07 14:35:37 2008 -0500" }, "message": "NFS: Fix the fsid revalidation in nfs_update_inode()\n\nWhen we detect that we\u0027ve crossed a mountpoint on the remote server, we\nmust take care not to use that inode to revalidate the fsid on our\ncurrent superblock. To do so, we label the inode as a remote mountpoint,\nand check for that in nfs_update_inode().\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "e621e69137b24fdbbe7ad28214e8d81e614c25b7", "tree": "6dce8c388746a8938019c99b49fef1eaf64c8968", "parents": [ "e9720acd728a46cb40daa52c99a979f7c4ff195c" ], "author": { "name": "Kirill A. Shutemov", "email": "k.shutemov@gmail.com", "time": "Fri Mar 07 11:11:13 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 07 11:11:13 2008 -0800" }, "message": "[NET]: include \u003clinux/types.h\u003e into linux/ethtool.h for __u* typedef\n\nSigned-off-by: Kirill A. Shutemov \u003ck.shutemov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e9720acd728a46cb40daa52c99a979f7c4ff195c", "tree": "01380f601384cf93f30dedb64afe80359fecb807", "parents": [ "1ff82fe0024e8070c38346b8abc1ff09612dea4c" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@openvz.org", "time": "Fri Mar 07 11:08:40 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 07 11:08:40 2008 -0800" }, "message": "[NET]: Make /proc/net a symlink on /proc/self/net (v3)\n\nCurrent /proc/net is done with so called \"shadows\", but current\nimplementation is broken and has little chances to get fixed.\n\nThe problem is that dentries subtree of /proc/net directory has\nfancy revalidation rules to make processes living in different\nnet namespaces see different entries in /proc/net subtree, but\ncurrently, tasks see in the /proc/net subdir the contents of any\nother namespace, depending on who opened the file first.\n\nThe proposed fix is to turn /proc/net into a symlink, which points\nto /proc/self/net, which in turn shows what previously was in\n/proc/net - the network-related info, from the net namespace the\nappropriate task lives in.\n\n# ls -l /proc/net\nlrwxrwxrwx 1 root root 8 Mar 5 15:17 /proc/net -\u003e self/net\n\nIn other words - this behaves like /proc/mounts, but unlike\n\"mounts\", \"net\" is not a file, but a directory.\n\nChanges from v2:\n* Fixed discrepancy of /proc/net nlink count and selinux labeling\n screwup pointed out by Stephen.\n\n To get the correct nlink count the -\u003egetattr callback for /proc/net\n is overridden to read one from the net-\u003eproc_net entry.\n\n To make selinux still work the net-\u003eproc_net entry is initialized\n properly, i.e. with the \"net\" name and the proc_net parent.\n\nSelinux fixes are\nAcked-by: Stephen Smalley \u003csds@tycho.nsa.gov\u003e\n\nChanges from v1:\n* Fixed a task_struct leak in get_proc_task_net, pointed out by Paul.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nAcked-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "810b38179e9e4d4f57b4b733767bb08f8291a965", "tree": "91692de4fbd46879b29d803839b5bf7e25f30cd8", "parents": [ "ce4796d1e16cf3761dc2a02b8d588667d05b3078" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri Feb 29 15:21:01 2008 -0500" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 07 16:42:59 2008 +0100" }, "message": "sched: retain vruntime\n\nKei Tokunaga reported an interactivity problem when moving tasks\nbetween control groups.\n\nTasks would retain their old vruntime when moved between groups, this\ncan cause funny lags. Re-set the vruntime on group move to fit within\nthe new tree.\n\nReported-by: Kei Tokunaga \u003ctokunaga.keiich@jp.fujitsu.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "db8dac20d5199307dcfcf4e01dac4bda5edf9e89", "tree": "3694d1aee5c0014fb45eec045a67ca150ca1231f", "parents": [ "ba0fa4599484b98dbb21d279fbfdb40e9c07d30d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 06 16:22:02 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 06 16:22:02 2008 -0800" }, "message": "[UDP]: Revert udplite and code split.\n\nThis reverts commit db1ed684f6c430c4cdad67d058688b8a1b5e607c (\"[IPV6]\nUDP: Rename IPv6 UDP files.\"), commit\n8be8af8fa4405652e6c0797db5465a4be8afb998 (\"[IPV4] UDP: Move\nIPv4-specific bits to other file.\") and commit\ne898d4db2749c6052072e9bc4448e396cbdeb06a (\"[UDP]: Allow users to\nconfigure UDP-Lite.\").\n\nFirst, udplite is of such small cost, and it is a core protocol just\nlike TCP and normal UDP are.\n\nWe spent enormous amounts of effort to make udplite share as much code\nwith core UDP as possible. All of that work is less valuable if we\u0027re\njust going to slap a config option on udplite support.\n\nIt is also causing build failures, as reported on linux-next, showing\nthat the changeset was not tested very well. In fact, this is the\nsecond build failure resulting from the udplite change.\n\nFinally, the config options provided was a bool, instead of a modular\noption. Meaning the udplite code does not even get build tested\nby allmodconfig builds, and furthermore the user is not presented\nwith a reasonable modular build option which is particularly needed\nby distribution vendors.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1c61fc40fc264059ff41a614ed2d899127288281", "tree": "53dc93a57a21d07f02fb2fc58a6439c2186710e7", "parents": [ "9ac33b2b749e9539e84bbb1a41f97b066c4bd757" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Wed Mar 05 13:58:17 2008 -0800" }, "committer": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Thu Mar 06 16:21:49 2008 -0800" }, "message": "slab - use angle brackets for include of kmalloc_sizes.h\n\nMake them all use angle brackets and the directory name.\n\nAcked-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\n" }, { "commit": "aab547ce0d1493d400b6468c521a0137cd8c1edf", "tree": "84625da40d905669a28a5770de111225667d5f27", "parents": [ "69d3b6f491545d326135a1def4e290cd577c9a36" ], "author": { "name": "Michael Buesch", "email": "mb@bu3sch.de", "time": "Fri Feb 29 11:36:12 2008 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Mar 06 17:09:43 2008 -0500" }, "message": "ssb: Add Gigabit Ethernet driver\n\nThis adds the Gigabit Ethernet driver for the SSB\nGigabit Ethernet core. This driver actually is a frontend to\nthe Tigon3 driver. So the real work is done by tg3.\nThis device is used in the Linksys WRT350N.\n\nSigned-off-by: Michael Buesch \u003cmb@bu3sch.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2ec600d672e74488f8d1acf67a0a2baed222564c", "tree": "e1e552ada4130ac6e01df5ca523c32b8a4a66383", "parents": [ "cc0672a1066829be7e1b0128a13e36a2d0a15479" ], "author": { "name": "Luis Carlos Cobo", "email": "luisca@cozybit.com", "time": "Sat Feb 23 15:17:06 2008 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Mar 06 15:30:41 2008 -0500" }, "message": "nl80211/cfg80211: support for mesh, sta dumping\n\nAdded support for mesh id and mesh path operation as well as\nstation structure dumping.\n\nSigned-off-by: Luis Carlos Cobo \u003cluisca@cozybit.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "cc0672a1066829be7e1b0128a13e36a2d0a15479", "tree": "c76a77c58daaf51618b75be37b61998df84d304f", "parents": [ "37c5798968d0ce4d479f114f1d5785551b57bfa5" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Sat Feb 23 15:17:05 2008 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Mar 06 15:30:40 2008 -0500" }, "message": "WEXT: add mesh interface type\n\nThis introduces a new WEXT type IW_MODE_MESH for mesh networks,\nused for scan results.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "37c5798968d0ce4d479f114f1d5785551b57bfa5", "tree": "9cbd8038c8e747a15534768206e149ec8c6c1572", "parents": [ "f59d43899e279c77924a7ada4bec8c70e5aeca06" ], "author": { "name": "Luis Carlos Cobo", "email": "luisca@cozybit.com", "time": "Sat Feb 23 15:17:04 2008 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Mar 06 15:30:40 2008 -0500" }, "message": "wireless: various definitions for mesh networking\n\nSigned-off-by: Luis Carlos Cobo \u003cluisca@cozybit.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "f59d43899e279c77924a7ada4bec8c70e5aeca06", "tree": "d93a990a41bc0ae05dc46b677e40e50dad5a996a", "parents": [ "0dc47877a3de00ceadea0005189656ae8dc52669" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 05 20:58:10 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 05 20:58:10 2008 -0800" }, "message": "[IPV6]: Fix powerpc allmodconfig build warnings.\n\nIntroduced by changeset 95e41e93e18d8e1e272ce23d96bae4f17ce11d42\n(\"[IPV6]: Make ndisc_flow_init() common for later use.\")\n\nReported by Stephen Rothwell.\n\nIn file included from net/ipv6/netfilter/ip6_tables.c:21:\ninclude/linux/icmpv6.h:192: warning: \u0027struct in6_addr\u0027 declared inside parameter list\ninclude/linux/icmpv6.h:192: warning: its scope is only this definition or declaration, which is probably not what you want\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ee6b967301b4aa5d4a4b61e2f682f086266db9fb", "tree": "197c2430f87733dc80d00d1971f1be2a0e562358", "parents": [ "a05c44f6d5fb6cd29da04f96bf5ffaa05f545ac5" ], "author": { "name": "Eric Dumazet", "email": "dada1@cosmosbay.com", "time": "Wed Mar 05 18:30:47 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 05 18:30:47 2008 -0800" }, "message": "[IPV4]: Add \u0027rtable\u0027 field in struct sk_buff to alias \u0027dst\u0027 and avoid casts\n\n(Anonymous) unions can help us to avoid ugly casts.\n\nA common cast it the (struct rtable *)skb-\u003edst one.\n\nDefining an union like :\nunion {\n struct dst_entry *dst;\n struct rtable *rtable;\n};\npermits to use skb-\u003ertable in place.\n\nSigned-off-by: Eric Dumazet \u003cdada1@cosmosbay.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e0007529893c1c064be90bd21422ca0da4a0198e", "tree": "c2334ba940e682183a18d18972cf95bd3a3da46a", "parents": [ "29e8c3c304b62f31b799565c9ee85d42bd163f80" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Wed Mar 05 10:31:54 2008 -0500" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Mar 06 08:40:53 2008 +1100" }, "message": "LSM/SELinux: Interfaces to allow FS to control mount options\n\nIntroduce new LSM interfaces to allow an FS to deal with their own mount\noptions. This includes a new string parsing function exported from the\nLSM that an FS can use to get a security data blob and a new security\ndata blob. This is particularly useful for an FS which uses binary\nmount data, like NFS, which does not pass strings into the vfs to be\nhandled by the loaded LSM. Also fix a BUG() in both SELinux and SMACK\nwhen dealing with binary mount data. If the binary mount data is less\nthan one page the copy_page() in security_sb_copy_data() can cause an\nillegal page fault and boom. Remove all NFSisms from the SELinux code\nsince they were broken by past NFS changes.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nAcked-by: Stephen Smalley \u003csds@tycho.nsa.gov\u003e\nAcked-by: Casey Schaufler \u003ccasey@schaufler-ca.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "255333c1db3ec63921de29b134418a4e56e5921e", "tree": "b1cd99373cabfa6fed020496d4d74500e7bc7e92", "parents": [ "9a43b709a230705ca40a6f854a334a02334a3c1c", "0d66afe7805b169b6bf3c7a88cf8163298b8ef05" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 05 12:26:41 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 05 12:26:41 2008 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\n\tnet/mac80211/rc80211_pid_algo.c\n" }, { "commit": "27d0483aa1ef66a8877d71b63bb97f46ab0246b2", "tree": "ca84a9db8c79b789d40d2d9ae30d0349fd3562fc", "parents": [ "665c1ef8369138dad7773da6407fe77ccff87deb", "dea75bdfa57f75a7a7ec2961ec28db506c18e5db" ], "author": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 20:20:58 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 20:20:58 2008 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (22 commits)\n [IPCONFIG]: The kernel gets no IP from some DHCP servers\n b43legacy: Fix module init message\n rndis_wlan: fix broken data copy\n libertas: compare the current command with response\n libertas: fix sanity check on sequence number in command response\n p54: fix eeprom parser length sanity checks\n p54: fix EEPROM structure endianness\n ssb: Add pcibios_enable_device() return value check\n rc80211-pid: fix rate adjustment\n [ESP]: Add select on AUTHENC\n [TCP]: Improve ipv4 established hash function.\n [NETPOLL]: Revert two bogus cleanups that broke netconsole.\n [PPPOL2TP]: Add missing sock_put() in pppol2tp_tunnel_closeall()\n Subject: [PPPOL2TP] add missing sock_put() in pppol2tp_recv_dequeue()\n [BLUETOOTH]: l2cap info_timer delete fix in hci_conn_del\n [NET]: Fix race in generic address resolution.\n iucv: fix build error on !SMP\n [TCP]: Must count fack_count also when skipping\n [TUN]: Fix RTNL-locking in tun/tap driver\n [SCTP]: Use proc_create to setup de-\u003eproc_fops.\n ...\n" }, { "commit": "2c6f2db13a2428aa16f54f50232a589ddd5d7d01", "tree": "f12c2f6ce3c6a541f5192aa5a2da400024015fb7", "parents": [ "12f981f9028da2402c236544c78b8378a278f830", "3634634edd49c115da931998b9540bcc17665b05" ], "author": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:37:35 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:37:35 2008 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:\n debugfs: fix sparse warnings\n Driver core: Fix cleanup when failing device_add().\n driver core: Remove dpm_sysfs_remove() from error path of device_add()\n PM: fix new mutex-locking bug in the PM core\n PM: Do not acquire device semaphores upfront during suspend\n kobject: properly initialize ksets\n sysfs: CONFIG_SYSFS_DEPRECATED fix\n driver core: fix up Kconfig text for CONFIG_SYSFS_DEPRECATED\n" }, { "commit": "12f981f9028da2402c236544c78b8378a278f830", "tree": "7983fdf95d77ad241e09db861bb90a629eee753f", "parents": [ "10955d2251387df3997d8b9b6c572dfad9f23dd0", "c1ef5cbd03921047c2eafb998132e562043678a7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:37:10 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:37:10 2008 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:\n pci: hotplug: pciehp: fix error code path in hpc_power_off_slot\n PCI: Add DECLARE_PCI_DEVICE_TABLE macro\n PCI: fix up error messages for pci_bus registering\n PCI: fix section mismatch warning in pci_scan_child_bus\n PCI: consolidate duplicated MSI enable functions\n PCI: use dev_printk in quirk messages\n" }, { "commit": "10955d2251387df3997d8b9b6c572dfad9f23dd0", "tree": "f7962c9d20c41ca9139f06164c3c484cd245d514", "parents": [ "b2a5cd6938879b5bcfef0a73c28fea84c49519c2", "4ae897df80019db433cd46cdd50d3b48463757d9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:36:53 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:36:53 2008 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:\n USB: ftdi_sio - really enable EM1010PC\n USB: remove incorrect struct class_device from the printer gadget\n USB: pxa2xx_udc: fix misuse of clock enable/disable calls\n USB: ftdi_sio: Workaround for broken Matrix Orbital serial port\n USB: Add support for AXESSTEL MV110H CDMA modem\n usb-storage: update earlier scatter-gather bug fix\n USB: isp116x: fix enumeration on boot\n USB: ehci: handle large bulk URBs correctly (again)\n USB: spruce up the device blacklist\n USB: fix comment of struct usb_interface\n USB: update Kconfig entry for USB_SUSPEND\n usb: Add support for the mos7820/7840-based B\u0026B USB/RS485 converter to mos7840.c\n" }, { "commit": "d0fae18f1b53a1d39135a968792be034bdf7ff26", "tree": "3448dab652696848df47dcafb7772220b9e58e4f", "parents": [ "a1801f858e57f87a7f79914346921cc729632295" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Tue Mar 04 14:29:31 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:18 2008 -0800" }, "message": "md: clean up irregularity with raid autodetect\n\nWhen a raid1 array is stopped, all components currently get added to the list\nfor auto-detection. However we should really only add components that were\nfound by autodetection in the first place. So add a flag to record that\ninformation, and use it.\n\nSigned-off-by: Neil Brown \u003cneilb@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8311c29d40235062a843f4a8e8a70a44af6fe4c9", "tree": "c869143fae8f135646300d1bac6639af5bb30dd7", "parents": [ "a35e63efa1fb18c6f20f38e3ddf3f8ffbcf0f6e7" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Tue Mar 04 14:29:30 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:17 2008 -0800" }, "message": "md: reduce CPU wastage on idle md array with a write-intent bitmap\n\nOn an md array with a write-intent bitmap, a thread wakes up every few seconds\nand scans the bitmap looking for work to do. If the array is idle, there will\nbe no work to do, but a lot of scanning is done to discover this.\n\nSo cache the fact that the bitmap is completely clean, and avoid scanning the\nwhole bitmap when the cache is known to be clean.\n\nSigned-off-by: Neil Brown \u003cneilb@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3715863aa142c4f4c5208f5f3e5e9bac06006d2f", "tree": "cd93a86f90bfd8e9bef9cbcf40abde55acc26b80", "parents": [ "7eb701dc7779794d46e02a7fa1380289cb730d46" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Tue Mar 04 14:29:27 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:17 2008 -0800" }, "message": "iommu: export iommu_is_span_boundary helper function\n\niommu_is_span_boundary is used internally in the IOMMU helper\n(lib/iommu-helper.c), a primitive function that judges whether a memory area\nspans LLD\u0027s segment boundary or not.\n\nIt\u0027s difficult to convert some IOMMUs to use the IOMMU helper but\niommu_is_span_boundary is still useful for them. So this patch exports it.\n\nThis is needed for the parisc iommu fixes.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: Kyle McMartin \u003ckyle@parisc-linux.org\u003e\nCc: Matthew Wilcox \u003cmatthew@wil.cx\u003e\nCc: Grant Grundler \u003cgrundler@parisc-linux.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8289546e573d5ff681cdf0fc7a1184cca66fdb55", "tree": "9cf874b55eb9a6c97233d137278c7b7c89a5f4a1", "parents": [ "7e924aafa4b03ff71de34af8553d9a1ebc86c071" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Mar 04 14:29:08 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:15 2008 -0800" }, "message": "memcg: remove mem_cgroup_uncharge\n\nNothing uses mem_cgroup_uncharge apart from mem_cgroup_uncharge_page, (a\ntrivial wrapper around it) and mem_cgroup_end_migration (which does the same\nas mem_cgroup_uncharge_page). And it often ends up having to lock just to let\nits caller unlock. Remove it (but leave the silly locking until a later\npatch).\n\nMoved mem_cgroup_cache_charge next to mem_cgroup_charge in memcontrol.h.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hirokazu Takahashi \u003ctaka@valinux.co.jp\u003e\nCc: YAMAMOTO Takashi \u003cyamamoto@valinux.co.jp\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9442ec9df40d952b0de185ae5638a74970388e01", "tree": "14b06d71203be119d93736464ca49f37ce402c1c", "parents": [ "98837c7f82ef78aa38f40462aa2fcac68fd3acbf" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Mar 04 14:29:07 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:15 2008 -0800" }, "message": "memcg: bad page if page_cgroup when free\n\nReplace free_hot_cold_page\u0027s VM_BUG_ON(page_get_page_cgroup(page)) by a \"Bad\npage state\" and clear: most users don\u0027t have CONFIG_DEBUG_VM on, and if it\nwere set here, it\u0027d likely cause corruption when the page is reused.\n\nDon\u0027t use page_assign_page_cgroup to clear it: that should be private to\nmemcontrol.c, and always called with the lock taken; and memmap_init_zone\ndoesn\u0027t need it either - like page-\u003emapping and other pointers throughout the\nkernel, Linux assumes pointers in zeroed structures are NULL pointers.\n\nInstead use page_reset_bad_cgroup, added to memcontrol.h for this only.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hirokazu Takahashi \u003ctaka@valinux.co.jp\u003e\nCc: YAMAMOTO Takashi \u003cyamamoto@valinux.co.jp\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "427d5416f317681498337ab19218d195edea02d6", "tree": "967cfc87ec775ca3c05f95f2339697e796383191", "parents": [ "bd845e38c7a7251a95a8f2c38aa7fb87140b771d" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Mar 04 14:29:03 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:14 2008 -0800" }, "message": "memcg: move_lists on page not page_cgroup\n\nEach caller of mem_cgroup_move_lists is having to use page_get_page_cgroup:\nit\u0027s more convenient if it acts upon the page itself not the page_cgroup; and\nin a later patch this becomes important to handle within memcontrol.c.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hirokazu Takahashi \u003ctaka@valinux.co.jp\u003e\nCc: YAMAMOTO Takashi \u003cyamamoto@valinux.co.jp\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bd845e38c7a7251a95a8f2c38aa7fb87140b771d", "tree": "007a1a6703f4fe27d52a07e6caea8ce87d06ff77", "parents": [ "acc4988bcf38f9618886eaeb9802aeacc6978ec2" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Mar 04 14:29:01 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:14 2008 -0800" }, "message": "memcg: mm_match_cgroup not vm_match_cgroup\n\nvm_match_cgroup is a perverse name for a macro to match mm with cgroup: rename\nit mm_match_cgroup, matching mm_init_cgroup and mm_free_cgroup.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hirokazu Takahashi \u003ctaka@valinux.co.jp\u003e\nCc: YAMAMOTO Takashi \u003cyamamoto@valinux.co.jp\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "acc4988bcf38f9618886eaeb9802aeacc6978ec2", "tree": "7056c977e8db45f475b4034b5cb299aec37d42a2", "parents": [ "544adb41077a10d299a1094f12ec55a5843a9bdb" ], "author": { "name": "Mathieu Desnoyers", "email": "mathieu.desnoyers@polymtl.ca", "time": "Tue Mar 04 14:29:00 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:14 2008 -0800" }, "message": "markers: add an if(0) to __mark_check_format()\n\nWrap __mark_check_format() into an if(0) to make sure that parameters such as\n\ntrace_mark(mm_page_alloc, \"order %u pfn %lu\", order, page?page_to_pfn(page):0);\n\n(where page_to_pfn() has side-effects) won\u0027t generate code because of the\n__mark_check_format().\n\nThanks to Jan Kiszka for reporting this.\n\nSigned-off-by: Mathieu Desnoyers \u003cmathieu.desnoyers@polymtl.ca\u003e\nCc: Jan Kiszka \u003cjan.kiszka@siemens.com\u003e\nCc: \"Frank Ch. Eigler\" \u003cfche@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "040922c04cf2c8ac70be2e88a8a9614ecdb41d2e", "tree": "8ed304c7fe1ae5ddbd0299a816e951f261724e9d", "parents": [ "9fe3fd03a18ee42006a59b182761d7d0f6f090f3" ], "author": { "name": "Eric Sandeen", "email": "sandeen@redhat.com", "time": "Tue Mar 04 14:28:53 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:13 2008 -0800" }, "message": "include falloc.h in header-y\n\nInclude falloc.h in header-y; it defines a flag for the fallocate sysctl.\n\nSigned-off-by: Eric Sandeen \u003csandeen@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3149be50d3a31df095bcc83d752293da65a37f62", "tree": "a40c9c16c47cbfe40bc2c16d1352ebccab5cc769", "parents": [ "245904a4ce08c48495b2fd6d6c317c26ddf2b57a" ], "author": { "name": "Ville Syrjala", "email": "syrjala@sci.fi", "time": "Tue Mar 04 14:28:50 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:13 2008 -0800" }, "message": "sm501: add support for the SM502 programmable PLL\n\nSM502 has a programmable PLL which can provide the panel pixel clock instead\nof the 288MHz and 336MHz PLLs.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Ville Syrjala \u003csyrjala@sci.fi\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5cba6d22e35a05adb28fdea191b232501518c455", "tree": "65ebdb01d81cbe218cbdedc6e52f759a1b18cc0a", "parents": [ "daa49ff50a0cd1ddf88019e9afc41e26640ab1c4" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Tue Mar 04 14:28:45 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:12 2008 -0800" }, "message": "ndelay(): switch to C function to avoid 64-bit division\n\nWe should be able to do ndelay(some_u64), but that can cause a call to\n__divdi3() to be emitted because the ndelay() macros does a divide.\n\nFix it by switching to static inline which will force the u64 arg to be\ntreated as an unsigned long. udelay() takes an unsigned long arg.\n\n[bunk@kernel.org: reported m68k build breakage]\nCc: Adrian Bunk \u003cbunk@kernel.org\u003e\nCc: Evgeniy Polyakov \u003cjohnpol@2ka.mipt.ru\u003e\nCc: Martin Michlmayr \u003ctbm@cyrius.com\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Adrian Bunk \u003cbunk@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "735c4fb916e9f83a9350aeb2680d77d01ea75094", "tree": "1e6a80c0aca5982af0ba96f8ab87e5512ad3c9dc", "parents": [ "e8ed857c64e3ae62e27606ae58bc7371b5daccb1" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Tue Mar 04 14:28:40 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:12 2008 -0800" }, "message": "add noinline_for_stack\n\nPeople are adding `noinline\u0027 in various places to prevent excess stack\nconsumption due to gcc inlining. But once this is done, it is quite unobvious\nwhy the `noinline\u0027 is present in the code. We can comment each and every\nsite, or we can use noinline_for_stack.\n\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "00f0b8259e48979c37212995d798f3fbd0374690", "tree": "589e8250c016450324e0c730139d020cf2bf887c", "parents": [ "804defea1c020d5c52985685e56986f1a399acde" ], "author": { "name": "Balbir Singh", "email": "balbir@linux.vnet.ibm.com", "time": "Tue Mar 04 14:28:39 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:12 2008 -0800" }, "message": "Memory controller: rename to Memory Resource Controller\n\nRename Memory Controller to Memory Resource Controller. Reflect the same\nchanges in the CONFIG definition for the Memory Resource Controller. Group\ntogether the config options for Resource Counters and Memory Resource\nController.\n\nSigned-off-by: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9edddaa200df18e08fe0cf21036e8ae467b1363c", "tree": "26f5319fac24fb6c76b1276b19725caeb5ec24bc", "parents": [ "8182ec49a73729334f5a6c65a607ba7009ebd6d6" ], "author": { "name": "Ananth N Mavinakayanahalli", "email": "ananth@in.ibm.com", "time": "Tue Mar 04 14:28:37 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:11 2008 -0800" }, "message": "Kprobes: indicate kretprobe support in Kconfig\n\nAdd CONFIG_HAVE_KRETPROBES to the arch/\u003carch\u003e/Kconfig file for relevant\narchitectures with kprobes support. This facilitates easy handling of\nin-kernel modules (like samples/kprobes/kretprobe_example.c) that depend on\nkretprobes being present in the kernel.\n\nThanks to Sam Ravnborg for helping make the patch more lean.\n\nPer Mathieu\u0027s suggestion, added CONFIG_KRETPROBES and fixed up dependencies.\n\nSigned-off-by: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nAcked-by: Mathieu Desnoyers \u003cmathieu.desnoyers@polymtl.ca\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7560fa60fcdcdb0da662f6a9fad9064b554ef46c", "tree": "2089d826b0b9230752f318b20884dca20b3847d5", "parents": [ "83c7c693ed3e61535ad6a097ad991a88aafc54b8" ], "author": { "name": "David Brownell", "email": "david-b@pacbell.net", "time": "Tue Mar 04 14:28:27 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:10 2008 -0800" }, "message": "gpio: \u003clinux/gpio.h\u003e and \"no GPIO support here\" stubs\n\nAdd a \u003clinux/gpio.h\u003e defining fail/warn stubs for GPIO calls on platforms that\ndon\u0027t support the GPIO programming interface. That includes the arch-specific\nimplementation glue otherwise.\n\nThis facilitates a new model for GPIO usage: drivers that can use GPIOs if\nthey\u0027re available, but don\u0027t require them. One example of such a driver is\nNAND driver for various FreeScale chips. On platforms update with GPIO\nsupport, they can be used instead of a worst-case delay to verify that the\nBUSY signal is off.\n\n(Also includes a couple minor unrelated doc updates.)\n\nSigned-off-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "90a1ba0c5e39eeea278f263c28ae02166c5911c8", "tree": "8cd1ecd1b4b9e0a70ceb9ca6036082e92c882b41", "parents": [ "4725e7bdb831b9d4bd4ba0b0909398ebcf0c2df9" ], "author": { "name": "Jonas Bonn", "email": "jonas@southpole.se", "time": "Fri Feb 22 11:02:21 2008 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Mar 04 15:07:04 2008 -0800" }, "message": "PCI: Add DECLARE_PCI_DEVICE_TABLE macro\n\nThe definitions of struct pci_device_id arrays should generally follow\nthe same pattern across the entire kernel. This macro defines this\narray as const and puts it into the __devinitconst section.\n\nThere are currently many definitions scattered about the kernel that\nomit the __devinitdata modifier despite the documentation stating that\nit should always be there. These definitions really also should have\nbeen const, which wasn\u0027t possible before but has become so with the\naddition of the __devinitconst attribute.\n\nFurthermore, there are definitions that use \"const\" and __devinitdata,\nwhich is explicitly wrong but the compiler doesn\u0027t catch section\nmismatches if there\u0027s only one such one case in the module (which is\noften the case).\n\nAdding the __devinitconst modifier where there was nothing before buys\nus memory. Adding the const modifier gives the compiler a chance to do\nits thing. Changing __devinitdata to __devinitconst where it was wrong\nactually fixes some compiler errors in older (mid-release) kernels that\nwere patched over by \"removing\" the section attribute altogether (which\nwastes memory).\n\nThis macro makes it pretty difficult to get this definition wrong in\nthe future...\n\nSigned-off-by: Jonas Bonn \u003cjonas@southpole.se\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "d6d914f52b15d5a8e81ad481e02d9ab30d412a29", "tree": "8ad42c65c99a5705ac11fca7e52e4530cf912f46", "parents": [ "c2c8d1fdadda4abc90efdb7176f44cb903634511" ], "author": { "name": "Lei Ming", "email": "tom.leiming@gmail.com", "time": "Mon Feb 25 18:07:28 2008 +0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Mar 04 14:57:43 2008 -0800" }, "message": "USB: fix comment of struct usb_interface\n\nupdate the comment for the removed \"driver\" field and being\nout-of-order of @cur_altsetting and @num_altsetting.\n\nSigned-off-by: Lei Ming \u003ctom.leiming@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "3634634edd49c115da931998b9540bcc17665b05", "tree": "1bd626e95866cf67e190d209d8525d3287d31b81", "parents": [ "c1fe539a7e031302af1d121163e7ce68e679ba8c" ], "author": { "name": "Harvey Harrison", "email": "harvey.harrison@gmail.com", "time": "Wed Feb 13 17:08:16 2008 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Mar 04 14:47:06 2008 -0800" }, "message": "debugfs: fix sparse warnings\n\nextern does not belong in C files, move declaration to linux/debugfs.h\nfs/debugfs/file.c:42:30: warning: symbol \u0027debugfs_file_operations\u0027 was not declared. Should it be static?\nfs/debugfs/file.c:54:31: warning: symbol \u0027debugfs_link_operations\u0027 was not declared. Should it be static?\n\nSigned-off-by: Harvey Harrison \u003charvey.harrison@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "d9452e9f81e997cbd0c9bface8d2c2a4b064cc3e", "tree": "6f0ea6264fa359293cc6093fff763305d4c0e9f4", "parents": [ "ec9b6add7d81f902f6094e71f595da4a362f3348" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 04 12:28:49 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 04 12:28:49 2008 -0800" }, "message": "[NETPOLL]: Revert two bogus cleanups that broke netconsole.\n\nBased upon a report by Andrew Morton and code analysis done\nby Jarek Poplawski.\n\nThis reverts 33f807ba0d9259e7c75c7a2ce8bd2787e5b540c7 (\"[NETPOLL]:\nKill NETPOLL_RX_DROP, set but never tested.\") and\nc7b6ea24b43afb5749cb704e143df19d70e23dea (\"[NETPOLL]: Don\u0027t need\nrx_flags.\").\n\nThe rx_flags did get tested for zero vs. non-zero and therefore we do\nneed those tests and that code which sets NETPOLL_RX_DROP et al.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b1c3c3ebf70548bb182d570b79a3f21045cd30e5", "tree": "ad70af0d0fa33b737ff1ae28e59761865b24bdae", "parents": [ "87baa2bb904ed46f872385fe430b6cfb80967835", "6497dcffe07b7c3d863f9899280c4f6eae999161" ], "author": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 11:26:01 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 11:26:01 2008 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:\n ioat: fix \u0027ack\u0027 handling, driver must ensure that \u0027ack\u0027 is zero\n dmaengine: fix sparse warning\n fsldma: do not cleanup descriptors in hardirq context\n dmaengine: add driver for Freescale MPC85xx DMA controller\n" }, { "commit": "87baa2bb904ed46f872385fe430b6cfb80967835", "tree": "36d9a0c365bfafe2a3c76b98a9b83b0d57809c9f", "parents": [ "34f10fc9886450c2e8a336f7022805c4a73e10f1", "62fb185130e4d420f71a30ff59d8b16b74ef5d2b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 09:23:28 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 09:23:28 2008 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel:\n sched: revert load_balance_monitor() changes\n" }, { "commit": "67171a3f0335f2ecd1723851e75a0af7e2115f25", "tree": "acabcdf01549c7cf3e157573469cd4254b8167a1", "parents": [ "ce932967b9f77c130d4936d1e20d619a628ae08f", "1a4e3f89c6b2cbe0b26c08ec63a8c34156eaae04" ], "author": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 09:22:05 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 09:22:05 2008 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:\n x86: disable KVM for Voyager and friends\n KVM: VMX: Avoid rearranging switched guest msrs while they are loaded\n KVM: MMU: Fix race when instantiating a shadow pte\n KVM: Route irq 0 to vcpu 0 exclusively\n KVM: Avoid infinite-frequency local apic timer\n KVM: make MMU_DEBUG compile again\n KVM: move alloc_apic_access_page() outside of non-preemptable region\n KVM: SVM: fix Windows XP 64 bit installation crash\n KVM: remove the usage of the mmap_sem for the protection of the memory slots.\n KVM: emulate access to MSR_IA32_MCG_CTL\n KVM: Make the supported cpuid list a host property rather than a vm property\n KVM: Fix kvm_arch_vcpu_ioctl_set_sregs so that set_cr0 works properly\n KVM: SVM: set NM intercept when enabling CR0.TS in the guest\n KVM: SVM: Fix lazy FPU switching\n" }, { "commit": "ec8670f1f795badedaa056a3a3245b9b82201747", "tree": "dbca9b272bcf13d7d4a4b86cfabdc396f685f488", "parents": [ "222ccf9ab838a1ca7163969fabd2cddc10403fb5" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sat Mar 01 07:51:29 2008 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Mar 04 10:16:46 2008 -0700" }, "message": "dmaengine: fix sparse warning\n\ninclude/linux/dmaengine.h:364:2: warning: returning void-valued expression\n\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "62fb185130e4d420f71a30ff59d8b16b74ef5d2b", "tree": "474c0824a5bf90950b0a430a11a52b358c9e1f31", "parents": [ "976dde010e513a9c7c3117a32b7b015f84b37430" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon Feb 25 17:34:02 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Mar 04 17:54:06 2008 +0100" }, "message": "sched: revert load_balance_monitor() changes\n\nThe following commits cause a number of regressions:\n\n commit 58e2d4ca581167c2a079f4ee02be2f0bc52e8729\n Author: Srivatsa Vaddagiri \u003cvatsa@linux.vnet.ibm.com\u003e\n Date: Fri Jan 25 21:08:00 2008 +0100\n sched: group scheduling, change how cpu load is calculated\n\n commit 6b2d7700266b9402e12824e11e0099ae6a4a6a79\n Author: Srivatsa Vaddagiri \u003cvatsa@linux.vnet.ibm.com\u003e\n Date: Fri Jan 25 21:08:00 2008 +0100\n sched: group scheduler, fix fairness of cpu bandwidth allocation for task groups\n\nNamely:\n - very frequent wakeups on SMP, reported by PowerTop users.\n - cacheline trashing on (large) SMP\n - some latencies larger than 500ms\n\nWhile there is a mergeable patch to fix the latter, the former issues\nare not fixable in a manner suitable for .25 (we\u0027re at -rc3 now).\n\nHence we revert them and try again in v2.6.26.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCC: Srivatsa Vaddagiri \u003cvatsa@linux.vnet.ibm.com\u003e\nTested-by: Alexey Zaytsev \u003calexey.zaytsev@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "72dc67a69690288538142df73a7e3ac66fea68dc", "tree": "f40cc5ef0c66686a469977fd438e5b6786f16280", "parents": [ "c7ac679c160db864810920df61a6ed14275011aa" ], "author": { "name": "Izik Eidus", "email": "izike@qumranet.com", "time": "Sun Feb 10 18:04:15 2008 +0200" }, "committer": { "name": "Avi Kivity", "email": "avi@qumranet.com", "time": "Tue Mar 04 15:19:40 2008 +0200" }, "message": "KVM: remove the usage of the mmap_sem for the protection of the memory slots.\n\nThis patch replaces the mmap_sem lock for the memory slots with a new\nkvm private lock, it is needed beacuse untill now there were cases where\nkvm accesses user memory while holding the mmap semaphore.\n\nSigned-off-by: Izik Eidus \u003cizike@qumranet.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@qumranet.com\u003e\n" }, { "commit": "a0db701a6bf767320e4471bd55e70702d230f6fb", "tree": "dee103b4f56be01e908ee39edada7c26450dcc8e", "parents": [ "bec419404afe8b0d60000118ca90ada4c69a3a6d" ], "author": { "name": "Adrian Bunk", "email": "bunk@kernel.org", "time": "Tue Mar 04 11:23:50 2008 +0100" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Tue Mar 04 11:28:36 2008 +0100" }, "message": "block/genhd.c: proper externs\n\nThis patch adds proper externs for two structs in include/linux/genhd.h\n\nSigned-off-by: Adrian Bunk \u003cbunk@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "1826eadfc42839af7c1c5a1859510aff635d3fa1", "tree": "387895990fb3db91cbf9d82d33f5df27d62a0219", "parents": [ "ff88972c850ced92b9c4c7f538d85829c741eeb0" ], "author": { "name": "Adrian Bunk", "email": "bunk@kernel.org", "time": "Tue Mar 04 11:23:46 2008 +0100" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Tue Mar 04 11:28:31 2008 +0100" }, "message": "block/genhd.c: cleanups\n\nThis patch contains the following cleanups:\n- make the needlessly global struct disk_type static\n- #if 0 the unused genhd_media_change_notify()\n\nSigned-off-by: Adrian Bunk \u003cbunk@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "e3790c7d42a545e8fe8b38b513613ca96687b670", "tree": "0b849ba46007c4d7f7a34271a76d58e7406cbad7", "parents": [ "7a85f8896f4b4a4a0249563b92af9e3161a6b467" ], "author": { "name": "Tejun Heo", "email": "htejun@gmail.com", "time": "Tue Mar 04 11:18:17 2008 +0100" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Tue Mar 04 11:18:17 2008 +0100" }, "message": "block: separate out padding from alignment\n\nBlock layer alignment was used for two different purposes - memory\nalignment and padding. This causes problems in lower layers because\ndrivers which only require memory alignment ends up with adjusted\nrq-\u003edata_len. Separate out padding such that padding occurs iff\ndriver explicitly requests it.\n\nTomo: restorethe code to update bio in blk_rq_map_user\n introduced by the commit 40b01b9bbdf51ae543a04744283bf2d56c4a6afa\n according to padding alignment.\n\nSigned-off-by: Tejun Heo \u003chtejun@gmail.com\u003e\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "7a85f8896f4b4a4a0249563b92af9e3161a6b467", "tree": "616c62e3c96237e874fc0f47133fbca2160913b5", "parents": [ "89b6e743788516491846724d7ef89bcac7ac9c99" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Tue Mar 04 11:17:11 2008 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@carl.home.kernel.dk", "time": "Tue Mar 04 11:17:11 2008 +0100" }, "message": "block: restore the meaning of rq-\u003edata_len to the true data length\n\nThe meaning of rq-\u003edata_len was changed to the length of an allocated\nbuffer from the true data length. It breaks SG_IO friends and\nbsg. This patch restores the meaning of rq-\u003edata_len to the true data\nlength and adds rq-\u003eextra_len to store an extended length (due to\ndrain buffer and padding).\n\nThis patch also removes the code to update bio in blk_rq_map_user\nintroduced by the commit 40b01b9bbdf51ae543a04744283bf2d56c4a6afa.\nThe commit adjusts bio according to memory alignment\n(queue_dma_alignment). However, memory alignment is NOT padding\nalignment. This adjustment also breaks SG_IO friends and bsg. Padding\nalignment needs to be fixed in a proper way (by a separate patch).\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nSigned-off-by: Jens Axboe \u003caxboe@carl.home.kernel.dk\u003e\n" }, { "commit": "95e41e93e18d8e1e272ce23d96bae4f17ce11d42", "tree": "c3b138bc03f3cb04396b3326b4fed13689b0366d", "parents": [ "5e5f3f0f801321078c897a5de0b4b4304f234da0" ], "author": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Thu Dec 06 15:43:30 2007 -0800" }, "committer": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Tue Mar 04 15:18:24 2008 +0900" }, "message": "[IPV6]: Make ndisc_flow_init() common for later use.\n\nFor later use, this patch is renaming ndisc_flow_init() to\nicmpv6_flow_init() and putting it in common place.\n\nSigned-off-by: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\n" }, { "commit": "e898d4db2749c6052072e9bc4448e396cbdeb06a", "tree": "2b8673d85210a23e67d0817b18f401411e8936f3", "parents": [ "c6aefafb7ec620911d46174eed514f9df639e5a4" ], "author": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Sat Mar 01 01:06:47 2008 +0900" }, "committer": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Tue Mar 04 15:18:22 2008 +0900" }, "message": "[UDP]: Allow users to configure UDP-Lite.\n\nLet\u0027s give users an option for disabling UDP-Lite (~4K).\n\nold:\n| text\t data\t bss\t dec\t hex\tfilename\n| 286498\t 12432\t 6072\t 305002\t 4a76a\tnet/ipv4/built-in.o\n| 193830\t 8192\t 3204\t 205226\t 321aa\tnet/ipv6/ipv6.o\n\nnew (without UDP-Lite):\n| text\t data\t bss\t dec\t hex\tfilename\n| 284086\t 12136\t 5432\t 301654\t 49a56\tnet/ipv4/built-in.o\n| 191835\t 7832\t 3076\t 202743\t 317f7\tnet/ipv6/ipv6.o\n\nSigned-off-by: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\n" }, { "commit": "6446faa2ff30ca77c5b25e886bbbfb81c63f1c91", "tree": "d8c29dec4b1395a313cd71e5185f656f7e8abbb6", "parents": [ "d8b42bf54be18b5d0bad941b3a1d3e8f022651a7" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Fri Feb 15 23:45:26 2008 -0800" }, "committer": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Mar 03 12:22:32 2008 -0800" }, "message": "slub: Fix up comments\n\nProvide comments and fix up various spelling / style issues.\n\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\n" }, { "commit": "a973e9dd1e140a65bed694a2c5c8d53e9cba1a23", "tree": "5a164080dae237d09c57abab9e84b750863a2ff7", "parents": [ "27710bf6febe8323f78bceca002ca7d71e5012a7" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Sat Mar 01 13:40:44 2008 -0800" }, "committer": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Mar 03 12:22:30 2008 -0800" }, "message": "Revert \"unique end pointer\" patch\n\nThis only made sense for the alternate fastpath which was reverted last week.\n\nMathieu is working on a new version that addresses the fastpath issues but that\nnew code first needs to go through mm and it is not clear if we need the\nunique end pointers with his new scheme.\n\nReviewed-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\n" }, { "commit": "988b705077d8f922408913f4f521ae073256d4a1", "tree": "9b57725b954e1e96a80043ed43d83f8e032b47b6", "parents": [ "8ed7edce82ca0d8d3adba8c08cd42337af6c758c" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@openvz.org", "time": "Mon Mar 03 12:20:57 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 03 12:20:57 2008 -0800" }, "message": "[ARP]: Introduce the arp_hdr_len helper.\n\nThere are some place, that calculate the ARP header length. These\ncalculations are correct, but \n a) some operate with \"magic\" constants,\n b) enlarge the code length (sometimes at the cost of coding style),\n c) are not informative from the first glance.\n\nThe proposal is to introduce a helper, that includes all the good\nsides of these calculations.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d0bcabcd72dda5f553322a1ca92ae31c15b408b6", "tree": "6603d13be28005cbbf67a9a3a3649db7a4db14b8", "parents": [ "e59e4a09729b06a131de9042b2a5b05b7ad26174" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Fri Feb 29 22:03:07 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Mon Mar 03 10:47:14 2008 -0800" }, "message": "docbook: fix usb source files\n\nFix docbook problems in USB source files.\nThese cause the generated docbook to be incorrect.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "674eea0fc4d1d693250b5d3ddad42ca931c87dfd", "tree": "a7995dd52f6715081cac74484a84351003e48480", "parents": [ "d730616384211436cfc84e6c2c1aa45351706a96" ], "author": { "name": "Avi Kivity", "email": "avi@qumranet.com", "time": "Mon Feb 11 18:37:23 2008 +0200" }, "committer": { "name": "Avi Kivity", "email": "avi@qumranet.com", "time": "Mon Mar 03 11:22:25 2008 +0200" }, "message": "KVM: Make the supported cpuid list a host property rather than a vm property\n\nOne of the use cases for the supported cpuid list is to create a \"greatest\ncommon denominator\" of cpu capabilities in a server farm. As such, it is\nuseful to be able to get the list without creating a virtual machine first.\n\nSince the code does not depend on the vm in any way, all that is needed is\nto move it to the device ioctl handler. The capability identifier is also\nchanged so that binaries made against -rc1 will fail gracefully.\n\nSigned-off-by: Avi Kivity \u003cavi@qumranet.com\u003e\n" }, { "commit": "4a80f2788952055a627f2093a0174537d70aec1b", "tree": "411c8ec555fe85cf9faa9da90e62ab781b33661c", "parents": [ "03a64c93b68e1eff299b9bbbb0d13105171cddc4", "e4861829072c61883114c64a3af61f305a789ff0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 29 13:41:25 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 29 13:41:25 2008 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.26\n" }, { "commit": "28de57d1a9eb7e67badb731297197fcbef0cc19e", "tree": "950fe43f059f03659c4fd87755a73610af5b20c4", "parents": [ "fba4a1e63723b5ef16c21a90f06520ae37c5da98" ], "author": { "name": "Aurelien Jarno", "email": "aurelien@aurel32.net", "time": "Fri Feb 22 16:14:58 2008 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Feb 29 15:41:43 2008 -0500" }, "message": "ssb: Add CHIPCO IRQ access functions\n\nThis patch adds functions to setup and read the CHIPCO IRQ.\n\nSigned-off-by: Aurelien Jarno \u003caurelien@aurel32.net\u003e\nSigned-off-by: Michael Buesch \u003cmb@bu3sch.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" } ], "next": "ffc7689ddae5cbe12bde437ae0f2b386d568b5cd" }