)]}' { "log": [ { "commit": "79600aadcf35dd31ec284928cf45296fea98db61", "tree": "545ebd8499e79af3adbbccb9ae900b3bc9cdaeec", "parents": [ "552618d124b68d41c2effaaaa3ca5b8ce9598502" ], "author": { "name": "Stephen M. Cameron", "email": "scameron@beardog.cce.hp.com", "time": "Tue Jun 15 08:12:34 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jun 15 08:12:34 2010 +0200" }, "message": "cciss: set SCSI max cmd len to 16, as default is wrong\n\nSigned-off-by: Stephen M. Cameron \u003cscameron@beardog.cce.hp.com\u003e\nCc: Mike Miller \u003cmikem@beardog.cce.hp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "552618d124b68d41c2effaaaa3ca5b8ce9598502", "tree": "677f2ac03472647c60fe2154f4f0bdaa55ddd3ae", "parents": [ "d4a3895f5d024b47ef8e9d98c59a9b86dcdcef59" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Jun 14 15:21:33 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Jun 14 15:21:33 2010 +0200" }, "message": "cpqarray: fix two more wrong section type\n\ncpqarray_register_ctlr() and cpqarray_eisa_detect() also\nneed to be marked as __devinit.\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "d4a3895f5d024b47ef8e9d98c59a9b86dcdcef59", "tree": "7b4a4d58a463e36b775770cd640ea1430f32763c", "parents": [ "575f552012ec0cd6591fd85ee996d5a5ad1a669a" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Jun 14 12:55:09 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Jun 14 12:55:09 2010 +0200" }, "message": "cpqarray: fix wrong __init type on pci probe function\n\nIt needs to be __devinit, not __init.\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "dc66c74de6f4238020db3e2041d4aca5c5b3e9bc", "tree": "8df9cdd2f1672217a210e624f4613744e57450e0", "parents": [ "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed Jun 02 14:31:29 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Mon Jun 14 12:19:41 2010 +0200" }, "message": "drbd: Fixed a race between disk-attach and unexpected state changes\n\nThis was a very hard to trigger race condition.\n\nIf we got a state packet from the peer, after drbd_nl_disk() has\nalready changed the disk state to D_NEGOTIATING but\nafter_state_ch() was not yet run by the worker, then receive_state()\nmight called drbd_sync_handshake(), which in turn crashed\nwhen accessing p_uuid.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "d2dd328b7f7bc6cebe167648289337755944ad2a", "tree": "5d664a2db1ac209f7537452ddc02597972f7aa37", "parents": [ "c1518f12bab97a6d409a25aaccb02dc8895800f3", "1abec4fdbb142e3ccb6ce99832fae42129134a96" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 04 15:37:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 04 15:37:44 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block: (27 commits)\n block: make blk_init_free_list and elevator_init idempotent\n block: avoid unconditionally freeing previously allocated request_queue\n pipe: change /proc/sys/fs/pipe-max-pages to byte sized interface\n pipe: change the privilege required for growing a pipe beyond system max\n pipe: adjust minimum pipe size to 1 page\n block: disable preemption before using sched_clock()\n cciss: call BUG() earlier\n Preparing 8.3.8rc2\n drbd: Reduce verbosity\n drbd: use drbd specific ratelimit instead of global printk_ratelimit\n drbd: fix hang on local read errors while disconnected\n drbd: Removed the now empty w_io_error() function\n drbd: removed duplicated #includes\n drbd: improve usage of MSG_MORE\n drbd: need to set socket bufsize early to take effect\n drbd: improve network latency, TCP_QUICKACK\n drbd: Revert \"drbd: Create new current UUID as late as possible\"\n brd: support discard\n Revert \"writeback: fix WB_SYNC_NONE writeback from umount\"\n Revert \"writeback: ensure that WB_SYNC_NONE writeback with sb pinned is sync\"\n ...\n" }, { "commit": "39059cceeda478cd040d521b9541d1113035c908", "tree": "56adf04d6766a4346160aacd709468e5b2f1b879", "parents": [ "b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2", "c2cdf6aba0dfcfb54be646ab630c1bccd180e890" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 03 15:46:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 03 15:46:37 2010 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/macio: Fix probing of macio devices by using the right of match table\n agp/uninorth: Fix oops caused by flushing too much\n powerpc/pasemi: Update MAINTAINERS file\n powerpc/cell: Fix integer constant warning\n powerpc/kprobes: Remove resume_execution() in kprobes\n powerpc/macio: Don\u0027t dereference pointer before null check\n" }, { "commit": "a5b365a652206ca300256974ed9301a7d241a6ed", "tree": "1898846dcce5b1815f8e13d7b0b610c83be1da7f", "parents": [ "aef4b9aaae1decc775778903922bd0075cce7a88" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Tue May 25 14:17:54 2010 +0200" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jun 03 22:39:18 2010 +0930" }, "message": "virtio-blk: fix minimum number of S/G elements\n\nWe need at least one S/G element to operate properly, as does the block\nlayer which increments it to one anyway. We hit this due to a qemu\nbug which advertises a sg_elements of 0 under some circumstances.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e (tweaked logic)\n" }, { "commit": "c2cdf6aba0dfcfb54be646ab630c1bccd180e890", "tree": "97bfd319f0ebe514ef821a080b74860fb9dbaa24", "parents": [ "79905ad50bcf025deb81382413719ed600734941" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jun 02 17:09:18 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jun 02 17:50:38 2010 +1000" }, "message": "powerpc/macio: Fix probing of macio devices by using the right of match table\n\nGrant patches added an of mach table to struct device_driver. However,\nwhile he changed the macio device code to use that, he left the match\ntable pointer in struct macio_driver and didn\u0027t update drivers to use\nthe \"new\" one, thus breaking the probing.\n\nThis completes the change by moving all drivers to setup the \"new\"\none, removing all traces of the old one, and while at it (since it\nchanges the exact same locations), I also remove two other duplicates\nfrom struct driver which are the name and owner fields.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "b4ca761577535b2b4d153689ee97342797dfff05", "tree": "29054d55508f1faa22ec32acf7c245751af03348", "parents": [ "28f4197e5d4707311febeec8a0eb97cb5fd93c97", "67a3e12b05e055c0415c556a315a3d3eb637e29e" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jun 01 12:42:12 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jun 01 12:42:12 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-linus\n\nConflicts:\n\tfs/pipe.c\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "713b686494a577b3c4f4f9f585a4705fc30d51c2", "tree": "3b7fa639a3b1bf1a6addd0d317558ca66bf9dd6c", "parents": [ "099c5c310e9744bd0654881bb55c137051228e56" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Tue Jun 01 12:17:48 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jun 01 12:17:48 2010 +0200" }, "message": "cciss: call BUG() earlier\n\nI moved the range check after the increment. The current code would\nwrite past the end of the array once before calling BUG().\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "2a0ab2cd73c26835e635ed4e3868f983519048fb", "tree": "3809dc43507fc168d1982b460527232255bb9bde", "parents": [ "7383506c87237dbd627f0b8b72b50117f25c5ca2" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed May 26 17:59:55 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jun 01 11:12:27 2010 +0200" }, "message": "drbd: Reduce verbosity\n\nThe \"Local READ/WRITE failed\" messages are too verbose.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "7383506c87237dbd627f0b8b72b50117f25c5ca2", "tree": "aa4a84c35452398547b021f75861bf9e0b4581e2", "parents": [ "d255e5ff5fc6cc6c60dd014d1261448a7bbc8134" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Thu May 27 11:51:56 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jun 01 11:12:27 2010 +0200" }, "message": "drbd: use drbd specific ratelimit instead of global printk_ratelimit\n\nusing the global printk_ratelimit() may mask other messages.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "d255e5ff5fc6cc6c60dd014d1261448a7bbc8134", "tree": "af933be5ddb81b1e47be2f91ff558c5c792f2f0f", "parents": [ "32fa7e91f923d8b2578c42016ff3a94efc9968a2" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Thu May 27 09:45:45 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jun 01 11:12:27 2010 +0200" }, "message": "drbd: fix hang on local read errors while disconnected\n\n\"canceled\" w_read_retry_remote never completed, if they have been\ncanceled after drbd_disconnect connection teardown cleanup has already\nrun (or we are currently not connected anyways).\n\nFixed by not queueing a remote retry if we already know it won\u0027t work\n(pdsk not uptodate), and cleanup ourselves on \"cancel\", in case we hit a\nrace with drbd_disconnect.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "32fa7e91f923d8b2578c42016ff3a94efc9968a2", "tree": "29195d8636831d92d421d816ff1d9961b059908f", "parents": [ "039e1fb65496636778e24c881a5e58ed7c39fbb3" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed May 26 17:13:18 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jun 01 11:12:27 2010 +0200" }, "message": "drbd: Removed the now empty w_io_error() function\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "039e1fb65496636778e24c881a5e58ed7c39fbb3", "tree": "2c567ca6a2fa65d2e61f0919b6321dc12a99b6a3", "parents": [ "ba11ad9a3b9dd2dbb9c6686ea9d41a9a77d94327" ], "author": { "name": "Andrea Gelmini", "email": "andrea.gelmini@gelma.net", "time": "Sun May 23 21:48:13 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jun 01 11:12:27 2010 +0200" }, "message": "drbd: removed duplicated #includes\n\ndrbd/drbd_receiver.c: linux/mm.h is included more than once.\n\nSigned-off-by: Andrea Gelmini \u003candrea.gelmini@gelma.net\u003e\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "ba11ad9a3b9dd2dbb9c6686ea9d41a9a77d94327", "tree": "d1aa2d5a2673a063e7cc8b9a4bba5305c608f6a1", "parents": [ "5dbf1673383f2f1554f0634fdfc390d59dc2c7d6" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Tue May 25 16:26:16 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jun 01 11:12:27 2010 +0200" }, "message": "drbd: improve usage of MSG_MORE\n\nIt seems to improve performance if we allow the \"p_data\" header in its\nown frame (no MSG_MORE), but sendpage all but the last page with MSG_MORE.\nThis is also in preparation of a later zero copy receive implementation.\n\nSuggested by Eduard.Guzovsky@stratus.com on drbd-dev.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "5dbf1673383f2f1554f0634fdfc390d59dc2c7d6", "tree": "a63a9ed3528b35f943100072b88add3fca72dbaf", "parents": [ "344fa462e3246bd102059ccc3c59deef416676dd" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Tue May 25 16:18:01 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jun 01 11:12:27 2010 +0200" }, "message": "drbd: need to set socket bufsize early to take effect\n\nquoting tcp(7):\n On individual connections, the socket buffer size must be set prior to the\n listen(2) or connect(2) calls in order to have it take effect.\n\nThis adds a wrapper to do so, and uses it appropriately.\nImproves performance in certain situations.\n\nNote that because we cannot easily determine which socket will be\n\"meta\" and wich \"data\" (bulk) socket, we adjust both sockets.\nPreviously, DRBD only adjusted the bufsizes of the \"data\" socket.\n\nThanks again to Eduard.Guzovsky@stratus.com.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "344fa462e3246bd102059ccc3c59deef416676dd", "tree": "1e66ef2ce11d25214004468d16bac6b7a1dc24c6", "parents": [ "2c8d196759054b632788633b20e39167df36041d" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Tue May 25 14:23:57 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jun 01 11:12:27 2010 +0200" }, "message": "drbd: improve network latency, TCP_QUICKACK\n\nOn Thu, Apr 29, 2010 at 04:00:50PM -0400, Eduard.Guzovsky@stratus.com\n wrote on drbd-dev@lists.linbit.com\n Subject: [Drbd-dev] DRBD small synchronous writes performance improvements\n\n\u003e 1. TCP_QUICKACK option is set incorrectly. The goal was force TCP to\n\u003e send and ACK as a \"one time\" event. Instead the code permanently sets\n\u003e connection in the QUICKACK mode.\n\nHe is right, we actually want to use an even val with TCP_QUICKACK.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "2c8d196759054b632788633b20e39167df36041d", "tree": "d4e5016e6d796b748f43ff7fca21045c6c890a5b", "parents": [ "b7c335713ea130d707c22d7f7c57a8eca75ded7e" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 25 14:32:03 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jun 01 11:12:26 2010 +0200" }, "message": "drbd: Revert \"drbd: Create new current UUID as late as possible\"\n\nThe late-UUID writing is delayed until the next release.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "b7c335713ea130d707c22d7f7c57a8eca75ded7e", "tree": "302213166522d0af8bcb01417b69cd7bd445cb49", "parents": [ "0e3c9a2284f5417f196e327c254d0b84c9ee8929" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Wed May 26 15:41:14 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Tue Jun 01 11:09:20 2010 +0200" }, "message": "brd: support discard\n\nSupport discard requests in brd by zeroing or deleting the underlying backing\npages. This is simply to help with testing and documentation nature of\nbrd code.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "cf9b59e9d3e008591d1f54830f570982bb307a0d", "tree": "113478ce8fd8c832ba726ffdf59b82cb46356476", "parents": [ "44504b2bebf8b5823c59484e73096a7d6574471d", "f4b87dee923342505e1ddba8d34ce9de33e75050" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "message": "Merge remote branch \u0027origin\u0027 into secretlab/next-devicetree\n\nMerging in current state of Linus\u0027 tree to deal with merge conflicts and\nbuild failures in vio.c after merge.\n\nConflicts:\n\tdrivers/i2c/busses/i2c-cpm.c\n\tdrivers/i2c/busses/i2c-mpc.c\n\tdrivers/net/gianfar.c\n\nAlso fixed up one line in arch/powerpc/kernel/vio.c to use the\ncorrect node pointer.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4018294b53d1dae026880e45f174c1cc63b5d435", "tree": "6db3538eaf91b653381720a6d92f4f15634a93d0", "parents": [ "597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:13:02 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:10:40 2010 -0600" }, "message": "of: Remove duplicate fields from of_platform_driver\n\n.name, .match_table and .owner are duplicated in both of_platform_driver\nand device_driver. This patch is a removes the extra copies from struct\nof_platform_driver and converts all users to the device_driver members.\n\nThis patch is a pretty mechanical change. The usage model doesn\u0027t change\nand if any drivers have been missed, or if anything has been fixed up\nincorrectly, then it will fail with a compile time error, and the fixup\nwill be trivial. This patch looks big and scary because it touches so\nmany files, but it should be pretty safe.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Sean MacLennan \u003csmaclennan@pikatech.com\u003e\n\n" }, { "commit": "e8bebe2f71d26871b0970ae1d9cf0ed3cdd9569d", "tree": "c0d82cbd11daaf579b74121c6641d58947091094", "parents": [ "6109e2ce2600e2db26cd0424bb9c6ed019723288", "82f3952c02add60b15eea9151d4d99b6b82066c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 19:37:45 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 19:37:45 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (69 commits)\n fix handling of offsets in cris eeprom.c, get rid of fake on-stack files\n get rid of home-grown mutex in cris eeprom.c\n switch ecryptfs_write() to struct inode *, kill on-stack fake files\n switch ecryptfs_get_locked_page() to struct inode *\n simplify access to ecryptfs inodes in -\u003ereadpage() and friends\n AFS: Don\u0027t put struct file on the stack\n Ban ecryptfs over ecryptfs\n logfs: replace inode uid,gid,mode initialization with helper function\n ufs: replace inode uid,gid,mode initialization with helper function\n udf: replace inode uid,gid,mode init with helper\n ubifs: replace inode uid,gid,mode initialization with helper function\n sysv: replace inode uid,gid,mode initialization with helper function\n reiserfs: replace inode uid,gid,mode initialization with helper function\n ramfs: replace inode uid,gid,mode initialization with helper function\n omfs: replace inode uid,gid,mode initialization with helper function\n bfs: replace inode uid,gid,mode initialization with helper function\n ocfs2: replace inode uid,gid,mode initialization with helper function\n nilfs2: replace inode uid,gid,mode initialization with helper function\n minix: replace inode uid,gid,mode init with helper\n ext4: replace inode uid,gid,mode init with helper\n ...\n\nTrivial conflict in fs/fs-writeback.c (mark bitfields unsigned)\n" }, { "commit": "1756ac3d3c41341297ea25b818b7fce505bb2a9a", "tree": "96382220afbb82fd5c576c4c08b3c3e13282851f", "parents": [ "98edb6ca4174f17a64890a02f44c211c8b44fb3c", "0643e4c6e4fd67778fa886a89e6ec2320e0ff4d3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:22:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:22:52 2010 -0700" }, "message": "Merge branch \u0027virtio\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* \u0027virtio\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (27 commits)\n drivers/char: Eliminate use after free\n virtio: console: Accept console size along with resize control message\n virtio: console: Store each console\u0027s size in the console structure\n virtio: console: Resize console port 0 on config intr only if multiport is off\n virtio: console: Add support for nonblocking write()s\n virtio: console: Rename wait_is_over() to will_read_block()\n virtio: console: Don\u0027t always create a port 0 if using multiport\n virtio: console: Use a control message to add ports\n virtio: console: Move code around for future patches\n virtio: console: Remove config work handler\n virtio: console: Don\u0027t call hvc_remove() on unplugging console ports\n virtio: console: Return -EPIPE to hvc_console if we lost the connection\n virtio: console: Let host know of port or device add failures\n virtio: console: Add a __send_control_msg() that can send messages without a valid port\n virtio: Revert \"virtio: disable multiport console support.\"\n virtio: add_buf_gfp\n trans_virtio: use virtqueue_xxx wrappers\n virtio-rng: use virtqueue_xxx wrappers\n virtio_ring: remove a level of indirection\n virtio_net: use virtqueue_xxx wrappers\n ...\n\nFix up conflicts in drivers/net/virtio_net.c due to new virtqueue_xxx\nwrappers changes conflicting with some other cleanups.\n" }, { "commit": "8018ab057480974e7f26a387bf4ce040e9a5f6f1", "tree": "98298180bf60797a028eca4f24234dc67d38a9d4", "parents": [ "e970a573ce30a3976234dcfb67906c164b0df9ee" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Mon Mar 22 17:32:25 2010 +0100" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:21 2010 -0400" }, "message": "sanitize vfs_fsync calling conventions\n\nNow that the last user passing a NULL file pointer is gone we can remove\nthe redundant dentry argument and associated hacks inside vfs_fsynmc_range.\n\nThe next step will be removig the dentry argument from -\u003efsync, but given\nthe luck with the last round of method prototype changes I\u0027d rather\ndefer this until after the main merge window.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "ee9a3607fb03e804ddf624544105f4e34260c380", "tree": "ce41b6e0fa10982a306f6c142a92dbf3c9961284", "parents": [ "b492e95be0ae672922f4734acf3f5d35c30be948", "d515e86e639890b33a09390d062b0831664f04a2" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri May 21 21:27:26 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri May 21 21:27:26 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-2.6.35\n\nConflicts:\n\tfs/ext3/fsync.c\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "4e23a59ed1c5f12e14f7899855f8379b3d42e578", "tree": "29317f39d5f2b482940df3c0159410fdfa553631", "parents": [ "23ce422748def9652fdc019f740cd7900fa2fe3b" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu May 20 14:45:07 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri May 21 21:12:01 2010 +0200" }, "message": "drbd: Do not free p_uuid early, this is done in the exit code of the receiver\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "23ce422748def9652fdc019f740cd7900fa2fe3b", "tree": "d3a4a74ad648d2b242ed0a41402fd817cac66bb6", "parents": [ "fc8ce1941d668c70e57a07f13f5a63e73e5dbff3" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu May 20 13:35:31 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri May 21 21:12:01 2010 +0200" }, "message": "drbd: Null pointer deref fix to the large \"multi bio rewrite\"\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "fc8ce1941d668c70e57a07f13f5a63e73e5dbff3", "tree": "ac7fddba37671fb74b414a2ff9532ac0d424ca72", "parents": [ "4604d6366859f781ad16c07a6c65b16fc96e26c5" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu May 20 10:04:17 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri May 21 21:12:00 2010 +0200" }, "message": "drbd: Fix: Do not detach, if a bio with a barrier fails\n\nIntroduced a few days ago:\n commit 45bb912bd5ea4d2b3a270a93cbdf767a0e2df6f5\n Author: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n Date: Fri May 14 17:10:48 2010 +0200\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "4604d6366859f781ad16c07a6c65b16fc96e26c5", "tree": "85cf6c3c004c6ab7015d247c69eda699df2dfa2a", "parents": [ "31a31dccdd308d5ec7f9a1197a7875a246a348dc" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed May 19 17:37:02 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri May 21 21:12:00 2010 +0200" }, "message": "drbd: Ensure to not trigger late-new-UUID creation multiple times\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "31a31dccdd308d5ec7f9a1197a7875a246a348dc", "tree": "88e6f8030ac768476433599d1276c0875862fb4f", "parents": [ "df96e96f76571c30d903829a7b2ab2b421028790" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed May 19 16:28:28 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri May 21 21:12:00 2010 +0200" }, "message": "drbd: Do not Oops when C_STANDALONE when uuid gets generated\n\nGot introduces with\n\ncommit 0c3f34516e8c5a1a0ba3585a7777d32bbbdf4ecb\nAuthor: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nDate: Mon May 17 16:10:43 2010 +0200\n\n drbd: Create new current UUID as late as possible\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "c3473c63542d53740f175f3a515257ae159e998b", "tree": "20832b70ba6f89aacaa377d41b7427d74be647b1", "parents": [ "6245838fe4d2ce4aab52f543224f7d1212d9155c" ], "author": { "name": "David Zeuthen", "email": "davidz@redhat.com", "time": "Mon May 03 14:08:59 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri May 21 09:37:30 2010 -0700" }, "message": "generate \"change\" uevent for loop device\n\nRecent udev versions probe loop devices for filesystems meaning that\nthe /dev/disk hierarchy may contain useful entries such as\n\n $ ls -l /dev/disk/by-label/Fedora-12-x86_64-Live\n lrwxrwxrwx 1 root root 11 Mar 11 13:41 /dev/disk/by-label/Fedora-12-x86_64-Live -\u003e ../../loop0\n\nUnfortunately, no \"change\" uevent is generated when the loop device is\ndetached so the symlink persists. Additionally, no \"change\" uevent is\nguaranteed to be generated when attaching an fd or changing capacity.\nFor example, user space could open the loop device O_RDONLY (in fact,\nrecent util-linux-ng does this) so udev\u0027s OPTIONS+\u003d\"watch\" machinery may\nnot trigger the \"change\" uevent.\n\nThis patch ensures that the \"change\" uevent is generated in all of\nthese cases. As a result, the /dev/disk hierarchy works as expected\nfor loop devices.\n\nSigned-off-by: David Zeuthen \u003cdavidz@redhat.com\u003e\nAcked-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "f39d01be4c59a61a08d0cb53f615e7016b85d339", "tree": "6777590e3ff2ddf4df1d38444ba7d692cd463b7b", "parents": [ "54291263519ac2c9bdda68b23b02fef3808deed4", "7db82437cfcac4bdfe79a6323eb554fdfa271623" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:20:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:20:59 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)\n vlynq: make whole Kconfig-menu dependant on architecture\n add descriptive comment for TIF_MEMDIE task flag declaration.\n EEPROM: max6875: Header file cleanup\n EEPROM: 93cx6: Header file cleanup\n EEPROM: Header file cleanup\n agp: use NULL instead of 0 when pointer is needed\n rtc-v3020: make bitfield unsigned\n PCI: make bitfield unsigned\n jbd2: use NULL instead of 0 when pointer is needed\n cciss: fix shadows sparse warning\n doc: inode uses a mutex instead of a semaphore.\n uml: i386: Avoid redefinition of NR_syscalls\n fix \"seperate\" typos in comments\n cocbalt_lcdfb: correct sections\n doc: Change urls for sparse\n Powerpc: wii: Fix typo in comment\n i2o: cleanup some exit paths\n Documentation/: it\u0027s -\u003e its where appropriate\n UML: Fix compiler warning due to missing task_struct declaration\n UML: add kernel.h include to signal.c\n ...\n" }, { "commit": "09ec6b69d2b97d6fca16cfe91b4634506f4db0a7", "tree": "eed15ab08e6e10fcdc14510752402ffcdb0a8db3", "parents": [ "505b0451c47699ca63db70bd5ec3bba187ec4bfd" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Mon Apr 12 16:18:36 2010 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed May 19 22:15:42 2010 +0930" }, "message": "virtio_blk: use virtqueue_xxx wrappers\n\nSwitch virtio_blk to new virtqueue_xxx wrappers.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "bdb4a1305723f985249210a803105dbc48e86b64", "tree": "426ffd80d67db47aebf116a2f99529d56e507c3c", "parents": [ "234f2725a5d03f78539f1d36cb32f2c4f9b1822c" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed May 19 22:15:40 2010 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed May 19 22:15:41 2010 +0930" }, "message": "virtio_blk: remove multichar constant.\n\ndrivers/block/virtio_blk.c:228:13: warning: multi-character character constant\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: john cooper \u003cjohn.cooper@redhat.com\u003e\n" }, { "commit": "234f2725a5d03f78539f1d36cb32f2c4f9b1822c", "tree": "583925489f277e88f4326bbb7a22018b1c1ceb01", "parents": [ "4cb2ea28c55cf5e5ef83aec535099ffce3c583df" ], "author": { "name": "john cooper", "email": "john.cooper@redhat.com", "time": "Thu Mar 25 01:34:02 2010 -0400" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed May 19 22:15:40 2010 +0930" }, "message": "Add virtio disk identification ioctl\n\nReturn serial string to the guest application via\nioctl driver call.\n\nNote this form of interface to the guest userland\nwas the consensus when the prior version using\nthe ATA_IDENTIFY came under dispute.\n\nSigned-off-by: john cooper \u003cjohn.cooper@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "4cb2ea28c55cf5e5ef83aec535099ffce3c583df", "tree": "5ec629c60a32c67946bb2ce17bf71eb282d18e47", "parents": [ "537b60d17894b7c19a6060feae40299d7109d6e7" ], "author": { "name": "john cooper", "email": "john.cooper@redhat.com", "time": "Thu Mar 25 01:33:33 2010 -0400" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed May 19 22:15:40 2010 +0930" }, "message": "Add virtio disk identification support\n\nAdd virtio-blk device id (s/n) support via virtio request.\n\nSigned-off-by: john cooper \u003cjohn.cooper@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "61c7a080a5a061c976988fd4b844dfb468dda255", "tree": "8cb492b73f2755c38a6164d770da34d5af6486a0", "parents": [ "d12d42f744f805a9ccc33cd76f04b237cd83ce56" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:12:29 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 18 16:10:44 2010 -0600" }, "message": "of: Always use \u0027struct device.of_node\u0027 to get device node pointer.\n\nThe following structure elements duplicate the information in\n\u0027struct device.of_node\u0027 and so are being eliminated. This patch\nmakes all readers of these elements use device.of_node instead.\n\n(struct of_device *)-\u003enode\n(struct dev_archdata *)-\u003eprom_node (sparc)\n(struct dev_archdata *)-\u003eof_node (powerpc \u0026 microblaze)\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "1014cfe2fb4cdd663137aafb21448cb613dd6a7d", "tree": "13b5fc4e7036b4226d94bd33aefb74a3dbb25b6a", "parents": [ "8123d8f17d8ba9d67e556688e4f025456ca97842", "4726f2a617ebd868a4fdeb5679613b897e5f1676" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:17:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:17:35 2010 -0700" }, "message": "Merge branch \u0027core-locking-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-locking-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n lockdep: Reduce stack_trace usage\n lockdep: No need to disable preemption in debug atomic ops\n lockdep: Actually _dec_ in debug_atomic_dec\n lockdep: Provide off case for redundant_hardirqs_on increment\n lockdep: Simplify debug atomic ops\n lockdep: Fix redundant_hardirqs_on incremented with irqs enabled\n lockstat: Make lockstat counting per cpu\n i8253: Convert i8253_lock to raw_spinlock\n" }, { "commit": "2db4e42eaceabec42f738f3895300632cd375e67", "tree": "b0ea75fc16a8a6d20ef9ba218eefaa3afc865887", "parents": [ "0c3f34516e8c5a1a0ba3585a7777d32bbbdf4ecb" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu May 13 22:02:21 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 02:04:10 2010 +0200" }, "message": "drivers/block/drbd: Use kzalloc\n\nUse kzalloc rather than the combination of kmalloc and memset.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression x,size,flags;\nstatement S;\n@@\n\n-x \u003d kmalloc(size,flags);\n+x \u003d kzalloc(size,flags);\n if (x \u003d\u003d NULL) S\n-memset(x, 0, size);\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "0c3f34516e8c5a1a0ba3585a7777d32bbbdf4ecb", "tree": "bb61a6235de8a6a87ebc4d4f39630d17e3c9a3de", "parents": [ "9a25a04c8079725c1b1ab756694a8e0757844b40" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Mon May 17 16:10:43 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 02:03:49 2010 +0200" }, "message": "drbd: Create new current UUID as late as possible\n\nThe choice was to either delay creation of the new UUID until\nIO got thawed or to delay it until the first IO request.\n\nBoth are correct, the later is more friendly to users of\ndual-primary setups, that actually only write on one side.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "9a25a04c8079725c1b1ab756694a8e0757844b40", "tree": "ed8fbbbbd7cb4db7d77531bcd2c046f5bd0170c1", "parents": [ "a1c88d0d7aa2ef427f78834c9a3b0a673a19dca6" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Mon May 10 16:42:23 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 02:03:32 2010 +0200" }, "message": "drbd: If we detect late that IO got frozen, retry after we thawed.\n\nIf we detect late (\u003d after grabing mdev-\u003ereq_lock) that IO got frozen, we\nreturn 1 to generic_make_request(), which simply will retry to make a\nrequest for that bio.\n\nIn the subsequent call of generic_make_request() into drbd_make_request_26()\nwe sleep in inc_ap_bio().\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "a1c88d0d7aa2ef427f78834c9a3b0a673a19dca6", "tree": "be62930616401a30e3d4784a109c001323d4470a", "parents": [ "bb3d000cb99aa0924b78c1ae5f5943484527868a" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Fri May 14 19:16:41 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 02:03:05 2010 +0200" }, "message": "drbd: always use_bmbv, ignore setting\n\nNow that the peer may handle multi-bio EEs,\nwe can ignore the peer\u0027s limit,\nand concentrate on the limits of the local IO stack.\n\nThis is safe accross drbd protocol versions,\nas our queue_max_sectors() will be adjusted accordingly.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "bb3d000cb99aa0924b78c1ae5f5943484527868a", "tree": "276a13a6f1484ae255725d0faab55ff071b68a98", "parents": [ "45bb912bd5ea4d2b3a270a93cbdf767a0e2df6f5" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Fri May 14 19:08:55 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 02:02:36 2010 +0200" }, "message": "drbd: allow resync requests to be larger than max_segment_size\n\nthis should allow for better background resync performance.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "45bb912bd5ea4d2b3a270a93cbdf767a0e2df6f5", "tree": "d95d27ea8e945fcda3427c50a5bc062c804c6eff", "parents": [ "708d740ed8242b84eefc63df144313a7308c7de5" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Fri May 14 17:10:48 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 02:01:23 2010 +0200" }, "message": "drbd: Allow drbd_epoch_entries to use multiple bios.\nThis should allow for better performance if the lower level IO stack\nof the peers differs in limits exposed either via the queue,\nor via some merge_bvec_fn.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "708d740ed8242b84eefc63df144313a7308c7de5", "tree": "6128220244460b945e09b8da4136f66fad08360f", "parents": [ "162f3ec7f026784ff2e216f19147d67e2f8ccd56" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Mon May 03 10:38:57 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:28:35 2010 +0200" }, "message": "drbd: reduce sizeof struct drbd_epoch_entry by 8 byte by aligning members\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "162f3ec7f026784ff2e216f19147d67e2f8ccd56", "tree": "ef211a8348dc4862da7ce21c315aed2e37e8de7b", "parents": [ "a8cdfd8d3bf0b6d2bbe792f5e74f54ccc6bc1d4f" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu May 06 15:19:30 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:28:08 2010 +0200" }, "message": "drbd: Fixes to the new delay_probes code\n\n* Only send delay_probes with protocol 93 or newer\n* drbd_send_delay_probes() is called only from worker context,\n no atomic_t needed for delay_seq\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "a8cdfd8d3bf0b6d2bbe792f5e74f54ccc6bc1d4f", "tree": "6301877820e111e09c3ff4fe9ab7aece59dd71c7", "parents": [ "eedf386ae9d9e80a5669107e960090951e62f3a3" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed May 05 20:53:33 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:26:51 2010 +0200" }, "message": "drbd: A fixes to the new resync speed code\n\n* Mention P_DELAY_PROBE in the packet naming array\n* Do not corrupt the mdev-\u003edata.work list in case the timer goes\n off before delay_probe_work got handled by the worker\n* Do not mod_timer() twice for a single delay_probe pair\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "eedf386ae9d9e80a5669107e960090951e62f3a3", "tree": "1f1d6739b6b6009c12f7a68dfe1d347fdba85868", "parents": [ "cdd67a74603d0453ddffc24c572aed2ddd1795b8" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 04 16:31:03 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:26:27 2010 +0200" }, "message": "drbd: Proc bits of new resync speed stuff\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "cdd67a74603d0453ddffc24c572aed2ddd1795b8", "tree": "d2a478bf8b225540044895ccf5b3b1575cc8bbd4", "parents": [ "bd26bfc5b4253425d17aa49648ae1f3e976041c4" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 04 16:57:18 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:25:47 2010 +0200" }, "message": "drbd: Control the actual resync rate based on the queuing delay of data packets\n\nIn a setup with a high bandwidth and high latency network, eventually\ninvolving deep queues in routers, it is beneficial to only fill those\nqueues up to an limited extend with resync data.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "bd26bfc5b4253425d17aa49648ae1f3e976041c4", "tree": "f4e052f417333ad045772f2aff52c56e8401ce60", "parents": [ "67c7ddd055c794f0d8e9466ca2d6b5cc0b73d4df" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 04 12:33:58 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:25:28 2010 +0200" }, "message": "drbd: Actually send delay probes\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "67c7ddd055c794f0d8e9466ca2d6b5cc0b73d4df", "tree": "c68ceb828b3677a7d68eb7065790e8d957d973c1", "parents": [ "7237bc430f49de1145d761c4b39f2ebae58842d5" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 04 11:12:00 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:25:00 2010 +0200" }, "message": "drbd: Four new configuration settings for resync speed control\n\nTo reasonably control resync speed over drbd-proxy connections,\ndrbd has to measure the current delay of packets transmitted over\nthe (possibly congested) data socket vs the meta-data socket.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "7237bc430f49de1145d761c4b39f2ebae58842d5", "tree": "281dd6163cf75db400f2eb076fcbafaee5d0f193", "parents": [ "0ced55a3bed25b0e30dcb3c7dce9634ce3c60cf2" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Mon May 03 15:10:47 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:22:46 2010 +0200" }, "message": "drbd: Sending of delay_probes\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "0ced55a3bed25b0e30dcb3c7dce9634ce3c60cf2", "tree": "7c5770c396588432619ecd2af5793a04ca7080b5", "parents": [ "5223671bb0315d83f9ad7becbbb9e703aa735bbe" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Fri Apr 30 15:26:20 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:22:11 2010 +0200" }, "message": "drbd: Receiving of delay_probes\n\nDelay_probes are new packets in the DRBD protocol, which allow\nDRBD to know the current delay packets have on the data socket.\n(relative to the meta data socket)\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "5223671bb0315d83f9ad7becbbb9e703aa735bbe", "tree": "abd92e52a9a4b65a4c927e81bfd05896faa0c197", "parents": [ "6b4388ac1f282515db3a651707238cad00b50e80" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed Apr 28 14:46:57 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:20:33 2010 +0200" }, "message": "drbd: Fixed bitmap in case of online-grow without resync\n\nThe \"surplus\" bits of the old (smaller) bitmap must be clean\nin case of online-grow without resync.\n\nNote: Reverted 67ae8b80d4a116ab3b7094eb3723506b20c06dff as\nwell, since the lines added by this patch are redundant. The\nbits get set by the bm_set_surplus(b) call before that.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "6b4388ac1f282515db3a651707238cad00b50e80", "tree": "9288c637bdc8b171dbbe13aeedac7179fc9b4fcf", "parents": [ "087c24925cf4209be1a91f8ede9241e17e9734c7" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Mon Apr 26 14:11:45 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:19:51 2010 +0200" }, "message": "drbd: Added transmission faults to the fault injection code\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "087c24925cf4209be1a91f8ede9241e17e9734c7", "tree": "adb2f50d3dddf1b2d55859c0582e4f3216d9b091", "parents": [ "6495d2c6d04f4c45411fdb1b40527c24015f39d6" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Fri Mar 26 13:49:56 2010 +0100" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:18:22 2010 +0200" }, "message": "drbd: bugfix: Make resize work, if remote\u0027s size was limiting and increased in the meantime\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "6495d2c6d04f4c45411fdb1b40527c24015f39d6", "tree": "cb7262a4b4750bb0fba045f492ffedbf8eef6701", "parents": [ "b4ee79dac3bddc468e21cae0deb00b80ec4ac051" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed Mar 24 16:07:04 2010 +0100" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:17:47 2010 +0200" }, "message": "drbd: Implemented the --assume-clean option for drbdsetup resize\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "b4ee79dac3bddc468e21cae0deb00b80ec4ac051", "tree": "cbba8a249e20f2b0d03a5f7c91eedd02f293bf42", "parents": [ "fd76438c2421324fa2fb9303e760ec5332ff0b58" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu Apr 01 09:57:40 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:17:11 2010 +0200" }, "message": "drbd: Added some missing statics\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "fd76438c2421324fa2fb9303e760ec5332ff0b58", "tree": "98968e899931e1df65df41505a4095874912763b", "parents": [ "e89b591c3aba0af87f5248b15f56ce7a4f439c16" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu Apr 01 09:57:40 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:16:20 2010 +0200" }, "message": "drbd: Make sure to resync all of the new storage upon online resize\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "e89b591c3aba0af87f5248b15f56ce7a4f439c16", "tree": "311b6977d986e9549ee9193b4471fc937007c3f5", "parents": [ "02d9a94bbb0d4e0fec8db6735bdc4ccfaac8f0ce" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed Mar 24 17:11:33 2010 +0100" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:15:44 2010 +0200" }, "message": "drbd: Implemented flags for the resize packet\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "02d9a94bbb0d4e0fec8db6735bdc4ccfaac8f0ce", "tree": "f8a2c63b8b84e0aef6d7e8fc920b20c5bb14c1c4", "parents": [ "d845030f21859dd11bcecc7e1b8575fb845eb425" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed Mar 24 16:23:03 2010 +0100" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:14:43 2010 +0200" }, "message": "drbd: Implemented the set_new_bits parameter for drbd_bm_resize()\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "d845030f21859dd11bcecc7e1b8575fb845eb425", "tree": "4b1a5bcf9389bf0e7eb31aa762b2a37ba6070cf4", "parents": [ "3a11a4878939e0e3c355bf3f52ef642a4cb6ba84" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed Mar 24 15:51:26 2010 +0100" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:14:04 2010 +0200" }, "message": "drbd: made determin_dev_size\u0027s parameter an flag enum\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "3a11a4878939e0e3c355bf3f52ef642a4cb6ba84", "tree": "43fb6bddbdc968e7d9e2657b8dca585c1c6d5788", "parents": [ "979f5c7f1f6c8a532b943defb790d43b999934eb" ], "author": { "name": "Adam Gandelman", "email": "adam.gandelman@linbit.com", "time": "Thu Apr 08 16:48:23 2010 -0700" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:13:33 2010 +0200" }, "message": "drbd: New handler: initial-split-brain\n\nSome wish to be notified of all instances of split brain, not just those that\ngo unresolved. The initial-split-brain handler is called to notify someone\nupon detection of all split brain conditions even if auto-recovery policies\nare configured.\n\nSigned-off-by: Adam Gandelman \u003cadam.gandelman@linbit.com\u003e\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "979f5c7f1f6c8a532b943defb790d43b999934eb", "tree": "64799998f0e104595281c32101218452736296fa", "parents": [ "6666032ade5a758aa05380ab92f416ab8ef25005" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Tue Apr 06 14:15:06 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:10:31 2010 +0200" }, "message": "drbd: fail_requests_early: remove incorrect and unnecessary optimization\n\nThe condition does not fit the commend (I may well be Primary,\neven if I lost the disk earlier and now the connection).\n\nAnd this is catched below anyways, where it also gets logged.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "6666032ade5a758aa05380ab92f416ab8ef25005", "tree": "be2ef8e83cfd52afb31fee9574baebf5b6d3866c", "parents": [ "c3fe30b0e7cd67e0207097f5f39ce9626644879e" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Tue Apr 06 12:15:04 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:09:57 2010 +0200" }, "message": "drbd: check for corrupt or malicous sector addresses when receiving data\n\nEven if it should never happen if the peer does behave, we need to\ndouble check, and not even attempt access beyond end of device.\nIt usually would be caught by lower layers, resulting in \"IO error\",\nbut may also end up in the internal meta data area.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "c3fe30b0e7cd67e0207097f5f39ce9626644879e", "tree": "d2c8fbc9b6dec42f0dc0e902eade9b22e921bb17", "parents": [ "8d4ce82b3ccd755c8ba401469ced5286b1e02284" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu Apr 01 09:57:40 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:09:13 2010 +0200" }, "message": "drbd: cleanup: This code path to trigger a resync is no longer needed\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "8d4ce82b3ccd755c8ba401469ced5286b1e02284", "tree": "9cd1b789104e4570294893856b49d3fb150379b5", "parents": [ "c3470cde57ea34d9b4bd34891ec040e46b9fb3bf" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Thu Apr 01 16:59:32 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:08:18 2010 +0200" }, "message": "drbd: don\u0027t start a resync without access to up-to-date Data\n\nIn case both nodes are \"inconsistent\", invalidate would\nhave started a resync anyways, without a chance to ever\nsucceed, just filling the logs with warning messages.\n\nSimply disallow that state change,\nre-using the SS_NO_UP_TO_DATE_DISK return value.\n\nThis also changes the corresponding error string to\n\"Need access to UpToDate Data\" -- I found the\n\"Refusing to be Primary without at least one UpToDate disk\"\nanswer misleading in some situations anyways.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "c3470cde57ea34d9b4bd34891ec040e46b9fb3bf", "tree": "b1aa11a591b7cd1cbaf3fa9abb21ec7c8050267a", "parents": [ "8d1894ebe441093cfd967affcbc56b764960575e" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Thu Apr 01 16:57:19 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:07:38 2010 +0200" }, "message": "drbd: fix potential protocol error\n\nDon\u0027t forget to drain the digest in case we cannot satisfy a\nchecksum based resync or online-verify request.\n\nIt would additionally cause a protocoll error,\ndropping the connection.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "8d1894ebe441093cfd967affcbc56b764960575e", "tree": "9dc8e3ea79f683502b712c8dea92cb67077576fa", "parents": [ "e0f83012dc510b0be92ee2d59227a573a36777b8" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Thu Apr 01 16:55:18 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:06:59 2010 +0200" }, "message": "drbd: remove bogus ASSERT\n\nblock_id may be ID_SYNCER,\nas well as checksum based resync request magic, or online verify magic.\n\nLet\u0027s just drop that ASSERT.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "e0f83012dc510b0be92ee2d59227a573a36777b8", "tree": "891cfe0ba0503f51db260ed189f3f760b85b274d", "parents": [ "e4f925e12ea5daaa9baf2dd5af9c4951721dae95" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Thu Apr 01 15:13:19 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:06:07 2010 +0200" }, "message": "drbd: fix regression: attach while connected failed\n\ncommit e4f925e12ea5daaa9baf2dd5af9c4951721dae95\nAuthor: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nDate: Wed Mar 17 14:18:41 2010 +0100\n\n drbd: Do not upgrade state to Outdated if already Inconsistent\n\nprevented the necessary state transition for attaching while connected\n(Diskless -\u003e Consistent respectively Outdated).\nThis is the fix for the fix.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "e4f925e12ea5daaa9baf2dd5af9c4951721dae95", "tree": "1a4022d30e051a58ef68734f11f9db62f9078fad", "parents": [ "8c484ee4910b36c9ac273ad1150261c6ebfc1ef7" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed Mar 17 14:18:41 2010 +0100" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 01:01:05 2010 +0200" }, "message": "drbd: Do not upgrade state to Outdated if already Inconsistent [Bugz 277]\n\nThere was a race condition:\n In a situation with a SyncSource+Primary and a SyncTarget+Secondary node,\n and a resync dependency to some other device. After both nodes decided\n to do the resync, the other device finishes its resync process.\n At that time SyncSource already sent the P_SYNC_UUID packet, and\n already updated its peer disk state to Inconsistent.\n The SyncTarget node waits for the P_SYNC_UUID and sends a state packet\n to report the resync dependency change. That packet still carries\n a disk state of Outdated.\n\nImpact:\n If application writes come in, during that time on the Primary node,\n those do not get replicated, and the out-of-sync counter gets increased.\n \u003d\u003e The completion of resync is not detected on the primary node.\n \u003d\u003e stalled.\n Those blocks get resync\u0027ed with the next resync, since the are get\n marked as out-of-sync in the bitmap.\n\nIn order to fix this, we filter out that wrong state change in the\nsanitize_state() function.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "8c484ee4910b36c9ac273ad1150261c6ebfc1ef7", "tree": "d55a77ac40da505e199437d81a5f7344ad7c824b", "parents": [ "5547e8aac6f71505d621a612de2fca0dd988b439" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Thu Mar 11 16:47:58 2010 +0100" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Tue May 18 00:59:00 2010 +0200" }, "message": "drbd: use proc_create_data with explicit NULL argument\n\nTo document that we know about deprecation of proc_create,\neven though we are not affected, as we don\u0027t use the -\u003edata member,\nopen code proc_create_data(..., NULL);\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "92183b346f02773dae09182c65f16b013f295d80", "tree": "51c6741126aada9f72ca1c5ce30e468b460414cd", "parents": [ "ff2db7c5ab78817eb3c5d15dd87f18e9be726f1a" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Apr 05 13:02:13 2009 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Mon May 17 21:37:45 2010 +0200" }, "message": "m68k: amiga - Floppy platform device conversion\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "c2d45b4da042720ae94648b417d0e051742441d4", "tree": "920d75ff3fe955ce01121fbb527fdd15015a6549", "parents": [ "ca0dbd86b12be9af7cda230890eb741d5cb8b624" ], "author": { "name": "Bill Pemberton", "email": "wfp5p@virginia.edu", "time": "Fri Apr 30 09:34:32 2010 -0400" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue May 11 09:59:26 2010 +0200" }, "message": "cciss: fix shadows sparse warning\n\nFix sparse warnings:\n\ndrivers/block/cciss.c:1591:37: warning: symbol \u0027i\u0027 shadows an earlier one\ndrivers/block/cciss.c:2437:21: warning: symbol \u0027i\u0027 shadows an earlier one\n\nSigned-off-by: Bill Pemberton \u003cwfp5p@virginia.edu\u003e\nAcked-by: Mike Miller \u003cmike.miller@hp.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "2395e463fefd4aa8b784787e926e9b84e216d14f", "tree": "e580063214259bced21018dd4f7915523e572710", "parents": [ "01effb0dc1451fad55925873ffbfb88fa4eadce0" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue May 11 09:02:55 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Tue May 11 09:02:55 2010 +0200" }, "message": "paride: fix menu indentation\n\nMake the PARIDE menu be displayed correctly, with proper/expected\nindentation, by moving the GDROM kconfig symbol, which was\nsplitting the PARIDE kconfig symbol from its dependent symbols.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "6a7cc883d6ad95bb89282fc04e917c16d2b5584f", "tree": "d22aadedb814584b7305586feefbcb35345372de", "parents": [ "be1066bbcd443a65df312fdecea7e4959adedb45", "5c3c7e64bbcb60db39d0d55c8fab39ef41d41c30" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Tue May 04 08:48:53 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Tue May 04 08:48:53 2010 +0200" }, "message": "Merge branch \u0027for-jens\u0027 of git://git.drbd.org/linux-2.6-drbd into for-linus\n" }, { "commit": "5c3c7e64bbcb60db39d0d55c8fab39ef41d41c30", "tree": "91e5c767a24eb468ef210474784a5902a0d253a3", "parents": [ "3c2023dd8ed31e2ecfbb2d5aa20e8884d4b339e2" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Sat Apr 10 02:10:09 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Mon May 03 22:40:16 2010 +0200" }, "message": "drbd: don\u0027t expose failed local READ to upper layers\n\nfix regression introduced in 8.3.3:\n commit a9b17323f2875f5d9b132c2b476a750bf44b10c7\n Author: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n Date: Wed Aug 12 15:18:33 2009 +0200\n\n out-of-spinlock completion of master bio\n\n : (bio_rw(bio) \u003d\u003d READA)\n ? read_completed_with_error\n : read_ahead_completed_with_error;\n\nis obviously not what was intended.\n\nNo one noticed because of\n * page-cache at work,\n * local RAIDs\n\nImpact:\nFailed local READs are not retried remotely,\nbut errored to upper layers, causing filesystems\nto remount read-only, or worse.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "53ba4f2fa73225113a488584df0d85d3cba52943", "tree": "d85b984d9818abc3ccc0237eb53b710d9e96c39e", "parents": [ "bd6d29c25bb1a24a4c160ec5de43e0004e01f72b", "66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon May 03 09:17:01 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon May 03 09:17:01 2010 +0200" }, "message": "Merge commit \u0027v2.6.34-rc6\u0027 into core/locking\n" }, { "commit": "f80a0ca6ad8f2800453e819dafa09a0ed9e56850", "tree": "bdbffa0e212888c31e11e89dc1194935f6825085", "parents": [ "a36fed12a4d980eebb2e67b87ea30ad090238cff" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Apr 28 14:36:41 2010 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 29 08:44:37 2010 -0700" }, "message": "pktcdvd: improve BKL and compat_ioctl.c usage\n\nThe pktcdvd driver uses proper locking and does not need the BKL in the\nioctl and llseek functions of the character device, so kill both.\n\nMoving the compat_ioctl handling from common code into the driver itself\nfixes build problems when CONFIG_BLOCK is disabled.\n\nAcked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7407cf355fdf5500430be966dbbde84a27293bad", "tree": "922861288ff38558ed721a79653f52b17b13bb95", "parents": [ "6a47dc1418682c83d603b491df1d048f73aa973e", "79dba2eaa771c3173957eccfd288e0e0d12e4d3f" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 29 09:36:24 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 29 09:36:24 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-2.6.35\n\nConflicts:\n\tfs/block_dev.c\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "fbd9b09a177a481eda256447c881f014f29034fe", "tree": "ef7e213045382f82a1e3e3cf134d196a1045dd7a", "parents": [ "6b4517a7913a09d3259bb1d21c9cb300f12294bd" ], "author": { "name": "Dmitry Monakhov", "email": "dmonakhov@openvz.org", "time": "Wed Apr 28 17:55:06 2010 +0400" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Wed Apr 28 19:47:36 2010 +0200" }, "message": "blkdev: generalize flags for blkdev_issue_fn functions\n\nThe patch just convert all blkdev_issue_xxx function to common\nset of flags. Wait/allocation semantics preserved.\n\nSigned-off-by: Dmitry Monakhov \u003cdmonakhov@openvz.org\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "7e2455c1a123ceadbb35150a610d61e8443fd340", "tree": "a2efcd21b21ce8af1ae571d13ab42d65265efb98", "parents": [ "7ac314c82f552eefebaa91c9fffe8c0d435641b9" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu Apr 22 14:50:23 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 22 14:50:23 2010 +0200" }, "message": "drbd: Terminate a connection early if sending the protocol fails\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "7ac314c82f552eefebaa91c9fffe8c0d435641b9", "tree": "08143785dae9710e291af83aae8278576f103786", "parents": [ "6de9400250f95f82da432c28b9b43823f4154c58" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Thu Apr 22 14:27:23 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 22 14:27:23 2010 +0200" }, "message": "drbd: fix memory leak\n\nWe leak memory if \"--dry-run\" is not supported by the peer.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "2f4084209adc77f9a1c9f38db3019a509e167882", "tree": "775657114c885505ecc46605e29ea1470e986f76", "parents": [ "2f10ffcfb28beb35137d9e86992c771b4a6c5f2a", "3440c49f5c5ecb4f29b0544aa87da71888404f8f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 09 11:50:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 09 11:50:29 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block: (34 commits)\n cfq-iosched: Fix the incorrect timeslice accounting with forced_dispatch\n loop: Update mtime when writing using aops\n block: expose the statistics in blkio.time and blkio.sectors for the root cgroup\n backing-dev: Handle class_create() failure\n Block: Fix block/elevator.c elevator_get() off-by-one error\n drbd: lc_element_by_index() never returns NULL\n cciss: unlock on error path\n cfq-iosched: Do not merge queues of BE and IDLE classes\n cfq-iosched: Add additional blktrace log messages in CFQ for easier debugging\n i2o: Remove the dangerous kobj_to_i2o_device macro\n block: remove 16 bytes of padding from struct request on 64bits\n cfq-iosched: fix a kbuild regression\n block: make CONFIG_BLK_CGROUP visible\n Remove GENHD_FL_DRIVERFS\n block: Export max number of segments and max segment size in sysfs\n block: Finalize conversion of block limits functions\n block: Fix overrun in lcm() and move it to lib\n vfs: improve writeback_inodes_wb()\n paride: fix off-by-one test\n drbd: fix al-to-on-disk-bitmap for 4k logical_block_size\n ...\n" }, { "commit": "02246c41171097ceab3246f6dc251ac89de6004b", "tree": "f50a2cc750b730ebf71f30e7badc723d25876155", "parents": [ "a74b2adae06265b8cfa335d7d40d4a5abd11e977" ], "author": { "name": "Nikanth Karthikesan", "email": "knikanth@suse.de", "time": "Thu Apr 08 21:39:31 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 08 21:39:31 2010 +0200" }, "message": "loop: Update mtime when writing using aops\n\nUpdate mtime when writing to backing filesystem using the address space\noperations write_begin and write_end.\n\nSigned-off-by: Nikanth Karthikesan \u003cknikanth@suse.de\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "829f46af39d50a43e260adaa9e7bbdff74a9f696", "tree": "f5ac404a4b92a6d5d54957ab5cb0736633ea79f7", "parents": [ "c6eb69acfdfe258b4a3f69fa5ced8928bbebdba9" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Tue Apr 06 14:34:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:38:03 2010 -0700" }, "message": "cciss: unlock on error path\n\nWe take the spin_lock again in fail_all_cmds() so we need to unlock here.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: Steve Cameron \u003cscameron@beardog.cce.hp.com\u003e\nCc: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b2b163dd47024e445410b72d0c5df6d819c14dfd", "tree": "587717f64b0c52c7b56de1f44a89843d9a2f08d9", "parents": [ "61917bdaaf6bea4b885525cf63f65272914f6be2" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Fri Apr 02 08:40:33 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri Apr 02 08:40:33 2010 +0200" }, "message": "drbd: lc_element_by_index() never returns NULL\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "61917bdaaf6bea4b885525cf63f65272914f6be2", "tree": "e8b1fbbad686676ebc9a234e0e2de9d57e8488ea", "parents": [ "39c01b219fd30c74869b6fc8749f7900f04e9ef6" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Fri Apr 02 08:39:40 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri Apr 02 08:39:40 2010 +0200" }, "message": "cciss: unlock on error path\n\nWe take the spin_lock again in fail_all_cmds() so we need to unlock\nhere.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "b4b7a4ef097f288f724420b473dbf92a89c0ab7e", "tree": "23ad8101e3e77c32a8d1e1b95a9c1cd7f7a475b7", "parents": [ "e9ce335df51ff782035a15c261a3c0c9892a1767", "a3d3203e4bb40f253b1541e310dc0f9305be7c84" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri Mar 19 08:05:10 2010 +0100" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri Mar 19 08:05:10 2010 +0100" }, "message": "Merge branch \u0027master\u0027 into for-linus\n\nConflicts:\n\tblock/Kconfig\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "ee714f2dd33e726346e34f5cda12543162f4753e", "tree": "63252755cc38a81085191e6b851a6a04623cc9b9", "parents": [ "2cda2728aa1c8c006418a24f867b25e5eb7a32e2" ], "author": { "name": "Martin K. Petersen", "email": "martin.petersen@oracle.com", "time": "Wed Mar 10 00:48:32 2010 -0500" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Mon Mar 15 12:47:59 2010 +0100" }, "message": "block: Finalize conversion of block limits functions\n\nRemove compatibility wrappers and update remaining drivers.\n\nSigned-off-by: Martin K. Petersen \u003cmartin.petersen@oracle.com\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "c32da02342b7521df25fefc2ef20aee0e61cf887", "tree": "7e38f664fa3e13602c357d37f77d8adcf82fccc2", "parents": [ "dca1d9f6d7ae428c193f32bd3e9a4ca13176648b", "318ae2edc3b29216abd8a2510f3f80b764f06858" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:04:50 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:04:50 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits)\n doc: fix typo in comment explaining rb_tree usage\n Remove fs/ntfs/ChangeLog\n doc: fix console doc typo\n doc: cpuset: Update the cpuset flag file\n Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed\n Remove drivers/parport/ChangeLog\n Remove drivers/char/ChangeLog\n doc: typo - Table 1-2 should refer to \"status\", not \"statm\"\n tree-wide: fix typos \"ass?o[sc]iac?te\" -\u003e \"associate\" in comments\n No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h\n devres/irq: Fix devm_irq_match comment\n Remove reference to kthread_create_on_cpu\n tree-wide: Assorted spelling fixes\n tree-wide: fix \u0027lenght\u0027 typo in comments and code\n drm/kms: fix spelling in error message\n doc: capitalization and other minor fixes in pnp doc\n devres: typo fix s/dev/devm/\n Remove redundant trailing semicolons from macros\n fix typo \"definetly\" -\u003e \"definitely\" in comment\n tree-wide: s/widht/width/g typo in comments\n ...\n\nFix trivial conflict in Documentation/laptops/00-INDEX\n" }, { "commit": "724ee626f38feaea215a11790e1a0cb5d83b0628", "tree": "499e03c265dd8de1d5b145d1a413b45b186b5694", "parents": [ "0aad92cfea6fec14bd57dd9c283cc6eb023c97bd" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Wed Mar 10 15:21:11 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:31 2010 -0800" }, "message": "drivers/block/floppy.c: remove unnecessary casting in fd_ioctl\n\nConvert outparam to const void *.\nCast outparam to const char * for strlen().\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCc: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nCc: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nCc: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0aad92cfea6fec14bd57dd9c283cc6eb023c97bd", "tree": "ec6f212f60ffc8ace932ee5995797f3c9a63132a", "parents": [ "712e1de43ed572886d6913a86eee5e73b7de4318" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Wed Mar 10 15:21:10 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:31 2010 -0800" }, "message": "drivers/block/floppy.c: remove misleading, used once FD_IOCTL_ALLOWED macro\n\nJust code the test directly\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCc: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nCc: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nCc: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "712e1de43ed572886d6913a86eee5e73b7de4318", "tree": "584ed5a9e06a3e30fd9b03717411c60ea035a9bb", "parents": [ "ded2863d09208b27baa4a6ad95bb7e5539e48c05" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Wed Mar 10 15:21:10 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:31 2010 -0800" }, "message": "drivers/block/floppy.c: remove obfuscating CODE2SIZE macro\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCc: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nCc: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nCc: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ded2863d09208b27baa4a6ad95bb7e5539e48c05", "tree": "a974104fe50bab2e8a213db30d3076ac580b859f", "parents": [ "7f2527174ab1ee7f4550c91be47b3f843ff1316d" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Wed Mar 10 15:21:09 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:31 2010 -0800" }, "message": "drivers/block/floppy.c: add __func__ to debugt\n\nMake debugt messages a little neater.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCc: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nCc: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nCc: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7f2527174ab1ee7f4550c91be47b3f843ff1316d", "tree": "4d665f8968d1686930ad37eaeb01bc148f71578f", "parents": [ "ce2f11fe784f7999b82c7a71cdbcb86ad2653def" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Wed Mar 10 15:21:08 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:31 2010 -0800" }, "message": "drivers/block/floppy.c: convert raw_cmd_copyin from while(1) to label: goto\n\nReduces indent.\nMakes a bit more readable and intelligible.\nReturn value now at bottom of function.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCc: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nCc: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nCc: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ce2f11fe784f7999b82c7a71cdbcb86ad2653def", "tree": "252cdbf6f0e2e5417f0aa4c60d8ddd0947ecd90e", "parents": [ "1ebddd85a6a6ad793eca82d65fba4573d0e28042" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Wed Mar 10 15:21:08 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:31 2010 -0800" }, "message": "drivers/block/floppy.c: remove some unnecessary casting\n\nRemove char/void __user * use.\nRemove kmalloc cast.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCc: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nCc: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nCc: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1ebddd85a6a6ad793eca82d65fba4573d0e28042", "tree": "5f413751925ad5d93aac3aacaf2c4e8bc3a31625", "parents": [ "275176bc2a7bbd5c4446ba12b8f4353a69012053" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Wed Mar 10 15:21:07 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:31 2010 -0800" }, "message": "drivers/block/floppy.c: use %pf in logging messages\n\nPrint the function name not the pointer address where useful and possible\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCc: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nCc: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nCc: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "275176bc2a7bbd5c4446ba12b8f4353a69012053" }