)]}' { "log": [ { "commit": "c49b85db0baedf56bf784462f9a44038253fc44a", "tree": "74ec11f46c618d5f661fea2d34115426e570db3d", "parents": [ "6d6ff5e495a12895b5b4a37eb3049fda560c693a" ], "author": { "name": "Ben Romberger", "email": "bromberg@codeaurora.org", "time": "Fri Jul 15 18:55:34 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:26:11 2011 -0700" }, "message": "msm: audio: qdsp6v2: Support for RX \u0026 TX ADM topology\n\nThis adds support to store separate RX \u0026 TX topology for\nthe audio device manager (ADM).\n\nSigned-off-by: Ben Romberger \u003cbromberg@codeaurora.org\u003e\n" }, { "commit": "229c6a5dc09fa4981088ffe4929f1bcb3ce70e37", "tree": "01f2240cc09183b6a562253b2406e029db12fb24", "parents": [ "a21d6bc64b41a8eaa61a7822a255c8910bf113f4" ], "author": { "name": "Bradley Rubin", "email": "brubin@codeaurora.org", "time": "Tue Jul 12 16:18:48 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:26:06 2011 -0700" }, "message": "ASoC: WCD9310: Add Active Noise Cancellation support\n\nANC is a feature which reduces noise on the near-end\nby pushing anti-noise onto the audio stream heard\nby the user. ANC mixes the anti-noise signal\ninside of the WCD9310 codec.\n\nSigned-off-by: Brad Rubin \u003cbrubin@codeaurora.org\u003e\n" }, { "commit": "5cd33b37653f4c32b9d8e992bab5938c37eae130", "tree": "1576740c74ae4192ace8f8131ab9e6b504d3fd67", "parents": [ "a5ee43644bcdcae9146349ba5163d991cfca1324" ], "author": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Mon Jul 18 18:07:10 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:25:50 2011 -0700" }, "message": "mm: ashmem: Add cache clean and invalidate ioctls for ashmem\n\nCRs-fixed: 291124\nSigned-off-by: Shubhraprakash Das \u003csadas@codeaurora.org\u003e\n" }, { "commit": "7f12ebf6a27f4b892ee5729d574d71a2a8b4bed3", "tree": "375714c4acb4a984ebeef5114de68321425aca8f", "parents": [ "fd915311da98b8fd1b13d7b9cd3f23744c3720cb" ], "author": { "name": "Lucille Sylvester", "email": "lsylvest@codeaurora.org", "time": "Mon Jul 18 17:14:39 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:25:45 2011 -0700" }, "message": "msm: kgsl: Remove unused variable w/ unneeded ifdef\n\nThis variable/ifdef should have been removed in a prior change.\n\nSigned-off-by: Lucille Sylvester \u003clsylvest@codeaurora.org\u003e\n" }, { "commit": "57390b03ac1e24045fe4b056d84c091a0ee1e0d9", "tree": "b848e945cce04cdfd9e9d48e494c7b428d4748bb", "parents": [ "0e468741095d4669b8716aa22c46d71fa64a6574" ], "author": { "name": "Abhijeet Dharmapurikar", "email": "adharmap@codeaurora.org", "time": "Thu Jul 14 18:05:11 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:25:43 2011 -0700" }, "message": "power: msm_charger: control system power\n\nSome chargers can control their current supply for the system. Provide\nfacility in the msm_charger to choose which charger supplies system\ncurrent. It is guaranteed that start charging will always be called\non a charger that has been previously been asked to provide system\ncurrent.\n\nSigned-off-by: Abhijeet Dharmapurikar \u003cadharmap@codeaurora.org\u003e\n" }, { "commit": "79c87bf556445f1d2b12f0898d9cb125e10f7631", "tree": "376621e156b4cb38b7add6117cd852da89d62c3c", "parents": [ "ebca0c796cb22947a224c1afea9b7950886804e1" ], "author": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Fri Jul 15 14:05:57 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:59:11 2011 -0700" }, "message": "Kbuild: Export ashmem header file to user space\n\nCRs-fixed: 291124\nSigned-off-by: Shubhraprakash Das \u003csadas@codeaurora.org\u003e\n" }, { "commit": "4d1ab557f03730771215020fc1e34b26dc26604b", "tree": "ce94f35a3690a6b94489188f81cd72bb77d37346", "parents": [ "ba345d5b6851c99cf58d90d7212f80c7924f416b" ], "author": { "name": "Ashay Jaiswal", "email": "ashayj@codeaurora.org", "time": "Fri Jul 15 11:30:49 2011 +0530" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:59:08 2011 -0700" }, "message": "drivers: rtc-pm8058: Fix automatic wakeup of APPS due to RTC alarm.\n\nAlarm interrupt causes automatic wakeup even when the phone is in\npowerdown state.\n\nCRs-Fixed: 286086\nSigned-off-by: Ashay Jaiswal \u003cashayj@codeaurora.org\u003e\n" }, { "commit": "52344ac5845edcc6ccc016ce1f07f61553ba2cad", "tree": "4ffc2e17db9be349bd9f190459ca025151e65fe7", "parents": [ "2fb6f08e5055df5d5b367e9b2c06025ab78d058a" ], "author": { "name": "Abhijeet Dharmapurikar", "email": "adharmap@codeaurora.org", "time": "Tue Jul 05 18:44:54 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:59:06 2011 -0700" }, "message": "power: pm8921-bms: add nano-doc comments to exported functions\n\nSigned-off-by: Abhijeet Dharmapurikar \u003cadharmap@codeaurora.org\u003e\n" }, { "commit": "2fb6f08e5055df5d5b367e9b2c06025ab78d058a", "tree": "33e74191a0351d5d4f9414205cc2dcae857591dc", "parents": [ "4c0d304651615fb084526704703201617d81cccd" ], "author": { "name": "Abhijeet Dharmapurikar", "email": "adharmap@codeaurora.org", "time": "Tue Jun 28 17:10:27 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:59:06 2011 -0700" }, "message": "power: pm8921-bms: Add api to read Vsense\n\nThe Rsense resistor connects between the -ve end of the battery\nand GND. The voltage across the Rsense gives us a good indication\nof the current flowing through the battery.\n\nSigned-off-by: Abhijeet Dharmapurikar \u003cadharmap@codeaurora.org\u003e\n" }, { "commit": "c448d98e7e2eceea73477e28ee75ed23b00ff3dc", "tree": "4b81a36d6346bafda3f78e487c6791d2b4ffc126", "parents": [ "814e6171ab7a99fdcb2207b5c0c96dab4b3a3f2b" ], "author": { "name": "Abhijeet Dharmapurikar", "email": "adharmap@codeaurora.org", "time": "Tue Jun 28 20:48:36 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:59:00 2011 -0700" }, "message": "power: pm8921-bms: read temperature and voltage via adc\n\nRead the battery temeperature and voltage from the adc driver instead\nof hard coding them in the driver.\n\nIn the charing began and charing end functions, use\npm8921_bms_get_percent_charge api. This prevents duplicating calling\nthe adc functions.\n\nSigned-off-by: Abhijeet Dharmapurikar \u003cadharmap@codeaurora.org\u003e\n" }, { "commit": "7429cea50e3a0020a1bf0a6e9d596ebe2d3aba40", "tree": "ff1d279b5ffdf7bc0ce8c76260e9e779adce2252", "parents": [ "15187778e4af8e8f675639dbc8c942aab3658f20" ], "author": { "name": "Larry Bassel", "email": "lbassel@codeaurora.org", "time": "Fri Jul 08 15:08:58 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:58:55 2011 -0700" }, "message": "pmem: remove support for unstable PMEM devices\n\nThis functionality has never been used, is ugly and\ncomplicates the DMM design.\n\nSigned-off-by: Larry Bassel \u003clbassel@codeaurora.org\u003e\n" }, { "commit": "15187778e4af8e8f675639dbc8c942aab3658f20", "tree": "1a3f247e47442a1a6bc4cc878c86c4c6ab31c57f", "parents": [ "b19046ab42aa41bbbdd822c6e67df9ebfc8c6b2f" ], "author": { "name": "Anirudh Ghayal", "email": "aghayal@codeaurora.org", "time": "Wed Jun 22 17:39:41 2011 +0530" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:58:24 2011 -0700" }, "message": "input: touchscreen: Move power mode handling to platform data\n\nSigned-off-by: Anirudh Ghayal \u003caghayal@codeaurora.org\u003e\n" }, { "commit": "80ba33d88f07caa74cf90721780f17f26fe9d236", "tree": "8f5514e1630dbcbdb9ce72bdec6d0a0fe8c72ef9", "parents": [ "c5760300500abbf48d54daa86836890da276ea58" ], "author": { "name": "Jason Varbedian", "email": "jasonv@codeaurora.org", "time": "Mon Jul 11 17:29:05 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:58:23 2011 -0700" }, "message": "msm: kgsl: change readtimestamp from IOR to IOWR and keep legacy\n\nSigned-off-by: Jason Varbedian \u003cjasonv@codeaurora.org\u003e\n" }, { "commit": "3f2bc4d6eb5a4fada842462ba22bb6bbb41d00c7", "tree": "088e0646c8abcbde263d13ee865ba69032ac86dd", "parents": [ "f06154cc47399dfdb3950d3e6b71d67ee186f69d" ], "author": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Tue Aug 16 17:27:22 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:57:10 2011 -0700" }, "message": "Initial Contribution\n\nmsm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142\n\nSigned-off-by: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\n" }, { "commit": "f06154cc47399dfdb3950d3e6b71d67ee186f69d", "tree": "2a34875c0da6853cacf22777bc5ce0544b85e823", "parents": [ "66589de55eff46f036ab5316a77834e01af3753c", "99ce39e359fa29e4b609a6a13485e7573eda5dfb" ], "author": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Fri Sep 23 11:47:13 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Fri Sep 23 11:47:21 2011 -0700" }, "message": "Merge branch \u0027devicetree/next\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027devicetree/next\u0027 of git://git.secretlab.ca/git/linux-2.6:\n dt: include linux/errno.h in linux/of_address.h\n of/address: Add of_find_matching_node_by_address helper\n dt: remove extra xsysace platform_driver registration\n tty/serial: Add devicetree support for nVidia Tegra serial ports\n dt: add empty of_property_read_u32[_array] for non-dt\n dt: bindings: move SEC node under new crypto/\n dt: add helper function to read u32 arrays\n tty/serial: change of_serial to use new of_property_read_u32() api\n dt: add \u0027const\u0027 for of_property_read_string parameter **out_string\n dt: add helper functions to read u32 and string property values\n tty: of_serial: support for 32 bit accesses\n dt: document the of_serial bindings\n dt/platform: allow device name to be overridden\n drivers/amba: create devices from device tree\n dt: add of_platform_populate() for creating device from the device tree\n dt: Add default match table for bus ids\n" }, { "commit": "66589de55eff46f036ab5316a77834e01af3753c", "tree": "867b8323f4b50c03d9a2c3e28eea81cdc543d159", "parents": [ "b198bd57abdf1c84f0a877fea7c43f84df110902", "87c0eb12b4f5b6b6d5933bb7198aa56a46e74250" ], "author": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Fri Sep 23 11:00:16 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Fri Sep 23 11:00:20 2011 -0700" }, "message": "Merge remote-tracking branch \u0027linux-audio/sgc/topic/omap_3.0\u0027\n\n* linux-audio/sgc/topic/omap_3.0: (106 commits)\n ASoC: twl6040: Configure init gain to minimal value\n ASoC: ABE: Protect playback/capture triggers against removal\n ASoC: DSP: Connect FE-\u003eBE links if FE is active\n ASoC: McPDM: Update channel management (for squash)\n ASoC: OMAP4 - Port Manager: Fix up DEBUG_FS compilation error\n ASoC: ABE DSP: Fixes for firmware equalizer parsing\n ASoC: ABE DSP: Use same firmware strategy for built-in and modules\n ASoC: ABE HAL: Allow flexible firmware loading\n ASoC: ABE DSP: Fix compilation warnings\n ASoC: OMAP ABE: update Firmware version 09.45\n ASoC: pcm - fix locking for dsp ops\n ASoC: OMAP ABE: Update for PM.\n ASoC: McPDM: Update channels management to link UL and DL\n ASoC: ABE DAI: Call modem trigger in bespoke_trigger()\n ASoC: ABE DAI: support 2 channels for MODEM DAI\n OMAP4: SDP4430: Fix merge issue with new MFD driver\n ASoC: OMAP: SDP4430 fix merge issue.\n ASoC: dapm: Fix long_name pointer for DAPM muxes\n ASoC: mcpdm: Enable watchdog during audio activity\n ASoC: SDP4430: Fix DMICs stream name\n ...\n" }, { "commit": "efcf89c8eb62b7c0c5976cb94f892c891afea199", "tree": "73d14c4ff835e5d7fd8608a8a7d20b762d1d4827", "parents": [ "8b404d162085c675989d7fb55c3f641fdfa11eec" ], "author": { "name": "Nishanth Menon", "email": "nm@ti.com", "time": "Wed Aug 17 18:31:58 2011 -0500" }, "committer": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Fri Aug 19 11:41:00 2011 -0700" }, "message": "panic: Add board ID to panic output\n\nAt times, it is necessary for boards to provide some additional information\nas part of panic logs. Provide information on the board hardware as part\nof panic logs.\n\nIt is safer to print this information at the very end in case something\nbad happens as part of the information retrieval itself.\n\nTo use this, set global mach_panic_string to an appropriate string in the\nboard file.\n\nChange-Id: Id12cdda87b0cd2940dd01d52db97e6162f671b4d\nSigned-off-by: Nishanth Menon \u003cnm@ti.com\u003e\n" }, { "commit": "9abd59b0df155835a970c2b9c8f93367eb793797", "tree": "bcf0868f831d204e2b582113c53b8de3ff015eca", "parents": [ "4e111751cfcb75f26d2725eab934b6eb91a3d115", "94ed5b4788a7cdbe68bc7cb8516972cbebdc8274" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Aug 10 18:07:59 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Aug 10 18:07:59 2011 -0700" }, "message": "Merge commit \u0027v3.0.1\u0027 into android-3.0\n" }, { "commit": "4e111751cfcb75f26d2725eab934b6eb91a3d115", "tree": "b3d63b5b44bd2036db6e0f0b2e81769c84cc5ca3", "parents": [ "ca64b0cd3a12d7704f4e98f4f5d51f41eb5047a2", "02f8c6aee8df3cdc935e9bdd4f2d020306035dbe" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Aug 10 18:04:30 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Aug 10 18:04:30 2011 -0700" }, "message": "Merge commit \u0027v3.0\u0027 into android-3.0\n" }, { "commit": "e65d9fe5564afaca75ae657179446578be73e9ba", "tree": "ece828b12ee9763b08e570c4afe32dccc97478f1", "parents": [ "f3d9cdd92a341c10bf277a2b84403e7041519251" ], "author": { "name": "Erik Gilling", "email": "konkers@android.com", "time": "Tue Aug 09 14:18:21 2011 -0700" }, "committer": { "name": "Erik Gilling", "email": "konkers@android.com", "time": "Tue Aug 09 17:58:49 2011 -0700" }, "message": "usb: otg: add proxy_wait handler to otg_id\n\nSome otg_id handlers can detect what\u0027s connected but can\u0027t detect a change.\nThis allows that handler to pass off the waiting for ID change to a proxy.\n\nChange-Id: Ib38b750c3da4bffc35e37b620ecee37c5d64d31f\nSigned-off-by: Erik Gilling \u003ckonkers@android.com\u003e\n" }, { "commit": "3fe24366a40147d7c776e1f291193fd3b61f217d", "tree": "35332418ccff1248b80cb7517f16f9439fb5a7dc", "parents": [ "89c65d6d9dd87332d58c853e31938b98f7ac8463" ], "author": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Tue Aug 09 14:42:08 2011 -0700" }, "committer": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Tue Aug 09 14:49:21 2011 -0700" }, "message": "ion: minor clean up\n\n-- init rb nodes in ion_handle_create\n-- in ion_handle_destroy, check that a node belongs to a tree before removing\n it (safety check, does not happen right now)\n-- mark as static functions used only inside ion.c\n-- update comments to ion_share() with a relevant blurb from the implementation\n-- other minor updates/typo fixes to comments\n\nSigned-off-by: Iliyan Malchev \u003cmalchev@google.com\u003e\n" }, { "commit": "c14acb19a4b1482b6dd6e9d0874b2c8e32d6599d", "tree": "09449801fb0b88b73bdbb83876f251a65a2120ac", "parents": [ "1fcb9d4b03b6ad6f4de417bbbe21d82123290114" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Jul 30 12:45:35 2011 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Aug 04 21:58:40 2011 -0700" }, "message": "NFS: Fix spurious readdir cookie loop messages\n\ncommit 0c0308066ca53fdf1423895f3a42838b67b3a5a8 upstream.\n\nIf the directory contents change, then we have to accept that the\nfile-\u003ef_pos value may shrink if we do a \u0027search-by-cookie\u0027. In that\ncase, we should turn off the loop detection and let the NFS client\ntry to recover.\n\nThe patch also fixes a second loop detection bug by ensuring\nthat after turning on the ctx-\u003eduped flag, we read at least one new\ncookie into ctx-\u003edir_cookie before attempting to match with\nctx-\u003edup_cookie.\n\nReported-by: Petr Vandrovec \u003cpetr@vandrovec.name\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "b045b9a265fb46d8197b7d78aff1a8f6ab8e23df", "tree": "650daaba84981a7ac749611f2ccee133380940c5", "parents": [ "cb83d9f7840657a0f0cc29ba5c01ce7320e28e9a" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Jul 25 17:12:32 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Aug 04 21:58:38 2011 -0700" }, "message": "mm/futex: fix futex writes on archs with SW tracking of dirty \u0026 young\n\ncommit 2efaca927f5cd7ecd0f1554b8f9b6a9a2c329c03 upstream.\n\nI haven\u0027t reproduced it myself but the fail scenario is that on such\nmachines (notably ARM and some embedded powerpc), if you manage to hit\nthat futex path on a writable page whose dirty bit has gone from the PTE,\nyou\u0027ll livelock inside the kernel from what I can tell.\n\nIt will go in a loop of trying the atomic access, failing, trying gup to\n\"fix it up\", getting succcess from gup, go back to the atomic access,\nfailing again because dirty wasn\u0027t fixed etc...\n\nSo I think you essentially hang in the kernel.\n\nThe scenario is probably rare\u0027ish because affected architecture are\nembedded and tend to not swap much (if at all) so we probably rarely hit\nthe case where dirty is missing or young is missing, but I think Shan has\na piece of SW that can reliably reproduce it using a shared writable\nmapping \u0026 fork or something like that.\n\nOn archs who use SW tracking of dirty \u0026 young, a page without dirty is\neffectively mapped read-only and a page without young unaccessible in the\nPTE.\n\nAdditionally, some architectures might lazily flush the TLB when relaxing\nwrite protection (by doing only a local flush), and expect a fault to\ninvalidate the stale entry if it\u0027s still present on another processor.\n\nThe futex code assumes that if the \"in_atomic()\" access -EFAULT\u0027s, it can\n\"fix it up\" by causing get_user_pages() which would then be equivalent to\ntaking the fault.\n\nHowever that isn\u0027t the case. get_user_pages() will not call\nhandle_mm_fault() in the case where the PTE seems to have the right\npermissions, regardless of the dirty and young state. It will eventually\nupdate those bits ... in the struct page, but not in the PTE.\n\nAdditionally, it will not handle the lazy TLB flushing that can be\nrequired by some architectures in the fault case.\n\nBasically, gup is the wrong interface for the job. The patch provides a\nmore appropriate one which boils down to just calling handle_mm_fault()\nsince what we are trying to do is simulate a real page fault.\n\nThe futex code currently attempts to write to user memory within a\npagefault disabled section, and if that fails, tries to fix it up using\nget_user_pages().\n\nThis doesn\u0027t work on archs where the dirty and young bits are maintained\nby software, since they will gate access permission in the TLB, and will\nnot be updated by gup().\n\nIn addition, there\u0027s an expectation on some archs that a spurious write\nfault triggers a local TLB flush, and that is missing from the picture as\nwell.\n\nI decided that adding those \"features\" to gup() would be too much for this\nalready too complex function, and instead added a new simpler\nfixup_user_fault() which is essentially a wrapper around handle_mm_fault()\nwhich the futex code can call.\n\n[akpm@linux-foundation.org: coding-style fixes]\n[akpm@linux-foundation.org: fix some nits Darren saw, fiddle comment layout]\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nReported-by: Shan Hai \u003chaishan.bai@gmail.com\u003e\nTested-by: Shan Hai \u003chaishan.bai@gmail.com\u003e\nCc: David Laight \u003cDavid.Laight@ACULAB.COM\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Darren Hart \u003cdarren.hart@intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "892cd4a38f0d379dfdbc1a0a45eaa31a89976796", "tree": "edc8337ed3451ff819dc20e3436b5019479b6c87", "parents": [ "f45c1d4647a37feee31f4bca9ebd9b90ebdc98a3" ], "author": { "name": "Peng Tao", "email": "peng_tao@emc.com", "time": "Sat Jul 30 20:52:33 2011 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Aug 04 21:58:37 2011 -0700" }, "message": "pnfs: let layoutcommit handle a list of lseg\n\ncommit a9bae5666d0510ad69bdb437371c9a3e6b770705 upstream.\n\nThere can be multiple lseg per file, so layoutcommit should be\nable to handle it.\n\n[Needed in v3.0]\nSigned-off-by: Peng Tao \u003cpeng_tao@emc.com\u003e\nSigned-off-by: Boaz Harrosh \u003cbharrosh@panasas.com\u003e\nSigned-off-by: Jim Rees \u003crees@umich.edu\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "6f437783919467437f19ec534a0317aef2fd2584", "tree": "01e8500766574786b1fd63e9a3090ac2c45777f9", "parents": [ "63ab4325d0df2ccefaeb932210d4046f2223e338" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sat Jul 09 16:43:22 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Aug 04 21:58:34 2011 -0700" }, "message": "firewire: cdev: prevent race between first get_info ioctl and bus reset event queuing\n\ncommit 93b37905f70083d6143f5f4dba0a45cc64379a62 upstream.\n\nBetween open(2) of a /dev/fw* and the first FW_CDEV_IOC_GET_INFO\nioctl(2) on it, the kernel already queues FW_CDEV_EVENT_BUS_RESET events\nto be read(2) by the client. The get_info ioctl is practically always\nissued right away after open, hence this condition only occurs if the\nclient opens during a bus reset, especially during a rapid series of bus\nresets.\n\nThe problem with this condition is twofold:\n\n - These bus reset events carry the (as yet undocumented) @closure\n value of 0. But it is not the kernel\u0027s place to choose closures;\n they are privat to the client. E.g., this 0 value forced from the\n kernel makes it unsafe for clients to dereference it as a pointer to\n a closure object without NULL pointer check.\n\n - It is impossible for clients to determine the relative order of bus\n reset events from get_info ioctl(2) versus those from read(2),\n except in one way: By comparison of closure values. Again, such a\n procedure imposes complexity on clients and reduces freedom in use\n of the bus reset closure.\n\nSo, change the ABI to suppress queuing of bus reset events before the\nfirst FW_CDEV_IOC_GET_INFO ioctl was issued by the client.\n\nNote, this ABI change cannot be version-controlled. The kernel cannot\ndistinguish old from new clients before the first FW_CDEV_IOC_GET_INFO\nioctl.\n\nWe will try to back-merge this change into currently maintained stable/\nlongterm series, and we only document the new behaviour. The old\nbehavior is now considered a kernel bug, which it basically is.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\nCc: \u003cstable@kernel.org\u003e\n\n" }, { "commit": "97edbc901240090ca75b81aa8955bcef8d570434", "tree": "98938f16e4c6cc3faf2cbe6cf66d75f7f731f769", "parents": [ "bde99f604b42182e590ac4b7176b5235321bc94c" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Jul 27 06:16:28 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Aug 04 21:58:31 2011 -0700" }, "message": "gro: Only reset frag0 when skb can be pulled\n\ncommit 17dd759c67f21e34f2156abcf415e1f60605a188 upstream.\n\nCurrently skb_gro_header_slow unconditionally resets frag0 and\nfrag0_len. However, when we can\u0027t pull on the skb this leaves\nthe GRO fields in an inconsistent state.\n\nThis patch fixes this by only resetting those fields after the\npskb_may_pull test.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "a956f9e3987c7f4ebe47049fcf713e5a7f8a5a0d", "tree": "44521c69833b0085a12005f62e0ce423f1097965", "parents": [ "87ce3c5305eac29aee5090a3b57bbe1649fae180" ], "author": { "name": "Axel Castaneda Gonzalez", "email": "x0055901@ti.com", "time": "Wed Feb 23 20:08:28 2011 -0600" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:55 2011 +0200" }, "message": "ASoC: twl6040: Configure ramp step based on platform\n\nEnable ramp down/up step to be configured based on\nplatform.\n\nSigned-off-by: Axel Castaneda Gonzalez \u003cx0055901@ti.com\u003e\nSigned-off-by: Misael Lopez Cruz \u003cmisael.lopez@ti.com\u003e\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "95ed04e15e254297044cf92ae495e8f95e3d0d7b", "tree": "de1733d6892b3575a801768841978770ee0df3cb", "parents": [ "b62eea9d69b7bd35d83dc81f6c7da00136010ae9" ], "author": { "name": "Misael Lopez Cruz", "email": "misael.lopez@ti.com", "time": "Sun May 01 03:51:24 2011 -0500" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:54 2011 +0200" }, "message": "input: Add initial support for TWL6040 vibrator\n\nAdd twl6040_vibra as a child of MFD device twl6040_codec. This\nimplementation covers the PCM-to-PWM mode of TWL6040 vibrator\nmodule.\n\nSigned-off-by: Misael Lopez Cruz \u003cmisael.lopez@ti.com\u003e\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nCC: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "3c9d7a18427b28721741df2f84e9f4f167e5a523", "tree": "fc839c8bd61372827ee9afa61ae1a65d6ac0e2e2", "parents": [ "be206b3963a5904fc362827bf96b98db6fac31ac" ], "author": { "name": "Misael Lopez Cruz", "email": "misael.lopez@ti.com", "time": "Wed Apr 27 02:14:07 2011 -0500" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:53 2011 +0200" }, "message": "mfd: twl6040: Add initial support\n\nTWL6040 IC provides analog high-end audio codec functions for\nhandset applications. It contains several audio analog inputs\nand outputs as well as vibrator support. It\u0027s connected to the\nhost processor via PDM interface for audio data communication.\nThe audio modules are controlled by internal registers that\ncan be accessed by I2C and PDM interface.\n\nTWL6040 MFD will be registered as a child of TWL-CORE, and will\nhave two children of its own: twl6040-codec and twl6040-vibra.\n\nThis driver is based on TWL4030 and WM8350 MFD drivers.\n\nSigned-off-by: Misael Lopez Cruz \u003cmisael.lopez@ti.com\u003e\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\n" }, { "commit": "be206b3963a5904fc362827bf96b98db6fac31ac", "tree": "9c9e1bcde76e1dab1b66c38f2f165f1a304a2f93", "parents": [ "d189dd57aa925949a458313e8be10420caa4823a" ], "author": { "name": "Peter Ujfalusi", "email": "peter.ujfalusi@ti.com", "time": "Tue May 31 15:21:13 2011 +0300" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:53 2011 +0200" }, "message": "MFD: twl4030-audio: Rename platform data\n\nAllign the platform data names for twl4030 audio submodule:\ntwl4030_audio_data: for the core MFD driver\ntwl4030_codec_data: for ASoC codec driver\ntwl4030_vibra_data: for the input/ForceFeedback driver\n\nTo avoid breakage, change all depending drivers, files\nto use the new types.\n\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\n" }, { "commit": "d189dd57aa925949a458313e8be10420caa4823a", "tree": "4b7d61057d209e67a8e5c8caa214ff8dd051d5f2", "parents": [ "918360729203d9c148adbfbe2cfbd186b80e096f" ], "author": { "name": "Peter Ujfalusi", "email": "peter.ujfalusi@ti.com", "time": "Tue May 31 12:02:49 2011 +0300" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:53 2011 +0200" }, "message": "MFD: twl4030-codec -\u003e twl4030-audio: Rename the driver\n\nRename the driver, and header file from twl4030-codec to\ntwl4030-audio.\nTo avoid breakage change depending drivers at the same time.\n\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nCC: Misael Lopez Cruz \u003cmisael.lopez@ti.com\u003e\n" }, { "commit": "0b893f0f37736c1e26655f04d51706dfba417171", "tree": "05cb4754030b59b9ed6a72843b830098ae8f056c", "parents": [ "c477e60b6689d36121f7cabaea449c4014705078" ], "author": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Sun Jul 17 16:07:23 2011 -0700" }, "committer": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Thu Jul 21 18:04:46 2011 -0700" }, "message": "netfilter: xt_qtaguid: add uid permission checks during ctrl/stats access\n\n* uid handling\n - Limit UID impersonation to processes with a gid in AID_NET_BW_ACCT.\n This affects socket tagging, and data removal.\n - Limit stats lookup to own uid or the process gid is in AID_NET_BW_STATS.\n This affects stats lookup.\n\n* allow pacifying the module\n Setting passive to Y/y will make the module return immediately on\n external stimulus.\n No more stats and silent success on ctrl writes.\n Mainly used when one suspects this module of misbehaving.\n\nChange-Id: I83990862d52a9b0922aca103a0f61375cddeb7c4\nSigned-off-by: JP Abgrall \u003cjpa@google.com\u003e\n" }, { "commit": "adf0760ceb775202fe7838c21eede5788f2ac31d", "tree": "be3d3c73b598d7af930e9cf5a3626c67873f0a0d", "parents": [ "fec502d9a18bbe8045c67bd4f9d3a1ade4e78555" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Jul 21 11:39:17 2011 -0700" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Jul 21 15:26:03 2011 -0700" }, "message": "USB: gadget: f_accessory: Add ioctl to detect USB accessory attached at boot\n\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "cf6ace16a3cd8b728fb0afa68368fd40bbeae19f", "tree": "489c64380668e8c5a29d3f36f37554e4b081a647", "parents": [ "acc11eab70591744369722280c9ce162a6193494", "d1e9ae47a0285d3f1699e8219ce50f656243b93f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 20 15:56:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 20 15:56:25 2011 -0700" }, "message": "Merge branch \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n signal: align __lock_task_sighand() irq disabling and RCU\n softirq,rcu: Inform RCU of irq_exit() activity\n sched: Add irq_{enter,exit}() to scheduler_ipi()\n rcu: protect __rcu_read_unlock() against scheduler-using irq handlers\n rcu: Streamline code produced by __rcu_read_unlock()\n rcu: Fix RCU_BOOST race handling current-\u003ercu_read_unlock_special\n rcu: decrease rcu_report_exp_rnp coupling with scheduler\n" }, { "commit": "d1e9ae47a0285d3f1699e8219ce50f656243b93f", "tree": "2f5a68b5ba1677bcd49ee759f09ffc5ccccb1455", "parents": [ "e6625fa48e6580a74b7e700efd7e6463e282810b", "a841796f11c90d53dbac773be56b04fbee8af272" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 20 20:59:26 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 20 20:59:26 2011 +0200" }, "message": "Merge branch \u0027rcu/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent\n" }, { "commit": "e3589f6c81e4764d32a25d2a2a0afe54fa344f5c", "tree": "414bf6bdbad3f04f629fa2a72254ea85acf723f4", "parents": [ "9c3f75cbd144014bea6af866a154cc2e73ab2287" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri Jul 15 10:35:52 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 20 18:32:41 2011 +0200" }, "message": "sched: Allow for overlapping sched_domain spans\n\nAllow for sched_domain spans that overlap by giving such domains their\nown sched_group list instead of sharing the sched_groups amongst\neach-other.\n\nThis is needed for machines with more than 16 nodes, because\nsched_domain_node_span() will generate a node mask from the\n16 nearest nodes without regard if these masks have any overlap.\n\nCurrently sched_domains have a sched_group that maps to their child\nsched_domain span, and since there is no overlap we share the\nsched_group between the sched_domains of the various CPUs. If however\nthere is overlap, we would need to link the sched_group list in\ndifferent ways for each cpu, and hence sharing isn\u0027t possible.\n\nIn order to solve this, allocate private sched_groups for each CPU\u0027s\nsched_domain but have the sched_groups share a sched_group_power\nstructure such that we can uniquely track the power.\n\nReported-and-tested-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/n/tip-08bxqw9wis3qti9u5inifh3y@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "9c3f75cbd144014bea6af866a154cc2e73ab2287", "tree": "2a565f7ff0820269973415c5605e313cfff903b4", "parents": [ "e6625fa48e6580a74b7e700efd7e6463e282810b" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Jul 14 13:00:06 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 20 18:32:40 2011 +0200" }, "message": "sched: Break out cpu_power from the sched_group structure\n\nIn order to prepare for non-unique sched_groups per domain, we need to\ncarry the cpu_power elsewhere, so put a level of indirection in.\n\nReported-and-tested-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/n/tip-qkho2byuhe4482fuknss40ad@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "7765be2fec0f476fcd61812d5f9406b04c765020", "tree": "e89ccb3fbd5655090b05f608f8e1d39924f23a9a", "parents": [ "131906b0062ddde7f85bbe67754983c754648bd8" ], "author": { "name": "Paul E. McKenney", "email": "paul.mckenney@linaro.org", "time": "Thu Jul 14 12:24:11 2011 -0700" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Tue Jul 19 21:38:52 2011 -0700" }, "message": "rcu: Fix RCU_BOOST race handling current-\u003ercu_read_unlock_special\n\nThe RCU_BOOST commits for TREE_PREEMPT_RCU introduced an other-task\nwrite to a new RCU_READ_UNLOCK_BOOSTED bit in the task_struct structure\u0027s\n-\u003ercu_read_unlock_special field, but, as noted by Steven Rostedt, without\ncorrectly synchronizing all accesses to -\u003ercu_read_unlock_special.\nThis could result in bits in -\u003ercu_read_unlock_special being spuriously\nset and cleared due to conflicting accesses, which in turn could result\nin deadlocks between the rcu_node structure\u0027s -\u003elock and the scheduler\u0027s\nrq and pi locks. These deadlocks would result from RCU incorrectly\nbelieving that the just-ended RCU read-side critical section had been\npreempted and/or boosted. If that RCU read-side critical section was\nexecuted with either rq or pi locks held, RCU\u0027s ensuing (incorrect)\ncalls to the scheduler would cause the scheduler to attempt to once\nagain acquire the rq and pi locks, resulting in deadlock. More complex\ndeadlock cycles are also possible, involving multiple rq and pi locks\nas well as locks from multiple rcu_node structures.\n\nThis commit fixes synchronization by creating -\u003ercu_boosted field in\ntask_struct that is accessed and modified only when holding the -\u003elock\nin the rcu_node structure on which the task is queued (on that rcu_node\nstructure\u0027s -\u003eblkd_tasks list). This results in tasks accessing only\ntheir own current-\u003ercu_read_unlock_special fields, making unsynchronized\naccess once again legal, and keeping the rcu_read_unlock() fastpath free\nof atomic instructions and memory barriers.\n\nThe reason that the rcu_read_unlock() fastpath does not need to access\nthe new current-\u003ercu_boosted field is that this new field cannot\nbe non-zero unless the RCU_READ_UNLOCK_BLOCKED bit is set in the\ncurrent-\u003ercu_read_unlock_special field. Therefore, rcu_read_unlock()\nneed only test current-\u003ercu_read_unlock_special: if that is zero, then\ncurrent-\u003ercu_boosted must also be zero.\n\nThis bug does not affect TINY_PREEMPT_RCU because this implementation\nof RCU accesses current-\u003ercu_read_unlock_special with irqs disabled,\nthus preventing races on the !SMP systems that TINY_PREEMPT_RCU runs on.\n\nMaybe-reported-by: Dave Jones \u003cdavej@redhat.com\u003e\nMaybe-reported-by: Sergey Senozhatsky \u003csergey.senozhatsky@gmail.com\u003e\nReported-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaul.mckenney@linaro.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nReviewed-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "99ce39e359fa29e4b609a6a13485e7573eda5dfb", "tree": "16ef77877ebc3027ed68fb4672e16a0d8a50668b", "parents": [ "90e33f62e027d330485d03598e1b2d8db3ff031c" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jul 05 23:42:37 2011 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Jul 18 16:37:45 2011 -0600" }, "message": "dt: include linux/errno.h in linux/of_address.h\n\nof_address.h makes reference to some of the error code #defines, so it\nneeds to include errno.h. If CONFIG_PCI is not selected, then some files\nwill fail to compile.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "90e33f62e027d330485d03598e1b2d8db3ff031c", "tree": "8dea43baa65a88ba28771a945f126a511024f804", "parents": [ "8c11642a50555e584774737f7c296f9aece310cf" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jul 05 23:42:28 2011 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Jul 18 16:32:26 2011 -0600" }, "message": "of/address: Add of_find_matching_node_by_address helper\n\nof_find_matching_node_by_address() can be used to find a device tree\nnode for a device at a specific address.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "a07c7964a29b6dc515b120f1e1c223ac2f8666f5", "tree": "cf45e084be0437ca921c0623569932bf1d142c1d", "parents": [ "0b8f6273eb6fd0611849d6fb432151f04e042434" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Sat Jul 16 22:22:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 18 11:06:03 2011 -0700" }, "message": "include/linux/sdla.h: remove the prototype of sdla()\n\n`make headers_check` complains that\n\nlinux-2.6/usr/include/linux/sdla.h:116: userspace cannot reference\nfunction or variable defined in the kernel\n\nthis is due to that there is no such a kernel function,\n\nvoid sdla(void *cfg_info, char *dev, struct frad_conf *conf, int quiet);\n\nI don\u0027t know why we have it in a kernel header, so remove it.\n\nSigned-off-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8c11642a50555e584774737f7c296f9aece310cf", "tree": "1ff8dfaf05479593ef2c50378a68dfc6aec495a5", "parents": [ "5d10302f46df1d9a85c34ea97f9b6c29e414482e", "620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jul 15 20:11:34 2011 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jul 15 20:11:34 2011 -0600" }, "message": "Merge commit \u0027v3.0-rc7\u0027 into devicetree/next\n" }, { "commit": "9a736a21691d48cc6e956ce8d49849823fd6af40", "tree": "e04b1bfcd4b39cb71c9213c0e0518bccd3a1d8e7", "parents": [ "ce4022b8d1c9e1b380dc5177f955bfe5f1327e3e" ], "author": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Wed Jun 15 17:21:57 2011 -0700" }, "committer": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Fri Jul 15 15:26:45 2011 -0700" }, "message": "Move x86_64 idle notifiers to generic\n\nMove the x86_64 idle notifiers originally by Andi Kleen and Venkatesh\nPallipadi to generic.\n\nChange-Id: Idf29cda15be151f494ff245933c12462643388d5\nAcked-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Todd Poynor \u003ctoddpoynor@google.com\u003e\n" }, { "commit": "ce4022b8d1c9e1b380dc5177f955bfe5f1327e3e", "tree": "932bd019c44b27ff5d33822206d1386f95eab70a", "parents": [ "f558e1e53997b661e85de0ba96c2596c9cc97b4f" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Jul 14 19:42:42 2011 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Fri Jul 15 17:18:14 2011 -0400" }, "message": "USB: gadget: f_mtp: Add support for sending MTP header during file transfer\n\nMTP_SEND_FILE_WITH_HEADER ioctl allows sending a file with the 12 byte header\nprepended at the beginning.\nThis is to allow MTP to use a single packet for the data phase instead of two.\n\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "62f2a3a48bdc99822a24356e667e52c30df287c9", "tree": "acad792fc90ac7d55974729f3b591e75b0f591dd", "parents": [ "b73c43f884b1b26ef8e824a33f3924f92e493c11" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Wed Jul 13 14:10:29 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 14 15:18:49 2011 -0700" }, "message": "net: remove NETIF_F_ALL_TX_OFFLOADS\n\nThere is no software fallback implemented for SCTP or FCoE checksumming,\nand so it should not be passed on by software devices like bridge or bonding.\n\nFor VLAN devices, this is different. First, the driver for underlying device\nshould be prepared to get offloaded packets even when the feature is disabled\n(especially if it advertises it in vlan_features). Second, devices under\nVLANs do not get replaced without tearing down the VLAN first.\n\nThis fixes a mess I accidentally introduced while converting bonding to\nndo_fix_features.\n\nNETIF_F_SOFT_FEATURES are removed from BOND_VLAN_FEATURES because they\nare unused as of commit 712ae51afd.\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "51414d41084496aaefd06d7f19eb8206e8bfac2d", "tree": "31c7624d28a564e1cc918a30b8570a3c001a9c7c", "parents": [ "201f92e2ca789d529418da8fa027d5457f0df024", "f39b2dd9d065151a04f5996656d1f27a7eb32d45" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 13 16:47:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 13 16:47:31 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n mmc: core: Bus width testing needs to handle suspend/resume\n" }, { "commit": "f39b2dd9d065151a04f5996656d1f27a7eb32d45", "tree": "3801f7d6793529d737fcbfd6af05b6900ef2cd06", "parents": [ "c31b55cd4eaf050bb5a15bd8251da1b3c7edeb1c" ], "author": { "name": "Philip Rakity", "email": "prakity@marvell.com", "time": "Thu Jul 07 09:04:55 2011 -0700" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Wed Jul 13 14:54:37 2011 -0400" }, "message": "mmc: core: Bus width testing needs to handle suspend/resume\n\nOn reading the ext_csd for the first time (in 1 bit mode), save the\next_csd information needed for bus width compare.\n\nOn every pass we make re-reading the ext_csd, compare the data\nagainst the saved ext_csd data.\n\nThis fixes a regression introduced in 3.0-rc1 by 08ee80cc397ac1a3\n(\"mmc: core: eMMC bus width may not work on all platforms\"), which\nincorrectly assumed we would be re-reading the ext_csd at resume-\ntime.\n\nSigned-off-by: Philip Rakity \u003cprakity@marvell.com\u003e\nTested-by: Jaehoon Chung \u003cjh80.chung@samsung.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "bb5b603036b99d80527b222dc98eba4ee8341020", "tree": "dcce59f7dd49c7f3f40ccaa1973dae94381f8fff", "parents": [ "497f5982a7eae716267213a8fdc3ea4c6ac09e5e" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 12 19:53:24 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 12 22:58:35 2011 -0700" }, "message": "cgroup: Add generic cgroup subsystem permission checks\n\nRather than using explicit euid \u003d\u003d 0 checks when trying to move\ntasks into a cgroup via CFS, move permission checks into each\nspecific cgroup subsystem. If a subsystem does not specify a\n\u0027allow_attach\u0027 handler, then we fall back to doing our checks\nthe old way.\n\nUse the \u0027allow_attach\u0027 handler for the \u0027cpu\u0027 cgroup to allow\nnon-root processes to add arbitrary processes to a \u0027cpu\u0027 cgroup\nif it has the CAP_SYS_NICE capability set.\n\nThis version of the patch adds a \u0027allow_attach\u0027 handler instead\nof reusing the \u0027can_attach\u0027 handler. If the \u0027can_attach\u0027 handler\nis reused, a new cgroup that implements \u0027can_attach\u0027 but not\nthe permission checks could end up with no permission checks\nat all.\n\nChange-Id: Icfa950aa9321d1ceba362061d32dc7dfa2c64f0c\nOriginal-Author: San Mehat \u003csan@google.com\u003e\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\n" }, { "commit": "75c56a81116e51c5cf15c0641906d0745188cd16", "tree": "c1d8e7def5bbb099a39d5e9ccfb13508ea5ca46a", "parents": [ "b4294d618e8a19bb47826e51ae52b9fb2fe05f80", "620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 12 20:10:37 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 12 20:10:37 2011 -0700" }, "message": "Merge commit \u0027v3.0-rc7\u0027 into android-3.0\n" }, { "commit": "8d86e5f91440aa56a5df516bf58fe3883552ad56", "tree": "94c8aea597b9e1ade376743a3f8f830e5195fa57", "parents": [ "d93a881dd7d71ad0e6504af232be2795044ab686", "770e1ac5f29003fca18af4e67eb5a05ddb5b1491" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 12 14:21:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 12 14:21:19 2011 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/mm: Fix memory_block_size_bytes() for non-pseries\n mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header\n" }, { "commit": "d93a881dd7d71ad0e6504af232be2795044ab686", "tree": "71fc6918e676a0cf53d585f5a253646a49b60c83", "parents": [ "d1ca1a004822983e2fc702d5382b4b9a5527cfbe", "24109afd17426e1a2b72141e4a2b730057e1a0ea" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 12 14:19:51 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 12 14:19:51 2011 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:\n pcmcia: pxa2xx/vpac270: free gpios on exist rather than requesting\n ARM: pxa/raumfeld: fix device name for codec ak4104\n ARM: pxa/raumfeld: display initialisation fixes\n ARM: pxa/raumfeld: adapt to upcoming hardware change\n ARM: pxa: fix gpio_to_chip() clash with gpiolib namespace\n genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)\n arm: mach-vt8500: add forgotten irq_data conversion\n ARM: pxa168: correct nand pmu setting\n ARM: pxa910: correct nand pmu setting\n ARM: pxa: fix PGSR register address calculation\n" }, { "commit": "a63fdc5156f2ef5690b6cf03d72b0c4917efbba7", "tree": "03d9b67a5d07ab9d805ea39db2f331740eba1d4c", "parents": [ "620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jun 14 10:57:50 2011 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jul 12 11:08:01 2011 +1000" }, "message": "mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header\n\nThe macro MIN_MEMORY_BLOCK_SIZE is currently defined twice in two .c\nfiles, and I need it in a third one to fix a powerpc bug, so let\u0027s\nfirst move it into a header\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "511b7e32086dc7f9c18341f8702745e7ce092354", "tree": "9f74cee6965c784d2fd2a98b93ee8f1aaa7a9196", "parents": [ "ab246b81fb40a587e89f281fe9255833b7540220" ], "author": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Tue Jun 21 11:14:49 2011 -0700" }, "committer": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Mon Jul 11 16:39:01 2011 -0700" }, "message": "netfilter: adding the original quota2 from xtables-addons\n\nThe original xt_quota in the kernel is plain broken:\n - counts quota at a per CPU level\n (was written back when ubiquitous SMP was just a dream)\n - provides no way to count across IPV4/IPV6.\n\nThis patch is the original unaltered code from:\n http://sourceforge.net/projects/xtables-addons\n\n at commit e84391ce665cef046967f796dd91026851d6bbf3\n\nChange-Id: I19d49858840effee9ecf6cff03c23b45a97efdeb\nSigned-off-by: JP Abgrall \u003cjpa@google.com\u003e\n" }, { "commit": "ab246b81fb40a587e89f281fe9255833b7540220", "tree": "0434320e4a18914f566811227e22886cea99622f", "parents": [ "2fc52d645892c7a5fb9915b09351f934ea03f15d" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 24 15:58:51 2011 -0700" }, "committer": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Mon Jul 11 15:30:10 2011 -0700" }, "message": "USB: otg: add otg id notifier utiltiies\n\nAdd a otg_id notifier to allow multiple drivers to cooperate to\ndetermine the type of cable connected to a USB connector without\nrequiring direct calls between the drivers.\n\nChange-Id: Ic5675f1a89daf85b17336765de24e4bdb6df6348\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\n" }, { "commit": "2fc52d645892c7a5fb9915b09351f934ea03f15d", "tree": "877aca8c73506a143c85ab7fc1f35859886368fa", "parents": [ "89daa34bcd42062221247172ea2653521dc89e6c" ], "author": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Thu Jul 07 23:20:27 2011 -0700" }, "committer": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Mon Jul 11 15:30:09 2011 -0700" }, "message": "pda_power: add support for using otg transceiver events\n\nIf the platform data sets the use_otg_notifier flag,\nthe driver will now register an otg notifier callback and listen\nto transceiver events for AC/USB plug-in events instead. This would\nnormally be used by not specifying is_xx_online callbacks and\nnot specifying any irqs so the state machine is completely driven\nfrom OTG xceiver events.\n\nChange-Id: Ic4b3bc4010f299156e41fd2411696c7ff5a88e92\nSigned-off-by: Dima Zavin \u003cdima@android.com\u003e\n" }, { "commit": "f607e7fc5fb94d92030c4527287e9c149ddf9e65", "tree": "49ac9020b87f028e947580425fef84222332fdf8", "parents": [ "453a9bf347f1e22a5bb3605ced43b2366921221d" ], "author": { "name": "Jean-François Dagenais", "email": "dagenaisj@sonatest.com", "time": "Fri Jul 08 15:39:44 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 08 21:14:44 2011 -0700" }, "message": "w1: ds1wm: add a reset recovery parameter\n\nThis fixes a regression in 3.0 reported by Paul Parsons regarding the\nremoval of the msleep(1) in the ds1wm_reset() function:\n\n: The linux-3.0-rc4 DS1WM 1-wire driver is logging \"bus error, retrying\"\n: error messages on an HP iPAQ hx4700 PDA (XScale-PXA270):\n:\n: \u003csnip\u003e\n: Driver for 1-wire Dallas network protocol.\n: DS1WM w1 busmaster driver - (c) 2004 Szabolcs Gyurko\n: 1-Wire driver for the DS2760 battery monitor chip - (c) 2004-2005, Szabolcs Gyurko\n: ds1wm ds1wm: pass: 1 bus error, retrying\n: ds1wm ds1wm: pass: 2 bus error, retrying\n: ds1wm ds1wm: pass: 3 bus error, retrying\n: ds1wm ds1wm: pass: 4 bus error, retrying\n: ds1wm ds1wm: pass: 5 bus error, retrying\n: ...\n:\n: The visible result is that the battery charging LED is erratic; sometimes\n: it works, mostly it doesn\u0027t.\n:\n: The linux-2.6.39 DS1WM 1-wire driver worked OK. I haven\u0027t tried 3.0-rc1,\n: 3.0-rc2, or 3.0-rc3.\n\nThis sleep should not be required on normal circuitry provided the\npull-ups on the bus are correctly adapted to the slaves. Unfortunately,\nthis is not always the case. The sleep is restored but as a parameter to\nthe probe function in the pdata.\n\n[akpm@linux-foundation.org: coding-style fixes]\nReported-by: Paul Parsons \u003clost.distance@yahoo.com\u003e\nTested-by: Paul Parsons \u003clost.distance@yahoo.com\u003e\nSigned-off-by: Jean-François Dagenais \u003cdagenaisj@sonatest.com\u003e\nCc: Evgeniy Polyakov \u003cjohnpol@2ka.mipt.ru\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0226f8a76da6bc97c9bb4af3fd2f6eeb03c5b0b0", "tree": "103470d3c4a2865d1cafc4d4527f97d62660fc5d", "parents": [ "814cdea670616252e4cdf297a07b02ce59698bf1" ], "author": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Thu Jul 07 17:27:59 2011 -0700" }, "committer": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Fri Jul 08 14:15:44 2011 -0700" }, "message": "plist: Remove the need to supply locks to plist heads\n\nThis was legacy code brought over from the RT tree and\nis no longer necessary.\n\nSigned-off-by: Dima Zavin \u003cdima@android.com\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Daniel Walker \u003cdwalker@codeaurora.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nLink: http://lkml.kernel.org/r/1310084879-10351-2-git-send-email-dima@android.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b98c0239204d6603b3a33bcc2b3916adaa8d4160", "tree": "db2c9e80e5c98dcf71c5345198fe55a938628b96", "parents": [ "5a9ebe959967b7d3579de2a53d5df470fe0c7f22" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Fri Jul 08 16:27:33 2011 +0800" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jul 08 12:52:33 2011 -0600" }, "message": "dt: add empty of_property_read_u32[_array] for non-dt\n\nThe patch adds empty functions of_property_read_u32 and\nof_property_read_u32_array for non-dt build, so that drivers\nmigrating to dt can save some \u0027#ifdef CONFIG_OF\u0027.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n[grant.likely: Moved things around so only one new static inline is needed]\n[grant.likely: Added _string variant]\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "814cdea670616252e4cdf297a07b02ce59698bf1", "tree": "c4a5665995e813c252b07f1e863166059bfb5bcb", "parents": [ "487ffb052891a552fecf865ad4b24bbe7945a413", "fe0d42203cb5616eeff68b14576a0f7e2dd56625" ], "author": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Thu Jul 07 17:55:44 2011 -0700" }, "committer": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Thu Jul 07 17:55:44 2011 -0700" }, "message": "Merge commit \u0027v3.0-rc6\u0027 into android-3.0\n" }, { "commit": "2a9d6df425d7b46b23cbc8673b2dfefa4678abdb", "tree": "a6ec2ee125a3c02342b48a2e4a36598c26ca2b8b", "parents": [ "c902ce1bfb40d8b049bd2319b388b4b68b04bc27", "7b28afe01ab6ffb5f152f47831b44933facd2328" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:22:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:22:26 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n drbd: we should write meta data updates with FLUSH FUA\n drbd: fix limit define, we support 1 PiByte now\n drbd: when receive times out on meta socket, also check last receive time on data socket\n drbd: account bitmap IO during resync as resync-(related-)-io\n drbd: don\u0027t cond_resched_lock with IRQs disabled\n drbd: add missing spinlock to bitmap receive\n drbd: Use the correct max_bio_size when creating resync requests\n cfq-iosched: make code consistent\n cfq-iosched: fix a rcu warning\n" }, { "commit": "c902ce1bfb40d8b049bd2319b388b4b68b04bc27", "tree": "7dcb1e8378f8ec8e7ad7684cd26e9d5a1b5b22d1", "parents": [ "075d9db13183c102770dc6cefabfee1b832f9614" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Jul 07 12:19:48 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:21:56 2011 -0700" }, "message": "FS-Cache: Add a helper to bulk uncache pages on an inode\n\nAdd an FS-Cache helper to bulk uncache pages on an inode. This will\nonly work for the circumstance where the pages in the cache correspond\n1:1 with the pages attached to an inode\u0027s page cache.\n\nThis is required for CIFS and NFS: When disabling inode cookie, we were\nreturning the cookie and setting cifsi-\u003efscache to NULL but failed to\ninvalidate any previously mapped pages. This resulted in \"Bad page\nstate\" errors and manifested in other kind of errors when running\nfsstress. Fix it by uncaching mapped pages when we disable the inode\ncookie.\n\nThis patch should fix the following oops and \"Bad page state\" errors\nseen during fsstress testing.\n\n ------------[ cut here ]------------\n kernel BUG at fs/cachefiles/namei.c:201!\n invalid opcode: 0000 [#1] SMP\n Pid: 5, comm: kworker/u:0 Not tainted 2.6.38.7-30.fc15.x86_64 #1 Bochs Bochs\n RIP: 0010: cachefiles_walk_to_object+0x436/0x745 [cachefiles]\n RSP: 0018:ffff88002ce6dd00 EFLAGS: 00010282\n RAX: ffff88002ef165f0 RBX: ffff88001811f500 RCX: 0000000000000000\n RDX: 0000000000000000 RSI: 0000000000000100 RDI: 0000000000000282\n RBP: ffff88002ce6dda0 R08: 0000000000000100 R09: ffffffff81b3a300\n R10: 0000ffff00066c0a R11: 0000000000000003 R12: ffff88002ae54840\n R13: ffff88002ae54840 R14: ffff880029c29c00 R15: ffff88001811f4b0\n FS: 00007f394dd32720(0000) GS:ffff88002ef00000(0000) knlGS:0000000000000000\n CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\n CR2: 00007fffcb62ddf8 CR3: 000000001825f000 CR4: 00000000000006e0\n DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n Process kworker/u:0 (pid: 5, threadinfo ffff88002ce6c000, task ffff88002ce55cc0)\n Stack:\n 0000000000000246 ffff88002ce55cc0 ffff88002ce6dd58 ffff88001815dc00\n ffff8800185246c0 ffff88001811f618 ffff880029c29d18 ffff88001811f380\n ffff88002ce6dd50 ffffffff814757e4 ffff88002ce6dda0 ffffffff8106ac56\n Call Trace:\n cachefiles_lookup_object+0x78/0xd4 [cachefiles]\n fscache_lookup_object+0x131/0x16d [fscache]\n fscache_object_work_func+0x1bc/0x669 [fscache]\n process_one_work+0x186/0x298\n worker_thread+0xda/0x15d\n kthread+0x84/0x8c\n kernel_thread_helper+0x4/0x10\n RIP cachefiles_walk_to_object+0x436/0x745 [cachefiles]\n ---[ end trace 1d481c9af1804caa ]---\n\nI tested the uncaching by the following means:\n\n (1) Create a big file on my NFS server (104857600 bytes).\n\n (2) Read the file into the cache with md5sum on the NFS client. Look in\n /proc/fs/fscache/stats:\n\n\tPages : mrk\u003d25601 unc\u003d0\n\n (3) Open the file for read/write (\"bash 5\u003c\u003e/warthog/bigfile\"). Look in proc\n again:\n\n\tPages : mrk\u003d25601 unc\u003d25601\n\nReported-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nReviewed-and-Tested-by: Suresh Jayaraman \u003csjayaraman@suse.de\u003e\ncc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "27a3b735b70651f28db03e5f92775a40661ba7a6", "tree": "9f300b93aa34381aa1d3121e9d53e8c8e1623a24", "parents": [ "85746e429f8e5dc8c5c0beadc0f099cb1feab93e", "161b6ae0e067e421b20bb35caf66bdb405c929ac", "140fe3b1ab9c082182ef13359fab4ddba95c24c3", "e4c2fb0d5776b58049d2556b456144a4db3fe5a9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:17:45 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:17:45 2011 -0700" }, "message": "Merge branches \u0027core-urgent-for-linus\u0027, \u0027perf-urgent-for-linus\u0027 and \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n debugobjects: Fix boot crash when kmemleak and debugobjects enabled\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n jump_label: Fix jump_label update for modules\n oprofile, x86: Fix race in nmi handler while starting counters\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched: Disable (revert) SCHED_LOAD_SCALE increase\n sched, cgroups: Fix MIN_SHARES on 64-bit boxen\n" }, { "commit": "659fb32d1b67476f4ade25e9ea0e2642a5b9c4b5", "tree": "a875904f1c457f321563060491956266a57c6514", "parents": [ "d30e1521b2afb5e6f21ca8bc1a4b6ec2afc93597" ], "author": { "name": "Simon Guinot", "email": "sguinot@lacie.com", "time": "Wed Jul 06 12:41:31 2011 -0400" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Jul 07 16:02:26 2011 +0000" }, "message": "genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)\n\nThis fixes a regression introduced by e59347a \"arm: orion:\nUse generic irq chip\".\n\nDepending on the device, interrupts acknowledgement is done by setting\nor by clearing a dedicated register. Replace irq_gc_ack() with some\n{set,clr}_bit variants allows to handle both cases.\n\nNote that this patch affects the following SoCs: Davinci, Samsung and\nOrion. Except for this last, the change is minor: irq_gc_ack() is just\nrenamed into irq_gc_ack_set_bit().\n\nFor the Orion SoCs, the edge GPIO interrupts support is currently\nbroken. irq_gc_ack() try to acknowledge a such interrupt by setting\nthe corresponding cause register bit. The Orion GPIO device expect the\nopposite. To fix this issue, the irq_gc_ack_clr_bit() variant is used.\n\nTested on Network Space v2.\n\nReported-by: Joey Oravec \u003cjoravec@drewtech.com\u003e\nSigned-off-by: Simon Guinot \u003csguinot@lacie.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "f2230156c74b8923ff7b84eab955761471104b9b", "tree": "2760d5c604c47cae00d834bf9a3d05a2ee8d16cd", "parents": [ "75dc25a8708d905afffd6da5f4fe69356f4eac33" ], "author": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Wed Jul 06 16:53:21 2011 -0700" }, "committer": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Wed Jul 06 19:45:30 2011 -0700" }, "message": "ion: fix ION_HEAP_\u003cxxx\u003e_MASK definitions\n\nSigned-off-by: Iliyan Malchev \u003cmalchev@google.com\u003e\n" }, { "commit": "0e373639ad7c7ef2b0c9cf907574b266791b9778", "tree": "2600fab3cee4360311a3e0784aa2498dc9cceb6a", "parents": [ "b84e773119e1401e6ebd8906fb0b2a43bbe64871" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Wed Jul 06 15:42:58 2011 -0500" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Jul 06 14:58:09 2011 -0600" }, "message": "dt: add helper function to read u32 arrays\n\nRework of_property_read_u32 to read an array of values. Then\nof_property_read_u32 becomes an inline with array size of 1.\n\nAlso make struct device_node ptr const.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "e4c2fb0d5776b58049d2556b456144a4db3fe5a9", "tree": "04cebbb24f524408728492cfeb396d66aa6127e4", "parents": [ "cd62287e364c0d15d517c6ced4e4808b54711475" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue Jul 05 10:56:32 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Jul 05 11:28:18 2011 +0200" }, "message": "sched: Disable (revert) SCHED_LOAD_SCALE increase\n\nAlex reported that commit c8b281161df (\"sched: Increase\nSCHED_LOAD_SCALE resolution\") caused a power usage regression\nunder light load as it increases the number of load-balance\noperations and keeps idle cpus from staying idle.\n\nTime has run out to find the root cause for this release so\ndisable the feature for v3.0 until we can figure out what\ncauses the problem.\n\nReported-by: \"Alex, Shi\" \u003calex.shi@intel.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Nikhil Rao \u003cncrao@google.com\u003e\nCc: Ming Lei \u003ctom.leiming@gmail.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/n/tip-m4onxn0sxnyn5iz9o88eskc3@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "aababb9766f0e874da26a17acbbec867bf9501f0", "tree": "4dea1f04d8c6d66ce00bb0ab49b939c165c3f33b", "parents": [ "b2bc4782191cb574924a1d09f48083ea8b33a93b", "3e86f1d8e397b1ef59a97910089e16a99e8f31f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 04 15:53:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 04 15:53:53 2011 -0700" }, "message": "Merge branch \u0027fbdev-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x\n\n* \u0027fbdev-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x:\n vesafb: fix memory leak\n fbdev: amba: Link fb device to its parent\n fsl-diu-fb: remove check for pixel clock ranges\n udlfb: Correct sub-optimal resolution selection.\n hecubafb: add module_put on error path in hecubafb_probe()\n sm501fb: fix section mismatch warning\n gx1fb: Fix section mismatch warnings\n fbdev: sh_mobile_meram: Correct pointer check for YCbCr chroma plane\n" }, { "commit": "f09bc831b7693f93ecb95dea7180d55b45b88e76", "tree": "d47c3408c86b147c77dd33e5295c7892ae8a9f7f", "parents": [ "a3b853633d78c3930b513ee219df48637ac82eed" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Mon Jul 04 09:01:18 2011 +0800" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sun Jul 03 23:47:22 2011 -0600" }, "message": "dt: add \u0027const\u0027 for of_property_read_string parameter **out_string\n\nThe existing dt codes usually call of_get_property to get a string\nproperty and save it as a \u0027const char *\u0027. The patch adds\u0027const\u0027 for\nof_property_read_string parameter **out_string to make the converting\nof existing code a little easier.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "e6ee124528d520d429bf40303340e8be0bcefdaa", "tree": "e2d4fd0c9d9c5c6444e5425310f11cf54b134c2b", "parents": [ "c80005ae9ef788dce825629ea07e658714a2adad" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Thu Jun 30 12:19:55 2011 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Thu Jun 30 15:15:14 2011 -0700" }, "message": "gpu: ion: Several fixes\n\nFix some cases where locks were not released on error paths\nChange heap-\u003eprio to heap-\u003eid to make meaning clearer\nFix kernel doc to match sources\n" }, { "commit": "a3b853633d78c3930b513ee219df48637ac82eed", "tree": "30d36c4b3e03db070f72eeaeed3f2d1dd1da159b", "parents": [ "7423734e19e7e0a90e3379152eacca2647f4377e" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Thu Jun 30 21:26:10 2011 +0530" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jun 30 13:02:10 2011 -0600" }, "message": "dt: add helper functions to read u32 and string property values\n\nAdd helper functions to retrieve unsigned integer and string property\nvalues from properties of a device node. These helper functions can be\nused to lookup a property in a device node, perform error checking and\nread the property value.\n\n[grant.likely@secretlab.ca: Proposal and initial implementation]\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\n[grant.likely: some word smithing and be more defensive validating the string]\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "7b28afe01ab6ffb5f152f47831b44933facd2328", "tree": "a537d78f49fa1b959c9a453f459c1acd767a939f", "parents": [ "726e99ab88db059fe1422e15376ae404f8c66eb4", "86e1e98e5c6b4edab97e2b058466ef553cfd878e" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Jun 30 10:10:50 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Jun 30 10:10:50 2011 +0200" }, "message": "Merge branch \u0027for-3.0-important\u0027 of git://git.drbd.org/linux-2.6-drbd into for-linus\n" }, { "commit": "15b493d11fcce3c5547e3d7fb6d90e11ffe12777", "tree": "0638c261a1ca0ce54e1cbeb3ddaab10075717b27", "parents": [ "cb6518cbef5e3e36b7ae90fcab610a52ea7e9fc0" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Tue Jun 28 09:48:48 2011 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu Jun 30 09:23:45 2011 +0200" }, "message": "drbd: fix limit define, we support 1 PiByte now\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "c80005ae9ef788dce825629ea07e658714a2adad", "tree": "2fe6bc7a2b3341fa1465ce5a63a696d7f5e3ad97", "parents": [ "e55d4fa96762fd767a3b6d842c904e994db6bb2e" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed Jun 29 19:44:29 2011 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed Jun 29 19:44:29 2011 -0700" }, "message": "gpu: ion: Add ION Memory Manager\n\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "e55d4fa96762fd767a3b6d842c904e994db6bb2e", "tree": "c74157e01cb128cb97f106a50cfadc4c8b872c41", "parents": [ "e32c14667e4fe9f16ac9b918d15d29abd2315a55", "b0af8dfdd67699e25083478c63eedef2e72ebd85" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 29 13:54:42 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 29 13:54:42 2011 -0700" }, "message": "Merge commit \u0027v3.0-rc5\u0027 into android-3.0\n" }, { "commit": "c89b857ce6d803905b2c9d71bc9effdd286c45ed", "tree": "6cf4a6e23f68f3b65906210dccb272ab2f9c5c74", "parents": [ "2e34b429a404675dc4fc4ad2ee339eea028da3ca", "663dd6dcaf7e95526e469e91f41972a9c0cca30c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:36 2011 -0700" }, "message": "Merge branch \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:\n Connector: Correctly set the error code in case of success when dispatching receive callbacks\n Connector: Set the CN_NETLINK_USERS correctly\n pti: PTI semantics fix in pti_tty_cleanup.\n pti: ENXIO error case memory leak PTI fix.\n pti: double-free security PTI fix\n drivers:misc: ti-st: fix skipping of change remote baud\n drivers/base/platform.c: don\u0027t mark platform_device_register_resndata() as __init_or_module\n st_kim: Handle case of no device found for ID 0\n firmware: fix GOOGLE_SMI kconfig dependency warning\n" }, { "commit": "04b905942b482092a547798a2477f21e32a8f65d", "tree": "9ad2837587f5ce284f830432fec3569ecf44fbcb", "parents": [ "d90ce8711ceb516de823ae878270e5a21d11dede", "3bc46b312b1486b1fe2db4246a34a30160d26d8d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:14:55 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:14:55 2011 -0700" }, "message": "Merge branch \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n serial: bcm63xx_uart: fix irq storm after rx fifo overrun.\n amba pl011: platform data for reg lockup and glitch v2\n amba pl011: workaround for uart registers lockup\n tty: n_gsm: improper skb_pull() use was leaking framed data\n tty: n_gsm: Fixed logic to decode break signal from modem status\n TTY: ntty, add one more sanity check\n TTY: ldisc, do not close until there are readers\n 8250: Fix capabilities when changing the port type\n 8250_pci: Fix missing const from merges\n ARM: SAMSUNG: serial: Fix on handling of one clock source for UART\n serial: ioremap warning fix for jsm driver.\n 8250_pci: add -ENODEV code for Intel EG20T PCH\n" }, { "commit": "08142579b6ca35883c1ed066a2681de6f6917062", "tree": "00735ed37753533f3b645714770b4fb036b5f7e0", "parents": [ "9b679320a5fbf46454011e5c62e0b8991b0956d1" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jun 27 16:18:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "mm: fix assertion mapping-\u003enrpages \u003d\u003d 0 in end_writeback()\n\nUnder heavy memory and filesystem load, users observe the assertion\nmapping-\u003enrpages \u003d\u003d 0 in end_writeback() trigger. This can be caused by\npage reclaim reclaiming the last page from a mapping in the following\nrace:\n\n\tCPU0\t\t\t\tCPU1\n ...\n shrink_page_list()\n __remove_mapping()\n __delete_from_page_cache()\n radix_tree_delete()\n\t\t\t\t\tevict_inode()\n\t\t\t\t\t truncate_inode_pages()\n\t\t\t\t\t truncate_inode_pages_range()\n\t\t\t\t\t pagevec_lookup() - finds nothing\n\t\t\t\t\t end_writeback()\n\t\t\t\t\t mapping-\u003enrpages !\u003d 0 -\u003e BUG\n page-\u003emapping \u003d NULL\n mapping-\u003enrpages--\n\nFix the problem by doing a reliable check of mapping-\u003enrpages under\nmapping-\u003etree_lock in end_writeback().\n\nAnalyzed by Jay \u003cjinshan.xiong@whamcloud.com\u003e, lost in LKML, and dug out\nby Miklos Szeredi \u003cmszeredi@suse.de\u003e.\n\nCc: Jay \u003cjinshan.xiong@whamcloud.com\u003e\nCc: Miklos Szeredi \u003cmszeredi@suse.de\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "507c5f1224014f9956e604ee8703b3bbea7da4a4", "tree": "8af568077785c6159d5698741215b282788d661c", "parents": [ "2b4b2482e70eba10dd98653a3a5ac68126565e24" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Mon Jun 27 16:18:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "include/linux/compat.h: declare compat_sys_sendmmsg()\n\nThis is required for tilegx to be able to use the compat unistd.h header\nwhere compat_sys_sendmmsg() is now mentioned.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d9d90e5eb70e09903dadff42099b6c948f814050", "tree": "c3ab73df6dee61f9403bfd819a6b0cb9f3ca6085", "parents": [ "94c1e62df4494b79782cb9c7279f827212d1de70" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:04 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "tmpfs: add shmem_read_mapping_page_gfp\n\nAlthough it is used (by i915) on nothing but tmpfs, read_cache_page_gfp()\nis unsuited to tmpfs, because it inserts a page into pagecache before\ncalling the filesystem\u0027s -\u003ereadpage: tmpfs may have pages in swapcache\nwhich only it knows how to locate and switch to filecache.\n\nAt present tmpfs provides a -\u003ereadpage method, and copes with this by\ncopying pages; but soon we can simplify it by removing its -\u003ereadpage.\nProvide shmem_read_mapping_page_gfp() now, ready for that transition,\n\nExport shmem_read_mapping_page_gfp() and add it to list in shmem_fs.h,\nwith shmem_read_mapping_page() inline for the common mapping_gfp case.\n\n(shmem_read_mapping_page_gfp or shmem_read_cache_page_gfp? Generally the\nread_mapping_page functions use the mapping\u0027s -\u003ereadpage, and the\nread_cache_page functions use the supplied filler, so I think\nread_cache_page_gfp was slightly misnamed.)\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "94c1e62df4494b79782cb9c7279f827212d1de70", "tree": "43013fb403e592c535e6a7770be105b635ac9b63", "parents": [ "072441e21ddcd1140606b7d4ef6eab579a86b0b3" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:03 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "tmpfs: take control of its truncate_range\n\n2.6.35\u0027s new truncate convention gave tmpfs the opportunity to control\nits file truncation, no longer enforced from outside by vmtruncate().\nWe shall want to build upon that, to handle pagecache and swap together.\n\nSlightly redefine the -\u003etruncate_range interface: let it now be called\nbetween the unmap_mapping_range()s, with the filesystem responsible for\ndoing the truncate_inode_pages_range() from it - just as the filesystem\nis nowadays responsible for doing that from its -\u003esetattr.\n\nLet\u0027s rename shmem_notify_change() to shmem_setattr(). Instead of\ncalling the generic truncate_setsize(), bring that code in so we can\ncall shmem_truncate_range() - which will later be updated to perform its\nown variant of truncate_inode_pages_range().\n\nRemove the punch_hole unmap_mapping_range() from shmem_truncate_range():\nnow that the COW\u0027s unmap_mapping_range() comes after -\u003etruncate_range,\nthere is no need to call it a third time.\n\nExport shmem_truncate_range() and add it to the list in shmem_fs.h, so\nthat i915_gem_object_truncate() can call it explicitly in future; get\nthis patch in first, then update drm/i915 once this is available (until\nthen, i915 will just be doing the truncate_inode_pages() twice).\n\nThough introduced five years ago, no other filesystem is implementing\n-\u003etruncate_range, and its only other user is madvise(,,MADV_REMOVE): we\nexpect to convert it to fallocate(,FALLOC_FL_PUNCH_HOLE,,) shortly,\nwhereupon -\u003etruncate_range can be removed from inode_operations -\nshmem_truncate_range() will help i915 across that transition too.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "072441e21ddcd1140606b7d4ef6eab579a86b0b3", "tree": "6f059ad83c09dfbeb1def29e805839db3e5bf85f", "parents": [ "5b8ba10198a109f8a02380648c5d29000caa9c55" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "mm: move shmem prototypes to shmem_fs.h\n\nBefore adding any more global entry points into shmem.c, gather such\nprototypes into shmem_fs.h. Remove mm\u0027s own declarations from swap.h,\nbut for now leave the ones in mm.h: because shmem_file_setup() and\nshmem_zero_setup() are called from various places, and we should not\nforce other subsystems to update immediately.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4d258b25d947521c8b913154db61ec55198243f8", "tree": "4f74f744797e92a0555705dc121ac8aaa041e750", "parents": [ "a64227b0855c42b5c037011afa80580ca3228527" ], "author": { "name": "Vitaliy Ivanov", "email": "vitalivanov@gmail.com", "time": "Mon Jun 27 19:07:08 2011 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 16:06:19 2011 -0700" }, "message": "Fix some kernel-doc warnings\n\nFix \u0027make htmldocs\u0027 warnings:\n\n Warning(/include/linux/hrtimer.h:153): No description found for parameter \u0027clockid\u0027\n Warning(/include/linux/device.h:604): Excess struct/union/enum/typedef member \u0027of_match\u0027 description in \u0027device\u0027\n Warning(/include/net/sock.h:349): Excess struct/union/enum/typedef member \u0027sk_rmem_alloc\u0027 description in \u0027sock\u0027\n\nSigned-off-by: Vitaliy Ivanov \u003cvitalivanov@gmail.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a64227b0855c42b5c037011afa80580ca3228527", "tree": "8633fc0989fd6e53c9f3f0bb5774c1a54bd5f18e", "parents": [ "c6830c22603aaecf65405af23f6da2d55892f9cb", "c31b55cd4eaf050bb5a15bd8251da1b3c7edeb1c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 14:55:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 14:55:43 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n mmc: queue: bring discard_granularity/alignment into line with SCSI\n mmc: queue: append partition subname to queue thread name\n mmc: core: make erase timeout calculation allow for gated clock\n mmc: block: switch card to User Data Area when removing the block driver\n mmc: sdio: reset card during power_restore\n mmc: cb710: fix #ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS\n mmc: sdhi: DMA slave ID 0 is invalid\n mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handling\n mmc: omap_hsmmc: use original sg_len for dma_unmap_sg\n mmc: omap_hsmmc: fix ocr mask usage\n mmc: sdio: fix runtime PM path during driver removal\n mmc: Add PCI fixup quirks for Ricoh 1180:e823 reader\n mmc: sdhi: fix module unloading\n mmc: of_mmc_spi: add NO_IRQ define to of_mmc_spi.c\n mmc: vub300: fix null dereferences in error handling\n" }, { "commit": "c6830c22603aaecf65405af23f6da2d55892f9cb", "tree": "19458ebc7c32bef8a4ed59630cabb5785b1bdc11", "parents": [ "af4087e0e682df12bdffec5cfafc2fec9208716e" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Thu Jun 16 17:28:07 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 14:13:09 2011 -0700" }, "message": "Fix node_start/end_pfn() definition for mm/page_cgroup.c\n\ncommit 21a3c96 uses node_start/end_pfn(nid) for detection start/end\nof nodes. But, it\u0027s not defined in linux/mmzone.h but defined in\n/arch/???/include/mmzone.h which is included only under\nCONFIG_NEED_MULTIPLE_NODES\u003dy.\n\nThen, we see\n mm/page_cgroup.c: In function \u0027page_cgroup_init\u0027:\n mm/page_cgroup.c:308: error: implicit declaration of function \u0027node_start_pfn\u0027\n mm/page_cgroup.c:309: error: implicit declaration of function \u0027node_end_pfn\u0027\n\nSo, fixiing page_cgroup.c is an idea...\n\nBut node_start_pfn()/node_end_pfn() is a very generic macro and\nshould be implemented in the same manner for all archs.\n(m32r has different implementation...)\n\nThis patch removes definitions of node_start/end_pfn() in each archs\nand defines a unified one in linux/mmzone.h. It\u0027s not under\nCONFIG_NEED_MULTIPLE_NODES, now.\n\nA result of macro expansion is here (mm/page_cgroup.c)\n\nfor !NUMA\n start_pfn \u003d ((\u0026contig_page_data)-\u003enode_start_pfn);\n end_pfn \u003d ({ pg_data_t *__pgdat \u003d (\u0026contig_page_data); __pgdat-\u003enode_start_pfn + __pgdat-\u003enode_spanned_pages;});\n\nfor NUMA (x86-64)\n start_pfn \u003d ((node_data[nid])-\u003enode_start_pfn);\n end_pfn \u003d ({ pg_data_t *__pgdat \u003d (node_data[nid]); __pgdat-\u003enode_start_pfn + __pgdat-\u003enode_spanned_pages;});\n\nChangelog:\n - fixed to avoid using \"nid\" twice in node_end_pfn() macro.\n\nReported-and-acked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nReported-and-tested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: Mel Gorman \u003cmgorman@suse.de\u003e\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5220cc9382e11ca955ce946ee6a5bac577bb14ff", "tree": "7949f52a5ca0c7fa74ec8e49ba89a00d0e4114a9", "parents": [ "726ce0656b99ac6436b590d83613fe8447b4769e", "155d109b5f52ffd749219b27702462dcd9cf4f8d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 24 08:42:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 24 08:42:35 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: add REQ_SECURE to REQ_COMMON_MASK\n block: use the passed in @bdev when claiming if partno is zero\n block: Add __attribute__((format(printf...) and fix fallout\n block: make disk_block_events() properly wait for work cancellation\n block: remove non-syncing __disk_block_events() and fold it into disk_block_events()\n block: don\u0027t use non-syncing event blocking in disk_check_events()\n cfq-iosched: fix locking around ioc-\u003eioc_data assignment\n" }, { "commit": "39785eb1d3e6c58cc8bf8f6990956a58037ecc75", "tree": "b896a48b483803124c940ff99e7ffdfd4a4a171c", "parents": [ "9377c51752970c305fae29ac634501fde44378cb" ], "author": { "name": "Timur Tabi", "email": "timur@freescale.com", "time": "Thu Jun 23 20:20:26 2011 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Jun 24 17:08:49 2011 +0900" }, "message": "fsl-diu-fb: remove check for pixel clock ranges\n\nThe Freescale DIU framebuffer driver defines two constants, MIN_PIX_CLK and\nMAX_PIX_CLK, that are supposed to represent the lower and upper limits of\nthe pixel clock. These values, however, are true only for one platform\nclock rate (533MHz) and only for the MPC8610. So the actual range for\nthe pixel clock is chip-specific, which means the current values are almost\nalways wrong. The chance of an out-of-range pixel clock being used are also\nremote.\n\nRather than try to detect an out-of-range clock in the DIU driver, we depend\non the board-specific pixel clock function (e.g. p1022ds_set_pixel_clock)\nto clamp the pixel clock to a supported value.\n\nSigned-off-by: Timur Tabi \u003ctimur@freescale.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "68d0080f1e222757c85606d3eaf81b5c4aa7719f", "tree": "5f177f7571a56e7dfe3888f67fcc86532be8235c", "parents": [ "f957db4fcdd8f03e186aa8f041f4049e76ab741c", "a5f76d5eba157bf637beb2dd18026db2917c512e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 22 21:08:52 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 22 21:08:52 2011 -0700" }, "message": "Merge branch \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6\n\n* \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:\n PCI / PM: Block races between runtime PM and system sleep\n PM / Domains: Update documentation\n PM / Runtime: Handle clocks correctly if CONFIG_PM_RUNTIME is unset\n PM: Fix async resume following suspend failure\n PM: Free memory bitmaps if opening /dev/snapshot fails\n PM: Rename dev_pm_info.in_suspend to is_prepared\n PM: Update documentation regarding sysdevs\n PM / Runtime: Update doc: usage count no longer incremented across system PM\n" }, { "commit": "2992c4bd5742b31a0ee00a76eee9c1c284507418", "tree": "b2af7d776ec6a4ae69b5f245ee0586359a99eabd", "parents": [ "e08f6d4131ab964420f0bcabecc68d75fb49df79", "1650add23578b5ca35c1f1e863987180a8c03779" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 21 18:20:55 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 21 18:20:55 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 NFS: Fix decode_secinfo_maxsz\n NFSv4.1: Fix an off-by-one error in pnfs_generic_pg_test\n NFSv4.1: Fix some issues with pnfs_generic_pg_test\n NFSv4.1: file layout must consider pg_bsize for coalescing\n pnfs-obj: No longer needed to take an extra ref at add_device\n SUNRPC: Ensure the RPC client only quits on fatal signals\n NFSv4: Fix a readdir regression\n nfs4.1: mark layout as bad on error path in _pnfs_return_layout\n nfs4.1: prevent race that allowed use of freed layout in _pnfs_return_layout\n NFSv4.1: need to put_layout_hdr on _pnfs_return_layout error path\n NFS: (d)printks should use %zd for ssize_t arguments\n NFSv4.1: fix break condition in pnfs_find_lseg\n nfs4.1: fix several problems with _pnfs_return_layout\n NFSv4.1: allow zero fh array in filelayout decode layout\n NFSv4.1: allow nfs_fhget to succeed with mounted on fileid\n NFSv4.1: Fix a refcounting issue in the pNFS device id cache\n NFSv4.1: deprecate headerpadsz in CREATE_SESSION\n NFS41: do not update isize if inode needs layoutcommit\n NLM: Don\u0027t hang forever on NLM unlock requests\n NFS: fix umount of pnfs filesystems\n" }, { "commit": "6d0e0e84f66d32c33511984dd3badd32364b863c", "tree": "215916af1632fbaff9d46676d14dafd52143d578", "parents": [ "8440f4b19494467883f8541b7aa28c7bbf6ac92b" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Sat Jun 18 22:42:09 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 21 23:20:20 2011 +0200" }, "message": "PM: Fix async resume following suspend failure\n\nThe PM core doesn\u0027t handle suspend failures correctly when it comes to\nasynchronously suspended devices. These devices are moved onto the\ndpm_suspended_list as soon as the corresponding async thread is\nstarted up, and they remain on the list even if they fail to suspend\nor the sleep transition is cancelled before they get suspended. As a\nresult, when the PM core unwinds the transition, it tries to resume\nthe devices even though they were never suspended.\n\nThis patch (as1474) fixes the problem by adding a new \"is_suspended\"\nflag to dev_pm_info. Devices are resumed only if the flag is set.\n\n[rjw:\n * Moved the dev-\u003epower.is_suspended check into device_resume(),\n because we need to complete dev-\u003epower.completion and clear\n dev-\u003epower.is_prepared too for devices whose\n dev-\u003epower.is_suspended flags are unset.\n * Fixed __device_suspend() to avoid setting dev-\u003epower.is_suspended\n if async_error is different from zero.]\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@kernel.org\n" }, { "commit": "f76b168b6f117a49d36307053e1acbe30580ea5b", "tree": "2aa0cc19b27764d8eb55ce85eaf226a60ce27756", "parents": [ "78420884e680da8fbc3240de2d3106437042381e" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Sat Jun 18 20:22:23 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 21 23:19:50 2011 +0200" }, "message": "PM: Rename dev_pm_info.in_suspend to is_prepared\n\nThis patch (as1473) renames the \"in_suspend\" field in struct\ndev_pm_info to \"is_prepared\", in preparation for an upcoming change.\nThe new name is more descriptive of what the field really means.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@kernel.org\n" }, { "commit": "890879cfa08f5ceaa09810611f46e890f7d57ff6", "tree": "c8898ae7a5bf00f315cfaa13d58a08aafa5002f9", "parents": [ "56299378726d5f2ba8d3c8cbbd13cb280ba45e4f", "de1b794130b130e77ffa975bb58cb843744f9ae5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 21 10:22:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 21 10:22:35 2011 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:\n jbd2: Fix oops in jbd2_journal_remove_journal_head()\n jbd2: Remove obsolete parameters in the comments for some jbd2 functions\n ext4: fixed tracepoints cleanup\n ext4: use FIEMAP_EXTENT_LAST flag for last extent in fiemap\n ext4: Fix max file size and logical block counting of extent format file\n ext4: correct comments for ext4_free_blocks()\n" }, { "commit": "15c3597d6ea47e8f3caf068887c4666165df63ad", "tree": "22f7b13f99898152da64f19a17f7a16b93e0187e", "parents": [ "5de1540b7bc4c23470f86add1e517be41e7fefe2" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 21 10:59:35 2011 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 21 11:04:10 2011 -0600" }, "message": "dt/platform: allow device name to be overridden\n\nSome platform code has specific requirements on the naming of devices.\nThis patch allows callers of of_platform_populate() to provide a\ndevice name lookup table.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "29d4f8a4974aacf46b028fa92f9dd3ffdba3e614", "tree": "35641937ac753b8b5d0255ef9ef312024e09a785", "parents": [ "cbb49c2665eebfd1fa2e491403684d0542662137" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 21 10:59:34 2011 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 21 11:02:29 2011 -0600" }, "message": "dt: add of_platform_populate() for creating device from the device tree\n\nof_platform_populate() is similar to of_platform_bus_probe() except\nthat it strictly enforces that all device nodes must have a compatible\nproperty, and it can be used to register devices (not buses) which are\nchildren of the root node.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "cbb49c2665eebfd1fa2e491403684d0542662137", "tree": "11f0d7496cf070c8fedaa5dede9f79b60219d0c3", "parents": [ "56299378726d5f2ba8d3c8cbbd13cb280ba45e4f" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 21 10:59:34 2011 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 21 11:02:29 2011 -0600" }, "message": "dt: Add default match table for bus ids\n\nNo need for most platforms to define their own bus table when calling\nof_platform_populate(). Supply a stock one.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "79568f5be06c91071697c065f01f3ebfbeb25a61", "tree": "81fc2bb54bebffc7ef22390bfc37c7ba818a30df", "parents": [ "f5fc5567dd24c15b1d95aa9ee2aaada04d835a0c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:13:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:13:49 2011 -0700" }, "message": "vfs: i_state needs to be \u0027unsigned long\u0027 for now\n\nCommit 13e12d14e2dc (\"vfs: reorganize \u0027struct inode\u0027 layout a bit\")\nmoved things around a bit changed i_state to be unsigned int instead of\nunsigned long. That was to help structure layout for the 64-bit case,\nand shrink \u0027struct inode\u0027 a bit (admittedly that only happened when\nspinlock debugging was on and i_flags didn\u0027t pack with i_lock).\n\nHowever, Meelis Roos reports that this results in unaligned exceptions\non sprc, and it turns out that the bit-locking primitives that we use\nfor the I_NEW bit want to use the bitops. Which want \u0027unsigned long\u0027,\nnot \u0027unsigned int\u0027.\n\nWe really should fix the bit locking code to not have that kind of\nrequirement, but that\u0027s a much bigger change. So for now, revert that\nfield back to \u0027unsigned long\u0027 (but keep the other re-ordering changes\nfrom the commit that caused this).\n\nAndi points out that we have played games with this in \u0027struct page\u0027, so\nit\u0027s solvable with other hacks too, but since right now the struct inode\nsize advantage only happens with some rare config options, it\u0027s not\nworth fighting.\n\nIt _would_ be worth fixing the bitlocking code, though. Especially\nsince there is no type safety in the bitlocking code (this never caused\nany warnings, and worked fine on x86-64, because the bitlocks take a\n\u0027void *\u0027 and x86-64 doesn\u0027t care that deeply about alignment). So it\u0027s\ncurrently a very easy problem to trigger by mistake and never notice.\n\nReported-by: Meelis Roos \u003cmroos@linux.ee\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "eda0841094a3a232357ca10a24b40da461db3fcf", "tree": "08f6ffd17275e6fab7bd8014d849d2fce46632d9", "parents": [ "6e158d21986fa15d21fd32cf241d167d4d741ae3", "105f4622104848ff1ee1f644d661bef9dec3eb27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:10:52 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:10:52 2011 -0700" }, "message": "Merge branch \u0027for-2.6.40\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-2.6.40\u0027 of git://linux-nfs.org/~bfields/linux:\n nfsd4: fix break_lease flags on nfsd open\n nfsd: link returns nfserr_delay when breaking lease\n nfsd: v4 support requires CRYPTO\n nfsd: fix dependency of nfsd on auth_rpcgss\n" }, { "commit": "36698206504fca9198b8563f1fc2c9e38e063e11", "tree": "f02b63c9b35a7962786b5dcdb1af15a63f5de1cf", "parents": [ "ef46222e7b56e728e423527d430cb2013c595491", "482e0cd3dbaa70f2a2bead4b5f2c0d203ef654ba" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:09:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:09:15 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n devcgroup_inode_permission: take \"is it a device node\" checks to inlined wrapper\n fix comment in generic_permission()\n kill obsolete comment for follow_down()\n proc_sys_permission() is OK in RCU mode\n reiserfs_permission() doesn\u0027t need to bail out in RCU mode\n proc_fd_permission() is doesn\u0027t need to bail out in RCU mode\n nilfs2_permission() doesn\u0027t need to bail out in RCU mode\n logfs doesn\u0027t need -\u003epermission() at all\n coda_ioctl_permission() is safe in RCU mode\n cifs_permission() doesn\u0027t need to bail out in RCU mode\n bad_inode_permission() is safe from RCU mode\n ubifs: dereferencing an ERR_PTR in ubifs_mount()\n" }, { "commit": "934abcf52a9831d35fb578048b737313e5a9e717", "tree": "4074b53eac0c6fec645b622ec421e01054e77bbd", "parents": [ "d8cfaaaf6817a0279f0faef8ee5ddd52de12839a" ], "author": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Mon Jun 20 12:41:46 2011 -0700" }, "committer": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Mon Jun 20 13:15:08 2011 -0700" }, "message": "netfilter: add xt_qtaguid matching module\n\nThis module allows tracking stats at the socket level for given UIDs.\nIt replaces xt_owner.\nIf the --uid-owner is not specified, it will just count stats based on\nwho the skb belongs to. This will even happen on incoming skbs as it\nlooks into the skb via xt_socket magic to see who owns it.\nIf an skb is lost, it will be assigned to uid\u003d0.\n\nTo control what sockets of what UIDs are tagged by what, one uses:\n echo t $sock_fd $accounting_tag $the_billed_uid \\\n \u003e /proc/net/xt_qtaguid/ctrl\n So whenever an skb belongs to a sock_fd, it will be accounted against\n $the_billed_uid\n and matching stats will show up under the uid with the given\n $accounting_tag.\n\nBecause the number of allocations for the stats structs is not that big:\n ~500 apps * 32 per app\nwe\u0027ll just do it atomic. This avoids walking lists many times, and\nthe fancy worker thread handling. Slabs will grow when needed later.\n\nIt use netdevice and inetaddr notifications instead of hooks in the core dev\ncode to track when a device comes and goes. This removes the need for\nexposed iface_stat.h.\n\nPut procfs dirs in /proc/net/xt_qtaguid/\n ctrl\n stats\n iface_stat/\u003ciface\u003e/...\nThe uid stats are obtainable in ./stats.\n\nChange-Id: I01af4fd91c8de651668d3decb76d9bdc1e343919\nSigned-off-by: JP Abgrall \u003cjpa@google.com\u003e\n" }, { "commit": "d8cfaaaf6817a0279f0faef8ee5ddd52de12839a", "tree": "4c6bdd7fad3e803b74e2870b2dbccbe3aa16421e", "parents": [ "cf7addf29b41f90d979267b2c5111ec6d137231a" ], "author": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Wed Jun 15 16:52:40 2011 -0700" }, "committer": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Mon Jun 20 13:15:08 2011 -0700" }, "message": "nf: xt_socket: export the fancy sock finder code\n\nThe socket matching function has some nifty logic to get the struct sock\nfrom the skb or from the connection tracker.\nWe export this so other xt_* can use it, similarly to ho how\nxt_socket uses nf_tproxy_get_sock.\n\nChange-Id: I11c58f59087e7f7ae09e4abd4b937cd3370fa2fd\nSigned-off-by: JP Abgrall \u003cjpa@google.com\u003e\n" }, { "commit": "19345cb299e8234006c5125151ab723e851a1d24", "tree": "43bde1db751eb50afbdabfbd26814431c8be573c", "parents": [ "df18d127f4fed7a0284bcfa8d2843800cdb63b72" ], "author": { "name": "Benny Halevy", "email": "benny@tonian.com", "time": "Sun Jun 19 18:33:46 2011 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Jun 20 16:12:26 2011 -0400" }, "message": "NFSv4.1: file layout must consider pg_bsize for coalescing\n\nOtherwise we end up overflowing the rpc buffer size on the receive end.\n\nSigned-off-by: Benny Halevy \u003cbenny@tonian.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" } ], "next": "c01ad4081939f91ebd7277e8e731fd90ceb3e632" }