)]}' { "log": [ { "commit": "b78049831ffed65f0b4e61f69df14f3ab17922cb", "tree": "196c37c7eeab26e5e71d4735cb4dd7a0fa9951df", "parents": [ "6bce98edc3365a8f780ff3944ac7992544c194fe" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Tue Sep 20 11:23:49 2011 -0400" }, "committer": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Tue Sep 20 23:24:44 2011 -0400" }, "message": "lib: add error checking to hex2bin\n\nhex2bin converts a hexadecimal string to its binary representation.\nThe original version of hex2bin did not do any error checking. This\npatch adds error checking and returns the result.\n\nChangelog v1:\n- removed unpack_hex_byte()\n- changed return code from boolean to int\n\nChangelog:\n- use the new unpack_hex_byte()\n- add __must_check compiler option (Andy Shevchenko\u0027s suggestion)\n- change function API to return error checking result\n (based on Tetsuo Handa\u0027s initial patch)\n\nSigned-off-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\nAcked-by: Andy Shevchenko \u003candy.shevchenko@gmail.com\u003e\n" }, { "commit": "566be59ab86c0e030b980645a580d683a015a483", "tree": "c5d29c7db2f8ef93e970cb405621f59c57d01b94", "parents": [ "bf6d0f5dcda17df3cc5577e203d0f8ea1c2ad6aa" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Mon Aug 22 09:14:18 2011 -0400" }, "committer": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Wed Sep 14 15:24:52 2011 -0400" }, "message": "evm: permit mode bits to be updated\n\nBefore permitting \u0027security.evm\u0027 to be updated, \u0027security.evm\u0027 must\nexist and be valid. In the case that there are no existing EVM protected\nxattrs, it is safe for posix acls to update the mode bits.\n\nTo differentiate between no \u0027security.evm\u0027 xattr and no xattrs used to\ncalculate \u0027security.evm\u0027, this patch defines INTEGRITY_NOXATTR.\n\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\n" }, { "commit": "bf6d0f5dcda17df3cc5577e203d0f8ea1c2ad6aa", "tree": "c6c5f39d43fe0d27bc1d3aedbd2f9b3ba2f8f537", "parents": [ "a924ce0b35875ef9512135b46a32f4150fd700b2" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Thu Aug 18 18:07:44 2011 -0400" }, "committer": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Wed Sep 14 15:24:51 2011 -0400" }, "message": "evm: posix acls modify i_mode\n\nThe posix xattr acls are \u0027system\u0027 prefixed, which normally would not\naffect security.evm. An interesting side affect of writing posix xattr\nacls is their modifying of the i_mode, which is included in security.evm.\n\nThis patch updates security.evm when posix xattr acls are written.\n\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\n" }, { "commit": "5dbe3040c74eef18e66951347eda05b153e69328", "tree": "72c9e5f77deae00f1234e488254d4898cab32027", "parents": [ "7b98a5857c3fa86cb0a7e5f893643491a8b5b425" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Aug 30 13:48:53 2011 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Sep 09 16:56:33 2011 -0700" }, "message": "security: sparse fix: Move security_fixup_op to security.h\n\nFix sparse warning by moving declaraion to global header.\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "fc9ff9b7e3eaff3f49bc0fbbddfc1416212e888a", "tree": "bf2f9905f32040e7ad164dd9f2bff957af38b7b7", "parents": [ "852584157c55c1689bcf3809ea44b79870c3e409" ], "author": { "name": "rongqing.li@windriver.com", "email": "rongqing.li@windriver.com", "time": "Tue Sep 06 11:35:36 2011 +0800" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Sep 09 16:40:31 2011 -0700" }, "message": "security: Fix a typo\n\nFix a typo.\n\nSigned-off-by: Roy.Li \u003crongqing.li@windriver.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "1e39f384bb01b0395b69cb70c2cacae65012f203", "tree": "d80fa4881dd94a198a6a8c34212e04187dc136ab", "parents": [ "7d8db1808a2001077a9f966180c5e4f7cc20d4c7" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Mon Aug 15 09:09:16 2011 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Aug 16 09:23:44 2011 +1000" }, "message": "evm: fix build problems\n\n- Make the previously missing security_old_inode_init_security() stub\n function definition static inline.\n\n- The stub security_inode_init_security() function previously returned\n -EOPNOTSUPP and relied on the callers to change it to 0. The stub\n security/security_old_inode_init_security() functions now return 0.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "5a4730ba9517cf2793175991243436a24b1db18f", "tree": "2c9c26d4662a31c851aed525d4d032d08e54e297", "parents": [ "e1c9b23adbe86c725738402857397d7a29f9d6ef" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Thu Aug 11 00:22:52 2011 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Aug 11 17:42:41 2011 +1000" }, "message": "evm: fix evm_inode_init_security return code\n\nevm_inode_init_security() should return 0, when EVM is not enabled.\n(Returning an error is a remnant of evm_inode_post_init_security.)\n\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "e1c9b23adbe86c725738402857397d7a29f9d6ef", "tree": "746d85cd4518480507c7d01b4c25d39d4ef21805", "parents": [ "0b024d2446474c6a7c47573af5a35db83f557ce3" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Thu Aug 11 00:22:51 2011 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Aug 11 17:42:07 2011 +1000" }, "message": "evm: building without EVM enabled fixes\n\n- Missing \u0027inline\u0027 on evm_inode_setattr() definition.\nIntroduced by commit 817b54aa45db (\"evm: add evm_inode_setattr to prevent\nupdating an invalid security.evm\").\n\n- Missing security_old_inode_init_security() stub function definition.\nCaused by commit 9d8f13ba3f48 (\"security: new security_inode_init_security\nAPI adds function callback\").\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "5a2f3a02aea164f4f59c0c3497772090a411b462", "tree": "d3ebe03d4f97575290087843960baa01de3acd0a", "parents": [ "1d568ab068c021672d6cd7f50f92a3695a921ffb", "817b54aa45db03437c6d09a7693fc6926eb8e822" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Aug 09 10:31:03 2011 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Aug 09 10:31:03 2011 +1000" }, "message": "Merge branch \u0027next-evm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next\n\nConflicts:\n\tfs/attr.c\n\nResolve conflict manually.\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "3295514841c2112d94451ba5deaf54f5afb78ea9", "tree": "6df351cb1febbcd011d24fcf99d1b08167c68d5e", "parents": [ "7813b94a54987571082ff19e9d87eabbfec23b4e" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Sun Aug 07 18:55:11 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 07 13:42:35 2011 -0700" }, "message": "fix rcu annotations noise in cred.h\n\ntask-\u003ecred is declared as __rcu, and access to other tasks\u0027 -\u003ecred is,\nindeed, protected. Access to current-\u003ecred does not need rcu_dereference()\nat all, since only the task itself can change its -\u003ecred. sparse, of\ncourse, has no way of knowing that...\n\nAdd force-cast in current_cred(), make current_fsuid() et.al. use it.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c2f340a69cabe0fb7b9f02d1a2495927db225a06", "tree": "dd9bc3125f833adf163c47542917ebc18b1acc56", "parents": [ "3ddcd0569cd68f00f3beae9a7959b72918bb91f4", "cf283ade08c454e884394a4720f22421dd33a715" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 06 22:56:03 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 06 22:56:03 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.open-osd.org/linux-open-osd\n\n* \u0027for-linus\u0027 of git://git.open-osd.org/linux-open-osd:\n ore: Make ore its own module\n exofs: Rename raid engine from exofs/ios.c \u003d\u003e ore\n exofs: ios: Move to a per inode components \u0026 device-table\n exofs: Move exofs specific osd operations out of ios.c\n exofs: Add offset/length to exofs_get_io_state\n exofs: Fix truncate for the raid-groups case\n exofs: Small cleanup of exofs_fill_super\n exofs: BUG: Avoid sbi realloc\n exofs: Remove pnfs-osd private definitions\n nfs_xdr: Move nfs4_string definition out of #ifdef CONFIG_NFS_V4\n" }, { "commit": "3ddcd0569cd68f00f3beae9a7959b72918bb91f4", "tree": "3f7c591316560b1c22e2cc0700fbcd29aa3fbd7f", "parents": [ "830c0f0edca67403d361fe976a25b17356c11f19" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 06 22:45:50 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 06 22:53:23 2011 -0700" }, "message": "vfs: optimize inode cache access patterns\n\nThe inode structure layout is largely random, and some of the vfs paths\nreally do care. The path lookup in particular is already quite D$\nintensive, and profiles show that accessing the \u0027inode-\u003ei_op-\u003exyz\u0027\nfields is quite costly.\n\nWe already optimized the dcache to not unnecessarily load the d_op\nstructure for members that are often NULL using the DCACHE_OP_xyz bits\nin dentry-\u003ed_flags, and this does something very similar for the inode\nops that are used during pathname lookup.\n\nIt also re-orders the fields so that the fields accessed by \u0027stat\u0027 are\ntogether at the beginning of the inode structure, and roughly in the\norder accessed.\n\nThe effect of this seems to be in the 1-2% range for an empty kernel\n\"make -j\" run (which is fairly kernel-intensive, mostly in filename\nlookup), so it\u0027s visible. The numbers are fairly noisy, though, and\nlikely depend a lot on exact microarchitecture. So there\u0027s more tuning\nto be done.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "830c0f0edca67403d361fe976a25b17356c11f19", "tree": "b4bfc71ab9aaff0e8b65403c319dde519dd6f9ef", "parents": [ "7cd4767e696123cdb7447fbd7c281eb8c610c8e4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 06 22:41:50 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 06 22:52:40 2011 -0700" }, "message": "vfs: renumber DCACHE_xyz flags, remove some stale ones\n\nGcc tends to generate better code with small integers, including the\nDCACHE_xyz flag tests - so move the common ones to be first in the list.\nAlso just remove the unused DCACHE_INOTIFY_PARENT_WATCHED and\nDCACHE_AUTOFS_PENDING values, their users no longer exists in the source\ntree.\n\nAnd add a \"unlikely()\" to the DCACHE_OP_COMPARE test, since we want the\ncommon case to be a nice straight-line fall-through.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7cd4767e696123cdb7447fbd7c281eb8c610c8e4", "tree": "8a44dfbe0a131f6036eab36f887a058e9750fe69", "parents": [ "1957e7fdefce4494cb8d8f09ee2317b7ede24994", "6e5714eaf77d79ae1c8b47e3e040ff5411b717ec" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 06 22:12:37 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 06 22:12:37 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:\n net: Compute protocol sequence numbers and fragment IDs using MD5.\n crypto: Move md5_transform to lib/md5.c\n" }, { "commit": "8ff660ab85f524bdc7652eb5d38aaef1d66aa9c7", "tree": "c4a29cde4fc8654ae00e65cb520e13f9fe7f4e08", "parents": [ "9e9db45649eb5d3ee5622fdad741914ecf1016a0" ], "author": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Sat Aug 06 19:26:31 2011 -0700" }, "committer": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Sat Aug 06 19:36:18 2011 -0700" }, "message": "exofs: Rename raid engine from exofs/ios.c \u003d\u003e ore\n\nORE stands for \"Objects Raid Engine\"\n\nThis patch is a mechanical rename of everything that was in ios.c\nand its API declaration to an ore.c and an osd_ore.h header. The ore\nengine will later be used by the pnfs objects layout driver.\n\n* File ios.c \u003d\u003e ore.c\n\n* Declaration of types and API are moved from exofs.h to a new\n osd_ore.h\n\n* All used types are prefixed by ore_ from their exofs_ name.\n\n* Shift includes from exofs.h to osd_ore.h so osd_ore.h is\n independent, include it from exofs.h.\n\nOther than a pure rename there are no other changes. Next patch\nwill move the ore into it\u0027s own module and will export the API\nto be used by exofs and later the layout driver\n\nSigned-off-by: Boaz Harrosh \u003cbharrosh@panasas.com\u003e\n" }, { "commit": "6e5714eaf77d79ae1c8b47e3e040ff5411b717ec", "tree": "30bd0d7a6a0a6ff0ace6da1835ae7b7167cce5e4", "parents": [ "bc0b96b54a21246e377122d54569eef71cec535f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 03 20:50:44 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 06 18:33:19 2011 -0700" }, "message": "net: Compute protocol sequence numbers and fragment IDs using MD5.\n\nComputers have become a lot faster since we compromised on the\npartial MD4 hash which we use currently for performance reasons.\n\nMD5 is a much safer choice, and is inline with both RFC1948 and\nother ISS generators (OpenBSD, Solaris, etc.)\n\nFurthermore, only having 24-bits of the sequence number be truly\nunpredictable is a very serious limitation. So the periodic\nregeneration and 8-bit counter have been removed. We compute and\nuse a full 32-bit sequence number.\n\nFor ipv6, DCCP was found to use a 32-bit truncated initial sequence\nnumber (it needs 43-bits) and that is fixed here as well.\n\nReported-by: Dan Kaminsky \u003cdan@doxpara.com\u003e\nTested-by: Willy Tarreau \u003cw@1wt.eu\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc0b96b54a21246e377122d54569eef71cec535f", "tree": "b9cb6230c79da4b3a146af7d08c6c26f8d72024c", "parents": [ "de96355c111679dd6e2c5c73e25e814c72510c58" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 03 19:45:10 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 06 18:32:45 2011 -0700" }, "message": "crypto: Move md5_transform to lib/md5.c\n\nWe are going to use this for TCP/IP sequence number and fragment ID\ngeneration.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2560540b78b48c8050f56e8ff5903c11a4f7a16e", "tree": "fca860f19ef6845e0d61dad8d8e3648c059b4ecd", "parents": [ "45a05f9488911851f7a5c536df80b41f0105caf0", "15b956a0b5651bbb1217ec374fdd67291dabb2af" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 06 13:26:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 06 13:26:15 2011 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (38 commits)\n acer-wmi: support Lenovo ideapad S205 wifi switch\n acerhdf.c: spaces in aliased changed to *\n platform-drivers-x86: ideapad-laptop: add missing ideapad_input_exit in ideapad_acpi_add error path\n x86 driver: fix typo in TDP override enabling\n Platform: fix samsung-laptop DMI identification for N150/N210/220/N230\n dell-wmi: Add keys for Dell XPS L502X\n platform-drivers-x86: samsung-q10: make dmi_check_callback return 1\n Platform: Samsung Q10 backlight driver\n platform-drivers-x86: intel_scu_ipc: convert to DEFINE_PCI_DEVICE_TABLE\n platform-drivers-x86: intel_rar_register: convert to DEFINE_PCI_DEVICE_TABLE\n platform-drivers-x86: intel_menlow: add missing return AE_OK for intel_menlow_register_sensor()\n platform-drivers-x86: intel_mid_thermal: fix memory leak\n platform-drivers-x86: msi-wmi: add missing sparse_keymap_free in msi_wmi_init error path\n Samsung Laptop platform driver: support N510\n asus-wmi: add uwb rfkill support\n asus-wmi: add gps rfkill support\n asus-wmi: add CWAP support and clarify the meaning of WAPF bits\n asus-wmi: return proper value in store_cpufv()\n asus-wmi: check for temp1 presence\n asus-wmi: add thermal sensor\n ...\n" }, { "commit": "1eb19a12bd2214cdcad5273d472b062a4ba97fa1", "tree": "a88b76f31a4ea5e3631581be249759fcf4b05a08", "parents": [ "de96355c111679dd6e2c5c73e25e814c72510c58" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@chromium.org", "time": "Fri Aug 05 18:46:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 06 11:26:52 2011 -0700" }, "message": "lib/sha1: use the git implementation of SHA-1\n\nFor ChromiumOS, we use SHA-1 to verify the integrity of the root\nfilesystem. The speed of the kernel sha-1 implementation has a major\nimpact on our boot performance.\n\nTo improve boot performance, we investigated using the heavily optimized\nsha-1 implementation used in git. With the git sha-1 implementation, we\nsee a 11.7% improvement in boot time.\n\n10 reboots, remove slowest/fastest.\n\nBefore:\n\n Mean: 6.58 seconds Stdev: 0.14\n\nAfter (with git sha-1, this patch):\n\n Mean: 5.89 seconds Stdev: 0.07\n\nThe other cool thing about the git SHA-1 implementation is that it only\nneeds 64 bytes of stack for the workspace while the original kernel\nimplementation needed 320 bytes.\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@chromium.org\u003e\nCc: Ramsay Jones \u003cramsay@ramsay1.demon.co.uk\u003e\nCc: Nicolas Pitre \u003cnico@cam.org\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: linux-crypto@vger.kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "33009557bd9397c446a59e4cc91059a8e84c046b", "tree": "b553cf2d802bda2170ae8da013a1dbe3a79e2d36", "parents": [ "38803141bf6ccf8f20d05c6f48e6e12c3650ce9a" ], "author": { "name": "Andy Lutomirski", "email": "luto@MIT.EDU", "time": "Tue May 24 15:16:43 2011 -0400" }, "committer": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Fri Aug 05 14:45:41 2011 -0400" }, "message": "Add KEY_MICMUTE and enable it on Lenovo X220\n\nI suspect that this works on T410.\n\nSigned-off-by: Andy Lutomirski \u003cluto@mit.edu\u003e\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\n" }, { "commit": "de96355c111679dd6e2c5c73e25e814c72510c58", "tree": "9283eee98bad9ee6dabdebcce12ec37f80196905", "parents": [ "8cd290a07d095f3b354e3448bcd7757393c29cd5", "39060a07781b4930656752943cf5d66376d0533c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 05 06:44:38 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 05 06:44:38 2011 -1000" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (55 commits)\n Revert \"drm/i915: Try enabling RC6 by default (again)\"\n drm/radeon: Extended DDC Probing for ECS A740GM-M DVI-D Connector\n drm/radeon: Log Subsystem Vendor and Device Information\n drm/radeon: Extended DDC Probing for Connectors with Improperly Wired DDC Lines (here: Asus M2A-VM HDMI)\n drm: Separate EDID Header Check from EDID Block Check\n drm: Add NULL check about irq functions\n drm: Fix irq install error handling\n drm/radeon: fix potential NULL dereference in drivers/gpu/drm/radeon/atom.c\n drm/radeon: clean reg header files\n drm/debugfs: Initialise empty variable\n drm/radeon/kms: add thermal chip quirk for asus 9600xt\n drm/radeon: off by one in check_reg() functions\n drm/radeon/kms: fix version comment due to merge timing\n drm/i915: allow cache sharing policy control\n drm/i915/hdmi: HDMI source product description infoframe support\n drm/i915/hdmi: split infoframe setting from infoframe type code\n drm: track CEA version number if present\n drm/i915: Try enabling RC6 by default (again)\n Revert \"drm/i915/dp: Zero the DPCD data before connection probe\"\n drm/i915/dp: wait for previous AUX channel activity to clear\n ...\n" }, { "commit": "07d952dc669bb70a9716a81e140e89b7d4969f09", "tree": "6e6455adcfdbd689e98e417401d692784de8ff92", "parents": [ "5fdb32472ec6cd1d62788d8872585b342b5d1d92", "c15fea2d8ca834dae491339c47e4fb3c81428190" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 05 06:42:01 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 05 06:42:01 2011 -1000" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (54 commits)\n ipv6: check for IPv4 mapped addresses when connecting IPv6 sockets\n mlx4: decreasing ref count when removing mac\n net: Fix security_socket_sendmsg() bypass problem.\n net: Cap number of elements for sendmmsg\n net: sendmmsg should only return an error if no messages were sent\n ixgbe: fix PHY link setup for 82599\n ixgbe: fix __ixgbe_notify_dca() bail out code\n igb: fix WOL on second port of i350 device\n e1000e: minor re-order of #include files\n e1000e: remove unnecessary check for NULL pointer\n intel drivers: repair missing flush operations\n macb: restore wrap bit when performing underrun cleanup\n cdc_ncm: fix endianness problem.\n irda: use PCI_VENDOR_ID_*\n mlx4: Fixing Ethernet unicast packet steering\n net: fix NULL dereferences in check_peer_redir()\n bnx2x: Clear MDIO access warning during first driver load\n bnx2x: Fix BCM578xx MAC test\n bnx2x: Fix BCM54618se invalid link indication\n bnx2x: Fix BCM84833 link\n ...\n" }, { "commit": "24f0eed2668b059e847ff145848ddacb75419acc", "tree": "010c89c06e191b068f8a078b10bfaf1d3699c834", "parents": [ "8b6b4628126fd73d0a53b499a26133c15b73c1e6", "3567866bf26190d1e734c975c907eb06e923ba23" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 04 16:44:40 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 04 16:44:40 2011 -1000" }, "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 RCUify freeing acls, let check_acl() go ahead in RCU mode if acl is cached\n get rid of boilerplate switches in posix_acl.h\n fix block device fallout from -\u003efsync() changes\n" }, { "commit": "7f3bf7cd348cead84f8027b32aa30ea49fa64df5", "tree": "d2f68190c64a7598fff040a8895103031551e2f2", "parents": [ "cbc158d6bfa1990f7869717bb5270867c66068d1", "21ef4b8b7a7d59a995bf44382de38c95587767d4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 04 16:43:43 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 04 16:43:43 2011 -1000" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:\n dmaengine: use DEFINE_IDR for static initialization\n ioat: fix xor_idx_to_desc\n Avoid section type conflict in dma/ioat/dma_v3.c\n ioat: Adding PCI IDs for IOAT devices on SandyBridge platforms\n" }, { "commit": "655b16128482fd12808f77a6799eea5419c93709", "tree": "833ca3eb906cc3ab872b7925efa8ffb6a02a22bb", "parents": [ "02f8c6aee8df3cdc935e9bdd4f2d020306035dbe" ], "author": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Sun May 29 10:57:47 2011 +0300" }, "committer": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Thu Aug 04 12:35:08 2011 -0700" }, "message": "nfs_xdr: Move nfs4_string definition out of #ifdef CONFIG_NFS_V4\n\nexofs file system wants to use pnfs_osd_xdr.h file instead of\nredefining pnfs-objects types in it\u0027s private \"pnfs.h\" headr.\n\nBefore we do the switch we must make sure pnfs_osd_xdr.h is\ncompilable also under NFS versions smaller than 4.1. Since now\nit is needed regardless of version, by the exofs code.\n\nnfs4_string is not the only nfs4 type out in the global scope.\n\nAck-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Boaz Harrosh \u003cbharrosh@panasas.com\u003e\n" }, { "commit": "53d1e658df6e26d62500410719aaee2b82067c03", "tree": "80dc082c1f256c481f152a62c74605c8962251a6", "parents": [ "455ce9d8410d381f56a1676449a723ca1985b369", "fe55c1844a1c106e9d9d3dd27cbfcf8caeb9e77e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 04 06:37:07 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 04 06:37:07 2011 -1000" }, "message": "Merge branch \u0027devicetree/merge\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027devicetree/merge\u0027 of git://git.secretlab.ca/git/linux-2.6:\n Revert \"dt: add of_alias_scan and of_alias_get_id\"\n dt: remove of_alias_get_id() reference\n" }, { "commit": "051963d4832ed61e5ae74f5330b0a94489e101b9", "tree": "4ade8f3af4f6ec99d8f76048707072708f5877e7", "parents": [ "5037f8acf448dd0de9868dc7410f45879d3d1a1b" ], "author": { "name": "Thomas Reim", "email": "reimth@gmail.com", "time": "Fri Jul 29 14:28:57 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:39:35 2011 +0100" }, "message": "drm: Separate EDID Header Check from EDID Block Check\n\n Provides function drm_edid_header_is_valid() for EDID header check\n and replaces EDID header check part of function drm_edid_block_valid()\n by a call of drm_edid_header_is_valid().\n This is a prerequisite to extend DDC probing, e. g. in function\n radeon_ddc_probe() for Radeon devices, by a central EDID header check.\n\n Tested for kernel 2.6.35, 2.6.38 and 3.0\n\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Thomas Reim \u003creimth@gmail.com\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nAcked-by: Stephen Michaels \u003cStephen.Micheals@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0b576372e86c8e6bee01506651b21ec0fe8a1698", "tree": "ed86064dad2db36348ab9c8305a910fe5cc48cec", "parents": [ "c41b9ee901bb2c7e3eacfa7e171de50c15d61c0b", "07b7ddd9b7f17a567e3ac2b33a4dffcb2a4524e0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:22:24 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:22:24 2011 +0100" }, "message": "Merge branch \u0027drm-intel-next\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 into drm-fixes\n\n* \u0027drm-intel-next\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6: (42 commits)\n drm/i915: allow cache sharing policy control\n drm/i915/hdmi: HDMI source product description infoframe support\n drm/i915/hdmi: split infoframe setting from infoframe type code\n drm: track CEA version number if present\n drm/i915: Try enabling RC6 by default (again)\n Revert \"drm/i915/dp: Zero the DPCD data before connection probe\"\n drm/i915/dp: wait for previous AUX channel activity to clear\n drm/i915: don\u0027t use uninitialized EDID bpc values when picking pipe bpp\n drm/i915/pch: Save/restore PCH_PORT_HOTPLUG across suspend\n drm/i915: apply phase pointer override on SNB+ too\n drm/i915: Add quirk to disable SSC on Sony Vaio Y2\n drm/i915: provide more error output when mode sets fail\n drm/i915: add GPU max frequency control file\n i915: add Dell OptiPlex FX170 to intel_no_lvds\n drm/i915: Ignore GPU wedged errors while pinning scanout buffers\n drm/i915/hdmi: send AVI info frames on ILK+ as well\n drm/i915: fix CB tuning check for ILK+\n drm/i915: Flush other plane register writes\n drm/i915: flush plane control changes on ILK+ as well\n drm/i915: apply timing generator bug workaround on CPT and PPT\n ...\n" }, { "commit": "fe55c1844a1c106e9d9d3dd27cbfcf8caeb9e77e", "tree": "85bbcd23d3f5fcc6b19abfc29d5ffea9608a6fcb", "parents": [ "9e191b22c91873c09c722d7f956ab9f3276f9a37" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Aug 04 10:27:32 2011 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Aug 04 11:26:24 2011 +0100" }, "message": "Revert \"dt: add of_alias_scan and of_alias_get_id\"\n\nThis reverts commit 750f463a749e28464151ad26938d11b07b1c43cb.\n\nof_alias_* still needs work to be generalized for \u0027promtree\u0027 dt\nplatforms, and to no implicitly create entries for available ids.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "35e51fe82ddcd8fb7f129d6dd8491c097d388665", "tree": "d6dd5e860c0e68a1af7976990c7d624e7362415d", "parents": [ "c0c770e610cc4cdcd66c7e939bdf89cc3e72f79d", "a0bfa1373859e9d11dc92561a8667588803e42d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 21:54:15 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 21:54:15 2011 -1000" }, "message": "Merge branch \u0027idle-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6\n\n* \u0027idle-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:\n cpuidle: stop depending on pm_idle\n x86 idle: move mwait_idle_with_hints() to where it is used\n cpuidle: replace xen access to x86 pm_idle and default_idle\n cpuidle: create bootparam \"cpuidle.off\u003d1\"\n mrst_pmu: driver for Intel Moorestown Power Management Unit\n" }, { "commit": "c0c770e610cc4cdcd66c7e939bdf89cc3e72f79d", "tree": "7cf6807258fef2a85a2ff212f4f4eb6d9dc336c6", "parents": [ "a9e4e6e14c322e08d1c615afc8f504fb415f9613", "d0e323b47057f4492b8fa22345f38d80a469bf8d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 21:53:27 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 21:53:27 2011 -1000" }, "message": "Merge branch \u0027apei-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027apei-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:\n ACPI, APEI, EINJ Param support is disabled by default\n APEI GHES: 32-bit buildfix\n ACPI: APEI build fix\n ACPI, APEI, GHES: Add hardware memory error recovery support\n HWPoison: add memory_failure_queue()\n ACPI, APEI, GHES, Error records content based throttle\n ACPI, APEI, GHES, printk support for recoverable error via NMI\n lib, Make gen_pool memory allocator lockless\n lib, Add lock-less NULL terminated single list\n Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG\n ACPI, APEI, Add WHEA _OSC support\n ACPI, APEI, Add APEI bit support in generic _OSC call\n ACPI, APEI, GHES, Support disable GHES at boot time\n ACPI, APEI, GHES, Prevent GHES to be built as module\n ACPI, APEI, Use apei_exec_run_optional in APEI EINJ and ERST\n ACPI, APEI, Add apei_exec_run_optional\n ACPI, APEI, GHES, Do not ratelimit fatal error printk before panic\n ACPI, APEI, ERST, Fix erst-dbg long record reading issue\n ACPI, APEI, ERST, Prevent erst_dbg from loading if ERST is disabled\n" }, { "commit": "27665ffa22b9b83bab226bf12c61424f7f1f8995", "tree": "aaccc030778bb6878c46ab9ca035901af67d78e4", "parents": [ "14595f708eeb528fabcee339ed0b9e0a2ecec73f", "750f463a749e28464151ad26938d11b07b1c43cb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 15:10:30 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 15:10:30 2011 -1000" }, "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: add of_alias_scan and of_alias_get_id\n" }, { "commit": "ebec9a7bf11f843b0602b06c402f04bf4213b35a", "tree": "dc99677c052f3a24bf55a87f9b88067f3de70102", "parents": [ "4e20fa65a3ea789510eed1a15deb9e8aab2b8202" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Aug 03 09:22:54 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Aug 03 17:43:10 2011 -0700" }, "message": "drm: track CEA version number if present\n\nDrivers need to know the CEA version number in addition to other display\ninfo (like whether the display is an HDMI sink) before enabling certain\nfeatures. So track the CEA version number in the display info\nstructure.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "e504f3fdd63d486d45b18009e5a65f2e329acb0a", "tree": "2d02a5c29a922fae626a69cd0fc92cae37d7918e", "parents": [ "31475dd611209413bace21651a400afb91d0bd9d" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Wed Aug 03 16:21:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:24 2011 -1000" }, "message": "tmpfs radix_tree: locate_item to speed up swapoff\n\nWe have already acknowledged that swapoff of a tmpfs file is slower than\nit was before conversion to the generic radix_tree: a little slower\nthere will be acceptable, if the hotter paths are faster.\n\nBut it was a shock to find swapoff of a 500MB file 20 times slower on my\nlaptop, taking 10 minutes; and at that rate it significantly slows down\nmy testing.\n\nNow, most of that turned out to be overhead from PROVE_LOCKING and\nPROVE_RCU: without those it was only 4 times slower than before; and\nmore realistic tests on other machines don\u0027t fare as badly.\n\nI\u0027ve tried a number of things to improve it, including tagging the swap\nentries, then doing lookup by tag: I\u0027d expected that to halve the time,\nbut in practice it\u0027s erratic, and often counter-productive.\n\nThe only change I\u0027ve so far found to make a consistent improvement, is\nto short-circuit the way we go back and forth, gang lookup packing\nentries into the array supplied, then shmem scanning that array for the\ntarget entry. Scanning in place doubles the speed, so it\u0027s now only\ntwice as slow as before (or three times slower when the PROVEs are on).\n\nSo, add radix_tree_locate_item() as an expedient, once-off,\nsingle-caller hack to do the lookup directly in place. #ifdef it on\nCONFIG_SHMEM and CONFIG_SWAP, as much to document its limited\napplicability as save space in other configurations. And, sadly,\n#include sched.h for cond_resched().\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "69f07ec938712b58755add82dd3d0b35f01317cc", "tree": "7a0a704ed4bc79dbba50454093469d0ce31ef1a4", "parents": [ "6922c0c7abd387374255801f7739624867e8acad" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Wed Aug 03 16:21:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:24 2011 -1000" }, "message": "tmpfs: use kmemdup for short symlinks\n\nBut we\u0027ve not yet removed the old swp_entry_t i_direct[16] from\nshmem_inode_info. That\u0027s because it was still being shared with the\ninline symlink. Remove it now (saving 64 or 128 bytes from shmem inode\nsize), and use kmemdup() for short symlinks, say, those up to 128 bytes.\n\nI wonder why mpol_free_shared_policy() is done in shmem_destroy_inode()\nrather than shmem_evict_inode(), where we usually do such freeing? I\nguess it doesn\u0027t matter, and I\u0027m not into NUMA mpol testing right now.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@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": "aa3b189551ad8e5cc1d9c663735c131650238278", "tree": "c789ab5c7f890a6065811d8bba15a784caf9e859", "parents": [ "54af60421822bb9cb664dd5cd7aac46c01ccfcf8" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Wed Aug 03 16:21:24 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:24 2011 -1000" }, "message": "tmpfs: convert mem_cgroup shmem to radix-swap\n\nRemove mem_cgroup_shmem_charge_fallback(): it was only required when we\nhad to move swappage to filecache with GFP_NOWAIT.\n\nRemove the GFP_NOWAIT special case from mem_cgroup_cache_charge(), by\nmoving its call out from shmem_add_to_page_cache() to two of thats three\ncallers. But leave it doing mem_cgroup_uncharge_cache_page() on error:\nalthough asymmetrical, it\u0027s easier for all 3 callers to handle.\n\nThese two changes would also be appropriate if anyone were to start\nusing shmem_read_mapping_page_gfp() with GFP_NOWAIT.\n\nRemove mem_cgroup_get_shmem_target(): mc_handle_file_pte() can test\nradix_tree_exceptional_entry() to get what it needs for itself.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "41ffe5d5ceef7f7ff2ff18e320d88ca6d629efaf", "tree": "66ce800fb7911ed037aa574f46729646ce485d0b", "parents": [ "285b2c4fdd69ea73b4762785d8c6be83b6c074a6" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Wed Aug 03 16:21:21 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:23 2011 -1000" }, "message": "tmpfs: miscellaneous trivial cleanups\n\nWhile it\u0027s at its least, make a number of boring nitpicky cleanups to\nshmem.c, mostly for consistency of variable naming. Things like \"swap\"\ninstead of \"entry\", \"pgoff_t index\" instead of \"unsigned long idx\".\n\nAnd since everything else here is prefixed \"shmem_\", better change\ninit_tmpfs() to shmem_init().\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "285b2c4fdd69ea73b4762785d8c6be83b6c074a6", "tree": "b350a54d8bca3e87ca47d2ad14bb71a53c9bb593", "parents": [ "a2c16d6cb0e478812829ca84aeabd02e36af35eb" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Wed Aug 03 16:21:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:23 2011 -1000" }, "message": "tmpfs: demolish old swap vector support\n\nThe maximum size of a shmem/tmpfs file has been limited by the maximum\nsize of its triple-indirect swap vector. With 4kB page size, maximum\nfilesize was just over 2TB on a 32-bit kernel, but sadly one eighth of\nthat on a 64-bit kernel. (With 8kB page size, maximum filesize was just\nover 4TB on a 64-bit kernel, but 16TB on a 32-bit kernel,\nMAX_LFS_FILESIZE being then more restrictive than swap vector layout.)\n\nIt\u0027s a shame that tmpfs should be more restrictive than ramfs, and this\nlimitation has now been noticed. Add another level to the swap vector?\nNo, it became obscure and hard to maintain, once I complicated it to\nmake use of highmem pages nine years ago: better choose another way.\n\nSurely, if 2.4 had had the radix tree pagecache introduced in 2.5, then\ntmpfs would never have invented its own peculiar radix tree: we would\nhave fitted swap entries into the common radix tree instead, in much the\nsame way as we fit swap entries into page tables.\n\nAnd why should each file have a separate radix tree for its pages and\nfor its swap entries? The swap entries are required precisely where and\nwhen the pages are not. We want to put them together in a single radix\ntree: which can then avoid much of the locking which was needed to\nprevent them from being exchanged underneath us.\n\nThis also avoids the waste of memory devoted to swap vectors, first in\nthe shmem_inode itself, then at least two more pages once a file grew\nbeyond 16 data pages (pages accounted by df and du, but not by memcg).\nAllocated upfront, to avoid allocation when under swapping pressure, but\npure waste when CONFIG_SWAP is not set - I have never spattered around\nthe ifdefs to prevent that, preferring this move to sharing the common\nradix tree instead.\n\nThere are three downsides to sharing the radix tree. One, that it binds\ntmpfs more tightly to the rest of mm, either requiring knowledge of swap\nentries in radix tree there, or duplication of its code here in shmem.c.\nI believe that the simplications and memory savings (and probable higher\nperformance, not yet measured) justify that.\n\nTwo, that on HIGHMEM systems with SWAP enabled, it\u0027s the lowmem radix\nnodes that cannot be freed under memory pressure - whereas before it was\nthe less precious highmem swap vector pages that could not be freed.\nI\u0027m hoping that 64-bit has now been accessible for long enough, that the\nhighmem argument has grown much less persuasive.\n\nThree, that swapoff is slower than it used to be on tmpfs files, since\nit\u0027s using a simple generic mechanism not tailored to it: I find this\nnoticeable, and shall want to improve, but maybe nobody else will\nnotice.\n\nSo... now remove most of the old swap vector code from shmem.c. But,\nfor the moment, keep the simple i_direct vector of 16 pages, with simple\naccessors shmem_put_swap() and shmem_get_swap(), as a toy implementation\nto help mark where swap needs to be handled in subsequent patches.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a2c16d6cb0e478812829ca84aeabd02e36af35eb", "tree": "7803a522da5deee7ce753dc5404dca01f42aa176", "parents": [ "6328650bb4d854a7dc1498d1c0048b838b0d340c" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Wed Aug 03 16:21:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:22 2011 -1000" }, "message": "mm: let swap use exceptional entries\n\nIf swap entries are to be stored along with struct page pointers in a\nradix tree, they need to be distinguished as exceptional entries.\n\nMost of the handling of swap entries in radix tree will be contained in\nshmem.c, but a few functions in filemap.c\u0027s common code need to check\nfor their appearance: find_get_page(), find_lock_page(),\nfind_get_pages() and find_get_pages_contig().\n\nSo as not to slow their fast paths, tuck those checks inside the\nexisting checks for unlikely radix_tree_deref_slot(); except for\nfind_lock_page(), where it is an added test. And make it a BUG in\nfind_get_pages_tag(), which is not applied to tmpfs files.\n\nA part of the reason for eliminating shmem_readpage() earlier, was to\nminimize the places where common code would need to allow for swap\nentries.\n\nThe swp_entry_t known to swapfile.c must be massaged into a slightly\ndifferent form when stored in the radix tree, just as it gets massaged\ninto a pte_t when stored in page tables.\n\nIn an i386 kernel this limits its information (type and page offset) to\n30 bits: given 32 \"types\" of swapfile and 4kB pagesize, that\u0027s a maximum\nswapfile size of 128GB. Which is less than the 512GB we previously\nallowed with X86_PAE (where the swap entry can occupy the entire upper\n32 bits of a pte_t), but not a new limitation on 32-bit without PAE; and\nthere\u0027s not a new limitation on 64-bit (where swap filesize is already\nlimited to 16TB by a 32-bit page offset). Thirty areas of 128GB is\nprobably still enough swap for a 64GB 32-bit machine.\n\nProvide swp_to_radix_entry() and radix_to_swp_entry() conversions, and\nenforce filesize limit in read_swap_header(), just as for ptes.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6328650bb4d854a7dc1498d1c0048b838b0d340c", "tree": "0e265dc86f7c4451647c1e227843cdd1530f9651", "parents": [ "70d327198a434edb95b3d858bc8010b8add28e3e" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Wed Aug 03 16:21:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:22 2011 -1000" }, "message": "radix_tree: exceptional entries and indices\n\nA patchset to extend tmpfs to MAX_LFS_FILESIZE by abandoning its\npeculiar swap vector, instead keeping a file\u0027s swap entries in the same\nradix tree as its struct page pointers: thus saving memory, and\nsimplifying its code and locking.\n\nThis patch:\n\nThe radix_tree is used by several subsystems for different purposes. A\nmajor use is to store the struct page pointers of a file\u0027s pagecache for\nmemory management. But what if mm wanted to store something other than\npage pointers there too?\n\nThe low bit of a radix_tree entry is already used to denote an indirect\npointer, for internal use, and the unlikely radix_tree_deref_retry()\ncase.\n\nDefine the next bit as denoting an exceptional entry, and supply inline\nfunctions radix_tree_exception() to return non-0 in either unlikely\ncase, and radix_tree_exceptional_entry() to return non-0 in the second\ncase.\n\nIf a subsystem already uses radix_tree with that bit set, no problem: it\ndoes not affect internal workings at all, but is defined for the\nconvenience of those storing well-aligned pointers in the radix_tree.\n\nThe radix_tree_gang_lookups have an implicit assumption that the caller\ncan deduce the offset of each entry returned e.g. by the page-\u003eindex of\na struct page. But that may not be feasible for some kinds of item to\nbe stored there.\n\nradix_tree_gang_lookup_slot() allow for an optional indices argument,\noutput array in which to return those offsets. The same could be added\nto other radix_tree_gang_lookups, but for now keep it to the only one\nfor which we need it.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5d6f921b42749d1a70441685b7a4f2801e12ebfb", "tree": "6c2bdf6a7de23e7ec7d8d5990586e1a0527164b0", "parents": [ "4c4dd903e72507c853b8c2b04b22e0d0c721fd93" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Wed Aug 03 16:21:17 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:22 2011 -1000" }, "message": "drivers/video/backlight/aat2870_bl.c: fix setting max_current\n\n - Current implementation tests wrong value for setting\n aat2870_bl-\u003emax_current.\n\n - In the current implementation, we cannot differentiate between 2 cases:\n\n a) if pdata-\u003emax_current is not set , or\n\n b) pdata-\u003emax_current is set to AAT2870_CURRENT_0_45 (which is also 0).\n\n Fix it by setting AAT2870_CURRENT_0_45 to be 1 and adjust the equation in\n aat2870_brightness() accordingly.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nTested-by: Jin Park \u003cjinyoungp@nvidia.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3dab1bce8e840606e76f1bad5a009328e2aa35c7", "tree": "ab2b3a8f159497ec22bb9c98445a214116e86b4e", "parents": [ "f7b9fcbbc3b8593ff7dc587f90c2fe90a2fd1e6f" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Wed Aug 03 16:21:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:21 2011 -1000" }, "message": "mm: page_alloc: increase __GFP_BITS_SHIFT to include __GFP_OTHER_NODE\n\n__GFP_OTHER_NODE is used for NUMA allocations on behalf of other nodes.\nIt\u0027s supposed to be passed through from the page allocator to\nzone_statistics(), but it never gets there as gfp_allowed_mask is not\nwide enough and masks out the flag early in the allocation path.\n\nThe result is an accounting glitch where successful NUMA allocations\nby-agent are not properly attributed as local.\n\nIncrease __GFP_BITS_SHIFT so that it includes __GFP_OTHER_NODE.\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Andi Kleen \u003cak@linux.intel.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nAcked-by: Mel Gorman \u003cmgorman@suse.de\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "88eca0207cf1574328c3ce8c3be537a9317261bb", "tree": "155b13f5df1e239fea2ad5512ef5b19865de4a9e", "parents": [ "a7295898a1d2e501427f557111c2b4bdfc90b1ed" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 03 16:21:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:20 2011 -1000" }, "message": "ida: simplified functions for id allocation\n\nThe current hyper-optimized functions are overkill if you simply want to\nallocate an id for a device. Create versions which use an internal\nlock.\n\nIn followup patches, numerous drivers are converted to use this\ninterface.\n\nThanks to Tejun for feedback.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dd48c085c1cdf9446f92826f1fd451167fb6c2fd", "tree": "d62870378cc08af36ea7a41531436bdebddec232", "parents": [ "f48d1915b86f06a943087e5f9b29542a1ef4cd4d" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Wed Aug 03 16:21:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:20 2011 -1000" }, "message": "fault-injection: add ability to export fault_attr in arbitrary directory\n\ninit_fault_attr_dentries() is used to export fault_attr via debugfs.\nBut it can only export it in debugfs root directory.\n\nPer Forlin is working on mmc_fail_request which adds support to inject\ndata errors after a completed host transfer in MMC subsystem.\n\nThe fault_attr for mmc_fail_request should be defined per mmc host and\nexport it in debugfs directory per mmc host like\n/sys/kernel/debug/mmc0/mmc_fail_request.\n\ninit_fault_attr_dentries() doesn\u0027t help for mmc_fail_request. So this\nintroduces fault_create_debugfs_attr() which is able to create a\ndirectory in the arbitrary directory and replace\ninit_fault_attr_dentries().\n\n[akpm@linux-foundation.org: extraneous semicolon, per Randy]\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nTested-by: Per Forlin \u003cper.forlin@linaro.org\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Pekka Enberg \u003cpenberg@kernel.org\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a0bfa1373859e9d11dc92561a8667588803e42d8", "tree": "ef5768a313ac16a211830efc3edb9ca95487cb6a", "parents": [ "4bfc8288bc4a64529c5547d17349a2a1f4675507" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Apr 01 19:34:59 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Aug 03 19:06:37 2011 -0400" }, "message": "cpuidle: stop depending on pm_idle\n\ncpuidle users should call cpuidle_call_idle() directly\nrather than via (pm_idle)() function pointer.\n\nArchitecture may choose to continue using (pm_idle)(),\nbut cpuidle need not depend on it:\n\n my_arch_cpu_idle()\n\t...\n\tif(cpuidle_call_idle())\n\t\tpm_idle();\n\ncc: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\ncc: Paul Mundt \u003clethal@linux-sh.org\u003e\ncc: x86@kernel.org\nAcked-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "d91ee5863b71e8c90eaf6035bff3078a85e2e7b5", "tree": "7c4972d8d6f614f656720ec686a6288de68f4af3", "parents": [ "62027aea23fcd14478abdddd3b74a4e0f5fb2984" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Apr 01 18:28:35 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Aug 03 19:06:36 2011 -0400" }, "message": "cpuidle: replace xen access to x86 pm_idle and default_idle\n\nWhen a Xen Dom0 kernel boots on a hypervisor, it gets access\nto the raw-hardware ACPI tables. While it parses the idle tables\nfor the hypervisor\u0027s beneift, it uses HLT for its own idle.\n\nRather than have xen scribble on pm_idle and access default_idle,\nhave it simply disable_cpuidle() so acpi_idle will not load and\narchitecture default HLT will be used.\n\ncc: xen-devel@lists.xensource.com\nTested-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nAcked-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "d0e323b47057f4492b8fa22345f38d80a469bf8d", "tree": "feb760c7e2cdb1e43640417409428ab858910ea3", "parents": [ "c027a474a68065391c8773f6e83ed5412657e369", "c3e6088e1036f8084bc7444b38437da136b7588b" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Aug 03 11:30:42 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Aug 03 11:30:42 2011 -0400" }, "message": "Merge branch \u0027apei\u0027 into apei-release\n\nSome trivial conflicts due to other various merges\nadding to the end of common lists sooner than this one.\n\n\tarch/ia64/Kconfig\n\tarch/powerpc/Kconfig\n\tarch/x86/Kconfig\n\tlib/Kconfig\n\tlib/Makefile\n\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "a7e09d450b2e0b068e850d103b6ee1af537d1910", "tree": "b38756299aeb751ea88a143560ceae0241471dc6", "parents": [ "ba61ca4aab47441f1c6cec28a9a6aa0489fd1df3" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Jul 16 18:14:21 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Aug 03 11:15:59 2011 -0400" }, "message": "ACPI: APEI build fix\n\nas GHES is optional...\n\nWhen # CONFIG_ACPI_APEI_GHES is not set:\n\n(.init.text+0x4c22): undefined reference to `ghes_disable\u0027\n\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "ea8f5fb8a71fddaf5f3a17100d3247855701f732", "tree": "052c3f7e699745394a35063d2a58c4ef0995f3c5", "parents": [ "152cef40a808d3034e383465b3f7d6783613e458" ], "author": { "name": "Huang Ying", "email": "ying.huang@intel.com", "time": "Wed Jul 13 13:14:27 2011 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Aug 03 11:15:58 2011 -0400" }, "message": "HWPoison: add memory_failure_queue()\n\nmemory_failure() is the entry point for HWPoison memory error\nrecovery. It must be called in process context. But commonly\nhardware memory errors are notified via MCE or NMI, so some delayed\nexecution mechanism must be used. In MCE handler, a work queue + ring\nbuffer mechanism is used.\n\nIn addition to MCE, now APEI (ACPI Platform Error Interface) GHES\n(Generic Hardware Error Source) can be used to report memory errors\ntoo. To add support to APEI GHES memory recovery, a mechanism similar\nto that of MCE is implemented. memory_failure_queue() is the new\nentry point that can be called in IRQ context. The next step is to\nmake MCE handler uses this interface too.\n\nSigned-off-by: Huang Ying \u003cying.huang@intel.com\u003e\nCc: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "7f184275aa306046fe7edcbef3229754f0d97402", "tree": "e2f82957072dd1ada3a4bc6c0281a6296123d8a0", "parents": [ "f49f23abf3dd786ddcac1c1e7db3c2013b07413f" ], "author": { "name": "Huang Ying", "email": "ying.huang@intel.com", "time": "Wed Jul 13 13:14:24 2011 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Aug 03 11:15:57 2011 -0400" }, "message": "lib, Make gen_pool memory allocator lockless\n\nThis version of the gen_pool memory allocator supports lockless\noperation.\n\nThis makes it safe to use in NMI handlers and other special\nunblockable contexts that could otherwise deadlock on locks. This is\nimplemented by using atomic operations and retries on any conflicts.\nThe disadvantage is that there may be livelocks in extreme cases. For\nbetter scalability, one gen_pool allocator can be used for each CPU.\n\nThe lockless operation only works if there is enough memory available.\nIf new memory is added to the pool a lock has to be still taken. So\nany user relying on locklessness has to ensure that sufficient memory\nis preallocated.\n\nThe basic atomic operation of this allocator is cmpxchg on long. On\narchitectures that don\u0027t have NMI-safe cmpxchg implementation, the\nallocator can NOT be used in NMI handler. So code uses the allocator\nin NMI handler should depend on CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG.\n\nSigned-off-by: Huang Ying \u003cying.huang@intel.com\u003e\nReviewed-by: Andi Kleen \u003cak@linux.intel.com\u003e\nReviewed-by: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "f49f23abf3dd786ddcac1c1e7db3c2013b07413f", "tree": "0726af5e245025b60be8adee0deb8bc665510904", "parents": [ "df013ffb8119c89f062ab05b7f544704315db47b" ], "author": { "name": "Huang Ying", "email": "ying.huang@intel.com", "time": "Wed Jul 13 13:14:23 2011 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Aug 03 11:15:56 2011 -0400" }, "message": "lib, Add lock-less NULL terminated single list\n\nCmpxchg is used to implement adding new entry to the list, deleting\nall entries from the list, deleting first entry of the list and some\nother operations.\n\nBecause this is a single list, so the tail can not be accessed in O(1).\n\nIf there are multiple producers and multiple consumers, llist_add can\nbe used in producers and llist_del_all can be used in consumers. They\ncan work simultaneously without lock. But llist_del_first can not be\nused here. Because llist_del_first depends on list-\u003efirst-\u003enext does\nnot changed if list-\u003efirst is not changed during its operation, but\nllist_del_first, llist_add, llist_add (or llist_del_all, llist_add,\nllist_add) sequence in another consumer may violate that.\n\nIf there are multiple producers and one consumer, llist_add can be\nused in producers and llist_del_all or llist_del_first can be used in\nthe consumer.\n\nThis can be summarized as follow:\n\n | add | del_first | del_all\n add | - | - | -\n del_first | | L | L\n del_all | | | -\n\nWhere \"-\" stands for no lock is needed, while \"L\" stands for lock is\nneeded.\n\nThe list entries deleted via llist_del_all can be traversed with\ntraversing function such as llist_for_each etc. But the list entries\ncan not be traversed safely before deleted from the list. The order\nof deleted entries is from the newest to the oldest added one. If you\nwant to traverse from the oldest to the newest, you must reverse the\norder by yourself before traversing.\n\nThe basic atomic operation of this list is cmpxchg on long. On\narchitectures that don\u0027t have NMI-safe cmpxchg implementation, the\nlist can NOT be used in NMI handler. So code uses the list in NMI\nhandler should depend on CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG.\n\nSigned-off-by: Huang Ying \u003cying.huang@intel.com\u003e\nReviewed-by: Andi Kleen \u003cak@linux.intel.com\u003e\nReviewed-by: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "750f463a749e28464151ad26938d11b07b1c43cb", "tree": "6aabb1512a4000615e93b25beccba606b62f7237", "parents": [ "ed8f37370d83e695c0a4fa5d5fc7a83ecb947526" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Wed Aug 03 11:28:14 2011 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Aug 03 13:02:31 2011 +0100" }, "message": "dt: add of_alias_scan and of_alias_get_id\n\nThe patch adds function of_alias_scan to populate a global lookup\ntable with the properties of \u0027aliases\u0027 node and function\nof_alias_get_id for drivers to find alias id from the lookup table.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n[grant.likely: add locking and rework parse loop]\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "f2c31e32b378a6653f8de606149d963baf11d7d3", "tree": "4eeb8075a93520935381a75514f309228e6824c0", "parents": [ "28f4881cbf9ce285edfc245a8990af36d21c062f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Jul 29 19:00:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 03 03:34:12 2011 -0700" }, "message": "net: fix NULL dereferences in check_peer_redir()\n\nGergely Kalman reported crashes in check_peer_redir().\n\nIt appears commit f39925dbde778 (ipv4: Cache learned redirect\ninformation in inetpeer.) added a race, leading to possible NULL ptr\ndereference.\n\nSince we can now change dst neighbour, we should make sure a reader can\nsafely use a neighbour.\n\nAdd RCU protection to dst neighbour, and make sure check_peer_redir()\ncan be called safely by different cpus in parallel.\n\nAs neighbours are already freed after one RCU grace period, this patch\nshould not add typical RCU penalty (cache cold effects)\n\nMany thanks to Gergely for providing a pretty report pointing to the\nbug.\n\nReported-by: Gergely Kalman \u003csynapse@hippy.csoma.elte.hu\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c299eba3c5a801657f275d33be588b34831cd30e", "tree": "022a2a72604443fa8ce8d3fd040fbda49b04f681", "parents": [ "1850536b93888e6cc3ee42e63e20e61f35f8b3e2", "4a8f5058bde15d737abe39b5bed3f21dcb6599d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 02 21:17:02 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 02 21:17:02 2011 -1000" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (28 commits)\n ACPI: delete stale reference in kernel-parameters.txt\n ACPI: add missing _OSI strings\n ACPI: remove NID_INVAL\n thermal: make THERMAL_HWMON implementation fully internal\n thermal: split hwmon lookup to a separate function\n thermal: hide CONFIG_THERMAL_HWMON\n ACPI print OSI(Linux) warning only once\n ACPI: DMI workaround for Asus A8N-SLI Premium and Asus A8N-SLI DELUX\n ACPI / Battery: propagate sysfs error in acpi_battery_add()\n ACPI / Battery: avoid acpi_battery_add() use-after-free\n ACPI: introduce \"acpi_rsdp\u003d\" parameter for kdump\n ACPI: constify ops structs\n ACPI: fix CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS\n ACPI: fix 80 char overflow\n ACPI / Battery: Resolve the race condition in the sysfs_remove_battery()\n ACPI / Battery: Add the check before refresh sysfs in the battery_notify()\n ACPI / Battery: Add the hibernation process in the battery_notify()\n ACPI / Battery: Rename acpi_battery_quirks2 with acpi_battery_quirks\n ACPI / Battery: Change 16-bit signed negative battery current into correct value\n ACPI / Battery: Add the power unit macro\n ...\n" }, { "commit": "a6b11f53388973d99c4a357c22b19753b424e73c", "tree": "f0c31698f4f3ba47e44d34f7f5077ddde6079850", "parents": [ "73a9fe86fa21ccd528807b8cc871dc18be67ee5a", "d945fa0da7db9ace61fbb2140cfdb1e2d2b24e7e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 02 20:49:57 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 02 20:49:57 2011 -1000" }, "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 MAINTAINERS: Add keyword match for of_match_table to device tree section\n of: constify property name parameters for helper functions\n input: xilinx_ps2: Add missing of_address.h header\n of: address: use resource_size helper\n" }, { "commit": "f3406816bb2486fc44558bec77179cd9bcbd4450", "tree": "718db1ef45e55314b5e7290f77e70e6328d855a4", "parents": [ "4400478ba3d939b680810aa004f1e954b4f8ba16", "ed8b752bccf2560e305e25125721d2f0ac759e88" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 02 20:49:21 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 02 20:49:21 2011 -1000" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: (34 commits)\n dm table: set flush capability based on underlying devices\n dm crypt: optionally support discard requests\n dm raid: add md raid1 support\n dm raid: support metadata devices\n dm raid: add write_mostly parameter\n dm raid: add region_size parameter\n dm raid: improve table parameters documentation\n dm ioctl: forbid multiple device specifiers\n dm ioctl: introduce __get_dev_cell\n dm ioctl: fill in device parameters in more ioctls\n dm flakey: add corrupt_bio_byte feature\n dm flakey: add drop_writes\n dm flakey: support feature args\n dm flakey: use dm_target_offset and support discards\n dm table: share target argument parsing functions\n dm snapshot: skip reading origin when overwriting complete chunk\n dm: ignore merge_bvec for snapshots when safe\n dm table: clean dm_get_device and move exports\n dm raid: tidy includes\n dm ioctl: prevent empty message\n ...\n" }, { "commit": "3567866bf26190d1e734c975c907eb06e923ba23", "tree": "60d6b71d8ec821b121e6ab0756833d79c912908e", "parents": [ "951c0d660a7c35286e401ca6d6ef38c9d49643c7" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Aug 02 21:32:13 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Aug 03 00:58:42 2011 -0400" }, "message": "RCUify freeing acls, let check_acl() go ahead in RCU mode if acl is cached\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "951c0d660a7c35286e401ca6d6ef38c9d49643c7", "tree": "3d642b16e966a5f000c288bfbcac868cf994559c", "parents": [ "da5aa861bea09197e6ae4d7c46618616064891e4" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Aug 03 00:47:21 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Aug 03 00:47:21 2011 -0400" }, "message": "get rid of boilerplate switches in posix_acl.h\n\nthe only potentially subtle thing here: get_cached_acl()\nis never called with the second argument other than\nACL_TYPE_{ACCESS,DEFAULT}. IOW, that return ERR_PTR(-EINVAL)\nin there might as well be BUG().\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "4a8f5058bde15d737abe39b5bed3f21dcb6599d2", "tree": "5e4fc5e59d4393fd08852665a6da1ecbbfd0d8b3", "parents": [ "3eb208f0a36cf7a86953afa7a4eb6776294e6768", "eb03cb02b74df6dd0b653d5f6d976f16a434dfaf", "d7f6169a0d32002657886fee561c641acddb9a75", "e4108292cc5b5ca07abc83af31a78338362810ca", "bb0c5ed6ec523199e34e81dcef8e987507553b63", "aa165971c2923d05988f920c978e438dbc7b0de6", "4996c02306a25def1d352ec8e8f48895bbc7dea9", "6c8111e9a0e73ef1e58a1bf0a10c23ee1512e7a2" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Tue Aug 02 17:22:09 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Tue Aug 02 17:22:09 2011 -0400" }, "message": "Merge branches \u0027acpica\u0027, \u0027battery\u0027, \u0027boot-irqs\u0027, \u0027bz-24492\u0027, \u0027bz-9528\u0027, \u0027from-akpm\u0027, \u0027kexec-param\u0027 and \u0027misc\u0027 into release\n\nConflicts:\n\tDocumentation/kernel-parameters.txt\n\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "f52e00c668669c9c290e84adf859c76db6d92a5a", "tree": "0535f1b6eb51e35b7ca454a2323470dc797f89f9", "parents": [ "31f5396ad3bde23c8416e8d23ba425e27f413314" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Thu Jul 28 13:48:43 2011 -0700" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Tue Aug 02 14:52:13 2011 -0400" }, "message": "ACPI: remove NID_INVAL\n\nb552a8c56db8 (\"ACPI: remove NID_INVAL\") removed the left over uses of\nNID_INVAL, but didn\u0027t actually remove the definition. Remove it.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "31f5396ad3bde23c8416e8d23ba425e27f413314", "tree": "923ec07b9afff6cf952cbc2bd5f26bf490793c6f", "parents": [ "0d97d7a494d43be77f57e688369be0aae33d1ade" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Thu Jul 28 13:48:42 2011 -0700" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Tue Aug 02 14:51:57 2011 -0400" }, "message": "thermal: make THERMAL_HWMON implementation fully internal\n\nTHERMAL_HWMON is implemented inside the thermal_sys driver and has no\neffect on drivers implementing thermal zones, so they shouldn\u0027t see\nanything related to it in \u003clinux/thermal.h\u003e. Making the THERMAL_HWMON\nimplementation fully internal has two advantages beyond the cleaner\ndesign:\n\n* This avoids rebuilding all thermal drivers if the THERMAL_HWMON\n implementation changes, or if CONFIG_THERMAL_HWMON gets enabled or\n disabled.\n\n* This avoids breaking the thermal kABI in these cases too, which should\n make distributions happy.\n\nThe only drawback I can see is slightly higher memory fragmentation, as\nthe number of kzalloc() calls will increase by one per thermal zone. But\nI doubt it will be a problem in practice, as I\u0027ve never seen a system with\nmore than two thermal zones.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Rene Herman \u003crene.herman@gmail.com\u003e\nAcked-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "aac285c6cb9622f1cc05ed162604bf5ad2da9a8d", "tree": "1cfcff20a178ad2c439484f74b0ffd77bd7feedf", "parents": [ "5f9288af065537be1fe6d1d5bd54ba51d6df721a" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Tue Aug 02 15:45:07 2011 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Aug 02 16:50:47 2011 +0100" }, "message": "of: constify property name parameters for helper functions\n\nThe helper functions for reading u32 integers, u32 arrays and strings\nshould have the property name as a const pointer.\n\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "0ddf9644cc26e74ed671525e61a17bdbebf18da6", "tree": "fa10cf2fda8f52c0da7f2f1fcec54f2ce2d5bd1f", "parents": [ "a3998799fb4df0b0af8271a7d50c4269032397aa" ], "author": { "name": "Mikulas Patocka", "email": "mpatocka@redhat.com", "time": "Tue Aug 02 12:32:06 2011 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Tue Aug 02 12:32:06 2011 +0100" }, "message": "dm ioctl: fill in device parameters in more ioctls\n\nMove parameter filling from find_device to __find_device_hash_cell.\n\nThis patch causes ioctls using __find_device_hash_cell\n(DM_DEV_REMOVE_CMD, DM_DEV_SUSPEND_CMD - resume, DM_TABLE_CLEAR_CMD)\nto return device parameters, bringing them into line with the other\nioctls.\n\nSigned-off-by: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "498f0103ea13123e007660def9072a0b7dd1c599", "tree": "3940ca8e50f13c3ed3a79c1939bacbc841ecb179", "parents": [ "a6e50b409d3f9e0833e69c3c9cca822e8fa4adbb" ], "author": { "name": "Mike Snitzer", "email": "snitzer@redhat.com", "time": "Tue Aug 02 12:32:04 2011 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Tue Aug 02 12:32:04 2011 +0100" }, "message": "dm table: share target argument parsing functions\n\nMove multipath target argument parsing code into dm-table so other\ntargets can share it.\n\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "a6e50b409d3f9e0833e69c3c9cca822e8fa4adbb", "tree": "82ca807c21156437270e6a1ed255b18ccf8b3672", "parents": [ "d5b9dd04bd74b774b8e8d93ced7a0d15ad403fa9" ], "author": { "name": "Mikulas Patocka", "email": "mpatocka@redhat.com", "time": "Tue Aug 02 12:32:04 2011 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Tue Aug 02 12:32:04 2011 +0100" }, "message": "dm snapshot: skip reading origin when overwriting complete chunk\n\nIf we write a full chunk in the snapshot, skip reading the origin device\nbecause the whole chunk will be overwritten anyway.\n\nThis patch changes the snapshot write logic when a full chunk is written.\nIn this case:\n 1. allocate the exception\n 2. dispatch the bio (but don\u0027t report the bio completion to device mapper)\n 3. write the exception record\n 4. report bio completed\n\nCallbacks must be done through the kcopyd thread, because callbacks must not\nrace with each other. So we create two new functions:\n\n dm_kcopyd_prepare_callback: allocate a job structure and prepare the callback.\n (This function must not be called from interrupt context.)\n\n dm_kcopyd_do_callback: submit callback.\n (This function may be called from interrupt context.)\n\nPerformance test (on snapshots with 4k chunk size):\n without the patch:\n non-direct-io sequential write (dd): 17.7MB/s\n direct-io sequential write (dd): 20.9MB/s\n non-direct-io random write (mkfs.ext2): 0.44s\n\n with the patch:\n non-direct-io sequential write (dd): 26.5MB/s\n direct-io sequential write (dd): 33.2MB/s\n non-direct-io random write (mkfs.ext2): 0.27s\n\nSigned-off-by: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "82c21bfab41a77bc01affe21bea9727d776774a7", "tree": "b0c5850be07c7f6d747df389f8f15780887da630", "parents": [ "87a0874cf19f1bc9bd25bd7d053a0ea25ccf8373" ], "author": { "name": "Paul Moore", "email": "paul.moore@hp.com", "time": "Mon Aug 01 11:10:33 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 01 17:58:33 2011 -0700" }, "message": "doc: Update the email address for Paul Moore in various source files\n\nMy @hp.com will no longer be valid starting August 5, 2011 so an update is\nnecessary. My new email address is employer independent so we don\u0027t have\nto worry about doing this again any time soon.\n\nSigned-off-by: Paul Moore \u003cpaul.moore@hp.com\u003e\nSigned-off-by: Paul Moore \u003cpaul@paul-moore.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cfe22345ad5ef29e192e157fdc3e17d357e4bc24", "tree": "15173bab84cb9122a95d46f2b49fb139362b5248", "parents": [ "60ad4466821a96913a9b567115e194ed1087c2d7", "424c3d4a2c7d4ac3467a4849f8ccc230f670c35a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 14:05:46 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 14:05:46 2011 -1000" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (23 commits)\n regulator: Improve WM831x DVS VSEL selection algorithm\n regulator: Bootstrap wm831x DVS VSEL value from ON VSEL if not already set\n regulator: Set up GPIO for WM831x VSEL before enabling VSEL mode\n regulator: Add EPEs to the MODULE_ALIAS() for wm831x-dcdc\n regulator: Fix WM831x DCDC DVS VSEL bootstrapping\n regulator: Fix WM831x regulator ID lookups for multiple WM831xs\n regulator: Fix argument format type errors in error prints\n regulator: Fix memory leak in set_machine_constraints() error paths\n regulator: Make core more chatty about some errors\n regulator: tps65910: Fix array access out of bounds bug\n regulator: tps65910: Add missing breaks in switch/case\n regulator: tps65910: Fix a memory leak in tps65910_probe error path\n regulator: TWL: Remove entry of RES_ID for 6030 macros\n ASoC: tlv320aic3x: Add correct hw registers to Line1 cross connect muxes\n regulator: Add basic per consumer debugfs\n regulator: Add rdev_crit() macro\n regulator: Refactor supply implementation to work as regular consumers\n regulator: Include the device name in the microamps_requested_ file\n regulator: Increase the limit on sysfs file names\n regulator: Properly register dummy regulator driver\n ...\n" }, { "commit": "60ad4466821a96913a9b567115e194ed1087c2d7", "tree": "cd488ba72a60f856b85a467763fb633cbe7ef2d9", "parents": [ "1b8e94993c4752d98c33903aa836acc15f7e6d5c", "79a77c5ac34cc27ccbfbdf7113b41cdd93534eab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 13:56:03 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 13:56:03 2011 -1000" }, "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: (60 commits)\n ext4: prevent memory leaks from ext4_mb_init_backend() on error path\n ext4: use EXT4_BAD_INO for buddy cache to avoid colliding with valid inode #\n ext4: use ext4_msg() instead of printk in mballoc\n ext4: use ext4_kvzalloc()/ext4_kvmalloc() for s_group_desc and s_group_info\n ext4: introduce ext4_kvmalloc(), ext4_kzalloc(), and ext4_kvfree()\n ext4: use the correct error exit path in ext4_init_inode_table()\n ext4: add missing kfree() on error return path in add_new_gdb()\n ext4: change umode_t in tracepoint headers to be an explicit __u16\n ext4: fix races in ext4_sync_parent()\n ext4: Fix overflow caused by missing cast in ext4_fallocate()\n ext4: add action of moving index in ext4_ext_rm_idx for Punch Hole\n ext4: simplify parameters of reserve_backup_gdb()\n ext4: simplify parameters of add_new_gdb()\n ext4: remove lock_buffer in bclean() and setup_new_group_blocks()\n ext4: simplify journal handling in setup_new_group_blocks()\n ext4: let setup_new_group_blocks() set multiple bits at a time\n ext4: fix a typo in ext4_group_extend()\n ext4: let ext4_group_add_blocks() handle 0 blocks quickly\n ext4: let ext4_group_add_blocks() return an error code\n ext4: rename ext4_add_groupblocks() to ext4_group_add_blocks()\n ...\n\nFix up conflict in fs/ext4/inode.c: commit aacfc19c626e (\"fs: simplify\nthe blockdev_direct_IO prototype\") had changed the ext4_ind_direct_IO()\nfunction for the new simplified calling convention, while commit\ndae1e52cb126 (\"ext4: move ext4_ind_* functions from inode.c to\nindirect.c\") moved the function to another file.\n" }, { "commit": "1b8e94993c4752d98c33903aa836acc15f7e6d5c", "tree": "b78cba208f0a193ce6ceebbc146021af4425b4e1", "parents": [ "12ff47e7f5fb64c566f62e6cf6a3b291c51bd337", "206d440f64030b6425841bf7cb38e26a5ea0c382" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 13:48:31 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 13:48:31 2011 -1000" }, "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 xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not set\n VFS: Reorganise shrink_dcache_for_umount_subtree() after demise of dcache_lock\n VFS: Remove dentry-\u003ed_lock locking from shrink_dcache_for_umount_subtree()\n VFS: Remove detached-dentry counter from shrink_dcache_for_umount_subtree()\n switch posix_acl_chmod() to umode_t\n switch posix_acl_from_mode() to umode_t\n switch posix_acl_equiv_mode() to umode_t *\n switch posix_acl_create() to umode_t *\n block: initialise bd_super in bdget()\n vfs: avoid call to inode_lru_list_del() if possible\n vfs: avoid taking inode_hash_lock on pipes and sockets\n vfs: conditionally call inode_wb_list_del()\n VFS: Fix automount for negative autofs dentries\n Btrfs: load the key from the dir item in readdir into a fake dentry\n devtmpfs: missing initialialization in never-hit case\n hppfs: missing include\n" }, { "commit": "12ff47e7f5fb64c566f62e6cf6a3b291c51bd337", "tree": "d9fba3780142af380ccfaf90d8b13363e3475bd7", "parents": [ "73bcbac130a59f236ae78ed70ef7a05b45caa19e", "1ae105aa7416087f2920c35c3cd16831d0d09c9c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 13:46:37 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 13:46:37 2011 -1000" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\n* \u0027for-linus\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (37 commits)\n Improve slave/cyclic DMA engine documentation\n dmaengine: pl08x: handle the rest of enums in pl08x_width\n DMA: PL08x: cleanup selection of burst size\n DMA: PL08x: avoid recalculating cctl at each prepare\n DMA: PL08x: cleanup selection of buswidth\n DMA: PL08x: constify plchan-\u003ecd and plat-\u003eslave_channels\n DMA: PL08x: separately store source/destination cctl\n DMA: PL08x: separately store source/destination slave address\n DMA: PL08x: clean up LLI debugging\n DMA: PL08x: select LLI bus only once per LLI setup\n DMA: PL08x: remove unused constants\n ARM: mxs-dma: reset after disable channel\n dma: intel_mid_dma: remove redundant pci_set_drvdata calls\n dma: mxs-dma: fix unterminated platform_device_id table\n dmaengine: pl330: make platform data optional\n dmaengine: imx-sdma: return proper error if kzalloc fails\n pch_dma: Fix CTL register access issue\n dmaengine: mxs-dma: skip request_irq for NO_IRQ\n dmaengine/coh901318: fix slave submission semantics\n dmaengine/ste_dma40: allow memory buswidth/burst to be configured\n ...\n\nFix trivial whitespace conflict in drivers/dma/mv_xor.c\n" }, { "commit": "a2d773023552f68baa2db2226dfd6d761c0df5da", "tree": "c905702c4f318d0e569222187472289c574bde3c", "parents": [ "72f9adfd20e3be8a33ff3ef96cec787ed97b9ba9", "7644c16c7e7431fa398e834109dbb76dc1b51617" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 13:40:51 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 13:40:51 2011 -1000" }, "message": "Merge branch \u0027pstore-efi\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6\n\n* \u0027pstore-efi\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:\n efivars: Introduce PSTORE_EFI_ATTRIBUTES\n efivars: Use string functions in pstore_write\n efivars: introduce utf16_strncmp\n efivars: String functions\n efi: Add support for using efivars as a pstore backend\n pstore: Allow the user to explicitly choose a backend\n pstore: Make \"part\" unsigned\n pstore: Add extra context for writes and erases\n pstore: Extend API for more flexibility in new backends\n" }, { "commit": "424c3d4a2c7d4ac3467a4849f8ccc230f670c35a", "tree": "55806b1367b42ec210f273c16bf350182ac6fd62", "parents": [ "02f8c6aee8df3cdc935e9bdd4f2d020306035dbe", "88cda60e512373ca18a663ee66dc2550800223eb" ], "author": { "name": "Liam Girdwood", "email": "lrg@slimlogic.co.uk", "time": "Mon Aug 01 18:25:06 2011 +0100" }, "committer": { "name": "Liam Girdwood", "email": "lrg@slimlogic.co.uk", "time": "Mon Aug 01 18:25:06 2011 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n" }, { "commit": "4a2d732f5d1a2adf38a5baaa2f27094024be65e9", "tree": "fbc8e050fb8f8d66fbb676746888080841882def", "parents": [ "965e32b18d6b6bbcb79f4a7308fc8bdb4d03e813", "867f503d580eafbcc342141bae53cf6a27d413b1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 06:13:48 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 06:13:48 2011 -1000" }, "message": "Merge branch \u0027gpio/next\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027gpio/next\u0027 of git://git.secretlab.ca/git/linux-2.6:\n gpio_msm: Move Qualcomm MSM v2 gpio driver into drivers\n gpio_msm: Move Qualcomm v6 MSM driver into drivers\n msm: gpio: Fold register defs into C file\n msm: gpiomux: Move public API to public header\n msm: gpio: Remove ifdefs on gpio chip registers\n msm: gpio: Remove chip-specific register definitions\n msm: Remove chip-ifdefs for GPIO io mappings\n msm: gpio: Remove unsupported devices\n gpio: ab8500: fix MODULE_ALIAS for ab8500\n of/gpio: export of_gpio_simple_xlate\n" }, { "commit": "965e32b18d6b6bbcb79f4a7308fc8bdb4d03e813", "tree": "5d558d0b194f51fb27976a5df2a03b73fb41bb4d", "parents": [ "e10b87d2b5b4574cdf3a5a19b22ca88b91ba7151", "df5d3ed23cf73ee0763a8963003bda9b69d9620f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 06:13:05 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 06:13:05 2011 -1000" }, "message": "Merge branch \u0027for-3.1-rc1\u0027 of git://gitorious.org/linux-omap-dss2/linux\n\n* \u0027for-3.1-rc1\u0027 of git://gitorious.org/linux-omap-dss2/linux: (31 commits)\n OMAP: DSS2: HDMI: fix hdmi clock name\n HACK: OMAP: DSS2: clk hack for OMAP2/3\n OMAP: DSS2: DSS: Fix context save/restore\n OMAP: DSS2: DISPC: Fix context save/restore\n OMAP: DSS2: Remove ctx loss count from dss.c\n OMAP: DSS2: Remove unused code from display.c\n OMAP: DSS2: DISPC: remove finegrained clk enables/disables\n OMAP: DSS2: Remove unused opt_clock_available\n OMAP: DSS2: Use PM runtime \u0026 HWMOD support\n OMAP: DSS2: Remove CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET\n OMAP: DSS2: Remove core_dump_clocks\n OMAP: DSS2: DPI: remove unneeded SYSCK enable/disable\n OMAP: DSS2: Use omap_pm_get_dev_context_loss_count to get ctx loss count\n OMAP: DSS2: rewrite use of context_loss_count\n OMAP: DSS2: Remove clk optimization at dss init\n OMAP: DSS2: Fix init and unit sequence\n OMAP: DSS2: Clean up probe for DSS \u0026 DSI\n OMAP: DSS2: Handle dpll4_m4_ck in dss_get/put_clocks\n OMAP: DSS2: Fix FIFO threshold and burst size for OMAP4\n OMAP: DSS2: DSI: sync when disabling a display\n ...\n" }, { "commit": "e10b87d2b5b4574cdf3a5a19b22ca88b91ba7151", "tree": "21c0714515e1fb1722b918b5e43ecbd7349e2202", "parents": [ "3da3f872aa175f59e20766ed30aaea67fd4fa7d1", "536628d0983f1c6a7ccece28ded635661aa30319" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 06:10:16 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 01 06:10:16 2011 -1000" }, "message": "Merge branch \u0027sh-latest\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x\n\n* \u0027sh-latest\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x: (39 commits)\n SH: static should be at beginning of declaration\n sh: move CLKDEV_xxx_ID macro to sh_clk.h\n sh: clock-shx3: add CLKDEV_ICK_ID for cleanup\n sh: clock-sh7786: add CLKDEV_ICK_ID for cleanup\n sh: clock-sh7785: add CLKDEV_ICK_ID for cleanup\n sh: clock-sh7757: add CLKDEV_ICK_ID for cleanup\n sh: clock-sh7366: add CLKDEV_ICK_ID for cleanup\n sh: clock-sh7343: add CLKDEV_ICK_ID for cleanup\n sh: clock-sh7722: add CLKDEV_ICK_ID for cleanup\n sh: clock-sh7724: add CLKDEV_ICK_ID for cleanup\n sh: clock-sh7366: modify I2C clock settings\n sh: clock-sh7343: modify I2C clock settings\n sh: clock-sh7723: modify I2C clock settings\n sh: clock-sh7722: modify I2C clock settings\n sh: clock-sh7724: modify I2C clock settings\n serial: sh-sci: Fix up pretty name printing for port IRQs.\n serial: sh-sci: Kill off per-port enable/disable callbacks.\n serial: sh-sci: Add missing module description/author bits.\n serial: sh-sci: Regtype probing doesn\u0027t need to be fatal.\n sh: Tidy up pre-clkdev clk_get() error handling.\n ...\n" }, { "commit": "86bc704db0ab7e69230f79bc7d124e063259abc6", "tree": "9eeaf664b0c47cf440be1e410f7685cc06c0049c", "parents": [ "3a5fba19b080b365d67866db38e32e6a4a2089e8" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Jul 23 19:03:11 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Aug 01 02:10:32 2011 -0400" }, "message": "switch posix_acl_chmod() to umode_t\n\nagain, that\u0027s what all callers pass to it\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "3a5fba19b080b365d67866db38e32e6a4a2089e8", "tree": "bbca7e67f502e1828ca9c897ecc883f879e7743e", "parents": [ "d6952123b53cc8b334df69bba2cd0063b0d88f68" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Jul 23 19:01:48 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Aug 01 02:10:20 2011 -0400" }, "message": "switch posix_acl_from_mode() to umode_t\n\n... seeing that this is what all callers pass to it anyway.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "d6952123b53cc8b334df69bba2cd0063b0d88f68", "tree": "b1ccaa7e3d65dbf4af093202044da65bc4deb34e", "parents": [ "d3fb612076eebec6f67257db0c7a9666ac7e5892" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Jul 23 18:56:36 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Aug 01 02:10:06 2011 -0400" }, "message": "switch posix_acl_equiv_mode() to umode_t *\n\n... so that \u0026inode-\u003ei_mode could be passed to it\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "d3fb612076eebec6f67257db0c7a9666ac7e5892", "tree": "5265fca258a74ffa75b845998492abb9446db72c", "parents": [ "782b94cdf577b4df1feb376f372dccc28e66a771" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Jul 23 18:37:50 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Aug 01 02:09:42 2011 -0400" }, "message": "switch posix_acl_create() to umode_t *\n\nso we can pass \u0026inode-\u003ei_mode to it\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f2ee7abf4c40c8e6bffced923a7c01ea2d1f6c97", "tree": "3c7ec119cf89f82737c55235ff7881ebeed9408f", "parents": [ "b12362bdb61a230a67daa77bcd2a11e59b2802e1" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jul 28 06:41:09 2011 +0200" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Aug 01 01:41:17 2011 -0400" }, "message": "vfs: avoid taking inode_hash_lock on pipes and sockets\n\nSome inodes (pipes, sockets, ...) are not hashed, no need to take\ncontended inode_hash_lock at dismantle time.\n\nnice speedup on SMP machines on socket intensive workloads.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "3da3f872aa175f59e20766ed30aaea67fd4fa7d1", "tree": "a44697edf5eebd02b6f159a7ab824a45730134b4", "parents": [ "968e75fc13b6d582f42ce44172e13ba58157e11f", "e178ccb33569da17dc897a08a3865441b813bdfb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 31 14:31:44 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 31 14:31:44 2011 -1000" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (46 commits)\n mfd: Fix mismatch in twl4030 mutex lock-unlock\n mfd: twl6030-pwm.c needs MODULE_LICENSE\n mfd: Fix the omap-usb-host clock API usage on usbhs_disable()\n mfd: Acknowledge WM8994 IRQs before reporting\n mfd: Acknowlege all WM831x IRQs before we handle them\n mfd: Avoid two assignments if failures happen in tps65910_i2c_probe\n regulator: Storing tps65912 error codes in u8\n mfd: Don\u0027t leak init_data in tps65910_i2c_probe\n regulator: aat2870: Add AAT2870 regulator driver\n backlight: Add AAT2870 backlight driver\n mfd: Add AAT2870 mfd driver\n mfd: Remove dead code from max8997-irq\n mfd: Move TPS55910 Kconfig option\n mfd: Fix missing stmpe kerneldoc\n mfd: Fix off-by-one value range checking for tps65912_i2c_write\n mfd: Add devices for WM831x clocking module\n mfd: Remove comp{1,2}_threshold sysfs entries in tps65911_comparator_remove\n mfd: Don\u0027t ask about the TPS65912 core driver in Kconfig\n mfd: Fix off by one in WM831x IRQ code\n mfd: Add tps65921 support from twl-core\n ...\n" }, { "commit": "968e75fc13b6d582f42ce44172e13ba58157e11f", "tree": "306eacdf2815f8a49b47228c3b50e7a6083ef7d4", "parents": [ "a00ed25cce6fe856388f89c7cd40da0eee7666a6", "d3690f8b713f9710e68214ca38fb8b07b587a2a7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 31 14:30:59 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 31 14:30:59 2011 -1000" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:\n m68k/math-emu: Remove unnecessary code\n m68k/math-emu: Remove commented out old code\n m68k: Kill warning in setup_arch() when compiling for Sun3\n m68k/atari: Prefix GPIO_{IN,OUT} with CODEC_\n sparc: iounmap() and *_free_coherent() - Use lookup_resource()\n m68k/atari: Reserve some ST-RAM early on for device buffer use\n m68k/amiga: Chip RAM - Use lookup_resource()\n resources: Add lookup_resource()\n sparc: _sparc_find_resource() should check for exact matches\n m68k/amiga: Chip RAM - Offset resource end by CHIP_PHYSADDR\n m68k/amiga: Chip RAM - Use resource_size() to fix off-by-one error\n m68k/amiga: Chip RAM - Change chipavail to an atomic_t\n m68k/amiga: Chip RAM - Always allocate from the start of memory\n m68k/amiga: Chip RAM - Convert from printk() to pr_*()\n m68k/amiga: Chip RAM - Use tabs for indentation\n" }, { "commit": "a00ed25cce6fe856388f89c7cd40da0eee7666a6", "tree": "24f7bfe891bfd40ed1f0013242c757c4be58b47e", "parents": [ "24c3047095fa3954f114bfff2e37b8fcbb216396" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Jul 31 16:39:04 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 31 14:27:04 2011 -1000" }, "message": "NFS: Re-enable compilation of nfs with !CONFIG_NFS_V4 || !CONFIG_NFS_V4_1\n\nFix two recently introduced compile problems:\n\nFix a typo in fs/nfs/pnfs.h\n\nMove the pnfs_blksize declaration outside the CONFIG_NFS_V4 section in\nstruct nfs_server.\n\nReported-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "09d6292befba8c6319d9471803149573ea6ed170", "tree": "1de1bda81b4ca3844e80a6041e0ccefbc5db1628", "parents": [ "7785bf11f312624101462d7dc840e27344899873" ], "author": { "name": "Jin Park", "email": "jinyoungp@nvidia.com", "time": "Mon Jul 04 19:48:12 2011 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Jul 31 23:28:26 2011 +0200" }, "message": "mfd: Add AAT2870 mfd driver\n\nAdd mfd core driver for AnalogicTech AAT2870.\nThe AAT2870 is communication through I2C and contains backlight and\nregulator components.\n\nSigned-off-by: Jin Park \u003cjinyoungp@nvidia.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "4dcaa6b6df354fa44b3072bed3cb13aad7e5fbd4", "tree": "c0d09696b116938aadb5b3d195f2cf71fd97a860", "parents": [ "63c8a58d226a0701272b54015a8d73643d72cd3d" ], "author": { "name": "Om Prakash", "email": "omprakash.pal@stericsson.com", "time": "Mon Jun 27 09:54:22 2011 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Jul 31 23:28:25 2011 +0200" }, "message": "mfd: Fix missing stmpe kerneldoc\n\nGenerating kerneldoc for STMPE result in warnings, so fix this by\nadding missing documentation.\n\nSigned-off-by: Om Prakash \u003comprakash.pal@stericsson.com\u003e\nReviewed-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nReviewed-by: Jonas Aberg \u003cjonas.aberg@stericsson.com\u003e\nReviewed-by: Srinidhi Kasagar \u003csrinidhi.kasagar@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "c7e1da477293b4b5e0bef3639b3734e28d5d55f7", "tree": "b6202f1847dc86f66a5afe2ea5c3ba9db24975b6", "parents": [ "b00cd68eb3f6c81525e43f6259b65665ef32499a" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Jun 21 11:12:23 2011 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Jul 31 23:28:24 2011 +0200" }, "message": "mfd: Add WM831x clock control register definitions\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "ec2328c30bf09fe31e77889090eeb1a965325f53", "tree": "b60fd04f5941a9db1c5fa0dab3b9d00e5b1c1b10", "parents": [ "19921ef61217fff600202b819c05bb078f254619" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon Jun 20 11:47:55 2011 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Jul 31 23:28:23 2011 +0200" }, "message": "mfd: Implement tps65910 IRQ cleanup\n\nThe tps65910_irq_exit() cleanup function was generating a warning from\nsparse due to the lack of a prototype. This wasn\u0027t causing GCC warnings\nas the driver wasn\u0027t cleaning up its IRQs on exit at all so there was no\nuse of an unprototyped function.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "0a1b089738cf2165ee8678e2483fce3c40389d4a", "tree": "1abf91e5781fb99f1bc44b690576c1840bc4a0aa", "parents": [ "6af75ecd5772eee4d7be974a881fd5a25f218b0b" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Thu Jun 09 23:57:57 2011 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Jul 31 23:28:23 2011 +0200" }, "message": "mfd: Clean-up ab8500 register file\n\nThis adds a previously undefined test register and removed a\nnumber of double-defined accessory detect registers (they are\nalready defined higher up in the file.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "668a6cc710ee054af2b059d27bbec746ead0fbca", "tree": "67b13e972464064fe81529613aaba32874352746", "parents": [ "d49a0f3f14a763242b71244019d7881ee06e0658" ], "author": { "name": "Margarita Olaya", "email": "magi@slimlogic.co.uk", "time": "Thu Jun 09 14:50:19 2011 -0500" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Jul 31 23:28:22 2011 +0200" }, "message": "tps65912: gpio: add gpio driver\n\nTPS65912 has five GPIOs that can be configured for different\npurposes.\n\nSigned-off-by: Margarita Olaya Cabrera \u003cmagi@slimlogic.co.uk\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Liam Girdwood \u003clrg@ti.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "d49a0f3f14a763242b71244019d7881ee06e0658", "tree": "fb268d0961fb012c480b8a7557b067a1f40a6753", "parents": [ "36e52873c6393b569f2befcdd1847929211892b8" ], "author": { "name": "Margarita Olaya", "email": "magi@slimlogic.co.uk", "time": "Thu Jun 09 14:50:13 2011 -0500" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Jul 31 23:28:22 2011 +0200" }, "message": "tps65912: irq: add interrupt controller\n\nThis module controls the interrupt handling for the tps65912.\nThe interrupt sources can be the following:\n\n- GPIO\n- PWRON signal\n- PWRHOLD signal\n- Temperature detection\n\nSigned-off-by: Margarita Olaya Cabrera \u003cmagi@slimlogic.co.uk\u003e\nAcked-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nAcked-by: Liam Girdwood \u003clrg@ti.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "36e52873c6393b569f2befcdd1847929211892b8", "tree": "dbc25ce026ec1bfe69702766048db78c5e7e3702", "parents": [ "8504d638041d50901b8bfba4fe646bd0bbb5cbb9" ], "author": { "name": "Margarita Olaya", "email": "magi@slimlogic.co.uk", "time": "Thu Jun 09 14:50:00 2011 -0500" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Jul 31 23:28:22 2011 +0200" }, "message": "mfd: tps65912: Add new mfd device\n\nThe tps65912 chip is a power management IC. It contains the following\ncomponents:\n\n- Regulators\n- GPIO controller\n\nThe core driver is registered as a platform driver, it provides communication\nthrough I2C and SPI interfaces.\n\nSigned-off-by: Margarita Olaya Cabrera \u003cmagi@slimlogic.co.uk\u003e\nAcked-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nAcked-by: Liam Girdwood \u003clrg@ti.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "78bb3688ea1830672b8095fb6388593f582cd591", "tree": "06e10d5acd11ae3a2235d05fdf82880b0b40371a", "parents": [ "a2495bc727e2dd8421fb85c80e38f9a4a4c1e58e" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Jun 07 11:47:28 2011 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Jul 31 23:28:20 2011 +0200" }, "message": "mfd: Support multiple active WM831x AUXADC conversions\n\nThe WM831x AUXADC hardware can schedule multiple conversions at once,\nallowing higher performance when more than one source is in use as we\ncan have the hardware start new conversions without having to wait for\na register write.\n\nTake advantage of this in the interrupt driven case, maintaining a list of\ncallers that are waiting for AUXADC conversions and completing them all\nsimultaneously. The external interface of the AUXADC is not changed so\nthere will be limited use of the feature immediately.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "c1a82780b41e78f31636c49279ce940afe60a453", "tree": "a8769c072230d413c53fbfffa46d466965c8510f", "parents": [ "5c05a8d1f0105ada3cb04be5b70686fc6b272619" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Thu Jun 02 19:18:52 2011 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Jul 31 23:28:20 2011 +0200" }, "message": "mfd: Read wm831x AUXADC conversion results before acknowledging interrupt\n\nEnsure that there\u0027s no possibility of loosing an AUXADC interrupt by reading\nthe conversion result in the IRQ handler when using interrupts. Otherwise\nit\u0027s possible that under very heavy load a new conversion could be initiated\nbefore the acknowledgement for a previous interrupt has happened.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "5c05a8d1f0105ada3cb04be5b70686fc6b272619", "tree": "ba8c16b5c553c4f35a2a483aa7d7f5d5625cc3dd", "parents": [ "b9d03d999b46f0897492f3aac3e794312e5282db" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Thu Jun 02 19:18:51 2011 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Jul 31 23:28:19 2011 +0200" }, "message": "mfd: Support dynamic allocation of IRQ range for wm831x\n\nUse irq_allocate_desc() to get the IRQ range, which turns into a noop on\nnon-sparse systems. Since all existing users are non-sparse there should\nbe no compatibility issues.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "266a5e02fe2690637b2318c9fc5c3513937128f4", "tree": "1f531de03568ef9b78ae67f2204f481c1e9eb582", "parents": [ "eb503dc16b04d07a42a37892da73c74461fd06da" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Thu Jun 02 19:18:49 2011 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Jul 31 23:28:19 2011 +0200" }, "message": "mfd: Allow touchscreen to be disabled on wm831x devices\n\nAllow platform data to flag the touchscreen as disabled so that if the\ntouch driver is built in we don\u0027t end up causing lots of work by spuriously\ndetecting touchscreen activity on systems where it isn\u0027t in use.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "ca7a71824ac957b1b9d3322656c05aad38d7275c", "tree": "ff89c76b4cda114343c01f332aa28fb80095f3db", "parents": [ "24c3047095fa3954f114bfff2e37b8fcbb216396" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Thu Jun 02 19:18:47 2011 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Jul 31 23:28:19 2011 +0200" }, "message": "mfd: Fix bus lock interaction for WM831x IRQ set_type() operation\n\nThe WM831x IRQ set_type() operation is doing a direct register write when\ncalled but since set_type() is called with the bus lock held this isn\u0027t\nlegal and could cause deadlocks in the IRQ core.\n\nFix this by posting the updates into an array and syncing in the\nbus_sync_unlock() callback.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "24c3047095fa3954f114bfff2e37b8fcbb216396", "tree": "a2263a4425d511ae619ca8b055705261dab9ec12", "parents": [ "6581058f44533f9d45548bcfe986c125376859e9", "71cdd40fd498f12679070def668f6a4719ddbd1c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 31 06:26:50 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 31 06:26:50 2011 -1000" }, "message": "Merge branch \u0027nfs-for-3.1\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\n* \u0027nfs-for-3.1\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (28 commits)\n pnfsblock: write_pagelist handle zero invalid extents\n pnfsblock: note written INVAL areas for layoutcommit\n pnfsblock: bl_write_pagelist\n pnfsblock: bl_read_pagelist\n pnfsblock: cleanup_layoutcommit\n pnfsblock: encode_layoutcommit\n pnfsblock: merge rw extents\n pnfsblock: add extent manipulation functions\n pnfsblock: bl_find_get_extent\n pnfsblock: xdr decode pnfs_block_layout4\n pnfsblock: call and parse getdevicelist\n pnfsblock: merge extents\n pnfsblock: lseg alloc and free\n pnfsblock: remove device operations\n pnfsblock: add device operations\n pnfsblock: basic extent code\n pnfsblock: use pageio_ops api\n pnfsblock: add blocklayout Kconfig option, Makefile, and stubs\n pnfs: cleanup_layoutcommit\n pnfs: ask for layout_blksize and save it in nfs_server\n ...\n" }, { "commit": "f0d15c96d4ddcf32b6f910c4c2487ee705e4d493", "tree": "07c715e05527545e40cbc57d4377f95247c20ebe", "parents": [ "4d8a93c7e542c364b1c2ad1dd406ede85080eab9", "f8c63918c9a3004bd052fa4af08aa1cefbcd79ac" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 31 06:24:50 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 31 06:24:50 2011 -1000" }, "message": "Merge git://git.infradead.org/battery-2.6\n\n* git://git.infradead.org/battery-2.6:\n gpio-charger: Fix checking return value of request_any_context_irq\n power_supply: MAX17042: Support additional properties\n max8903_charger: Allow platform data to be __initdata\n power_supply: Add charger driver for MAX8998/LP3974\n power_supply: Add charger driver for MAX8997/8966\n max17042_battery: Remove obsolete cleanup for clientdata\n twl4030_charger: Fix warnings\n wm831x_power: Support multiple instances\n wm831x_backup: Support multiple instances\n apm_power: Fix style error in macros\n s3c_adc_battery: Fix annotation for s3c_adc_battery_probe()\n bq20z75: Enable detection after registering\n bq20z75: Add support for external notification\n" }, { "commit": "f33c596a2f921696391801b637ed50d514634079", "tree": "abc353fe3ef128e60e20a6b73f52858ce6d39eff", "parents": [ "250f8e3db646028353a2a737ddb7a894c97a1098", "74411c04540404a1ff29d254584ef393e150aeda" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 31 06:23:08 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 31 06:23:08 2011 -1000" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:\n smc91c92_cs.c: fix bogus compiler warning\n orinoco_cs: be more careful when matching cards with ID 0x0156:0x0002\n hostap_cs: support cards with \"Version 01.02\" as third product ID\n pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3\n pxa2xx pcmcia - stargate 2 use gpio array.\n pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.\n drivers:pcmcia:soc_common: make socket_init and socket_suspend optional\n" }, { "commit": "2f9fd182607e7b3bdca35f6ed7f2fae539f7c46b", "tree": "9a61ca5ef63c4160c3b632fe333720d3927b627f", "parents": [ "03341d2cc91c700fc38883e572043a6a8f17dd5c" ], "author": { "name": "Fred Isaman", "email": "iisaman@citi.umich.edu", "time": "Sat Jul 30 20:52:46 2011 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Jul 31 12:18:16 2011 -0400" }, "message": "pnfsblock: call and parse getdevicelist\n\nCall GETDEVICELIST during mount, then call and parse GETDEVICEINFO\nfor each device returned.\n\n[pnfsblock: get rid of deprecated xdr macros]\nSigned-off-by: Jim Rees \u003crees@umich.edu\u003e\n[pnfsblock: fix pnfs_deviceid references]\nSigned-off-by: Fred Isaman \u003ciisaman@citi.umich.edu\u003e\n[pnfsblock: fix print format warnings for sector_t and size_t]\n[pnfs-block: #include \u003clinux/vmalloc.h\u003e]\n[pnfsblock: no PNFS_NFS_SERVER]\nSigned-off-by: Benny Halevy \u003cbhalevy@panasas.com\u003e\n[pnfsblock: fix bug determining size of striped volume]\n[pnfsblock: fix oops when using multiple devices]\nSigned-off-by: Fred Isaman \u003ciisaman@citi.umich.edu\u003e\nSigned-off-by: Benny Halevy \u003cbhalevy@panasas.com\u003e\nSigned-off-by: Benny Halevy \u003cbhalevy@tonian.com\u003e\n[pnfsblock: get rid of vmap and deviceid-\u003earea structure]\nSigned-off-by: Peng Tao \u003cpeng_tao@emc.com\u003e\nSigned-off-by: Jim Rees \u003crees@umich.edu\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" } ], "next": "fe0a9b740881d181e3c96c1f6f6043e252692ffe" }