)]}' { "log": [ { "commit": "df677140281beb608f6748c341af7612f7bfe7a0", "tree": "db977b703e36487ce956cc120bb021565810734f", "parents": [ "de701c74a34005e637e1ca2634fbf28fd1debba2" ], "author": { "name": "Martin K. Petersen", "email": "martin.petersen@oracle.com", "time": "Tue Mar 08 08:28:01 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Mar 08 08:28:01 2011 +0100" }, "message": "block: biovec_slab vs. CONFIG_BLK_DEV_INTEGRITY\n\nThe block integrity subsystem no longer uses the bio_vec slabs so this\ncode can safely be compiled in.\n\nSigned-off-by: Martin K. Petersen \u003cmartin.petersen@oracle.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "e83a46bbb1d4c03defd733a64b727632a40059ad", "tree": "c4bc4822b2d3af1bf38095f531adc0a2aac054a5", "parents": [ "da527770007fce8e4541947d47918248286da875", "fd51469fb68b987032e46297e0a4fe9020063c20" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Mar 04 19:09:02 2011 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Mar 04 19:09:02 2011 +0100" }, "message": "Merge branch \u0027for-linus\u0027 of ../linux-2.6-block into block-for-2.6.39/core\n\nThis merge creates two set of conflicts. One is simple context\nconflicts caused by removal of throtl_scheduled_delayed_work() in\nfor-linus and removal of throtl_shutdown_timer_wq() in\nfor-2.6.39/core.\n\nThe other is caused by commit 255bb490c8 (block: blk-flush shouldn\u0027t\ncall directly into q-\u003erequest_fn() __blk_run_queue()) in for-linus\ncrashing with FLUSH reimplementation in for-2.6.39/core. The conflict\nisn\u0027t trivial but the resolution is straight-forward.\n\n* __blk_run_queue() calls in flush_end_io() and flush_data_end_io()\n should be called with @force_kblockd set to %true.\n\n* elv_insert() in blk_kick_flush() should use\n %ELEVATOR_INSERT_REQUEUE.\n\nBoth changes are to avoid invoking -\u003erequest_fn() directly from\nrequest completion path and closely match the changes in the commit\n255bb490c8.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "2d3a8497f8cc5aca14b722cd37d51f6c15ff9f74", "tree": "2e0013fdc1eec486a425e666a885b04a1c37befb", "parents": [ "255bb490c8c27eed484d538efe6ef6a7473bd3f6" ], "author": { "name": "Tao Ma", "email": "boyu.mt@taobao.com", "time": "Thu Mar 03 10:53:20 2011 -0500" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 03 10:53:20 2011 -0500" }, "message": "blktrace: Remove blk_fill_rwbs_rq.\n\nIf we enable trace events to trace block actions, We use\nblk_fill_rwbs_rq to analyze the corresponding actions\nin request\u0027s cmd_flags, but we only choose the minor 2 bits\nfrom it, so most of other flags(e.g, REQ_SYNC) are missing.\nFor example, with a sync write we get:\nwrite_test-2409 [001] 160.013869: block_rq_insert: 3,64 W 0 () 258135 + \u003d\n8 [write_test]\n\nSince now we have integrated the flags of both bio and request,\nit is safe to pass rq-\u003ecmd_flags directly to blk_fill_rwbs and\nblk_fill_rwbs_rq isn\u0027t needed any more.\n\nWith this patch, after a sync write we get:\nwrite_test-2417 [000] 226.603878: block_rq_insert: 3,64 WS 0 () 258135 +\u003d\n 8 [write_test]\n\nSigned-off-by: Tao Ma \u003cboyu.mt@taobao.com\u003e\nAcked-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "da527770007fce8e4541947d47918248286da875", "tree": "fc518172887409133e8dea827067209adfdb1c3c", "parents": [ "cd25f54961273c2e4cbd47441e04832468382a5e" ], "author": { "name": "Vivek Goyal", "email": "vgoyal@redhat.com", "time": "Wed Mar 02 19:05:33 2011 -0500" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Wed Mar 02 19:06:49 2011 -0500" }, "message": "block: Move blk_throtl_exit() call to blk_cleanup_queue()\n\nMove blk_throtl_exit() in blk_cleanup_queue() as blk_throtl_exit() is\nwritten in such a way that it needs queue lock. In blk_release_queue()\nthere is no gurantee that -\u003equeue_lock is still around.\n\nInitially blk_throtl_exit() was in blk_cleanup_queue() but Ingo reported\none problem.\n\n https://lkml.org/lkml/2010/10/23/86\n\n And a quick fix moved blk_throtl_exit() to blk_release_queue().\n\n commit 7ad58c028652753814054f4e3ac58f925e7343f4\n Author: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n Date: Sat Oct 23 20:40:26 2010 +0200\n\n block: fix use-after-free bug in blk throttle code\n\nThis patch reverts above change and does not try to shutdown the\nthrotl work in blk_sync_queue(). By avoiding call to\nthrotl_shutdown_timer_wq() from blk_sync_queue(), we should also avoid\nthe problem reported by Ingo.\n\nblk_sync_queue() seems to be used only by md driver and it seems to be\nusing it to make sure q-\u003eunplug_fn is not called as md registers its\nown unplug functions and it is about to free up the data structures\nused by unplug_fn(). Block throttle does not call back into unplug_fn()\nor into md. So there is no need to cancel blk throttle work.\n\nIn fact I think cancelling block throttle work is bad because it might\nhappen that some bios are throttled and scheduled to be dispatched later\nwith the help of pending work and if work is cancelled, these bios might\nnever be dispatched.\n\nBlock layer also uses blk_sync_queue() during blk_cleanup_queue() and\nblk_release_queue() time. That should be safe as we are also calling\nblk_throtl_exit() which should make sure all the throttling related\ndata structures are cleaned up.\n\nSigned-off-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "1654e7411a1ad4999fe7890ef51d2a2bbb1fcf76", "tree": "c8071cf8cc1aef9e776697b72aaca5a22a47c3d7", "parents": [ "291d24f6d9e7bbef81454fade8a44720665c7302" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 02 08:48:05 2011 -0500" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Wed Mar 02 08:48:05 2011 -0500" }, "message": "block: add @force_kblockd to __blk_run_queue()\n\n__blk_run_queue() automatically either calls q-\u003erequest_fn() directly\nor schedules kblockd depending on whether the function is recursed.\nblk-flush implementation needs to be able to explicitly choose\nkblockd. Add @force_kblockd.\n\nAll the current users are converted to specify %false for the\nparameter and this patch doesn\u0027t introduce any behavior change.\n\nstable: This is prerequisite for fixing ide oops caused by the new\n blk-flush implementation.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Jan Beulich \u003cJBeulich@novell.com\u003e\nCc: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "6fae9c25134baffbeeb20031479e7ff6f6d8eec0", "tree": "c9ab89992ce5293a43cd455a81dc8a5926a28a5e", "parents": [ "c186794dbb466b45cf40f942f2d09d6d5b4b0e42", "f5412be599602124d2bdd49947b231dd77c0bf99" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Mar 01 15:04:39 2011 -0500" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Mar 01 15:04:39 2011 -0500" }, "message": "Merge commit \u0027v2.6.38-rc6\u0027 into for-2.6.39/core\n\nConflicts:\n\tblock/cfq-iosched.c\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "450adcbe518ab3a3953d8475309525d22de77cba", "tree": "352fd47d75b86804e590fd88c09f953a798ba8b0", "parents": [ "3e1f2356ce231488dc1fa844e5ce91bcb59fc2a1" ], "author": { "name": "Vivek Goyal", "email": "vgoyal@redhat.com", "time": "Tue Mar 01 13:40:54 2011 -0500" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Mar 01 13:41:53 2011 -0500" }, "message": "blk-throttle: Do not use kblockd workqueue for throtl work\n\no Dominik Klein reported a system hang issue while doing some blkio\n throttling testing.\n\n https://lkml.org/lkml/2011/2/24/173\n\no Some tracing revealed that CFQ was not dispatching any more jobs as\n queue unplug was not happening. And queue unplug was not happening\n because unplug work was not being called as there was one throttling\n work on same cpu which as not finished yet. And throttling work had not\n finished as it was tyring to dispatch a bio to CFQ but all the request\n descriptors were consume to it was put to sleep.\n\no So basically it is a cyclic dependecny between CFQ unplug work and\n throtl dispatch work. Tejun suggested that use separate workqueue for\n such cases.\n\no This patch uses a separate workqueue for throttle related work and\n does not rely on kblockd workqueue anymore.\n\nCc: stable@kernel.org\nReported-by: Dominik Klein \u003cdk@in-telegence.net\u003e\nSigned-off-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "af06216a8ef1c430cc6ad22b562f3a11a512c5dd", "tree": "8c258db7e165cc160a8c85c3d06afa5f1e07a063", "parents": [ "dbc39ec4b69de34e2c2c937131649cc4a104283f" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 01 01:12:19 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 28 18:00:31 2011 -0800" }, "message": "ACPI: Fix build for CONFIG_NET unset\n\nSeveral ACPI drivers fail to build if CONFIG_NET is unset, because\nthey refer to things depending on CONFIG_THERMAL that in turn depends\non CONFIG_NET. However, CONFIG_THERMAL doesn\u0027t really need to depend\non CONFIG_NET, because the only part of it requiring CONFIG_NET is\nthe netlink interface in thermal_sys.c.\n\nPut the netlink interface in thermal_sys.c under #ifdef CONFIG_NET\nand remove the dependency of CONFIG_THERMAL on CONFIG_NET from\ndrivers/thermal/Kconfig.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Len Brown \u003clenb@kernel.org\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Luming Yu \u003cluming.yu@intel.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "493f3358cb289ccf716c5a14fa5bb52ab75943e5", "tree": "86b5385a63281824908d59107066b1267f75a386", "parents": [ "fe41947e1aa12e96a50edaee123b4e4de03b668b", "805bdaec1a44155db35f6ee5410d6bbc365324a8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 25 15:15:17 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 25 15:15:17 2011 -0800" }, "message": "Merge branch \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6\n\n* \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:\n PM: Make ACPI wakeup from S5 work again when CONFIG_PM_SLEEP is unset\n" }, { "commit": "fe41947e1aa12e96a50edaee123b4e4de03b668b", "tree": "fe29db5a488a7bb175801102c3d9372c7e5bbe1d", "parents": [ "99b0d365e5ade293c5fa25a9f1a49ac764656670" ], "author": { "name": "Alexandre Bounine", "email": "alexandre.bounine@idt.com", "time": "Fri Feb 25 14:44:31 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 25 15:07:37 2011 -0800" }, "message": "rapidio: fix sysfs config attribute to access 16MB of maint space\n\nFixes sysfs config attribute to allow access to entire 16MB maintenance\nspace of RapidIO devices.\n\nSigned-off-by: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nCc: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nCc: Matt Porter \u003cmporter@kernel.crashing.org\u003e\nCc: Li Yang \u003cleoli@freescale.com\u003e\nCc: Thomas Moll \u003cthomas.moll@sysgo.com\u003e\nCc: Micha Nelissen \u003cmicha@neli.hopto.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "638691a7a46a4ae9a7b56c603299e42d7f6e722e", "tree": "f744b3fbdd4704ef9ae122b67a14785b4a7a6b65", "parents": [ "0a93ea2e897bd793cc0aaaddc397eff32ac8d6fe", "f0b4f7e2f29af678bd9af43422c537dcb6008603" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 25 11:13:26 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 25 11:13:26 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://neil.brown.name/md\n\n* \u0027for-linus\u0027 of git://neil.brown.name/md:\n md: Fix - again - partition detection when array becomes active\n Fix over-zealous flush_disk when changing device size.\n md: avoid spinlock problem in blk_throtl_exit\n md: correctly handle probe of an \u0027mdp\u0027 device.\n md: don\u0027t set_capacity before array is active.\n md: Fix raid1-\u003eraid0 takeover\n" }, { "commit": "805bdaec1a44155db35f6ee5410d6bbc365324a8", "tree": "01f5ba1cca8216de1a6057be8c1877c778603a2d", "parents": [ "2aa15890f3c191326678f1bd68af61ec6b8753ec" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Feb 24 11:10:01 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Feb 24 19:53:06 2011 +0100" }, "message": "PM: Make ACPI wakeup from S5 work again when CONFIG_PM_SLEEP is unset\n\nCommit 074037e (PM / Wakeup: Introduce wakeup source objects and\nevent statistics (v3)) caused ACPI wakeup to only work if\nCONFIG_PM_SLEEP is set, but it also worked for CONFIG_PM_SLEEP unset\nbefore. This can be fixed by making device_set_wakeup_enable(),\ndevice_init_wakeup() and device_may_wakeup() work in the same way\nas before commit 074037e when CONFIG_PM_SLEEP is unset.\n\nReported-and-tested-by: Justin Maggard \u003cjmaggard10@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "93b270f76e7ef3b81001576860c2701931cdc78b", "tree": "abaca0e4d3e86721815498fafd06295dd9cfd002", "parents": [ "da9cf5050a2e3dbc3cf26a8d908482eb4485ed49" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Thu Feb 24 17:25:47 2011 +1100" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Thu Feb 24 17:25:47 2011 +1100" }, "message": "Fix over-zealous flush_disk when changing device size.\n\nThere are two cases when we call flush_disk.\nIn one, the device has disappeared (check_disk_change) so any\ndata will hold becomes irrelevant.\nIn the oter, the device has changed size (check_disk_size_change)\nso data we hold may be irrelevant.\n\nIn both cases it makes sense to discard any \u0027clean\u0027 buffers,\nso they will be read back from the device if needed.\n\nIn the former case it makes sense to discard \u0027dirty\u0027 buffers\nas there will never be anywhere safe to write the data. In the\nsecond case it *does*not* make sense to discard dirty buffers\nas that will lead to file system corruption when you simply enlarge\nthe containing devices.\n\nflush_disk calls __invalidate_devices.\n__invalidate_device calls both invalidate_inodes and invalidate_bdev.\n\ninvalidate_inodes *does* discard I_DIRTY inodes and this does lead\nto fs corruption.\n\ninvalidate_bev *does*not* discard dirty pages, but I don\u0027t really care\nabout that at present.\n\nSo this patch adds a flag to __invalidate_device (calling it\n__invalidate_device2) to indicate whether dirty buffers should be\nkilled, and this is passed to invalidate_inodes which can choose to\nskip dirty inodes.\n\nflusk_disk then passes true from check_disk_change and false from\ncheck_disk_size_change.\n\ndm avoids tripping over this problem by calling i_size_write directly\nrathher than using check_disk_size_change.\n\nmd does use check_disk_size_change and so is affected.\n\nThis regression was introduced by commit 608aeef17a which causes\ncheck_disk_size_change to call flush_disk, so it is suitable for any\nkernel since 2.6.27.\n\nCc: stable@kernel.org\nAcked-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Andrew Patterson \u003candrew.patterson@hp.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "2aa15890f3c191326678f1bd68af61ec6b8753ec", "tree": "347f5fdcd0678b12be92f266cd2a5e7a74749403", "parents": [ "78794b2cdeac37ac1fd950fc9c4454b56d88ac03" ], "author": { "name": "Miklos Szeredi", "email": "mszeredi@suse.cz", "time": "Wed Feb 23 13:49:47 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 23 19:52:52 2011 -0800" }, "message": "mm: prevent concurrent unmap_mapping_range() on the same inode\n\nMichael Leun reported that running parallel opens on a fuse filesystem\ncan trigger a \"kernel BUG at mm/truncate.c:475\"\n\nGurudas Pai reported the same bug on NFS.\n\nThe reason is, unmap_mapping_range() is not prepared for more than\none concurrent invocation per inode. For example:\n\n thread1: going through a big range, stops in the middle of a vma and\n stores the restart address in vm_truncate_count.\n\n thread2: comes in with a small (e.g. single page) unmap request on\n the same vma, somewhere before restart_address, finds that the\n vma was already unmapped up to the restart address and happily\n returns without doing anything.\n\nAnother scenario would be two big unmap requests, both having to\nrestart the unmapping and each one setting vm_truncate_count to its\nown value. This could go on forever without any of them being able to\nfinish.\n\nTruncate and hole punching already serialize with i_mutex. Other\ncallers of unmap_mapping_range() do not, and it\u0027s difficult to get\ni_mutex protection for all callers. In particular -\u003ed_revalidate(),\nwhich calls invalidate_inode_pages2_range() in fuse, may be called\nwith or without i_mutex.\n\nThis patch adds a new mutex to \u0027struct address_space\u0027 to prevent\nrunning multiple concurrent unmap_mapping_range() on the same mapping.\n\n[ We\u0027ll hopefully get rid of all this with the upcoming mm\n preemptibility series by Peter Zijlstra, the \"mm: Remove i_mmap_mutex\n lockbreak\" patch in particular. But that is for 2.6.39 ]\n\nSigned-off-by: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nReported-by: Michael Leun \u003clkml20101129@newton.leun.net\u003e\nReported-by: Gurudas Pai \u003cgurudas.pai@oracle.com\u003e\nTested-by: Gurudas Pai \u003cgurudas.pai@oracle.com\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ef3242859fae47e728b50b7ce3d17b201a71779a", "tree": "7857320b5209cafc231b329b9dab67ddb53f8128", "parents": [ "b5f7376eb30538d03dd27f6a59b5b2d28587967c", "518d020a18716024187ee0b834c8f5bfebd59398" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 23 16:02:00 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 23 16:02:00 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits)\n Added support for usb ethernet (0x0fe6, 0x9700)\n r8169: fix RTL8168DP power off issue.\n r8169: correct settings of rtl8102e.\n r8169: fix incorrect args to oob notify.\n DM9000B: Fix PHY power for network down/up\n DM9000B: Fix reg_save after spin_lock in dm9000_timeout\n net_sched: long word align struct qdisc_skb_cb data\n sfc: lower stack usage in efx_ethtool_self_test\n bridge: Use IPv6 link-local address for multicast listener queries\n bridge: Fix MLD queries\u0027 ethernet source address\n bridge: Allow mcast snooping for transient link local addresses too\n ipv6: Add IPv6 multicast address flag defines\n bridge: Add missing ntohs()s for MLDv2 report parsing\n bridge: Fix IPv6 multicast snooping by correcting offset in MLDv2 report\n bridge: Fix IPv6 multicast snooping by storing correct protocol type\n p54pci: update receive dma buffers before and after processing\n fix cfg80211_wext_siwfreq lock ordering...\n rt2x00: Fix WPA TKIP Michael MIC failures.\n ath5k: Fix fast channel switching\n tcp: undo_retrans counter fixes\n ...\n" }, { "commit": "98562ad8cb03fa6b7ba7f50168cdb34a98abcc1d", "tree": "2ab860a56a6d7adb2df6aea4202f24d7bd301dff", "parents": [ "5fb24b8109e0cb343cc89cb148a836d490caa456" ], "author": { "name": "Dmitry Torokhov", "email": "dtor@vmware.com", "time": "Fri Feb 04 13:30:10 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 21 15:21:53 2011 -0800" }, "message": "module: explicitly align module_version_attribute structure\n\nWe force particular alignment when we generate attribute structures\nwhen generation MODULE_VERSION() data and we need to make sure that\nthis alignment is followed when we iterate over these structures,\notherwise we may crash on platforms whose natural alignment is not\nsizeof(void *), such as m68k.\n\nReported-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@vmware.com\u003e\n[ There are more issues here, but the fixes are incredibly ugly - Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "226111d1fbe611bc7a5ffaa5275ccb41e73fd011", "tree": "2127a47120c71f4eb2cfdcc889c0c2971c9d9c33", "parents": [ "91035f0b7d89291af728b6f3e370c3be58fcbe1b" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Fri Feb 18 13:30:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 19 19:00:50 2011 -0800" }, "message": "net: dcb: match dcb_app protocol field with 802.1Qaz spec\n\nThe dcb_app protocol field is a __u32 however the 802.1Qaz\nspecification defines it as a 16 bit field. This patch brings\nthe structure inline with the spec making it a __u16.\n\nCC: Shmulik Ravid \u003cshmulikr@broadcom.com\u003e\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0cc9d5257857608ba85885b75fcada13d359b5d1", "tree": "c36289844c623f2a3026f629d47cee793fb535ff", "parents": [ "4c3021da451fe0ea1deaba8fa3805d8d065ec84e", "456d66ecd09e3bc326b93174745faafb6ac378d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 18 14:20:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 18 14:20:46 2011 -0800" }, "message": "Merge branch \u0027rtc-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027rtc-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n RTC: Re-enable UIE timer/polling emulation\n RTC: Revert UIE emulation removal\n RTC: Release mutex in error path of rtc_alarm_irq_enable\n" }, { "commit": "bc3adfc6703edfd2484902b5391092c717076f87", "tree": "9df3b216990f6b321095bcc6c35444f5e0d8165c", "parents": [ "3c18d4de86e4a7f93815c081e50e0543fa27200f", "3233cdbd9fa347a6d6897a94cc6ed0302ae83c4f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 18 12:36:06 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 18 12:36:06 2011 -0800" }, "message": "Merge branch \u0027fixes-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\n* \u0027fixes-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:\n workqueue: make sure MAYDAY_INITIAL_TIMEOUT is at least 2 jiffies long\n workqueue, freezer: unify spelling of \u0027freeze\u0027 + \u0027able\u0027 to \u0027freezable\u0027\n workqueue: wake up a worker when a rescuer is leaving a gcwq\n" }, { "commit": "3c18d4de86e4a7f93815c081e50e0543fa27200f", "tree": "adea22bccd076266bf94cbda3ed6d9a98eea1206", "parents": [ "2a324ce7b79a3a90cc2d4ade5d5f960a99000caa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 18 11:32:28 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 18 11:32:28 2011 -0800" }, "message": "Expand CONFIG_DEBUG_LIST to several other list operations\n\nWhen list debugging is enabled, we aim to readably show list corruption\nerrors, and the basic list_add/list_del operations end up having extra\ndebugging code in them to do some basic validation of the list entries.\n\nHowever, \"list_del_init()\" and \"list_move[_tail]()\" ended up avoiding\nthe debug code due to how they were written. This fixes that.\n\nSo the _next_ time we have list_move() problems with stale list entries,\nwe\u0027ll hopefully have an easier time finding them..\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "456d66ecd09e3bc326b93174745faafb6ac378d6", "tree": "24e0fb6f1c861204e2bf25abc2e27a1e3c3941ae", "parents": [ "6e57b1d6a8d8ed1998229b71c102be1997e397c6" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Feb 11 18:15:23 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Feb 17 14:59:42 2011 -0800" }, "message": "RTC: Re-enable UIE timer/polling emulation\n\nThis patch re-enables UIE timer/polling emulation for rtc devices\nthat do not support alarm irqs.\n\nCC: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReported-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nTested-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "6e57b1d6a8d8ed1998229b71c102be1997e397c6", "tree": "941ae7ba1c168af5603bb47d3bbfba33a8f2760c", "parents": [ "516373b8b60fa4152334b6b6f2ece0f178c540ce" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Feb 11 17:45:40 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Feb 17 14:59:41 2011 -0800" }, "message": "RTC: Revert UIE emulation removal\n\nUwe pointed out that my alarm based UIE emulation is not sufficient\nto replace the older timer/polling based UIE emulation on devices\nwhere there is no alarm irq. This causes rtc devices without alarms\nto return -EINVAL to UIE ioctls. The fix is to re-instate the old\ntimer/polling method for devices without alarm irqs.\n\nThis patch reverts the following commits:\n042620a018afcfba1d678062b62e46 - Remove UIE emulation\n1daeddd5962acad1bea55e524fc0fa - Cleanup removed UIE emulation declaration\nb5cc8ca1c9c3a37eaddf709b2fd3e1 - Remove Kconfig symbol for UIE emulation\n\nThe emulation mode will still need to be wired-in with a following\npatch before it will work.\n\nCC: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReported-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "58a69cb47ec6991bf006a3e5d202e8571b0327a4", "tree": "56abdf817649c352f70bff3263f9351ed6c42062", "parents": [ "7576958a9d5a4a677ad7dd40901cdbb6c1110c98" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Feb 16 09:25:31 2011 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Feb 16 17:48:59 2011 +0100" }, "message": "workqueue, freezer: unify spelling of \u0027freeze\u0027 + \u0027able\u0027 to \u0027freezable\u0027\n\nThere are two spellings in use for \u0027freeze\u0027 + \u0027able\u0027 - \u0027freezable\u0027 and\n\u0027freezeable\u0027. The former is the more prominent one. The latter is\nmostly used by workqueue and in a few other odd places. Unify the\nspelling to \u0027freezable\u0027.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nAcked-by: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nAcked-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: Alex Dubov \u003coakad@yahoo.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\n" }, { "commit": "a7d6e4ecdb7648478ddec76d30d87d03d6e22b31", "tree": "1e0110780ac0a8eeef2629e1d5880602bd6003c0", "parents": [ "09f586b35d8503b57de1e0e9b19bc6b38e0d7319" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Tue Feb 15 19:02:45 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 15 15:21:11 2011 -0800" }, "message": "thp: prevent hugepages during args/env copying into the user stack\n\nTransparent hugepages can only be created if rmap is fully\nfunctional. So we must prevent hugepages to be created while\nis_vma_temporary_stack() is true.\n\nThis also optmizes away some harmless but unnecessary setting of\nkhugepaged_scan.address and it switches some BUG_ON to VM_BUG_ON.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1cecd791f2708b621e619cf4df4636c97c9497e5", "tree": "7d1cae2e3e0c02a5c187408fac36f0bae20fadf0", "parents": [ "fef86db8feb2618430ac9e3c9b6197a7eacaf27a", "a252852afaea8270fcb91628b298253b112fc92e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 15 10:18:48 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 15 10:18:48 2011 -0800" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Fix text_poke_smp_batch() deadlock\n perf tools: Fix thread_map event synthesizing in top and record\n watchdog, nmi: Lower the severity of error messages\n ARM: oprofile: Fix backtraces in timer mode\n oprofile: Fix usage of CONFIG_HW_PERF_EVENTS for oprofile_perf_init and friends\n" }, { "commit": "87450bd55d6f7caa472b5db49a97ca373baf2577", "tree": "00cc4e9da0e486c5d540c2f733a75a9230405f40", "parents": [ "055d219441cc23f631240335fd369b6b5852681a", "cfaea56741360311d0dabcb6603fa78c2e3de155" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 15 09:40:27 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 15 09:40:27 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: matrix_keypad - increase the limit of rows and columns\n Input: wacom - fix error path in wacom_probe()\n Input: ads7846 - check proper condition when freeing gpio\n Revert \"Input: do not pass injected events back to the originating handler\"\n Input: sysrq - rework re-inject logic\n Input: serio - clear pending rescans after sysfs driver rebind\n Input: rotary_encoder - use proper irqflags\n Input: wacom_w8001 - report resolution to userland\n" }, { "commit": "a252852afaea8270fcb91628b298253b112fc92e", "tree": "71d0931449a6fba2a4c3a306effe2e7ef15f8541", "parents": [ "d91309f69b7bdb64aeb30106fde8d18c5dd354b5", "d14dd7e20d5e526557f5d3cfef4046a642f80924" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Feb 15 04:10:35 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Feb 15 04:10:35 2011 +0100" }, "message": "Merge branch \u0027urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent\n" }, { "commit": "795abaf1e4e188c4171e3cd3dbb11a9fcacaf505", "tree": "ae7273f0234c3fc3847626266080d8cfdb072c52", "parents": [ "091994cfb8e7d7a372c2d547778a91012d899e16" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Sun Feb 13 16:37:07 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 13 16:54:24 2011 -0800" }, "message": "klist: Fix object alignment on 64-bit.\n\nCommit c0e69a5bbc6f (\"klist.c: bit 0 in pointer can\u0027t be used as flag\")\nintended to make sure that all klist objects were at least pointer size\naligned, but used the constant \"4\" which only works on 32-bit.\n\nUse \"sizeof(void *)\" which is correct in all cases.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Jesper Nilsson \u003cjesper.nilsson@axis.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c186794dbb466b45cf40f942f2d09d6d5b4b0e42", "tree": "07ccd819bb6cced2c19053d2ed97ebaac88f824e", "parents": [ "9d5a4e946ce5352f19400b6370f4cd8e72806278" ], "author": { "name": "Mike Snitzer", "email": "snitzer@redhat.com", "time": "Fri Feb 11 11:08:00 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri Feb 11 11:08:00 2011 +0100" }, "message": "block: share request flush fields with elevator_private\n\nFlush requests are never put on the IO scheduler. Convert request\nstructure\u0027s elevator_private* into an array and have the flush fields\nshare a union with it.\n\nReclaim the space lost in \u0027struct request\u0027 by moving \u0027completion_data\u0027\nback in the union with \u0027rb_node\u0027.\n\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "cfaea56741360311d0dabcb6603fa78c2e3de155", "tree": "2b21a60fc72413a0e7384dc00c81a52a327e0281", "parents": [ "4b6d44344000ff3e62faf595e5f89fd8d9e52a94" ], "author": { "name": "Trilok Soni", "email": "tsoni@codeaurora.org", "time": "Fri Feb 11 00:44:41 2011 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Fri Feb 11 01:01:23 2011 -0800" }, "message": "Input: matrix_keypad - increase the limit of rows and columns\n\nSome keyboard controllers support more than 16 columns and rows.\nIncrease the limit to 32.\n\nSigned-off-by: Trilok Soni \u003ctsoni@codeaurora.org\u003e\nAcked-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "6037b715d6fab139742c3df8851db4c823081561", "tree": "aba9e9427debd4fa5b904daefa8e71a6320f4b93", "parents": [ "deabb19ba4bd8c06ae69bc262e3594b515e3a459" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Wed Feb 09 22:11:51 2011 -0800" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Feb 11 17:41:58 2011 +1100" }, "message": "security: add cred argument to security_capable()\n\nExpand security_capable() to include cred, so that it can be usable in a\nwider range of call sites.\n\nSigned-off-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "67d019528e5c2693145217cf18a507689980d2a4", "tree": "77191261468d37b069009887c1ab11afd93e2952", "parents": [ "ce86d35d2fd119d777fc72736732c8c9c3456698", "721d92fc6373dee15846216f9d178ec240ec0fd7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 10 12:20:40 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 10 12:20:40 2011 -0800" }, "message": "Merge branch \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (21 commits)\n USB: cdc-acm: Adding second ACM channel support for Nokia N8\n USB, Mass Storage, composite, gadget: Fix build failure and memset of a struct\n USB: Fix trout build failure with ci13xxx_msm gadget\n USB: EHCI: fix scheduling while atomic during suspend\n USB: usb-storage: unusual_devs entry for Coby MP3 player\n USB: ftdi_sio: Add VID\u003d0x0647, PID\u003d0x0100 for Acton Research spectrograph\n USB: fix race between root-hub resume and wakeup requests\n USB: prevent buggy hubs from crashing the USB stack\n usb: r8a66597-udc: Fixed bufnum of Bulk\n USB: ftdi_sio: add ST Micro Connect Lite uart support\n USB: Storage: Add unusual_devs entry for VTech Kidizoom\n USB SL811HS HCD: Fix memory leak in sl811h_urb_enqueue()\n USB: ti_usb: fix module removal\n USB: io_edgeport: fix the reported firmware major and minor\n usb: ehci-omap: Show fatal probing time errors to end user\n usb: musb: introduce api for dma code to check compatibility with usb request\n usb: musb: maintain three states for buffer mappings instead of two\n usb: musb: disable double buffering when it\u0027s broken\n usb: musb: hsdma: change back to use musb_read/writew\n usb: musb: core: fix IRQ check\n ...\n" }, { "commit": "e128c5e26bd474a2a56b96ec7c8967aff347b763", "tree": "1352a221d62f4c452c3962c283aac48491549363", "parents": [ "70a062286b9dfcbd24d2e11601aecfead5cf709a", "3e9d08ec0a68f6faf718d5a7e050fe5ca0ba004f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 10 12:05:09 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 10 12:05:09 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits)\n virtio_net: Add schedule check to napi_enable call\n x25: Do not reference freed memory.\n pch_can: fix tseg1/tseg2 setting issue\n isdn: hysdn: Kill (partially buggy) CVS regision log reporting.\n can: softing_cs needs slab.h\n pch_gbe: Fix the issue which a driver locks when rx offload is set by ethtool\n netfilter: nf_conntrack: set conntrack templates again if we return NF_REPEAT\n pch_can: fix module reload issue with MSI\n pch_can: fix rmmod issue\n pch_can: fix 800k comms issue\n net: Fix lockdep regression caused by initializing netdev queues too early.\n net/caif: Fix dangling list pointer in freed object on error.\n USB CDC NCM errata updates for cdc_ncm host driver\n CDC NCM errata updates for cdc.h\n ixgbe: update version string\n ixgbe: cleanup variable initialization\n ixgbe: limit VF access to network traffic\n ixgbe: fix for 82599 erratum on Header Splitting\n ixgbe: fix variable set but not used warnings by gcc 4.6\n e1000: add support for Marvell Alaska M88E1118R PHY\n ...\n" }, { "commit": "d3d373e0e3f51f335d8c722dd1340ab812fdf94b", "tree": "766175dfbbd5688f77e69fe43c835865fd864d2d", "parents": [ "aceb91cd351bc3a19a783c901fe8a8070d5f6fa9", "5084f89303c0a138f66bf74662753f46878989bb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 09 11:51:40 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 09 11:51:40 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:\n virtio: console: Update Copyright\n virtio: console: Wake up outvq on host notifications\n" }, { "commit": "3a9dda7602e566014a859faaf8490e6454683ab1", "tree": "8bd9a7f31308fd13551112ed2a0454b1022f2160", "parents": [ "3fb17dabf663216b90076f7a1649b599e90d46f1" ], "author": { "name": "Alexey Orishko", "email": "alexey.orishko@gmail.com", "time": "Mon Feb 07 09:45:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 13:54:42 2011 -0800" }, "message": "CDC NCM errata updates for cdc.h\n\nChanges are based on the following documents:\n- CDC NCM errata:\nhttp://www.usb.org/developers/devclass_docs/NCM10_012011.zip\n- CDC and WMC errata link:\nhttp://www.usb.org/developers/devclass_docs/CDC1.2_WMC1.1_012011.zip\n\nSigned-off-by: Alexey Orishko \u003calexey.orishko@stericsson.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5084f89303c0a138f66bf74662753f46878989bb", "tree": "7bb0b6cb9d54de0680c53c2efcea23f7baf378e2", "parents": [ "2770c5ea501be69989a7acf54ec4cb3554c47191" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Mon Jan 31 13:06:37 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Feb 09 08:19:55 2011 +1030" }, "message": "virtio: console: Update Copyright\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "43a723286f3cae795418c62bc41c3cce73791a81", "tree": "71b8f7e24df3b2dd49164c31da0c92d5992c43f7", "parents": [ "15ccb7b429d341605296b6a654b414f2b3ae9fd3", "a9fe8d5fd52ecd17c3f3970bbcf6b3573f831898" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 06 12:04:49 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 06 12:04:49 2011 -0800" }, "message": "Merge branch \u0027irq-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027irq-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n m32r: Fixup last __do_IRQ leftover\n genirq: Add missing status flags to modification mask\n" }, { "commit": "15ccb7b429d341605296b6a654b414f2b3ae9fd3", "tree": "f2af4a8952b10728e13c6f41db4b7a062a574a5c", "parents": [ "07675f484bb9de0c4bd0722e174cb27043dbacef", "862b6f62bf0cd768910b087f6d051f420206c4d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 06 12:04:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 06 12:04:16 2011 -0800" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n perf stat: Fix aggreate counter reading accounting\n tracing: Replace syscall_meta_data struct array with pointer array\n tracepoints: Fix section alignment using pointer array\n tracing: Replace trace_event struct array with pointer array\n" }, { "commit": "872434d69c644b8aa5088b835598dc3cd9832aff", "tree": "82f55a0ff9ed1fc9eb814fb80dfb5e605f47e07a", "parents": [ "44f2c5c841da1b1e0864d768197ab1497b5c2cc1" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Feb 05 16:25:25 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Feb 05 16:33:56 2011 +0100" }, "message": "genirq: Add missing status flags to modification mask\n\nThe mask which filters out the valid bits which can be set via\nirq_modify_status() is missing IRQ_NO_BALANCING, which breaks UV.\n\nAdd IRQ_PER_CPU as well to avoid another one line patch for 39.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "44f2c5c841da1b1e0864d768197ab1497b5c2cc1", "tree": "a9e62ee30dedd31c5aeb9c1a97cb8efec5dc3398", "parents": [ "78d2978874e4e10e97dfd4fd79db45bdc0748550", "1e6d93e45b231b3ae87c01902ede2315aacfe976" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 04 13:20:01 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 04 13:20:01 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (68 commits)\n net: can: janz-ican3: world-writable sysfs termination file\n net: can: at91_can: world-writable sysfs files\n MAINTAINERS: update email ids of the be2net driver maintainers.\n bridge: Don\u0027t put partly initialized fdb into hash\n r8169: prevent RxFIFO induced loops in the irq handler.\n r8169: RxFIFO overflow oddities with 8168 chipsets.\n r8169: use RxFIFO overflow workaround for 8168c chipset.\n include/net/genetlink.h: Allow genlmsg_cancel to accept a NULL argument\n net: Provide compat support for SIOCGETMIFCNT_IN6 and SIOCGETSGCNT_IN6.\n net: Support compat SIOCGETVIFCNT ioctl in ipv4.\n net: Fix bug in compat SIOCGETSGCNT handling.\n niu: Fix races between up/down and get_stats.\n tcp_ecn is an integer not a boolean\n atl1c: Add missing PCI device ID\n s390: Fix possibly wrong size in strncmp (smsgiucv)\n s390: Fix wrong size in memcmp (netiucv)\n qeth: allow OSA CHPARM change in suspend state\n qeth: allow HiperSockets framesize change in suspend\n qeth: add more strict MTU checking\n qeth: show new mac-address if its setting fails\n ...\n" }, { "commit": "8cf28f1f4de58c70e6af657bb46ca8f304c073d4", "tree": "0127ff6c9f92106d42e07f5607547e5ebb71fdd3", "parents": [ "148fc55fd0449683a1d15bf219ad8d8b6fa17545" ], "author": { "name": "Pavankumar Kondeti", "email": "pkondeti@codeaurora.org", "time": "Fri Feb 04 10:08:18 2011 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Feb 04 12:38:14 2011 -0800" }, "message": "USB: Fix trout build failure with ci13xxx_msm gadget\n\nThis patch fixes the below compilation errors.\n\n CC drivers/usb/gadget/ci13xxx_msm.o\n CC net/mac80211/led.o\n drivers/usb/gadget/ci13xxx_msm.c: In function \u0027ci13xxx_msm_notify_event\u0027:\n drivers/usb/gadget/ci13xxx_msm.c:42: error: \u0027USB_AHBBURST\u0027 undeclared (first use in this function)\n drivers/usb/gadget/ci13xxx_msm.c:42: error: (Each undeclared identifier is reported only once\n drivers/usb/gadget/ci13xxx_msm.c:42: error: for each function it appears in.)\n drivers/usb/gadget/ci13xxx_msm.c:43: error: \u0027USB_AHBMODE\u0027 undeclared (first use in this function)\nmake[4]: *** [drivers/usb/gadget/ci13xxx_msm.o] Error 1\nmake[3]: *** [drivers/usb/gadget] Error 2\n\nMSM USB driver is not supported on boards like trout (MSM7201) which\nhas an external PHY.\n\nSigned-off-by: Pavankumar Kondeti \u003cpkondeti@codeaurora.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "862b6f62bf0cd768910b087f6d051f420206c4d6", "tree": "f646e5246679ca851baf54e888c0d59b66ecf324", "parents": [ "1ebdfa803dc5ced604ebadd26fcb8cdca8e09b85", "3d56e331b6537671c66f1b510bed0f1e0331dfc8" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 04 19:02:53 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 04 19:02:53 2011 +0100" }, "message": "Merge branch \u0027tip/perf/urgent-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent\n" }, { "commit": "e2d57766e6744f2956975dd2086d82957187b0f6", "tree": "6d7f09ad6eaaac8ad99528cc83894faa6b230b1a", "parents": [ "ca6b8bb097c8e0ab6bce4fa04584074dee17c0d9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 03 17:59:32 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 03 18:05:29 2011 -0800" }, "message": "net: Provide compat support for SIOCGETMIFCNT_IN6 and SIOCGETSGCNT_IN6.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3d56e331b6537671c66f1b510bed0f1e0331dfc8", "tree": "80145576e1b9e701b7a2270c6a09798ed6b783c3", "parents": [ "654986462939cd7ec18f276c6379a334dac106a7" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Wed Feb 02 17:06:09 2011 -0500" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Thu Feb 03 09:29:06 2011 -0500" }, "message": "tracing: Replace syscall_meta_data struct array with pointer array\n\nCurrently the syscall_meta structures for the syscall tracepoints are\nplaced in the __syscall_metadata section, and at link time, the linker\nmakes one large array of all these syscall metadata structures. On boot\nup, this array is read (much like the initcall sections) and the syscall\ndata is processed.\n\nThe problem is that there is no guarantee that gcc will place complex\nstructures nicely together in an array format. Two structures in the\nsame file may be placed awkwardly, because gcc has no clue that they\nare suppose to be in an array.\n\nA hack was used previous to force the alignment to 4, to pack the\nstructures together. But this caused alignment issues with other\narchitectures (sparc).\n\nInstead of packing the structures into an array, the structures\u0027 addresses\nare now put into the __syscall_metadata section. As pointers are always the\nnatural alignment, gcc should always pack them tightly together\n(otherwise initcall, extable, etc would also fail).\n\nBy having the pointers to the structures in the section, we can still\niterate the trace_events without causing unnecessary alignment problems\nwith other architectures, or depending on the current behaviour of\ngcc that will likely change in the future just to tick us kernel developers\noff a little more.\n\nThe __syscall_metadata section is also moved into the .init.data section\nas it is now only needed at boot up.\n\nSuggested-by: David Miller \u003cdavem@davemloft.net\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "654986462939cd7ec18f276c6379a334dac106a7", "tree": "b9c70944012c24fa6d7cc973fa9b4b6e875ca842", "parents": [ "e4a9ea5ee7c8812a7bf0c3fb725ceeaa3d4c2fcc" ], "author": { "name": "Mathieu Desnoyers", "email": "mathieu.desnoyers@efficios.com", "time": "Wed Jan 26 17:26:22 2011 -0500" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Thu Feb 03 09:28:46 2011 -0500" }, "message": "tracepoints: Fix section alignment using pointer array\n\nMake the tracepoints more robust, making them solid enough to handle compiler\nchanges by not relying on anything based on compiler-specific behavior with\nrespect to structure alignment. Implement an approach proposed by David Miller:\nuse an array of const pointers to refer to the individual structures, and export\nthis pointer array through the linker script rather than the structures per se.\nIt will consume 32 extra bytes per tracepoint (24 for structure padding and 8\nfor the pointers), but are less likely to break due to compiler changes.\n\nHistory:\n\ncommit 7e066fb8 tracepoints: add DECLARE_TRACE() and DEFINE_TRACE()\nadded the aligned(32) type and variable attribute to the tracepoint structures\nto deal with gcc happily aligning statically defined structures on 32-byte\nmultiples.\n\nOne attempt was to use a 8-byte alignment for tracepoint structures by applying\nboth the variable and type attribute to tracepoint structures definitions and\ndeclarations. It worked fine with gcc 4.5.1, but broke with gcc 4.4.4 and 4.4.5.\n\nThe reason is that the \"aligned\" attribute only specify the _minimum_ alignment\nfor a structure, leaving both the compiler and the linker free to align on\nlarger multiples. Because tracepoint.c expects the structures to be placed as an\narray within each section, up-alignment cause NULL-pointer exceptions due to the\nextra unexpected padding.\n\n(this patch applies on top of -tip)\n\nSigned-off-by: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nLKML-Reference: \u003c20110126222622.GA10794@Krystal\u003e\nCC: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCC: Ingo Molnar \u003cmingo@elte.hu\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCC: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCC: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "e4a9ea5ee7c8812a7bf0c3fb725ceeaa3d4c2fcc", "tree": "1b25668508fa302a6ada053c895cd55727f798f1", "parents": [ "9ffdc6c37df131f89d52001e0ef03091b158826f" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Thu Jan 27 09:15:30 2011 -0500" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Wed Feb 02 21:37:13 2011 -0500" }, "message": "tracing: Replace trace_event struct array with pointer array\n\nCurrently the trace_event structures are placed in the _ftrace_events\nsection, and at link time, the linker makes one large array of all\nthe trace_event structures. On boot up, this array is read (much like\nthe initcall sections) and the events are processed.\n\nThe problem is that there is no guarantee that gcc will place complex\nstructures nicely together in an array format. Two structures in the\nsame file may be placed awkwardly, because gcc has no clue that they\nare suppose to be in an array.\n\nA hack was used previous to force the alignment to 4, to pack the\nstructures together. But this caused alignment issues with other\narchitectures (sparc).\n\nInstead of packing the structures into an array, the structures\u0027 addresses\nare now put into the _ftrace_event section. As pointers are always the\nnatural alignment, gcc should always pack them tightly together\n(otherwise initcall, extable, etc would also fail).\n\nBy having the pointers to the structures in the section, we can still\niterate the trace_events without causing unnecessary alignment problems\nwith other architectures, or depending on the current behaviour of\ngcc that will likely change in the future just to tick us kernel developers\noff a little more.\n\nThe _ftrace_event section is also moved into the .init.data section\nas it is now only needed at boot up.\n\nSuggested-by: David Miller \u003cdavem@davemloft.net\u003e\nCc: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "3cd90ea42f2c15f928b70ed66f6d8ed0a8e7aadd", "tree": "2e27c807baaec2e6528cd5431d57308a4d874dea", "parents": [ "1a44bc8c7cfe69756a116d38aef992d50fc1969d" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Tue Feb 01 15:52:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 02 16:03:19 2011 -0800" }, "message": "vfs: sparse: add __FMODE_EXEC\n\nFMODE_EXEC is a constant type of fmode_t but was used with normal integer\nconstants. This results in following warnings from sparse. Fix it using\nnew macro __FMODE_EXEC.\n\n fs/exec.c:116:58: warning: restricted fmode_t degrades to integer\n fs/exec.c:689:58: warning: restricted fmode_t degrades to integer\n fs/fcntl.c:777:9: warning: restricted fmode_t degrades to integer\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1a44bc8c7cfe69756a116d38aef992d50fc1969d", "tree": "3e830a7fe2f4b57e425421b35c6faebbbb2c7cc2", "parents": [ "3751d60430fe4c26460a5ca8ad8672d32f93bcb1" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Tue Feb 01 15:52:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 02 16:03:19 2011 -0800" }, "message": "vfs: sparse: remove a warning on OPEN_FMODE()\n\nAND-ing FMODE_* constant with normal integer results in following\nsparse warnings. Fix it.\n\n fs/open.c:662:21: warning: restricted fmode_t degrades to integer\n fs/anon_inodes.c:123:34: warning: restricted fmode_t degrades to integer\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "19942822df65ee4a47c2e6d6d70cace1b7f01710", "tree": "1fe6fdcc92ae7e64014c04676fc91e0105bdf344", "parents": [ "9221edb7120e2dc3ae90f1c58514979f7ba40e46" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Tue Feb 01 15:52:43 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 02 16:03:19 2011 -0800" }, "message": "memcg: prevent endless loop when charging huge pages to near-limit group\n\nIf reclaim after a failed charging was unsuccessful, the limits are\nchecked again, just in case they settled by means of other tasks.\n\nThis is all fine as long as every charge is of size PAGE_SIZE, because in\nthat case, being below the limit means having at least PAGE_SIZE bytes\navailable.\n\nBut with transparent huge pages, we may end up in an endless loop where\ncharging and reclaim fail, but we keep going because the limits are not\nyet exceeded, although not allowing for a huge page.\n\nFix this up by explicitely checking for enough room, not just whether we\nare within limits.\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0fd08c5545a806c960a6597fae4a2e656eb7ead9", "tree": "027dfcc65f600afe6a4b19ab72c472fe3f0f24fa", "parents": [ "7921127e297ea203b794c4a1c3ef3eb0ee52acbf", "d1205f87bbb8040c1408bbd9e0a720310b2b0b9b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 01 09:41:02 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 01 09:41:02 2011 +1000" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n NFS: NFSv4 readdir loses entries\n NFS: Micro-optimize nfs4_decode_dirent()\n NFS: Fix an NFS client lockdep issue\n NFS construct consistent co_ownerid for v4.1\n NFS: nfs_wcc_update_inode() should set nfsi-\u003eattr_gencount\n NFS improve pnfs_put_deviceid_cache debug print\n NFS fix cb_sequence error processing\n NFS do not find client in NFSv4 pg_authenticate\n NLM: Fix \"kernel BUG at fs/lockd/host.c:417!\" or \".../host.c:283!\"\n NFS: Prevent memory allocation failure in nfsacl_encode()\n NFS: nfsacl_{encode,decode} should return signed integer\n NFS: Fix \"kernel BUG at fs/nfs/nfs3xdr.c:1338!\"\n NFS: Fix \"kernel BUG at fs/aio.c:554!\"\n NFS4: Avoid potential NULL pointer dereference in decode_and_add_ds().\n NFS: fix handling of malloc failure during nfs_flush_multi()\n" }, { "commit": "ffbbf2da9e578dc7b7ae4f945412c4b74f54b20e", "tree": "42286b98b10fce7132ad61750db94765a0946c3c", "parents": [ "fb9f1f17e9c117c0bf7a8f1b7a0efe5db5bc1836" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon Jan 31 09:29:14 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 01 08:23:22 2011 +1000" }, "message": "kernel.h: fix kernel-doc warning\n\nFix kernel-doc warning in kernel.h from commit 7ef88ad56145\n(\"BUILD_BUG_ON: make it handle more cases\"):\n\n Warning(include/linux/kernel.h:605): No description found for parameter \u0027condition\u0027\n Warning(include/linux/kernel.h:605): Excess function parameter \u0027cond\u0027 description in \u0027BUILD_BUG_ON\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cbae48738f23d5409138700c5ccdfd6e4e0d6032", "tree": "67f3773989a9ed3787c18bc22cf80f503431ee9c", "parents": [ "fb1c6348b22dde3ef75b53ec23982bf1bc617c32", "fd96d0d8d8079b1ea7a7e8943a4da9dfc9621124" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 01 08:07:40 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 01 08:07:40 2011 +1000" }, "message": "Merge branch \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (42 commits)\n usb: gadget: composite: avoid access beyond array max length\n USB: serial: handle Data Carrier Detect changes\n USB: gadget: Fix endpoint representation in ci13xxx_udc\n USB: gadget: Fix error path in ci13xxx_udc gadget probe function\n usb: pch_udc: Fix the worning log issue at gadget driver remove\n USB: serial: Updated support for ICOM devices\n USB: ehci-mxc: add work-around for efika mx/sb bug\n USB: unbreak ehci-mxc on otg port of i.MX27\n drivers: update to pl2303 usb-serial to support Motorola cables\n USB: adding USB support for Cinterion\u0027s HC2x, EU3 and PH8 products\n USB serial: add missing .usb_driver field in serial drivers\n USB: ehci-fsl: Fix \u0027have_sysif_regs\u0027 detection\n USB: g_printer: fix bug in module parameter definitions\n USB: g_printer: fix bug in unregistration\n USB: uss720: remove duplicate USB device\n MAINTAINERS: add ueagle-atm entry\n USB: EHCI: fix DMA deallocation bug\n USB: pch_udc: support new device ML7213 IOH\n usb: pch_udc: Fixed issue which does not work with g_serial\n usb: set ep_dev async suspend should be later than device_initialize\n ...\n" }, { "commit": "709b46e8d90badda1898caea50483c12af178e96", "tree": "799b57704dda3684777fb57a6e413dabac78858c", "parents": [ "13ad17745c2cbd437d9e24b2d97393e0be11c439" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sat Jan 29 16:15:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 30 01:14:38 2011 -0800" }, "message": "net: Add compat ioctl support for the ipv4 multicast ioctl SIOCGETSGCNT\n\nSIOCGETSGCNT is not a unique ioctl value as it it maps tio SIOCPROTOPRIVATE +1,\nwhich unfortunately means the existing infrastructure for compat networking\nioctls is insufficient. A trivial compact ioctl implementation would conflict\nwith:\n\nSIOCAX25ADDUID\nSIOCAIPXPRISLT\nSIOCGETSGCNT_IN6\nSIOCGETSGCNT\nSIOCRSSCAUSE\nSIOCX25SSUBSCRIP\nSIOCX25SDTEFACILITIES\n\nTo make this work I have updated the compat_ioctl decode path to mirror the\nthe normal ioctl decode path. I have added an ipv4 inet_compat_ioctl function\nso that I can have ipv4 specific compat ioctls. I have added a compat_ioctl\nfunction into struct proto so I can break out ioctls by which kind of ip socket\nI am using. I have added a compat_raw_ioctl function because SIOCGETSGCNT only\nworks on raw sockets. I have added a ipmr_compat_ioctl that mirrors the normal\nipmr_ioctl.\n\nThis was necessary because unfortunately the struct layout for the SIOCGETSGCNT\nhas unsigned longs in it so changes between 32bit and 64bit kernels.\n\nThis change was sufficient to run a 32bit ip multicast routing daemon on a\n64bit kernel.\n\nReported-by: Bill Fenner \u003cfenner@aristanetworks.com\u003e\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "52fe7c9cc1637110ba4e0e6fe5d07cc0786d62de", "tree": "b57098f78a3ed893de4e67da1219c80f433b5672", "parents": [ "c128df731862e90ec9292c5d3eb264ac73b522b8" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Sat Jan 29 13:10:37 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 30 01:14:14 2011 -0800" }, "message": "caif: bugfix - add caif headers for userspace usage.\n\nAdd caif_socket.h and if_caif.h to the kernel header files\nexported for use by userspace.\n\nSigned-off-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d14dd7e20d5e526557f5d3cfef4046a642f80924", "tree": "4f4d9c70322e0d2431b5ebdd08cb68dfa451e13b", "parents": [ "1ea1bdf7faa4d0b5293e605f2e1ef1c2c59f6b53" ], "author": { "name": "Ari Kauppi", "email": "kauppi@papupata.org", "time": "Thu Jan 20 13:57:19 2011 -0500" }, "committer": { "name": "Robert Richter", "email": "robert.richter@amd.com", "time": "Wed Jan 26 19:21:28 2011 +0100" }, "message": "ARM: oprofile: Fix backtraces in timer mode\n\nAlways allow backtraces when using oprofile on ARM, even if a PMU\nisn\u0027t present. Restores functionality originally introduced in commit\n1b7b56982fdcd9d85effd76f3928cf5d6eb26155 (\"oprofile: Always allow\nbacktraces on ARM\") by Richard Purdie.\n\nIt is not that obvious, but there is now only one oprofile_arch_init()\nfunction. So the .backtrace callback is available also in timer mode.\n\nImplemented by removing code and using stubs for oprofile_perf_{init,\nexit} provided by \u003clinux/oprofile.h\u003e. This allows cleaning of other\narchitecture specific implementations too.\n\nCc: stable@kernel.org # 37.x\nSigned-off-by: Ari Kauppi \u003ckauppi@papupata.org\u003e\nAcked-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Robert Richter \u003crobert.richter@amd.com\u003e\n" }, { "commit": "1ea1bdf7faa4d0b5293e605f2e1ef1c2c59f6b53", "tree": "9cb838dcde16a66eb6f0933e10c310d61154843d", "parents": [ "1bae4ce27c9c90344f23c65ea6966c50ffeae2f5" ], "author": { "name": "Ari Kauppi", "email": "kauppi@papupata.org", "time": "Thu Jan 20 13:57:18 2011 -0500" }, "committer": { "name": "Robert Richter", "email": "robert.richter@amd.com", "time": "Wed Jan 26 19:14:34 2011 +0100" }, "message": "oprofile: Fix usage of CONFIG_HW_PERF_EVENTS for oprofile_perf_init and friends\n\nThe implementations are flagged in Makefile with CONFIG_HW_PERF_EVENTS\ninstead of CONFIG_PERF_EVENTS.\n\nCc: stable@kernel.org # 37.x\nSigned-off-by: Ari Kauppi \u003ckauppi@papupata.org\u003e\nSigned-off-by: Robert Richter \u003crobert.richter@amd.com\u003e\n" }, { "commit": "6fb1b304255efc5c4c93874ac8c066272e257e28", "tree": "67b4193e20d3a5470f56b26d912ed791dba20f13", "parents": [ "ac751efa6a0d70f2c9daef5c7e3a92270f5c2dff", "409550f2902470f0387fe40a7db441526e16b2c0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 26 16:31:44 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 26 16:31:44 2011 +1000" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: wacom - pass touch resolution to clients through input_absinfo\n Input: wacom - add 2 Bamboo Pen and touch models\n Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent\n Input: sparse-keymap - fix KEY_VSW handling in sparse_keymap_setup\n Input: tegra-kbc - add tegra keyboard driver\n Input: gpio_keys - switch to using request_any_context_irq\n Input: serio - allow registered drivers to get status flag\n Input: ct82710c - return proper error code for ct82c710_open\n Input: bu21013_ts - added regulator support\n Input: bu21013_ts - remove duplicate resolution parameters\n Input: tnetv107x-ts - don\u0027t treat NULL clk as an error\n Input: tnetv107x-keypad - don\u0027t treat NULL clk as an error\n\nFix up trivial conflicts in drivers/input/keyboard/Makefile due to\nadditions of tc3589x/Tegra drivers\n" }, { "commit": "ac751efa6a0d70f2c9daef5c7e3a92270f5c2dff", "tree": "e2d3f799e20e2cbca80891ea17af7484f21d628f", "parents": [ "3689456b4bd36027022b3215eb2acba51cd0e6b5" ], "author": { "name": "Torben Hohn", "email": "torbenh@gmx.de", "time": "Tue Jan 25 15:07:35 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 26 10:50:06 2011 +1000" }, "message": "console: rename acquire/release_console_sem() to console_lock/unlock()\n\nThe -rt patches change the console_semaphore to console_mutex. As a\nresult, a quite large chunk of the patches changes all\nacquire/release_console_sem() to acquire/release_console_mutex()\n\nThis commit makes things use more neutral function names which dont make\nimplications about the underlying lock.\n\nThe only real change is the return value of console_trylock which is\ninverted from try_acquire_console_sem()\n\nThis patch also paves the way to switching console_sem from a semaphore to\na mutex.\n\n[akpm@linux-foundation.org: coding-style fixes]\n[akpm@linux-foundation.org: make console_trylock return 1 on success, per Geert]\nSigned-off-by: Torben Hohn \u003ctorbenh@gmx.de\u003e\nCc: Thomas Gleixner \u003ctglx@tglx.de\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8348ad7c178627a302d579906096108b02052730", "tree": "253a309819de4cd9d913594950e7c1764f7ba5c7", "parents": [ "9948d378b99b06f6f34164dd8ff827e228ae9251", "170c7ab58f41c526c54e9dd04044857d5d73f9e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 26 09:02:14 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 26 09:02:14 2011 +1000" }, "message": "Merge branch \u0027rmobile-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* \u0027rmobile-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:\n ARM: mach-shmobile: AG5EVM LCDC / MIPI-DSI platform data\n ARM: mach-shmobile: sh73a0 CPGA fix for PLL CFG bit\n ARM: mach-shmobile: mackerel: clarify shdi/mmcif switch settings\n ARM: mach-shmobile: sh73a0 CPGA fix for IrDA MSTP\n ARM: mach-shmobile: sh73a0 CPGA fix for FRQCRA M3\n ARM: mach-shmobile: remove sh7367 on-chip set_irq_type()\n ARM: mach-shmobile: sh7372 INTCS MFIS2 interrupt update\n ARM: mach-shmobile: ag5evm: Add IrDA support\n ARM: mach-shmobile: clock-sh7372: fixup pllc2 set_rate\n mmc: sh_mmcif: Convert to __raw_xxx() I/O accessors.\n ARM: mach-shmobile: ag5evm requires GPIOLIB\n ARM: mach-shmobile: fix cpu_base of gic_init() on sh73a0\n" }, { "commit": "778be232a207e79088ba70d832ac25dfea6fbf1a", "tree": "307249459e5ef45c4b3651c7fc5c454cdb3e0c92", "parents": [ "80c30e8de4f81851b1f712bcc596e11d53bc76f1" ], "author": { "name": "Andy Adamson", "email": "andros@netapp.com", "time": "Tue Jan 25 15:38:01 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Jan 25 15:26:51 2011 -0500" }, "message": "NFS do not find client in NFSv4 pg_authenticate\n\nThe information required to find the nfs_client cooresponding to the incoming\nback channel request is contained in the NFS layer. Perform minimal checking\nin the RPC layer pg_authenticate method, and push more detailed checking into\nthe NFS layer where the nfs_client can be found.\n\nSigned-off-by: Andy Adamson \u003candros@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "f61f6da0d53842e849bab7f69e1431bd3de1136d", "tree": "8433904f645695338b98d3dc831631ffd6f129e5", "parents": [ "731f3f482ad3b2c58a1af2d0a9a634a82803706a" ], "author": { "name": "Chuck Lever", "email": "chuck.lever@oracle.com", "time": "Fri Jan 21 03:05:38 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Jan 25 15:24:47 2011 -0500" }, "message": "NFS: Prevent memory allocation failure in nfsacl_encode()\n\nnfsacl_encode() allocates memory in certain cases. This of course\nis not guaranteed to work.\n\nSince commit 9f06c719 \"SUNRPC: New xdr_streams XDR encoder API\", the\nkernel\u0027s XDR encoders can\u0027t return a result indicating possibly a\nfailure, so a memory allocation failure in nfsacl_encode() has become\nfatal (ie, the XDR code Oopses) in some cases.\n\nHowever, the allocated memory is a tiny fixed amount, on the order\nof 40-50 bytes. We can easily use a stack-allocated buffer for\nthis, with only a wee bit of nose-holding.\n\nSigned-off-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "731f3f482ad3b2c58a1af2d0a9a634a82803706a", "tree": "1425c239481309ffc68dd33a991fc13fc309226c", "parents": [ "ee5dc7732bd557bae6d10873a0aac606d2c551fb" ], "author": { "name": "Chuck Lever", "email": "chuck.lever@oracle.com", "time": "Fri Jan 21 03:05:28 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Jan 25 15:24:47 2011 -0500" }, "message": "NFS: nfsacl_{encode,decode} should return signed integer\n\nClean up.\n\nThe nfsacl_encode() and nfsacl_decode() functions return negative\nerrno values, and each call site verifies that the returned value\nis not negative. Change the synopsis of both of these functions\nto reflect this usage.\n\nDocument the synopsis and return values.\n\nReported-by: Trond Myklebust \u003ctrond.myklebust@netapp.com\u003e\nSigned-off-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "ae1b1539622fb46e51b4d13b3f9e5f4c713f86ae", "tree": "c5cb540141003a3ec7ebf0b8c6e01653ab6aaef5", "parents": [ "143a87f4c9c629067afea5b6703d66ea88c82f8e" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jan 25 12:43:54 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jan 25 12:43:54 2011 +0100" }, "message": "block: reimplement FLUSH/FUA to support merge\n\nThe current FLUSH/FUA support has evolved from the implementation\nwhich had to perform queue draining. As such, sequencing is done\nqueue-wide one flush request after another. However, with the\ndraining requirement gone, there\u0027s no reason to keep the queue-wide\nsequential approach.\n\nThis patch reimplements FLUSH/FUA support such that each FLUSH/FUA\nrequest is sequenced individually. The actual FLUSH execution is\ndouble buffered and whenever a request wants to execute one for either\nPRE or POSTFLUSH, it queues on the pending queue. Once certain\nconditions are met, a flush request is issued and on its completion\nall pending requests proceed to the next sequence.\n\nThis allows arbitrary merging of different type of flushes. How they\nare merged can be primarily controlled and tuned by adjusting the\nabove said \u0027conditions\u0027 used to determine when to issue the next\nflush.\n\nThis is inspired by Darrick\u0027s patches to merge multiple zero-data\nflushes which helps workloads with highly concurrent fsync requests.\n\n* As flush requests are never put on the IO scheduler, request fields\n used for flush share space with rq-\u003erb_node. rq-\u003ecompletion_data is\n moved out of the union. This increases the request size by one\n pointer.\n\n As rq-\u003eelevator_private* are used only by the iosched too, it is\n possible to reduce the request size further. However, to do that,\n we need to modify request allocation path such that iosched data is\n not allocated for flush requests.\n\n* FLUSH/FUA processing happens on insertion now instead of dispatch.\n\n- Comments updated as per Vivek and Mike.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: \"Darrick J. Wong\" \u003cdjwong@us.ibm.com\u003e\nCc: Shaohua Li \u003cshli@kernel.org\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "414b4ff5eecff0097d09c4a7da12e435fd503692", "tree": "cc7cd46c1455712af672b3ff872800b3da895837", "parents": [ "3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jan 25 12:43:49 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jan 25 12:43:49 2011 +0100" }, "message": "block: add REQ_FLUSH_SEQ\n\nrq \u003d\u003d \u0026q-\u003eflush_rq was used to determine whether a rq is part of a\nflush sequence, which worked because all requests in a flush sequence\nwere sequenced using the single dedicated request. This is about to\nchange, so introduce REQ_FLUSH_SEQ flag to distinguish flush sequence\nrequests.\n\nThis patch doesn\u0027t cause any behavior change.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "ce84d539ce47484ff3cbc9c67b3eb69ae88954f9", "tree": "cdba43e845e23a6793ca47857a16fae6032becfb", "parents": [ "bc094757f4f3d7b8211a8a1ed7605ffd7c728f75", "b5cc8ca1c9c3a37eaddf709b2fd3e1699aee41ba" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 25 05:25:55 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 25 05:25:55 2011 +1000" }, "message": "Merge branch \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n RTC: Remove Kconfig symbol for UIE emulation\n RTC: Properly handle rtc_read_alarm error propagation and fix bug\n RTC: Propagate error handling via rtc_timer_enqueue properly\n acpi_pm: Clear pmtmr_ioport if acpi_pm initialization fails\n rtc: Cleanup removed UIE emulation declaration\n hrtimers: Notify hrtimer users of switches to NOHZ mode\n" }, { "commit": "8c6a98b22b750c9eb52653ba643faa17db8d3881", "tree": "682d083e544bf4b420b6972941c9f3e7493e77ef", "parents": [ "cb1b145929b5b7e1bdc5f76dd2905df9f89c038e" ], "author": { "name": "Andy Whitcroft", "email": "apw@canonical.com", "time": "Mon Jan 24 09:31:38 2011 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Jan 24 09:33:36 2011 -0800" }, "message": "Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent\n\nCurrently sysrq_enabled and __sysrq_enabled are initialised separately\nand inconsistently, leading to sysrq being actually enabled by reported\nas not enabled in sysfs. The first change to the sysfs configurable\nsynchronises these two:\n\n static int __read_mostly sysrq_enabled \u003d 1;\n static int __sysrq_enabled;\n\nAdd a common define to carry the default for these preventing them becoming\nout of sync again. Default this to 1 to mirror previous behaviour.\n\nSigned-off-by: Andy Whitcroft \u003capw@canonical.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "d315777b32a4696feb86f2a0c9e9f39c94683649", "tree": "f21c24d85cde6ad453c4d9485f5de49357336f81", "parents": [ "5a05a6d7a51bcc47c5c6f0ed68e433f9a01afd89", "1765e3a4933ea0870fabd755feffc5473c4363ce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 24 19:58:39 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 24 19:58:39 2011 +1000" }, "message": "Merge branch \u0027BUG_ON\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* \u0027BUG_ON\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:\n Remove MAYBE_BUILD_BUG_ON\n BUILD_BUG_ON: make it handle more cases\n" }, { "commit": "1765e3a4933ea0870fabd755feffc5473c4363ce", "tree": "208364f2933f96773310a3a6c4dce6a21f66eec7", "parents": [ "7ef88ad561457c0346355dfd1f53e503ddfde719" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Jan 24 14:45:10 2011 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Jan 24 14:45:11 2011 +1030" }, "message": "Remove MAYBE_BUILD_BUG_ON\n\nNow BUILD_BUG_ON() can handle optimizable constants, we don\u0027t need\nMAYBE_BUILD_BUG_ON any more.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "7ef88ad561457c0346355dfd1f53e503ddfde719", "tree": "22f5e53aec61e0508f8d1aee130160fe24801144", "parents": [ "1bae4ce27c9c90344f23c65ea6966c50ffeae2f5" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Jan 24 14:45:10 2011 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Jan 24 14:45:10 2011 +1030" }, "message": "BUILD_BUG_ON: make it handle more cases\n\nBUILD_BUG_ON used to use the optimizer to do code elimination or fail\nat link time; it was changed to first the size of a negative array (a\nnicer compile time error), then (in\n8c87df457cb58fe75b9b893007917cf8095660a0) to a bitfield.\n\nThis forced us to change some non-constant cases to MAYBE_BUILD_BUG_ON();\nas Jan points out in that commit, it didn\u0027t work as intended anyway.\n\nbitfields: needs a literal constant at parse time, and can\u0027t be put under\n\t\"if (__builtin_constant_p(x))\" for example.\nnegative array: can handle anything, but if the compiler can\u0027t tell it\u0027s\n\ta constant, silently has no effect.\nlink time: breaks link if the compiler can\u0027t determine the value, but the\n\tlinker output is not usually as informative as a compiler error.\n\nIf we use the negative-array-size method *and* the link time trick,\nwe get the ability to use BUILD_BUG_ON() under __builtin_constant_p()\nbranches, and maximal ability for the compiler to detect errors at\nbuild time.\n\nWe also document it thoroughly.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Jan Beulich \u003cJBeulich@novell.com\u003e\nAcked-by: Hollis Blanchard \u003chollisb@us.ibm.com\u003e\n" }, { "commit": "b75be4204e7871869b2c268c00783703197aaa7d", "tree": "6667a6d0ca0380bf8f64a499bfcee0db39bdc5a6", "parents": [ "3b90a5b292321b2acac3921f77046ae195aef53f" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Wed Jan 05 13:27:04 2011 +0100" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Jan 24 14:32:52 2011 +1030" }, "message": "param: add null statement to compiled-in module params\n\nAdd an unused struct declaration statement requiring a\nterminating semicolon to the compile-in case to provoke an\nerror if __MODULE_INFO() is used without the terminating\nsemicolon. Previously MODULE_ALIAS(\"foo\") (no semicolon)\ncompiled fine if MODULE was not selected.\n\nCc: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "3b90a5b292321b2acac3921f77046ae195aef53f", "tree": "f084c812a3c55911b9a9a35e101346ffb33d8aae", "parents": [ "e94965ed5beb23c6fabf7ed31f625e66d7ff28de" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Jan 24 14:32:51 2011 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Jan 24 14:32:52 2011 +1030" }, "message": "module: fix linker error for MODULE_VERSION when !MODULE and CONFIG_SYSFS\u003dn\n\nlib/built-in.o:(__modver+0x8): undefined reference to `__modver_version_show\u0027\nlib/built-in.o:(__modver+0x2c): undefined reference to `__modver_version_show\u0027\n\nSimplest to just not emit anything: if they\u0027ve disabled SYSFS they probably\nwant the smallest kernel possible.\n\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "e94965ed5beb23c6fabf7ed31f625e66d7ff28de", "tree": "842e4cab961b568bcb98d8ab80d7d399110598a4", "parents": [ "1bae4ce27c9c90344f23c65ea6966c50ffeae2f5" ], "author": { "name": "Dmitry Torokhov", "email": "dtor@vmware.com", "time": "Wed Dec 15 14:00:19 2010 -0800" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Jan 24 14:32:51 2011 +1030" }, "message": "module: show version information for built-in modules in sysfs\n\nCurrently only drivers that are built as modules have their versions\nshown in /sys/module/\u003cmodule_name\u003e/version, but this information might\nalso be useful for built-in drivers as well. This especially important\nfor drivers that do not define any parameters - such drivers, if\nbuilt-in, are completely invisible from userspace.\n\nThis patch changes MODULE_VERSION() macro so that in case when we are\ncompiling built-in module, version information is stored in a separate\nsection. Kernel then uses this data to create \u0027version\u0027 sysfs attribute\nin the same fashion it creates attributes for module parameters.\n\nSigned-off-by: Dmitry Torokhov \u003cdtor@vmware.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "fd96d0d8d8079b1ea7a7e8943a4da9dfc9621124", "tree": "1d1314722847d56e3b703ec721f9534e93fa5580", "parents": [ "3c47eb06f08eb970ea9d696bcdb57a175d37b470", "50d64676d132a8a72a1a1657d7b3e6efa53da1ac" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jan 24 08:11:18 2011 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jan 24 08:14:07 2011 +0900" }, "message": "Merge branch \u0027for-usb-linus\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/sarah/xhci into usb-linus\n\n* \u0027for-usb-linus\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/sarah/xhci:\n xhci: Remove more doorbell-related reads\n xHCI: fix printk_ratelimit() usage\n xHCI: replace dev_dbg() with xhci_dbg()\n xHCI: fix cycle bit set in giveback_first_trb()\n xHCI: remove redundant parameter in giveback_first_trb()\n xHCI: fix queue_trb in isoc transfer\n xhci: Use GFP_NOIO during device reset.\n usb: Realloc xHCI structures after a hub is verified.\n xhci: Do not run xhci_cleanup_msix with irq disabled\n xHCI: synchronize irq in xhci_suspend()\n xhci: Resume bus on any port status change.\n" }, { "commit": "d14fc1a74e846d7851f24fc9519fe87dc12a1231", "tree": "9d014b0200d4f2ba94c6d5ed1002c46027147fae", "parents": [ "ca9cfea09fc5802074f79d086547c6363ddc894b" ], "author": { "name": "Libor Pechacek", "email": "lpechacek@suse.cz", "time": "Fri Jan 14 14:30:21 2011 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sat Jan 22 18:53:26 2011 -0800" }, "message": "USB: serial: handle Data Carrier Detect changes\n\nAlan\u0027s commit 335f8514f200e63d689113d29cb7253a5c282967 introduced\n.carrier_raised function in several drivers. That also means\ntty_port_block_til_ready can now suspend the process trying to open the serial\nport when Carrier Detect is low and put it into tty_port.open_wait queue. We\nneed to wake up the process when Carrier Detect goes high and trigger TTY\nhangup when CD goes low.\n\nSome of the devices do not report modem status line changes, or at least we\ndon\u0027t understand the status message, so for those we remove .carrier_raised\nagain.\n\nSigned-off-by: Libor Pechacek \u003clpechacek@suse.cz\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "5bf7a6503ff416214b9a53569677dbf07657e6fd", "tree": "0dc8e8dbc30a23d466a327bef05e78c571f2b8a3", "parents": [ "0f5c2ac58f22fd41deaeeb45ee752d4ae55f0d01", "42c025f3de9042d9c9abd9a6f6205d1a0f4bcadf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 21 13:38:57 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 21 13:38:57 2011 -0800" }, "message": "Merge branch \u0027fixes-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\n* \u0027fixes-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:\n workqueue: note the nested NOT_RUNNING test in worker_clr_flags() isn\u0027t a noop\n workqueue: relax lockdep annotation on flush_work()\n" }, { "commit": "0f5c2ac58f22fd41deaeeb45ee752d4ae55f0d01", "tree": "6e13ef4d7247e53d7a0f18e04549a8847cc80214", "parents": [ "cfd74486eace27a0899b30529d01bc1a09a5b973", "dfff95c394b0dd977a6b65bd52b99703fae94d9b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 21 13:38:26 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 21 13:38:26 2011 -0800" }, "message": "Merge branch \u0027irq-cleanup-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027irq-cleanup-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (37 commits)\n um: Use generic irq Kconfig\n tile: Use generic irq Kconfig\n sparc: Use generic irq Kconfig\n score: Use generic irq Kconfig\n powerpc: Use generic irq Kconfig\n parisc: Use generic irq Kconfig\n mn10300: Use generic irq Kconfig\n microblaze: Use generic irq Kconfig\n m68knommu: Use generic irq Kconfig\n ia64: Use generic irq Kconfig\n frv: Use generic irq Kconfig\n blackfin: Use generic irq Kconfig\n alpha: Use generic irq Kconfig\n genirq: Remove __do_IRQ\n m32r: Convert to generic irq Kconfig\n m32r: Convert usrv platform irq handling\n m32r: Convert opsput_lcdpld irq chip\n m32r: Convert opsput lanpld irq chip\n m32r: Convert opsput pld irq chip\n m32r: Convert opsput irq chip\n ...\n" }, { "commit": "3dece370ecc7c6152b3fdd21c6de28179f6e643d", "tree": "e63f721412c1ef469108ae7e688cebcf39d83cad", "parents": [ "db9fd8486bfe895b00b3603685c086a3c8210ffe" ], "author": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Fri Jan 21 08:49:56 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 21 08:40:30 2011 -0800" }, "message": "mm: System without MMU do not need pte_mkwrite\n\nThe patch \"thp: export maybe_mkwrite\" (commit 14fd403f2146) breaks\nsystems without MMU.\n\nError log:\n\n CC arch/microblaze/mm/init.o\n In file included from include/linux/mman.h:14,\n from arch/microblaze/mm/consistent.c:24:\n include/linux/mm.h: In function \u0027maybe_mkwrite\u0027:\n include/linux/mm.h:482: error: implicit declaration of function \u0027pte_mkwrite\u0027\n include/linux/mm.h:482: error: incompatible types in assignment\n\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\nCC: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nCC: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCC: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "aa0be0f4659f91f31e45adc422b1788cb36ffddc", "tree": "02eed33d672f36e41e735c5060acb9d2446c23af", "parents": [ "db6b175fa6ad1408cbb2fb62949a6d55cfece03e" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jan 20 15:26:12 2011 -0800" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jan 21 17:38:19 2011 +0100" }, "message": "RTC: Propagate error handling via rtc_timer_enqueue properly\n\nIn cases where RTC hardware does not support alarms, the virtualized\nRTC interfaces did not have a way to propagate the error up to userland.\n\nThis patch extends rtc_timer_enqueue so it catches errors from the hardware\nand returns them upwards to the virtualized interfaces. To simplify error\nhandling, it also internalizes the management of the timer-\u003eenabled bit\ninto rtc_timer_enqueue and rtc_timer_remove.\n\nAlso makes rtc_timer_enqueue and rtc_timer_remove static.\n\nReported-by: David Daney \u003cddaney@caviumnetworks.com\u003e\nReported-by: Andreas Schwab \u003cschwab@linux-m68k.org\u003e\nReported-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nDiagnosed-by: David Daney \u003cddaney@caviumnetworks.com\u003e\nTested-by: David Daney \u003cddaney@caviumnetworks.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nLKML-Reference: \u003c1295565973-14358-1-git-send-email-john.stultz@linaro.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "1daeddd5962acad1bea55e524fc0fadf32654a21", "tree": "29f20f9720c57228f74af205b263321d945f247e", "parents": [ "2d0640b47da74cff7c11642c798d40de861ed524" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jan 13 09:30:49 2011 -0800" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jan 21 17:38:18 2011 +0100" }, "message": "rtc: Cleanup removed UIE emulation declaration\n\nrtc_dev_update_irq_enable_emul was removed in commit\n042620a018afcfba1d678062b62e463b9e43a68d (UIE emulation is\nnow handled via hrtimer), but the declaration was missed.\nThis patch cleans it up.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nLKML-Reference: \u003c1294939849-20608-1-git-send-email-john.stultz@linaro.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "4843456c5c341eb57f80f9224362a22665d14107", "tree": "5656b405a8b1d2596e8eb748b953ee677a261e3c", "parents": [ "2b1caf6ed7b888c95a1909d343799672731651a5", "f00c9e44ad1a9660fe8cd3ca15b6cd9497172eab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 21 07:33:37 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 21 07:33:37 2011 -0800" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:\n quota: Fix deadlock during path resolution\n" }, { "commit": "1c77ff22f539ceaa64ea43d6a26d867e84602cb7", "tree": "d1623ae6a2f8ed56acbaa03b514e393496c42802", "parents": [ "0e155b2ce293382730b8473f6ceeb7ac9b939b7d" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Jan 19 19:41:35 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jan 21 11:55:31 2011 +0100" }, "message": "genirq: Remove __do_IRQ\n\nAll architectures are finally converted. Remove the cruft.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Greg Ungerer \u003cgerg@uclinux.org\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Chen Liqin \u003cliqin.chen@sunplusct.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\n" }, { "commit": "2b1caf6ed7b888c95a1909d343799672731651a5", "tree": "7ab9a7ae13bc02376bce6267df67f6f2aa9091f1", "parents": [ "d551d81d6a720542873f478def60baab6b5df403", "bd924e8cbd4b73ffb7d707a774c04f7e2cae88ed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 18:30:37 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 18:30:37 2011 -0800" }, "message": "Merge branch \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n smp: Allow on_each_cpu() to be called while early_boot_irqs_disabled status to init/main.c\n lockdep: Move early boot local IRQ enable/disable status to init/main.c\n" }, { "commit": "2d6d9fd3a54a28c6f67f26eb6c74803307a1b11e", "tree": "0d7c54159ca8e9c4d4e113597d3c7c08d9f98e84", "parents": [ "8d99641f6c1af806cd5d9e6badce91910219a161" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Jan 19 22:27:14 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 18:30:17 2011 -0800" }, "message": "ACPI: Introduce acpi_os_ioremap()\n\nCommit ca9b600be38c (\"ACPI / PM: Make suspend_nvs_save() use\nacpi_os_map_memory()\") attempted to prevent the code in osl.c and nvs.c\nfrom using different ioremap() variants by making the latter use\nacpi_os_map_memory() for mapping the NVS pages. However, that also\nrequires acpi_os_unmap_memory() to be used for unmapping them, which\ncauses synchronize_rcu() to be executed many times in a row\nunnecessarily and introduces substantial delays during resume on some\nsystems.\n\nInstead of using acpi_os_map_memory() for mapping the NVS pages in nvs.c\nintroduce acpi_os_ioremap() calling ioremap_cache() and make the code in\nboth osl.c and nvs.c use it.\n\nReported-by: Jeff Chua \u003cjeff.chua.linux@gmail.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ca3e021417eed30ec2b64ce88eb0acf64aa9bc29", "tree": "710590e51764d56c12d00744c402ab15c0d14a6b", "parents": [ "e401f1761c0b01966e36e41e2c385d455a7b44ee" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Thu Jan 20 14:44:24 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 17:02:06 2011 -0800" }, "message": "memcg: fix USED bit handling at uncharge in THP\n\nNow, under THP:\n\nat charge:\n - PageCgroupUsed bit is set to all page_cgroup on a hugepage.\n ....set to 512 pages.\nat uncharge\n - PageCgroupUsed bit is unset on the head page.\n\nSo, some pages will remain with \"Used\" bit.\n\nThis patch fixes that Used bit is set only to the head page.\nUsed bits for tail pages will be set at splitting if necessary.\n\nThis patch adds this lock order:\n compound_lock() -\u003e page_cgroup_move_lock().\n\n[akpm@linux-foundation.org: fix warning]\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2ce802f62ba32a7d95748ac92bf351f76affb6ff", "tree": "54dd0d6063ca61619e6b8ca84dd95b8e5a3c1402", "parents": [ "12fcdba1b7ae8b25696433f420b775aeb556d89b" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Jan 20 12:06:35 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jan 20 13:32:33 2011 +0100" }, "message": "lockdep: Move early boot local IRQ enable/disable status to init/main.c\n\nDuring early boot, local IRQ is disabled until IRQ subsystem is\nproperly initialized. During this time, no one should enable\nlocal IRQ and some operations which usually are not allowed with\nIRQ disabled, e.g. operations which might sleep or require\ncommunications with other processors, are allowed.\n\nlockdep tracked this with early_boot_irqs_off/on() callbacks.\nAs other subsystems need this information too, move it to\ninit/main.c and make it generally available. While at it,\ntoggle the boolean to early_boot_irqs_disabled instead of\nenabled so that it can be initialized with %false and %true\nindicates the exceptional condition.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLKML-Reference: \u003c20110120110635.GB6036@htj.dyndns.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "1268afe676ee9431a229fc68a2efb0dad4d5852f", "tree": "c252b969a51bd97317415cfc3b6465441f1b8aec", "parents": [ "c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470", "4580ccc04ddd8c17a470573a7fdb8def2e036dfa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 19 20:25:45 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 19 20:25:45 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (41 commits)\n sctp: user perfect name for Delayed SACK Timer option\n net: fix can_checksum_protocol() arguments swap\n Revert \"netlink: test for all flags of the NLM_F_DUMP composite\"\n gianfar: Fix misleading indentation in startup_gfar()\n net/irda/sh_irda: return to RX mode when TX error\n net offloading: Do not mask out NETIF_F_HW_VLAN_TX for vlan.\n USB CDC NCM: tx_fixup() race condition fix\n ns83820: Avoid bad pointer deref in ns83820_init_one().\n ipv6: Silence privacy extensions initialization\n bnx2x: Update bnx2x version to 1.62.00-4\n bnx2x: Fix AER setting for BCM57712\n bnx2x: Fix BCM84823 LED behavior\n bnx2x: Mark full duplex on some external PHYs\n bnx2x: Fix BCM8073/BCM8727 microcode loading\n bnx2x: LED fix for BCM8727 over BCM57712\n bnx2x: Common init will be executed only once after POR\n bnx2x: Swap BCM8073 PHY polarity if required\n iwlwifi: fix valid chain reading from EEPROM\n ath5k: fix locking in tx_complete_poll_work\n ath9k_hw: do PA offset calibration only on longcal interval\n ...\n" }, { "commit": "f966a13f92913ce8cbd35bc7f066553c9f3d41b0", "tree": "5039770cf62f69317c974775190cc4f5919f8398", "parents": [ "7e96fbf2320782fb8f0970928026105cd34b41bd", "38d59392b29437af3a702209b6a5196ef01f79a8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 18 12:50:19 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 18 12:50:19 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "d2763b4f44e16f44cc4156c9591e74df9dcd88be", "tree": "ce030e235f8283a6c8ffa689995ce3847ea8135d", "parents": [ "ba555461833aa1b5083004492ba97c92d5fccf46" ], "author": { "name": "Naveen Kumar Gaddipati", "email": "naveen.gaddipati@stericsson.com", "time": "Mon Jan 17 20:40:58 2011 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Jan 17 20:49:12 2011 -0800" }, "message": "Input: bu21013_ts - remove duplicate resolution parameters\n\nRemove duplicate display resolution parameters from platform data as\none pair is quite enough.\n\nSigned-off-by: Naveen Kumar Gaddipati \u003cnaveen.gaddipati@stericsson.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "6845a44a314c0c626549de373131bf108f9cc1f1", "tree": "9152a5c557434515dd7306d288e8f55ecc64652e", "parents": [ "eee2a817df7c5a6e569f353f8be78cc1b3604bb6", "4790f4dc5f4326dab5d81ed8fb8c9473e620bdbb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 14:45:48 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 14:45:48 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n RDMA: Update workqueue usage\n RDMA/nes: Fix incorrect SFP+ link status detection on driver init\n RDMA/nes: Fix SFP+ link down detection issue with switch port disable\n RDMA/nes: Generate IB_EVENT_PORT_ERR/PORT_ACTIVE events\n RDMA/nes: Fix bonding on iw_nes\n IB/srp: Test only once whether iu allocation succeeded\n IB/mlx4: Handle protocol field in multicast table\n RDMA: Use vzalloc() to replace vmalloc()+memset(0)\n mlx4_{core, ib, en}: Fix driver when sizeof (phys_addr_t) \u003e sizeof (long)\n IB/mthca: Fix driver when sizeof (phys_addr_t) \u003e sizeof (long)\n" }, { "commit": "9e8a462a0141b12e22c4a2f0c12e0542770401f0", "tree": "c0e32e5877f099b43e75afc5faecc944207dd51c", "parents": [ "cf78859f520f8275318f47d7864f4459d940cb6b", "24562486be76cf223b8d911f45e1d26eb3364b13" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 12:39:57 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 12:39:57 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:\n ecryptfs: remove unnecessary decrypt when extending a file\n ecryptfs: Fix ecryptfs_printk() size_t warnings\n fs/ecryptfs: Add printf format/argument verification and fix fallout\n ecryptfs: fixed testing of file descriptor flags\n ecryptfs: test lower_file pointer when lower_file_mutex is locked\n ecryptfs: missing initialization of the superblock \u0027magic\u0027 field\n ecryptfs: moved ECRYPTFS_SUPER_MAGIC definition to linux/magic.h\n ecryptfs: fix truncation error in ecryptfs_read_update_atime\n" }, { "commit": "8c34482c17d8fd07966328c7b1cfc35ee290bd1c", "tree": "324f7535ae561dcc430764fd2c7531ff67d9780b", "parents": [ "1a47f7a84ef386c1f7f55f669598bd9894ceb73a", "d95defaca7994ffff1ceb52f3011eb644dfe3274" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 11:18:40 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 11:18:40 2011 -0800" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/spi_sh_msiof: fix a wrong free_irq() parameter\n dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch()\n" }, { "commit": "ab2020f2f11fc7fb81e6c71298b0830d85412011", "tree": "c9a6342063461dcf31278d65585bca73bdda4a84", "parents": [ "235646a486d10891bd86af28d8eac75d9f22bd2d", "154bf89f5e3e3dc59666926f27ca4a0866f39157" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 11:15:30 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 11:15:30 2011 -0800" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (59 commits)\n mtd: mtdpart: disallow reading OOB past the end of the partition\n mtd: pxa3xx_nand: NULL dereference in pxa3xx_nand_probe\n UBI: use mtd-\u003ewritebufsize to set minimal I/O unit size\n mtd: initialize writebufsize in the MTD object of a partition\n mtd: onenand: add mtd-\u003ewritebufsize initialization\n mtd: nand: add mtd-\u003ewritebufsize initialization\n mtd: cfi: add writebufsize initialization\n mtd: add writebufsize field to mtd_info struct\n mtd: OneNAND: OMAP2/3: prevent regulator sleeping while OneNAND is in use\n mtd: OneNAND: add enable / disable methods to onenand_chip\n mtd: m25p80: Fix JEDEC ID for AT26DF321\n mtd: txx9ndfmc: limit transfer bytes to 512 (ECC provides 6 bytes max)\n mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips\n mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips\n mtd: nand: ams-delta: drop omap_read/write, use ioremap\n mtd: m25p80: add debugging trace in sst_write\n mtd: nand: ams-delta: select for built-in by default\n mtd: OneNAND: lighten scary initial bad block messages\n mtd: OneNAND: OMAP2/3: add support for command line partitioning\n mtd: nand: rearrange ONFI revision checking, add ONFI 2.3\n ...\n\nFix up trivial conflict in drivers/mtd/Kconfig as per DavidW.\n" }, { "commit": "235646a486d10891bd86af28d8eac75d9f22bd2d", "tree": "72308e6d2d7c936d00907689a2749715873d5f1b", "parents": [ "af575e2d2e09517a8190f1b425453cc3e0102f6c", "ecf5632dd189ab4c366cef853d6e5fe7adfe52e5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 11:00:09 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 11:00:09 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n fs: fix address space warnings in ioctl_fiemap()\n aio: check return value of create_workqueue()\n hpfs_setattr error case avoids unlock_kernel\n compat: copy missing fields in compat_statfs64 to user\n compat: update comment of compat statfs syscalls\n compat: remove unnecessary assignment in compat_rw_copy_check_uvector()\n fs: FS_POSIX_ACL does not depend on BLOCK\n fs: Remove unlikely() from fget_light()\n fs: Remove unlikely() from fput_light()\n fallocate should be a file operation\n make the feature checks in -\u003efallocate future proof\n staging: smbfs building fix\n tidy up around finish_automount()\n don\u0027t drop newmnt on error in do_add_mount()\n Take the completion of automount into new helper\n" }, { "commit": "e1288cd72f54e7fc16ae9ebb4d0647537ef848d4", "tree": "b4fd87b9307d8041fb680cb9b8fbf787ec968df7", "parents": [ "e78bf5e6cbe837daa6ab628a5f679548742994d3", "94ae85220a07d357d4937086c490854f63344de4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 10:54:41 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 10:54:41 2011 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (63 commits)\n ARM: PL08x: cleanup comments\n Update CONFIG_MD_RAID6_PQ to CONFIG_RAID6_PQ in drivers/dma/iop-adma.c\n ARM: PL08x: fix a warning\n Fix dmaengine_submit() return type\n dmaengine: at_hdmac: fix race while monitoring channel status\n dmaengine: at_hdmac: flags located in first descriptor\n dmaengine: at_hdmac: use subsys_initcall instead of module_init\n dmaengine: at_hdmac: no need set ACK in new descriptor\n dmaengine: at_hdmac: trivial add precision to unmapping comment\n dmaengine: at_hdmac: use dma_address to program DMA hardware\n pch_dma: support new device ML7213 IOH\n ARM: PL08x: prevent dma_set_runtime_config() reconfiguring memcpy channels\n ARM: PL08x: allow dma_set_runtime_config() to return errors\n ARM: PL08x: fix locking between prepare function and submit function\n ARM: PL08x: introduce \u0027phychan_hold\u0027 to hold on to physical channels\n ARM: PL08x: put txd\u0027s on the pending list in pl08x_tx_submit()\n ARM: PL08x: rename \u0027desc_list\u0027 as \u0027pend_list\u0027\n ARM: PL08x: implement unmapping of memcpy buffers\n ARM: PL08x: store prep_* flags in async_tx structure\n ARM: PL08x: shrink srcbus/dstbus in txd structure\n ...\n" }, { "commit": "2a8652f4e0d11ee27b1d2870c600fd1300661a6e", "tree": "f7ee0d8614b60a8733bcf0cfba8ac94776925ed5", "parents": [ "38a708d7759476318d0eec64af174513032ec67a" ], "author": { "name": "Roberto Sassu", "email": "roberto.sassu@polito.it", "time": "Wed Nov 03 11:11:15 2010 +0100" }, "committer": { "name": "Tyler Hicks", "email": "tyhicks@linux.vnet.ibm.com", "time": "Mon Jan 17 10:44:31 2011 -0600" }, "message": "ecryptfs: moved ECRYPTFS_SUPER_MAGIC definition to linux/magic.h\n\nThe definition of ECRYPTFS_SUPER_MAGIC has been moved to the include\nfile \u0027linux/magic.h\u0027 to become available to other kernel subsystems.\n\nSigned-off-by: Roberto Sassu \u003croberto.sassu@polito.it\u003e\nSigned-off-by: Tyler Hicks \u003ctyhicks@linux.vnet.ibm.com\u003e\n" }, { "commit": "ecf5632dd189ab4c366cef853d6e5fe7adfe52e5", "tree": "947ae7edf45415753e960d53957ae3a4121fb3b8", "parents": [ "27eaa1c90c608aa907336c2743d5ecf35c469440" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Sun Jan 16 23:28:17 2011 +0900" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 17 08:21:42 2011 -0500" }, "message": "fs: fix address space warnings in ioctl_fiemap()\n\nThe fi_extents_start field of struct fiemap_extent_info is a\nuser pointer but was not marked as __user. This makes sparse\nemit following warnings:\n\n CHECK fs/ioctl.c\nfs/ioctl.c:114:26: warning: incorrect type in argument 1 (different address spaces)\nfs/ioctl.c:114:26: expected void [noderef] \u003casn:1\u003e*dst\nfs/ioctl.c:114:26: got struct fiemap_extent *[assigned] dest\nfs/ioctl.c:202:14: warning: incorrect type in argument 1 (different address spaces)\nfs/ioctl.c:202:14: expected void const volatile [noderef] \u003casn:1\u003e*\u003cnoident\u003e\nfs/ioctl.c:202:14: got struct fiemap_extent *[assigned] fi_extents_start\nfs/ioctl.c:212:27: warning: incorrect type in argument 1 (different address spaces)\nfs/ioctl.c:212:27: expected void [noderef] \u003casn:1\u003e*dst\nfs/ioctl.c:212:27: got char *\u003cnoident\u003e\n\nAlso add \u0027ufiemap\u0027 variable to eliminate unnecessary casts.\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "c2b3e74b78b24cb367289a75a2bd30e569e56e0e", "tree": "1ae2e53e0aa3831486afd2ec8c71a8cd32535b1b", "parents": [ "2fe17c1075836b66678ed2a305fd09b6773883aa" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Mon Dec 13 19:38:08 2010 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 17 03:26:26 2011 -0500" }, "message": "fs: Remove unlikely() from fput_light()\n\nIn fput_light(), there\u0027s an unlikely(fput_needed), which running on\nmy normal desktop doing firefox, xchat, evolution and part of my distcc farm,\nand running the annotate branch profiler shows that the unlikely is not\nvery unlikely.\n\n correct incorrect % Function File Line\n ------- --------- - -------- ---- ----\n 0 48 100 fput_light file.h 26\n115828710 897415279 88 fput_light file.h 26\n865271179 5286128445 85 fput_light file.h 26\n19568539 8923664 31 fput_light file.h 26\n12353677 3562279 22 fput_light file.h 26\n 267691 67062 20 fput_light file.h 26\n15014853 348172 2 fput_light file.h 26\n 209258 205 0 fput_light file.h 26\n 1364164 0 0 fput_light file.h 26\n\nWhich gives 1032903812 times it was correct and 6203351846 times it was\nincorrect, or 85% incorrect.\n\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "2fe17c1075836b66678ed2a305fd09b6773883aa", "tree": "eb5287be8138686682eef9622872cfc7657e0664", "parents": [ "64c23e86873ee410554d6d1c76b60da47025e96f" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Fri Jan 14 13:07:43 2011 +0100" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 17 02:25:31 2011 -0500" }, "message": "fallocate should be a file operation\n\nCurrently all filesystems except XFS implement fallocate asynchronously,\nwhile XFS forced a commit. Both of these are suboptimal - in case of O_SYNC\nI/O we really want our allocation on disk, especially for the !KEEP_SIZE\ncase where we actually grow the file with user-visible zeroes. On the\nother hand always commiting the transaction is a bad idea for fast-path\nuses of fallocate like for example in recent Samba versions. Given\nthat block allocation is a data plane operation anyway change it from\nan inode operation to a file operation so that we have the file structure\navailable that lets us check for O_SYNC.\n\nThis also includes moving the code around for a few of the filesystems,\nand remove the already unnedded S_ISDIR checks given that we only wire\nup fallocate for regular files.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "94ae85220a07d357d4937086c490854f63344de4", "tree": "8dda364dc7cbae73a30bbe5ef47ac8d674d998c6", "parents": [ "0261f7416362f6affc2d4fe7fea9320a6bdaaee6" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Sun Jan 16 20:18:05 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sun Jan 16 16:55:43 2011 -0800" }, "message": "ARM: PL08x: cleanup comments\n\nCleanup the formatting of comments, remove some which don\u0027t make sense\nanymore.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n[fix conflict with 96a608a4]\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "fc8fe1e992ae0326a88edbe4d6793e840bbdd4ff", "tree": "40eb3f1660898b9261219c0c256f569f0258a953", "parents": [ "f8206b925fb0eba3a11839419be118b09105d7b1" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Jan 16 20:42:43 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 16 11:56:26 2011 -0800" }, "message": "PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset\n\nAfter commit 415e12b23792 (\"PCI/ACPI: Request _OSC control once for each\nroot bridge (v3)\") include/linux/pci-acpi.h is included by\ndrivers/pci/pcie/aer/aerdrv.c and if CONFIG_ACPI is unset, the bogus and\nunnecessary alternative definition of acpi_find_root_bridge_handle()\ncauses a build error to occur.\n\nRemove the offending piece of garbage.\n\nReported-and-tested-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "f8206b925fb0eba3a11839419be118b09105d7b1" }