)]}' { "log": [ { "commit": "a2c2a0e668e26e020731ce2a40e6474d1d37210a", "tree": "81f0f6aabffb97fe6c0ec06fd7042c5147cceb9c", "parents": [ "121f099412bd6576dfb3d94222e89d9341362177" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Wed Nov 16 09:21:50 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Nov 16 09:21:50 2011 +0100" }, "message": "paride: fix potential information leak in pg_read()\n\nSmatch has a new check for Rosenberg type information leaks where structs\nare copied to the user with uninitialized stack data in them. i In this\ncase, the pg_write_hdr struct has a hole in it.\n\nstruct pg_write_hdr {\n char magic; /* 0 1 */\n char func; /* 1 1 */\n /* XXX 2 bytes hole, try to pack */\n int dlen; /* 4 4 */\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nCc: Tim Waugh \u003ctim@cyberelk.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "0007a4c90a11a5371c8b3f80b220fa402a399189", "tree": "3fb4a0158f87f539b2415fad35e958d1d1259910", "parents": [ "7035b5df3c071ccaf2f1694b96bd8958b0eb37ca" ], "author": { "name": "Stephen M. Cameron", "email": "scameron@beardog.cce.hp.com", "time": "Wed Nov 16 09:21:49 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Nov 16 09:21:49 2011 +0100" }, "message": "cciss: auto engage SCSI mid layer at driver load time\n\nA long time ago, probably in 2002, one of the distros, or maybe more than\none, loaded block drivers prior to loading the SCSI mid layer. This meant\nthat the cciss driver, being a block driver, could not engage the SCSI mid\nlayer at init time without panicking, and relied on being poked by a\nuserland program after the system was up (and the SCSI mid layer was\ntherefore present) to engage the SCSI mid layer.\n\nThis is no longer the case, and cciss can safely rely on the SCSI mid\nlayer being present at init time and engage the SCSI mid layer straight\naway. This means that users will see their tape drives and medium\nchangers at driver load time without need for a script in /etc/rc.d that\ndoes this:\n\nfor x in /proc/driver/cciss/cciss*\ndo\n\techo \"engage scsi\" \u003e $x\ndone\n\nHowever, if no tape drives or medium changers are detected, the SCSI mid\nlayer will not be engaged. If a tape drive or medium change is later\nhot-added to the system it will then be necessary to use the above script\nor similar for the device(s) to be acceesible.\n\nSigned-off-by: Stephen M. Cameron \u003cscameron@beardog.cce.hp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "7035b5df3c071ccaf2f1694b96bd8958b0eb37ca", "tree": "146e916bce5b11232afac2319c012b1fccba54d0", "parents": [ "0c614e2d3e6ee6ff13c6181f380787cea1d82d1d" ], "author": { "name": "Dmitry Monakhov", "email": "dmonakhov@openvz.org", "time": "Wed Nov 16 09:21:49 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Nov 16 09:21:49 2011 +0100" }, "message": "loop: cleanup set_status interface\n\n1) Anyone who has read access to loopdev has permission to call set_status\n and may change important parameters such as lo_offset, lo_sizelimit and\n so on, which contradicts to read access pattern and definitely equals\n to write access pattern.\n2) Add lo_offset over i_size check to prevent blkdev_size overflow.\n ##Testcase_bagin\n #dd if\u003d/dev/zero of\u003d./file bs\u003d1k count\u003d1\n #losetup /dev/loop0 ./file\n /* userspace_application */\n struct loop_info64 loinf;\n fd \u003d open(\"/dev/loop0\", O_RDONLY);\n ioctl(fd, LOOP_GET_STATUS64, \u0026loinf);\n /* Set offset to any value which is bigger than i_size, and sizelimit\n * to nonzero value*/\n loinf.lo_offset \u003d 4096*1024;\n loinf.lo_sizelimit \u003d 1024;\n ioctl(fd, LOOP_SET_STATUS64, \u0026loinf);\n /* After this loop device will have size similar to 0x7fffffffffxxxx */\n #blockdev --getsz /dev/loop0\n ##OUTPUT: 36028797018955968\n ##Testcase_end\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Dmitry Monakhov \u003cdmonakhov@openvz.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "3bb9068278ea524581237abadd41377a14717e7d", "tree": "6e360ae87c4b393e862b6bb2ab18e8f2cea22797", "parents": [ "6b76106d8ef31111d6fc469564b83b5f5542794f" ], "author": { "name": "Dmitry Monakhov", "email": "dmonakhov@openvz.org", "time": "Wed Nov 16 09:21:48 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Nov 16 09:21:48 2011 +0100" }, "message": "loop: prevent information leak after failed read\n\nIf read was not fully successful we have to fail whole bio to prevent\ninformation leak of old pages\n\n##Testcase_begin\ndd if\u003d/dev/zero of\u003d./file bs\u003d1M count\u003d1\nlosetup /dev/loop0 ./file -o 4096\ntruncate -s 0 ./file\n# OOps loop offset is now beyond i_size, so read will silently fail.\n# So bio\u0027s pages would not be cleared, may which result in information leak.\nhexdump -C /dev/loop0\n##testcase_end\n\nSigned-off-by: Dmitry Monakhov \u003cdmonakhov@openvz.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "193733585692301f38d489b8ad8724c2f88349c0", "tree": "85a00825178aa915e5f7e38f338c59951546c802", "parents": [ "7a401a972df8e184b3d1a3fc958c0a4ddee8d312" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Fri Nov 11 22:05:54 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Nov 11 22:05:54 2011 +0100" }, "message": "The Windows driver .inf disables ASPM on all cciss devices. Do the same.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nCc: iss_storagedev@hp.com\nAcked-by: Mike Miller \u003cmike.miller@hp.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "06d381484fe8fb1ba2996c22e89595a273e3634c", "tree": "0d39c57cb8c501341ab8ed1d740f076b0b8c0bd0", "parents": [ "5d5a8d2d9d6cca979efe4fe1552d787fdc542603", "c9d6369978411f690513994e6e53e2e6410874a4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:31:36 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:31:36 2011 -0800" }, "message": "Merge branch \u0027stable/vmalloc-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/vmalloc-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n net: xen-netback: use API provided by xenbus module to map rings\n block: xen-blkback: use API provided by xenbus module to map rings\n xen: use generic functions instead of xen_{alloc, free}_vm_area()\n" }, { "commit": "3d0a8d10cfb4cc3d1877c29a866ee7d8a46aa2fa", "tree": "11a85044d1472f5972ae47ce10a2f446ad981e9f", "parents": [ "b4fdcb02f1e39c27058a885905bd0277370ba441", "a0eda62552eba4e1f92d5354bb65c68fb6b45f87" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 17:22:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 17:22:14 2011 -0700" }, "message": "Merge branch \u0027for-3.2/drivers\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-3.2/drivers\u0027 of git://git.kernel.dk/linux-block: (30 commits)\n virtio-blk: use ida to allocate disk index\n hpsa: add small delay when using PCI Power Management to reset for kump\n cciss: add small delay when using PCI Power Management to reset for kump\n xen/blkback: Fix two races in the handling of barrier requests.\n xen/blkback: Check for proper operation.\n xen/blkback: Fix the inhibition to map pages when discarding sector ranges.\n xen/blkback: Report VBD_WSECT (wr_sect) properly.\n xen/blkback: Support \u0027feature-barrier\u0027 aka old-style BARRIER requests.\n xen-blkfront: plug device number leak in xlblk_init() error path\n xen-blkfront: If no barrier or flush is supported, use invalid operation.\n xen-blkback: use kzalloc() in favor of kmalloc()+memset()\n xen-blkback: fixed indentation and comments\n xen-blkfront: fix a deadlock while handling discard response\n xen-blkfront: Handle discard requests.\n xen-blkback: Implement discard requests (\u0027feature-discard\u0027)\n xen-blkfront: add BLKIF_OP_DISCARD and discard request struct\n drivers/block/loop.c: remove unnecessary bdev argument from loop_clr_fd()\n drivers/block/loop.c: emit uevent on auto release\n drivers/block/cpqarray.c: use pci_dev-\u003erevision\n loop: always allow userspace partitions and optionally support automatic scanning\n ...\n\nFic up trivial header file includsion conflict in drivers/block/loop.c\n" }, { "commit": "b4fdcb02f1e39c27058a885905bd0277370ba441", "tree": "fd4cfd1994f21f44afe5e7904681fb5ac09f81b8", "parents": [ "044595d4e448305fbaec472eb7d22636d24e7d8c", "6dd9ad7df2019b1e33a372a501907db293ebcd0d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 17:06:58 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 17:06:58 2011 -0700" }, "message": "Merge branch \u0027for-3.2/core\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-3.2/core\u0027 of git://git.kernel.dk/linux-block: (29 commits)\n block: don\u0027t call blk_drain_queue() if elevator is not up\n blk-throttle: use queue_is_locked() instead of lockdep_is_held()\n blk-throttle: Take blkcg-\u003elock while traversing blkcg-\u003epolicy_list\n blk-throttle: Free up policy node associated with deleted rule\n block: warn if tag is greater than real_max_depth.\n block: make gendisk hold a reference to its queue\n blk-flush: move the queue kick into\n blk-flush: fix invalid BUG_ON in blk_insert_flush\n block: Remove the control of complete cpu from bio.\n block: fix a typo in the blk-cgroup.h file\n block: initialize the bounce pool if high memory may be added later\n block: fix request_queue lifetime handling by making blk_queue_cleanup() properly shutdown\n block: drop @tsk from attempt_plug_merge() and explain sync rules\n block: make get_request[_wait]() fail if queue is dead\n block: reorganize throtl_get_tg() and blk_throtl_bio()\n block: reorganize queue draining\n block: drop unnecessary blk_get/put_queue() in scsi_cmd_ioctl() and blk_get_tg()\n block: pass around REQ_* flags instead of broken down booleans during request alloc/free\n block: move blk_throtl prototypes to block/blk.h\n block: fix genhd refcounting in blkio_policy_parse_and_set()\n ...\n\nFix up trivial conflicts due to \"mddev_t\" -\u003e \"struct mddev\" conversion\nand making the request functions be of type \"void\" instead of \"int\" in\n - drivers/md/{faulty.c,linear.c,md.c,md.h,multipath.c,raid0.c,raid1.c,raid10.c,raid5.c}\n - drivers/staging/zram/zram_drv.c\n" }, { "commit": "5087a50e66bd51b6e72c60bce4757a42b93f6b2c", "tree": "b0a0f017fbeeef3b6be8604f6e40b54ce1053bac", "parents": [ "edfd52e6367270c90f3fd7cc302b375ffa89f91e" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Sun Oct 30 21:29:59 2011 +0200" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:02 2011 +1030" }, "message": "virtio-blk: use ida to allocate disk index\n\nBased on a patch by Mark Wu \u003cdwu@redhat.com\u003e\n\nCurrent index allocation in virtio-blk is based on a monotonically\nincreasing variable \"index\". This means we\u0027ll run out of numbers\nafter a while. It also could cause confusion about the disk\nname in the case of hot-plugging disks.\nChange virtio-blk to use ida to allocate index, instead.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "0c8d44f239b453517d25d0fcfd2737bb5cb34ef8", "tree": "ddd9da6086f67462e7a323e3eefaa974cb7908c1", "parents": [ "d5decd3b9512e35c87492312a72443192eebdda9" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri Jul 01 15:56:05 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:13 2011 -0400" }, "message": "block: Fix files that are modules and hence need module.h\n\nWe want to remove the implicit everywhere presence of module.h\nso fix up the people relying on that implicit presence in advance.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "d5decd3b9512e35c87492312a72443192eebdda9", "tree": "96aec1c137a09e3b8c4129862d117ce9775909fb", "parents": [ "a0e5cc581b3fc0e0a909e3cab48d9ec286c2a276" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu May 26 16:00:52 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:12 2011 -0400" }, "message": "block: add export.h to files using EXPORT_SYMBOL/THIS_MODULE macros\n\nThese files were getting \u003clinux/module.h\u003e via an implicit include\npath, but we want to crush those out of existence since they cost\ntime during compiles of processing thousands of lines of headers\nfor no reason. Give them the lightweight header that just contains\nthe EXPORT_SYMBOL infrastructure.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "a0eda62552eba4e1f92d5354bb65c68fb6b45f87", "tree": "53c4069ef7be8e54e0bce7c82c0f7316f08390e6", "parents": [ "c4853efec665134b2e6fc9c13447323240980351" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Mon Oct 31 08:05:36 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Mon Oct 31 08:05:36 2011 +0100" }, "message": "virtio-blk: use ida to allocate disk index\n\nBased on a patch by Mark Wu \u003cdwu@redhat.com\u003e\n\nCurrent index allocation in virtio-blk is based on a monotonically\nincreasing variable \"index\". This means we\u0027ll run out of numbers\nafter a while. It also could cause confusion about the disk\nname in the case of hot-plugging disks.\nChange virtio-blk to use ida to allocate index, instead.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "97d2eb13a019ec09cc1a7ea2d3705c0b117b3c0d", "tree": "86f6382941f8cfc41647d33d87bec7bc1407c18c", "parents": [ "68d99b2c8efcb6ed3807a55569300c53b5f88be5", "339573406737461cfb17bebabf7ba536a302d841" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 16:42:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 16:42:18 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://ceph.newdream.net/git/ceph-client\n\n* \u0027for-linus\u0027 of git://ceph.newdream.net/git/ceph-client:\n libceph: fix double-free of page vector\n ceph: fix 32-bit ino numbers\n libceph: force resend of osd requests if we skip an osdmap\n ceph: use kernel DNS resolver\n ceph: fix ceph_monc_init memory leak\n ceph: let the set_layout ioctl set single traits\n Revert \"ceph: don\u0027t truncate dirty pages in invalidate work thread\"\n ceph: replace leading spaces with tabs\n libceph: warn on msg allocation failures\n libceph: don\u0027t complain on msgpool alloc failures\n libceph: always preallocate mon connection\n libceph: create messenger with client\n ceph: document ioctls\n ceph: implement (optional) max read size\n ceph: rename rsize -\u003e rasize\n ceph: make readpages fully async\n" }, { "commit": "2d073846b891c3f49c4ea03c5db3ac92f92742f1", "tree": "c47dd9015bb072e1d31d1cefdfe9995d8a2388ef", "parents": [ "4dcaebbf6586d299be8513512a1253f177b803d7" ], "author": { "name": "David Vrabel", "email": "david.vrabel@citrix.com", "time": "Thu Sep 29 16:53:30 2011 +0100" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Oct 26 10:02:35 2011 -0400" }, "message": "block: xen-blkback: use API provided by xenbus module to map rings\n\nThe xenbus module provides xenbus_map_ring_valloc() and\nxenbus_map_ring_vfree(). Use these to map the ring pages granted by\nthe frontend.\n\nAcked-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nSigned-off-by: David Vrabel \u003cdavid.vrabel@citrix.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "6ab00d465a1c8c02c2216f8220727282f3aa50b5", "tree": "b4cc08e1be5ffe0a60d9090d86f7f0d05b1f6e36", "parents": [ "6a8ea4706adb4b4d8f77a8da5f9778b65fbf6f48" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Tue Aug 09 09:41:59 2011 -0700" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Tue Oct 25 16:10:15 2011 -0700" }, "message": "libceph: create messenger with client\n\nThis simplifies the init/shutdown paths, and makes client-\u003emsgr available\nduring the rest of the setup process.\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "59e52534172d845ebffb0d7e85fc56fb7b857051", "tree": "49552e03f1bdb413cd8b5f7542e91770688d7047", "parents": [ "73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26", "0d89e54c8249645404283436d952afc261a04e1e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:11:02 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:11:02 2011 +0200" }, "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: (59 commits)\n MAINTAINERS: linux-m32r is moderated for non-subscribers\n linux@lists.openrisc.net is moderated for non-subscribers\n Drop default from \"DM365 codec select\" choice\n parisc: Kconfig: cleanup Kernel page size default\n Kconfig: remove redundant CONFIG_ prefix on two symbols\n cris: remove arch/cris/arch-v32/lib/nand_init.S\n microblaze: add missing CONFIG_ prefixes\n h8300: drop puzzling Kconfig dependencies\n MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers\n tty: drop superfluous dependency in Kconfig\n ARM: mxc: fix Kconfig typo \u0027i.MX51\u0027\n Fix file references in Kconfig files\n aic7xxx: fix Kconfig references to READMEs\n Fix file references in drivers/ide/\n thinkpad_acpi: Fix printk typo \u0027bluestooth\u0027\n bcmring: drop commented out line in Kconfig\n btmrvl_sdio: fix typo \u0027btmrvl_sdio_sd6888\u0027\n doc: raw1394: Trivial typo fix\n CIFS: Don\u0027t free volume_info-\u003eUNC until we are entirely done with it.\n treewide: Correct spelling of successfully in comments\n ...\n" }, { "commit": "31018acd4c77f0e4b90f870011249f32c5e3d5b6", "tree": "a588fb41ac2b37a5de7112732d861cb328840d5a", "parents": [ "5eef150c1d7e41baaefd00dd56c153debcd86aee", "a491dbef56f2aba42fb292067d4652d246627738", "38a1ed4f039db32b418007ac365076cf53647ebd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 09:17:47 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 09:17:47 2011 +0200" }, "message": "Merge branches \u0027stable/bug.fixes-3.2\u0027 and \u0027stable/mmu.fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/bug.fixes-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen/p2m/debugfs: Make type_name more obvious.\n xen/p2m/debugfs: Fix potential pointer exception.\n xen/enlighten: Fix compile warnings and set cx to known value.\n xen/xenbus: Remove the unnecessary check.\n xen/irq: If we fail during msi_capability_init return proper error code.\n xen/events: Don\u0027t check the info for NULL as it is already done.\n xen/events: BUG() when we can\u0027t allocate our event-\u003eirq array.\n\n* \u0027stable/mmu.fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen: Fix selfballooning and ensure it doesn\u0027t go too far\n xen/gntdev: Fix sleep-inside-spinlock\n xen: modify kernel mappings corresponding to granted pages\n xen: add an \"highmem\" parameter to alloc_xenballooned_pages\n xen/p2m: Use SetPagePrivate and its friends for M2P overrides.\n xen/p2m: Make debug/xen/mmu/p2m visible again.\n Revert \"xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag set.\"\n" }, { "commit": "83157223defe3be490cfea048e83451b6f254216", "tree": "fa484185d27765a13036bb43ae68d8cdb63f585b", "parents": [ "9562ad9ab36df7ccef920d119f3b5100025db95f", "f992ae801a7dec34a4ed99a6598bbbbfb82af4fb" ], "author": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Mon Oct 24 16:24:38 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Mon Oct 24 16:24:38 2011 +0200" }, "message": "Merge branch \u0027for-linus\u0027 into for-3.2/core\n" }, { "commit": "ab5dbebe33e0c353e8545f09c34553ac3351dad6", "tree": "628b7956eac1b3a22850f0a2f2446ca29b69250b", "parents": [ "b8d8bdfe31a67981bbc398a4886ccc67aff521d5" ], "author": { "name": "Mike Miller", "email": "mike.miller@hp.com", "time": "Thu Oct 20 22:19:17 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Thu Oct 20 22:21:52 2011 +0200" }, "message": "cciss: add small delay when using PCI Power Management to reset for kump\n\nThe P600 requires a small delay when changing states. Otherwise we may think\nthe board did not reset and we bail. This for kdump only and is particular\nto the P600.\n\nCc: stable@kernel.org\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "b8d8bdfe31a67981bbc398a4886ccc67aff521d5", "tree": "b9e123aaad821d251f12da495a7eb46d87985603", "parents": [ "4c823cc3d568277aa6340d8df6981e34f4c4dee5", "6927d92091df2848fc0e6a693a017d4b2df549c2" ], "author": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Thu Oct 20 15:10:59 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Thu Oct 20 15:10:59 2011 +0200" }, "message": "Merge branch \u0027stable/for-jens-3.2\u0027 of git://oss.oracle.com/git/kwilk/xen into for-3.2/drivers\n" }, { "commit": "5c04b426f2e8b46cfc7969a35b2631063a3c646c", "tree": "2d27d9f5d2fe5d5e8fbc01a467ec58bcb50235c1", "parents": [ "499337bb6511e665a236a6a947f819d98ea340c6", "899e3ee404961a90b828ad527573aaaac39f0ab1" ], "author": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Oct 19 14:30:42 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Oct 19 14:30:42 2011 +0200" }, "message": "Merge branch \u0027v3.1-rc10\u0027 into for-3.2/core\n\nConflicts:\n\tblock/blk-core.c\n\tinclude/linux/blkdev.h\n\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "6927d92091df2848fc0e6a693a017d4b2df549c2", "tree": "31fc8055bad35f8daf4325a252018dd5ff0a9150", "parents": [ "dda1852802a6cc6fdecb9021e491b2de680c76b9" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Mon Oct 17 14:27:48 2011 -0400" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Mon Oct 17 14:28:57 2011 -0400" }, "message": "xen/blkback: Fix two races in the handling of barrier requests.\n\nThere are two windows of opportunity to cause a race when\nprocessing a barrier request. This patch fixes this.\n\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "456be1484ffc72a24bdb4200b5847c4fa90139d9", "tree": "570f0818bd6cfa245ab23d0121853b7b1e5a649b", "parents": [ "8bc03e8f3a334e09e89a7dffb486ee97a5ce84ae" ], "author": { "name": "Christoph Hellwig", "email": "hch@infradead.org", "time": "Mon Oct 17 12:57:20 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Mon Oct 17 12:57:20 2011 +0200" }, "message": "loop: remove the incorrect write_begin/write_end shortcut\n\nCurrently the loop device tries to call directly into write_begin/write_end\ninstead of going through -\u003ewrite if it can. This is a fairly nasty shortcut\nas write_begin and write_end are only callbacks for the generic write code\nand expect to be called with filesystem specific locks held.\n\nThis code currently causes various issues for clustered filesystems as it\ndoesn\u0027t take the required cluster locks, and it also causes issues for XFS\nas it doesn\u0027t properly lock against the swapext ioctl as called by the\ndefragmentation tools. This in case causes data corruption if\ndefragmentation hits a busy loop device in the wrong time window, as\nreported by RH QA.\n\nThe reason why we have this shortcut is that it saves a data copy when\ndoing a transformation on the loop device, which is the technical term\nfor using cryptoloop (or an XOR transformation). Given that cryptoloop\nhas been deprecated in favour of dm-crypt my opinion is that we should\nsimply drop this shortcut instead of finding complicated ways to to\nintroduce a formal interface for this shortcut.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "dda1852802a6cc6fdecb9021e491b2de680c76b9", "tree": "49a4b77a84898dc3a31fe291d9519d4edbe92004", "parents": [ "64391b2536ca92f9c589b2bfeaca3954896fe057" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Fri Oct 14 12:13:05 2011 -0400" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Fri Oct 14 12:29:55 2011 -0400" }, "message": "xen/blkback: Check for proper operation.\n\nThe patch titled: \"xen/blkback: Fix the inhibition to map pages\nwhen discarding sector ranges.\" had the right idea except that\nit used the wrong comparison operator. It had \u003d\u003d instead of !\u003d.\n\nThis fixes the bug where all (except discard) operations would\nhave been ignored.\n\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "64391b2536ca92f9c589b2bfeaca3954896fe057", "tree": "0712fab29f774ec1bf6e4bb851cf58228486af1d", "parents": [ "5c62cb48602dba95159c81ffeca179d3852e25be" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Mon Oct 10 00:47:49 2011 -0400" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Oct 13 09:48:38 2011 -0400" }, "message": "xen/blkback: Fix the inhibition to map pages when discarding sector ranges.\n\nThe \u0027operation\u0027 parameters are the ones provided to the bio layer while\nthe req-\u003eoperation are the ones passed in between the backend and\nfrontend. We used the wrong \u0027operation\u0027 value to squash the\ncall to map pages when processing the discard operation resulting\nin an hypercall that did nothing. Lets guard against going in the\nmapping function by checking for the proper operation type.\n\nCC: Li Dongyang \u003clidongyang@novell.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "5c62cb48602dba95159c81ffeca179d3852e25be", "tree": "ebd8920d2681fdf485eaaaa625310c29f5e239db", "parents": [ "29bde093787f3bdf7b9b4270ada6be7c8076e36b" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Mon Oct 10 12:33:21 2011 -0400" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Oct 13 09:48:37 2011 -0400" }, "message": "xen/blkback: Report VBD_WSECT (wr_sect) properly.\n\nWe did not increment the amount of sectors written to disk\nb/c we tested for the \u003d\u003d WRITE which is incorrect - as the\noperations are more of WRITE_FLUSH, WRITE_ODIRECT. This patch\nfixes it by doing a \u0026 WRITE check.\n\nCC: stable@kernel.org\nReported-by: Andy Burns \u003cxen.lists@burns.me.uk\u003e\nSuggested-by: Ian Campbell \u003cIan.Campbell@citrix.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "29bde093787f3bdf7b9b4270ada6be7c8076e36b", "tree": "4fff697e0acb2471b1bd575cbd006fa4efc3937d", "parents": [ "469738e675524b6aa029ecd46bdda3f878b12eff" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Mon Oct 10 00:42:22 2011 -0400" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Oct 13 09:48:36 2011 -0400" }, "message": "xen/blkback: Support \u0027feature-barrier\u0027 aka old-style BARRIER requests.\n\nWe emulate the barrier requests by draining the outstanding bio\u0027s\nand then sending the WRITE_FLUSH command. To drain the I/Os\nwe use the refcnt that is used during disconnect to wait for all\nthe I/Os before disconnecting from the frontend. We latch on its\nvalue and if it reaches either the threshold for disconnect or when\nthere are no more outstanding I/Os, then we have drained all I/Os.\n\nSuggested-by: Christopher Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "469738e675524b6aa029ecd46bdda3f878b12eff", "tree": "3eb7ba048443b12adebebff8b76d9b60633c4f49", "parents": [ "d11e6158307bed3f178399a4e6216eec67d16200" ], "author": { "name": "Laszlo Ersek", "email": "lersek@redhat.com", "time": "Fri Oct 07 21:34:38 2011 +0200" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Oct 13 09:48:35 2011 -0400" }, "message": "xen-blkfront: plug device number leak in xlblk_init() error path\n\n... though after a failed xenbus_register_frontend() all may be lost.\n\nAcked-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nSigned-off-by: Laszlo Ersek \u003clersek@redhat.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "d11e6158307bed3f178399a4e6216eec67d16200", "tree": "c5fa6989bcba7d39b3924628c60e386e3f24edcc", "parents": [ "8e6dc6fe51957116d363204a725c1262b4b78e19" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Fri Sep 16 15:15:14 2011 -0400" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Oct 13 09:48:35 2011 -0400" }, "message": "xen-blkfront: If no barrier or flush is supported, use invalid operation.\n\nGuard against issuing BLKIF_OP_WRITE_BARRIER or BLKIF_OP_FLUSH_CACHE\nby checking whether we successfully negotiated with the backend.\nThe negotiation with the backend also sets the q-\u003eflush_flags which\nfortunately for us is also used when submitting an bio to us. If\nwe don\u0027t support barriers or flushes it would be set to zero so\nwe should never end up having to deal with REQ_FLUSH | REQ_FUA.\n\nHowever, other third party implementations of __make_request that\nmight be stacked on top of us might not be so smart, so lets fix this up.\n\nAcked-by: Jan Beulich \u003cjbeulich@suse.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "8e6dc6fe51957116d363204a725c1262b4b78e19", "tree": "0e37fa8f70308ca1e6bebde46423bfd2984e0088", "parents": [ "c555aab97de139ac8762c922248bb68f43a8c488" ], "author": { "name": "Jan Beulich", "email": "JBeulich@suse.com", "time": "Fri Sep 16 08:38:09 2011 +0100" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Oct 13 09:48:34 2011 -0400" }, "message": "xen-blkback: use kzalloc() in favor of kmalloc()+memset()\n\nThis fixes the problem of three of those four memset()-s having\nimproper size arguments passed: Sizeof a pointer-typed expression\nreturns the size of the pointer, not that of the pointed to data.\n\nIt also reverts using kmalloc() instead of kzalloc() for the allocation\nof the pending grant handles array, as that array gets fully\ninitialized in a subsequent loop.\n\nReported-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Jan Beulich \u003cjbeulich@novell.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "c555aab97de139ac8762c922248bb68f43a8c488", "tree": "8dcae9533434adc889963d8a38d65c5a001a69ea", "parents": [ "69ef68cef961a934c35308843a04b26d91cad4a8" ], "author": { "name": "Joe Jin", "email": "joe.jin@oracle.com", "time": "Mon Aug 15 12:57:07 2011 +0800" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Oct 13 09:48:33 2011 -0400" }, "message": "xen-blkback: fixed indentation and comments\n\nThis patch fixes belows:\n\n1. Fix code style issue.\n2. Fix incorrect functions name in comments.\n\nSigned-off-by: Joe Jin \u003cjoe.jin@oracle.com\u003e\nCc: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nCc: Ian Campbell \u003cIan.Campbell@eu.citrix.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "69ef68cef961a934c35308843a04b26d91cad4a8", "tree": "bf7bebecdcd53aa75f80fb1e066f2293a2483916", "parents": [ "ed30bf317c5ceb25166cdbce3e0b35e33c82b509" ], "author": { "name": "Li Dongyang", "email": "lidongyang@novell.com", "time": "Wed Sep 14 14:02:40 2011 +0800" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Oct 13 09:48:32 2011 -0400" }, "message": "xen-blkfront: fix a deadlock while handling discard response\n\nWhen we get -EOPNOTSUPP response for a discard request, we will clear\nthe discard flag on the request queue so we won\u0027t attempt to send discard\nrequests to backend again, and this should be protected under rq-\u003equeue_lock.\nHowever, when we setup the request queue, we pass blkif_io_lock to\nblk_init_queue so rq-\u003equeue_lock is blkif_io_lock indeed, and this lock\nis already taken when we are in blkif_interrpt, so remove the\nspin_lock/spin_unlock when we clear the discard flag or we will end up\nwith deadlock here\n\nSigned-off-by: Li Dongyang \u003clidongyang@novell.com\u003e\n[v1: Updated description a bit and removed comment from source]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "ed30bf317c5ceb25166cdbce3e0b35e33c82b509", "tree": "112e4e184a29e64b618f83da873333abae25f11e", "parents": [ "b3cb0d6adc4bbc70b5e37e49a6068e973545ead7" ], "author": { "name": "Li Dongyang", "email": "lidongyang@novell.com", "time": "Thu Sep 01 18:39:09 2011 +0800" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Oct 13 09:48:31 2011 -0400" }, "message": "xen-blkfront: Handle discard requests.\n\nIf the backend advertises \u0027feature-discard\u0027, then interrogate\nthe backend for alignment and granularity. Setup the request\nqueue with the appropiate values and send the discard operation\nas required.\n\nSigned-off-by: Li Dongyang \u003clidongyang@novell.com\u003e\n[v1: Amended commit description]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "b3cb0d6adc4bbc70b5e37e49a6068e973545ead7", "tree": "b52aeb45ea918b18c056aaeae2bb405d19100829", "parents": [ "32a8d26cc9b96629269e04ee6c583e14398f6f47" ], "author": { "name": "Li Dongyang", "email": "lidongyang@novell.com", "time": "Thu Sep 01 18:39:10 2011 +0800" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Oct 13 09:48:30 2011 -0400" }, "message": "xen-blkback: Implement discard requests (\u0027feature-discard\u0027)\n\n..aka ATA TRIM/SCSI UNMAP command to be passed through the frontend\nand used as appropiately by the backend. We also advertise\ncertain granulity parameters to the frontend so it can plug them in.\nIf the backend is a realy device - we just end up using\n\u0027blkdev_issue_discard\u0027 while for loopback devices - we just punch\na hole in the image file.\n\nSigned-off-by: Li Dongyang \u003clidongyang@novell.com\u003e\n[v1: Fixed up pr_debug and commit description]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "0930bba674e248b921ea659b036ff02564e5a5f4", "tree": "52df16f477e1e63b034ee2e28f2d5c916bb53097", "parents": [ "693394b8c3dcee1a3baa52e30fdc3323d88cd579" ], "author": { "name": "Stefano Stabellini", "email": "stefano.stabellini@eu.citrix.com", "time": "Thu Sep 29 11:57:56 2011 +0100" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Sep 29 10:32:58 2011 -0400" }, "message": "xen: modify kernel mappings corresponding to granted pages\n\nIf we want to use granted pages for AIO, changing the mappings of a user\nvma and the corresponding p2m is not enough, we also need to update the\nkernel mappings accordingly.\nCurrently this is only needed for pages that are created for user usages\nthrough /dev/xen/gntdev. As in, pages that have been in use by the\nkernel and use the P2M will not need this special mapping.\nHowever there are no guarantees that in the future the kernel won\u0027t\nstart accessing pages through the 1:1 even for internal usage.\n\nIn order to avoid the complexity of dealing with highmem, we allocated\nthe pages lowmem.\nWe issue a HYPERVISOR_grant_table_op right away in\nm2p_add_override and we remove the mappings using another\nHYPERVISOR_grant_table_op in m2p_remove_override.\nConsidering that m2p_add_override and m2p_remove_override are called\nonce per page we use multicalls and hypercall batching.\n\nUse the kmap_op pointer directly as argument to do the mapping as it is\nguaranteed to be present up until the unmapping is done.\nBefore issuing any unmapping multicalls, we need to make sure that the\nmapping has already being done, because we need the kmap-\u003ehandle to be\nset correctly.\n\nSigned-off-by: Stefano Stabellini \u003cstefano.stabellini@eu.citrix.com\u003e\n[v1: Removed GRANT_FRAME_BIT usage]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "6c4867f6469964e34c5f4ee229a2a7f71a34c7ff", "tree": "639fb854b56d746aeb324011372b4c0571fd01ef", "parents": [ "d11bb4462c4cc6ddd45c6927c617ad79fa6fb8fc" ], "author": { "name": "Carsten Emde", "email": "C.Emde@osadl.org", "time": "Wed Sep 21 10:22:11 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Sep 21 10:22:11 2011 +0200" }, "message": "floppy: use del_timer_sync() in init cleanup\n\nWhen no floppy is found the module code can be released while a timer\nfunction is pending or about to be executed.\n\nCPU0 CPU1\n\t\t\t\t floppy_init()\ntimer_softirq()\n spin_lock_irq(\u0026base-\u003elock);\n detach_timer();\n spin_unlock_irq(\u0026base-\u003elock);\n -\u003e Interrupt\n\t\t\t\t\tdel_timer();\n\t\t\t\t return -ENODEV;\n module_cleanup();\n \u003c- EOI\n call_timer_fn();\n OOPS\n\nUse del_timer_sync() to prevent this.\n\nSigned-off-by: Carsten Emde \u003cC.Emde@osadl.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "4c823cc3d568277aa6340d8df6981e34f4c4dee5", "tree": "69d160a2baf1c6d346b1e4978cb294a2af9ad66f", "parents": [ "8a9c594422ecad912d6470888acdee9a1236ad68" ], "author": { "name": "Ayan George", "email": "ayan@ayan.net", "time": "Wed Sep 21 10:02:13 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Sep 21 10:02:13 2011 +0200" }, "message": "drivers/block/loop.c: remove unnecessary bdev argument from loop_clr_fd()\n\nIf the loop device is associated (lo-\u003elo_state \u003d\u003d Lo_bound), it will have\na valid bdev pointed to by lo-\u003elo_device. There is no reason to ever pass\nan additional block_device pointer.\n\nSigned-off-by: Ayan George \u003cayan.george@canonical.com\u003e\nCc: Phillip Susi \u003cpsusi@cfl.rr.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@google.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "8a9c594422ecad912d6470888acdee9a1236ad68", "tree": "6f8da22845a400ec63f7f623ac26206a93812bb8", "parents": [ "5a3a76e6c35fa236fc234d17a98edeb41d49130f" ], "author": { "name": "Phillip Susi", "email": "psusi@cfl.rr.com", "time": "Wed Sep 21 10:02:13 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Sep 21 10:02:13 2011 +0200" }, "message": "drivers/block/loop.c: emit uevent on auto release\n\nThe loopback driver failed to emit the change uevent when auto releasing\nthe device. Fixed lo_release() to pass the bdev to loop_clr_fd() so it\ncan emit the event.\n\nSigned-off-by: Phillip Susi \u003cpsusi@cfl.rr.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Ayan George \u003cayan@ayan.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@google.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "5a3a76e6c35fa236fc234d17a98edeb41d49130f", "tree": "8387e33209444ca3e9e7bdd15ecf2ca4d1a42cb4", "parents": [ "e03c8dd14915fabc101aa495828d58598dc5af98" ], "author": { "name": "Sergei Shtylyov", "email": "sshtylyov@ru.mvista.com", "time": "Wed Sep 21 10:02:13 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Sep 21 10:02:13 2011 +0200" }, "message": "drivers/block/cpqarray.c: use pci_dev-\u003erevision\n\nThis driver uses PCI_CLASS_REVISION instead of PCI_REVISION_ID, so it\nwasn\u0027t converted by commit 44c10138fd4bbc4b6 (\"PCI: Change all drivers to\nuse pci_device-\u003erevision\").\n\nSigned-off-by: Sergei Shtylyov \u003csshtylyov@ru.mvista.com\u003e\nAcked-by: Mike Miller \u003cmike.miller@hp.com\u003e\nCc: Chirag Kantharia \u003cchirag.kantharia@hp.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@google.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "e060c38434b2caa78efe7cedaff4191040b65a15", "tree": "407361230bf6733f63d8e788e4b5e6566ee04818", "parents": [ "10e4ac572eeffe5317019bd7330b6058a400dfc2", "cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 15:08:05 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 15:08:18 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nFast-forward merge with Linus to be able to merge patches\nbased on more recent version of the tree.\n" }, { "commit": "e5de063016ce838aff08683ce38ac40211c247d9", "tree": "1b4cd4e201ba784bcefcd06c0b42207b64a05f69", "parents": [ "e0ffaa8cba275c48531f1a005f8ff8973fbebea9" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Mon Aug 01 23:16:06 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 14:57:06 2011 +0200" }, "message": "Remove unneeded version.h includes from drivers/block/\n\nIt was pointed out by \u0027make versioncheck\u0027 that some includes of\nlinux/version.h are not needed in drivers/block/.\nThis patch removes them.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "699324871fcc3650f2023c5e36cb119a92d7894b", "tree": "7115a8183a4fd00b6f0ea1ae3b8f3dfbcf1c454b", "parents": [ "ca4a04cf3dd0cecb5e7188ed7796cc55fc13aeb1" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Tue Jul 26 23:06:29 2011 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 14:50:49 2011 +0200" }, "message": "treewide: remove extra semicolons from various parts of the kernel\n\nThis is a resend from the original, changing the title from PATCH to\nRFC(since this is a review for commit, and I should have put that the first go around).\nand also removing some of the commit\u0027s with ia64 and bash since it is significant.\nlet me know if I might have missed anything etc..\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "1d273b929cad7b1ee95d5c15ac806b3abc764278", "tree": "53e1b3103a9d3c486211d63af428f5debb90f6c7", "parents": [ "3dbd4439837f2cfd2ff302897353f4b1b6263b2a" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri Jun 03 02:28:46 2011 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 14:02:57 2011 +0200" }, "message": "drbd: Use angle brackets for system includes\n\nUse the normal include style.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "57f3224c3f838844cdae5e4a9d63e03152013f9a", "tree": "58b0195a271b810144f375f32f76755c1d44b6cb", "parents": [ "3a816054fcd345d0fe47c666c375d372c6170371" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sat May 28 10:36:24 2011 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 13:55:02 2011 +0200" }, "message": "drbd: Convert vmalloc/memset to vzalloc\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "5a7bbad27a410350e64a2d7f5ec18fc73836c14f", "tree": "3447cd62dbcbd77b4071e2eb7576f1d7632ef2d3", "parents": [ "c20e8de27fef9f59869c81c288ad6cf28200e00c" ], "author": { "name": "Christoph Hellwig", "email": "hch@infradead.org", "time": "Mon Sep 12 12:12:01 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Sep 12 12:12:01 2011 +0200" }, "message": "block: remove support for bio remapping from -\u003emake_request\n\nThere is very little benefit in allowing to let a -\u003emake_request\ninstance update the bios device and sector and loop around it in\n__generic_make_request when we can archive the same through calling\ngeneric_make_request from the driver and letting the loop in\ngeneric_make_request handle it.\n\nNote that various drivers got the return value from -\u003emake_request and\nreturned non-zero values for errors.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nAcked-by: NeilBrown \u003cneilb@suse.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "e03c8dd14915fabc101aa495828d58598dc5af98", "tree": "8aba1d519848c3f7684ac5673c95f56aa6ff1d57", "parents": [ "e8b177cedc39b092e423b8cbc687dbf096a1de47" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Tue Aug 23 20:12:04 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Aug 23 20:12:04 2011 +0200" }, "message": "loop: always allow userspace partitions and optionally support automatic scanning\n\nAutomatic partition scanning can be requested individually per loop\ndevice during its setup by setting LO_FLAGS_PARTSCAN. By default, no\npartition tables are scanned.\n\nUserspace can now always add and remove partitions from all loop\ndevices, regardless if the in-kernel partition scanner is enabled or\nnot.\n\nThe needed partition minor numbers are allocated from the extended\nminors space, the main loop device numbers will continue to match the\nloop minors, regardless of the number of partitions used.\n\n # grep . /sys/class/block/loop1/loop/*\n /sys/block/loop1/loop/autoclear:0\n /sys/block/loop1/loop/backing_file:/home/kay/data/stuff/part.img\n /sys/block/loop1/loop/offset:0\n /sys/block/loop1/loop/partscan:1\n /sys/block/loop1/loop/sizelimit:0\n\n # ls -l /dev/loop*\n brw-rw---- 1 root disk 7, 0 Aug 14 20:22 /dev/loop0\n brw-rw---- 1 root disk 7, 1 Aug 14 20:23 /dev/loop1\n brw-rw---- 1 root disk 259, 0 Aug 14 20:23 /dev/loop1p1\n brw-rw---- 1 root disk 259, 1 Aug 14 20:23 /dev/loop1p2\n brw-rw---- 1 root disk 7, 99 Aug 14 20:23 /dev/loop99\n brw-rw---- 1 root disk 259, 2 Aug 14 20:23 /dev/loop99p1\n brw-rw---- 1 root disk 259, 3 Aug 14 20:23 /dev/loop99p2\n crw------T 1 root root 10, 237 Aug 14 20:22 /dev/loop-control\n\nCc: Karel Zak \u003ckzak@redhat.com\u003e\nCc: Davidlohr Bueso \u003cdave@gnu.org\u003e\nAcked-By: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "89c63a8ef36a621cb6790c1a56c737e6805ad8f4", "tree": "5ea04a45a3260e734871407d7840dca4bf56d850", "parents": [ "65299a3b788bd274bed92f9fa3232082c9f3ea70", "1bc05b0ae6448b20d46076899e0cc12ad999e50e" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Aug 23 15:09:13 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Aug 23 15:09:13 2011 +0200" }, "message": "Merge branch \u0027stable/for-jens\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus\n" }, { "commit": "1bc05b0ae6448b20d46076899e0cc12ad999e50e", "tree": "509b16a1f2c83f2966b6c7b8e9a8f4bd73ad5063", "parents": [ "6f5986bce558e64fe867bff600a2127a3cb0c006" ], "author": { "name": "Joe Jin", "email": "joe.jin@oracle.com", "time": "Mon Aug 15 12:57:07 2011 +0800" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Mon Aug 22 11:35:36 2011 -0400" }, "message": "xen-blkback: fixed indentation and comments\n\nThis patch fixes belows:\n\n1. Fix code style issue.\n2. Fix incorrect functions name in comments.\n\nSigned-off-by: Joe Jin \u003cjoe.jin@oracle.com\u003e\nCc: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nCc: Ian Campbell \u003cIan.Campbell@eu.citrix.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "6f5986bce558e64fe867bff600a2127a3cb0c006", "tree": "b08c7f219d1757f6389258d9879c1ae592232716", "parents": [ "ea5e116162b7e0cf83a2b8a273440514404604de" ], "author": { "name": "Joe Jin", "email": "joe.jin@oracle.com", "time": "Mon Aug 15 12:51:31 2011 +0800" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Mon Aug 22 11:35:35 2011 -0400" }, "message": "xen-blkback: Don\u0027t disconnect backend until state switched to XenbusStateClosed.\n\nWhen do block-attach/block-detach test with below steps, umount hangs\nin the guest. Furthermore shutdown ends up being stuck when umounting file-systems.\n\n1. start guest.\n2. attach new block device by xm block-attach in Dom0.\n3. mount new disk in guest.\n4. execute xm block-detach to detach the block device in dom0 until timeout\n5. Any request to the disk will hung.\n\nRoot cause:\nThis issue is caused when setting backend device\u0027s state to\n\u0027XenbusStateClosing\u0027, which sends to the frontend the XenbusStateClosing\nnotification. When frontend receives the notification it tries to release\nthe disk in blkfront_closing(), but at that moment the disk is still in use\nby guest, so frontend refuses to close. Specifically it sets the disk state to\nXenbusStateClosing and sends the notification to backend - when backend receives the\nevent, it disconnects the vbd from real device, and sets the vbd device state to\nXenbusStateClosing. The backend disconnects the real device/file, and any IO\nrequests to the disk in guest will end up in ether, leaving disk DEAD and set to\nXenbusStateClosing. When the guest wants to disconnect the disk, umount will\nhang on blkif_release()-\u003exlvbd_release_gendisk() as it is unable to send any IO\nto the disk, which prevents clean system shutdown.\n\nSolution:\nDon\u0027t disconnect backend until frontend state switched to XenbusStateClosed.\n\nSigned-off-by: Joe Jin \u003cjoe.jin@oracle.com\u003e\nCc: Daniel Stodden \u003cdaniel.stodden@citrix.com\u003e\nCc: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nCc: Annie Li \u003cannie.li@oracle.com\u003e\nCc: Ian Campbell \u003cIan.Campbell@eu.citrix.com\u003e\n[v1: Modified description a bit]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "dfaa2ef68e80c378e610e3c8c536f1c239e8d3ef", "tree": "1b827fb8b3785dfca6c5e19d7dbbb0a9d59a3d2c", "parents": [ "548ef6cc26ca1c81f19855d57d3fb0f9a7ce3385" ], "author": { "name": "Lukas Czerner", "email": "lczerner@redhat.com", "time": "Fri Aug 19 14:50:46 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri Aug 19 14:50:46 2011 +0200" }, "message": "loop: add discard support for loop devices\n\nThis commit adds discard support for loop devices. Discard is usually\nsupported by SSD and thinly provisioned devices as a method for\nreclaiming unused space. This is no different than trying to reclaim\nback space which is not used by the file system on the image, but it\nstill occupies space on the host file system.\n\nWe can do the reclamation on file system which does support hole\npunching. So when discard request gets to the loop driver we can\ntranslate that to punch a hole to the underlying file, hence reclaim\nthe free space.\n\nThis is very useful for trimming down the size of the image to only what\nis really used by the file system on that image. Fstrim may be used for\nthat purpose.\n\nIt has been tested on ext4, xfs and btrfs with the image file systems\next4, ext3, xfs and btrfs. ext4, or ext6 image on ext4 file system has\nsome problems but it seems that ext4 punch hole implementation is\nsomewhat flawed and it is unrelated to this commit.\n\nAlso this is a very good method of validating file systems punch hole\nimplementation.\n\nNote that when encryption is used, discard support is disabled, because\nusing it might leak some information useful for possible attacker.\n\nSigned-off-by: Lukas Czerner \u003clczerner@redhat.com\u003e\nReviewed-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "548ef6cc26ca1c81f19855d57d3fb0f9a7ce3385", "tree": "2a8eaa3e24b9199932d927eff62992dfa4f5b559", "parents": [ "5eedf5415cd57f8db8642a5db4cf8e5507390030" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Fri Aug 19 14:48:28 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri Aug 19 14:48:28 2011 +0200" }, "message": "nbd-replace-some-printk-with-dev_warn-and-dev_info-checkpatch-fixes\n\nERROR: code indent should use tabs where possible\n#30: FILE: drivers/block/nbd.c:578:\n+^I dev_info(disk_to_dev(lo-\u003edisk), \"NBD_DISCONNECT\\n\");$\n\ntotal: 1 errors, 0 warnings, 35 lines checked\n\nNOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or\n scripts/cleanfile\n\n./patches/nbd-replace-some-printk-with-dev_warn-and-dev_info.patch has style problems, please review.\n\nIf any of these errors are false positives, please report\nthem to the maintainer, see CHECKPATCH in MAINTAINERS.\n\nPlease run checkpatch prior to sending patches\n\nCc: Paul Clements \u003cPaul.Clements@steeleye.com\u003e\nCc: WANG Cong \u003camwang@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "5eedf5415cd57f8db8642a5db4cf8e5507390030", "tree": "9e84f3cc2b766545c6f7c03c94e2a165a0465b87", "parents": [ "7742ce4ab49976851ce7f0185dcbe491935371a2" ], "author": { "name": "WANG Cong", "email": "amwang@redhat.com", "time": "Fri Aug 19 14:48:28 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri Aug 19 14:48:28 2011 +0200" }, "message": "nbd: replace some printk with dev_warn() and dev_info()\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nCc: Paul Clements \u003cPaul.Clements@steeleye.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "7742ce4ab49976851ce7f0185dcbe491935371a2", "tree": "bcfca24f3a625e6a9f142d2fceb8d71e3c34792d", "parents": [ "7f1b90f99a2d4253f8eb1221d39da072178adbc5" ], "author": { "name": "WANG Cong", "email": "amwang@redhat.com", "time": "Fri Aug 19 14:48:28 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri Aug 19 14:48:28 2011 +0200" }, "message": "nbd: lower the loglevel of an error message\n\nThis is only an error, no need to use KERN_CRIT log level.\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nCc: Paul Clements \u003cPaul.Clements@steeleye.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "7f1b90f99a2d4253f8eb1221d39da072178adbc5", "tree": "7e8f0422677c931e7c96b0cb82dde6ec99ae66e5", "parents": [ "1695b87f7dd152b866f0dd867c8e599025fc4965" ], "author": { "name": "WANG Cong", "email": "amwang@redhat.com", "time": "Fri Aug 19 14:48:22 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri Aug 19 14:48:22 2011 +0200" }, "message": "nbd: replace printk KERN_ERR with dev_err()\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nCc: Paul Clements \u003cPaul.Clements@steeleye.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "1695b87f7dd152b866f0dd867c8e599025fc4965", "tree": "5ca52504b19c0640f6d9e1f59a649d6242480dd4", "parents": [ "25ac0c2b971235d3e8c7af0b6889a1eb6988b559" ], "author": { "name": "WANG Cong", "email": "amwang@redhat.com", "time": "Fri Aug 19 14:48:21 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri Aug 19 14:48:21 2011 +0200" }, "message": "nbd: replace sysfs_create_file() with device_create_file()\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nCc: Paul Clements \u003cPaul.Clements@steeleye.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "25ac0c2b971235d3e8c7af0b6889a1eb6988b559", "tree": "baec27728cfb9d2a544d552f80a08c810758c600", "parents": [ "f963d270cb7bbb8eeb57901d02b22a493e664fd2" ], "author": { "name": "WANG Cong", "email": "amwang@redhat.com", "time": "Fri Aug 19 14:48:17 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri Aug 19 14:48:17 2011 +0200" }, "message": "nbd: use task_pid_nr() to get current pid\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nCc: Paul Clements \u003cPaul.Clements@steeleye.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "40bb96ade4ef1549f387625589175def31dc9023", "tree": "1b02671145e225e54354ffeb0ee7fe2afe3c4339", "parents": [ "fa1bf42ff9296ac4cf211b0a1b450a6071d26a95", "ea5e116162b7e0cf83a2b8a273440514404604de" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Aug 09 20:43:26 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Aug 09 20:43:26 2011 +0200" }, "message": "Merge branch \u0027stable/for-jens\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus\n" }, { "commit": "ea5e116162b7e0cf83a2b8a273440514404604de", "tree": "6eee7e14bb69e015172b806d2abc98272430717f", "parents": [ "89153b5cae9f40c224a5d321665a97bf14220c2c" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Aug 03 11:12:17 2011 -0400" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Tue Aug 09 11:12:14 2011 -0400" }, "message": "xen/blkback: Make description more obvious.\n\nWith the frontend having Xen but the backend not, it just looks odd:\n\n \u003c*\u003e Xen virtual block device support\n \u003c*\u003e Block-device backend driver\n\nFix it to have the \u0027Xen\u0027 in front of it.\n\nReported-by: Sander Eikelenboom \u003clinux@eikelenboom.it\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "f963d270cb7bbb8eeb57901d02b22a493e664fd2", "tree": "24c3c13c3c82391b670b84d1d2436cc1a58c8dbb", "parents": [ "13049537007dee73a76f0a30fcbc24d02c6fa9e4" ], "author": { "name": "Joe Handzik", "email": "joseph.t.handzik@beardog.cce.hp.com", "time": "Mon Aug 08 11:40:17 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Aug 08 11:40:17 2011 +0200" }, "message": "cciss: add transport mode attribute to sys\n\nSigned-off-by: Joseph Handzik \u003cjoseph.t.handzik@beardog.cce.hp.com\u003e\nAcked-by: Stephen M. Cameron \u003cscameron@beardog.cce.hp.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "13049537007dee73a76f0a30fcbc24d02c6fa9e4", "tree": "2bc62c056f42ef8792c3912fef5ce5ca318df993", "parents": [ "322a8b034003c0d46d39af85bf24fee27b902f48" ], "author": { "name": "Joseph Handzik", "email": "joseph.t.handzik@beardog.cce.hp.com", "time": "Mon Aug 08 11:40:15 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Aug 08 11:40:15 2011 +0200" }, "message": "cciss: Adds simple mode functionality\n\nSigned-off-by: Joseph Handzik \u003cjoseph.t.handzik@beardog.cce.hp.com\u003e\nAcked-by: Stephen M. Cameron \u003cscameron@beardog.cce.hp.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "f41c53a569c4cf0556893ec9cfcf697d069799e1", "tree": "e5ee3810301fe3c91e9a1f395028dda6e230d3f8", "parents": [ "f95fe9cfb49f6e625fbb5888cae2ed6f3a276b89" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Wed Aug 03 15:02:55 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Wed Aug 03 15:02:55 2011 +0200" }, "message": "block: swim3: fix unterminated of_device_id table\n\nof_device_id structures need a NULL terminating entry, add it.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "ddad9ef5826efdfbbdb67b13b46f30e43e46ec3e", "tree": "e61bae18a470e75fc46b23b9923e224aba93868d", "parents": [ "e2a5429ff7947ad251310376384f449297b7492a" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Tue Aug 02 12:43:49 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Aug 02 12:43:49 2011 +0200" }, "message": "drivers/block/drbd/drbd_nl.c: use bitmap_parse instead of __bitmap_parse\n\nThe buffer \u0027sc.cpu_mask\u0027 is a kernel buffer. If bitmap_parse is used\ninstead of __bitmap_parse the extra parameter that indicates a kernel\nbuffer is not needed.\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nCc: Lars Ellenberg \u003cdrbd-dev@lists.linbit.com\u003e\nCc: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "05eb0f252b04aa94ace0794f73d56c6a02351d80", "tree": "51c86862b31a5d2361b54658d0b6e14ed03c9afc", "parents": [ "d134b00b9acca3fb054d7c88a5f5d562ecbb42d1" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Sun Jul 31 22:21:35 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sun Jul 31 22:21:35 2011 +0200" }, "message": "loop: fix deadlock when sysfs and LOOP_CLR_FD race against each other\n\nLOOP_CLR_FD takes lo-\u003elo_ctl_mutex and tries to remove the loop sysfs\nfiles. Sysfs calls show() and waits for lo-\u003elo_ctl_mutex. LOOP_CLR_FD\nwaits for show() to finish to remove the sysfs file.\n\n cat /sys/class/block/loop0/loop/backing_file\n mutex_lock_nested+0x176/0x350\n ? loop_attr_do_show_backing_file+0x2f/0xd0 [loop]\n ? loop_attr_do_show_backing_file+0x2f/0xd0 [loop]\n loop_attr_do_show_backing_file+0x2f/0xd0 [loop]\n dev_attr_show+0x1b/0x60\n ? sysfs_read_file+0x86/0x1a0\n ? __get_free_pages+0x12/0x50\n sysfs_read_file+0xaf/0x1a0\n\n ioctl(LOOP_CLR_FD):\n wait_for_common+0x12c/0x180\n ? try_to_wake_up+0x2a0/0x2a0\n wait_for_completion+0x18/0x20\n sysfs_deactivate+0x178/0x180\n ? sysfs_addrm_finish+0x43/0x70\n ? sysfs_addrm_start+0x1d/0x20\n sysfs_addrm_finish+0x43/0x70\n sysfs_hash_and_remove+0x85/0xa0\n sysfs_remove_group+0x59/0x100\n loop_clr_fd+0x1dc/0x3f0 [loop]\n lo_ioctl+0x223/0x7a0 [loop]\n\nInstead of taking the lo_ctl_mutex from sysfs code, take the inner\nlo-\u003elo_lock, to protect the access to the backing_file data.\n\nThanks to Tejun for help debugging and finding a solution.\n\nCc: Milan Broz \u003cmbroz@redhat.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nCc: stable@kernel.org\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "d134b00b9acca3fb054d7c88a5f5d562ecbb42d1", "tree": "ccc63647ec8a551289f26866ec86091e44266bad", "parents": [ "770fe30a46a12b6fb6b63fbe1737654d28e84844" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Sun Jul 31 22:08:04 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sun Jul 31 22:08:04 2011 +0200" }, "message": "loop: add BLK_DEV_LOOP_MIN_COUNT\u003d%i to allow distros 0 pre-allocated loop devices\n\nInstead of unconditionally creating a fixed number of dead loop\ndevices which need to be investigated by storage handling services,\neven when they are never used, we allow distros start with 0\nloop devices and have losetup(8) and similar switch to the dynamic\n/dev/loop-control interface instead of searching /dev/loop%i for free\ndevices.\n\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "770fe30a46a12b6fb6b63fbe1737654d28e84844", "tree": "e8a35712602ca086c41f94d191579ac2dc365cf5", "parents": [ "34dd82afd27da2537199d7f71f1542501c6f96e7" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Sun Jul 31 22:08:04 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sun Jul 31 22:08:04 2011 +0200" }, "message": "loop: add management interface for on-demand device allocation\n\nLoop devices today have a fixed pre-allocated number of usually 8.\nThe number can only be changed at module init time. To find a free\ndevice to use, /dev/loop%i needs to be scanned, and all devices need\nto be opened until a free one is possibly found.\n\nThis adds a new /dev/loop-control device node, that allows to\ndynamically find or allocate a free device, and to add and remove loop\ndevices from the running system:\n LOOP_CTL_ADD adds a specific device. Arg is the number\n of the device. It returns the device i or a negative\n error code.\n\n LOOP_CTL_REMOVE removes a specific device, Arg is the\n number the device. It returns the device i or a negative\n error code.\n\n LOOP_CTL_GET_FREE finds the next unbound device or allocates\n a new one. No arg is given. It returns the device i or a\n negative error code.\n\nThe loop kernel module gets automatically loaded when\n/dev/loop-control is accessed the first time. The alias\nspecified in the module, instructs udev to create this\n\u0027dead\u0027 device node, even when the module is not loaded.\n\nExample:\n cfd \u003d open(\"/dev/loop-control\", O_RDWR);\n\n # add a new specific loop device\n err \u003d ioctl(cfd, LOOP_CTL_ADD, devnr);\n\n # remove a specific loop device\n err \u003d ioctl(cfd, LOOP_CTL_REMOVE, devnr);\n\n # find or allocate a free loop device to use\n devnr \u003d ioctl(cfd, LOOP_CTL_GET_FREE);\n\n sprintf(loopname, \"/dev/loop%i\", devnr);\n ffd \u003d open(\"backing-file\", O_RDWR);\n lfd \u003d open(loopname, O_RDWR);\n err \u003d ioctl(lfd, LOOP_SET_FD, ffd);\n\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Karel Zak \u003ckzak@redhat.com\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "34dd82afd27da2537199d7f71f1542501c6f96e7", "tree": "35688ccd99d99e16f3c82829eb824703e7460822", "parents": [ "aa387cc895672b00f807ad7c734a2defaf677712" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Sun Jul 31 22:08:04 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sun Jul 31 22:08:04 2011 +0200" }, "message": "loop: replace linked list of allocated devices with an idr index\n\nReplace the linked list, that keeps track of allocated devices, with an\nidr index to allow a more efficient lookup of devices.\n\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "60063497a95e716c9a689af3be2687d261f115b4", "tree": "6ce0d68db76982c53df46aee5f29f944ebf2c320", "parents": [ "148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: use \u003clinux/atomic.h\u003e\n\nThis allows us to move duplicated code in \u003casm/atomic.h\u003e\n(atomic_inc_not_zero() for now) to \u003clinux/atomic.h\u003e\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ba5b56cb3e3d2cab73d4fee9a022bb69462a8cd9", "tree": "eda7ea059a41ae5d68e2ad5a36a87069187ef22a", "parents": [ "243dd2809a5edd2e0e3e62781083aa44049af37d", "d79698da32b317e96216236f265a9b72b78ae568" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 13:38:50 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 13:38:50 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (23 commits)\n ceph: document unlocked d_parent accesses\n ceph: explicitly reference rename old_dentry parent dir in request\n ceph: document locking for ceph_set_dentry_offset\n ceph: avoid d_parent in ceph_dentry_hash; fix ceph_encode_fh() hashing bug\n ceph: protect d_parent access in ceph_d_revalidate\n ceph: protect access to d_parent\n ceph: handle racing calls to ceph_init_dentry\n ceph: set dir complete frag after adding capability\n rbd: set blk_queue request sizes to object size\n ceph: set up readahead size when rsize is not passed\n rbd: cancel watch request when releasing the device\n ceph: ignore lease mask\n ceph: fix ceph_lookup_open intent usage\n ceph: only link open operations to directory unsafe list if O_CREAT|O_TRUNC\n ceph: fix bad parent_inode calc in ceph_lookup_open\n ceph: avoid carrying Fw cap during write into page cache\n libceph: don\u0027t time out osd requests that haven\u0027t been received\n ceph: report f_bfree based on kb_avail rather than diffing.\n ceph: only queue capsnap if caps are dirty\n ceph: fix snap writeback when racing with writes\n ...\n" }, { "commit": "029bcbd8b076fd19787b8c73e58dd0a6f2c0caf1", "tree": "305128db78ecfb09e6a236caeeac1fbb9ece1175", "parents": [ "e9852227431a0ed6ceda064f33e4218757acab6c" ], "author": { "name": "Josh Durgin", "email": "josh.durgin@dreamhost.com", "time": "Fri Jul 22 11:35:23 2011 -0700" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Tue Jul 26 11:29:35 2011 -0700" }, "message": "rbd: set blk_queue request sizes to object size\n\nThis improves performance since more requests can be merged.\n\nReviewed-by: Yehuda Sadeh \u003cyehuda@hq.newdream.net\u003e\nSigned-off-by: Josh Durgin \u003cjosh.durgin@dreamhost.com\u003e\n" }, { "commit": "79e3057c4c9d32b88e6745fd220d91b0a8b2030b", "tree": "fb6f4bff64c4e6014af3bdaa5284e921d24111bd", "parents": [ "2f90b852e3ae73889d7f6de6ecf429b9b6a6b103" ], "author": { "name": "Yehuda Sadeh", "email": "yehuda@hq.newdream.net", "time": "Tue Jul 12 16:56:57 2011 -0700" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Tue Jul 26 11:29:04 2011 -0700" }, "message": "rbd: cancel watch request when releasing the device\n\nWe were missing this cleanup, so when a device was released\nthe osd didn\u0027t clean up its watchers list, so following notifications\ncould be slow as osd needed to timeout on the client.\n\nSigned-off-by: Yehuda Sadeh \u003cyehuda@hq.newdream.net\u003e\n" }, { "commit": "8ded371f81fba8b38a049f8c5f30ce6438fc7b75", "tree": "0684d176cb6f35c92c4bf0185b1af9f5380077eb", "parents": [ "096a705bbc080a4041636d07514560da8d78acbe", "07d0c38e7d84f911c72058a124c7f17b3c779a65" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 10:38:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 10:38:18 2011 -0700" }, "message": "Merge branch \u0027for-3.1/drivers\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-3.1/drivers\u0027 of git://git.kernel.dk/linux-block:\n cciss: do not attempt to read from a write-only register\n xen/blkback: Add module alias for autoloading\n xen/blkback: Don\u0027t let in-flight requests defer pending ones.\n bsg: fix address space warning from sparse\n bsg: remove unnecessary conditional expressions\n bsg: fix bsg_poll() to return POLLOUT properly\n" }, { "commit": "bbd9d6f7fbb0305c9a592bf05a32e87eb364a4ff", "tree": "12b2bb4202b05f6ae6a43c6ce830a0472043dbe5", "parents": [ "8e204874db000928e37199c2db82b7eb8966cc3c", "5a9a43646cf709312d71eca71cef90ad802f28f9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 19:02:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 19:02:39 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (107 commits)\n vfs: use ERR_CAST for err-ptr tossing in lookup_instantiate_filp\n isofs: Remove global fs lock\n jffs2: fix IN_DELETE_SELF on overwriting rename() killing a directory\n fix IN_DELETE_SELF on overwriting rename() on ramfs et.al.\n mm/truncate.c: fix build for CONFIG_BLOCK not enabled\n fs:update the NOTE of the file_operations structure\n Remove dead code in dget_parent()\n AFS: Fix silly characters in a comment\n switch d_add_ci() to d_splice_alias() in \"found negative\" case as well\n simplify gfs2_lookup()\n jfs_lookup(): don\u0027t bother with . or ..\n get rid of useless dget_parent() in btrfs rename() and link()\n get rid of useless dget_parent() in fs/btrfs/ioctl.c\n fs: push i_mutex and filemap_write_and_wait down into -\u003efsync() handlers\n drivers: fix up various -\u003ellseek() implementations\n fs: handle SEEK_HOLE/SEEK_DATA properly in all fs\u0027s that define their own llseek\n Ext4: handle SEEK_HOLE/SEEK_DATA generically\n Btrfs: implement our own -\u003ellseek\n fs: add SEEK_HOLE and SEEK_DATA flags\n reiserfs: make reiserfs default to barrier\u003dflush\n ...\n\nFix up trivial conflicts in fs/xfs/linux-2.6/xfs_super.c due to the new\nshrinker callout for the inode cache, that clashed with the xfs code to\nstart the periodic workers later.\n" }, { "commit": "a99a7d1436f9375662f35ccac8f1a1e1b0302a11", "tree": "0b3f411f6b1c4256063cf1d53773110f5a5f7482", "parents": [ "bdc7ccfc0631797636837b10df7f87bc1e2e4ae3", "ded7c1ee9799fe0ca725b459f151402e3ca4d12b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 16:51:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 16:51:56 2011 -0700" }, "message": "Merge branch \u0027timers-cleanup-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-cleanup-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n mips: Fix i8253 clockevent fallout\n i8253: Cleanup outb/inb magic\n arm: Footbridge: Use common i8253 clockevent\n mips: Use common i8253 clockevent\n x86: Use common i8253 clockevent\n i8253: Create common clockevent implementation\n i8253: Export i8253_lock unconditionally\n pcpskr: MIPS: Make config dependencies finer grained\n pcspkr: Cleanup Kconfig dependencies\n i8253: Move remaining content and delete asm/i8253.h\n i8253: Consolidate definitions of PIT_LATCH\n x86: i8253: Consolidate definitions of global_clock_event\n i8253: Alpha, PowerPC: Remove unused asm/8253pit.h\n alpha: i8253: Cleanup remaining users of i8253pit.h\n i8253: Remove I8253_LOCK config\n i8253: Make pcsp sound driver use the shared i8253_lock\n i8253: Make pcspkr input driver use the shared i8253_lock\n i8253: Consolidate all kernel definitions of i8253_lock\n i8253: Unify all kernel declarations of i8253_lock\n i8253: Create linux/i8253.h and use it in all 8253 related files\n" }, { "commit": "8181780c163e7111f15619067cfa044172d532e1", "tree": "7eec99ddd1b20e9018edfba5c05a179b317c27fe", "parents": [ "7235dd74a4733d4b3651349b5261d2e06996427d", "99ce39e359fa29e4b609a6a13485e7573eda5dfb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 14:53:38 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 14:53:38 2011 -0700" }, "message": "Merge branch \u0027devicetree/next\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027devicetree/next\u0027 of git://git.secretlab.ca/git/linux-2.6:\n dt: include linux/errno.h in linux/of_address.h\n of/address: Add of_find_matching_node_by_address helper\n dt: remove extra xsysace platform_driver registration\n tty/serial: Add devicetree support for nVidia Tegra serial ports\n dt: add empty of_property_read_u32[_array] for non-dt\n dt: bindings: move SEC node under new crypto/\n dt: add helper function to read u32 arrays\n tty/serial: change of_serial to use new of_property_read_u32() api\n dt: add \u0027const\u0027 for of_property_read_string parameter **out_string\n dt: add helper functions to read u32 and string property values\n tty: of_serial: support for 32 bit accesses\n dt: document the of_serial bindings\n dt/platform: allow device name to be overridden\n drivers/amba: create devices from device tree\n dt: add of_platform_populate() for creating device from the device tree\n dt: Add default match table for bus ids\n" }, { "commit": "111ad119d1765b1bbef2629a5f2bd825caeb7e74", "tree": "167ee4a4e6e9276bb7178ddcce85d6860543cfb4", "parents": [ "997271cf5e12c1b38aec0764187094663501c984", "3a6d28b11a895d08b6b4fc6f16dd9ff995844b45" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 13:45:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 13:45:15 2011 -0700" }, "message": "Merge branch \u0027stable/drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen/pciback: Have \u0027passthrough\u0027 option instead of XEN_PCIDEV_BACKEND_PASS and XEN_PCIDEV_BACKEND_VPCI\n xen/pciback: Remove the DEBUG option.\n xen/pciback: Drop two backends, squash and cleanup some code.\n xen/pciback: Print out the MSI/MSI-X (PIRQ) values\n xen/pciback: Don\u0027t setup an fake IRQ handler for SR-IOV devices.\n xen: rename pciback module to xen-pciback.\n xen/pciback: Fine-grain the spinlocks and fix BUG: scheduling while atomic cases.\n xen/pciback: Allocate IRQ handler for device that is shared with guest.\n xen/pciback: Disable MSI/MSI-X when reseting a device\n xen/pciback: guest SR-IOV support for PV guest\n xen/pciback: Register the owner (domain) of the PCI device.\n xen/pciback: Cleanup the driver based on checkpatch warnings and errors.\n xen/pciback: xen pci backend driver.\n xen: tmem: self-ballooning and frontswap-selfshrinking\n xen: Add module alias to autoload backend drivers\n xen: Populate xenbus device attributes\n xen: Add __attribute__((format(printf... where appropriate\n xen: prepare tmem shim to handle frontswap\n xen: allow enable use of VGA console on dom0\n" }, { "commit": "e7f59097071f2e193e900093742a4be85839f3d9", "tree": "35cc747b65d29fdc4f6dea472bf75b540da20453", "parents": [ "0ee5dc676a5f8fadede608c7281dfedb1ae714ea" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Jul 07 15:45:59 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jul 20 01:44:21 2011 -0400" }, "message": "kill useless checks for sb-\u003es_op \u003d\u003d NULL\n\nnever is...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "8c11642a50555e584774737f7c296f9aece310cf", "tree": "1ff8dfaf05479593ef2c50378a68dfc6aec495a5", "parents": [ "5d10302f46df1d9a85c34ea97f9b6c29e414482e", "620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jul 15 20:11:34 2011 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jul 15 20:11:34 2011 -0600" }, "message": "Merge commit \u0027v3.0-rc7\u0027 into devicetree/next\n" }, { "commit": "89153b5cae9f40c224a5d321665a97bf14220c2c", "tree": "00290a8a37e49c1dea67be06e2640f26677364c2", "parents": [ "196cfe2ae8fcdc03b3c7d627e7dfe8c0ce7229f9" ], "author": { "name": "Stefan Bader", "email": "stefan.bader@canonical.com", "time": "Thu Jul 14 15:30:37 2011 +0200" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Jul 14 14:19:51 2011 -0400" }, "message": "xen-blkfront: Fix one off warning about name clash\n\nAvoid telling users to use xvde and onwards when using xvde.\n\nAcked-by: Stefano Stabellini \u003cstefano.stabellini@eu.citrix.com\u003e\nSigned-off-by: Stefan Bader \u003cstefan.bader@canonical.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "196cfe2ae8fcdc03b3c7d627e7dfe8c0ce7229f9", "tree": "6d9150912d9ad4c9d6749430532e87e98a47c360", "parents": [ "a7e9357f10744c3392ce3cd735c690ee513c7375" ], "author": { "name": "Stefan Bader", "email": "stefan.bader@canonical.com", "time": "Thu Jul 14 15:30:22 2011 +0200" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Jul 14 14:19:33 2011 -0400" }, "message": "xen-blkfront: Drop name and minor adjustments for emulated scsi devices\n\nThese were intended to avoid the namespace clash when representing\nemulated IDE and SCSI devices. However that seems to confuse users\nmore than expected (a disk defined as sda becomes xvde).\nSo for now go back to the scheme which does no adjustments. This\nwill break when mixing IDE and SCSI names in the configuration of\nguests but should be by now expected.\n\nAcked-by: Stefano Stabellini \u003cstefano.stabellini@eu.citrix.com\u003e\nSigned-off-by: Stefan Bader \u003cstefan.bader@canonical.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "5d10302f46df1d9a85c34ea97f9b6c29e414482e", "tree": "65bb2287b6b5e7dda65045193b1992a209c13a46", "parents": [ "2e39e5be1ddf9fc5fbe84fe7ae3e035bb07845e5" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jul 14 05:33:52 2011 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jul 14 05:33:52 2011 -0600" }, "message": "dt: remove extra xsysace platform_driver registration\n\nAfter commit 1c48a5c93, \"dt: Eliminate\nof_platform_{,un}register_driver\", the xsysace driver attempts to\nregister two platform_drivers with the same name, which a) doesn\u0027t\nwork, and b) isn\u0027t necessary. This patch merges the two\nplatform_drivers.\n\nReported-by: Daniel Hellstrom \u003cdaniel@gaisler.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "07d0c38e7d84f911c72058a124c7f17b3c779a65", "tree": "d9a63809a1d67e5410ff5cf76a43fb6899d0c281", "parents": [ "a7e9357f10744c3392ce3cd735c690ee513c7375" ], "author": { "name": "Stephen M. Cameron", "email": "scameron@beardog.cce.hp.com", "time": "Sat Jul 09 09:04:12 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Jul 09 09:04:12 2011 +0200" }, "message": "cciss: do not attempt to read from a write-only register\n\nMost smartarrays will tolerate it, but some new ones don\u0027t.\n\nSigned-off-by: Stephen M. Cameron \u003cscameron@beardog.cce.hp.com\u003e\n\nNote: this is a regression caused by commit 1ddd5049\nCc: stable@kernel.org\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "a7e9357f10744c3392ce3cd735c690ee513c7375", "tree": "b666d2ffb65a34014f8cdb8817172842d44d4496", "parents": [ "b4726a9df270859898e254b6eee67a28f38b34d3" ], "author": { "name": "Bastian Blank", "email": "waldi@debian.org", "time": "Wed Jun 29 14:40:50 2011 +0200" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Jun 30 12:48:25 2011 -0400" }, "message": "xen/blkback: Add module alias for autoloading\n\nAdd xen-backend:vbd module alias to the xen-blkback module. This allows\nautomatic loading of the module.\n\nSigned-off-by: Bastian Blank \u003cwaldi@debian.org\u003e\nAcked-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "b4726a9df270859898e254b6eee67a28f38b34d3", "tree": "2512fcce88e4ad97ea1068864d716fd105d86c39", "parents": [ "2b727c6300b49352f80f63704bb50c256949e95e" ], "author": { "name": "Daniel Stodden", "email": "daniel.stodden@citrix.com", "time": "Sat May 28 13:21:10 2011 -0700" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Jun 30 12:48:06 2011 -0400" }, "message": "xen/blkback: Don\u0027t let in-flight requests defer pending ones.\n\nRunning RING_FINAL_CHECK_FOR_REQUESTS from make_response is a bad\nidea. It means that in-flight I/O is essentially blocking continued\nbatches. This essentially kills throughput on frontends which unplug\n(or even just notify) early and rightfully assume addtional requests\nwill be picked up on time, not synchronously.\n\nSigned-off-by: Daniel Stodden \u003cdaniel.stodden@citrix.com\u003e\n[v1: Rebased and fixed compile problems]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "08b8bfc1c649cf82edf43f686cbb9a4bac809679", "tree": "1706e037fc0fa2596bd96ff11fcb9fed4b6a1c19", "parents": [ "f7fdd84e04c8fdc9196abe3bfd27535bccb52ee5" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 12 09:21:13 2011 -0700" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Jun 30 12:14:40 2011 -0400" }, "message": "xen: Add __attribute__((format(printf... where appropriate\n\nUse the compiler to verify printf formats and arguments.\n\nFix fallout.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "7b28afe01ab6ffb5f152f47831b44933facd2328", "tree": "a537d78f49fa1b959c9a453f459c1acd767a939f", "parents": [ "726e99ab88db059fe1422e15376ae404f8c66eb4", "86e1e98e5c6b4edab97e2b058466ef553cfd878e" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Jun 30 10:10:50 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Jun 30 10:10:50 2011 +0200" }, "message": "Merge branch \u0027for-3.0-important\u0027 of git://git.drbd.org/linux-2.6-drbd into for-linus\n" }, { "commit": "86e1e98e5c6b4edab97e2b058466ef553cfd878e", "tree": "e8b26c03a90edaf5214a094d3dcb1b223041b862", "parents": [ "15b493d11fcce3c5547e3d7fb6d90e11ffe12777" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Tue Jun 28 13:22:48 2011 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu Jun 30 09:23:46 2011 +0200" }, "message": "drbd: we should write meta data updates with FLUSH FUA\n\nWe used to write these with BIO_RW_BARRIER aka REQ_HARDBARRIER (unless\ndisabled in the configuration). The correct semantic now would be to\nwrite with FLUSH/FUA.\nFor example, with activity log transactions, FUA alone is not enough, we\nneed the corresponding bitmap update (and all related application\nupdates) on stable storage as well.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "cb6518cbef5e3e36b7ae90fcab610a52ea7e9fc0", "tree": "1eb6576ba34d7a731eeea5dab58c96905a142be2", "parents": [ "5a8b424276f7ba50c51e7caf485b2be23739e5b8" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Mon Jun 20 14:44:45 2011 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu Jun 30 09:23:44 2011 +0200" }, "message": "drbd: when receive times out on meta socket, also check last receive time on data socket\n\nIf we have an asymetrically congested network, we may send P_PING,\nbut due to congestion, the corresponding P_PING_ACK would time out,\nand we would drop a (congested, but otherwise) healthy connection\n(\"PingAck did not arrive in time.\")\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "5a8b424276f7ba50c51e7caf485b2be23739e5b8", "tree": "001a7250e631db20a5bc3d9fd667dc8a817d9c1f", "parents": [ "8ccee20e3ef4e12dbf02a18f17d386569b1f73ee" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Tue Jun 14 14:18:23 2011 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu Jun 30 09:23:43 2011 +0200" }, "message": "drbd: account bitmap IO during resync as resync-(related-)-io\n\nIf we have a good resync rate, we will frequently update the on-disk\nbitmap, which, if not accounted for as resync io, may let an otherwise\nidle device appear to be \"busy\", and cause us to throttle resync.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "8ccee20e3ef4e12dbf02a18f17d386569b1f73ee", "tree": "a725b7844412c1cf9079e46ce779d33338ae1d67", "parents": [ "829c60878626be290a4c248e8f1b86a0d5cbd38b" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Mon Jun 06 11:31:42 2011 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu Jun 30 09:23:42 2011 +0200" }, "message": "drbd: don\u0027t cond_resched_lock with IRQs disabled\n\nThe last commit, drbd: add missing spinlock to bitmap receive,\nintroduced a cond_resched_lock(), where the lock in question is taken\nwith irqs disabled.\n\nAs we must not schedule with IRQs disabled,\nand cond_resched_lock_irq() does not exist, yet,\nwe re-aquire the spin_lock_irq() for each bitmap page processed in turn.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "829c60878626be290a4c248e8f1b86a0d5cbd38b", "tree": "3774c1a3abb72bcc5ab0b37a23fdd9727ca188e4", "parents": [ "0cfdd247d1779d5ffc8f685b172a526ecdc6773f" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Fri Jun 03 21:18:13 2011 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu Jun 30 09:23:41 2011 +0200" }, "message": "drbd: add missing spinlock to bitmap receive\n\nDuring bitmap exchange, when using the RLE bitmap compression scheme,\nwe have a code path that can set the whole bitmap at once.\n\nTo avoid holding spin_lock_irq() for too long, we used to lock out other\nbitmap modifications during bitmap exchange by other means, and then,\nknowing we have exclusive access to the bitmap, modify it without\nthe spinlock, and with IRQs enabled.\n\nSince we now allow local IO to continue, potentially setting additional\nbits during the bitmap receive phase, this is no longer true, and we get\nuncoordinated updates of bitmap members, causing bm_set to no longer\naccurately reflect the total number of set bits.\n\nTo actually see this, you\u0027d need to have a large bitmap, use RLE bitmap\ncompression, and have busy IO during sync handshake and bitmap exchange.\n\nFix this by taking the spin_lock_irq() in this code path as well, but\ncalling cond_resched_lock() after each page worth of bits processed.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "0cfdd247d1779d5ffc8f685b172a526ecdc6773f", "tree": "affca52cde37dde016424d5c17679464f855f7ae", "parents": [ "a1c15c59feee36267c43142a41152fbf7402afb6" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed May 25 11:14:35 2011 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu Jun 30 09:23:40 2011 +0200" }, "message": "drbd: Use the correct max_bio_size when creating resync requests\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "334955ef964bee9d3b1e20966847eee28cfd05f6", "tree": "e0c35313ce6d82e94768f0c5d78c53ec296392a2", "parents": [ "06e86849cf4019945a106913adb9ff0abcc01770" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Wed Jun 01 19:04:57 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Jun 09 15:01:37 2011 +0200" }, "message": "i8253: Create linux/i8253.h and use it in all 8253 related files\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: linux-mips@linux-mips.org\nLink: http://lkml.kernel.org/r/20110601180610.054254048@duck.linux-mips.net\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n arch/arm/mach-footbridge/isa-timer.c | 2 +-\n arch/mips/cobalt/time.c | 2 +-\n arch/mips/jazz/irq.c | 2 +-\n arch/mips/kernel/i8253.c | 2 +-\n arch/mips/mti-malta/malta-time.c | 2 +-\n arch/mips/sgi-ip22/ip22-time.c | 2 +-\n arch/mips/sni/time.c | 2 +-\n arch/x86/kernel/apic/apic.c | 2 +-\n arch/x86/kernel/apm_32.c | 2 +-\n arch/x86/kernel/hpet.c | 2 +-\n arch/x86/kernel/i8253.c | 2 +-\n arch/x86/kernel/time.c | 2 +-\n drivers/block/hd.c | 2 +-\n drivers/clocksource/i8253.c | 2 +-\n drivers/input/gameport/gameport.c | 2 +-\n drivers/input/joystick/analog.c | 2 +-\n drivers/input/misc/pcspkr.c | 2 +-\n include/linux/i8253.h | 11 +++++++++++\n sound/drivers/pcsp/pcsp.h | 2 +-\n 19 files changed, 29 insertions(+), 18 deletions(-)\n\n" }, { "commit": "4f1ba49efafccbc73017f824efa2505c81b247cd", "tree": "db072bbccffd1f1c6b1269ac7a752cb30af3a726", "parents": [ "39b4a46f19295b4876fba6655f27d67232dc6a1f", "e3a57b3ccf5c04934ac43b5b80e32ba51b817288" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 08:11:26 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 08:11:26 2011 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: Use hlist_entry() for io_context.cic_list.first\n cfq-iosched: Remove bogus check in queue_fail path\n xen/blkback: potential null dereference in error handling\n xen/blkback: don\u0027t call vbd_size() if bd_disk is NULL\n block: blkdev_get() should access -\u003ebd_disk only after success\n CFQ: Fix typo and remove unnecessary semicolon\n block: remove unwanted semicolons\n Revert \"block: Remove extra discard_alignment from hd_struct.\"\n nbd: adjust \u0027max_part\u0027 according to part_shift\n nbd: limit module parameters to a sane value\n nbd: pass MSG_* flags to kernel_recvmsg()\n block: improve the bio_add_page() and bio_add_pc_page() descriptions\n" }, { "commit": "0f48f2600911d5de6393829e4a9986d4075558b3", "tree": "39745ab1858bb308f3b101f5ae555f08485bb7ea", "parents": [ "3f303103b884ca577908d3e5c0650ad12e40c586" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:29:19 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:29:19 2011 +0900" }, "message": "block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal\n\nJens\u0027 back-merge commit 698567f3fa79 (\"Merge commit \u0027v2.6.39\u0027 into\nfor-2.6.40/core\") was incorrectly done, and re-introduced the\nDISK_EVENT_MEDIA_CHANGE lines that had been removed earlier in commits\n\n - 9fd097b14918 (\"block: unexport DISK_EVENT_MEDIA_CHANGE for\n legacy/fringe drivers\")\n\n - 7eec77a1816a (\"ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd\n and ide-cd\")\n\nbecause of conflicts with the \"g-\u003eflags\" updates near-by by commit\nd4dc210f69bc (\"block: don\u0027t block events on excl write for non-optical\ndevices\")\n\nAs a result, we re-introduced the hanging behavior due to infinite disk\nmedia change reports.\n\nTssk, tssk, people! Don\u0027t do back-merges at all, and *definitely* don\u0027t\ndo them to hide merge conflicts from me - especially as I\u0027m likely\nbetter at merging them than you are, since I do so many merges.\n\nReported-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9b83c771214cf6a256ee875050e6eaf320cf7983", "tree": "39b5308ea40a47d19cefab98721402296b78a246", "parents": [ "6464920a6e30604cb71d0ecbaa20e35009bd76fb" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Fri May 27 09:27:16 2011 +0300" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Jun 01 09:28:21 2011 -0400" }, "message": "xen/blkback: potential null dereference in error handling\n\nblkbk-\u003epending_pages can be NULL here so I added a check for it.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\n[v1: Redid the loop a bit]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "6464920a6e30604cb71d0ecbaa20e35009bd76fb", "tree": "e4b8e6a06c6548d739176988c0bbdc21cafa40eb", "parents": [ "4c49ff3fe128ca68dabd07537415c419ad7f82f9" ], "author": { "name": "Laszlo Ersek", "email": "lersek@redhat.com", "time": "Wed May 25 12:24:25 2011 +0200" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Jun 01 09:28:20 2011 -0400" }, "message": "xen/blkback: don\u0027t call vbd_size() if bd_disk is NULL\n\n...because vbd_size() dereferences bd_disk if bd_part is NULL.\n\nSigned-off-by: Laszlo Ersek\u003clersek@redhat.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "6917f83ffe5e6b6414ccc845263b792ed201c0f1", "tree": "e90ecfcad36fc10e679ae0b6d2a7e5e725b58d1e", "parents": [ "7a7c924cf03da2a76ea4dc0aac1a788cf95a9c29" ], "author": { "name": "Liu Yuan", "email": "tailai.ly@taobao.com", "time": "Sun Apr 24 02:49:26 2011 +0800" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:13 2011 +0930" }, "message": "drivers, block: virtio_blk: Replace cryptic number with the macro\n\nIt is easier to figure out the context by reading SCSI_SENSE_BUFFERSIZE\ninstead of plain \u002796\u0027.\n\nSigned-off-by: Liu Yuan \u003ctailai.ly@taobao.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "7a7c924cf03da2a76ea4dc0aac1a788cf95a9c29", "tree": "717aba1aab456d252c684abf256afa8e92b7dd96", "parents": [ "990c91f0af46c57f0291060d928c7ab82f9d5667" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Tue Feb 01 21:43:48 2011 +0100" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:13 2011 +0930" }, "message": "virtio_blk: allow re-reading config space at runtime\n\nWire up the virtio_driver config_changed method to get notified about\nconfig changes raised by the host. For now we just re-read the device\nsize to support online resizing of devices, but once we add more\nattributes that might be changeable they could be added as well.\n\nNote that the config_changed method is called from irq context, so\nwe\u0027ll have to use the workqueue infrastructure to provide us a proper\nuser context for our changes.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "f310642123e0d32d919c60ca3fab5acd130c4ba3", "tree": "f3844152e2e8c0fdd01621a400f84c8a159252a0", "parents": [ "ef1d57599dc904fdb31b8e9b5336350d21a1fde1", "5d4c47e0195b989f284907358bd5c268a44b91c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:18:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:18:09 2011 -0700" }, "message": "Merge branch \u0027idle-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6\n\n* \u0027idle-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:\n x86 idle: deprecate mwait_idle() and \"idle\u003dmwait\" cmdline param\n x86 idle: deprecate \"no-hlt\" cmdline param\n x86 idle APM: deprecate CONFIG_APM_CPU_IDLE\n x86 idle floppy: deprecate disable_hlt()\n x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it\n x86 idle: clarify AMD erratum 400 workaround\n idle governor: Avoid lock acquisition to read pm_qos before entering idle\n cpuidle: menu: fixed wrapping timers at 4.294 seconds\n" } ], "next": "3b70b2e5fcf6315eb833a1bcc2b810bdc75484ff" }