)]}' { "log": [ { "commit": "5cbecafce4ee8ab73c194911e01a77a7a07f034e", "tree": "1434a04f60faec36094bad48db0f3938367df361", "parents": [ "a87aa5cc0074fea871c8c6d2660d9b6cd7699d3d" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat Sep 11 21:31:04 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 21 11:36:25 2010 +0100" }, "message": "intel-gtt: generic (insert|remove)_entries for i830\n\nWell, not all too generic because it does not yet support dmar.\nAdd a new function check_flags to ensure that non-gem code does\nnot try to screw us over.\n\nv2: Beautify i830_check_flags with an idea from Chris Wilson.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "a87aa5cc0074fea871c8c6d2660d9b6cd7699d3d", "tree": "f28de481abe2577bd6459ecad54b4a44892ad6a1", "parents": [ "d0b6dc4b930e3be9c02cc9638f02e14d271d5f0d" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Sep 09 18:17:34 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 21 11:36:11 2010 +0100" }, "message": "agp: kill agp_(map|unmap)_page\n\nOnly used to remap the scratch page. Now that intel-gtt does this\nitself, kill the support code.\n\nCc: Dave Airlie \u003cairlied@linux.ie\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "d0b6dc4b930e3be9c02cc9638f02e14d271d5f0d", "tree": "ebccc4c31b3b11ae4f3b1009ee44d7d5633e06af", "parents": [ "97ef1bdd0bc75bce7b2058e9c432b6c277dcf4d3" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Sep 09 18:11:41 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 21 11:35:58 2010 +0100" }, "message": "intel-gtt: drop agp scratch page support stuff\n\nintel-gtt.c now handles the scratch page itself, so drop all that\nwas just there to support it.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "97ef1bdd0bc75bce7b2058e9c432b6c277dcf4d3", "tree": "f60e252600d69331f8b209e5935b77bdb415d076", "parents": [ "a6963596a13e62f8e65b1cf3403a330ff2db407c" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Sep 09 17:52:20 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 21 11:35:44 2010 +0100" }, "message": "intel-gtt: introduce pte write function for gen6\n\nLike for i830. intel_i9xx_configure is now unused, so kill it.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "a6963596a13e62f8e65b1cf3403a330ff2db407c", "tree": "a384b7f3fa0e8c3b2fadc090e647a5509fa3f6d1", "parents": [ "351bb278d2fd2df93526c15f37500070347328b4" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat Sep 11 14:01:43 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 21 11:35:31 2010 +0100" }, "message": "intel-gtt: introduce pte write function for g33/i965/gm45\n\nLike for the i830.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "351bb278d2fd2df93526c15f37500070347328b4", "tree": "9e351eac4867c206f273e121ab061b0d62ec931f", "parents": [ "0e87d2b06cb4651c874d0b208d31c73addbd638b" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Sep 07 22:41:04 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 21 11:35:18 2010 +0100" }, "message": "intel-gtt: introduce pte write function for i8xx/i915/i945\n\nAnd put it to use in the gtt configuration code that writes\nthe scratch page addr in all gtt ptes. This makes intel_i830_configure\ngeneric, hence rename it to intel_fake_agp_configure.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "0e87d2b06cb4651c874d0b208d31c73addbd638b", "tree": "dd933e996f74b67e0e386f1871149f40b0e94855", "parents": [ "f13d3f7311add99d1f874a6b67d56426afa35664" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Sep 07 22:11:15 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 21 11:30:21 2010 +0100" }, "message": "intel-gtt: initialize our own scratch page\n\nThe intel gtt fake agp driver is the only agp driver to use dma\naddress remapping. So it makes sense to fold this code back into the\nonly user (and thus reduce the reliance on the agp code).\n\nThis patch does the first step by initializing (and remapping) the\nscratch page in a new function intel_gtt_setup_scratch_page.\nUnfortunately intel_gtt_cleanup had to move to avoid a forward\ndeclaration. The new scratch page is not yet used, though.\n\nv2: Refactor out scratch page teardown. Suggested by Chris Wilson on\nirc. This makes it clear what\u0027s going on and results in a nice\nsymmetry between setup and teardown.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e9e5f8e8d373e72f5c39dafde1ce110fc7082118", "tree": "2991e33571a59cc2488daef36dcfeab7bddb9d7f", "parents": [ "f899fc64cda8569d0529452aafc0da31c042df2e", "db8c076b9206ea35b1f7299708d5510b17674db2" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 21 11:19:32 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 21 11:19:32 2010 +0100" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into HEAD\n\nConflicts:\n\tdrivers/char/agp/intel-agp.c\n\tdrivers/gpu/drm/i915/intel_crt.c\n" }, { "commit": "41a51428916ab04587bacee2dda61c4a0c4fc02f", "tree": "8c741b166adbfe2219774038a82e08a32ab6b019", "parents": [ "e259befd9013e212648c3bd4f6f1fbf92d0dd51d" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 17 08:22:30 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 17 08:22:30 2010 +0100" }, "message": "drm/i915,agp/intel: Add second set of PCI-IDs for B43\n\nThere is a second revision of B43 (a desktop gen4 part) floating around,\nfunctionally equivalent to the original B43, so simply add the new\nPCI-IDs.\n\nBugzilla: https://bugs.freedesktop.org/show_bugs.cgi?id\u003d30221\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "3f08e4ef807c3103ceebf7993c7463c7a90646f3", "tree": "63119dac1d44e097fd8cbcaa3f77eb111757483e", "parents": [ "b1c5b0f8cc16a1d22e2e521c4236a6ceca1b2983" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 14 20:15:22 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 14 21:13:13 2010 +0100" }, "message": "agp/intel: Fix resume regression from 2d2430cf\n\nOn i915 [EeePCs] something scribles over the registers during suspend\nand resume so we must save a copy of the PGETBL_CTL register programmed\nby the BIOS and restore that upon resume.\n\nReported-by: Sitsofe Wheeler \u003csitsofe@yahoo.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "b1c5b0f8cc16a1d22e2e521c4236a6ceca1b2983", "tree": "c9d2ae374fb56af57532bb929e0c2e1cb0be7ac7", "parents": [ "819f3fb7fe349d0e6aadbd7088529ab95fe5cd9f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 14 19:30:13 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 14 21:13:12 2010 +0100" }, "message": "agp/intel: Remove redundant setting of gtt_mappable_entries\n\nTwo calls enter, only one will leave.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "9e76e7b8bd716413cfd722a807aa22723f3a895f", "tree": "3564c55631ee10644aae41783322da09cc2b0711", "parents": [ "0bc23aad3b67ca0cd7480dec0b7652d9b8686432" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 14 12:12:11 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 14 12:12:11 2010 +0100" }, "message": "agp/intel: Use macro to set the count of the size array\n\nIt\u0027s a fixed size array so let the compiler do the hard work of updating\nall the call sites.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "19966754328d99ee003ddfc7a8c31ceb115483ac", "tree": "c057dfaf9f9354168102e5ae450ebefbc158bd28", "parents": [ "ac622a9cdb742cad90648d95f2c4877774518f19" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Sep 06 20:08:44 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:21 2010 +0100" }, "message": "drm/i915: die, i915_probe_agp, die\n\nUse the detection from intel-gtt.ko instead. Hooray!\n\nAlso move the stolen mem allocator to the other gtt stuff in dev_prv-\u003emem.\n\nv2: Chris Wilson noted that my error handling was crap. Fix it. He also\nsaid that this fixes a problem on his i845. Indeed, i915_probe_agp\nmisses a special case for i830/i845 stolen mem detection.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d25476\nCc: stable@kernel.org\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "239918f7a5ac118ecfe9c55a4cfd25d7767b674a", "tree": "6a38a5ed6dda6ff9341a6cca8a12e71eb0ec3f9d", "parents": [ "3b15a9d7cd59b7ec79f61aafabfbe84116561461" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Aug 31 22:30:43 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:19 2010 +0100" }, "message": "intel-gtt: use chipset generation number some more\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "3b15a9d7cd59b7ec79f61aafabfbe84116561461", "tree": "fa53438e6bee5bedd9ce32a9ba35854dcc6f1b73", "parents": [ "2d2430cf9bf9e8b0ad9ea34a103625f4fe7e4477" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Aug 29 14:18:49 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:19 2010 +0100" }, "message": "intel-gtt: call init_gtt_init in probe function\n\nThis way create_gatt_table become dummy glue functions for the fake\nagp driver - rename them accordingly (and kill the now unnecessary\ni9xx copy).\n\nWith this change, the gtt initialization code is almost independant\nfrom the agp stuff. Two things are still missing:\n- the scratch page is created by the generic agp code.\n- filling the whole gtt with scratch_page ptes is not yet consolidated -\n this needs abstracted pte handling, first.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "2d2430cf9bf9e8b0ad9ea34a103625f4fe7e4477", "tree": "2beac383272109a7db261b88fd3de664f4b5348b", "parents": [ "73800422a30e9b8b6e0e49c27af9e9d196e52fd9" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Aug 29 17:35:30 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:18 2010 +0100" }, "message": "intel-gtt: consolidate i9xx setup\n\nThe only difference between i915 and i965 was the calculation of the\ngtt address. So merge these two paths into one. Otherwise the same\nchanges as in the i830 setup consolidation.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "73800422a30e9b8b6e0e49c27af9e9d196e52fd9", "tree": "1a9d78237a1655c7667ad1f0325eb224f8cb19d8", "parents": [ "f67eab664c47b261517b09812477de9a1780b426" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Aug 29 17:29:50 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:17 2010 +0100" }, "message": "intel-gtt: consolidate i830 setup\n\nSlighlty reordered sequence was necessary. Also don\u0027t set\nagp_bridge-\u003egatt_bus_addr anymore. Only used by generic agp helper\nfunctions, hence unnecessary for the intel fake agp driver.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "f67eab664c47b261517b09812477de9a1780b426", "tree": "84b2cf266d05f16aff57f27e76f2f3363e327c24", "parents": [ "fdfb58a965486d2afea4ef0f9b8153dab9b98b2e" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Aug 29 17:27:36 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:17 2010 +0100" }, "message": "intel-gtt: consolidate the gtt ioremap calls\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "fdfb58a965486d2afea4ef0f9b8153dab9b98b2e", "tree": "a67a1feac243119c776344f5cac582269f018578", "parents": [ "210b23c2f7b9721afb0a57459b7dbac3b094862e" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Aug 29 00:15:03 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:16 2010 +0100" }, "message": "intel-gtt: i830: adjust ioremap of regs and gtt to i9xx\n\nThis way around this can be extracted into common code.\n\nAlso use a common cleanup function (and give it a generic name).\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "210b23c2f7b9721afb0a57459b7dbac3b094862e", "tree": "1294b7eff22f03bc10c2a8ffa64333fe56895b7a", "parents": [ "ccc4e67be5ac1bd38c4bfd61aca38366597e8afb" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat Aug 28 16:14:32 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:15 2010 +0100" }, "message": "intel-gtt: i965: use detected gtt size for mapping\n\nAlso move the Sandybdridge size detection into gtt_total_entries, like\nthe rest.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "ccc4e67be5ac1bd38c4bfd61aca38366597e8afb", "tree": "04c661214c09dd31114ab36f34ef431711b38da9", "parents": [ "1a997ff2a0089a07a5494545d31f4366742dea43" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Sep 08 21:20:12 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:14 2010 +0100" }, "message": "intel-gtt: i915: use detected gtt size for mapping\n\nSlight reordering of the init sequence required.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "1a997ff2a0089a07a5494545d31f4366742dea43", "tree": "31b1922f2922c76ef1aff40cc298fd8a2e49d114", "parents": [ "e5e408fc94595aab897f613b6f4e2f5b36870a6f" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Sep 08 21:18:53 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:14 2010 +0100" }, "message": "intel-gtt: introduce intel_gtt_driver\n\nSame idea as INTEL_INFO from drm/i915. This\n- reduces the dependancy on agp_driver\n- stops the what-does-IS_I965G-mean confusion (here it\u0027s just gen4, in\n drm/i915 it\u0027s gen \u003e\u003d4)\n- further prepares the separation of the fake agp driver from the rest.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e5e408fc94595aab897f613b6f4e2f5b36870a6f", "tree": "77924470cb3934115db4116e7a4ff5c12da51153", "parents": [ "ffdd7510b0bd5ec663b6b11b39810574f2ce3111" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat Aug 28 11:04:32 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:13 2010 +0100" }, "message": "intel-gtt: fix gtt_total_entries detection\n\nIn commit f1befe71 Chris Wilson added some code to clear the full gtt\non g33/pineview instead of just the mappable part. The code looks like\nit was copy-pasted from agp/intel-gtt.c, at least an identical piece\nof code is still there (in intel_i830_init_gtt_entries). This lead to\na regression in 2.6.35 which was supposedly fixed in commit e7b96f28\n\nNow this commit makes absolutely no sense to me. It seems to be\nslightly confused about chipset generations - it references docs for\n4th gen but the regression concerns 3rd gen g33. Luckily the the g33\ngmch docs are available with the GMCH Graphics Control pci config\nregister definitions. The other (bigger problem) is that the new\ncheck in there uses the i830 stolen mem bits (.5M, 1M or 8M of stolen\nmem). They are different since the i855GM.\n\nThe most likely case is that it hits the 512M fallback, which was\nprobably the right thing for the boxes this was tested on.\n\nSo the original approach by Chris Wilson seems to be wrong and the\ncurrent code is definitely wrong. There is a third approach by Jesse\nBarnes from his RFC patch \"Who wants a bigger GTT mapping range?\"\nwhere he simply shoves g33 in the same clause like later chipset\ngenerations.\n\nI\u0027ve asked him and Jesse confirmed that this should work. So implement\nit.\n\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d16891$\nTested-by: Anisse Astier \u003canisse@astier.eu\u003e\nCc: stable@kernel.org\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "ffdd7510b0bd5ec663b6b11b39810574f2ce3111", "tree": "7bfc9cf2676fc5aeddd1dd60dc5b9504c33d5f63", "parents": [ "fbe407836b5c8d82c68195962240a392d0ce64ea" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Aug 27 17:51:29 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:12 2010 +0100" }, "message": "intel-gtt: s/i8[13]0/fake_agp for generic functions\n\nStart to separate the fake agp driver from the rest of intel-gtt.c\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "fbe407836b5c8d82c68195962240a392d0ce64ea", "tree": "243c746f61fae6ecff3f1459408be5909c4e161d", "parents": [ "77ad498ecaeb9a614d2a7bbfaab58a35c0cc577d" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Aug 27 17:12:41 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:12 2010 +0100" }, "message": "intel-gtt: adjust overhead entries in intel_gtt_stolen_entries\n\nagp/intel_gtt.c and drm/i915/i915_dma.c don\u0027t calculate this the same\nway: The intel-gtt code seems to use the actual gtt size, the drm\nmodule just the mappable. Go with the logic from the drm module because\nthat\u0027s the more conservative choice.\n\nBut conserve the original code in intel_gtt_total_size for later use.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "77ad498ecaeb9a614d2a7bbfaab58a35c0cc577d", "tree": "0e146e942233b703fda4241ee67dd2a6969f73d6", "parents": [ "d8d9abcd35aeebd633cba2e99c384f4e004ccb84" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Aug 27 16:25:54 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:11 2010 +0100" }, "message": "intel-gtt: drop unnecessary conditions in intel_gtt_stolen_entries\n\nThe dedection function in drm/i915/i915_dma.c works without it, so\ndrop it here, too. All the values are disdinct, anyway.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "d8d9abcd35aeebd633cba2e99c384f4e004ccb84", "tree": "f3b4fa8f70112fcacf710fe1654b9ee514aa5e0d", "parents": [ "3e921f980fdd5b972efb7f368b2a847a01804184" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Aug 27 16:13:52 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:10 2010 +0100" }, "message": "intel-gtt: sane variable names for intel_gtt_stolen_entries\n\nThis somewhat aligns it with the version in drm/i915/i915_dma.c.\nChanges:\n- s/gtt_entries/stolen_size\n- track overhead entries in a seperate var (the effective gtt size\n calculation will be extracted later on).\n- subtract the overhead at the end instead of in each clause.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "3e921f980fdd5b972efb7f368b2a847a01804184", "tree": "b554b1699b81976938358fed03649c9981cfbccd", "parents": [ "1784a5fb4f7a41b9a5ea066f7782418bfe170c04" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Aug 27 15:33:26 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:09 2010 +0100" }, "message": "intel-gtt: generic intel_fake_agp_fetch_size\n\nThis uses the new mappable gtt size detection from the previous patch.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "1784a5fb4f7a41b9a5ea066f7782418bfe170c04", "tree": "b295e950380bf16dbe54893bd84df56c2b1eca86", "parents": [ "bfde067bebe72293b1f909a8b35ee8d82811f8f5" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Sep 08 21:01:04 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:09 2010 +0100" }, "message": "intel-gtt: new function intel_gtt_mappable_entries\n\nThis implementation is stolen from drm/i915, but is equivalent to\nthe code sprinkled over intel-gtt.c in the various fetch_size functions.\nIt\u0027s not yet used anywhere, though.\n\nAlso introduce intel_gtt_init which only calls intel_gtt_stolen_entries.\nOver the course of the next patches, this will grow untill it contains\nthe complete init sequence starting from the call to gtt_mappable_entries.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "bfde067bebe72293b1f909a8b35ee8d82811f8f5", "tree": "c4b15e42fb1683426e944b589994c52257d2bc49", "parents": [ "d7cca2f7000243ac43a389110c3d8474f582ae3f" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Aug 24 23:07:59 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:08 2010 +0100" }, "message": "intel-gtt: s/intel_i830_init_gtt_entries/intel_gtt_stolen_entries\n\nFirst simple step towards a more generic initialization. This\nis needed to disentangle the agp stuff from the stuff that is\nactually needed by drm/i915.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "d7cca2f7000243ac43a389110c3d8474f582ae3f", "tree": "e2e5df744aa066591201aa365c6e24c687b574b8", "parents": [ "0ade638655f0ef4d807295c14a4c97544bd6b9ca" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Aug 24 23:06:19 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:07 2010 +0100" }, "message": "intel-gtt: store a local pointer to the bridge pci dev\n\nWhen the intel-gtt code now longer depends on agp, we cannot rely\non this. So store a local reference in intel-gtt.c.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "0ade638655f0ef4d807295c14a4c97544bd6b9ca", "tree": "23ddab04b976c4133e1528d3be2aaa53d9e195d7", "parents": [ "e2404e7c3fe6f46e161edf085c6d9bea06ebe488" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Aug 24 22:18:41 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:07 2010 +0100" }, "message": "intel-gtt: introduce drm/intel-gtt.h\n\nAdd a few definitions to it that are already shared and that will\nbe shared in the future (like the number of stolen entries).\nNo functional changes in here.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e2404e7c3fe6f46e161edf085c6d9bea06ebe488", "tree": "0d799bb55f9f508d2df4712d0ce3ac7d9fc63600", "parents": [ "02c026ced58f33bb5702d3063c05dae2b651e4ba" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Sep 08 17:29:51 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:06 2010 +0100" }, "message": "agp/intel: make intel-gtt.c into a real source file\n\nNow that the disentangling is complete, stop including intel-gtt.c\nfrom intel-agp.c.\n\nThe linux build system _really_ doesn\u0027t allow .c source files with the\nsame name as the module. It fails with the following message when trying\nto build such a bugger:\n\nmake[3]: Circular drivers/char/agp/intel-agp.o \u003c- drivers/char/agp/intel-agp.o dependency dropped.\n\nInstead of renameing intel-agp.c I\u0027ve simply created a new module out\nof intel-gtt.c. Renaming intel-agp.ko to something else is not an option\nfor it will surely kill someones boot process.\n\nThis also paves the way to use the gtt code without loading the agp\ndriver.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "02c026ced58f33bb5702d3063c05dae2b651e4ba", "tree": "e51caf2fd184aa931e777f28f02c86956a9fae89", "parents": [ "309b1e3ab750c0ad4d77c6a6e434402e3346baf4" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Aug 24 19:39:48 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:05 2010 +0100" }, "message": "agp/intel: split out gmch/gtt probe, part 2\n\nThis just splits the device list into two and moves the gtt related stuff\nto intel-gtt.c. The two new devices lists also lose the not longer needed\nfields. There where only about 5 cases anyway with both a gmch and a\npossible agp port, so the duplication of entries is rather small.\nAdditionally kill 2 out of the three Ironlake mobile entries that\nonly differed in host bridge pci id.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "cc491e27d31f1bb3dacb309407b47d65669ceb9d", "tree": "9596fd035919fe9204a275f60044236dbbdd01a2", "parents": [ "2c20130f200b8f9aa746b7c7bc265ab129c29ead", "af045b86662f17bf130239a65995c61a34f00a6b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 08 11:19:18 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 08 11:19:18 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: i8042 - fix device removal on unload\n Input: bcm5974 - adjust major/minor to scale\n Input: MT - initialize slots to unused\n Input: use PIT_TICK_RATE in vt beep ioctl\n Input: wacom - fix mousewheel handling for old wacom tablets\n" }, { "commit": "61f953cbaae26f930b8d937366270547e08c1290", "tree": "44cefef0fdd172ce4fe2083ed7695d86b76ed257", "parents": [ "a44a553f827f28d46130c9818dbcb95f4262b96c", "50b6e71ae83714be509b80727dbf90fa8b1c0717" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 07 14:35:16 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 07 14:35:16 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n Revert \"hwrng: n2-drv - remove casts from void*\"\n crypto: testmgr - Default to no tests\n crypto: testmgr - Fix test disabling option\n crypto: hash - Fix handling of small unaligned buffers\n" }, { "commit": "608a5ffc3ee0d6f4aff53e902659201eeaeb9c06", "tree": "38658ba63eb2fccaf9f3d23112c84a31a40e257f", "parents": [ "78f220a84f464ff1a74d1b646e9b96bdddc47050", "6eb68d6f3bf1707d5d816ea9242b7d38f25b942e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 07 14:04:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 07 14:04:09 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n tty: fix tty_line must not be equal to number of allocated tty pointers in tty driver\n serial: bfin_sport_uart: restore transmit frame sync fix\n serial: fix port type conflict between NS16550A \u0026 U6_16550A\n MAINTAINERS: orphan isicom\n vt: Fix console corruption on driver hand-over.\n" }, { "commit": "8554048070906579ec9fa19ac381deddd2d7b155", "tree": "3d43823689bf126d98ff1e45b86a4041f0d09fc3", "parents": [ "a69ffdbfcba8eabf2ca9d384b578e6f28b339c61" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Tue Sep 07 13:45:32 2010 +0800" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 07 11:16:44 2010 +0100" }, "message": "intel_agp,i915: Add more sandybridge graphics device ids\n\nNew pci ids for GT2 and GT2+ on desktop and mobile sandybridge,\nand graphics device ids for server sandybridge. Also rename original\nids string to reflect GT1 version.\n\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "f8f235e5bbf4e61f3e0886a44afb1dc4cfe8f337", "tree": "9211554f0542ce636aa1f14ffe58cfa832efa04d", "parents": [ "93f5f7f1249e76a5e8afbdab53f90b10c41fdb61" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Fri Aug 27 11:08:57 2010 +0800" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 07 11:16:43 2010 +0100" }, "message": "agp/intel: Fix cache control for Sandybridge\n\nSandybridge GTT has new cache control bits in PTE, which controls\ngraphics page cache in LLC or LLC/MLC, so we need to extend the mask\nfunction to respect the new bits.\n\nAnd set cache control to always LLC only by default on Gen6.\n\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "93f5f7f1249e76a5e8afbdab53f90b10c41fdb61", "tree": "0565797da0c29ed6717977b70ef08a78d7893466", "parents": [ "8dfc2b14ebf538f28a05565f34913ecffedf5024" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Fri Aug 27 11:06:48 2010 +0800" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 07 11:16:42 2010 +0100" }, "message": "agp/intel: use #ifdef idiom for intel-agp.h\n\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "8dfc2b14ebf538f28a05565f34913ecffedf5024", "tree": "be4866115ee59b042da6ec0987e36f1a55e7c9c9", "parents": [ "032d2a0d068b0368296a56469761394ef03207c3" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Mon Aug 23 14:37:52 2010 +0800" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 07 11:16:41 2010 +0100" }, "message": "agp/intel: fix physical address mask bits for sandybridge\n\nIt should shift bit 39-32 into pte\u0027s bit 11-4.\n\nReported-by:Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "df51e7aa2cf204e3a65657a1d60b96cfda133e9b", "tree": "758a3630b9e6b76a4cab9acefe034c62c12309bd", "parents": [ "9f82d23846146990d475f6753be733e55788d88d" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Sep 04 14:57:27 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Sep 06 23:09:53 2010 +0100" }, "message": "agp/intel: Promote warning about failure to setup flush to error.\n\nMake sure we always detect when we fail to correctly allocate the Isoch\nFlush Page and print an error to warn the user about the likely memory\ncorruption that will result in invalid rendering or worse.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "6eb68d6f3bf1707d5d816ea9242b7d38f25b942e", "tree": "8b07c11557ac0b72105d5ecb538fb34335ee10eb", "parents": [ "336746918299f2ca16b31490655b4ff7c8824c87" ], "author": { "name": "Nathael Pajani", "email": "nathael.pajani@ed3l.fr", "time": "Thu Sep 02 16:06:16 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Sep 03 17:29:04 2010 -0700" }, "message": "tty: fix tty_line must not be equal to number of allocated tty pointers in tty driver\n\nI found a bug \"by chance\" in drivers/char/tty_io.c\n\nI mean \"by chance\" because I was just reading the code of the\ntty_find_polling_driver() to make a new tty_find_by_name() function.\n\nIn tty_find_polling_driver() the driver actually test \"tty_line \u003c\u003d\np-\u003enum\" while num refers to the number of struct tty_struct pointers\nallocated for the p-\u003ettys (p is a tty_driver), and tty_line is scanned\nin a tty name, which can be for example ttyS2. Then tty_line equals 2.\nAnd if p-\u003enum is 2, we have only p-\u003ettys[0] and p-\u003ettys[1], but no\np-\u003ettys[2].\n\nThis is actually unharmful, for tty_find_polling_driver() is used only\nin drivers/serial/kgdboc.c, and there\u0027s a test over there to find a\nconsole with a matching index, which will never happen.\n\nThis is still a bug anyway.\n\nSigned-off-by: Nathael Pajani \u003cnathael.pajani@ed3l.fr\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "9fc2b2d0cf743008d8f6be6293278f4ef61f09f3", "tree": "df7c30660be493aa9844da45f02c06097936f5b9", "parents": [ "2bfc96a127bc1cc94d26bfaa40159966064f9c8c" ], "author": { "name": "Francisco Jerez", "email": "currojerez@riseup.net", "time": "Sun Aug 22 17:37:24 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Sep 03 17:29:03 2010 -0700" }, "message": "vt: Fix console corruption on driver hand-over.\n\nAfter 02f0777a0d6560eb995aade34a1b82f95c0452da \"vc_origin\" is no\nlonger reset to the screen buffer before calling the con_init() hook\nof the new console driver.\n\nIf the old driver wasn\u0027t using a fixed scanout buffer (e.g. the case\nof vgacon) \"vc_origin\" may be a pointer to a VRAM location, and its\ncontents aren\u0027t guaranteed to be preserved after calling con_deinit()\non the old driver and con_init() on the new driver, i.e. the\nsubsequent console resize may fill the framebuffer with garbage.\n\nIt can be reproduced in the transition from vgacon to the nouveau\nframebuffer driver: in that case the legacy VGA aperture \"vc_origin\"\npoints to becomes unreadable after fbcon_init().\n\nThis patch reverts the mentioned commit. To avoid the problem it\nintended to fix, stop using \"vc_scr_end\" in vc_do_resize() to\ncalculate how many rows we have to copy (actually the code looks\nsimpler this way without the help of \"vc_scr_end\").\n\nSigned-off-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nCc: qiaochong \u003cqiaochong@loongson.cn\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "2c4e9671edfef534e9726366707d64e63d44e7e6", "tree": "79d1e786e962eba6a7e12309a022b52d9d913126", "parents": [ "d9f66c1a46163c7c83411058516a69da547262f8" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Aug 28 20:35:17 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Sat Aug 28 21:39:09 2010 -0700" }, "message": "Input: use PIT_TICK_RATE in vt beep ioctl\n\nThe KIOCSOUND and KDMKTONE ioctls are based on the CLOCK_TICK_RATE,\nwhich is architecture and sometimes configuration specific.\n\nIn practice, most user applications assume that it is actually defined\nas the i8253 PIT base clock of 1193182 Hz, which is true on some\narchitectures but not on others.\n\nThis patch makes the vt code use the PIT frequency on all\narchitectures, which is much more well-defined. It will change the\nbehavior of user applications sending the beep ioctl on all\narchitectures that define CLOCK_TICK_RATE different from\nPIT_TICK_RATE.\n\nThe original breakage was introduced in commit bcc8ca099 \"Adapt\ndrivers/char/vt_ioctl.c to non-x86\". Hopefully, reverting this change\nwill make the frequency correct in more cases than it will make it\nincorrect.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "2637d139fb9a1bd428a003b7671fda40a034854f", "tree": "7983e0776c95990a545f83275682614e16a71167", "parents": [ "494e2fbe1f8bee22ab2070bd6f4d1a24f7d5fd8b", "288933c02b440621d9c8e7bb5f232cfb7bdef7df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 13:55:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 13:55:31 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: pxa27x_keypad - remove input_free_device() in pxa27x_keypad_remove()\n Input: mousedev - fix regression of inverting axes\n Input: uinput - add devname alias to allow module on-demand load\n Input: hil_kbd - fix compile error\n USB: drop tty argument from usb_serial_handle_sysrq_char()\n Input: sysrq - drop tty argument form handle_sysrq()\n Input: sysrq - drop tty argument from sysrq ops handlers\n" }, { "commit": "80d04f22b0869a1145b36a90a83a79603ac92be8", "tree": "196b465c243e3b230530ffeda8ef3396bdd82a94", "parents": [ "49bf7eaffc0c252ab2a2cc8f1bf8c0077e778704" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Wed Aug 11 20:01:46 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Aug 23 18:17:21 2010 -0700" }, "message": "synclink: add mutex_unlock() on error path\n\nThere is a path which still holds its mutex here.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "49bf7eaffc0c252ab2a2cc8f1bf8c0077e778704", "tree": "51e65d529687bbca73d9d4081bb9dd7c912cff29", "parents": [ "05254a207a255e1a76f9b349a783b5016b874d72" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Wed Aug 11 20:00:09 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Aug 23 18:17:21 2010 -0700" }, "message": "rocket: add a mutex_unlock()\n\nThis path needs a mutex_unlock(). This is stuff from the bkl to mutex\ntransition.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "05254a207a255e1a76f9b349a783b5016b874d72", "tree": "13d95f3956978e1e8e347be48b565cdf5b661c89", "parents": [ "f64ac9830b2a2455208ee023f6bac480ae159db4" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Thu Aug 12 13:48:59 2010 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Aug 23 18:17:21 2010 -0700" }, "message": "ip2: return -EFAULT on copy_to_user errors\n\ncopy_to_user() returns the number of bytes remaining but we want to return\na negative error code on errors.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nCc: \"Michael H. Warfield\" \u003cmhw@wittsend.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "f64ac9830b2a2455208ee023f6bac480ae159db4", "tree": "c91728532925b176ceb970f3278e5c267e3b669c", "parents": [ "07cda511c78db79974f56b277b3704bfc6bba711" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Thu Aug 12 13:48:57 2010 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Aug 23 18:17:20 2010 -0700" }, "message": "ip2: remove unneeded NULL check\n\nWe don\u0027t pass NULL tty pointers to the close function, and anyway we\nalready dereferenced it at this point. This check can be removed.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nCc: \"Michael H. Warfield\" \u003cmhw@wittsend.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "4238a417a91643e1162a98770288f630e37f0484", "tree": "9a4ec0f4249ebe5c723d3f281f087aa472666c02", "parents": [ "bc584c5107bfd97e2aa41c798e3b213bcdd4eae7", "4fefe435626758b14e6c05d2a5f8d71a997c0ad6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 22 11:03:27 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 22 11:03:27 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (58 commits)\n drm/i915,intel_agp: Add support for Sandybridge D0\n drm/i915: fix render pipe control notify on sandybridge\n agp/intel: set 40-bit dma mask on Sandybridge\n drm/i915: Remove the conflicting BUG_ON()\n drm/i915/suspend: s/IS_IRONLAKE/HAS_PCH_SPLIT/\n drm/i915/suspend: Flush register writes before busy-waiting.\n i915: disable DAC on Ironlake also when doing CRT load detection.\n drm/i915: wait for actual vblank, not just 20ms\n drm/i915: make sure eDP PLL is enabled at the right time\n drm/i915: fix VGA plane disable for Ironlake+\n drm/i915: eDP mode set sequence corrections\n drm/i915: add panel reset workaround\n drm/i915: Enable RC6 on Ironlake.\n drm/i915/sdvo: Only set is_lvds if we have a valid fixed mode.\n drm/i915: Set up a render context on Ironlake\n drm/i915 invalidate indirect state pointers at end of ring exec\n drm/i915: Wake-up wait_request() from elapsed hang-check (v2)\n drm/i915: Apply i830 errata for cursor alignment\n drm/i915: Only update i845/i865 CURBASE when disabled (v2)\n drm/i915: FBC is updated within set_base() so remove second call in mode_set()\n ...\n" }, { "commit": "4fefe435626758b14e6c05d2a5f8d71a997c0ad6", "tree": "efd6adcafcdc73902cf940ec2bfb89055ab37be0", "parents": [ "3fdef0205e69b80c4219f14b834cb85eb719039f" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Thu Aug 19 09:46:16 2010 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sat Aug 21 23:29:03 2010 -0700" }, "message": "drm/i915,intel_agp: Add support for Sandybridge D0\n\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "877fdacf8291d7627f339885b5ae52c2f6061734", "tree": "2bfa23d723deeeb95298f69a83ab44f70dcac96c", "parents": [ "156dadc180a1bd3a25d644ee6c361afc465ccd0e" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Thu Aug 19 09:46:13 2010 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sat Aug 21 23:24:50 2010 -0700" }, "message": "agp/intel: set 40-bit dma mask on Sandybridge\n\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "f335397d177c906256ee1bba28e8c49e8ec63817", "tree": "b6911d0b40940cbec9083769856e7744d5461e22", "parents": [ "1495cc9df4e81f5a8fa9b0b8f1034b14d24b7d8c" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Aug 17 21:15:47 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Sat Aug 21 00:34:45 2010 -0700" }, "message": "Input: sysrq - drop tty argument form handle_sysrq()\n\nSysrq operations do not accept tty argument anymore so no need to pass\nit to us.\n\n[Stephen Rothwell \u003csfr@canb.auug.org.au\u003e: fix build breakage in drm code\n caused by sysrq using bool but not including linux/types.h]\n\n[Sachin Sant \u003csachinp@in.ibm.com\u003e: fix build breakage in s390 keyboadr\n driver]\n\nAcked-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nAcked-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "1495cc9df4e81f5a8fa9b0b8f1034b14d24b7d8c", "tree": "7a08852f9fb0cb3073367ef84c0218af0b5479f7", "parents": [ "da5cabf80e2433131bf0ed8993abc0f7ea618c73" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Aug 17 21:15:46 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Aug 19 22:07:06 2010 -0700" }, "message": "Input: sysrq - drop tty argument from sysrq ops handlers\n\nNoone is using tty argument so let\u0027s get rid of it.\n\nAcked-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nAcked-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "145c3ae46b37993b0debb0b3da6256daea4a6ec5", "tree": "0dbff382ce36b23b3d2dbff87d3eaab73a07a2a4", "parents": [ "81ca03a0e2ea0207b2df80e0edcf4c775c07a505", "99b7db7b8ffd6bb755eb0a175596421a0b581cb2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 18 09:35:08 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 18 09:35:08 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n fs: brlock vfsmount_lock\n fs: scale files_lock\n lglock: introduce special lglock and brlock spin locks\n tty: fix fu_list abuse\n fs: cleanup files_lock locking\n fs: remove extra lookup in __lookup_hash\n fs: fs_struct rwlock to spinlock\n apparmor: use task path helpers\n fs: dentry allocation consolidation\n fs: fix do_lookup false negative\n mbcache: Limit the maximum number of cache entries\n hostfs -\u003efollow_link() braino\n hostfs: dumb (and usually harmless) tpyo - strncpy instead of strlcpy\n remove SWRITE* I/O types\n kill BH_Ordered flag\n vfs: update ctime when changing the file\u0027s permission by setfacl\n cramfs: only unlock new inodes\n fix reiserfs_evict_inode end_writeback second call\n" }, { "commit": "86ea51d4a27ec79e9da7d2ce0c4a58f1dc4544c0", "tree": "dadb5d86c9f05bdbfe3180c3b307630c08f721b3", "parents": [ "3b89f56783a4ef796190ef1192c25e72e0b986b6", "5c79a5ae23e72fa12f1c7c528f62bf3ea35da0dc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 18 09:26:17 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 18 09:26:17 2010 -0700" }, "message": "Merge branch \u0027merge-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027merge-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi.h: missing kernel-doc notation, please fix\n of: fix missing headers for of_address_to_resource() in MTD and SysACE drivers\n of: Fix missing includes\n ata: update for of_device to platform_device replacement\n microblaze: Fix of: eliminate of_device-\u003enode and dev_archdata-\u003e{of,prom}_node\n microblaze: Fix of/address: Merge all of the bus translation code\n booting-without-of: Remove nonexistent chapters from TOC, fix numbering\n" }, { "commit": "d996b62a8df1d935b01319bf8defb95b5709f7b8", "tree": "d81f8240da776336845a2063555d7bb4dce684bd", "parents": [ "ee2ffa0dfdd2db19705f2ba1c6a4c0bfe8122dd8" ], "author": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Wed Aug 18 04:37:36 2010 +1000" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Aug 18 08:35:47 2010 -0400" }, "message": "tty: fix fu_list abuse\n\ntty: fix fu_list abuse\n\ntty code abuses fu_list, which causes a bug in remount,ro handling.\n\nIf a tty device node is opened on a filesystem, then the last link to the inode\nremoved, the filesystem will be allowed to be remounted readonly. This is\nbecause fs_may_remount_ro does not find the 0 link tty inode on the file sb\nlist (because the tty code incorrectly removed it to use for its own purpose).\nThis can result in a filesystem with errors after it is marked \"clean\".\n\nTaking idea from Christoph\u0027s initial patch, allocate a tty private struct\nat file-\u003eprivate_data and put our required list fields in there, linking\nfile and tty. This makes tty nodes behave the same way as other device nodes\nand avoid meddling with the vfs, and avoids this bug.\n\nThe error handling is not trivial in the tty code, so for this bugfix, I take\nthe simple approach of using __GFP_NOFAIL and don\u0027t worry about memory errors.\nThis is not a problem because our allocator doesn\u0027t fail small allocs as a rule\nanyway. So proper error handling is left as an exercise for tty hackers.\n\n[ Arguably filesystem\u0027s device inode would ideally be divorced from the\ndriver\u0027s pseudo inode when it is opened, but in practice it\u0027s not clear whether\nthat will ever be worth implementing. ]\n\nCc: linux-kernel@vger.kernel.org\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Nick Piggin \u003cnpiggin@kernel.dk\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "ee2ffa0dfdd2db19705f2ba1c6a4c0bfe8122dd8", "tree": "e48400d1a33f8d2e68589ccfd61637aa64462f08", "parents": [ "b04f784e5d19ed58892833dae845738972cea260" ], "author": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Wed Aug 18 04:37:35 2010 +1000" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Aug 18 08:35:47 2010 -0400" }, "message": "fs: cleanup files_lock locking\n\nfs: cleanup files_lock locking\n\nLock tty_files with a new spinlock, tty_files_lock; provide helpers to\nmanipulate the per-sb files list; unexport the files_lock spinlock.\n\nCc: linux-kernel@vger.kernel.org\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nAcked-by: Andi Kleen \u003cak@linux.intel.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Nick Piggin \u003cnpiggin@kernel.dk\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f1ca09b2b5c9dd3988c61818a7d621b1400e4f0c", "tree": "2a54bbcc450aa1269fe33c30f6a9316e585939c3", "parents": [ "60652d07a028595df5c2582e915325d643a3800d" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Aug 16 23:44:49 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Aug 16 23:44:49 2010 -0600" }, "message": "of: Fix missing includes\n\nThis patch fixes missing includes from a number of .c files because\nthe code (wrongfully) depended on prom.h including them. The include\nof linux/of_address.h was removed in microblaze prom.h in commit\n\"of/address: Clean up function declarations\" (sha1 id 22ae782f8), but\nnot fixed in some callers. This patch fixes them up.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nTested-by: Michal Simek \u003cmonstr@monstr.eu\u003e\n" }, { "commit": "beed5336eba6a5a70c97e9f4bfff525915a25003", "tree": "cbc477bf6c3377da41c50a6d80c7218a4a589b6c", "parents": [ "fed891c89bfd8ef898c2289b34e748969bb12798" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Mon Aug 16 15:58:31 2010 -0500" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Mon Aug 16 15:58:31 2010 -0500" }, "message": "vt,console,kdb: preserve console_blanked while in kdb\n\nCommit b45cfba4e9005d64d419718e7ff7f7cab44c1994 (vt,console,kdb:\nimplement atomic console enter/leave functions) introduced the ability\nto atomically change the console mode with kernel mode setting but did\nnot preserve the state of the console_blanked variable.\n\nThe console_blanked variable must be restored when executing the\ncon_debug_leave() or further kernel mode set changes (such as using\nchvt X) will fail to correctly set the state of console.\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCC: Andrew Morton \u003cakpm@linux-foundation.org\u003e\n" }, { "commit": "fed891c89bfd8ef898c2289b34e748969bb12798", "tree": "a923c4f2aa42401237f1bc92d7a08505d0ee3d66", "parents": [ "787ea1c5811b11124d28c8d85f483c4cd37f5c58" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Mon Aug 16 15:58:30 2010 -0500" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Mon Aug 16 15:58:30 2010 -0500" }, "message": "vt: fix regression warnings from KMS merge\n\nFix the following new sparse warnings in vt.c introduced by the commit\nb45cfba4e9005d64d419718e7ff7f7cab44c1994 (vt,console,kdb: implement\natomic console enter/leave functions):\n\ndrivers/char/vt.c:197:5: warning: symbol \u0027saved_fg_console\u0027 was not declared. Should it be static?\ndrivers/char/vt.c:198:5: warning: symbol \u0027saved_last_console\u0027 was not declared. Should it be static?\ndrivers/char/vt.c:199:5: warning: symbol \u0027saved_want_console\u0027 was not declared. Should it be static?\ndrivers/char/vt.c:200:5: warning: symbol \u0027saved_vc_mode\u0027 was not declared. Should it be static?\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCC: Andrew Morton \u003cakpm@linux-foundation.org\u003e\n" }, { "commit": "26df0766a73a859bb93dc58e747c5028557a23fd", "tree": "4776de567425a7fb66ca9a87228309f9c84de633", "parents": [ "580287628cdd99366b10c9050c4479b387283be8", "a6de51b2787012ba3ab62c7d50df1b749b83d5f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:01:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:01:59 2010 -0700" }, "message": "Merge branch \u0027params\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* \u0027params\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (22 commits)\n param: don\u0027t deref arg in __same_type() checks\n param: update drivers/acpi/debug.c to new scheme\n param: use module_param in drivers/message/fusion/mptbase.c\n ide: use module_param_named rather than module_param_call\n param: update drivers/char/ipmi/ipmi_watchdog.c to new scheme\n param: lock if_sdio\u0027s lbs_helper_name and lbs_fw_name against sysfs changes.\n param: lock myri10ge_fw_name against sysfs changes.\n param: simple locking for sysfs-writable charp parameters\n param: remove unnecessary writable charp\n param: add kerneldoc to moduleparam.h\n param: locking for kernel parameters\n param: make param sections const.\n param: use free hook for charp (fix leak of charp parameters)\n param: add a free hook to kernel_param_ops.\n param: silence .init.text references from param ops\n Add param ops struct for hvc_iucv driver.\n nfs: update for module_param_named API change\n AppArmor: update for module_param_named API change\n param: use ops in struct kernel_param, rather than get and set fns directly\n param: move the EXPORT_SYMBOL to after the definitions.\n ...\n" }, { "commit": "58d4ea65b98f154f3326b038eecda32f90b46ea8", "tree": "636aed413349dece12c08a4bd3d1fea0254976d8", "parents": [ "26f0cf91813bdc8e61595f8ad6660251e2ee9cf6", "fbe0f8348fd6c3d016a3f48756eb729b41a67c22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6:\n mmc_spi: Fix unterminated of_match_table\n of/sparc: fix build regression from of_device changes\n of/device: Replace struct of_device with struct platform_device\n" }, { "commit": "7b958090458e99456b8c1a0f644923b6b9fdd358", "tree": "970c300fad07d25ab71365649f1e2fc6e4de0278", "parents": [ "3c111a071da260aa1e9cae3e882e2109c4e9bdfc" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Wed Aug 11 14:17:30 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 08:43:29 2010 -0700" }, "message": "pc8736x_gpio: depends on X86_32\n\nFix kconfig dependency warning for PC8736x_GPIO by restricting it to\nX86_32.\n\n warning: (SCx200_GPIO \u0026\u0026 SCx200 || PC8736x_GPIO \u0026\u0026 X86) selects NSC_GPIO which has unmet direct dependencies (X86_32)\n\nNSC_GPIO is X86_32 only. The other driver (SCx200_GPIO) that selects\nNSC_GPIO is X86_32 only (indirectly, since SCx200 depends on X86_32), so\nlimit this driver also.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: Jordan Crouse \u003cjordan.crouse@amd.com\u003e\nCc: Jim Cromie \u003cjim.cromie@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4457d9845927b3c62b6e833be243d21d6ca7df47", "tree": "c18beec72aa318227225b22ea323c45760439e32", "parents": [ "ad9c7ed0685406fe3cd7f0749b82bf433a39dd9c" ], "author": { "name": "Stefani Seibold", "email": "stefani@seibold.net", "time": "Tue Aug 10 18:03:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:23 2010 -0700" }, "message": "kfifo: fix kfifo miss use of nozami.c\n\nThere are different types of a fifo which can not handled in C without a\nlot of overhead. So i decided to write the API as a set of macros, which\nis the only way to do a kind of template meta programming without C++.\nThis macros handles the different types of fifos in a transparent way.\n\nThere are a lot of benefits:\n\n- Compile time handling of the different fifo types\n- Better performance (a save put or get of an integer does only generate\n 9 assembly instructions on a x86)\n- Type save\n- Cleaner interface, the additional kfifo_..._rec() functions are gone\n- Easier to use\n- Less error prone\n- Different types of fifos: it is now possible to define a int fifo or\n any other type. See below for an example.\n- Smaller footprint for none byte type fifos\n- No need of creating a second hidden variable, like in the old DEFINE_KFIFO\n\nThe API was not changed.\n\nThere are now real in place fifos where the data space is a part of the\nstructure. The fifo needs now 20 byte plus the fifo space. Dynamic\nassigned or allocated create a little bit more code.\n\nMost of the macros code will be optimized away and simple generate a\nfunction call. Only the really small one generates inline code.\n\nAdditionally you can now create fifos for any data type, not only the\n\"unsigned char\" byte streamed fifos.\n\nThere is also a new kfifo_put and kfifo_get function, to handle a single\nelement in a fifo. This macros generates inline code, which is lit bit\nlarger but faster.\n\nI know that this kind of macros are very sophisticated and not easy to\nmaintain. But i have all tested and it works as expected. I analyzed the\noutput of the compiler and for the x86 the code is as good as hand written\nassembler code. For the byte stream fifo the generate code is exact the\nsame as with the current kfifo implementation. For all other types of\nfifos the code is smaller before, because the interface is easier to use.\n\nThe main goal was to provide an API which is very intuitive, save and easy\nto use. So linux will get now a powerful fifo API which provides all what\na developer needs. This will save in the future a lot of kernel space,\nsince there is no need to write an own implementation. Most of the device\ndriver developers need a fifo, and also deep kernel development will gain\nbenefit from this API.\n\nHere are the results of the text section usage:\n\nExample 1:\n kfifo_put/_get kfifo_in/out current kfifo\ndynamic allocated 0x000002a8 0x00000291 0x00000299\nin place 0x00000291 0x0000026e 0x00000273\n\nkfifo.c new old\ntext section size 0x00000be5 0x000008b2\n\nAs you can see, kfifo_put/kfifo_get creates a little bit more code than\nkfifo_in/kfifo_out, but it is much faster (the code is inline).\n\nThe code is complete hand crafted and optimized. The text section size is\nas small as possible. You get all the fifo handling in only 3 kb. This\nincludes type safe fix size records, dynamic records and DMA handling.\n\nThis should be the final version. All requested features are implemented.\n\nNote: Most features of this API doesn\u0027t have any users. All functions\nwhich are not used in the next 9 months will be removed. So, please adapt\nyour drivers and other sources as soon as possible to the new API and post\nit.\n\nThis are the features which are currently not used in the kernel:\n\nkfifo_to_user()\nkfifo_from_user()\nkfifo_dma_....() macros\nkfifo_esize()\nkfifo_recsize()\nkfifo_put()\nkfifo_get()\n\nThe fixed size record elements, exclude \"unsigned char\" fifo\u0027s and the\nvariable size records fifo\u0027s\n\nThis patch:\n\nUser of the kernel fifo should never bypass the API and directly access\nthe fifo structure. Otherwise it will be very hard to maintain the API.\n\nSigned-off-by: Stefani Seibold \u003cstefani@seibold.net\u003e\nCc: Greg KH \u003cgreg@kroah.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e73790a57abc1320b3c3a94da43ae24359687d7c", "tree": "10aafbf75687e9e0b07f2b892f208f2ab44db2c9", "parents": [ "7bb671e3d053226f870c333f701924986b39ee7f" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Tue Aug 10 18:03:12 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:20 2010 -0700" }, "message": "drivers/char/n_gsm.c: add missing spin_unlock_irqrestore\n\nAdd a spin_unlock_irqrestore missing on the error path. Converting the\nreturn to break leads to the spin_unlock_irqrestore at the end of the\nfunction.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression E1;\n@@\n\n* spin_lock_irqsave(E1,...);\n \u003c+... when !\u003d E1\n if (...) {\n ... when !\u003d E1\n* return ...;\n }\n ...+\u003e\n* spin_unlock_irqrestore(E1,...);\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7bb671e3d053226f870c333f701924986b39ee7f", "tree": "1a5f891b9a1d9bc26617caf0b39bc22386ee9cae", "parents": [ "7faefea66a6d1f0d9da0a18615f57dc969e00d99" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Tue Aug 10 18:03:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:20 2010 -0700" }, "message": "ipmi: print info for spmi and smbios paths like acpi and pci\n\nPrint out the reg spacing and size for spmi and smbios so BIOS developers\ncan make them consistent.\n\nAlso remove extra PFX on the duplicating path.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Corey Minyard \u003cminyard@acm.org\u003e\nCc: Matthew Garrett \u003cmjg@redhat.com\u003e\nCc: Len Brown \u003clen.brown@intel.com\u003e\nCc: Myron Stowe \u003cmyron.stowe@hp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7faefea66a6d1f0d9da0a18615f57dc969e00d99", "tree": "a3035d4e86df7460840e7d4991178375b465b918", "parents": [ "f46c77c283e514a747aee7e8c4f5afc70274c232" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Tue Aug 10 18:03:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:20 2010 -0700" }, "message": "ipmi: fix memleaking for add_smi when duplicating happen\n\nFree the temporary info struct when we have duplicated ones.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Corey Minyard \u003cminyard@acm.org\u003e\nCc: Matthew Garrett \u003cmjg@redhat.com\u003e\nCc: Len Brown \u003clen.brown@intel.com\u003e\nCc: Myron Stowe \u003cmyron.stowe@hp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f46c77c283e514a747aee7e8c4f5afc70274c232", "tree": "ce74249748d538105237c565c5bca8e98e545cde", "parents": [ "cfbef3cb16658046c6faa8c9816018dd11ae62f0" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Tue Aug 10 18:03:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:20 2010 -0700" }, "message": "drivers/char/ipmi/ipmi_si_intf.c: fix warning: variable \u0027addr_space\u0027 set but not used\n\nFix a warning message generated by GCC, and also updates a web address\npointing to a pdf containing information.\n\nCC [M] drivers/char/ipmi/ipmi_si_intf.o\ndrivers/char/ipmi/ipmi_si_intf.c: In function \u0027try_init_spmi\u0027:\ndrivers/char/ipmi/ipmi_si_intf.c:2016:8: warning: variable \u0027addr_space\u0027 set but not used\n\nSigned-off-by: Sergey V. \u003csftp.mtuci@gmail.com\u003e\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nAcked-by: Corey Minyard \u003cminyard@acm.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c8ba6c52e19c13c2b6fb9ca9e5188799c753914c", "tree": "af3d9cd6fd8082421013f59f6d436ad63f7fc614", "parents": [ "886275ce41a9751117367fb387ed171049eb6148" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 11 23:04:37 2010 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 11 23:04:37 2010 +0930" }, "message": "param: update drivers/char/ipmi/ipmi_watchdog.c to new scheme\n\nThis is one of the most interesting users of module parameters in the\ntree, so weaning it off the old-style non-const module_param_call\nscheme is a useful exercise.\n\nI was confused by set_param_int/get_param_int (vs. the normal\nparam_set_int and param_get_int), so I renamed set_param_int to\nset_param_timeout, and re-used param_get_int directly instead of\nget_param_int. I also implemented param_check_wdog_ifnum and\nparam_check_timeout, so now the ifnum_to_use and timeout/pretimeout\nparameters can just use plain module_param().\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Corey Minyard \u003cminyard@acm.org\u003e\nCc: openipmi-developer@lists.sourceforge.net\n" }, { "commit": "549a8a030693912d5ec4106c2f538593c482a1e4", "tree": "60f1898a5a73cd63eaf38fc94ce27ccec0a557ee", "parents": [ "8e4e15d44a817e9f02cb04a6cd6c0ee77ed3fbd8" ], "author": { "name": "Sachin Sant", "email": "sachinp@in.ibm.com", "time": "Tue Nov 17 18:51:03 2009 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 11 23:04:16 2010 +0930" }, "message": "Add param ops struct for hvc_iucv driver.\n\nToday\u0027s next 20091117 build failed on s390 with\n\ndrivers/char/hvc_iucv.c:1331: error: \u0027param_ops_vmidfilter\u0027 undeclared here (not in a function)\nmake[2]: *** [drivers/char/hvc_iucv.o] Error 1\n\nMost probably caused by commit 684a6d340b8a5767db4670031b0f39455346018a\n(param:param_ops) which introduced a param_ops structure.\n\nThe following compile tested patch adds a param_ops structure for hvc_iucv.\n\nSigned-off-by: Sachin Sant \u003csachinp@in.ibm.com\u003e\nAcked-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nTested-by: Phil Carmody \u003cext-phil.2.carmody@nokia.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "bf9c1fca9ae9a79ed209e7ab2c10b3862f3f6f72", "tree": "0e2a97645980af73baacf522d687e995f30d5993", "parents": [ "ee78bb95b7bea08b7774a02073ea2bb45611a9e1" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Thu Jul 29 11:46:32 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:46 2010 -0700" }, "message": "Char: nozomi, set tty-\u003edriver_data appropriately\n\nSorry, one more fix, this one depends on the other, so this is rather 2/2.\n--\n\ntty-\u003edriver_data is used all over the code, but never set. This\nresults in oopses like:\nBUG: unable to handle kernel NULL pointer dereference at 0000000000000130\nIP: [\u003cffffffff814a0040\u003e] mutex_lock+0x10/0x40\n...\nPid: 2157, comm: modem-manager Not tainted 2.6.34.1-0.1-desktop #1 2768DR7/2768DR7\nRIP: 0010:[\u003cffffffff814a0040\u003e] [\u003cffffffff814a0040\u003e] mutex_lock+0x10/0x40\nRSP: 0018:ffff88007b16fa50 EFLAGS: 00010286\nRAX: 0000000000000000 RBX: 0000000000000130 RCX: 0000000000000003\nRDX: 0000000000000003 RSI: 0000000000000286 RDI: 0000000000000130\nRBP: 0000000000001000 R08: 0000000000000000 R09: 0000000000000000\nR10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000130\nR13: 0000000000000001 R14: 0000000000000000 R15: ffff88007b16feb4\n...\nCall Trace:\n [\u003cffffffffa077690d\u003e] ntty_write_room+0x4d/0x90 [nozomi]\n...\n\nSet tty-\u003edriver_data to the computed port in .install to not recompute it in\nevery place where needed. Switch .open to use driver_data too.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: stable \u003cstable@kernel.org\u003e [.34, .35]\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n\n" }, { "commit": "ee78bb95b7bea08b7774a02073ea2bb45611a9e1", "tree": "76c0cf55276de4213d340afc92175e152f0afa0e", "parents": [ "e38018be3e7c03dd7e8f4ab0e1d55407cebbf89d" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Thu Jul 29 11:09:47 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:46 2010 -0700" }, "message": "Char: nozomi, fix tty-\u003ecount counting\n\nCurrently ntty_install omits to increment tty count and we get the\nfollowing warnings:\nWarning: dev (noz2) tty-\u003ecount(0) !\u003d #fd\u0027s(1) in tty_open\n\nSo to fix that, add one tty-\u003ecount++ there.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: stable \u003cstable@kernel.org\u003e [.34, .35]\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "464eb8f596fcbdadcfbbdb4a84847ffcb93cc4dd", "tree": "5fda5926be75e771d97a121ac2e31ea0bf677e20", "parents": [ "e847003f00d5eca3e3b3a6a1199f82b51293faf6" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Fri Jul 23 20:34:53 2010 +0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:45 2010 -0700" }, "message": "mxser: remove unnesesary NULL check\n\nmxser_transmit_chars(tty, port) is called only from mxser_interrupt().\nNULL check is performed in mxser_interrupt() so it is redundant here.\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nAcked-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "2b50d24760a7c0b62180e6fb5a44c2ce3db66abd", "tree": "a6a3672ba5ebf2cd070d5adb145fc33c3533df98", "parents": [ "61fd15262bb9c88a05fd89af22add9317dc1b1f4" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Tue Jun 29 14:15:09 2010 +0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:44 2010 -0700" }, "message": "tty_io: remove casts from void*\n\nRemove unnesessary casts from void*.\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "11dbf203922dc70a340417c895c95fb96f6b7068", "tree": "7c79b79c74a184a7d67d3f54af4e37dee930d11e", "parents": [ "a0821df6e57c8af0053963d0d08c8d5198ea077d" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 18 14:58:07 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:44 2010 -0700" }, "message": "tty: avoid recursive BTM in pty_close\n\nWhen the console has been redirected, a hangup of the tty\nwill cause tty_release to be called under the big tty_mutex,\nwhich leads to a deadlock because hangup is also called\nunder the BTM.\n\nThis moves the BTM deeper into the tty_hangup function so\nwe can close the redirected tty without holding the BTM.\nIn case of pty, we now need to drop the BTM before\ncalling tty_vhangup.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "e142a31da34b42458e10026b554e66127739cf23", "tree": "1f65a42cd559116223e1fa1db7631cd449c73968", "parents": [ "b07471fa51358ce64cc25e1501544502362e4404" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jun 01 22:53:10 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:44 2010 -0700" }, "message": "tty: release BTM while sleeping in block_til_ready\n\nMost tty drivers may block while opening a device.\nSince this possibly depends on another thread\nclosing it first and both threads may need the BTM,\nwe need to release it here.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "b07471fa51358ce64cc25e1501544502362e4404", "tree": "0bd1889eb3cbabe51f15cc5e971f9644cdced0f3", "parents": [ "ddcd9fb66ae7f448b517242c10a31d4e17bcad45" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Aug 06 21:40:30 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:44 2010 -0700" }, "message": "tty: implement BTM as mutex instead of BKL\n\nThe tty locking now follows the rules for mutexes, so\nwe can replace the BKL usage with a new subsystem\nwide mutex.\n\nUsing a regular mutex here will change the behaviour\nwhen blocked on the BTM from spinning to sleeping,\nbut that should not be visible to the user.\n\nUsing the mutex also means that all the BTM is now\ncovered by lockdep.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "ddcd9fb66ae7f448b517242c10a31d4e17bcad45", "tree": "54c5894f3c1dd45580cd45c621bbeb9174da879b", "parents": [ "203652192634c1fce5e79df0a8ff2fabfaefd3ab" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jun 01 22:53:08 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:44 2010 -0700" }, "message": "tty: remove tty_lock_nested\n\nThis changes all remaining users of tty_lock_nested\nto be non-recursive, which lets us kill this function.\nAs a consequence, we won\u0027t need to keep the lock count\nany more, which allows more simplifications later.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "203652192634c1fce5e79df0a8ff2fabfaefd3ab", "tree": "9c2ee78c04b0750220fa34e7adc541c16bf21e90", "parents": [ "60af22d2ed490554cc92c8d0fed0b5b9cf687568" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jun 01 22:53:07 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:43 2010 -0700" }, "message": "tty: untangle locking of wait_until_sent\n\nSome wait_until_sent versions require the big\ntty mutex, others don\u0027t and some callers of\nwait_until_sent already hold it while other don\u0027t.\nThat leads to recursive use of the BTM in these\nfunctions, which we\u0027re trying to get rid of.\n\nThis turns all cleans up the locking there so\nthat the driver\u0027s wait_until_sent function\nnever takes the BTM itself if it is already\ncalled with that lock held.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "60af22d2ed490554cc92c8d0fed0b5b9cf687568", "tree": "6c9d1b2d9b5c409dc6a38f26ed5b7ec0f37a041a", "parents": [ "be1bc2889a4db4961ef69f47fb471ecae9f23ade" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jun 01 22:53:06 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:43 2010 -0700" }, "message": "tty: reorder ldisc locking\n\nWe need to release the BTM in paste_selection() when\nsleeping in tty_ldisc_ref_wait to avoid deadlocks\nwith tty_ldisc_enable.\n\nIn tty_set_ldisc, we now always grab the BTM before\ntaking the ldisc_mutex in order to avoid AB-BA\ndeadlocks between the two.\n\ntty_ldisc_halt potentially blocks on a workqueue\nfunction that takes the BTM, so we must release\nthe BTM before calling it.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "be1bc2889a4db4961ef69f47fb471ecae9f23ade", "tree": "fd6d5e46e69efd9d66e6baa184988461f608f49a", "parents": [ "4e608671674b62e97166f903830d5553e37970e8" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jun 01 22:53:05 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:43 2010 -0700" }, "message": "tty: introduce wait_event_interruptible_tty\n\nCalling wait_event_interruptible implicitly\nreleases the BKL when it sleeps, but we need\nto do this explcitly when we have converted\nit to a mutex.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "64ba3dc3143d94bbe935722aa17fa516b232bc83", "tree": "9649ffd431eb8dc97fbad83d47feaed96980cb7e", "parents": [ "ec79d6056de58511d8e46d9ae59d3878f958dc3e" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jun 01 22:53:02 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:43 2010 -0700" }, "message": "tty: never hold BTM while getting tty_mutex\n\ntty_mutex is never taken with the BTM held, except for\ntwo corner cases that are worked around here.\nWe give up the BTM before calling tty_release() in the\nerror path of tty_open().\nSimilarly, we reorder the locking in ptmx_open()\nto get tty_mutex before the BTM.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "ec79d6056de58511d8e46d9ae59d3878f958dc3e", "tree": "8e73cf399c4cb3c31dbf3caced385cfc018a706a", "parents": [ "3f582b8c11014e4ce310d9839fb335164195333f" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jun 01 22:53:01 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:43 2010 -0700" }, "message": "tty: replace BKL with a new tty_lock\n\nAs a preparation for replacing the big kernel lock\nin the TTY layer, wrap all the callers in new\nmacros tty_lock, tty_lock_nested and tty_unlock.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "8ce73264b75be4d5ed480440ac32dfc1f25ff678", "tree": "d604eda549bee636d8132994496ba2f1406fb8f1", "parents": [ "ff917ba4f1a6189f90ed2c975984d6a1a1dc553d" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 01 22:52:56 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:42 2010 -0700" }, "message": "tty: Move the vt_tty field from the vc_data into the standard tty_port\n\nThis takes all the tty references through the expected interface points so\nwe can refcount them.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "ff917ba4f1a6189f90ed2c975984d6a1a1dc553d", "tree": "a53853d16c578dafee829ebe7645e724d184fab9", "parents": [ "e33ac1c10b6baaac68d18d931e120d8b96e8c5f8" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 01 22:52:55 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:41 2010 -0700" }, "message": "tty: Make vt\u0027s have a tty_port\n\nThe vt layer isn\u0027t safely handling reference counts to tty object on the input\nside. Add a tty port structure to the vt layer in order to implement this using\nthe standard helpers.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "e33ac1c10b6baaac68d18d931e120d8b96e8c5f8", "tree": "e39049f7e17546c3ad9dd90d739b6259826330d2", "parents": [ "d87d9b7d19f04b16c4406d3c0feeca10090e0ada" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 01 22:52:54 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:41 2010 -0700" }, "message": "vc: Locking clean up\n\nThe virtual console layer uses the BKL for various things that don\u0027t really\nneed it. Clean them out.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "a360fae67bc173942f620d44d1b23cfb5ccaaf96", "tree": "be45781b50fb44586694e265d9ec113e481809f5", "parents": [ "4287341d4dba27ef8048f589e3c0bc683c9f2017" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 01 22:52:50 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:41 2010 -0700" }, "message": "synclink: reworking locking a bit\n\nUse the port mutex and port lock to fix the various races. The locking\nstill isn\u0027t totally consistent but its better than before. Wants switching\nto the port helpers.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "7479db07011c9c85a65eeb03724193230af0a99d", "tree": "d4020fc59b97fb25e48fddb0825df6d15a34c73d", "parents": [ "7cc34fd028ef35b12fec0fa9268c37c099d33bd2" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 01 22:52:49 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:40 2010 -0700" }, "message": "specialix: Kill the BKL\n\nUse the port mutex instead\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "7cc34fd028ef35b12fec0fa9268c37c099d33bd2", "tree": "d31500ec5bd0e241ab8ba3caf83e9894cd367a88", "parents": [ "25c3cdf80c73156e910a322aba468ddaca0b91ae" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 01 22:52:48 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:40 2010 -0700" }, "message": "epca: Kill the big kernel lock\n\nThe lock is no longer needed for wait until sent paths so this can go\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "25c3cdf80c73156e910a322aba468ddaca0b91ae", "tree": "2575584e11d5ccc12caf91f35cb193fae4a774eb", "parents": [ "f602501d90e0da28c8e6f5e4569b8bf5d40a9d9c" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 01 22:52:47 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:40 2010 -0700" }, "message": "cyclades: Kill off BKL usage\n\nUse the port mutext for config setting, the rest is locked sufficiently\nanyway that the BKL makes no odds.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "f602501d90e0da28c8e6f5e4569b8bf5d40a9d9c", "tree": "ae0bfcf04f6ef9f4a374b5105d59c1830776d209", "parents": [ "417b6e0e146ba38eec5d79777433e38c73d4feb1" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 01 22:52:46 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:40 2010 -0700" }, "message": "synclink: kill the big kernel lock\n\nWe don\u0027t need it while waiting and we can lock the ioctls using the port\nmutex. While at it eliminate use of the hangup mutex and switch to the port\nmutex.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "417b6e0e146ba38eec5d79777433e38c73d4feb1", "tree": "dc93f95ad8221b42ce9ba8c87adfc7a243f78d21", "parents": [ "ec82db129e94c7896e732d21f2bb9ab8e7312fe0" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 01 22:52:45 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:40 2010 -0700" }, "message": "rocket: kill BKL\n\nWe can use the port mutex for this and also for the hangup path so removing\nthe problematic use of the hangup mutex in this driver. Fix up the locking\non the various port flags while we are at it.\n\nUltimately this driver needs to be using tty_port_ helpers which would sort\nthis out far better.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "ec82db129e94c7896e732d21f2bb9ab8e7312fe0", "tree": "cf9118042698dd3b1448f4f90d3d39a23a051a84", "parents": [ "bf936f92a7a564a2cdb44bbe3bc797cd811bf625" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 01 22:52:44 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:40 2010 -0700" }, "message": "isicom: kill off the BKL\n\nAs with the others we can use the port mutex to get the needed locking\nproperties and fix the race with open.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "bf936f92a7a564a2cdb44bbe3bc797cd811bf625", "tree": "248f4515b8bcb0ea7d8b585ed5eaf0d1f66c0e6b", "parents": [ "8a1e803d0148e320b9200a442dfb88f8cbde88e7" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 01 22:52:43 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:40 2010 -0700" }, "message": "riscom8: kill use of lock_kernel\n\nThe riscom8 board uses lock_kernel to protect bits of the port setting\nioctl logic. We can use the port mutex for this as the logic is internal\nand will also lock set versus open (a locking property that has been lost\nsomewhere along the way)\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "8a1e803d0148e320b9200a442dfb88f8cbde88e7", "tree": "431694cff4ad1a30f54aeb1bc26dc2f651bfe7bc", "parents": [ "b4eda9cb48eac1b7369ad33e5d015c33b4376431" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 01 22:52:42 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:40 2010 -0700" }, "message": "istallion: use bit ops for the board flags\n\nThis lets us avoid problems with races on the flag changes\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "b4eda9cb48eac1b7369ad33e5d015c33b4376431", "tree": "0faa2f1af52804731765b3793436c0b00956fe2e", "parents": [ "8fd4bd22350784d5b2fe9274f6790ba353976415" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 01 22:52:41 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:40 2010 -0700" }, "message": "stallion: prune lock_kernel calls\n\nRemove unneeded tty layer lock kernel bits. Relock the needed bits using the\nport mutex. The istallion still has brd state races but those are not new\nor introduced by the removal of the lock_kernel logic.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "8fd4bd22350784d5b2fe9274f6790ba353976415", "tree": "a74d39c50f9a1ca74cfb47b08201c3a3d1e0baea", "parents": [ "26df6d13406d1a53b0bda08bd712f1924affd7cd" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Jun 23 12:56:12 2010 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:40 2010 -0700" }, "message": "vt/console: try harder to print output when panicing\n\nJesse\u0027s initial patch commit said:\n\n\"At panic time (i.e. when oops_in_progress is set) we should try a bit\nharder to update the screen and make sure output gets to the VT, since\nsome drivers are capable of flipping back to it.\n\nSo make sure we try to unblank and update the display if called from a\npanic context.\"\n\nI\u0027ve enhanced this to add a flag to the vc that console layer can set to\nindicate they want this behaviour to occur. This also adds support to\nfbcon for that flag and adds an fb flag for drivers to indicate they want\nto use the support. It enables this for KMS drivers.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nAcked-by: James Simmons \u003cjsimmons@infradead.org\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "26df6d13406d1a53b0bda08bd712f1924affd7cd", "tree": "db17328acbd7cac9dc20bc854509527c1c89ca01", "parents": [ "a3c8ed693da9782f924223f65da9261da796e49b" ], "author": { "name": "hyc@symas.com", "email": "hyc@symas.com", "time": "Tue Jun 22 10:14:49 2010 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:39 2010 -0700" }, "message": "tty: Add EXTPROC support for LINEMODE\n\nThis patch is against the 2.6.34 source.\n\nParaphrased from the 1989 BSD patch by David Borman @ cray.com:\n\n These are the changes needed for the kernel to support\n LINEMODE in the server.\n\n There is a new bit in the termios local flag word, EXTPROC.\n When this bit is set, several aspects of the terminal driver\n are disabled. Input line editing, character echo, and mapping\n of signals are all disabled. This allows the telnetd to turn\n off these functions when in linemode, but still keep track of\n what state the user wants the terminal to be in.\n\n New ioctl:\n TIOCSIG Generate a signal to processes in the\n current process group of the pty.\n\n There is a new mode for packet driver, the TIOCPKT_IOCTL bit.\n When packet mode is turned on in the pty, and the EXTPROC bit\n is set, then whenever the state of the pty is changed, the\n next read on the master side of the pty will have the TIOCPKT_IOCTL\n bit set. This allows the process on the server side of the pty\n to know when the state of the terminal has changed; it can then\n issue the appropriate ioctl to retrieve the new state.\n\nSince the original BSD patches accompanied the source code for telnet\nI\u0027ve left that reference here, but obviously the feature is useful for\nany remote terminal protocol, including ssh.\n\nThe corresponding feature has existed in the BSD tty driver since 1989.\nFor historical reference, a good copy of the relevant files can be found\nhere:\n\nhttp://anonsvn.mit.edu/viewvc/krb5/trunk/src/appl/telnet/?pathrev\u003d17741\n\nSigned-off-by: Howard Chu \u003chyc@symas.com\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n\n" } ], "next": "74c807ce3d1f092fc5138c5a54019553061ecc17" }