)]}' { "log": [ { "commit": "cb87ea28ed9e75a41eb456bfcb547b4e6f10e750", "tree": "e3fe4a653bd96815c650dd9f5db11edc6b39b0db", "parents": [ "641c3187b9d53cfd4c23b0ce2ab18a13d5e775e5" ], "author": { "name": "John Calixto", "email": "john.calixto@modsystems.com", "time": "Tue Apr 26 18:56:29 2011 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:02:54 2011 -0400" }, "message": "mmc: core: Add mmc CMD+ACMD passthrough ioctl\n\nAllows appropriately-privileged applications to send CMD (normal) and ACMD\n(application-specific; preceded with CMD55) commands to cards/devices on\nthe mmc bus. This is primarily useful for enabling the security\nfunctionality built in to every SD card.\n\nIt can also be used as a generic passthrough (e.g. to enable virtual\nmachines to control mmc bus devices directly). However, this use case has\nnot been tested rigorously. Generic passthrough testing was only conducted\nfor a few non-security opcodes to prove the feasibility of the passthrough.\n\nSince any opcode can be sent using this passthrough, it is very possible to\nrender the card/device unusable. Applications that use this ioctl must\nhave CAP_SYS_RAWIO.\n\nSecurity commands tested on TI PCIxx12 (SDHCI), Sigma Designs SMP8652 SoC,\nTI OMAP3621/OMAP3630 SoC, Samsung S5PC110 SoC, Qualcomm MSM7200A SoC.\n\nSigned-off-by: John Calixto \u003cjohn.calixto@modsystems.com\u003e\nReviewed-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nReviewed-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "641c3187b9d53cfd4c23b0ce2ab18a13d5e775e5", "tree": "9bea85b68521e8d7b1efe4a01b9c19b722860b1b", "parents": [ "82b0e23a295cc58d1290017ee97a40956ad68d94" ], "author": { "name": "Rabin Vincent", "email": "rabin@rab.in", "time": "Sat Apr 23 20:52:58 2011 +0530" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:02:49 2011 -0400" }, "message": "mmc: block: init force_ro sysfs attribute\n\nTo avoid lockdep warnings:\n\nBUG: key dc90a520 not in .data!\n------------[ cut here ]------------\nWARNING: at /home/rabin/kernel/arm/kernel/lockdep.c:2701 sysfs_add_file_mode+0x4c/0xb0()\nModules linked in:\n[\u003cc004b5d8\u003e] (unwind_backtrace+0x0/0xe4) from [\u003cc0074f20\u003e] (warn_slowpath_common+0x4c/0x64)\n[\u003cc0074f20\u003e] (warn_slowpath_common+0x4c/0x64) from [\u003cc0074f50\u003e] (warn_slowpath_null+0x18/0x1c)\n[\u003cc0074f50\u003e] (warn_slowpath_null+0x18/0x1c) from [\u003cc0157fec\u003e] (sysfs_add_file_mode+0x4c/0xb0)\n[\u003cc0157fec\u003e] (sysfs_add_file_mode+0x4c/0xb0) from [\u003cc02d61e4\u003e] (mmc_add_disk+0x40/0x64)\n[\u003cc02d61e4\u003e] (mmc_add_disk+0x40/0x64) from [\u003cc02d64cc\u003e] (mmc_blk_probe+0x188/0x1fc)\n[\u003cc02d64cc\u003e] (mmc_blk_probe+0x188/0x1fc) from [\u003cc02ce820\u003e] (mmc_bus_probe+0x14/0x18)\n...\n\nSigned-off-by: Rabin Vincent \u003crabin@rab.in\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "82b0e23a295cc58d1290017ee97a40956ad68d94", "tree": "f3f140be979623ae8b83b79841eb842858ed054b", "parents": [ "f06c9153f5ecd47dfed23f87b9d08e42ff0e4170" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Apr 21 20:26:38 2011 +0200" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:02:42 2011 -0400" }, "message": "mmc: sdhci: Fix read-only detection with JMicron 388 chip\n\nOn HP laptops with JMicron 388 chip, the write-locked SD card isn\u0027t\ndetected correctly as read-only in many cases. This is because the\nPRESENT_STATE register becomes unsable just after plugging, and it\nreturns the WRITE_PROTECT bit wrongly at the first read.\n\nThis patch fixes the read-only detection by adding a new sdhci quirk\nindicating to check the register more intensively with a relatively\nlong delay.\n\nThe patch is tested with 2.6.39-rc4 kernel.\n\nCc: Aries Lee \u003carieslee@jmicron.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "f06c9153f5ecd47dfed23f87b9d08e42ff0e4170", "tree": "0557ae6ba11f6bf1c100f3432a1547c62cbcc864", "parents": [ "393c1a34dd852dbf0c409ec94dd48057100480ea" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Thu Apr 21 22:46:13 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:02:38 2011 -0400" }, "message": "mmc: Ensure hardware partitions don\u0027t mess with mmcblk device naming.\n\nWith the hardware partitions support (which represent additional logical\ndevices present on MMC), devidx does not correspond with index used to form\n/dev/mmcblkX names. So use an additional allocated index for device names.\n\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "393c1a34dd852dbf0c409ec94dd48057100480ea", "tree": "e24e7ceda2f730cfe53f4c5744f979a45f0478d6", "parents": [ "4b01681c77642c62a833187066c35e71e59caaf5" ], "author": { "name": "Philip Rakity", "email": "prakity@marvell.com", "time": "Fri Jan 21 11:26:40 2011 -0800" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:02:33 2011 -0400" }, "message": "mmc: sdhci: Add pre and post reset processing for chip specific reset\n\nMarvell pxa controllers have private registers that may need to be\nmodified before and after a reset is done.\n\nFor example, the SD reset operation, RESET_ALL, will reset the private\nregisters to their default state. This will cause the clock adjustment\nregisters that may have been programmed to have incorrect values.\n\nRESET_DATA sometimes needs to be delayed before the reset is done\n(depending on SoC) to enable any transactions being handled by the\nSDIO card to be completed. Needed in pre SD 3.0 silicon to handle\nclock gating.\n\nImplement hooks to allow this to happen.\n\nSigned-off-by: Philip Rakity \u003cprakity@marvell.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "4b01681c77642c62a833187066c35e71e59caaf5", "tree": "d9826b3bbd20c260cbff1cb4571c9518b784dab4", "parents": [ "24f5b53ba076e983bc64fa48534ca795d7813d51" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Apr 19 18:44:17 2011 +0100" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:02:12 2011 -0400" }, "message": "mmc: sdhci: Fix SDHCI_QUIRK_TIMEOUT_USES_SDCLK\n\nCommit 373e6a (mmc: sdhci: R1B command handling + MMC_CAP_ERASE) moved the\nhandling of SDHCI_QUIRK_TIMEOUT_USES_SDCLK from sdhci_calc_timeout() to\nsdhci_add_host(). This causes division by zero errors on at least the S3C\nSDHCI controller as the quirk implementation needs host-\u003eclock set to work\nbut host-\u003eclock has not been set when sdhci_add_host() is called.\n\nFix this by backing out that portion of the change, the clock may vary at\nruntime anyway. It does occur to me that we may want to move the quirk to\nwhere we set the clock but this seems more invasive and I\u0027m concerned\nabout undesirable side effects.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: Andrei Warkentin \u003candreiw@motorola.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "24f5b53ba076e983bc64fa48534ca795d7813d51", "tree": "6ae546b6443ec6f28694a9688fdd79da633c57b7", "parents": [ "a61ad2b49bfce94dfddce828cd9222e4b9e7825b" ], "author": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Wed Apr 13 23:49:45 2011 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:02:01 2011 -0400" }, "message": "mmc: initialize struct mmc_request at declaration time\n\nConverts from:\n\tstruct mmc_request mrq;\n\tmemset(\u0026mrq, 0, sizeof(struct mmc_request));\n\nto:\n\tstruct mmc_request mrq \u003d {0};\n\nbecause it\u0027s shorter, as performant, and easier to work out whether\ninitialization has happened.\n\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "a61ad2b49bfce94dfddce828cd9222e4b9e7825b", "tree": "36f93e61adc7c7d7523c78c78c3df1e75fae5e33", "parents": [ "1278dba167f01bb3c6626d16450d31129d041087" ], "author": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Wed Apr 13 23:46:05 2011 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:56 2011 -0400" }, "message": "mmc: initialize struct mmc_data at declaration time\n\nConverts from:\n\tstruct mmc_data data;\n\tmemset(\u0026data, 0, sizeof(struct mmc_data));\n\nto:\n\tstruct mmc_data data \u003d {0};\n\nbecause it\u0027s shorter, as performant, and easier to work out whether\ninitialization has happened.\n\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "1278dba167f01bb3c6626d16450d31129d041087", "tree": "6fb3af716e5437cb558ae37fd8a58db23b9b173e", "parents": [ "62929e4be3fe4cc632b3b03645e083c6548de531" ], "author": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Wed Apr 13 23:40:30 2011 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:52 2011 -0400" }, "message": "mmc: initialize struct mmc_command at declaration time\n\nConverts from:\n\tstruct mmc_command cmd;\n\tmemset(\u0026cmd, 0, sizeof(struct mmc_command));\n\nto:\n\tstruct mmc_command cmd \u003d {0};\n\nbecause it\u0027s shorter, as performant, and easier to work out whether\ninitialization has happened.\n\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "62929e4be3fe4cc632b3b03645e083c6548de531", "tree": "811cae5f01b1130d23c49fc47869bb6adf9cf026", "parents": [ "30574ed143e10dd19295b7d80be55f2cd6764c6f" ], "author": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Wed Apr 13 16:28:34 2011 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:47 2011 -0400" }, "message": "mmc: card: Fix use of uninitialized data in mmc_blk_issue_rw_rq.\n\nmmc_blk_issue_rw_rq did not zero out mmc_command on stack.\n\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "30574ed143e10dd19295b7d80be55f2cd6764c6f", "tree": "ff99f1105ccb7e8d6c8c908e3773b9382acb11f4", "parents": [ "87f6119e25bbe0fd60e76f599d5fa10cf489519c" ], "author": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Wed Apr 13 16:25:30 2011 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:42 2011 -0400" }, "message": "mmc: core: Fix use of uninitialized data in mmc_send_if_cond.\n\nmmc_send_if_cond did not zero out mmc_command on stack.\n\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "87f6119e25bbe0fd60e76f599d5fa10cf489519c", "tree": "10cc6964609facbddb8653b04475dfd33850ab01", "parents": [ "6a7a6b45f454686a1549729bfbae31f0b3b595d6" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Wed Apr 13 15:33:12 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:38 2011 -0400" }, "message": "mmc: core: Fix use of uninitialized data in mmc_cmd_app.\n\nmmc_cmd_app did not zero out mmc_command on stack.\n\nReported-by: Chuanxiao Dong \u003cchuanxiao.dong@intel.com\u003e\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "6a7a6b45f454686a1549729bfbae31f0b3b595d6", "tree": "dafdeae86c51d07c0115065114906d438781a50d", "parents": [ "f6a03cbf43e586211f8ea088148c8ecd3fc4b5be" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Tue Apr 12 15:06:53 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:34 2011 -0400" }, "message": "mmc: quirks: Fix erase/trim for certain SanDisk cards.\n\nCMD38 argument is passed through EXT_CSD[113].\n\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "f6a03cbf43e586211f8ea088148c8ecd3fc4b5be", "tree": "6b3c34b585d7412cf1c82d0eb33b389ea0fa8e0f", "parents": [ "6f60c22252af05df94352240f30f9fc84090d88d" ], "author": { "name": "Mikko Vinni", "email": "mmvinni@yahoo.com", "time": "Tue Apr 12 09:36:18 2011 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:29 2011 -0400" }, "message": "mmc: sdhci: work around broken dma boundary behavior\n\nSome SD host controllers (noticed on an integrated JMicron SD reader on an\nHP Pavilion dv5-1250eo laptop) don\u0027t update the dma address register before\nsignaling a dma interrupt due to a dma boundary. Update the register\nmanually to the next boundary (by default 512KiB), at which the transfer\nstopped.\n\nAs long as each transfer is at most 512KiB in size (guaranteed by a BUG_ON\nin sdhci_prepare_data()) and the boundary is kept at the default value,\nthis fix is needed at most once per transfer. Smaller boundaries are taken\ncare of by counting the transferred bytes.\n\nFixes: https://bugzilla.kernel.org/show_bug.cgi?id\u003d28462\n\nSigned-off-by: Mikko Vinni \u003cmmvinni@yahoo.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "6f60c22252af05df94352240f30f9fc84090d88d", "tree": "f7c4f8c9cc726491c8f515b0f87a6905795ae819", "parents": [ "371a689f64b0da140c3bcd3f55305ffa1c3a58ef" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Mon Apr 11 19:11:04 2011 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:25 2011 -0400" }, "message": "mmc: quirks: Support for block quirks.\n\nBlock quirks implemented using core/quirks.c support.\n\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "371a689f64b0da140c3bcd3f55305ffa1c3a58ef", "tree": "c0dff82d668378d395cb22ce33cd93e6dafef9eb", "parents": [ "1a258db6f396e26c2c00b19c0107a891895d4584" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Mon Apr 11 18:10:25 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:21 2011 -0400" }, "message": "mmc: MMC boot partitions support.\n\nAllows device MMC boot partitions to be accessed. MMC partitions are\ntreated effectively as separate block devices on the same MMC card.\n\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "1a258db6f396e26c2c00b19c0107a891895d4584", "tree": "b9012952b952612a929994f87f3488ce88bcb46f", "parents": [ "d3a8d95dcbb726b9cf0bbc166b2473bdd236c88c" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Mon Apr 11 18:10:24 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:16 2011 -0400" }, "message": "mmc: card: block.c cleanup for host claim/release.\n\nMove host claim/release into mmc_blk_issue_rq.\n\n(This is helpful so that selecting partition only has to happen\nin one place for these commands.)\n\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "d3a8d95dcbb726b9cf0bbc166b2473bdd236c88c", "tree": "10c6e435f28f6d61562ce54291063913e59dc0b3", "parents": [ "a3c7778f8153b9e4eceea6738973280b9e63c618" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Mon Apr 11 16:13:43 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:13 2011 -0400" }, "message": "mmc: core: Allow setting CMD timeout for CMD6 (SWITCH).\n\nCMD6 is an R1B-type command, where DAT is used as busy. Depending\non register written using CMD6, timeout value can be different\nas per spec.\n\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "a3c7778f8153b9e4eceea6738973280b9e63c618", "tree": "73d81d32c5c4b06d76ae9f81b444cd6b08b7325e", "parents": [ "eaa02f751ff4f8abfc2e55a15c20a5a274244418" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Mon Apr 11 16:13:42 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:09 2011 -0400" }, "message": "mmc: sdhci: R1B command handling + MMC_CAP_ERASE.\n\nERASE command needs R1B response, so fix R1B-type command\nhandling for SDHCI controller. For non-DAT commands using a busy\nresponse, the cmd-\u003ecmd_timeout_ms (in ms) field is used for timeout\ncalculations.\n\nBased on patch by Chuanxiao Dong \u003cchuanxiao.dong@intel.com\u003e\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "eaa02f751ff4f8abfc2e55a15c20a5a274244418", "tree": "c521e84176e140acdc03926683b525250ceee777", "parents": [ "853c6cac0dc0d9d330deb5b48c19eebafaed1841" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Mon Apr 11 16:13:41 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:05 2011 -0400" }, "message": "mmc: core: Rename erase_timeout to cmd_timeout_ms.\n\nRenames erase_timeout to cmd_timeout_ms inside struct mmc_command.\nFirst step to making host honor timeouts for non-data-transfer\ncommands. Cleans up erase timeout code.\n\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "853c6cac0dc0d9d330deb5b48c19eebafaed1841", "tree": "88bbcb5a7b32f23dba7d42d7e61d55ff2d1fc442", "parents": [ "32780cd1350e651e68bdf33b7f5b009d21d5b794" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue Apr 12 12:59:09 2011 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:00:59 2011 -0400" }, "message": "mmc: quirks: fix truncation warnings\n\nFix data truncation warnings: .manfid is not unsigned long:\n\ndrivers/mmc/core/quirks.c:36: warning: large integer implicitly truncated to unsigned type\ndrivers/mmc/core/quirks.c:40: warning: large integer implicitly truncated to unsigned type\ndrivers/mmc/core/quirks.c:43: warning: large integer implicitly truncated to unsigned type\ndrivers/mmc/core/quirks.c:46: warning: large integer implicitly truncated to unsigned type\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "32780cd1350e651e68bdf33b7f5b009d21d5b794", "tree": "e8e86350a3eca20cca098b488e596d2b76ecaea8", "parents": [ "f317dfeb86c83d03304a74ce5426a69422b79547" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Mon Apr 11 17:02:15 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:00:54 2011 -0400" }, "message": "mmc: quirks: Extends card quirks with MMC/SD quirks matching the CID.\n\nThe current mechanism is SDIO-only. This allows us to create\nfunction-specific quirks, without creating messy Kconfig dependencies,\nor polluting core/ with function-specific code.\n\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "f317dfeb86c83d03304a74ce5426a69422b79547", "tree": "c5f313b1afcc4318c7d86dd243fb8867b01ffb05", "parents": [ "b177bc9188c04e140e5d8928e88623a92ba751bf" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Mon Apr 11 06:11:29 2011 +0200" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:00:50 2011 -0400" }, "message": "mmc: core: fix memory leak in mmc_add_host\n\nled_trigger_register_simple() allocates memory which must not be leaked\nin the error-path of mmc_add_host. Move it past the only error-check in\nthe function.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "b177bc9188c04e140e5d8928e88623a92ba751bf", "tree": "20dbad913f51c246c38165d6fd9cb128fb365ab5", "parents": [ "14e7dc76f24577694f1c121e6ce1fd2f3d46c726" ], "author": { "name": "Ameya Palande", "email": "2ameya@gmail.com", "time": "Tue Apr 05 21:13:13 2011 +0300" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:00:41 2011 -0400" }, "message": "mmc: sdhci-pci: Fix checkpatch.pl errors\n\nThis patch fixes 21 errors and 6 warnings reported by checkpatch.pl.\n\nSigned-off-by: Ameya Palande \u003c2ameya@gmail.com\u003e\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "14e7dc76f24577694f1c121e6ce1fd2f3d46c726", "tree": "b16d3dbc8f7d0858b9df6490863892f70dd21dcb", "parents": [ "2059a02dcb84236f9db9197fa9b00418d7b8465b" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Apr 05 18:02:26 2011 +0300" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:00:05 2011 -0400" }, "message": "mmc: quirks: wl1271 is MMC_QUIRK_DISABLE_CD\n\nThe wl12xx device supports disconnecting the pull-up resistor on\nCD/DAT[3] (pin 1) of the card.\n\nTell SDIO core to disconnect that resistor during card init,\nsince we don\u0027t need it at that point (and anyway all\nhosts shall provide pull-up resistors on all data lines DAT[3:0]\nas described in section 6 of the SD physical specification).\n\nAs a result, this may save some power, but it\u0027s also generally healthy\nsince it prevents both ends from pulling up that pin, which\nresults in undesirable asymmetric physical bus.\n\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "2059a02dcb84236f9db9197fa9b00418d7b8465b", "tree": "d51b9fe1b70a7e3e7d5c24912637d22a04bf35b5", "parents": [ "0b4043d70af5871908864fa725821bc8e667542d" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Apr 05 18:02:25 2011 +0300" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:00:01 2011 -0400" }, "message": "mmc: add MMC_QUIRK_DISABLE_CD\n\n006ebd5d introduced sdio_disable_cd(), which disconnects the pull-up\nresistor on CD/DAT[3] (pin 1) of the card.\n\nMake it possible to start using sdio_disable_cd() by introducing\nMMC_QUIRK_DISABLE_CD.\n\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "0b4043d70af5871908864fa725821bc8e667542d", "tree": "665b1a5337f4cc137d5b57a0e2c8bb7323cc522f", "parents": [ "eab4068795d670b065164096805cbf15a19e9690" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Apr 05 17:50:15 2011 +0300" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:56 2011 -0400" }, "message": "mmc: quirks: wl1271 is MMC_QUIRK_NONSTD_FUNC_IF\n\nTell SDIO core to ignore the standard SDIO function interface\ncodes indicated by the wl1271. This is required because the\nwl1271 erroneously indicates its first function as a standard\nBluetooth SDIO interface, and that drives btsdio mad.\n\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "eab4068795d670b065164096805cbf15a19e9690", "tree": "5fb62e0a18163fe2c46044cb23c276a9dad64477", "parents": [ "6b93d01fe5971951911a070f51f412d50e9536dc" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Apr 05 17:50:14 2011 +0300" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:52 2011 -0400" }, "message": "mmc: add MMC_QUIRK_NONSTD_FUNC_IF\n\nIntroduce MMC_QUIRK_NONSTD_FUNC_IF to ignore the \"SDIO Standard Function\ninterface code\" as indicated by the card\u0027s FBR, and instead treat all\nfunctions as non-standard interfaces.\n\nThis is required to prevent standard drivers from facing\nerrors when trying to communicate with SDIO cards that erroneously\nindicate standard function interface codes.\n\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "6b93d01fe5971951911a070f51f412d50e9536dc", "tree": "0e0221f3af9f954bd60e469f94810730899ee374", "parents": [ "a5e9425d2010978c5f85986cc70a9fa0c0d5b912" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Apr 05 17:43:21 2011 +0300" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:47 2011 -0400" }, "message": "mmc: do not switch to 1-bit mode if not required\n\n6b5eda36 followed SDIO spec part E1 section 8, which states that\nin case SDIO interrupts are being used to wake up a suspended host,\nthen it is required to switch to 1-bit mode before stopping the clock.\n\nBefore switching to 1-bit mode (or back to 4-bit mode on resume),\nmake sure that SDIO interrupts are really being used to wake the host.\n\nThis is helpful for devices which have an external irq line (e.g.\nwl1271), and do not use SDIO interrupts to wake up the host.\n\nIn this case, switching to 1-bit mode (and back to 4-bit mode on resume)\nis not necessary.\n\nReported-by: Eliad Peller \u003celiad@wizery.com\u003e\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "a5e9425d2010978c5f85986cc70a9fa0c0d5b912", "tree": "2d58d5b79f3e0b2fe30edbb5fc1b6808b7576d81", "parents": [ "f4c5522b0a8827f39f83f928961d87e081bfe71c" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Apr 05 17:43:20 2011 +0300" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:43 2011 -0400" }, "message": "mmc: mmc_card_keep_power cleanups\n\nmmc_card_is_powered_resumed is a mouthful; instead, simply use\nmmc_card_keep_power, which also better explains the purpose of\nthe macro.\n\nEmploy mmc_card_keep_power() where possible.\n\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "f4c5522b0a8827f39f83f928961d87e081bfe71c", "tree": "3c2126f0adb2a3444b2fd152cc1a880c192c9d77", "parents": [ "766a6bf6e987ff5f5085c614b5a62a55006b6a7e" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Thu Mar 31 18:40:00 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:38 2011 -0400" }, "message": "mmc: Reliable write support.\n\nAllows reliable writes to be used for MMC writes. Reliable writes are used\nto service write REQ_FUA/REQ_META requests. Handles both the legacy and\nthe enhanced reliable write support in MMC cards.\n\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nReviewed-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "766a6bf6e987ff5f5085c614b5a62a55006b6a7e", "tree": "dd213ed5cbd1210e5ad029ab73a6698c7749c03a", "parents": [ "c7f409e39e65cb007304da718b0a7b25a0144a0a" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Thu Mar 31 09:31:19 2011 +0800" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:34 2011 -0400" }, "message": "mmc: sdhci: change CONFIG of MMC_SDHCI_TEGRA from \u0027tristate\u0027 to \u0027bool\u0027\n\nThis config option is used to decide whether tegra sdhci support\nshould be build into the sdhci-platform module. So setting it \u0027m\u0027\nis nonsense, since we can\u0027t build part of an module as a module.\nThe effect for \u0027m\u0027 will probably be the same as for \u0027n\u0027.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "c7f409e39e65cb007304da718b0a7b25a0144a0a", "tree": "f835f6e38b48e8ea5fad8c18be03071cf833c599", "parents": [ "0b38c4ebf037290eef27b31bdc37cacf804c7a48" ], "author": { "name": "Venkat Rao", "email": "vrao@broadcom.com", "time": "Fri Mar 25 20:37:47 2011 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:30 2011 -0400" }, "message": "mmc: tegra: add pm_flags\n\nEnable fast bcm4329 WIFI suspend/resume on Tegra2 board.\n\nThis patch allows the mach-tegra support to tell the tegra MMC host\ncontroller to NOT turn off power for the MMC controller the WIFI part\nlives behind. Thus bcm4329 firmware doesn\u0027t need to be reloaded.\n\nSigned-off-by: Venkat Rao \u003cvrao@broadcom.com\u003e\nTested-by: Grant Grundler \u003cgrundler@chromium.org\u003e\nReviewed-by: Olof Johansson \u003colof@lixom.net\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "0b38c4ebf037290eef27b31bdc37cacf804c7a48", "tree": "97a947537da85f161b2862d2d26221402d637194", "parents": [ "41e2a4893566ced3c46af15df5b727326881e47d" ], "author": { "name": "John Ogness", "email": "john.ogness@linutronix.de", "time": "Fri Mar 25 09:47:37 2011 +0100" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:17 2011 -0400" }, "message": "mmc: remove redundant irq disabling\n\nThere is no need to disable irq\u0027s when using the sg_copy_*_buffer()\nfunctions because those functions do that already. There are also\nno races for the mm_queue struct here that would require the irq\u0027s\nto be disabled before calling sg_copy_*_buffer().\n\nSigned-off-by: John Ogness \u003cjohn.ogness@linutronix.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "41e2a4893566ced3c46af15df5b727326881e47d", "tree": "62263d47bf1f034857e8138095af724aa61c53bb", "parents": [ "7c21738efd0b5e8c2a9ac2440e7ffbf432d6f239" ], "author": { "name": "Philip Rakity", "email": "prakity@marvell.com", "time": "Sat Mar 19 14:10:33 2011 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:13 2011 -0400" }, "message": "mmc: Ensure linux starts in eMMC user partition\n\nuBoot sometimes leaves eMMC pointing to the private boot partition.\nEnsure we always start looking at the user partition.\n\nSigned-off-by: Philip Rakity \u003cprakity@marvell.com\u003e\nSigned-off-by: Bruce Clemens \u003cbpclemens@marvell.com\u003e\nSigned-off-by: Mark F. Brown \u003cmarkb@marvell.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "7c21738efd0b5e8c2a9ac2440e7ffbf432d6f239", "tree": "d65f02ae98b229604e04df9984632272686cef9a", "parents": [ "eed631e0d741d1a1067cfc6d709fdf2363126f9c", "752d2635ebb12b6122ba05775f7d1ccfef14b275" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 16 08:47:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 16 08:47:31 2011 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm: Take lock around probes for drm_fb_helper_hotplug_event\n drm/i915: Revert i915.semaphore\u003d1 default from 47ae63e0\n vga_switcheroo: don\u0027t toggle-switch devices\n drm/radeon/kms: add some evergreen/ni safe regs\n drm/radeon/kms: fix extended lvds info parsing\n drm/radeon/kms: fix tiling reg on fusion\n" }, { "commit": "752d2635ebb12b6122ba05775f7d1ccfef14b275", "tree": "787f76b453e15a03e7db938eaace598dc36273eb", "parents": [ "8eea1be174a1ea4b86323167bbadc8a6abdca613" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Apr 22 11:03:57 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 16 12:01:43 2011 +1000" }, "message": "drm: Take lock around probes for drm_fb_helper_hotplug_event\n\nWe need to hold the dev-\u003emode_config.mutex whilst detecting the output\nstatus. But we also need to drop it for the call into\ndrm_fb_helper_single_fb_probe(), which indirectly acquires the lock when\nattaching the fbcon.\n\nFailure to do so exposes a race with normal output probing. Detected by\nadding some warnings that the mutex is held to the backend detect routines:\n\n[ 17.772456] WARNING: at drivers/gpu/drm/i915/intel_crt.c:471 intel_crt_detect+0x3e/0x373 [i915]()\n[ 17.772458] Hardware name: Latitude E6400\n[ 17.772460] Modules linked in: ....\n[ 17.772582] Pid: 11, comm: kworker/0:1 Tainted: G W 2.6.38.4-custom.2 #8\n[ 17.772584] Call Trace:\n[ 17.772591] [\u003cffffffff81046af5\u003e] ? warn_slowpath_common+0x78/0x8c\n[ 17.772603] [\u003cffffffffa03f3e5c\u003e] ? intel_crt_detect+0x3e/0x373 [i915]\n[ 17.772612] [\u003cffffffffa0355d49\u003e] ? drm_helper_probe_single_connector_modes+0xbf/0x2af [drm_kms_helper]\n[ 17.772619] [\u003cffffffffa03534d5\u003e] ? drm_fb_helper_probe_connector_modes+0x39/0x4d [drm_kms_helper]\n[ 17.772625] [\u003cffffffffa0354760\u003e] ? drm_fb_helper_hotplug_event+0xa5/0xc3 [drm_kms_helper]\n[ 17.772633] [\u003cffffffffa035577f\u003e] ? output_poll_execute+0x146/0x17c [drm_kms_helper]\n[ 17.772638] [\u003cffffffff81193c01\u003e] ? cfq_init_queue+0x247/0x345\n[ 17.772644] [\u003cffffffffa0355639\u003e] ? output_poll_execute+0x0/0x17c [drm_kms_helper]\n[ 17.772648] [\u003cffffffff8105b540\u003e] ? process_one_work+0x193/0x28e\n[ 17.772652] [\u003cffffffff8105c6bc\u003e] ? worker_thread+0xef/0x172\n[ 17.772655] [\u003cffffffff8105c5cd\u003e] ? worker_thread+0x0/0x172\n[ 17.772658] [\u003cffffffff8105c5cd\u003e] ? worker_thread+0x0/0x172\n[ 17.772663] [\u003cffffffff8105f767\u003e] ? kthread+0x7a/0x82\n[ 17.772668] [\u003cffffffff8100a724\u003e] ? kernel_thread_helper+0x4/0x10\n[ 17.772671] [\u003cffffffff8105f6ed\u003e] ? kthread+0x0/0x82\n[ 17.772674] [\u003cffffffff8100a720\u003e] ? kernel_thread_helper+0x0/0x10\n\nReported-by: Frederik Himpe \u003cfhimpe@telenet.be\u003e\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d36394\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8eea1be174a1ea4b86323167bbadc8a6abdca613", "tree": "3d1c9a591c7b905b73dc33d272bfc9f239d1d75e", "parents": [ "a67b8887ced9d54cab7759bdb19deafed37481eb" ], "author": { "name": "Andy Lutomirski", "email": "luto@mit.edu", "time": "Fri May 13 12:14:54 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 16 09:15:37 2011 +1000" }, "message": "drm/i915: Revert i915.semaphore\u003d1 default from 47ae63e0\n\nMy Q67 / i7-2600 box has rev09 Sandy Bridge graphics. It hangs\ninstantly when GNOME loads and it hangs so hard the reset button\ndoesn\u0027t work. Setting i915.semaphore\u003d0 fixes it.\n\nSemaphores were disabled in a1656b9090f7008d2941c314f5a64724bea2ae37\nin 2.6.38 and were re-enabled by\n\ncommit 47ae63e0c2e5fdb582d471dc906eb29be94c732f\nMerge: c59a333 467cffb\nAuthor: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nDate: Mon Mar 7 12:32:44 2011 +0000\n\n Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n\n Apply the trivial conflicting regression fixes, but keep GPU semaphores\n enabled.\n\n Conflicts:\n drivers/gpu/drm/i915/i915_drv.h\n drivers/gpu/drm/i915/i915_gem_execbuffer.c\n\n(It\u0027s worth noting that the offending change is i915_drv.c,\n which is not a conflict.)\n\nSigned-off-by: Andy Lutomirski \u003cluto@mit.edu\u003e\nAcked-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a67b8887ced9d54cab7759bdb19deafed37481eb", "tree": "87ad4a1f9f2b5fd48d820949c827fea7264fa885", "parents": [ "3a8ab79eae4500e6ac618a92a90cee63d6e804a8" ], "author": { "name": "Florian Mickler", "email": "florian@mickler.org", "time": "Sun May 15 16:32:50 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 16 08:57:04 2011 +1000" }, "message": "vga_switcheroo: don\u0027t toggle-switch devices\n\nIf the requested device is already active, ignore the request.\n\nThis restores the original behaviour of the interface. The change was\nprobably an unintended side effect of\n\ncommit 66b37c6777c4 vga_switcheroo: split switching into two stages\n\nwhich did not take into account to duplicate the !active check in the split-off\nstage2.\n\nFix this by factoring that check out of stage1 into the debugfs_write routine.\n\nReferences: https://bugzilla.kernel.org/show_bug.cgi?id\u003d34252\nReported-by: Igor Murzov \u003ce-mail@date.by\u003e\nTested-by: Igor Murzov \u003ce-mail@date.by\u003e\nSigned-off-by: Florian Mickler \u003cflorian@mickler.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "eed631e0d741d1a1067cfc6d709fdf2363126f9c", "tree": "31ba02472a8d5ef2d7780274a7663258c09a9acf", "parents": [ "bd1a643e10eb8782b36b47c3602300319dd2fb00", "ebcb904dfe31644857422e3bb62e50f76fe86255" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 15 10:22:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 15 10:22:10 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:\n Btrfs: fix FS_IOC_SETFLAGS ioctl\n Btrfs: fix FS_IOC_GETFLAGS ioctl\n fs: remove FS_COW_FL\n Btrfs: fix easily get into ENOSPC in mixed case\n Prevent oopsing in posix_acl_valid()\n" }, { "commit": "bd1a643e10eb8782b36b47c3602300319dd2fb00", "tree": "68915b6c23f07441ebc956a3492cd0a0797a7d8d", "parents": [ "9f6bd36c407f30c388c5de66c831e1968eec0367", "1fec70932d867416ffe620dd17005f168cc84eb5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 15:41:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 15:41:10 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n rbd: fix split bio handling\n rbd: fix leak of ops struct\n" }, { "commit": "ebcb904dfe31644857422e3bb62e50f76fe86255", "tree": "e4dd906d7f15e0a924b410acd236e8b7e3bc8bba", "parents": [ "d0092bdda819914b8725da76a8c33eb06eb0bd21" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Fri Apr 15 03:03:17 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat May 14 16:10:28 2011 -0400" }, "message": "Btrfs: fix FS_IOC_SETFLAGS ioctl\n\nSteps to reproduce the bug:\n\n - Call FS_IOC_SETLFAGS ioctl with flags\u003dFS_COMPR_FL\n - Call FS_IOC_SETFLAGS ioctl with flags\u003d0\n - Call FS_IOC_GETFLAGS ioctl, and you\u0027ll see FS_COMPR_FL is still set!\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "d0092bdda819914b8725da76a8c33eb06eb0bd21", "tree": "34de4ffe3822f8a8f1a731628c849280a7e4edeb", "parents": [ "e1e8fb6a1ff3f9487e03a4cbf85b81d1316068ce" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Fri Apr 15 03:03:06 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat May 14 16:10:27 2011 -0400" }, "message": "Btrfs: fix FS_IOC_GETFLAGS ioctl\n\nAs we\u0027ve added per file compression/cow support.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "e1e8fb6a1ff3f9487e03a4cbf85b81d1316068ce", "tree": "a7cd1ba1f93d163e2ca02b8172888f43e444713f", "parents": [ "1aba86d67f340a8001d67183ec32e8a62e3ec658" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Fri Apr 15 03:02:49 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat May 14 16:10:26 2011 -0400" }, "message": "fs: remove FS_COW_FL\n\nFS_COW_FL and FS_NOCOW_FL were newly introduced to control per file\nCOW in btrfs, but FS_NOCOW_FL is sufficient.\n\nThe fact is we don\u0027t have corresponding BTRFS_INODE_COW flag.\n\nCOW is default, and FS_NOCOW_FL can be used to switch off COW for\na single file.\n\nIf we mount btrfs with nodatacow, a newly created file will be set with\nthe FS_NOCOW_FL flag. So to turn on COW for it, we can just clear the\nFS_NOCOW_FL flag.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "1aba86d67f340a8001d67183ec32e8a62e3ec658", "tree": "8e2a3dc2bceca44c1525f4815b00ef1ae275adad", "parents": [ "f5de93914983bf04b92a786d1d205286fc53b49b" ], "author": { "name": "liubo", "email": "liubo2009@cn.fujitsu.com", "time": "Fri Apr 08 08:44:37 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat May 14 16:10:26 2011 -0400" }, "message": "Btrfs: fix easily get into ENOSPC in mixed case\n\nWhen a btrfs disk is created by mixed data \u0026 metadata option, it will have no\npure data or pure metadata space info.\n\nIn btrfs\u0027s for-linus branch, commit 78b1ea13838039cd88afdd62519b40b344d6c920\n(Btrfs: fix OOPS of empty filesystem after balance) initializes space infos at\nthe very beginning. The problem is this initialization does not take the mixed\ncase into account, which will cause btrfs will easily get into ENOSPC in mixed\ncase.\n\nSigned-off-by: Liu Bo \u003cliubo2009@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "f5de93914983bf04b92a786d1d205286fc53b49b", "tree": "88801bc318e62bdd34698ca7cf5029b16570d1b7", "parents": [ "7cf96da3ec7ca225acf4f284b0e904a1f5f98821" ], "author": { "name": "Daniel J Blueman", "email": "daniel.blueman@gmail.com", "time": "Tue May 03 16:44:13 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat May 14 16:10:18 2011 -0400" }, "message": "Prevent oopsing in posix_acl_valid()\n\nIf posix_acl_from_xattr() returns an error code, a negative address is\ndereferenced causing an oops; fix by checking for error code first.\n\nSigned-off-by: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nReviewed-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "9f6bd36c407f30c388c5de66c831e1968eec0367", "tree": "649de9788cba56933f094b095fa70bc7d8854209", "parents": [ "05bf86b4ccfd0f197da61c67bd372111d15a6620", "5f6f12ccf3aa42cfc0c5bde9228df0c843dd63f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 12:19:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 12:19:18 2011 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n libata: fix oops when LPM is used with PMP\n" }, { "commit": "05bf86b4ccfd0f197da61c67bd372111d15a6620", "tree": "23db61517fad9b68b19fdbe044fa3dbe8fc2bd19", "parents": [ "afa49791caae70cc3fd665a182eea61250795265" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Sat May 14 12:06:42 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 12:18:55 2011 -0700" }, "message": "tmpfs: fix race between swapoff and writepage\n\nShame on me! Commit b1dea800ac39 \"tmpfs: fix race between umount and\nwritepage\" fixed the advertized race, but introduced another: as even\nits comment makes clear, we cannot safely rely on a peek at list_empty()\nwhile holding no lock - until info-\u003eswapped is set, shmem_unuse_inode()\nmay delete any formerly-swapped inode from the shmem_swaplist, which\nin this case would leave a swap area impossible to swapoff.\n\nAlthough I don\u0027t relish taking the mutex every time, I don\u0027t care much\nfor the alternatives either; and at least the peek at list_empty() in\nshmem_evict_inode() (a hotter path since most inodes would never have\nbeen swapped) remains safe, because we already truncated the whole file.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5f6f12ccf3aa42cfc0c5bde9228df0c843dd63f7", "tree": "0fd92494ecaa6caf7f4d7f12524d49b149d7d304", "parents": [ "ddb503b42960792f3be580f98959add669241a04" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon May 09 16:04:11 2011 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@pobox.com", "time": "Sat May 14 14:51:40 2011 -0400" }, "message": "libata: fix oops when LPM is used with PMP\n\nae01b2493c (libata: Implement ATA_FLAG_NO_DIPM and apply it to mcp65)\nadded ATA_FLAG_NO_DIPM and made ata_eh_set_lpm() check the flag.\nHowever, @ap is NULL if @link points to a PMP link and thus the\nunconditional @ap-\u003eflags dereference leads to the following oops.\n\n BUG: unable to handle kernel NULL pointer dereference at 0000000000000018\n IP: [\u003cffffffff813f98e1\u003e] ata_eh_recover+0x9a1/0x1510\n ...\n Pid: 295, comm: scsi_eh_4 Tainted: P 2.6.38.5-core2 #1 System76, Inc. Serval Professional/Serval Professional\n RIP: 0010:[\u003cffffffff813f98e1\u003e] [\u003cffffffff813f98e1\u003e] ata_eh_recover+0x9a1/0x1510\n RSP: 0018:ffff880132defbf0 EFLAGS: 00010246\n RAX: 0000000000000000 RBX: ffff880132f40000 RCX: 0000000000000000\n RDX: ffff88013377c000 RSI: ffff880132f40000 RDI: 0000000000000000\n RBP: ffff880132defce0 R08: ffff88013377dc58 R09: ffff880132defd98\n R10: 0000000000000000 R11: 00000000ffffffff R12: 0000000000000000\n R13: 0000000000000000 R14: ffff88013377c000 R15: 0000000000000000\n FS: 0000000000000000(0000) GS:ffff8800bf700000(0000) knlGS:0000000000000000\n CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\n CR2: 0000000000000018 CR3: 0000000001a03000 CR4: 00000000000406e0\n DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n Process scsi_eh_4 (pid: 295, threadinfo ffff880132dee000, task ffff880133b416c0)\n Stack:\n 0000000000000000 ffff880132defcc0 0000000000000000 ffff880132f42738\n ffffffff813ee8f0 ffffffff813eefe0 ffff880132defd98 ffff88013377f190\n ffffffffa00b3e30 ffffffff813ef030 0000000032defc60 ffff880100000000\n Call Trace:\n [\u003cffffffff81400867\u003e] sata_pmp_error_handler+0x607/0xc30\n [\u003cffffffffa00b273f\u003e] ahci_error_handler+0x1f/0x70 [libahci]\n [\u003cffffffff813faade\u003e] ata_scsi_error+0x5be/0x900\n [\u003cffffffff813cf724\u003e] scsi_error_handler+0x124/0x650\n [\u003cffffffff810834b6\u003e] kthread+0x96/0xa0\n [\u003cffffffff8100cd64\u003e] kernel_thread_helper+0x4/0x10\n Code: 8b 95 70 ff ff ff b8 00 00 00 00 48 3b 9a 10 2e 00 00 48 0f 44 c2 48 89 85 70 ff ff ff 48 8b 8d 70 ff ff ff f6 83 69 02 00 00 01 \u003c48\u003e 8b 41 18 0f 85 48 01 00 00 48 85 c9 74 12 48 8b 51 08 48 83\n RIP [\u003cffffffff813f98e1\u003e] ata_eh_recover+0x9a1/0x1510\n RSP \u003cffff880132defbf0\u003e\n CR2: 0000000000000018\n\nFix it by testing @link-\u003eap-\u003eflags instead.\n\nstable: ATA_FLAG_NO_DIPM was added during 2.6.39 cycle but was\n backported to 2.6.37 and 38. This is a fix for that and thus\n also applicable to 2.6.37 and 38.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: \"Nathan A. Mourey II\" \u003cnmoureyii@ne.rr.com\u003e\nLKML-Reference: \u003c1304555277.2059.2.camel@localhost.localdomain\u003e\nCc: Connor H \u003ccmdkhh@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Jeff Garzik \u003cjgarzik@pobox.com\u003e\n" }, { "commit": "afa49791caae70cc3fd665a182eea61250795265", "tree": "5a1683ad60a9c789802cfb2ac657981a6e43410e", "parents": [ "22fe9446e82f1fe4b59900db4599061384efb0ad", "c590cece75728a85ea06801df3ebad2d7ad8612c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 11:24:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 11:24:32 2011 -0700" }, "message": "Merge branch \u0027fbmem\u0027\n\n* fbmem:\n Further fbcon sanity checking\n fbmem: fix remove_conflicting_framebuffers races\n" }, { "commit": "22fe9446e82f1fe4b59900db4599061384efb0ad", "tree": "f5ad2181f1c9bcd8987b6f5b36c24e1f6b8d4140", "parents": [ "ddb503b42960792f3be580f98959add669241a04" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat May 14 12:28:04 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 10:45:59 2011 -0700" }, "message": "Revert \"libata: ahci_start_engine compliant to AHCI spec\"\n\nThis reverts commit 270dac35c26433d06a89150c51e75ca0181ca7e4.\n\nThe commits causes command timeouts on AC plug/unplug. It isn\u0027t yet\nclear why. As the commit was for a single rather obscure controller,\nrevert the change for now.\n\nThe problem was reported and bisected by Gu Rui in bug#34692.\n\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d34692\n\nAlso, reported by Rafael and Michael in the following thread.\n\n http://thread.gmane.org/gmane.linux.kernel/1138771\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Gu Rui \u003cchaos.proton@gmail.com\u003e\nReported-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nReported-by: Michael Leun \u003clkml20100708@newton.leun.net\u003e\nCc: Jian Peng \u003cjipeng2005@gmail.com\u003e\nCc: Jeff Garzik \u003cjgarzik@pobox.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c590cece75728a85ea06801df3ebad2d7ad8612c", "tree": "3f3f7ade41317d86305a3839d9f2ad646945aa60", "parents": [ "712f3147aee0fbbbbed2da20b21b272c5505125e" ], "author": { "name": "Bruno Prémont", "email": "bonbons@linux-vserver.org", "time": "Sat May 14 12:24:15 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 10:28:54 2011 -0700" }, "message": "Further fbcon sanity checking\n\nThis moves the\n\n if (num_registered_fb \u003d\u003d FB_MAX)\n return -ENXIO;\n\ncheck _AFTER_ the call to do_remove_conflicting_framebuffers() as this\nwould (now in a safe way) allow a native driver to replace the\nconflicting one even if all slots in registered_fb[] are taken.\n\nThis also prevents unregistering a framebuffer that is no longer\nregistered (vga16f will unregister at module unload time even if the\nframe buffer had been unregistered earlier due to being found\nconflicting).\n\nSigned-off-by: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "712f3147aee0fbbbbed2da20b21b272c5505125e", "tree": "02bf6ff00f1978b4165c2c2d4554606bae65107e", "parents": [ "c47747fde931c02455683bd00ea43eaa62f35b0e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 16:16:41 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 10:23:44 2011 -0700" }, "message": "fbmem: fix remove_conflicting_framebuffers races\n\nWhen a register_framebuffer() call results in us removing old\nconflicting framebuffers, the new registration_lock doesn\u0027t protect that\nsituation. And we can\u0027t just add the same locking to the function,\nbecause these functions call each other: register_framebuffer() calls\nremove_conflicting_framebuffers, which in turn calls\nunregister_framebuffer for any conflicting entry.\n\nIn order to fix it, this just creates wrapper functions around all three\nfunctions and makes the versions that actually do the work be called\n\"do_xxx()\", leaving just the wrapper that gets the lock and calls the\nworker function.\n\nSo the rule becomes simply that \"do_xxxx()\" has to be called with the\nlock held, and now do_register_framebuffer() can just call\ndo_remove_conflicting_framebuffers(), and that in turn can call\n_do_unregister_framebuffer(), and there is no deadlock, and we can hold\nthe registration lock over the whole sequence, fixing the races.\n\nIt also makes error cases simpler, and fixes one situation where we\nwould return from unregister_framebuffer() without releasing the lock,\npointed out by Bruno Prémont.\n\nTested-by: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nTested-by: Anca Emanuel \u003canca.emanuel@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ddb503b42960792f3be580f98959add669241a04", "tree": "81b4fa600ac88bb70874d0b892e72521cbe9c8c0", "parents": [ "298eaaad0edc004912513d7b9e18163bc053539b", "90b57f35164aa715dcc7d939a88780a23231f84e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 17:29:03 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 17:29:03 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:\n alpha: Wire up syscalls new to 2.6.39\n alpha: convert to clocksource_register_hz\n" }, { "commit": "90b57f35164aa715dcc7d939a88780a23231f84e", "tree": "04c66668861339d13d687738fb4fbd177d9841c2", "parents": [ "f550806a7fbca06b487238442546aceb7ecbb0c9" ], "author": { "name": "Michael Cree", "email": "mcree@orcon.net.nz", "time": "Wed May 04 08:14:50 2011 +0000" }, "committer": { "name": "Matt Turner", "email": "mattst88@gmail.com", "time": "Fri May 13 19:16:11 2011 -0400" }, "message": "alpha: Wire up syscalls new to 2.6.39\n\nWire up the syscalls:\n name_to_handle_at\n open_by_handle_at\n clock_adjtime\n syncfs\nand adjust some whitespace in the neighbourhood to align commments.\n\nSigned-off-by: Michael Cree \u003cmcree@orcon.net.nz\u003e\nSigned-off-by: Matt Turner \u003cmattst88@gmail.com\u003e\n" }, { "commit": "f550806a7fbca06b487238442546aceb7ecbb0c9", "tree": "b71da9ac8c3b11228c2c33e1accb8309e894f81c", "parents": [ "446cc6345d3de6571bdd0840f48aca441488a28d" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Tue Feb 15 22:34:49 2011 -0800" }, "committer": { "name": "Matt Turner", "email": "mattst88@gmail.com", "time": "Fri May 13 19:16:10 2011 -0400" }, "message": "alpha: convert to clocksource_register_hz\n\nConverts alpha to use clocksource_register_hz.\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCC: Richard Henderson \u003crth@twiddle.net\u003e\nCC: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Matt Turner \u003cmattst88@gmail.com\u003e\n" }, { "commit": "298eaaad0edc004912513d7b9e18163bc053539b", "tree": "9e0e6dd9c54e4af80b0c671de87a71d018f79c38", "parents": [ "cf70cc5b9d6a07d21ffd521aee690d26315d1bdf", "cb68552858c64db302771469b1202ea09e696329" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 15:20:51 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 15:20:51 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n bridge: fix forwarding of IPv6\n bonding,llc: Fix structure sizeof incompatibility for some PDUs\n ipv6: restore correct ECN handling on TCP xmit\n ne-h8300: Fix regression caused during net_device_ops conversion\n hydra: Fix regression caused during net_device_ops conversion\n zorro8390: Fix regression caused during net_device_ops conversion\n sfc: Always map MCDI shared memory as uncacheable\n ehea: Fix memory hotplug oops\n libertas: fix cmdpendingq locking\n iwlegacy: fix IBSS mode crashes\n ath9k: Fix a warning due to a queued work during S3 state\n mac80211: don\u0027t start the dynamic ps timer if not associated\n" }, { "commit": "cf70cc5b9d6a07d21ffd521aee690d26315d1bdf", "tree": "4804c11071e693eb5d66799bb8e05431f7905c84", "parents": [ "087fbc9962e10a65fb0b542ecfc116ebf6cf1735", "a75b9df9d3bfc3cd1083974c045ae31ce5f3434f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 15:19:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 15:19:39 2011 -0700" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n NFSv4.1: Ensure that layoutget uses the correct gfp modes\n NFSv4.1: remove pnfs_layout_hdr from pnfs_destroy_all_layouts tmp_list\n NFSv41: Resend on NFS4ERR_RETRY_UNCACHED_REP\n" }, { "commit": "1fec70932d867416ffe620dd17005f168cc84eb5", "tree": "921f08b555d2b71e7356034aae65bed4ed37e2df", "parents": [ "11f770027b5c0de16544f3ec82b5c6f9f8d5a644" ], "author": { "name": "Yehuda Sadeh", "email": "yehuda@hq.newdream.net", "time": "Fri May 13 13:52:56 2011 -0700" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Fri May 13 13:52:57 2011 -0700" }, "message": "rbd: fix split bio handling\n\nThe rbd driver currently splits bios when they span an object boundary.\nHowever, the blk_end_request expects the completions to roll up the results\nin block device order, and the split rbd/ceph ops can complete in any\norder. This patch adds a struct rbd_req_coll to track completion of split\nrequests and ensures that the results are passed back up to the block layer\nin order.\n\nThis fixes errors where the file system gets completion of a read operation\nthat spans an object boundary before the data has actually arrived. The\nbug is easily reproduced with iozone with a working set larger than\navailable RAM.\n\nReported-by: Fyodor Ustinov \u003cufm@ufm.su\u003e\nSigned-off-by: Yehuda Sadeh \u003cyehuda@hq.newdream.net\u003e\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "cb68552858c64db302771469b1202ea09e696329", "tree": "f7a5f943a151b0bcde920b9aad1938e245c7c5d0", "parents": [ "a10e14667635dde504ed9e7ee851494c2cf2ae8e" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri May 13 16:03:24 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 16:03:24 2011 -0400" }, "message": "bridge: fix forwarding of IPv6\n\nThe commit 6b1e960fdbd75dcd9bcc3ba5ff8898ff1ad30b6e\n bridge: Reset IPCB when entering IP stack on NF_FORWARD\nbroke forwarding of IPV6 packets in bridge because it would\ncall bp_parse_ip_options with an IPV6 packet.\n\nReported-by: Noah Meyerhans \u003cnoahm@debian.org\u003e\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "087fbc9962e10a65fb0b542ecfc116ebf6cf1735", "tree": "c6cedad81ecb0bbc87eab629349cd2dcad7bba82", "parents": [ "26cf46be954a2dd391d32eeaf7d07c3a953dcc5a" ], "author": { "name": "Andy Lutomirski", "email": "luto@mit.edu", "time": "Fri May 13 12:14:54 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 12:22:51 2011 -0700" }, "message": "drm/i915: Revert i915.semaphore\u003d1 default from i915 merge\n\nMy Q67 / i7-2600 box has rev09 Sandy Bridge graphics. It hangs\ninstantly when GNOME loads and it hangs so hard the reset button\ndoesn\u0027t work. Setting i915.semaphore\u003d0 fixes it.\n\nSemaphores were disabled in a1656b9090f7 (\"drm/i915: Disable GPU\nsemaphores by default\") in 2.6.38 but were then re-enabled (by mistake?)\nby the merge 47ae63e0c2e5 (\"Merge branch \u0027drm-intel-fixes\u0027 into\ndrm-intel-next\").\n\n(It\u0027s worth noting that the offending change is i915_drv.c, which was\nnot marked as a conflict - although a \u0027git show --cc\u0027 on the merge does\nshow that neither parent had it set to 1)\n\nSigned-off-by: Andy Lutomirski \u003cluto@mit.edu\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a10e14667635dde504ed9e7ee851494c2cf2ae8e", "tree": "bf5ad736713e1fcb80fadb05825184b44d50c87e", "parents": [ "ca06707022d6ba4744198a8ebbe4994786b0c613" ], "author": { "name": "Vitalii Demianets", "email": "vitas@nppfactor.kiev.ua", "time": "Thu May 12 23:04:29 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 15:13:24 2011 -0400" }, "message": "bonding,llc: Fix structure sizeof incompatibility for some PDUs\n\nWith some combinations of arch/compiler (e.g. arm-linux-gcc) the sizeof\noperator on structure returns value greater than expected. In cases when the\nstructure is used for mapping PDU fields it may lead to unexpected results\n(such as holes and alignment problems in skb data). __packed prevents this\nundesired behavior.\n\nSigned-off-by: Vitalii Demianets \u003cvitas@nppfactor.kiev.ua\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "26cf46be954a2dd391d32eeaf7d07c3a953dcc5a", "tree": "6445ebf0328e3227178f378c97be6b083cad087b", "parents": [ "47a150edc2ae734c0f4bf50aa19499e23b9a46f8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 11:51:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 11:51:01 2011 -0700" }, "message": "vfs: micro-optimize acl_permission_check()\n\nIt\u0027s a hot function, and we\u0027re better off not mixing types in the mask\ncalculations. The compiler just ends up mixing 16-bit and 32-bit\noperations, for no good reason.\n\nSo do everything in \u0027unsigned int\u0027 rather than mixing \u0027unsigned int\u0027\nmasking with a \u0027umode_t\u0027 (16-bit) mode variable.\n\nThis, together with the parent commit (47a150edc2ae: \"Cache user_ns in\nstruct cred\") makes acl_permission_check() much nicer.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "47a150edc2ae734c0f4bf50aa19499e23b9a46f8", "tree": "beeba9befd531285f663559a76f6f0f7378a6c2b", "parents": [ "381e7863d94891035a1a6b7836e9db72f9f1cba1" ], "author": { "name": "Serge E. Hallyn", "email": "serge.hallyn@canonical.com", "time": "Fri May 13 04:27:54 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 11:45:33 2011 -0700" }, "message": "Cache user_ns in struct cred\n\nIf !CONFIG_USERNS, have current_user_ns() defined to (\u0026init_user_ns).\n\nGet rid of _current_user_ns. This requires nsown_capable() to be\ndefined in capability.c rather than as static inline in capability.h,\nso do that.\n\nRequest_key needs init_user_ns defined at current_user_ns if\n!CONFIG_USERNS, so forward-declare that in cred.h if !CONFIG_USERNS\nat current_user_ns() define.\n\nCompile-tested with and without CONFIG_USERNS.\n\nSigned-off-by: Serge E. Hallyn \u003cserge.hallyn@canonical.com\u003e\n[ This makes a huge performance difference for acl_permission_check(),\n up to 30%. And that is one of the hottest kernel functions for loads\n that are pathname-lookup heavy. ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3a8ab79eae4500e6ac618a92a90cee63d6e804a8", "tree": "e102cd13d3376ad17edee00ee15b0b6a8aee9b64", "parents": [ "05fa7ea7d23980de0014417a0e0af2048a0f9fc1" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu May 12 21:15:15 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 13 16:16:36 2011 +1000" }, "message": "drm/radeon/kms: add some evergreen/ni safe regs\n\nneed to programmed from the userspace drivers.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "05fa7ea7d23980de0014417a0e0af2048a0f9fc1", "tree": "7b8d2727e7b142dd5e097a80ef7334a07b68a402", "parents": [ "d9282fca8a763be574a2fc20b2edcc6e132cbf90" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed May 11 14:02:07 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 13 16:16:33 2011 +1000" }, "message": "drm/radeon/kms: fix extended lvds info parsing\n\nOn rev \u003c\u003d 1.1 tables, the offset is absolute,\non newer tables, it\u0027s relative.\n\nFixes:\nhttps://bugzilla.redhat.com/show_bug.cgi?id\u003d700326\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d9282fca8a763be574a2fc20b2edcc6e132cbf90", "tree": "156d3546ff2e1ae53385b9f858a036502e9ce9bb", "parents": [ "ca1376d10810bc2c20c8d0821a9ee04ca2507c01" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed May 11 03:15:24 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 13 16:15:39 2011 +1000" }, "message": "drm/radeon/kms: fix tiling reg on fusion\n\nThe location of MC_ARB_RAMCFG changed on fusion.\nI\u0027ve diffed all the other regs in evergreend.h and this\nis the only other reg that changed.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "11f770027b5c0de16544f3ec82b5c6f9f8d5a644", "tree": "7a64ef3a9a47ddd19dd22d50059a266cf626ddee", "parents": [ "446cc6345d3de6571bdd0840f48aca441488a28d" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu May 12 16:13:54 2011 -0700" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu May 12 20:59:14 2011 -0700" }, "message": "rbd: fix leak of ops struct\n\nThe ops vector must be freed by the rbd_do_request caller.\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "381e7863d94891035a1a6b7836e9db72f9f1cba1", "tree": "e04c956c7bf479041d444ba0401402d90daccee9", "parents": [ "446cc6345d3de6571bdd0840f48aca441488a28d", "ca7d12000895ae5dfef8b8ff2648a0d50abd397c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 18:16:13 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 18:16:13 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:\n SELinux: delete debugging printks from filename_trans rule processing\n" }, { "commit": "446cc6345d3de6571bdd0840f48aca441488a28d", "tree": "d955f58d6895088dad9a45efcc78302d1d51511a", "parents": [ "9bbd055808248a7adc78161472d3301285252361", "1b0bcbcf62884959fa7214eb16c44cff445691c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 18:00:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 18:00:09 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:\n net/9p/protocol.c: Fix a memory leak\n" }, { "commit": "9bbd055808248a7adc78161472d3301285252361", "tree": "9278fd9cddaea9e5932ce6478242927098f6aeb6", "parents": [ "411f05f123cbd7f8aa1edcae86970755a6e2a9d9", "9ddabb055d73c63037878bb9346e52c7f2e07e96" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 16:55:33 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 16:55:33 2011 -0700" }, "message": "Merge branch \u0027for-2639-rc7/i2c-fixes\u0027 of git://git.fluff.org/bjdooks/linux\n\n* \u0027for-2639-rc7/i2c-fixes\u0027 of git://git.fluff.org/bjdooks/linux:\n i2c: pnx: Fix crash due to wrong init of timer-\u003edata\n" }, { "commit": "ca7d12000895ae5dfef8b8ff2648a0d50abd397c", "tree": "259fb1e473ef6129b9fa5faf771c9e811ab572c4", "parents": [ "411f05f123cbd7f8aa1edcae86970755a6e2a9d9", "93826c092c385549c04af184fbebd43f36995c69" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri May 13 09:52:16 2011 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri May 13 09:52:16 2011 +1000" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.infradead.org/users/eparis/selinux into for-linus\n" }, { "commit": "9ddabb055d73c63037878bb9346e52c7f2e07e96", "tree": "029448dcc4dbaabefe57dcf6b74bb467ee7b0405", "parents": [ "ca1376d10810bc2c20c8d0821a9ee04ca2507c01" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Fri Apr 29 15:30:02 2011 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Fri May 13 00:10:36 2011 +0100" }, "message": "i2c: pnx: Fix crash due to wrong init of timer-\u003edata\n\nalg_data is already a pointer which must be passed directly.\n\nReported-by: Dieter Ripp \u003cripp@systecnet.com\u003e\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Ben Dooks \u003cben-i2c@fluff.org\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "ca06707022d6ba4744198a8ebbe4994786b0c613", "tree": "829c4c904b4e3c21c9ae5dd05e5262cc430502c9", "parents": [ "2592a7354092afd304a8c067319b15ab1e441e35" ], "author": { "name": "Steinar H. Gunderson", "email": "sgunderson@bigfoot.com", "time": "Fri May 06 23:44:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 12 18:52:14 2011 -0400" }, "message": "ipv6: restore correct ECN handling on TCP xmit\n\nSince commit e9df2e8fd8fbc9 (Use appropriate sock tclass setting for\nrouting lookup) we lost ability to properly add ECN codemarks to ipv6\nTCP frames.\n\nIt seems like TCP_ECN_send() calls INET_ECN_xmit(), which only sets the\nECN bit in the IPv4 ToS field (inet_sk(sk)-\u003etos), but after the patch,\nwhat\u0027s checked is inet6_sk(sk)-\u003etclass, which is a completely different\nfield.\n\nClose bug https://bugzilla.kernel.org/show_bug.cgi?id\u003d34322\n\n[Eric Dumazet] : added the INET_ECN_dontxmit() fix and replace macros\nby inline functions for clarity.\n\nSigned-off-by: Steinar H. Gunderson \u003csgunderson@bigfoot.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "411f05f123cbd7f8aa1edcae86970755a6e2a9d9", "tree": "63fa10cd8d895c36bbbacd8c5b38b25e3e1f3448", "parents": [ "ca1376d10810bc2c20c8d0821a9ee04ca2507c01" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu May 12 23:00:28 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 15:18:16 2011 -0700" }, "message": "vsprintf: Turn kptr_restrict off by default\n\nkptr_restrict has been triggering bugs in apps such as perf, and it also makes\nthe system less useful by default, so turn it off by default.\n\nThis is how we generally handle security features that remove functionality,\nsuch as firewall code or SELinux - they have to be configured and activated\nfrom user-space.\n\nDistributions can turn kptr_restrict on again via this line in\n/etc/sysctrl.conf:\n\nkernel.kptr_restrict \u003d 1\n\n( Also mark the variable __read_mostly while at it, as it\u0027s typically modified\n only once per bootup, or not at all. )\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1b0bcbcf62884959fa7214eb16c44cff445691c6", "tree": "08d74d89ce863caec1536c3830168ed7a2d42817", "parents": [ "ca1376d10810bc2c20c8d0821a9ee04ca2507c01" ], "author": { "name": "Pedro Scarapicchia Junior", "email": "pedrinho.rep51@gmail.com", "time": "Mon May 09 14:10:49 2011 +0000" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Thu May 12 17:05:37 2011 -0500" }, "message": "net/9p/protocol.c: Fix a memory leak\n\nWhen p9pdu_readf() is called with \"s\" attribute, it allocates a pointer that\nwill store a string. In p9dirent_read(), this pointer is not being released,\nleading to out of memory errors.\nThis patch releases this pointer after string is copyed to dirent-\u003ed_name.\n\nSigned-off-by: Pedro Scarapicchia Junior \u003cpedro.scarapiccha@br.flextronics.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "2592a7354092afd304a8c067319b15ab1e441e35", "tree": "9f011e276c70fdac0368698b3e30edd31d5ea97b", "parents": [ "0b25e0157dfa236a0629c16c8ad6f222f633f682" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu May 12 09:11:40 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 12 16:59:57 2011 -0400" }, "message": "ne-h8300: Fix regression caused during net_device_ops conversion\n\nChangeset dcd39c90290297f6e6ed8a04bb20da7ac2b043c5 (\"ne-h8300: convert to\nnet_device_ops\") broke ne-h8300 by adding 8390.o to the link. That\nmeant that lib8390.c was included twice, once in ne-h8300.c and once in\n8390.c, subject to different macros. This patch reverts that by\navoiding the wrappers in 8390.c.\n\nFix based on commits 217cbfa856dc1cbc2890781626c4032d9e3ec59f (\"mac8390:\nfix regression caused during net_device_ops conversion\") and\n4e0168fa4842e27795a75b205a510f25b62181d9 (\"mac8390: fix build with\nNET_POLL_CONTROLLER\").\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0b25e0157dfa236a0629c16c8ad6f222f633f682", "tree": "310c0de8776d9809526aedf0d637f217d157d08a", "parents": [ "cf7e032fc87d59c475df26c4d40bf45d401b2adb" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu May 12 09:11:39 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 12 16:59:57 2011 -0400" }, "message": "hydra: Fix regression caused during net_device_ops conversion\n\nChangeset 5618f0d1193d6b051da9b59b0e32ad24397f06a4 (\"hydra: convert to\nnet_device_ops\") broke hydra by adding 8390.o to the link. That\nmeant that lib8390.c was included twice, once in hydra.c and once in\n8390.c, subject to different macros. This patch reverts that by\navoiding the wrappers in 8390.c.\n\nFix based on commits 217cbfa856dc1cbc2890781626c4032d9e3ec59f (\"mac8390:\nfix regression caused during net_device_ops conversion\") and\n4e0168fa4842e27795a75b205a510f25b62181d9 (\"mac8390: fix build with\nNET_POLL_CONTROLLER\").\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cf7e032fc87d59c475df26c4d40bf45d401b2adb", "tree": "31950f192e6c3bae94db497b97d43011461e2d80", "parents": [ "d44cf14ddf5a7e61d7acf13bc430111783d9c6aa" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu May 12 09:11:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 12 16:59:57 2011 -0400" }, "message": "zorro8390: Fix regression caused during net_device_ops conversion\n\nChangeset b6114794a1c394534659f4a17420e48cf23aa922 (\"zorro8390: convert to\nnet_device_ops\") broke zorro8390 by adding 8390.o to the link. That\nmeant that lib8390.c was included twice, once in zorro8390.c and once in\n8390.c, subject to different macros. This patch reverts that by\navoiding the wrappers in 8390.c.\n\nFix based on commits 217cbfa856dc1cbc2890781626c4032d9e3ec59f (\"mac8390:\nfix regression caused during net_device_ops conversion\") and\n4e0168fa4842e27795a75b205a510f25b62181d9 (\"mac8390: fix build with\nNET_POLL_CONTROLLER\").\n\nReported-by: Christian T. Steigies \u003ccts@debian.org\u003e\nSuggested-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nTested-by: Christian T. Steigies \u003ccts@debian.org\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d44cf14ddf5a7e61d7acf13bc430111783d9c6aa", "tree": "d2e3403e4ba51327b329e57124c3ec429dd89001", "parents": [ "21ccc7936dac5ca9b3e2838bbc112a60f34e18b3", "747df2258b1b9a2e25929ef496262c339c380009" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 12 16:26:45 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 12 16:26:45 2011 -0400" }, "message": "Merge branch \u0027sfc-2.6.39\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-2.6\n" }, { "commit": "93826c092c385549c04af184fbebd43f36995c69", "tree": "20f77a85a74a24ed3418da8818e12b439f70fc81", "parents": [ "bf69d41d198138e3c601e9a6645f4f1369aff7e0" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Thu Apr 07 14:46:59 2011 -0400" }, "committer": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Thu May 12 16:02:42 2011 -0400" }, "message": "SELinux: delete debugging printks from filename_trans rule processing\n\nThe filename_trans rule processing has some printk(KERN_ERR ) messages\nwhich were intended as debug aids in creating the code but weren\u0027t removed\nbefore it was submitted. Remove them.\n\nReported-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "ca1376d10810bc2c20c8d0821a9ee04ca2507c01", "tree": "5575a8dcce6d00ef702257cdb7027f603c4df3f7", "parents": [ "0c5e1577f1108e88475ca7b7ca75c411460173e1", "61bf35b9a3eab961ee1249467d9b2ac11d3c34c1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 12:41:30 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 12:41:30 2011 -0700" }, "message": "Merge branch \u0027fix/asoc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027fix/asoc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:\n ASoC: WM8903: Fix Digital Capture Volume range\n ASoC: UDA134x: Remove POWER_OFF_ON_STANDBY define.\n ASoC: SSM2602: Fix reg_cache_size\n ASoC: SSM2602: Fix \u0027Mic Boost2\u0027 control\n ASoC: SSM2602: Properly annotate i2c probe and remove functions\n ASoC: sst_platform: add hw_free callback to fix resource leak\n ASoC: Don\u0027t crash on PM operations\n ASoC: JZ4740: Fix i2s shutdown\n" }, { "commit": "0c5e1577f1108e88475ca7b7ca75c411460173e1", "tree": "d74285bb8d89c7c6d2d6896410fdcf57ff2a3b96", "parents": [ "982b2035d9d7033f63db187bac55e9d8998b0266", "53f8023febf9b3e18d8fb0d99c55010e473ce53d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 12:21:51 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 12:21:51 2011 -0700" }, "message": "Merge branch \u0027stable/bug-fixes-for-rc7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/bug-fixes-for-rc7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n x86/mm: Fix section mismatch derived from native_pagetable_reserve()\n x86,xen: introduce x86_init.mapping.pagetable_reserve\n Revert \"xen/mmu: Add workaround \"x86-64, mm: Put early page table high\"\"\n" }, { "commit": "982b2035d9d7033f63db187bac55e9d8998b0266", "tree": "2608ce34afd4f81e8c275a7617b7295c52b606f9", "parents": [ "df43938bc581f831b80b14ae249078e8da3d6ef5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 12:19:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 12:19:43 2011 -0700" }, "message": "Revert \"drm/i915: Only enable the plane after setting the fb base (pre-ILK)\"\n\nThis reverts commit 49183b2818de6899383bb82bc032f9344d6791ff.\n\nQuoth Franz Melchior:\n\n \"This patch introduces a bug on my infamous \"Acer Travelmate\n 5735Z-452G32Mnss\": when KMS takes over, the frame buffer contents get\n completely garbled up on screen, with colored stripes and unreadable\n text (photo on request). Only when X11 is started, the screen gets\n restored again. Closing and re-opening the lid partly cures the\n mess, too: it makes the font readable, though horizontally stretched.\"\n\nAcked-by: Keith Packard \u003ckeithp@keithp.com\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "df43938bc581f831b80b14ae249078e8da3d6ef5", "tree": "544a9ae62e208a70cca56b5e3cb724b798eec681", "parents": [ "49f019c188aa1e0ed5c8cffbcc5533dfb0e732dd", "c47747fde931c02455683bd00ea43eaa62f35b0e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 10:42:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 10:42:36 2011 -0700" }, "message": "Merge branch \u0027fbmem\u0027\n\n* fbmem:\n fbmem: make read/write/ioctl use the frame buffer at open time\n fbcon: add lifetime refcount to opened frame buffers\n" }, { "commit": "49f019c188aa1e0ed5c8cffbcc5533dfb0e732dd", "tree": "4d60206230d1eb9182f1f565309cc90c6454c404", "parents": [ "6eaed0a438ef554a282210a04da0de27b671d817", "28350e330cfab46b60a1dbf763b678d859f9f3d9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 10:41:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 10:41:31 2011 -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: ads7846 - remove unused variable from struct ads7845_ser_req\n Input: ads7846 - make transfer buffers DMA safe\n" }, { "commit": "53f8023febf9b3e18d8fb0d99c55010e473ce53d", "tree": "cd61833a85a6bc6e446c7300435d05181d7cc7fa", "parents": [ "279b706bf800b5967037f492dbe4fc5081ad5d0f" ], "author": { "name": "Sedat Dilek", "email": "sedat.dilek@gmail.com", "time": "Sun Apr 17 16:17:34 2011 +0200" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu May 12 13:05:05 2011 -0400" }, "message": "x86/mm: Fix section mismatch derived from native_pagetable_reserve()\n\nWith CONFIG_DEBUG_SECTION_MISMATCH\u003dy I see these warnings in next-20110415:\n\n LD vmlinux.o\n MODPOST vmlinux.o\nWARNING: vmlinux.o(.text+0x1ba48): Section mismatch in reference from the function native_pagetable_reserve() to the function .init.text:memblock_x86_reserve_range()\nThe function native_pagetable_reserve() references\nthe function __init memblock_x86_reserve_range().\nThis is often because native_pagetable_reserve lacks a __init\nannotation or the annotation of memblock_x86_reserve_range is wrong.\n\nThis patch fixes the issue.\nThanks to pipacs from PaX project for help on IRC.\n\nAcked-by: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: Sedat Dilek \u003csedat.dilek@gmail.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "279b706bf800b5967037f492dbe4fc5081ad5d0f", "tree": "608b9455cd6af84018bd5096b45e0ca90f9c7619", "parents": [ "92bdaef7b2c5d3cb8abc902faa1f7670a183dcdc" ], "author": { "name": "Stefano Stabellini", "email": "stefano.stabellini@eu.citrix.com", "time": "Thu Apr 14 15:49:41 2011 +0100" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu May 12 13:05:04 2011 -0400" }, "message": "x86,xen: introduce x86_init.mapping.pagetable_reserve\n\nIntroduce a new x86_init hook called pagetable_reserve that at the end\nof init_memory_mapping is used to reserve a range of memory addresses for\nthe kernel pagetable pages we used and free the other ones.\n\nOn native it just calls memblock_x86_reserve_range while on xen it also\ntakes care of setting the spare memory previously allocated\nfor kernel pagetable pages from RO to RW, so that it can be used for\nother purposes.\n\nA detailed explanation of the reason why this hook is needed follows.\n\nAs a consequence of the commit:\n\ncommit 4b239f458c229de044d6905c2b0f9fe16ed9e01e\nAuthor: Yinghai Lu \u003cyinghai@kernel.org\u003e\nDate: Fri Dec 17 16:58:28 2010 -0800\n\n x86-64, mm: Put early page table high\n\nat some point init_memory_mapping is going to reach the pagetable pages\narea and map those pages too (mapping them as normal memory that falls\nin the range of addresses passed to init_memory_mapping as argument).\nSome of those pages are already pagetable pages (they are in the range\npgt_buf_start-pgt_buf_end) therefore they are going to be mapped RO and\neverything is fine.\nSome of these pages are not pagetable pages yet (they fall in the range\npgt_buf_end-pgt_buf_top; for example the page at pgt_buf_end) so they\nare going to be mapped RW. When these pages become pagetable pages and\nare hooked into the pagetable, xen will find that the guest has already\na RW mapping of them somewhere and fail the operation.\nThe reason Xen requires pagetables to be RO is that the hypervisor needs\nto verify that the pagetables are valid before using them. The validation\noperations are called \"pinning\" (more details in arch/x86/xen/mmu.c).\n\nIn order to fix the issue we mark all the pages in the entire range\npgt_buf_start-pgt_buf_top as RO, however when the pagetable allocation\nis completed only the range pgt_buf_start-pgt_buf_end is reserved by\ninit_memory_mapping. Hence the kernel is going to crash as soon as one\nof the pages in the range pgt_buf_end-pgt_buf_top is reused (b/c those\nranges are RO).\n\nFor this reason we need a hook to reserve the kernel pagetable pages we\nused and free the other ones so that they can be reused for other\npurposes.\nOn native it just means calling memblock_x86_reserve_range, on Xen it\nalso means marking RW the pagetable pages that we allocated before but\nthat haven\u0027t been used before.\n\nAnother way to fix this is without using the hook is by adding a \u0027if\n(xen_pv_domain)\u0027 in the \u0027init_memory_mapping\u0027 code and calling the Xen\ncounterpart, but that is just nasty.\n\nSigned-off-by: Stefano Stabellini \u003cstefano.stabellini@eu.citrix.com\u003e\nAcked-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nAcked-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "92bdaef7b2c5d3cb8abc902faa1f7670a183dcdc", "tree": "1d1a363bd03415a2c5e5ee7f597d2128578e3b72", "parents": [ "0ee5623f9a6e52df90a78bd21179f8ab370e102e" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu May 05 13:50:43 2011 -0400" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu May 12 13:04:29 2011 -0400" }, "message": "Revert \"xen/mmu: Add workaround \"x86-64, mm: Put early page table high\"\"\n\nThis reverts commit a38647837a411f7df79623128421eef2118b5884.\n\nIt does not work with certain AMD machines.\n\nlast_pfn \u003d 0x100000 max_arch_pfn \u003d 0x400000000\ninitial memory mapped : 0 - 02c3a000\nBase memory trampoline at [ffff88000009b000] 9b000 size 20480\ninit_memory_mapping: 0000000000000000-0000000100000000\n 0000000000 - 0100000000 page 4k\nkernel direct mapping tables up to 100000000 @ ff7fb000-100000000\ninit_memory_mapping: 0000000100000000-00000001e0800000\n 0100000000 - 01e0800000 page 4k\nkernel direct mapping tables up to 1e0800000 @ 1df0f3000-1e0000000\nxen: setting RW the range fffdc000 - 100000000\nRAMDISK: 0203b000 - 02c3a000\nNo NUMA configuration found\nFaking a node at 0000000000000000-00000001e0800000\nNUMA: Using 63 for the hash shift.\nInitmem setup node 0 0000000000000000-00000001e0800000\n NODE_DATA [00000001dfffb000 - 00000001dfffffff]\nBUG: unable to handle kernel NULL pointer dereference at (null)\nIP: [\u003cffffffff81cf6a75\u003e] setup_node_bootmem+0x18a/0x1ea\nPGD 0\nOops: 0003 [#1] SMP\nlast sysfs file:\nCPU 0\nModules linked in:\n\nPid: 0, comm: swapper Not tainted 2.6.39-0-virtual #6~smb1\nRIP: e030:[\u003cffffffff81cf6a75\u003e] [\u003cffffffff81cf6a75\u003e] setup_node_bootmem+0x18a/0x1ea\nRSP: e02b:ffffffff81c01e38 EFLAGS: 00010046\nRAX: 0000000000000000 RBX: 00000001e0800000 RCX: 0000000000001040\nRDX: 0000000000004100 RSI: 0000000000000000 RDI: ffff8801dfffb000\nRBP: ffffffff81c01e58 R08: 0000000000000020 R09: 0000000000000000\nR10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000000\nR13: 0000000000000000 R14: 0000000000000000 R15: 0000000000bfe400\nFS: 0000000000000000(0000) GS:ffffffff81cca000(0000) knlGS:0000000000000000\nCS: e033 DS: 0000 ES: 0000 CR0: 0000000080050033\nCR2: 0000000000000000 CR3: 0000000001c03000 CR4: 0000000000000660\nDR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\nDR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\nProcess swapper (pid: 0, threadinfo ffffffff81c00000, task ffffffff81c0b020)\nStack:\n 0000000000000040 0000000000000001 0000000000000000 ffffffffffffffff\n ffffffff81c01e88 ffffffff81cf6c25 0000000000000000 0000000000000000\n ffffffff81cf687f 0000000000000000 ffffffff81c01ea8 ffffffff81cf6e45\nCall Trace:\n [\u003cffffffff81cf6c25\u003e] numa_register_memblks.constprop.3+0x150/0x181\n [\u003cffffffff81cf687f\u003e] ? numa_add_memblk+0x7c/0x7c\n [\u003cffffffff81cf6e45\u003e] numa_init.part.2+0x1c/0x7c\n [\u003cffffffff81cf687f\u003e] ? numa_add_memblk+0x7c/0x7c\n [\u003cffffffff81cf6f67\u003e] numa_init+0x6c/0x70\n [\u003cffffffff81cf7057\u003e] initmem_init+0x39/0x3b\n [\u003cffffffff81ce5865\u003e] setup_arch+0x64e/0x769\n [\u003cffffffff815e43c1\u003e] ? printk+0x51/0x53\n [\u003cffffffff81cdf92b\u003e] start_kernel+0xd4/0x3f3\n [\u003cffffffff81cdf388\u003e] x86_64_start_reservations+0x132/0x136\n [\u003cffffffff81ce2ed4\u003e] xen_start_kernel+0x588/0x58f\nCode: 41 00 00 48 8b 3c c5 a0 24 cc 81 31 c0 40 f6 c7 01 74 05 aa 66 ba ff 40 40 f6 c7 02 74 05 66 ab 83 ea 02 89 d1 c1 e9 02 f6 c2 02 \u003cf3\u003e ab 74 02 66 ab 80 e2 01 74 01 aa 49 63 c4 48 c1 eb 0c 44 89\nRIP [\u003cffffffff81cf6a75\u003e] setup_node_bootmem+0x18a/0x1ea\n RSP \u003cffffffff81c01e38\u003e\nCR2: 0000000000000000\n---[ end trace a7919e7f17c0a725 ]---\nKernel panic - not syncing: Attempted to kill the idle task!\nPid: 0, comm: swapper Tainted: G D 2.6.39-0-virtual #6~smb1\n\nReported-by: Stefan Bader \u003cstefan.bader@canonical.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "6eaed0a438ef554a282210a04da0de27b671d817", "tree": "d0caf299ebcdac32fad8ab1baa7957e44655d1eb", "parents": [ "8043f4eb85bf772e3af82678657019937388b6e1", "d24339059d640f108c08ba99ef30e3bafa10f8e4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 08:06:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 08:06:53 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:\n fuse: fix oops in revalidate when called with NULL nameidata\n" }, { "commit": "8043f4eb85bf772e3af82678657019937388b6e1", "tree": "a30b4fd36f31dcc306c2dca8962e4f5656a04575", "parents": [ "75c0b3b466388f2fad60fda57b6ca2c4fabbcaf7", "b1054282d752c5a026e2c0450616ebf37fc0413e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 07:53:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 07:53:34 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sparc32: Fixed unaligned memory copying in function __csum_partial_copy_sparc_generic\n sparc32: fix sparcstation 5 boot\n sparc32: fix section mismatch warnings in apc, pmc and time_32\n" }, { "commit": "75c0b3b466388f2fad60fda57b6ca2c4fabbcaf7", "tree": "11de004529d01abded73a9392715baebab2e2a6d", "parents": [ "3568bd9720b4a775f28a718fcbb462ce2f386988", "a904f5f9eb7a55baacb2f4c1423cac8a8eb78a3a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 07:53:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 07:53:06 2011 -0700" }, "message": "Merge branch \u0027fixes\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027fixes\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: 6870/1: The mandatory barrier rmb() must be a dsb() in for device accesses\n ARM: 6892/1: handle ptrace requests to change PC during interrupted system calls\n ARM: 6890/1: memmap: only free allocated memmap entries when using SPARSEMEM\n ARM: zImage: the page table memory must be considered before relocation\n ARM: zImage: make sure not to relocate on top of the relocation code\n ARM: zImage: Fix bad SP address after relocating kernel\n ARM: zImage: make sure the stack is 64-bit aligned\n ARM: RiscPC: acornfb: fix section mismatches\n ARM: RiscPC: etherh: fix section mismatches\n" }, { "commit": "c47747fde931c02455683bd00ea43eaa62f35b0e", "tree": "a98fbf2b466cabbc71a685a24496e08e074ecfb2", "parents": [ "698b368275c3fa98261159253cfc79653f9dffc6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 11 14:58:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 07:46:43 2011 -0700" }, "message": "fbmem: make read/write/ioctl use the frame buffer at open time\n\nread/write/ioctl on a fbcon file descriptor has traditionally used the\nfbcon not when it was opened, but as it was at the time of the call.\nThat makes no sense, but the lack of sense is much more obvious now that\nwe properly ref-count the usage - it means that the ref-counting doesn\u0027t\nactually protect operations we do on the frame buffer.\n\nThis changes it to look at the fb_info that we got at open time, but in\norder to avoid using a frame buffer long after it has been unregistered,\nwe do verify that it is still current, and return -ENODEV if not.\n\nAcked-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nTested-by: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nTested-by: Anca Emanuel \u003canca.emanuel@gmail.com\u003e\nCc: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: Andy Whitcroft \u003candy.whitcroft@canonical.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "698b368275c3fa98261159253cfc79653f9dffc6", "tree": "b92c921fe6522ece33fbbde33cc173c9dd32d9a2", "parents": [ "9f381a61f58bb6487c93ce2233bb9992f8ea9211" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 11 14:49:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 07:37:51 2011 -0700" }, "message": "fbcon: add lifetime refcount to opened frame buffers\n\nThis just adds the refcount and the new registration lock logic. It\ndoes not (for example) actually change the read/write/ioctl routines to\nactually use the frame buffer that was opened: those function still end\nup alway susing whatever the current frame buffer is at the time of the\ncall.\n\nWithout this, if something holds the frame buffer open over a\nframebuffer switch, the close() operation after the switch will access a\nfb_info that has been free\u0027d by the unregistering of the old frame\nbuffer.\n\n(The read/write/ioctl operations will normally not cause problems,\nbecause they will - illogically - pick up the new fbcon instead. But a\nswitch that happens just as one of those is going on might see problems\ntoo, the window is just much smaller: one individual op rather than the\nwhole open-close sequence.)\n\nThis use-after-free is apparently fairly easily triggered by the Ubuntu\n11.04 boot sequence.\n\nAcked-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nTested-by: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nTested-by: Anca Emanuel \u003canca.emanuel@gmail.com\u003e\nCc: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: Andy Whitcroft \u003candy.whitcroft@canonical.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "747df2258b1b9a2e25929ef496262c339c380009", "tree": "7f0ff222afed691599f24473e0b8d10b36f48cf2", "parents": [ "ff538818f4a82c4cf02d2d6bd6ac5c7360b9d41d" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Wed May 11 17:41:18 2011 +0100" }, "committer": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu May 12 15:16:32 2011 +0100" }, "message": "sfc: Always map MCDI shared memory as uncacheable\n\nWe enabled write-combining for memory-mapped registers in commit\n65f0b417dee94f779ce9b77102b7d73c93723b39, but inhibited it for the\nMCDI shared memory where this is not supported. However,\nwrite-combining mappings also allow read-reordering, which may also\nbe a problem.\n\nI found that when an SFC9000-family controller is connected to an\nIntel 3000 chipset, and write-combining is enabled, the controller\nstops responding to PCIe read requests during driver initialisation\nwhile the driver is polling for completion of an MCDI command. This\nresults in an NMI and system hang. Adding read memory barriers\nbetween all reads to the shared memory area appears to reduce but not\neliminate the probability of this.\n\nWe have not yet established whether this is a bug in our BIU or in the\nPCIe bridge. For now, work around by mapping the shared memory area\nseparately.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\n" }, { "commit": "a904f5f9eb7a55baacb2f4c1423cac8a8eb78a3a", "tree": "d3ada07264a900601f8e610f9270b5319a6631d4", "parents": [ "2af68df02fe5ccd644f4312ba2401996f52faab3" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Wed Apr 06 16:18:47 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu May 12 10:52:00 2011 +0100" }, "message": "ARM: 6870/1: The mandatory barrier rmb() must be a dsb() in for device accesses\n\nSince mandatory barriers may be used (explicitly or implicitly via readl\netc.) to ensure the ordering between Device and Normal memory accesses,\na DMB is not enough. This patch converts it to a DSB.\n\nCc: Colin Cross \u003cccross@android.com\u003e\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "2af68df02fe5ccd644f4312ba2401996f52faab3", "tree": "b881d8561a1d1831f45b4a40b7351e72dfa48110", "parents": [ "9af386c8dc5a9dce56f36b484647ad6401758c85" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue May 03 18:32:55 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu May 12 10:52:00 2011 +0100" }, "message": "ARM: 6892/1: handle ptrace requests to change PC during interrupted system calls\n\nGDB\u0027s interrupt.exp test cases currenly fail on ARM. The problem is how do_signal\nhandled restarting interrupted system calls:\n\nThe entry.S assembler code determines that we come from a system call; and that\ninformation is passed as \"syscall\" parameter to do_signal. That routine then\ncalls get_signal_to_deliver [*] and if a signal is to be delivered, calls into\nhandle_signal. If a system call is to be restarted either after the signal\nhandler returns, or if no handler is to be called in the first place, the PC\nis updated after the get_signal_to_deliver call, either in handle_signal (if\nwe have a handler) or at the end of do_signal (otherwise).\n\nNow the problem is that during [*], the call to get_signal_to_deliver, a ptrace\nintercept may happen. During this intercept, the debugger may change registers,\nincluding the PC. This is done by GDB if it wants to execute an \"inferior call\",\ni.e. the execution of some code in the debugged program triggered by GDB.\n\nTo this purpose, GDB will save all registers, allocate a stack frame, set up\nPC and arguments as appropriate for the call, and point the link register to\na dummy breakpoint instruction. Once the process is restarted, it will execute\nthe call and then trap back to the debugger, at which point GDB will restore\nall registers and continue original execution.\n\nThis generally works fine. However, now consider what happens when GDB attempts\nto do exactly that while the process was interrupted during execution of a to-be-\nrestarted system call: do_signal is called with the syscall flag set; it calls\nget_signal_to_deliver, at which point the debugger takes over and changes the PC\nto point to a completely different place. Now get_signal_to_deliver returns\nwithout a signal to deliver; but now do_signal decides it should be restarting\na system call, and decrements the PC by 2 or 4 -- so it now points to 2 or 4\nbytes before the function GDB wants to call -- which leads to a subsequent crash.\n\nTo fix this problem, two things need to be supported:\n- do_signal must be able to recognize that get_signal_to_deliver changed the PC\n to a different location, and skip the restart-syscall sequence\n- once the debugger has restored all registers at the end of the inferior call\n sequence, do_signal must recognize that *now* it needs to restart the pending\n system call, even though it was now entered from a breakpoint instead of an\n actual svc instruction\n\nThis set of issues is solved on other platforms, usually by one of two\nmechanisms:\n\n- The status information \"do_signal is handling a system call that may need\n restarting\" is itself carried in some register that can be accessed via\n ptrace. This is e.g. on Intel the \"orig_eax\" register; on Sparc the kernel\n defines a magic extra bit in the flags register for this purpose.\n This allows GDB to manage that state: reset it when doing an inferior call,\n and restore it after the call is finished.\n\n- On s390, do_signal transparently handles this problem without requiring\n GDB interaction, by performing system call restarting in the following\n way: first, adjust the PC as necessary for restarting the call. Then,\n call get_signal_to_deliver; and finally just continue execution at the\n PC. This way, if GDB does not change the PC, everything is as before.\n If GDB *does* change the PC, execution will simply continue there --\n and once GDB restores the PC it saved at that point, it will automatically\n point to the *restarted* system call. (There is the minor twist how to\n handle system calls that do *not* need restarting -- do_signal will undo\n the PC change in this case, after get_signal_to_deliver has returned, and\n only if ptrace did not change the PC during that call.)\n\nBecause there does not appear to be any obvious register to carry the\nsyscall-restart information on ARM, we\u0027d either have to introduce a new\nartificial ptrace register just for that purpose, or else handle the issue\ntransparently like on s390. The patch below implements the second option;\nusing this patch makes the interrupt.exp test cases pass on ARM, with no\nregression in the GDB test suite otherwise.\n\nCc: patches@linaro.org\nSigned-off-by: Ulrich Weigand \u003culrich.weigand@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd.bergmann@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "9af386c8dc5a9dce56f36b484647ad6401758c85", "tree": "b884faac285aeb76c07f73e118ef29ce94cd7156", "parents": [ "362607df9faa01fea6ae437b1a50645f33f393c0" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Thu Apr 28 18:44:31 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu May 12 10:52:00 2011 +0100" }, "message": "ARM: 6890/1: memmap: only free allocated memmap entries when using SPARSEMEM\n\nThe SPARSEMEM code allocates memmap entries only for sections which are\npresent (i.e. those which contain some valid memory). The membank checks\nin free_unused_memmap do not take this into account and can incorrectly\nattempt to free memory which is not allocated, resulting in a BUG() in\nthe bootmem code.\n\nHowever, if memory is configured as follows:\n\n |\u003c----section----\u003e|\u003c----hole----\u003e|\u003c----section----\u003e|\n +--------+--------+--------------+--------+--------+\n | bank 0 | unused | | bank 1 | unused |\n +--------+--------+--------------+--------+--------+\n\nwhere a bank only occupies part of a section, the memmap allocated for\nthe remainder of the section *can* be freed.\n\nThis patch modifies the checks in free_unused_memmap so that only valid\nmemmap entries are considered for removal.\n\nAcked-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "b1054282d752c5a026e2c0450616ebf37fc0413e", "tree": "d88dcef782fc8e33674109c5c82fb37f2829abdc", "parents": [ "f486b3dc2d048e7309a733f97eb9f9f83d586df2" ], "author": { "name": "Tkhai Kirill", "email": "tkhai@yandex.ru", "time": "Tue May 10 02:31:41 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 11 21:35:04 2011 -0700" }, "message": "sparc32: Fixed unaligned memory copying in function __csum_partial_copy_sparc_generic\n\nWhen we are in the label cc_dword_align, registers %o0 and %o1 have the same last 2 bits,\nbut it\u0027s not guaranteed one of them is zero. So we can get unaligned memory access\nin label ccte. Example of parameters which lead to this:\n%o0\u003d0x7ff183e9, %o1\u003d0x8e709e7d, %g1\u003d3\n\nWith the parameters I had a memory corruption, when the additional 5 bytes were rewritten.\nThis patch corrects the error.\n\nOne comment to the patch. We don\u0027t care about the third bit in %o1, because cc_end_cruft\nstores word or less.\n\nSigned-off-by: Tkhai Kirill \u003ctkhai@yandex.ru\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "21ccc7936dac5ca9b3e2838bbc112a60f34e18b3", "tree": "b711735fea08bb340517a75e81ef6e422a7ab791", "parents": [ "78d41b35a9570b7a9a45686789df5dfaeb2b7f4c" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Tue May 10 16:17:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 12 00:09:34 2011 -0400" }, "message": "ehea: Fix memory hotplug oops\n\nThe ehea driver oopses during memory hotplug if the ports are not\nup. A simple testcase:\n\n# ifconfig ethX down\n# echo offline \u003e /sys/devices/system/memory/memory32/state\n\nOops: Kernel access of bad area, sig: 11 [#1]\nlast sysfs file: /sys/devices/system/memory/memory32/state\nREGS: c000000709393110 TRAP: 0300 Not tainted (2.6.39-rc2-01385-g7ef73bc-dirty)\nDAR: 0000000000000000, DSISR: 40000000\n...\nNIP [c000000000067c98] .__wake_up_common+0x48/0xf0\nLR [c00000000006d034] .__wake_up+0x54/0x90\nCall Trace:\n[c00000000006d034] .__wake_up+0x54/0x90\n[d000000006bb6270] .ehea_rereg_mrs+0x140/0x730 [ehea]\n[d000000006bb69c4] .ehea_mem_notifier+0x164/0x170 [ehea]\n[c0000000006fc8a8] .notifier_call_chain+0x78/0xf0\n[c0000000000b3d70] .__blocking_notifier_call_chain+0x70/0xb0\n[c000000000458d78] .memory_notify+0x28/0x40\n[c0000000001871d8] .remove_memory+0x208/0x6d0\n[c000000000458264] .memory_section_action+0x94/0x140\n[c0000000004583ec] .memory_block_change_state+0xdc/0x1d0\n[c0000000004585cc] .store_mem_state+0xec/0x160\n[c00000000044768c] .sysdev_store+0x3c/0x50\n[c00000000020b48c] .sysfs_write_file+0xec/0x1f0\n[c00000000018f86c] .vfs_write+0xec/0x1e0\n[c00000000018fa88] .SyS_write+0x58/0xd0\n\nTo fix this, initialise the waitqueues during port probe instead\nof port open.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nCc: stable@kernel.org\nAcked-by: Breno Leitao \u003cleitao@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "a75b9df9d3bfc3cd1083974c045ae31ce5f3434f" }