)]}' { "log": [ { "commit": "e70f224c1938af208b64b02c5cec27889fefcaec", "tree": "a247c81526e3b169158693c151efda3c2bc073e9", "parents": [ "6991b8f2a3193397461104a27be417addb8d032b" ], "author": { "name": "Marek Olšák", "email": "maraeo@gmail.com", "time": "Tue Oct 25 01:38:45 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Nov 20 07:53:13 2011 +0000" }, "message": "drm/radeon/kms: add a CS ioctl flag not to rewrite tiling flags in the CS\n\nThis adds a new optional chunk to the CS ioctl that specifies optional flags\nto the CS parser. Why this is useful is explained below. Note that some regs\nno longer need the NOP relocation packet if this feature is enabled.\nTested on r300g and r600g with this flag disabled and enabled.\n\nAssume there are two contexts sharing the same mipmapped tiled texture.\nOne context wants to render into the first mipmap and the other one\nwants to render into the last mipmap. As you probably know, the hardware\nhas a MACRO_SWITCH feature, which turns off macro tiling for small mipmaps,\nbut that only applies to samplers.\n(at least on r300-r500, though later hardware likely behaves the same)\n\nSo we want to just re-set the tiling flags before rendering (writing\npackets), right? ... No. The contexts run in parallel, so they may\nset the tiling flags simultaneously and then fire their command streams\nalso simultaneously. The last one setting the flags wins, the other one\nloses.\n\nAnother problem is when one context wants to render into the first and\nthe last mipmap in one CS. Impossible. It must flush before changing\ntiling flags and do the rendering into the smaller mipmaps in another CS.\n\nYet another problem is that writing copy_blit in userspace would be a mess\ninvolving re-setting tiling flags to please the kernel, and causing races\nwith other contexts at the same time.\n\nThe only way out of this is to send tiling flags with each CS, ideally\nwith each relocation. But we already do that through the registers.\nSo let\u0027s just use what we have in the registers.\n\nSigned-off-by: Marek Olšák \u003cmaraeo@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6991b8f2a3193397461104a27be417addb8d032b", "tree": "0cb56a33a2e5476d436b8a30abdf9c1cdf6de9f5", "parents": [ "6c47e5c23aa2a7c54ad7ac13af4bd56cd9e703bf" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Nov 14 17:52:51 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 15 19:44:03 2011 +0000" }, "message": "drm/radeon/kms: fix segfault in pm rework\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6c47e5c23aa2a7c54ad7ac13af4bd56cd9e703bf", "tree": "402aa8b11f3ec82492212498452c63e517cf5e61", "parents": [ "b872a37437e93df9d112ce674752b3b3a0a17020" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Nov 14 14:32:01 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 15 19:43:39 2011 +0000" }, "message": "drm/radeon/kms: fix up gpio i2c mask bits for r4xx\n\nFixes i2c test failures when i2c_algo_bit.bit_test\u003d1.\n\nThe hw doesn\u0027t actually require a mask, so just set it\nto the default mask bits for r1xx-r4xx radeon ddc.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@kernel.org\nCc: Jean Delvare \u003ckhali@linux-fr.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b872a37437e93df9d112ce674752b3b3a0a17020", "tree": "fcf01626485ca3b5a6bda6718831265e7ae24dcd", "parents": [ "f6252114cbb7edabc1c92bf794153922ee0ea46d" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Nov 14 09:33:56 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 15 19:43:06 2011 +0000" }, "message": "drm/radeon: add some missing FireMV pci ids\n\nNoticed by Egbert.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@kernel.org\nCc: Egbert Eich \u003ceich@suse.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f6252114cbb7edabc1c92bf794153922ee0ea46d", "tree": "d4fc856af59dc962a7af5117eff0587de97edfbc", "parents": [ "d53dab3ae1a3c6b438738c3792c98ac63f0061f4" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Oct 10 09:29:18 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 14 10:03:15 2011 +0000" }, "message": "vgaarb: a NULL bridge is acceptable for root devices.\n\nI assumed all PCI buses had a bridge, but playing with qemu recently, I\ndiscovered vgaarb bug where it wasn\u0027t detecting both devices shared a bridge\nat the root level.\n\nDon\u0027t check for NULL, if two buses have a NULL bridge, assume they share the\nroot bus.\n\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d53dab3ae1a3c6b438738c3792c98ac63f0061f4", "tree": "f4e78aae50cd45ae335dbfed81896c3d965628fe", "parents": [ "a7c36fd8c5ee6dcca584137cb81aeefd785a0721" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Jul 23 12:45:07 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 14 09:28:50 2011 +0000" }, "message": "drm: Remove utterly bogus preempt_disable() sections\n\ncommit 27641c3f (drm/vblank: Add support for precise vblank\ntimestamping) adds preempt_disable()/enable() around a spin locked\nsection with the comments:\n\n * Disable preemption, so vblank_time_lock is held as short as\n * possible, even under a kernel with PREEMPT_RT patches.\n\n/* Disable preemption while holding vblank_time_lock. Do\n * it explicitely to guard against PREEMPT_RT kernel.\n\nJust that this has never been tested on a RT kernel which would have\ngranted that nonsense with a might_sleep() warning because\ndev-\u003evblank_time_lock is converted to a \"sleeping\" spinlock on RT.\n\nSo this is activly wrong on RT and superflous on mainline. Remove it.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Mario Kleiner \u003cmario.kleiner@tuebingen.mpg.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a7c36fd8c5ee6dcca584137cb81aeefd785a0721", "tree": "da8a9677415a4dd41bfc2cd1356d60e33edc4714", "parents": [ "8f3f1c9a22a6420e28c2d3eff59b832893bc8efc" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Sat Nov 12 11:57:29 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Nov 12 17:46:40 2011 +0000" }, "message": "drm/radeon/kms/combios: fix dynamic allocation of PM clock modes\n\nI missed the combios path when I updated the atombios pm code.\n\nReported by amarsh04 on IRC.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8f3f1c9a22a6420e28c2d3eff59b832893bc8efc", "tree": "fff750d9ccf699b3607ca473791c9e5820e1a7c5", "parents": [ "bbe26ffe9ffd231de7cf88c4361f1939858e8594" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Fri Nov 04 10:09:43 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 14:16:05 2011 +0000" }, "message": "drm/radeon/kms/pm: switch to dynamically allocating clock mode array\n\nOn newer chips the number of clock modes per power state varies.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "bbe26ffe9ffd231de7cf88c4361f1939858e8594", "tree": "ad89a20f804bd817114896cb5cfb1fc1e2253e91", "parents": [ "a4c9e2eed17457b30e17235158657801ec686a14" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Fri Nov 04 10:09:42 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 14:15:40 2011 +0000" }, "message": "drm/radeon/kms: optimize r600_pm_profile_init\n\nAvoid a lot of extra loops through the pm state array.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a4c9e2eed17457b30e17235158657801ec686a14", "tree": "aa1cfeb1691d1b7d7a96df84ddc741f38d8bd144", "parents": [ "10b391b946c459a39b631aaf81880f94dcfbff46" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Fri Nov 04 10:09:41 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 14:15:37 2011 +0000" }, "message": "drm/radeon/kms/pm: add a proper pm profile init function for fusion\n\nThe new power tables need to be handled differently when setting\nup the profiles.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "10b391b946c459a39b631aaf81880f94dcfbff46", "tree": "710f6c7b3abf0b43b27d877b97b337fc4c37f2d1", "parents": [ "6c3d904b48e44bd9c3121c24efb87c9d39d7736c" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Fri Nov 04 10:09:40 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 14:15:05 2011 +0000" }, "message": "drm/radeon/kms: remove extraneous calls to radeon_pm_compute_clocks()\n\nIt\u0027s already called via the DPMS functions.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6c3d904b48e44bd9c3121c24efb87c9d39d7736c", "tree": "0bdb03ce9b0276cd7faa66a4454557656d7ec710", "parents": [ "44a1dabf4cfb787459bfbff305a2a1cda628766d" ], "author": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Fri Nov 04 21:09:50 2011 +0900" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 12:01:49 2011 +0000" }, "message": "drm/exynos: added padding to be 64-bit align.\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "44a1dabf4cfb787459bfbff305a2a1cda628766d", "tree": "ae03d29416bd9c2bda360a0949cf2cc5c83b88b2", "parents": [ "0007fa2416f350621709880357d2fc50c5233984" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Mon Oct 31 12:51:30 2011 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:23:09 2011 +0000" }, "message": "drm: fix kconfig unmet dependency warning\n\nFix kconfig unmet dependency warning. BACKLIGHT_CLASS_DEVICE depends on\nBACKLIGHT_LCD_SUPPORT, so select the latter along with the former.\n\nwarning: (DRM_RADEON_KMS \u0026\u0026 DRM_I915 \u0026\u0026 STUB_POULSBO \u0026\u0026 FB_BACKLIGHT \u0026\u0026 PANEL_SHARP_LS037V7DW01 \u0026\u0026 PANEL_ACX565AKM \u0026\u0026 USB_APPLEDISPLAY \u0026\u0026 FB_OLPC_DCON \u0026\u0026 ASUS_LAPTOP \u0026\u0026 SONY_LAPTOP \u0026\u0026 THINKPAD_ACPI \u0026\u0026 EEEPC_LAPTOP \u0026\u0026 ACPI_ASUS \u0026\u0026 ACPI_CMPC \u0026\u0026 SAMSUNG_Q10) selects BACKLIGHT_CLASS_DEVICE which has unmet direct dependencies (HAS_IOMEM \u0026\u0026 BACKLIGHT_LCD_SUPPORT)\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: David Airlie \u003cairlied@linux.ie\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0007fa2416f350621709880357d2fc50c5233984", "tree": "a83f90df4b1a8dda7dc1c666071fea8f78b23df7", "parents": [ "a6778e9e7fb57603f15344ceb30098a3f6b7caf4", "5c79507b2c50ddab8f51bc692e3c0a39e3da2ad6" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:17:43 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:17:43 2011 +0000" }, "message": "Merge branch \u0027drm-nouveau-fixes\u0027 of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes\n\n* \u0027drm-nouveau-fixes\u0027 of git://git.freedesktop.org/git/nouveau/linux-2.6:\n drm/nouveau: Fix bandwidth calculation for DisplayPort\n drm/nouveau: by default use low bpp framebuffer on low memory cards\n drm/nv10: Change the BO size threshold determining the memory placement range.\n drm/nvc0: enable acceleration for nvc1 by default\n drm/nvc0/gr: fixup the mmio list register writes for 0xc1\n drm/nvc1: hacky workaround to fix accel issues\n drm/nvc0/gr: fix some bugs in grctx generation\n drm/nvc0: enable acceleration on 0xc8 by default\n drm/nvc0/vram: skip disabled PBFB subunits\n drm/nv40/pm: fix issues on igp chipsets, which don\u0027t have memory\n drm/nouveau: testing the wrong variable\n drm/nvc0/vram: storage type 0xc3 is not compressed\n drm/nv50: fix stability issue on NV86.\n drm/nouveau: initialize chan-\u003efence.lock before use\n drm/nv50/vram: fix incorrect detection of bank count on newer chipsets\n drm/nv50/gr: typo fix, how about we not reset fifo during graph init?\n drm/nv50/bios: fixup mpll programming from the init table parser\n drm/nouveau: fix oops if i2c bus not found in nouveau_i2c_identify()\n drm: make sure drm_vblank_init() has been called before touching vbl_lock\n" }, { "commit": "a6778e9e7fb57603f15344ceb30098a3f6b7caf4", "tree": "1422443322e6bd119edab9db60dc6ae2e3d3b29f", "parents": [ "bfba16582600ab2c75dc39250a2b8f3b2a42da11" ], "author": { "name": "Ilija Hadzic", "email": "ihadzic@research.bell-labs.com", "time": "Mon Oct 31 13:11:57 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:16:30 2011 +0000" }, "message": "drm: add some comments to drm_wait_vblank and drm_queue_vblank_event\n\nduring the review of the fix for locks problems in drm_wait_vblank,\na couple of false concerns were raised about how the drm_vblank_get\nand drm_vblank_put are used in this function; it turned out that the\ncode is correct and that it cannot be simplified\n\nadd a few comments to explain non-obvious flows in the code,\nto prevent \"false alarms\" in the future\n\nv2: incorporate comments received from Daniel Vetter\n\nSigned-off-by: Ilija Hadzic \u003cihadzic@research.bell-labs.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "bfba16582600ab2c75dc39250a2b8f3b2a42da11", "tree": "f1043efacdf8e96ed6d965d1d1012d897487ad01", "parents": [ "8f4ff2b06afcd6f151868474a432c603057eaf56" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Sat Oct 29 10:21:28 2011 +0300" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:16:12 2011 +0000" }, "message": "drm/radeon/benchmark: signedness bug in radeon_benchmark_move()\n\nradeon_benchmark_do_move() returns an int so \"time\" should be int\ntoo. Making it unsigned breaks the error handling.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8f4ff2b06afcd6f151868474a432c603057eaf56", "tree": "5ca22d67a97f55184b04f2ac94c1d6362edbad65", "parents": [ "398a6d4a02257d6065c2afe1413f5b6ae3a76f09" ], "author": { "name": "Ilija Hadzic", "email": "ihadzic@research.bell-labs.com", "time": "Mon Oct 31 17:46:18 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:12:47 2011 +0000" }, "message": "drm: do not sleep on vblank while holding a mutex\n\ndrm_wait_vblank must be DRM_UNLOCKED because otherwise it\nwill grab the drm_global_mutex and then go to sleep until the vblank\nevent it is waiting for. That can wreck havoc in the windowing system\nbecause if one process issues this ioctl, it will block all other\nprocesses for the duration of all vblanks between the current and the\none it is waiting for. In some cases it can block the entire windowing\nsystem.\n\nv2: incorporate comments received from Daniel Vetter and\n Michel Daenzer.\n\nv3/v4: after a lengty discussion with Daniel Vetter, it was concluded\n that the only thing not yet protected with locks and atomic\n ops is the write to dev-\u003elast_vblank_wait. It\u0027s only used in a\n debug file in proc, and the current code already employs no\n correct locking: the proc file only takes dev-\u003estruct_mutex,\n whereas drm_wait_vblank implicitly took the drm_global_mutex.\n Given all this, it\u0027s not worth bothering to try to fix\n the locks at this time.\n\nSigned-off-by: Ilija Hadzic \u003cihadzic@research.bell-labs.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "398a6d4a02257d6065c2afe1413f5b6ae3a76f09", "tree": "f49c8fab51478717babe699ff29885cd69316b3a", "parents": [ "c5006cfe2f5fc3cc03ebe2342aaca83d051d99e0" ], "author": { "name": "Kyungmin Park", "email": "kyungmin.park@samsung.com", "time": "Wed Nov 02 11:33:16 2011 +0900" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:11:08 2011 +0000" }, "message": "MAINTAINERS: exynos: Add EXYNOS DRM maintainer entry\n\nAs Exynos DRM is merged at mainline. Also update the maintainer entry.\n\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c5006cfe2f5fc3cc03ebe2342aaca83d051d99e0", "tree": "6f83b8e279f783a668f5f770aef5760b43ef92ff", "parents": [ "091264f0bc12419560ac64fcef4567809d611658" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Nov 07 10:39:57 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:07:36 2011 +0000" }, "message": "drm: try to restore previous CRTC config if mode set fails\n\nWe restore the CRTC, encoder, and connector configurations, but if the\nmode set failed, the attached display may have been turned off, so we\nneed to try set_config again to restore things to the way they were.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "091264f0bc12419560ac64fcef4567809d611658", "tree": "f34d8ec612e1b8a446a76da36551675a281e1b8d", "parents": [ "87cb73dafef765c6e20452ebf2581ba113c0360a" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Nov 08 10:09:58 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:06:50 2011 +0000" }, "message": "drm/radeon/kms: make an aux failure debug only\n\nCan happen when there is no DP panel attached, confusing\nusers. Make it debug only.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "87cb73dafef765c6e20452ebf2581ba113c0360a", "tree": "e099da48a77d6de8a35e8edf5a13c858aa6cd2e0", "parents": [ "b3e067c0b276197b59046d7095b01b99f98b2821" ], "author": { "name": "Paul Bolle", "email": "pebolle@tiscali.nl", "time": "Wed Nov 09 01:16:50 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:06:10 2011 +0000" }, "message": "drm: drop select of SLOW_WORK\n\nslow-work got killed in commit 181a51f6e0. This means that since v2.6.36\nthere is no Kconfig symbol SLOW_WORK. Apparently selecting that symbol\nis a nop. Drop that select.\n\nSigned-off-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b3e067c0b276197b59046d7095b01b99f98b2821", "tree": "90a260a3a560e0f06398db84ebe3feb27d569128", "parents": [ "3b9832f662d195755e7308f92368d44458268457" ], "author": { "name": "Marcin Slusarz", "email": "marcin.slusarz@gmail.com", "time": "Wed Nov 09 22:20:35 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:05:19 2011 +0000" }, "message": "drm: serialize access to list of debugfs files\n\nNouveau, when configured with debugfs, creates debugfs files for every\nchannel, so structure holding list of files needs to be protected from\nsimultaneous changes by multiple threads.\n\nWithout this patch it\u0027s possible to hit kernel oops in\ndrm_debugfs_remove_files just by running a couple of xterms with\nlooped glxinfo.\n\nSigned-off-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3b9832f662d195755e7308f92368d44458268457", "tree": "78e0dcd49741640b1d04dbf2a4e15e5b004aca6e", "parents": [ "7a1619b97e978bb9c05fa4bbe64171068bd5bf85" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu Nov 10 08:59:39 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:04:18 2011 +0000" }, "message": "drm/radeon/kms: fix use of vram scratch page on evergreen/ni\n\nThis hunk seems to have gotten lost when I rebased the patch.\n\nReported-by: Sylvain Bertrand \u003csylvain.bertrand@gmail.com\u003e\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7a1619b97e978bb9c05fa4bbe64171068bd5bf85", "tree": "c70a08db8ab123d51a622c062958786901473bdf", "parents": [ "471dd2ef3761de01348b19e83128a778df1d45b2" ], "author": { "name": "Michel Dänzer", "email": "michel.daenzer@amd.com", "time": "Thu Nov 10 18:57:26 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:02:10 2011 +0000" }, "message": "drm/radeon: Make sure CS mutex is held across GPU reset.\n\nThis was only the case if the GPU reset was triggered from the CS ioctl,\notherwise other processes could happily enter the CS ioctl and wreak havoc\nduring the GPU reset.\n\nThis is a little complicated because the GPU reset can be triggered from the\nCS ioctl, in which case we\u0027re already holding the mutex, or from other call\npaths, in which case we need to lock the mutex. AFAICT the mutex API doesn\u0027t\nallow recursive locking or finding out the mutex owner, so we need to handle\nthis with helper functions which allow recursive locking from the same\nprocess.\n\nSigned-off-by: Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "471dd2ef3761de01348b19e83128a778df1d45b2", "tree": "6fbe78c023f3c6a7ef9e49f2478be4983ed4db20", "parents": [ "baa91d640034dd8d0b58a9088f5fefe5cec3c8c4" ], "author": { "name": "Vinson Lee", "email": "vlee@vmware.com", "time": "Thu Nov 10 11:55:40 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 10:59:15 2011 +0000" }, "message": "drm: Ensure string is null terminated.\n\nFixes Coverity buffer not null terminated defect.\n\nSigned-off-by: Vinson Lee \u003cvlee@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "baa91d640034dd8d0b58a9088f5fefe5cec3c8c4", "tree": "99eec6ddc06baf6b8e6110dda9faea9391aa3f6e", "parents": [ "f0c8a6524dca1d37ab7b0247aa7681e490af1ee4" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Wed Nov 09 10:25:28 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 10:58:26 2011 +0000" }, "message": "vmwgfx: Only allow 64x64 cursors\n\nSnooping code expects this to be the case.\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f0c8a6524dca1d37ab7b0247aa7681e490af1ee4", "tree": "8e4801a4ccfa110b5bc7449dd369f3e6206483cf", "parents": [ "c0d18316ae99e1f19738f9cb5e0a2a9dc57dd8cd" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Wed Nov 09 10:25:27 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 10:57:59 2011 +0000" }, "message": "vmwgfx: Initialize clip rect loop correctly in surface dirty\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c0d18316ae99e1f19738f9cb5e0a2a9dc57dd8cd", "tree": "270877b23a9f3cb785ff7074be6fc7f8a7a8e171", "parents": [ "14660ccd599dc7bd6ecef17408bd76dc853f9b77" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Wed Nov 09 10:25:26 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 10:57:29 2011 +0000" }, "message": "vmwgfx: Close screen object system\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5c79507b2c50ddab8f51bc692e3c0a39e3da2ad6", "tree": "01a713f9d98c04f651b758f72f812280e4420aee", "parents": [ "1e482f75f169861e992eb6b5602dc73a9e0b63a2" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Oct 25 13:09:43 2011 -0400" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 09:03:05 2011 +1000" }, "message": "drm/nouveau: Fix bandwidth calculation for DisplayPort\n\nPorted from the equivalent fix in drm-intel-next:\n\nhttp://cgit.freedesktop.org/~keithp/linux/commit/?h\u003ddrm-intel-next\u0026id\u003dcd9dde44f47501394b9f0715b6a36a92aa74c0d0\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "1e482f75f169861e992eb6b5602dc73a9e0b63a2", "tree": "8785ad26b68c3951ffcb4d9461e344f808cf1ffb", "parents": [ "4beb116a454867cc3a98d02d906e0f0459aefe72" ], "author": { "name": "Marcin Slusarz", "email": "marcin.slusarz@gmail.com", "time": "Sun Nov 06 20:32:04 2011 +0100" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 09:02:41 2011 +1000" }, "message": "drm/nouveau: by default use low bpp framebuffer on low memory cards\n\nFramebuffer\u0027s BPP is not that important but can waste significant part\nof memory on low-VRAM cards. Lower it to 8bpp on \u003c 32MB cards and to\n16bpp on 64MB cards. It can still be overridden by video\u003d option.\n\nSigned-off-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "4beb116a454867cc3a98d02d906e0f0459aefe72", "tree": "67b120d1c06d2cda9c2a776735a750a428a678a3", "parents": [ "1c77e0f7fa4b398652f8e03f125aed258fa7018e" ], "author": { "name": "Francisco Jerez", "email": "currojerez@riseup.net", "time": "Sun Nov 06 21:21:28 2011 +0100" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 09:02:34 2011 +1000" }, "message": "drm/nv10: Change the BO size threshold determining the memory placement range.\n\nFixes the framebuffer memory allocation failure seen on some\nlow-memory cards, followed by X refusing to start.\n\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d42384\n\nReported-by: Chris Paulson-Ellis \u003cchris@edesix.com\u003e\nSigned-off-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "1c77e0f7fa4b398652f8e03f125aed258fa7018e", "tree": "b3c521aa422b4c82b088e14576bb6f9f6ca0054f", "parents": [ "6688a4dd20bf774d654203a0629d454447b80502" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Oct 28 11:00:39 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 09:02:02 2011 +1000" }, "message": "drm/nvc0: enable acceleration for nvc1 by default\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "6688a4dd20bf774d654203a0629d454447b80502", "tree": "99fbe018a4c292f772d86c3b0487227dace069b3", "parents": [ "4c5df493eb30089ff0b8d03a50a86293f758a786" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Oct 28 11:43:04 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 09:02:00 2011 +1000" }, "message": "drm/nvc0/gr: fixup the mmio list register writes for 0xc1\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "4c5df493eb30089ff0b8d03a50a86293f758a786", "tree": "6e82e388d4bd1dbc3c49bb7a46b4564e621b1fd6", "parents": [ "af6d9fe5368aadd8f0f3647b38405ffcd3ed5f81" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Oct 28 10:59:45 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 09:01:53 2011 +1000" }, "message": "drm/nvc1: hacky workaround to fix accel issues\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "af6d9fe5368aadd8f0f3647b38405ffcd3ed5f81", "tree": "3c023f22e23a12253e8b9eece904bf66c8a5a939", "parents": [ "80859760daa01fb38497aa6326a32a16489d8c97" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jul 11 15:40:43 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 09:01:12 2011 +1000" }, "message": "drm/nvc0/gr: fix some bugs in grctx generation\n\nMost serious is for chips with only 1 TPC, we\u0027d get stuck in an infinite\nloop. The fix here will slightly change the setup for all other chipsets\ntoo, but, it shouldn\u0027t matter too much, and this all needs figuring out\nand likely redone anyway.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "80859760daa01fb38497aa6326a32a16489d8c97", "tree": "49f751465e585b6d387e4d4e73232e4204d4c63e", "parents": [ "d4547ed8cc219f2e06078ac05147a873b2a03d5a" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Oct 27 11:31:49 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 09:00:07 2011 +1000" }, "message": "drm/nvc0: enable acceleration on 0xc8 by default\n\nWorked well enough for glxgears and gnome-shell at least, no reason to\nhave this off anymore.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "d4547ed8cc219f2e06078ac05147a873b2a03d5a", "tree": "146998eed7108e5f238d67d632e5dd8e6103a21f", "parents": [ "2bfa7482224903097a50c14a4389a29f56e19c3b" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Oct 27 11:26:17 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 09:00:02 2011 +1000" }, "message": "drm/nvc0/vram: skip disabled PBFB subunits\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "2bfa7482224903097a50c14a4389a29f56e19c3b", "tree": "f27c3cb366dbe305ba5c4cc06b695a6d236886ff", "parents": [ "ef5ced4bfe48ba2acb16e867ceb9c473dd0ef192" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Oct 19 14:06:59 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 08:59:47 2011 +1000" }, "message": "drm/nv40/pm: fix issues on igp chipsets, which don\u0027t have memory\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "ef5ced4bfe48ba2acb16e867ceb9c473dd0ef192", "tree": "5e3323ee6add369c79d464f34fc65c5761c86dff", "parents": [ "12b6d9d881ccb64a833d53565a3579e12ab1d026" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Tue Oct 18 09:07:51 2011 +0300" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 08:59:43 2011 +1000" }, "message": "drm/nouveau: testing the wrong variable\n\nmemtimings is a valid pointer here, the intent was to test for\nkcalloc() failure.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "12b6d9d881ccb64a833d53565a3579e12ab1d026", "tree": "2264796ea9fc6e49dcab03bf9141e7a7333a0eea", "parents": [ "71856abefb49bae5d67275752ada02853c16660d" ], "author": { "name": "Christoph Bumiller", "email": "e0425955@student.tuwien.ac.at", "time": "Fri Oct 07 18:10:45 2011 +0200" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 08:59:23 2011 +1000" }, "message": "drm/nvc0/vram: storage type 0xc3 is not compressed\n\nSigned-off-by: Christoph Bumiller \u003ce0425955@student.tuwien.ac.at\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "71856abefb49bae5d67275752ada02853c16660d", "tree": "ce0744175284ab67356b89582136104e64b4a2a2", "parents": [ "5e60ee780e792efe6dce97eceb110b1d30bab850" ], "author": { "name": "Maxim Levitsky", "email": "maximlevitsky@gmail.com", "time": "Sun Oct 09 22:58:31 2011 +0200" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 08:58:57 2011 +1000" }, "message": "drm/nv50: fix stability issue on NV86.\n\nConfirmed to fix random hangs while running all Unegine demos on NV86.\n\nSigned-off-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "5e60ee780e792efe6dce97eceb110b1d30bab850", "tree": "e27495ae3d1ba32526eea93e37eefac685761f0b", "parents": [ "7b4b98fa0c4d3a975b36bfe9984e4cd117f2ddff" ], "author": { "name": "Marcin Slusarz", "email": "marcin.slusarz@gmail.com", "time": "Fri Sep 09 14:16:42 2011 +0200" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 08:58:53 2011 +1000" }, "message": "drm/nouveau: initialize chan-\u003efence.lock before use\n\nFence lock needs to be initialized before any call to nouveau_channel_put\nbecause it calls nouveau_channel_idle-\u003enouveau_fence_update which uses\nfence lock.\n\nBUG: spinlock bad magic on CPU#0, test/24134\n lock: ffff88019f90dba8, .magic: 00000000, .owner: \u003cnone\u003e/-1, .owner_cpu: 0\nPid: 24134, comm: test Not tainted 3.0.0-nv+ #800\nCall Trace:\n spin_bug+0x9c/0xa3\n do_raw_spin_lock+0x29/0x13c\n _raw_spin_lock+0x1e/0x22\n nouveau_fence_update+0x2d/0xf1\n nouveau_channel_idle+0x22/0xa0\n nouveau_channel_put_unlocked+0x84/0x1bd\n nouveau_channel_put+0x20/0x24\n nouveau_channel_alloc+0x4ec/0x585\n nouveau_ioctl_fifo_alloc+0x50/0x130\n drm_ioctl+0x289/0x361\n do_vfs_ioctl+0x4dd/0x52c\n sys_ioctl+0x42/0x65\n system_call_fastpath+0x16/0x1b\n\nIt\u0027s easily triggerable from userspace.\n\nAdditionally remove double initialization of chan-\u003efence.pending.\n\nSigned-off-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "7b4b98fa0c4d3a975b36bfe9984e4cd117f2ddff", "tree": "1bbc4e238e4f69001c63b75476485db6deffffa7", "parents": [ "dce411cdf60eb64638443f953b52c18192378305" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Oct 07 16:00:31 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 08:58:47 2011 +1000" }, "message": "drm/nv50/vram: fix incorrect detection of bank count on newer chipsets\n\nNVA3+ has an extra bit here compared to NV50:NVA3 chipsets.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "dce411cdf60eb64638443f953b52c18192378305", "tree": "8d47adefeada8155637303a61003b92475d0a412", "parents": [ "ee9f7ef99f4422463634c075b22197c22c5cfa71" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Sep 29 13:15:17 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 08:58:30 2011 +1000" }, "message": "drm/nv50/gr: typo fix, how about we not reset fifo during graph init?\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "ee9f7ef99f4422463634c075b22197c22c5cfa71", "tree": "2f7ff8b9d2c8a953470e421fa49e368f526d4382", "parents": [ "46b348865011bf0d706fe1ec8c9cef08cf86ad40" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Sep 23 15:37:38 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 08:58:18 2011 +1000" }, "message": "drm/nv50/bios: fixup mpll programming from the init table parser\n\nReportedly this has been causing stability and corruption issues after\nresuming from suspend for a few people.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "46b348865011bf0d706fe1ec8c9cef08cf86ad40", "tree": "57ac40e456cb28cc03c276329191090f9f6c92fe", "parents": [ "bde4889aaa2d59c1febfeadd7f690be0ed143ed5" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Sep 22 12:51:31 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 08:58:13 2011 +1000" }, "message": "drm/nouveau: fix oops if i2c bus not found in nouveau_i2c_identify()\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "bde4889aaa2d59c1febfeadd7f690be0ed143ed5", "tree": "2a7a3d175bb1995040eea6b6e5b14ff736d970de", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jul 04 12:52:27 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 10 08:57:55 2011 +1000" }, "message": "drm: make sure drm_vblank_init() has been called before touching vbl_lock\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "14660ccd599dc7bd6ecef17408bd76dc853f9b77", "tree": "98dde39f1a4110fd63b3690148c9294d8bf871d4", "parents": [ "a08185a3eb658854b29c05bcbfac0f85038ffe9f" ], "author": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Oct 31 23:16:21 2011 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 08 10:50:36 2011 +0000" }, "message": "drm/i915: Fix object refcount leak on mmappable size limit error path.\n\nI\u0027ve been seeing memory leaks on my system in the form of large\n(300-400MB) GEM objects created by now-dead processes laying around\nclogging up memory. I usually notice when it gets to about 1.2GB of\nthem. Hopefully this clears up the issue, but I just found this bug\nby inspection.\n\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\nCc: stable@kernel.org\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "a08185a3eb658854b29c05bcbfac0f85038ffe9f", "tree": "9411bc4cd2dc3dd5e4f29654b7b32669fe1434bb", "parents": [ "35b09c9bf619c4fc6040c52dcea6bd5bd6af7679" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Oct 28 10:28:00 2011 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 08 10:50:27 2011 +0000" }, "message": "agp: iommu_gfx_mapped only available if CONFIG_INTEL_IOMMU is set\n\nKernels with no iommu support cannot ever need the Ironlake\nwork-around, so never enable it in that case.\n\nMight be better to completely remove the work-around from the kernel\nin this case?\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReviewed-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\n" }, { "commit": "35b09c9bf619c4fc6040c52dcea6bd5bd6af7679", "tree": "27e9ec49a947d0a267c716a732eae58ac2b856ee", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Fri Oct 28 14:42:41 2011 +0300" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 08 10:50:18 2011 +0000" }, "message": "drm/i915: fix if statement (bogus semi-colon)\n\nThe semi-colon is a typo here and it makes the if statement\nunconditional.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "1ea6b8f48918282bdca0b32a34095504ee65bab5", "tree": "01099b45d72a6b9977cebe34b97938b07d00a0b5", "parents": [ "075cb105cb6dcda8a585989ebd4a71f0b3c33f3e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 16:16:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 16:16:02 2011 -0800" }, "message": "Linux 3.2-rc1\n\n.. with new name. Because nothing says \"really solid kernel release\"\nlike naming it after an extinct animal that just happened to be in the\nnews lately.\n" }, { "commit": "075cb105cb6dcda8a585989ebd4a71f0b3c33f3e", "tree": "288b8ceb07f2f9780c572ca8c15b9d3096928ba0", "parents": [ "a3fbbde70a0cec017f2431e8f8de208708c76acc", "d30cc16c8e48368e0518f4975a78711e53e14a0f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 16:14:26 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 16:14:26 2011 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (31 commits)\n ARM: OMAP: Fix export.h or module.h includes\n ARM: OMAP: omap_device: Include linux/export.h\n ARM: OMAP2: Fix H4 matrix keyboard warning\n ARM: OMAP1: Remove unused omap-alsa.h\n ARM: OMAP1: Fix warnings about enabling 32 KiHz timer\n ARM: OMAP2+: timer: Remove omap_device_pm_latency\n ARM: OMAP2+: clock data: Remove redundant timer clkdev\n ARM: OMAP: Devkit8000: Remove double omap_mux_init_gpio\n ARM: OMAP: usb: musb: OMAP: Delete unused function\n MAINTAINERS: Update linux-omap git repository\n ARM: OMAP: change get_context_loss_count ret value to int\n ARM: OMAP4: hsmmc: configure SDMMC1_DR0 properly\n ARM: OMAP4: hsmmc: Fix Pbias configuration on regulator OFF\n ARM: OMAP3: hwmod: fix variant registration and remove SmartReflex from common list\n ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success\n ARM: OMAP: dmtimer: Include linux/module.h\n ARM: OMAP2+: l3-noc: Include linux/module.h\n ARM: OMAP2+: devices: Fixes for McPDM\n ARM: OMAP: Fix errors and warnings when building for one board\n ARM: OMAP3: PM: restrict erratum i443 handling to OMAP3430 only\n ...\n" }, { "commit": "a3fbbde70a0cec017f2431e8f8de208708c76acc", "tree": "f584856e638ca916a8aca32eda58a8fe89722c9f", "parents": [ "54a0f91301950af3d6ae2ff2bf710c9c68a9bfea" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Mon Nov 07 21:21:26 2011 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 14:58:06 2011 -0800" }, "message": "VFS: we need to set LOOKUP_JUMPED on mountpoint crossing\n\nMountpoint crossing is similar to following procfs symlinks - we do\nnot get -\u003ed_revalidate() called for dentry we have arrived at, with\nunpleasant consequences for NFS4.\n\nSimple way to reproduce the problem in mainline:\n\n cat \u003e/tmp/a.c \u003c\u003c\u0027EOF\u0027\n #include \u003cunistd.h\u003e\n #include \u003cfcntl.h\u003e\n #include \u003cstdio.h\u003e\n main()\n {\n struct flock fl \u003d {.l_type \u003d F_RDLCK, .l_whence \u003d SEEK_SET, .l_len \u003d 1};\n if (fcntl(0, F_SETLK, \u0026fl))\n perror(\"setlk\");\n }\n EOF\n cc /tmp/a.c -o /tmp/test\n\nthen on nfs4:\n\n mount --bind file1 file2\n /tmp/test \u003c file1\t\t# ok\n /tmp/test \u003c file2\t\t# spews \"setlk: No locks available\"...\n\nWhat happens is the missing call of -\u003ed_revalidate() after mountpoint\ncrossing and that\u0027s where NFS4 would issue OPEN request to server.\n\nThe fix is simple - treat mountpoint crossing the same way we deal with\nfollowing procfs-style symlinks. I.e. set LOOKUP_JUMPED...\n\nCc: stable@kernel.org\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "54a0f91301950af3d6ae2ff2bf710c9c68a9bfea", "tree": "ffcdf0b916f9c5f805cab347e53b60be17c9aead", "parents": [ "94956eed14b4b16d401c8ad36d68df0608f968cb", "f9e3d4b1a9c86217655997d3ef109b1eaae967bc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 12:38:11 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 12:38:11 2011 -0800" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf top: Fix live annotation in the --stdio interface\n perf top tui: Don\u0027t recalc column widths considering just the first page\n perf report: Add progress bar when processing time ordered events\n perf hists browser: Warn about lost events\n perf tools: Fix a typo of command name as trace-cmd\n perf hists: Fix recalculation of total_period when sorting entries\n perf header: Fix build on old systems\n perf ui browser: Handle K_RESIZE in dialog windows\n perf ui browser: No need to switch char sets that often\n perf hists browser: Use K_TIMER\n perf ui: Rename ui__warning_paranoid to ui__error_paranoid\n perf ui: Reimplement the popup windows using libslang\n perf ui: Reimplement ui__popup_menu using ui__browser\n perf ui: Reimplement ui_helpline using libslang\n perf ui: Improve handling sigwinch a bit\n perf ui progress: Reimplement using slang\n perf evlist: Fix grouping of multiple events\n" }, { "commit": "d30cc16c8e48368e0518f4975a78711e53e14a0f", "tree": "26b57f7ab5a963cc3d6c57dff6951bd930875583", "parents": [ "41eb2d813f558900884e240c2f723e36c7bd151f", "a1bcc1dcef8451b4291ea2a1b2677cb194102952" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:23 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:23 2011 -0800" }, "message": "Merge branch \u0027fixes-modulesplit\u0027 into fixes\n" }, { "commit": "a1bcc1dcef8451b4291ea2a1b2677cb194102952", "tree": "156edbbee0f46bc89d7fb323673edd2a88ba0c1a", "parents": [ "5558141556d20f2bea7a664d70a867b8f64ca38d" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "message": "ARM: OMAP: Fix export.h or module.h includes\n\nCommit 32aaeffbd4a7457bf2f7448b33b5946ff2a960eb (Merge branch\n\u0027modsplit-Oct31_2011\u0027...) caused some build errors. Fix these\nand make sure we always have export.h or module.h included\nfor MODULE_ and EXPORT_SYMBOL users:\n\n$ grep -rl ^MODULE_ arch/arm/*omap*/*.c | xargs \\\n grep -L linux/module.h\n arch/arm/mach-omap2/dsp.c\n arch/arm/mach-omap2/mailbox.c\n arch/arm/mach-omap2/omap-iommu.c\n arch/arm/mach-omap2/smartreflex.c\n\nAlso check we either have export.h or module.h included\nfor the files exporting symbols:\n\n$ grep -rl EXPORT_SYMBOL arch/arm/*omap*/*.c | xargs \\\n grep -L linux/export.h | xargs grep -L linux/module.h\n\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "5558141556d20f2bea7a664d70a867b8f64ca38d", "tree": "2d5b5e5c3b2dbfe3471fc172a9e813d178c3fc0f", "parents": [ "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "message": "ARM: OMAP: omap_device: Include linux/export.h\n\nInclude linux/export.h to fix below build warning:\n\n CC arch/arm/plat-omap/omap_device.o\narch/arm/plat-omap/omap_device.c:1055: warning: data definition has no type or storage class\narch/arm/plat-omap/omap_device.c:1055: warning: type defaults to \u0027int\u0027 in declaration of \u0027EXPORT_SYMBOL\u0027\narch/arm/plat-omap/omap_device.c:1055: warning: parameter names (without types) in function declaration\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "94956eed14b4b16d401c8ad36d68df0608f968cb", "tree": "60e4e1a3c2c44e8f6616db78cd6b22737b2a1f37", "parents": [ "50e696308c3fb18a4a0dae7b3a4d47469149c919", "e45a618753d5a8bc9086382f73bbc2d6a3399250" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:55:33 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:55:33 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)\n forcedeth: fix a few sparse warnings (variable shadowing)\n forcedeth: Improve stats counters\n forcedeth: remove unneeded stats updates\n forcedeth: Acknowledge only interrupts that are being processed\n forcedeth: fix race when unloading module\n MAINTAINERS/rds: update maintainer\n wanrouter: Remove kernel_lock annotations\n usbnet: fix oops in usbnet_start_xmit\n ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined\n etherh: Add MAINTAINERS entry for etherh\n bonding: comparing a u8 with -1 is always false\n sky2: fix regression on Yukon Optima\n netlink: clarify attribute length check documentation\n netlink: validate NLA_MSECS length\n i825xx:xscale:8390:freescale: Fix Kconfig dependancies\n macvlan: receive multicast with local address\n tg3: Update version to 3.121\n tg3: Eliminate timer race with reset_task\n tg3: Schedule at most one tg3_reset_task run\n tg3: Obtain PCI function number from device\n ...\n" }, { "commit": "50e696308c3fb18a4a0dae7b3a4d47469149c919", "tree": "16ff458026c1551803b86d9e0f9f02c7a64182fa", "parents": [ "a84450604d0fe08b6a2335efbedede18d3d7cc75" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Mon Nov 07 16:39:57 2011 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:54:10 2011 -0800" }, "message": "vfs: d_invalidate() should leave mountpoints alone\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e45a618753d5a8bc9086382f73bbc2d6a3399250", "tree": "5d703fb6c245a761d9d6b838ecc7d7c594c97f7b", "parents": [ "0bdfea8ba856826f5901fda608013f323c87f661" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:25 2011 -0500" }, "message": "forcedeth: fix a few sparse warnings (variable shadowing)\n\nThis fixes the following sparse warnings:\ndrivers/net/ethernet/nvidia/forcedeth.c:2113:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2102:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2155:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2102:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2227:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2215:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2271:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2215:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2986:20: warning: symbol \u0027addr\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2963:6: originally declared here\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0bdfea8ba856826f5901fda608013f323c87f661", "tree": "8527b969d9e27d5f2ded73c643dc79c0c7dd4433", "parents": [ "4687f3f364a1d5b2df815a8c58a763cab57724e8" ], "author": { "name": "Mandeep Baines", "email": "msb@google.com", "time": "Sat Nov 05 14:38:23 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: Improve stats counters\n\nRx byte count was off; instead use the hardware\u0027s count. Tx packet\ncount was counting pre-TSO packets; instead count on-the-wire packets.\nReport hardware dropped frame count as rx_fifo_errors.\n\n- The count of transmitted packets reported by the forcedeth driver\n reports pre-TSO (TCP Segmentation Offload) packet counts and not the\n count of the number of packets sent on the wire. This change fixes\n the forcedeth driver to report the correct count. Fixed the code by\n copying the count stored in the NIC H/W to the value reported by the\n driver.\n\n- Count rx_drop_frame errors as rx_fifo_errors:\n We see a lot of rx_drop_frame errors if we disable the rx bottom-halves\n for too long. Normally, rx_fifo_errors would be counted in this case.\n The rx_drop_frame error count is private to forcedeth and is not\n reported by ifconfig or sysfs. The rx_fifo_errors count is currently\n unused in the forcedeth driver. It is reported by ifconfig as overruns.\n This change reports rx_drop_frame errors as rx_fifo_errors.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4687f3f364a1d5b2df815a8c58a763cab57724e8", "tree": "9083050ec1f348c3f210172e337fcafb3b736678", "parents": [ "2a4e7a085fb44369c450c92cf8bd53b91f874a57" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:22 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: remove unneeded stats updates\n\nFunction ndo_get_stats() updates most of the stats from hardware\nregisters, making the manual updates un-needed. This change removes\nthese manual updates. Main exception is rx_missed_errors which needs\nmanual update.\n\nAnother exception is rx_packets, still updated manually in this commit\nto make sure this patch doesn\u0027t change behavior of driver. This will\nbe addressed by a future patch.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a4e7a085fb44369c450c92cf8bd53b91f874a57", "tree": "c96dd683da76b9698281521d249a11ece0ad59ea", "parents": [ "f9c4082df59e43c6667db197a4fb3eb3286f3fc1" ], "author": { "name": "Mike Ditto", "email": "mditto@google.com", "time": "Sat Nov 05 14:38:21 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: Acknowledge only interrupts that are being processed\n\nThis is to avoid a race, accidentally acknowledging an interrupt that\nwe didn\u0027t notice and won\u0027t immediately process. This is based solely\non code inspection; it is not known if there was an actual bug here.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9c4082df59e43c6667db197a4fb3eb3286f3fc1", "tree": "2bd8c50a7a0ea2b12b0f384fb656eb51e32cfbd0", "parents": [ "dd1294c4ed25725d13a6cb3d93ca0eb5fee14963" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: fix race when unloading module\n\nWhen forcedeth module is unloaded, there exists a path that can lead\nto mod_timer() after del_timer_sync(), causing an oops. This patch\nshort-circuits this unneeded path, which originates in\nnv_get_ethtool_stats().\n\nTested:\n x86_64 16-way + 3 ethtool -S infinite loops + 100Mbps incoming traffic\n + rmmod/modprobe/ifconfig in a loop\n\nInitial-Author: Salman Qazi \u003csqazi@google.com\u003e\nDiscussion: http://patchwork.ozlabs.org/patch/123548/\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a84450604d0fe08b6a2335efbedede18d3d7cc75", "tree": "013be8cd17b787a3051d1d614f794f30573467f8", "parents": [ "6f66263f8ebe1fb1f138de41ca9aa0a4860b30d0" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Tue Nov 01 20:27:43 2011 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:29:10 2011 -0800" }, "message": "device-mapper: using EXPORT_SYBOL in dm-space-map-checker.c needs export.h\n\nReported-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6f66263f8ebe1fb1f138de41ca9aa0a4860b30d0", "tree": "bf8057b31cafcd43e6c4a60551bf24ece185ff07", "parents": [ "1944ce60fe1e92506d3347f4d8e10a82b17096e4" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Tue Nov 01 18:30:49 2011 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:29:10 2011 -0800" }, "message": "device-mapper: dm-bufio.c needs to include module.h\n\nsince it uses the module facilities.\n\nReported-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1944ce60fe1e92506d3347f4d8e10a82b17096e4", "tree": "1da72242c0a525e6a46c3ddc9693d88816362a03", "parents": [ "0c073e35550879fd133bc3fe509df5b88da51278" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Sep 28 18:29:32 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:29:09 2011 -0800" }, "message": "drivers/md: change module.h -\u003e export.h in persistent-data/dm-*\n\nFor the files which are not themselves modular, we can change\nthem to include only the smaller export.h since all they are\ndoing is looking for EXPORT_SYMBOL.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0c073e35550879fd133bc3fe509df5b88da51278", "tree": "7fdbfc7d5cb6a8c3c53defc06387dee6785120fc", "parents": [ "3c00303206c3a1ccd86579efdc90bc35f140962e" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sat Oct 08 23:24:48 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:28:58 2011 -0800" }, "message": "arm: Add export.h to recently added files for EXPORT_SYMBOL\n\nThese files didn\u0027t exist at the time of the module.h split, and\nso were not fixed by the commits on that baseline. Since they use\nthe EXPORT_SYMBOL and/or THIS_MODULE macros, they will need the\nnew export.h file included that provides them.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dd1294c4ed25725d13a6cb3d93ca0eb5fee14963", "tree": "b98556fe938245ac34cb2a24cb06b4be8ff02216", "parents": [ "039c811cb0e6c5696086072794bb79fc7011c765" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@mellanox.com", "time": "Mon Nov 07 13:28:20 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:28:20 2011 -0500" }, "message": "MAINTAINERS/rds: update maintainer \n\nupdate for the actual maintainer\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "039c811cb0e6c5696086072794bb79fc7011c765", "tree": "a74d1a5d974769a9352c09124b9a4275a8204214", "parents": [ "23ba07991dad5a96a024c1b45cb602eef5f83df8" ], "author": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Mon Nov 07 13:27:30 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:27:30 2011 -0500" }, "message": "wanrouter: Remove kernel_lock annotations\n\nThe BKL is gone, these annotations are useless.\n\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "23ba07991dad5a96a024c1b45cb602eef5f83df8", "tree": "1404d618c42757a234dfb1f0efe946411ecf1b0e", "parents": [ "012641082b34433dac3cbb452e0a6ceccfd4643f" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Mon Nov 07 05:54:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:25:41 2011 -0500" }, "message": "usbnet: fix oops in usbnet_start_xmit\n\nThis patch fixes the bug added in commit v3.1-rc7-1055-gf9b491e\nSKB can be NULL at this point, at least for cdc-ncm.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nAcked-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "012641082b34433dac3cbb452e0a6ceccfd4643f", "tree": "b5fcc89c44d5508f5c669d50e2d879910618ab24", "parents": [ "1a6422f67fbf691cf8721076619aeead9183403d" ], "author": { "name": "Rose, Gregory V", "email": "gregory.v.rose@intel.com", "time": "Mon Nov 07 07:44:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:23:12 2011 -0500" }, "message": "ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined\n\nFix compiler errors and warnings with CONFIG_PCI_IOV defined and not\ndefined.\n\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3c00303206c3a1ccd86579efdc90bc35f140962e", "tree": "66170c84b5ddaeb102aea3530517a26657b6ea29", "parents": [ "83dbb15e9cd78a3619e3db36777e2f81d09b2914", "efb90582c575084723cc14302c1300cb26c7e01f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:13:52 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:13:52 2011 -0800" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:\n cpuidle: Single/Global registration of idle states\n cpuidle: Split cpuidle_state structure and move per-cpu statistics fields\n cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev-\u003eprepare()\n cpuidle: Move dev-\u003elast_residency update to driver enter routine; remove dev-\u003elast_state\n ACPI: Fix CONFIG_ACPI_DOCK\u003dn compiler warning\n ACPI: Export FADT pm_profile integer value to userspace\n thermal: Prevent polling from happening during system suspend\n ACPI: Drop ACPI_NO_HARDWARE_INIT\n ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()\n PNPACPI: Simplify disabled resource registration\n ACPI: Fix possible recursive locking in hwregs.c\n ACPI: use kstrdup()\n mrst pmu: update comment\n tools/power turbostat: less verbose debugging\n" }, { "commit": "83dbb15e9cd78a3619e3db36777e2f81d09b2914", "tree": "521737fc0829222c2739e4d50bf8546a39d6aa0e", "parents": [ "6e6bc67982573c221d12cbd123d34395f9f6e22e", "2ac863719e518ae1a8f328849e64ea26a222f079" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:01:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:01:56 2011 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux: (40 commits)\n vmwgfx: Snoop DMA transfers with non-covering sizes\n vmwgfx: Move the prefered mode first in the list\n vmwgfx: Unreference surface on cursor error path\n vmwgfx: Free prefered mode on error path\n vmwgfx: Use pointer return error codes\n vmwgfx: Fix hw cursor position\n vmwgfx: Infrastructure for explicit placement\n vmwgfx: Make the preferred autofit mode have a 60Hz vrefresh\n vmwgfx: Remove screen object active list\n vmwgfx: Screen object cleanups\n drm/radeon/kms: consolidate GART code, fix segfault after GPU lockup V2\n drm/radeon/kms: don\u0027t poll forever if MC GDDR link training fails\n drm/radeon/kms: fix DP setup on TRAVIS bridges\n drm/radeon/kms: set HPD polarity in hpd_init()\n drm/radeon/kms: add MSI module parameter\n drm/radeon/kms: Add MSI quirk for Dell RS690\n drm/radeon/kms: Add MSI quirk for HP RS690\n drm/radeon/kms: split MSI check into a separate function\n vmwgfx: Reinstate the update_layout ioctl\n drm/radeon/kms: always do extended edid probe\n ...\n" }, { "commit": "6e6bc67982573c221d12cbd123d34395f9f6e22e", "tree": "a63ac571bedace9fc04515cd95da1c49a1304b68", "parents": [ "ff4d7fa8c32f6ec513fb792c060809ec82d53ea4", "3a73dbbc9bb3fc8594cd67af4db6c563175dfddb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:59:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:59:02 2011 -0800" }, "message": "Merge branch \u0027urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux\n\n* \u0027urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:\n writeback: fix uninitialized task_ratelimit\n" }, { "commit": "ff4d7fa8c32f6ec513fb792c060809ec82d53ea4", "tree": "2b04ad419ff934fd640a97ac8e9df1abdd1e503c", "parents": [ "e0d65113a70f1dc514e625cc4e7a7485a4bf72df", "a88b470773bc5b640292d8be7b8e7e1011a86639" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:56:22 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:56:22 2011 -0800" }, "message": "Merge git://git.samba.org/sfrench/cifs-2.6\n\n* git://git.samba.org/sfrench/cifs-2.6:\n CIFS: Cleanup byte-range locking code style\n CIFS: Simplify setlk error handling for mandatory locking\n" }, { "commit": "e0d65113a70f1dc514e625cc4e7a7485a4bf72df", "tree": "7320a130dc304623f5cf4b5dd8f67fb1776225ca", "parents": [ "cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2", "48e546b7f281f251893baa40769581fd15f085fb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:11:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:11:16 2011 -0800" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (226 commits)\n mtd: tests: annotate as DANGEROUS in Kconfig\n mtd: tests: don\u0027t use mtd0 as a default\n mtd: clean up usage of MTD_DOCPROBE_ADDRESS\n jffs2: add compr\u003dlzo and compr\u003dzlib options\n jffs2: implement mount option parsing and compression overriding\n mtd: nand: initialize ops.mode\n mtd: provide an alias for the redboot module name\n mtd: m25p80: don\u0027t probe device which has status of \u0027disabled\u0027\n mtd: nand_h1900 never worked\n mtd: Add DiskOnChip G3 support\n mtd: m25p80: add EON flash EN25Q32B into spi flash id table\n mtd: mark block device queue as non-rotational\n mtd: r852: make r852_pm_ops static\n mtd: m25p80: add support for at25df321a spi data flash\n mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks\n mtd: nand: switch `check_pattern()\u0027 to standard `memcmp()\u0027\n mtd: nand: invalidate cache on unaligned reads\n mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set\n mtd: nand: wait to set BBT version\n mtd: nand: scrub BBT on ECC errors\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-at91/board-usb-a9260.c\n\tMerged into board-usb-a926x.c\n - drivers/mtd/maps/lantiq-flash.c\n\tadd_mtd_partitions -\u003e mtd_device_register vs changed to use\n\tmtd_device_parse_register.\n" }, { "commit": "cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2", "tree": "66ecb6f516d33915171682cc602af978c0ae014f", "parents": [ "31555213f03bca37d2c02e10946296052f4ecfcd", "7606f85a701ed8feeac065e133ff9a51c267aa0d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 08:52:19 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 08:52:19 2011 -0800" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.infradead.org/ubifs-2.6\n\n* \u0027linux-next\u0027 of git://git.infradead.org/ubifs-2.6:\n UBIFS: fix the dark space calculation\n UBIFS: introduce a helper to dump scanning info\n" }, { "commit": "2ac863719e518ae1a8f328849e64ea26a222f079", "tree": "bc3900daf89dfe3f5c8cc994499a7164c16316c2", "parents": [ "d41025c0d6a7b3d80d68f07f943b72962d66ac74" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:08 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:16:55 2011 +0000" }, "message": "vmwgfx: Snoop DMA transfers with non-covering sizes\n\nEnough to get cursors working under Wayland.\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d41025c0d6a7b3d80d68f07f943b72962d66ac74", "tree": "868c2a20eebe3d7698b2c321fbc9c1e6ae0c5856", "parents": [ "e5c8dbb8141e7da81bd8179929d1298302d17128" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:07 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:16:34 2011 +0000" }, "message": "vmwgfx: Move the prefered mode first in the list\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e5c8dbb8141e7da81bd8179929d1298302d17128", "tree": "53c42a405d17cc491bf469337ea13a840c64617e", "parents": [ "55bde5b215ceb8356328f18cd82a77843bc4ffd3" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:06 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:16:14 2011 +0000" }, "message": "vmwgfx: Unreference surface on cursor error path\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "55bde5b215ceb8356328f18cd82a77843bc4ffd3", "tree": "4d9f311c7d3dc9befb69a1b6cbd6ee9fd996b635", "parents": [ "d982640914d74054d22508ccebeeda70ce5933e1" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:05 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:15:56 2011 +0000" }, "message": "vmwgfx: Free prefered mode on error path\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d982640914d74054d22508ccebeeda70ce5933e1", "tree": "1f1fbed6d9facf8154879395c61ea034afd220af", "parents": [ "da7653d6a0dcf7c3a173c87df144735e61a86c1e" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:04 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:15:54 2011 +0000" }, "message": "vmwgfx: Use pointer return error codes\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "da7653d6a0dcf7c3a173c87df144735e61a86c1e", "tree": "333e81fc4a0a667918c891ca521d8d8e77a8b188", "parents": [ "6987427a3953c5038dc14d2a090b5a6c93669428" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:12 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:15:40 2011 +0000" }, "message": "vmwgfx: Fix hw cursor position\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6987427a3953c5038dc14d2a090b5a6c93669428", "tree": "9e97ef3e0f57aead819845961cb6b892df0ac4e6", "parents": [ "1543b4dd0c4b63975ffdadccd67c3a8805f28814" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:11 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:15:18 2011 +0000" }, "message": "vmwgfx: Infrastructure for explicit placement\n\nMake it possible to use explicit placement\n(although not hooked up with a user-space interface yet)\nand relax the single framebuffer limit to only apply to implicit placement.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1543b4dd0c4b63975ffdadccd67c3a8805f28814", "tree": "fb23465df4e17c0bb702914cef5f40cbcf69807f", "parents": [ "0e708bc5d6403d1a64a0e4155f1b91e318318989" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:10 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:14:59 2011 +0000" }, "message": "vmwgfx: Make the preferred autofit mode have a 60Hz vrefresh\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0e708bc5d6403d1a64a0e4155f1b91e318318989", "tree": "896ab31125b0e5acc3295a7f7949cdb73bfdbdb9", "parents": [ "d4528b846ec8ba7ccf3116f1c2157c5e14ba46f3" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:09 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:14:31 2011 +0000" }, "message": "vmwgfx: Remove screen object active list\n\nIt isn\u0027t used for anything. Replace with an active bool.\n\nAlso make a couple of functions return void instead of int\nsince their return value wasn\u0027t checked anyway.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakbo Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d4528b846ec8ba7ccf3116f1c2157c5e14ba46f3", "tree": "21f20296be0c7bd0d84590839b25ca391b97400d", "parents": [ "c9a1be96277b3b2d2e8aff2ba69d7817ea8e46c9" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:08 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:14:11 2011 +0000" }, "message": "vmwgfx: Screen object cleanups\n\nRemove unused member.\nNo need to pin / unpin fb.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3a73dbbc9bb3fc8594cd67af4db6c563175dfddb", "tree": "e5120c19fd8e83a38d5c0852336a92c5b7862c6a", "parents": [ "31555213f03bca37d2c02e10946296052f4ecfcd" ], "author": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Mon Nov 07 19:19:28 2011 +0800" }, "committer": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Mon Nov 07 19:19:28 2011 +0800" }, "message": "writeback: fix uninitialized task_ratelimit\n\nIn balance_dirty_pages() task_ratelimit may be not initialized\n(initialization skiped by goto pause), and then used when calling\ntracing hook.\n\nFix it by moving the task_ratelimit assignment before goto pause.\n\nReported-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "31555213f03bca37d2c02e10946296052f4ecfcd", "tree": "8fdd0ad6f3171fe493b2888616997df29abd4b34", "parents": [ "0084e4751e63a71b30f315710f976f8bb0c2cc07" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 22:22:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 22:22:16 2011 -0800" }, "message": "Revert \"hvc_console: display printk messages on console.\"\n\nThis reverts commit 361162459f62dc0826b82c9690a741a940f457f0.\n\nIt causes an infinite loop when booting Linux under Xen, as so:\n\n [ 2.382984] console [hvc0] enabled\n [ 2.382984] console [hvc0] enabled\n [ 2.382984] console [hvc0] enabled\n ...\n\nas reported by Konrad Rzeszutek Wilk. And Rusty reports the same for\nlguest. He goes on to say:\n\n \"This is not a concurrency problem: the issue seems to be that\n calling register_console() twice on the same struct console is a bad\n idea.\"\n\nand Greg says he\u0027ll fix it up properly at some point later. Revert for now.\n\nReported-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReported-by: Rusty Russell \u003crusty@ozlabs.org\u003e\nRequested-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Miche Baker-Harvey \u003cmiche@google.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0084e4751e63a71b30f315710f976f8bb0c2cc07", "tree": "9973621cd75652f53a7c8e76470f7e01b8281678", "parents": [ "b32fc0a0629bf5894b35f33554c118aacfd0d1e2" ], "author": { "name": "Michael Neuling", "email": "mikey@neuling.org", "time": "Mon Nov 07 17:12:28 2011 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 22:21:18 2011 -0800" }, "message": "powerpc: fix building hvc_opal.c\n\nFix building following build error:\n\n drivers/tty/hvc/hvc_opal.c:244:12: error: \u0027THIS_MODULE\u0027 undeclared here (not in a function)\n\nSigned-off-by: Michael Neuling \u003cmikey@neuling.org\u003e\n[ New file from powerpc tree not following the new rules from the\n module.h split, both of which were merged today. - Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b32fc0a0629bf5894b35f33554c118aacfd0d1e2", "tree": "5d6aaa9a35b7fa63681adab91da3b3dec5276f84", "parents": [ "403299a8515c56db58454c57712f4dc96d6c1fde", "97ce2c88f9ad42e3c60a9beb9fca87abf3639faa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:20:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:20:46 2011 -0800" }, "message": "Merge branch \u0027upstream/jump-label-noearly\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen\n\n* \u0027upstream/jump-label-noearly\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:\n jump-label: initialize jump-label subsystem much earlier\n x86/jump_label: add arch_jump_label_transform_static()\n s390/jump-label: add arch_jump_label_transform_static()\n jump_label: add arch_jump_label_transform_static() to optimise non-live code updates\n sparc/jump_label: drop arch_jump_label_text_poke_early()\n x86/jump_label: drop arch_jump_label_text_poke_early()\n jump_label: if a key has already been initialized, don\u0027t nop it out\n stop_machine: make stop_machine safe and efficient to call early\n jump_label: use proper atomic_t initializer\n\nConflicts:\n - arch/x86/kernel/jump_label.c\n\tAdded __init_or_module to arch_jump_label_text_poke_early vs\n\tremoval of that function entirely\n - kernel/stop_machine.c\n\tsame patch (\"stop_machine: make stop_machine safe and efficient\n\tto call early\") merged twice, with whitespace fix in one version\n" }, { "commit": "403299a8515c56db58454c57712f4dc96d6c1fde", "tree": "1dbcb33c606b03adc7d7fe128ecb3f0c3404ffef", "parents": [ "daedd8708fe7707ed651bb1c83162f25c48a947c", "fdb9eb9f155bfc0f8dc2fc88f90448b30c78ad97" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:15:05 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:15:05 2011 -0800" }, "message": "Merge branch \u0027upstream/xen-settime\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen\n\n* \u0027upstream/xen-settime\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:\n xen/dom0: set wallclock time in Xen\n xen: add dom0_op hypercall\n xen/acpi: Domain0 acpi parser related platform hypercall\n" }, { "commit": "daedd8708fe7707ed651bb1c83162f25c48a947c", "tree": "424e9aaa7d6f686b729257e753e4edf91fecb73c", "parents": [ "6a6662ced4153f6dbcfc40d7225c3cc45416039c", "6b71c52e7f848e2c9f804e175215e5965ea90d32" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:13:34 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:13:34 2011 -0800" }, "message": "Merge branch \u0027stable/cleanups-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/cleanups-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen: use static initializers in xen-balloon.c\n Xen: fix braces and tabs coding style issue in xenbus_probe.c\n Xen: fix braces coding style issue in xenbus_probe.h\n Xen: fix whitespaces,tabs coding style issue in drivers/xen/pci.c\n Xen: fix braces coding style issue in gntdev.c and grant-table.c\n Xen: fix whitespaces,tabs coding style issue in drivers/xen/events.c\n Xen: fix whitespaces,tabs coding style issue in drivers/xen/balloon.c\n\nFix up trivial whitespace-conflicts in\n drivers/xen/{balloon.c,pci.c,xenbus/xenbus_probe.c}\n" }, { "commit": "6a6662ced4153f6dbcfc40d7225c3cc45416039c", "tree": "77ad5d577333f02cd854e44827a407dd0388d4eb", "parents": [ "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "7c7e82a77fe3d89ae50824aa7c897454675eb4c4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:03:41 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:03:41 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (114 commits)\n Btrfs: check for a null fs root when writing to the backup root log\n Btrfs: fix race during transaction joins\n Btrfs: fix a potential btrfs_bio leak on scrub fixups\n Btrfs: rename btrfs_bio multi -\u003e bbio for consistency\n Btrfs: stop leaking btrfs_bios on readahead\n Btrfs: stop the readahead threads on failed mount\n Btrfs: fix extent_buffer leak in the metadata IO error handling\n Btrfs: fix the new inspection ioctls for 32 bit compat\n Btrfs: fix delayed insertion reservation\n Btrfs: ClearPageError during writepage and clean_tree_block\n Btrfs: be smarter about committing the transaction in reserve_metadata_bytes\n Btrfs: make a delayed_block_rsv for the delayed item insertion\n Btrfs: add a log of past tree roots\n btrfs: separate superblock items out of fs_info\n Btrfs: use the global reserve when truncating the free space cache inode\n Btrfs: release metadata from global reserve if we have to fallback for unlink\n Btrfs: make sure to flush queued bios if write_cache_pages waits\n Btrfs: fix extent pinning bugs in the tree log\n Btrfs: make sure btrfs_remove_free_space doesn\u0027t leak EAGAIN\n Btrfs: don\u0027t wait as long for more batches during SSD log commit\n ...\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "efb90582c575084723cc14302c1300cb26c7e01f", "tree": "25af70a2c40e7e404215acd9aadfa42e71e716ae", "parents": [ "e751b759e82629798c4a5e4a87eb3a30c0510154", "46bcfad7a819bd17ac4e831b04405152d59784ab", "22f4521d664030e417f41953e922f61c65f2e189", "aeae1e92daec5a38b40ad12598b97501b675a381" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 22:14:50 2011 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 22:14:50 2011 -0500" }, "message": "Merge branches \u0027acpi\u0027, \u0027idle\u0027, \u0027mrst-pmu\u0027 and \u0027pm-tools\u0027 into next\n" }, { "commit": "e751b759e82629798c4a5e4a87eb3a30c0510154", "tree": "225043e83eecdce1ac8d8ccb6d5a115c5d0b6461", "parents": [ "3bf3f8b19d2bfccc40f13c456bf339fd8f535ebc", "f7f71cfbf0c276ee3d8d856d0f35a41aed997fa4", "c1056b42a87b59375f8f81a92ef029165f44fcce", "362b646062b2073bd5c38efb42171d86e4f717e6", "18fd470a48396c8795ba7256c5973e92ffa25cb3" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 22:10:14 2011 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 22:10:14 2011 -0500" }, "message": "Merge branches \u0027atomic-io\u0027, \u0027lockdep\u0027, \u0027misc\u0027, \u0027pm-profile\u0027 and \u0027pnp-cleanup\u0027 into acpi\n" }, { "commit": "208bca0860406d16398145ddd950036a737c3c9d", "tree": "7797a16c17d8bd155120126fa7976727fc6de013", "parents": [ "6aad3738f6a79fd0ca480eaceefe064cc471f6eb", "0e175a1835ffc979e55787774e58ec79e41957d7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:02:23 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:02:23 2011 -0800" }, "message": "Merge branch \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux\n\n* \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:\n writeback: Add a \u0027reason\u0027 to wb_writeback_work\n writeback: send work item to queue_io, move_expired_inodes\n writeback: trace event balance_dirty_pages\n writeback: trace event bdi_dirty_ratelimit\n writeback: fix ppc compile warnings on do_div(long long, unsigned long)\n writeback: per-bdi background threshold\n writeback: dirty position control - bdi reserve area\n writeback: control dirty pause time\n writeback: limit max dirty pause time\n writeback: IO-less balance_dirty_pages()\n writeback: per task dirty rate limit\n writeback: stabilize bdi-\u003edirty_ratelimit\n writeback: dirty rate control\n writeback: add bg_threshold parameter to __bdi_update_bandwidth()\n writeback: dirty position control\n writeback: account per-bdi accumulated dirtied pages\n" }, { "commit": "6aad3738f6a79fd0ca480eaceefe064cc471f6eb", "tree": "08fb9ec4824bf3320af01f29fe84b75f814c0fa0", "parents": [ "02ebbbd481635fd3ce7018e5bb19c18c0f1e4561", "5bda90c8f20f0af93375721533f4081a40fa6f41" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:00:42 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:00:42 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:\n target: use -\u003eexectute_task for all CDB emulation\n target: remove SCF_EMULATE_CDB_ASYNC\n target: refactor transport_emulate_control_cdb\n target: pass the se_task to the CDB emulation callback\n target: split core_scsi3_emulate_pr\n target: split core_scsi2_emulate_crh\n target: Add generic active I/O shutdown logic\n target: add back error handling in transport_complete_task\n target/pscsi: blk_make_request() returns an ERR_PTR()\n target: Remove core TRANSPORT_FREE_CMD_INTR usage\n target: Make TFO-\u003echeck_stop_free return free status\n iscsi-target: Fix non-immediate TMR handling\n iscsi-target: Add missing CMDSN_LOWER_THAN_EXP check in iscsit_handle_scsi_cmd\n target: Avoid double list_del for aborted se_tmr_req\n target: Minor cleanups to core_tmr_drain_tmr_list\n target: Fix wrong se_tmr being added to drain_tmr_list\n target: Fix incorrect se_cmd assignment in core_tmr_drain_tmr_list\n target: Check -ENOMEM to signal QUEUE_FULL from fabric callbacks\n tcm_loop: Add explict read buffer memset for SCF_SCSI_CONTROL_SG_IO_CDB\n target: Fix compile warning w/ missing module.h include\n" } ], "next": "02ebbbd481635fd3ce7018e5bb19c18c0f1e4561" }