)]}' { "log": [ { "commit": "09ef0789bbceb0fe89ce4ad2bb1fdb2b937d3eba", "tree": "e238daa543759a37143ed42591304d29320f493b", "parents": [ "859ad35e711d95f2794ab2196aac7c45fe5f7cfe" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:01 2012 -0800" }, "message": "smsc911x: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "859ad35e711d95f2794ab2196aac7c45fe5f7cfe", "tree": "6876c16bdc7b1b4e3aa2e48493d694ae60aa4658", "parents": [ "5278fb547076ad6768d16c8b4df45c086470c163" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:01 2012 -0800" }, "message": "s6gmac: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5278fb547076ad6768d16c8b4df45c086470c163", "tree": "823f9e28fac267c4c1ba28eb8c593ff31e0eb408", "parents": [ "d073a102a185e9847785c93669bffd1a09a8c1f2" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:01 2012 -0800" }, "message": "sh-eth: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d073a102a185e9847785c93669bffd1a09a8c1f2", "tree": "2f9dcff8dbbc7b8e98384c6b44aa2d7af44eeb42", "parents": [ "12322431d154250db9e61b0c79151c968a8d7766" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:01 2012 -0800" }, "message": "pxa168-eth: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "12322431d154250db9e61b0c79151c968a8d7766", "tree": "b19ecb9b785c2f5c5d9e131002a8c437c4daef79", "parents": [ "d1b86507d87c94a201a9a1bb31d2285b189d8e26" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "mv643xx-eth: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nAcked-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d1b86507d87c94a201a9a1bb31d2285b189d8e26", "tree": "ae490994b6beeb4b8466a0f2bfa8007144ce7271", "parents": [ "391420f7b829e73b26a543e39c40a83f7de6467c" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:14 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "lantiq_etop: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "391420f7b829e73b26a543e39c40a83f7de6467c", "tree": "47ec8646e97cee1af969c781cbd55853aa3bceec", "parents": [ "63f678301fb952c2d758d9ded4ed88c1da6c0c50" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:13 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "fec: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "63f678301fb952c2d758d9ded4ed88c1da6c0c50", "tree": "d30d434b3d7e2482c79f3d713bd41c67dbc22fe2", "parents": [ "98d5e57eafce7a68d864fdb5a26542ba8b4f59ba" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:12 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "dnet: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "98d5e57eafce7a68d864fdb5a26542ba8b4f59ba", "tree": "9800df483050169adb3d4ea3aea2b79969ee9399", "parents": [ "446bbc4b5ee122c3a3a4954b144d031f0f9aa006" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:11 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "macb: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "446bbc4b5ee122c3a3a4954b144d031f0f9aa006", "tree": "6d4b806e6eadab525a615aefbd15b2b9c58ebec5", "parents": [ "f74299b6c1d01363adf356c9ecc01ba000a5a1aa" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:10 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "sb1250: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f74299b6c1d01363adf356c9ecc01ba000a5a1aa", "tree": "eb3be20c38ebe2cea6dc202a41cd8f83a3e6b622", "parents": [ "75432fd2913e03696f56289a853754ef0124545f" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:09 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "au1000-eth: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "75432fd2913e03696f56289a853754ef0124545f", "tree": "eeb14fbb8e09732f1931117efc4e4a8fb2551dc0", "parents": [ "fa84e7201c592945b390fb51a5ffc7e785868be4" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:08 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "bfin_mac: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa84e7201c592945b390fb51a5ffc7e785868be4", "tree": "13091b56438081a04901708f7899f02515f96685", "parents": [ "71bc5d94061516c4e70303570128797bcf768b10" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:07 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "ax88796: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "71bc5d94061516c4e70303570128797bcf768b10", "tree": "5625427bd7c047b0feffc0809ab91d91051a2014", "parents": [ "8ef66bdc4bda6aac2dae73b84d79dc8c2db33637" ], "author": { "name": "Jussi Kivilinna", "email": "jussi.kivilinna@mbnet.fi", "time": "Tue Jan 10 06:40:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 14:59:48 2012 -0800" }, "message": "asix: fix setting custom MAC address on Asix 88178 devices\n\nIn kernel v3.2 initialization sequence for Asix 88178 devices was changed so\nthat hardware is reseted on every time interface is brought up (ifconfig up),\ninstead just at USB probe time. This causes problem with setting custom MAC\naddress to device as ax88178_reset causes reload of MAC address from EEPROM.\n\nThis patch fixes the issue by rewriting MAC address at end of ax88178_reset.\n\nSigned-off-by: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nAcked-by: Grant Grundler \u003cgrundler@chromium.org\u003e\nCc: Allan Chou \u003callan@asix.com.tw\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8ef66bdc4bda6aac2dae73b84d79dc8c2db33637", "tree": "a4a78ce0bbf4e7a320d10f1c80b80e93fc08a1ec", "parents": [ "2193ceabdcde1fca5e017acf1d0023285531748f" ], "author": { "name": "Jussi Kivilinna", "email": "jussi.kivilinna@mbnet.fi", "time": "Tue Jan 10 06:40:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 14:59:48 2012 -0800" }, "message": "asix: fix setting custom MAC address on Asix 88772 devices\n\nIn kernel v3.2 initialization sequence for Asix 88772 devices was changed so\nthat hardware is reseted on every time interface is brought up (ifconfig up),\ninstead just at USB probe time. This causes problem with setting custom MAC\naddress to device as ax88772_reset causes reload of MAC address from EEPROM.\n\nThis patch fixes the issue by rewriting MAC address at end of ax88772_reset.\n\nSigned-off-by: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nAcked-by: Grant Grundler \u003cgrundler@chromium.org\u003e\nCc: Allan Chou \u003callan@asix.com.tw\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2193ceabdcde1fca5e017acf1d0023285531748f", "tree": "5b2116a0256006e5e318b5bbb9231a71410b0dcf", "parents": [ "aae54cff9255f190ec712468d1b40e63bb51e127" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Tue Jan 10 01:54:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 14:57:20 2012 -0800" }, "message": "drivers: isdn: Fix dependency for ISDN_PPP\n\nFix the following build warning:\n\nwarning: (ISDN_PPP) selects SLHC which has unmet direct dependencies (NETDEVICES)\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aae54cff9255f190ec712468d1b40e63bb51e127", "tree": "3a20f6dfbe71f0e2524ec0cd1dcbbbba1d9705e7", "parents": [ "1dd8117e3320fb42ec40ef2ace982871572d34ed" ], "author": { "name": "Stefan Roese", "email": "sr@denx.de", "time": "Tue Jan 10 01:47:51 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 14:57:20 2012 -0800" }, "message": "stmmac: Add missing LF to pr_info() in stmmac_main.c\n\nOtherwise the output looks like this:\n\n...\nSTMMAC - user ID: 0x10, Synopsys ID: 0x32\n No HW DMA feature register supported\n Normal descriptors\n Remote wake-up capable\n Checksum Offload Engine supported\n No MAC Management Counters availableIP-Config: Complete:\n device\u003deth0, addr\u003d192.168.20.42, mask\u003d255.255.0.0, gw\u003d192.168.1.254,\n...\n\nSigned-off-by: Stefan Roese \u003csr@denx.de\u003e\nCc: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nAcked-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1dd8117e3320fb42ec40ef2ace982871572d34ed", "tree": "147b727bb7b64daff4ca09cefe85d00e0dd00fac", "parents": [ "f3e438f0f776024aa3979e717a0f65f85fe9c6f3" ], "author": { "name": "Stefan Roese", "email": "sr@denx.de", "time": "Tue Jan 10 01:47:40 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 14:57:20 2012 -0800" }, "message": "stmmac: Fix compilation error in mmc_core.c\n\nFix this error:\n\n CC drivers/net/ethernet/stmicro/stmmac/mmc_core.o\ndrivers/net/ethernet/stmicro/stmmac/mmc_core.c: In function \u0027dwmac_mmc_ctrl\u0027:\ndrivers/net/ethernet/stmicro/stmmac/mmc_core.c:143:2: error: implicit\n declaration of function \u0027pr_debug\u0027 [-Werror\u003dimplicit-function-declaration]\n\nSigned-off-by: Stefan Roese \u003csr@denx.de\u003e\nCc: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nAcked-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f3e438f0f776024aa3979e717a0f65f85fe9c6f3", "tree": "0a636cc5b427e171ab4a04fc889a3f1e6ad961ef", "parents": [ "e4e11180dfa545233e5145919b75b7fac88638df", "e92b9b3b091d5fcdaed91d6fa9410deae135704b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 14:53:49 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 14:53:49 2012 -0800" }, "message": "Merge branch \u0027davem-next.via-rhine\u0027 of git://violet.fr.zoreil.com/romieu/linux\n" }, { "commit": "e4e11180dfa545233e5145919b75b7fac88638df", "tree": "bfdb18eee49aa55fd3d6170a422164e772736a1b", "parents": [ "37cfc3f67db9f2d907f6bfcfae590cdbbef623e8", "adc0e91ab142abe93f5b0d7980ada8a7676231fe" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 17:37:37 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 17:37:37 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n vfs: new helper - d_make_root()\n dcache: use a dispose list in select_parent\n ceph: d_alloc_root() may fail\n ext4: fix failure exits\n isofs: inode leak on mount failure\n" }, { "commit": "adc0e91ab142abe93f5b0d7980ada8a7676231fe", "tree": "27ee89f960b7e2d6cd5179d914bc252324122c26", "parents": [ "b48f03b319ba78f3abf9a7044d1f436d8d90f4f9" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 16:49:21 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 19:23:45 2012 -0500" }, "message": "vfs: new helper - d_make_root()\n\nd_alloc_root() with iput() in case of allocation failure...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "b48f03b319ba78f3abf9a7044d1f436d8d90f4f9", "tree": "7ddc8f545787d28825413946519ed88ea19edb24", "parents": [ "3c5184ef1216dd476c9c67f22a199d90ac4d5892" ], "author": { "name": "Dave Chinner", "email": "david@fromorbit.com", "time": "Tue Aug 23 18:56:24 2011 +1000" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 19:22:52 2012 -0500" }, "message": "dcache: use a dispose list in select_parent\n\nselect_parent currently abuses the dentry cache LRU to provide\ncleanup features for child dentries that need to be freed. It moves\nthem to the tail of the LRU, then tells shrink_dcache_parent() to\ncalls __shrink_dcache_sb to unconditionally move them to a dispose\nlist (as DCACHE_REFERENCED is ignored). __shrink_dcache_sb() has to\nrelock the dentries to move them off the LRU onto the dispose list,\nbut otherwise does not touch the dentries that select_parent() moved\nto the tail of the LRU. It then passses the dispose list to\nshrink_dentry_list() which tries to free the dentries.\n\nIOWs, the use of __shrink_dcache_sb() is superfluous - we can build\nexactly the same list of dentries for disposal directly in\nselect_parent() and call shrink_dentry_list() instead of calling\n__shrink_dcache_sb() to do that. This means that we avoid long holds\non the lru lock walking the LRU moving dentries to the dispose list\nWe also avoid the need to relock each dentry just to move it off the\nLRU, reducing the numebr of times we lock each dentry to dispose of\nthem in shrink_dcache_parent() from 3 to 2 times.\n\nFurther, we remove one of the two callers of __shrink_dcache_sb().\nThis also means that __shrink_dcache_sb can be moved into back into\nprune_dcache_sb() and we no longer have to handle referenced\ndentries conditionally, simplifying the code.\n\nSigned-off-by: Dave Chinner \u003cdchinner@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "37cfc3f67db9f2d907f6bfcfae590cdbbef623e8", "tree": "b573983938838dd76b40a7b53b3744472041720f", "parents": [ "38e5781bbf8e82c1635ea845e0d07b2228a5ac7a", "6e4d177dc07b1c4d8e6ef061fe5ffcc7e7646546" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:47:06 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:47:06 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:\n sparc32: remove unused file: include/asm/pgtsun4.h\n sparc32: fix PAGE_SIZE definition\n sparc32: enable different preemptions models\n sparc32: support atomic64_t\n apbuart: fix section mismatch warning\n sparc32: drop useless preprocessor conditional in atomic_32.h\n sparc32: drop unused atomic24 support\n" }, { "commit": "38e5781bbf8e82c1635ea845e0d07b2228a5ac7a", "tree": "69ced9c509c864a67122c5e1337f14cd1d9e988d", "parents": [ "979ecef5b89a8003902299566d9cdc08de34a3ee", "a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:46:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:46:52 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:\n igmp: Avoid zero delay when receiving odd mixture of IGMP queries\n netdev: make net_device_ops const\n bcm63xx: make ethtool_ops const\n usbnet: make ethtool_ops const\n net: Fix build with INET disabled.\n net: introduce netif_addr_lock_nested() and call if when appropriate\n net: correct lock name in dev_[uc/mc]_sync documentations.\n net: sk_update_clone is only used in net/core/sock.c\n 8139cp: fix missing napi_gro_flush.\n pktgen: set correct max and min in pktgen_setup_inject()\n smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h\n asix: fix infinite loop in rx_fixup()\n net: Default UDP and UNIX diag to \u0027n\u0027.\n r6040: fix typo in use of MCR0 register bits\n net: fix sock_clone reference mismatch with tcp memcontrol\n" }, { "commit": "979ecef5b89a8003902299566d9cdc08de34a3ee", "tree": "2a695d557adab1dec5263f014789f5b59238bac8", "parents": [ "e8cbce976050a9f874a8b07012ddeb9b9eb59603", "8c3b2296f1aa13d7504d2c09bc819cef3759562a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:44:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:44:15 2012 -0800" }, "message": "Merge tag \u0027clk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nclock management changes for i.MX\n\nAnother simple series related to clock management, this time only for\nimx.\n\n* tag \u0027clk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: mxs: select HAVE_CLK_PREPARE for clock\n clk: add config option HAVE_CLK_PREPARE into Kconfig\n ASoC: mxs-saif: convert to clk_prepare/clk_unprepare\n video: mxsfb: convert to clk_prepare/clk_unprepare\n serial: mxs-auart: convert to clk_prepare/clk_unprepare\n net: flexcan: convert to clk_prepare/clk_unprepare\n mtd: gpmi-lib: convert to clk_prepare/clk_unprepare\n mmc: mxs-mmc: convert to clk_prepare/clk_unprepare\n dma: mxs-dma: convert to clk_prepare/clk_unprepare\n net: fec: add clk_prepare/clk_unprepare\n ARM: mxs: convert platform code to clk_prepare/clk_unprepare\n clk: add helper functions clk_prepare_enable and clk_disable_unprepare\n\nFix up trivial conflicts in drivers/net/ethernet/freescale/fec.c due to\ncommit 0ebafefcaa7a (\"net: fec: add clk_prepare/clk_unprepare\") clashing\ntrivially with commit e163cc97f9ac (\"net/fec: fix the .remove code\").\n" }, { "commit": "e8cbce976050a9f874a8b07012ddeb9b9eb59603", "tree": "3660d00f49a70e20c74c3d41027ea8598ad926d7", "parents": [ "b3c37522928b5452588fc202eaa0f11f6e339256", "27fdb577435e336e4b00b9e51626f9002b88a86c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:40:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:40:48 2012 -0800" }, "message": "Merge tag \u0027timer\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\ntimer changes for msm\n\nA very simple series. We used to have more churn in the timer\narea, so this is kept separate. Will probably put this into the\ndrivers series next time.\n\n* tag \u0027timer\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n msm: timer: Use clockevents_config_and_register()\n msm: timer: Setup interrupt after registering clockevent\n msm: timer: Remove SoC specific #ifdefs\n msm: timer: Remove msm_clocks[] and simplify code\n msm: timer: Fix ONESHOT mode interrupts\n msm: timer: Use GPT for clockevents and DGT for clocksource\n msm: timer: Cleanup #includes and #defines\n msm: timer: Tighten #ifdef for local timer support\n" }, { "commit": "b3c37522928b5452588fc202eaa0f11f6e339256", "tree": "37bfe21d9977b15271903d1a4b304289a232e364", "parents": [ "2ac9d7aaccbd598b5bd19ac40761b723bb675442", "6d0a5636fba5a3f82ec80ab124dd4748344549c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:59 2012 -0800" }, "message": "Merge tag \u0027pm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\npower management changes for omap and imx\n\nA significant part of the changes for these two platforms went into\npower management, so they are split out into a separate branch.\n\n* tag \u0027pm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (65 commits)\n ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1\n ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation\n ARM: imx6q: resume PL310 only when CACHE_L2X0 defined\n ARM: imx6q: build pm code only when CONFIG_PM selected\n ARM: mx5: use generic irq chip pm interface for pm functions on\n ARM: omap: pass minimal SoC/board data for UART from dt\n arm/dts: Add minimal device tree support for omap2420 and omap2430\n omap-serial: Add minimal device tree support\n omap-serial: Use default clock speed (48Mhz) if not specified\n omap-serial: Get rid of all pdev-\u003eid usage\n ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init\n ARM: OMAP4: PRM: use PRCM interrupt handler\n ARM: OMAP3: pm: use prcm chain handler\n ARM: OMAP: hwmod: add support for selecting mpu_irq for each wakeup pad\n ARM: OMAP2+: mux: add support for PAD wakeup interrupts\n ARM: OMAP: PRCM: add suspend prepare / finish support\n ARM: OMAP: PRCM: add support for chain interrupt handler\n ARM: OMAP3/4: PRM: add functions to read pending IRQs, PRM barrier\n ARM: OMAP2+: hwmod: Add API to enable IO ring wakeup\n ARM: OMAP2+: mux: add wakeup-capable hwmod mux entries to dynamic list\n ...\n" }, { "commit": "2ac9d7aaccbd598b5bd19ac40761b723bb675442", "tree": "09132a44e33798aaa5e80f10bf025b510015cab3", "parents": [ "5ede3ceb7b2c2843e153a1803edbdc8c56655950", "dcf7ec5ee62a78123057a1e286c88ca739717409" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:22 2012 -0800" }, "message": "Merge tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nDriver specific changes\n\nAgain, a lot of platforms have changes in here: pxa, samsung, omap,\nat91, imx, ...\n\n* tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)\n ARM: sa1100: clean up of the clock support\n ARM: pxa: add dummy clock for sa1100-rtc\n RTC: sa1100: support sa1100, pxa and mmp soc families\n RTC: sa1100: remove redundant code of setting alarm\n RTC: sa1100: Clean out ost register\n Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()\n pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()\n ARM: EXYNOS: Modified files for SPI consolidation work\n ARM: S5P64X0: Enable SDHCI support\n ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names\n ARM: S5P64X0: Add HSMMC setup for host Controller\n ARM: EXYNOS: Add USB OHCI support to ORIGEN board\n USB: Add Samsung Exynos OHCI diver\n ARM: EXYNOS: Add USB OHCI support to SMDKV310 board\n ARM: EXYNOS: Add USB OHCI device\n net: macb: fix build break with !CONFIG_OF\n i2c: tegra: Support DVC controller in device tree\n i2c: tegra: Add __devinit/exit to probe/remove\n net/at91_ether: use gpio_is_valid for phy IRQ line\n ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT\n ...\n" }, { "commit": "5ede3ceb7b2c2843e153a1803edbdc8c56655950", "tree": "4cfa82b619f7d39b671e4a2a213f4d040b09c486", "parents": [ "6d889d03ab1417645e76e129834f76204bae37c0", "3e2762c8f1141ae8dc708034ea41d6827818c328" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:38:51 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:38:51 2012 -0800" }, "message": "Merge tag \u0027devel\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nNew feature development\n\nThis adds support for new features, and contains stuff from most\nplatforms. A number of these patches could have fit into other\nbranches, too, but were small enough not to cause too much\nconfusion here.\n\n* tag \u0027devel\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)\n mfd/db8500-prcmu: remove support for early silicon revisions\n ARM: ux500: fix the smp_twd clock calculation\n ARM: ux500: remove support for early silicon revisions\n ARM: ux500: update register files\n ARM: ux500: register DB5500 PMU dynamically\n ARM: ux500: update ASIC detection for U5500\n ARM: ux500: support DB8520\n ARM: picoxcell: implement watchdog restart\n ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C\n ARM: OMAP3: hwmod data: disable multiblock reads on MMC1/2 on OMAP34xx/35xx \u003c\u003d ES2.1\n ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP4\n ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3\n ARM: OMAP: hwmod data: Add support for AM35xx UART4/ttyO3\n ARM: Orion: Remove address map info from all platform data structures\n ARM: Orion: Get address map from plat-orion instead of via platform_data\n ARM: Orion: mbus_dram_info consolidation\n ARM: Orion: Consolidate the address map setup\n ARM: Kirkwood: Add configuration for MPP12 as GPIO\n ARM: Kirkwood: Recognize A1 revision of 6282 chip\n ARM: ux500: update the MOP500 GPIO assignments\n ...\n" }, { "commit": "6d889d03ab1417645e76e129834f76204bae37c0", "tree": "577e37b5597b27f6de25bbbc634a0f17ccfb15f7", "parents": [ "7400c12eb069df781894a94dfa5c865f3fe3e2d4", "421b759b86eb8a914cbbd11f6d09a74f411762c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:37:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:37:41 2012 -0800" }, "message": "Merge tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nBoard-level changes\n\nThis adds and extends support for specific boards on a number of\nARM platforms: omap, imx, samsung, tegra, ...\n\n* tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)\n Enable 32 bit flash support for iMX21ADS board\n ARM: mx31pdk: Add MC13783 RTC support\n iomux-mx25: configuration to support CSPI3 on CSI pins\n MX1:apf9328: Add i2c support\n mioa701: add newly available DoC G3 chip\n arm/tegra: remove __initdata annotation from pinmux tables\n arm/tegra: Use bus notifiers to trigger pinmux setup\n arm/tegra: Refactor board-*-pinmux.c to share code\n arm/tegra: Fix mistake in Trimslice\u0027s pinmux\n arm/tegra: Rework Seaboard-vs-Ventana pinmux table\n arm/tegra: Remove useless entries from ventana_pinmux[]\n arm/tegra: PCIe: Remove include of mach/pinmux.h\n arm/tegra: Harmony PCIe: Don\u0027t touch pinmux\n arm/tegra: Add AUXDATA for tegra-pinmux and tegra-gpio\n arm/tegra: Split Seaboard GPIO table to allow for Ventana\n ARM: imx6q: generate imx6q dtb files\n arm/imx6q: Rename Sabreauto to Armadillo2\n arm/imx6q-sabrelite: add enet phy ksz9021rn fixup\n arm/imx6: add imx6q sabrelite board support\n dts/imx: rename uart labels to consistent with hw spec\n ...\n" }, { "commit": "7400c12eb069df781894a94dfa5c865f3fe3e2d4", "tree": "53a0922933c0eabcef8e9ba23af0c629952ff44b", "parents": [ "190a44e65b0f32eaf5b4db3969f5eb224f83a7a2", "23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:33:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:33:17 2012 -0800" }, "message": "Merge tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nSoC-level changes for tegra and omap\n\nThis adds support for the new tegra30 SoC, as well as small\nchanges to support minor variations of existing omap SoCs.\n\n* tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (26 commits)\n arm/tegra: Compile tegra_dt_init_irq only when CONFIG_OF\n arm/tegra: Make MACH_TEGRA_DT depend on ARCH_TEGRA_2x_SOC\n arm/tegra: Delete tegra_init_clock()\n arm/tegra: Fix section mismatch errors in tegra30 pinmux\n arm/tegra: Fix section mismatch errors in tegra20 pinmux\n arm/tegra: refresh defconfig for tegra30\n arm/tegra: add support for tegra30 based board cardhu\n arm/tegra: implement support for tegra30\n arm/tegra: pinmux tables and definitions for tegra30\n arm/tegra: add new fields to struct tegra_pingroup_desc\n arm/tegra: prepare pinmux code for multiple tegra variants\n arm/tegra: rename tegra20 pinmux files\n arm/tegra: generalize L2 cache initialization\n arm/tegra: use PMC reset\n arm/tegra: rename board-dt.c to board-dt-tegra20.c\n arm/tegra: prepare early init for multiple tegra variants\n arm/tegra: don\u0027t export clk_measure_input_freq\n arm/tegra: prepare clock code for multiple tegra variants\n arm/tegra: cleanup tegra20 support\n arm/tegra: clk_get should not be fatal\n ...\n\nFix up trivial conflict in arch/arm/mach-tegra/board-dt-tegra20.c\n" }, { "commit": "190a44e65b0f32eaf5b4db3969f5eb224f83a7a2", "tree": "577c9a3949ba06e62d082eb11894b7045ebe3ef3", "parents": [ "dfc1ebe76663d582a01c9dc572395cf8086d01de", "b48741cce3be32a48af9a2b272f3f13a077375cf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:30:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:30:28 2012 -0800" }, "message": "Merge tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nCleanups for the Samsung platforms\n\nVarious cleanup changes that the device driver changes are built upon.\nSince the samsung cleanups depend on the device tree series, which\ndepends on the first set of cleanups for tegra.\n\n* tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: EXYNOS: Use gpio_request_one\n ARM: S5PV210: Use gpio_request_one\n ARM: S3C64XX: Modified according to SPI consolidation work\n ARM: S5PV210: Modified files for SPI consolidation work\n ARM: S5P64X0: Modified files for SPI consolidation work\n ARM: S5PC100: Modified files for SPI consolidation work\n ARM: S3C64XX: Modified files for SPI consolidation work\n ARM: SAMSUNG: Consolidation of SPI platform devices to plat-samsung\n ARM: SAMSUNG: Remove SPI bus clocks from platform data\n ARM: S5PV210: Add SPI clkdev support\n ARM: S5P64X0: Add SPI clkdev support\n ARM: S5PC100: Add SPI clkdev support\n ARM: S3C64XX: Add SPI clkdev support\n spi/s3c64xx: Use bus clocks created using clkdev\n mmc: sdhci-s3c: Use generic clock names for sdhci bus clock options\n ARM: SAMSUNG: Add lookup of sdhci-s3c clocks using generic names\n ARM: SAMSUNG: Remove SDHCI bus clocks from platform data\n ARM: SAMSUNG: Use kmemdup rather than duplicating its implementation\n ARM: EXYNOS: remove exynos4_scu_enable()\n" }, { "commit": "dfc1ebe76663d582a01c9dc572395cf8086d01de", "tree": "54a5ac91214a90f82c27b6e38099a4470837729e", "parents": [ "acc952c1f373bf3f66cc7a10680eee1762bed40b", "b001befe58691ef3627458cd814e8cee7f845c5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:28:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:28:38 2012 -0800" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nDevice tree conversions for samsung and tegra\n\nBoth platforms had some initial device tree support, but this adds\nmuch more to actually make it usable.\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)\n ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN\n ARM: EXYNOS: Add Exynos4 device tree enabled board file\n rtc: rtc-s3c: Add device tree support\n input: samsung-keypad: Add device tree support\n ARM: S5PV210: Modify platform data for pl330 driver\n ARM: S5PC100: Modify platform data for pl330 driver\n ARM: S5P64x0: Modify platform data for pl330 driver\n ARM: EXYNOS: Add a alias for pdma clocks\n ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build\n ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers\n DMA: PL330: Add device tree support\n ARM: EXYNOS: Modify platform data for pl330 driver\n DMA: PL330: Infer transfer direction from transfer request instead of platform data\n DMA: PL330: move filter function into driver\n serial: samsung: Fix build for non-Exynos4210 devices\n serial: samsung: add device tree support\n serial: samsung: merge probe() function from all SoC specific extensions\n serial: samsung: merge all SoC specific port reset functions\n ARM: SAMSUNG: register uart clocks to clock lookup list\n serial: samsung: remove all uses of get_clksrc and set_clksrc\n ...\n\nFix up fairly trivial conflicts in arch/arm/mach-s3c2440/clock.c and\ndrivers/tty/serial/Kconfig both due to just adding code close to\nchanges.\n" }, { "commit": "acc952c1f373bf3f66cc7a10680eee1762bed40b", "tree": "de1135ffe304f4d8e53d282e5bb1bde5db04e0ae", "parents": [ "57e964e1ae9bd4f699ae1074430bcf81a9a11377", "40ba95fdf158713377d47736b1b3a9d75f4f2515" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:21:03 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:21:03 2012 -0800" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nCleanups on various subarchitectures\n\nCleanup patches for various ARM platforms and some of their associated\ndrivers, the bulk of these is for mach-91.\n\nArnd ended up pulling in the restart branch from Russell in order to\nfix up some simple but annoying merge conflicts.\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)\n arm/at91: fix build of stamp9g20\n ARM: u300: delete memory.h\n MAINTAINERS: add maintainer entry for Picochip picoxcell\n ARM: picoxcell: move io mappings to common.c\n ARM: picoxcell: don\u0027t reserve irq_descs\n ARM: picoxcell: remove mach/memory.h\n ARM: at91: delete the pcontrol_g20_defconfig\n arm/tegra: Remove code that\u0027s ifndef CONFIG_ARM_GIC\n arm/tegra: remove unused defines\n arm/tegra: fix variable formatting in makefile\n ARM: davinci: vpif: move code to driver core header from platform\n ARM: at91/gpio: fix display of number of irq setuped\n ARM: at91/gpio: drop PIN_BASE\n ARM: at91/udc: use gpio_is_valid to check the gpio\n ARM: at91/ohci: use gpio_is_valid to check the gpio\n ARM: at91/nand: use gpio_is_valid to check the gpio\n ARM: at91/mmc: use gpio_is_valid to check the gpio\n ARM: at91/ide: use gpio_is_valid to check the gpio\n ARM: at91/pata: use gpio_is_valid to check the gpio\n ARM: at91/soc: use gpio_is_valid to check the gpio\n ...\n" }, { "commit": "57e964e1ae9bd4f699ae1074430bcf81a9a11377", "tree": "8c1fc5199e18a55cece4aa72bbaf2ca909bd1453", "parents": [ "4dee6b64ee7cfef94b47733c6d9fef07f8051c7c", "39fbc76272225fb991ffdfac1e08974506cfa3eb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:20:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:20:39 2012 -0800" }, "message": "Merge tag \u0027fixes-non-critical\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nNon-critical bug fixes\n\nSimple bug fixes that were not considered important enough for inclusion\ninto 3.2.\n\n* tag \u0027fixes-non-critical\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n MAINTAINERS: update pxa and mmp\n ARM: pxa: Include linux/export.h in balloon3.c\n ARM: OMAP4: clock: Add CPU local timer clock node\n ARM: OMAP4: hwmod: Don\u0027t wait for the idle status if modulemode is not supported\n ARM: OMAP: AM3517/3505: fix crash on boot due to incorrect voltagedomain data\n ARM: OMAP: hwmod data: fix the panic on Nokia RM-680 during boot\n ARM: OMAP2+: DMA: Workaround for invalid destination position\n ARM: OMAP2+: DMA: Workaround for invalid source position\n" }, { "commit": "4dee6b64ee7cfef94b47733c6d9fef07f8051c7c", "tree": "78bf53f15f2b0dbcb6b6c1e74faf32545f4ba8bb", "parents": [ "6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5" ], "author": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Jan 09 17:15:42 2012 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:19:33 2012 -0800" }, "message": "tracing/mm: Move include of trace/events/kmem.h out of header into slab.c\n\nIncluding trace/events/*.h TRACE_EVENT() macro headers in other headers\ncan cause strange side effects if another trace/event/*.h header\nincludes that header. Having trace/events/kmem.h inside slab_def.h\ncaused a compile error in sparc64 when changes were done to some header\nfiles. Moving the kmem.h trace header out of slab.h and into slab.c\nfixes the problem.\n\nNote, both slub.c and slob.c already include the trace/events/kmem.h\nfile. Only slab.c had it missing.\n\nLink: http://lkml.kernel.org/r/20120105190405.1e3191fb5a43b2a0f1655e1f@canb.auug.org.au\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27", "tree": "8e1ac7654905142f37d74d8e3e376325a5eb48b1", "parents": [ "e5686ad82ca2aeed7a8f24ffca115c0b7478dec9" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Mon Jan 09 14:06:46 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 14:06:46 2012 -0800" }, "message": "igmp: Avoid zero delay when receiving odd mixture of IGMP queries\n\nCommit 5b7c84066733c5dfb0e4016d939757b38de189e4 (\u0027ipv4: correct IGMP\nbehavior on v3 query during v2-compatibility mode\u0027) added yet another\ncase for query parsing, which can result in max_delay \u003d 0. Substitute\na value of 1, as in the usual v3 case.\n\nReported-by: Simon McVittie \u003csmcv@debian.org\u003e\nReferences: http://bugs.debian.org/654876\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e5686ad82ca2aeed7a8f24ffca115c0b7478dec9", "tree": "e8adf108c0474879f18845d51556279ce9325c23", "parents": [ "1aff0cbe9d51236efba2e721a34e2c15779f95f3" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jan 05 19:10:25 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 14:05:23 2012 -0800" }, "message": "netdev: make net_device_ops const\n\nMore drivers where net_device_ops should be const.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1aff0cbe9d51236efba2e721a34e2c15779f95f3", "tree": "b0ed0d690cc5c42122b50ae6b41c3b905d71e2ee", "parents": [ "bc689c9788f2cc9829d01d84083bc1714b969b15" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jan 05 19:10:24 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 14:05:23 2012 -0800" }, "message": "bcm63xx: make ethtool_ops const\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc689c9788f2cc9829d01d84083bc1714b969b15", "tree": "80417749027b979ecc11875d0cdbb5cc78113713", "parents": [ "3969eb3859e4fad4b32ca8f96d4ec8551c20704a" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jan 05 19:10:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 14:05:23 2012 -0800" }, "message": "usbnet: make ethtool_ops const\n\nThe ethtool_ops table of function pointers should be const.\nFix all the usb network drivers.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3969eb3859e4fad4b32ca8f96d4ec8551c20704a", "tree": "06620d8c94d92ab187f6ce8e72f2d0453d734314", "parents": [ "2429f7ac2ef429378536d87fcbbf6f424aa5b47f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 13:44:23 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 13:44:23 2012 -0800" }, "message": "net: Fix build with INET disabled.\n\n\u003e net/core/sock.c: In function \u0027sk_update_clone\u0027:\n\u003e net/core/sock.c:1278:3: error: implicit declaration of function \u0027sock_update_memcg\u0027\n\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3c5184ef1216dd476c9c67f22a199d90ac4d5892", "tree": "f6bd6d77ee9d1260892c8e8589497eaa2f5efbab", "parents": [ "94bf608a18fa4421315275a81c5489734599297a" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 16:34:32 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 16:36:12 2012 -0500" }, "message": "ceph: d_alloc_root() may fail\n\n... and ceph_init_dentry(NULL) will oops\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5", "tree": "33e64fc453619978c3ecc86c7ec3649db3b4d8dc", "parents": [ "db0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3", "933393f58fef9963eac61db8093689544e29a600" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 13:08:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 13:08:28 2012 -0800" }, "message": "Merge branch \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n percpu: Remove irqsafe_cpu_xxx variants\n\nFix up conflict in arch/x86/include/asm/percpu.h due to clash with\ncebef5beed3d (\"x86: Fix and improve percpu_cmpxchg{8,16}b_double()\")\nwhich edited the (now removed) irqsafe_cpu_cmpxchg*_double code.\n" }, { "commit": "db0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3", "tree": "8f38957c01b18edddd44d49ecc3beeac08a20b4e", "parents": [ "ac69e0928054ff29a5049902fb477f9c7605c773", "0d19ea866562e46989412a0676412fa0983c9ce7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:59:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:59:24 2012 -0800" }, "message": "Merge branch \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\n* \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits)\n cgroup: fix to allow mounting a hierarchy by name\n cgroup: move assignement out of condition in cgroup_attach_proc()\n cgroup: Remove task_lock() from cgroup_post_fork()\n cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end()\n cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static\n cgroup: only need to check oldcgrp\u003d\u003dnewgrp once\n cgroup: remove redundant get/put of task struct\n cgroup: remove redundant get/put of old css_set from migrate\n cgroup: Remove unnecessary task_lock before fetching css_set on migration\n cgroup: Drop task_lock(parent) on cgroup_fork()\n cgroups: remove redundant get/put of css_set from css_set_check_fetched()\n resource cgroups: remove bogus cast\n cgroup: kill subsys-\u003ecan_attach_task(), pre_attach() and attach_task()\n cgroup, cpuset: don\u0027t use ss-\u003epre_attach()\n cgroup: don\u0027t use subsys-\u003ecan_attach_task() or -\u003eattach_task()\n cgroup: introduce cgroup_taskset and use it in subsys-\u003ecan_attach(), cancel_attach() and attach()\n cgroup: improve old cgroup handling in cgroup_attach_proc()\n cgroup: always lock threadgroup during migration\n threadgroup: extend threadgroup_lock() to cover exit and exec\n threadgroup: rename signal-\u003ethreadgroup_fork_lock to -\u003egroup_rwsem\n ...\n\nFix up conflict in kernel/cgroup.c due to commit e0197aae59e5: \"cgroups:\nfix a css_set not found bug in cgroup_attach_proc\" that already\nmentioned that the bug is fixed (differently) in Tejun\u0027s cgroup\npatchset. This one, in other words.\n" }, { "commit": "94bf608a18fa4421315275a81c5489734599297a", "tree": "69b0022e0f47a5af7888c7e97459302373bfa338", "parents": [ "8fdd8c49fe50394fef3e193db27222cb03c2b212" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 15:53:24 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 15:57:20 2012 -0500" }, "message": "ext4: fix failure exits\n\na) leaking root dentry is bad\nb) in case of failed ext4_mb_init() we don\u0027t want to do ext4_mb_release()\nc) OTOH, in the same case we *do* want ext4_ext_release()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "ac69e0928054ff29a5049902fb477f9c7605c773", "tree": "05be6b9285186823452e0adeffe40e1dfee6e354", "parents": [ "9e203936eac786f9268d6a13e6442d2accef1829", "302bf2f3259948c93361d501b04a5ed69c3bd4f8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:51:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:51:21 2012 -0800" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:\n ext2/3/4: delete unneeded includes of module.h\n ext{3,4}: Fix potential race when setversion ioctl updates inode\n udf: Mark LVID buffer as uptodate before marking it dirty\n ext3: Don\u0027t warn from writepage when readonly inode is spotted after error\n jbd: Remove j_barrier mutex\n reiserfs: Force inode evictions before umount to avoid crash\n reiserfs: Fix quota mount option parsing\n udf: Treat symlink component of type 2 as /\n udf: Fix deadlock when converting file from in-ICB one to normal one\n udf: Cleanup calling convention of inode_getblk()\n ext2: Fix error handling on inode bitmap corruption\n ext3: Fix error handling on inode bitmap corruption\n ext3: replace ll_rw_block with other functions\n ext3: NULL dereference in ext3_evict_inode()\n jbd: clear revoked flag on buffers before a new transaction started\n ext3: call ext3_mark_recovery_complete() when recovery is really needed\n" }, { "commit": "9e203936eac786f9268d6a13e6442d2accef1829", "tree": "1da906e1c099b3afacf3b358b8981931c4da45fd", "parents": [ "993ecff81aa6d50d694704de2647a5529ff2f166", "724577ca355795b0a25c93ccbeee927871ca1a77" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:51:01 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:51:01 2012 -0800" }, "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: Must support none-PAGE-aligned IO\n ore: fix BUG_ON, too few sgs when reading\n ore: Fix crash in case of an IO error.\n ore: FIX breakage when MISC_FILESYSTEMS is not set\n" }, { "commit": "993ecff81aa6d50d694704de2647a5529ff2f166", "tree": "047a313e86f63e22f1eff63945bea2e8e8147222", "parents": [ "12e55508921865aefdd80fd17afe70c191afbd1b", "b1c770c273a4787069306fc82aab245e9ac72e9d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:50:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:50:15 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs\n\n* \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs:\n xfs: fix endian conversion issue in discard code\n" }, { "commit": "2429f7ac2ef429378536d87fcbbf6f424aa5b47f", "tree": "15e0fd0c42f6e10ede9f1cf84553c2a01e593d81", "parents": [ "ab16ebf375f0513d6b0f5193de84186a3fc0c33b" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Mon Jan 09 06:36:54 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 12:46:58 2012 -0800" }, "message": "net: introduce netif_addr_lock_nested() and call if when appropriate\n\ndev_uc_sync() and dev_mc_sync() are acquiring netif_addr_lock for\ndestination device of synchronization. Since netif_addr_lock is\nalready held at the time for source device, this triggers lockdep\ndeadlock warning.\n\nThere\u0027s no way this deadlock can happen so use spin_lock_nested() to\nsilence the warning.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ab16ebf375f0513d6b0f5193de84186a3fc0c33b", "tree": "5f4581eac2a8a155a7dc41be0ea47e0c35761f2c", "parents": [ "475f1b52645a29936b9df1d8fcd45f7e56bd4a9f" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Mon Jan 09 06:18:34 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 12:46:58 2012 -0800" }, "message": "net: correct lock name in dev_[uc/mc]_sync documentations.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "12e55508921865aefdd80fd17afe70c191afbd1b", "tree": "476b3226fd9602b36bed0934409959bdd24a7eb5", "parents": [ "55b81e6f2795484ea8edf5805c95c007cacfa736", "4d447c9a6ebc0142d320f075c5bac6d202a79fd4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:18:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:18:17 2012 -0800" }, "message": "Merge branch \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\n* \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits)\n net/hyperv: Add support for jumbo frame up to 64KB\n net/hyperv: Add NETVSP protocol version negotiation\n net/hyperv: Remove unnecessary kmap_atomic in netvsc driver\n staging/rtl8192e: Register against lib80211\n staging/rtl8192e: Convert to lib80211_crypt_info\n staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops\n staging/rtl8192e: Add lib80211.h to rtllib.h\n staging/mei: add watchdog device registration wrappers\n drm/omap: GEM, deal with cache\n staging: vt6656: int.c, int.h: Change return of function to void\n staging: usbip: removed unused definitions from header\n staging: usbip: removed dead code from receive function\n staging:iio: Drop {mark,unmark}_in_use callbacks\n staging:iio: Drop buffer mark_param_change callback\n staging:iio: Drop the unused buffer enable() and is_enabled() callbacks\n staging:iio: Drop buffer busy flag\n staging:iio: Make sure a device is only opened once at a time\n staging:iio: Disallow modifying buffer size when buffer is enabled\n staging:iio: Disallow changing scan elements in all buffered modes\n staging:iio: Use iio_buffer_enabled instead of open coding it\n ...\n\nFix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of\nmodule_init due to using module_i2c_driver() helper, next to removal of\nMODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).\n" }, { "commit": "55b81e6f2795484ea8edf5805c95c007cacfa736", "tree": "c3724975107857fcc03b5dd649c462e4f72397be", "parents": [ "5983faf942f260023e547f3c5f38c1033c35cc9b", "08e87d0d773dc9ca5faf4c3306e238ed0ea129b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:47 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:47 2012 -0800" }, "message": "Merge branch \u0027usb-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\n* \u0027usb-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (232 commits)\n USB: Add USB-ID for Multiplex RC serial adapter to cp210x.c\n xhci: Clean up 32-bit build warnings.\n USB: update documentation for usbmon\n usb: usb-storage doesn\u0027t support dynamic id currently, the patch disables the feature to fix an oops\n drivers/usb/class/cdc-acm.c: clear dangling pointer\n drivers/usb/dwc3/dwc3-pci.c: introduce missing kfree\n drivers/usb/host/isp1760-if.c: introduce missing kfree\n usb: option: add ZD Incorporated HSPA modem\n usb: ch9: fix up MaxStreams helper\n USB: usb-skeleton.c: cleanup open_count\n USB: usb-skeleton.c: fix open/disconnect race\n xhci: Properly handle COMP_2ND_BW_ERR\n USB: remove dead code from suspend/resume path\n USB: add quirk for another camera\n drivers: usb: wusbcore: Fix dependency for USB_WUSB\n xhci: Better debugging for critical host errors.\n xhci: Be less verbose during URB cancellation.\n xhci: Remove debugging about ring structure allocation.\n xhci: Remove debugging about toggling cycle bits.\n xhci: Remove debugging for individual transfers.\n ...\n" }, { "commit": "5983faf942f260023e547f3c5f38c1033c35cc9b", "tree": "f54ce89de5d9f7a05e99948937ac5456df09df30", "parents": [ "21a2cb565a74bf794d343ce22300c5f6c1568ae1", "995234da19b927f42722d796e8270384f33be11c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:24 2012 -0800" }, "message": "Merge branch \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\n* \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (65 commits)\n tty: serial: imx: move del_timer_sync() to avoid potential deadlock\n imx: add polled io uart methods\n imx: Add save/restore functions for UART control regs\n serial/imx: let probing fail for the dt case without a valid alias\n serial/imx: propagate error from of_alias_get_id instead of using -ENODEV\n tty: serial: imx: Allow UART to be a source for wakeup\n serial: driver for m32 arch should not have DEC alpha errata\n serial/documentation: fix documented name of DCD cpp symbol\n atmel_serial: fix spinlock lockup in RS485 code\n tty: Fix memory leak in virtual console when enable unicode translation\n serial: use DIV_ROUND_CLOSEST instead of open coding it\n serial: add support for 400 and 800 v3 series Titan cards\n serial: bfin-uart: Remove ASYNC_CTS_FLOW flag for hardware automatic CTS.\n serial: bfin-uart: Enable hardware automatic CTS only when CTS pin is available.\n serial: make FSL errata depend on 8250_CONSOLE, not just 8250\n serial: add irq handler for Freescale 16550 errata.\n serial: manually inline serial8250_handle_port\n serial: make 8250 timeout use the specified IRQ handler\n serial: export the key functions for an 8250 IRQ handler\n serial: clean up parameter passing for 8250 Rx IRQ handling\n ...\n" }, { "commit": "21a2cb565a74bf794d343ce22300c5f6c1568ae1", "tree": "5cf49d94bc8cc31a299417b8a362f0645b41c543", "parents": [ "c99516ca854770000c277b2680a15581c691e18c", "2a5ac6f7a9c0a24adcf68e0dd634afbe083191c1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:08:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:08:59 2012 -0800" }, "message": "Merge branch \u0027char-misc-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc\n\n* \u0027char-misc-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:\n isl29020: Remove a redundant semi-colon from return statement\n BMP085: Remove redundant semi-colon from return statement\n drivers:misc: ti-st: DEBUG uart, baud rate mods\n drivers:misc: ti-st: flush UART upon fw failure\n drivers:misc: ti-st: protect registrations\n char_dev.c: fix up some whitespace errors\n s390: tape_class.h: remove kobj_map.h inclusion\n misc: ad525x_dpot: Add support for SPI module device table matching\n" }, { "commit": "421b759b86eb8a914cbbd11f6d09a74f411762c6", "tree": "505ca7f23987d8eaaa519a7e8506b854e2c0d030", "parents": [ "e067096c8d57d191f29d734cd5692695c95cc36e", "a07613a54d700a974f3a4a657da78ef5d097315d" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 17:06:36 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 17:06:36 2012 +0000" }, "message": "Merge branch \u0027samsung/cleanup\u0027 into next/boards\n\nConflicts:\n\tarch/arm/mach-imx/mach-imx6q.c\n\tarch/arm/mach-omap2/board-ti8168evm.c\n\tarch/arm/mach-s3c64xx/Kconfig\n\tarch/arm/mach-tegra/Makefile\n\tarch/arm/mach-tegra/board-dt-tegra20.c\n\tarch/arm/mach-tegra/common.c\n\nLots of relatively simple conflicts between the board\nchanges and stuff from the arm tree. This pulls in\nthe resolution from the samsung/cleanup tree, so we\ndon\u0027t get conflicting merges.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "c99516ca854770000c277b2680a15581c691e18c", "tree": "b2bc5a297f3996668cea3f9445645d25b607f644", "parents": [ "72f318897e50c29b91efd1ed24515a93c138a2ba", "0ce8c0109f548ed75535d96ec5a347b410ed1472" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 08:31:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 08:31:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n ext[34]: avoid i_nlink warnings triggered by drop_nlink/inc_nlink kludge in symlink()\n exofs: oops after late failure in mount\n devpts: fix double-free on mount failure\n ... and the same for gadgetfs\n functionfs: unfuck failure exits on mount\n" }, { "commit": "dcf7ec5ee62a78123057a1e286c88ca739717409", "tree": "fa3f19434638a942ba66d236dde4d9aaadf8b370", "parents": [ "15db3e823c3246e3bd31fe454f5c8927eb85caf2", "142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:16:29 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:16:29 2012 +0000" }, "message": "Merge branch \u0027samsung/driver\u0027 into next/drivers\n\nConflicts:\n\tarch/arm/mach-mxs/include/mach/common.h\n\nPull in previous samsung conflict merges and do a trivial\nmerge of an mxs double-add conflict.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6", "tree": "8cced517382b7087df4e89a9e2a00ccac9676a92", "parents": [ "155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511", "a07613a54d700a974f3a4a657da78ef5d097315d" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:14:07 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:14:07 2012 +0000" }, "message": "Merge branch \u0027samsung/cleanup\u0027 into samsung/driver\n\nConflicts:\n\tarch/arm/mach-s5p64x0/cpu.c -\u003e common.c\n\nMore changes to a file that got moved into common.c,\nsee previous conflict resolutions.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "72f318897e50c29b91efd1ed24515a93c138a2ba", "tree": "7e7ef8138d5afacd1be4655e4458dc4cee432d1e", "parents": [ "a0e86bd4252519321b0d102dc4ed90557aa7bee9", "2fa1d4fce599809e6bd7d95756709a5faef30710" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 08:11:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 08:11:13 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (31 commits)\n [S390] disassembler: mark exception causing instructions\n [S390] Enable exception traces by default\n [S390] return address of compat signals\n [S390] sysctl: get rid of dead declaration\n [S390] dasd: fix fixpoint divide exception in define_extent\n [S390] dasd: add sanity check to detect path connection error\n [S390] qdio: fix kernel panic for zfcp 31-bit\n [S390] Add s390x description to Documentation/kdump/kdump.txt\n [S390] Add VMCOREINFO_SYMBOL(high_memory) to vmcoreinfo\n [S390] dasd: fix expiration handling for recovery requests\n [S390] outstanding interrupts vs. smp_send_stop\n [S390] ipc: call generic sys_ipc demultiplexer\n [S390] zcrypt: Fix error return codes.\n [S390] zcrypt: Rework length parameter checking.\n [S390] cleanup trap handling\n [S390] Remove Kerntypes leftovers\n [S390] topology: increase poll frequency if change is anticipated\n [S390] entry[64].S improvements\n [S390] make arch/s390 subdirectories depend on config option\n [S390] kvm: move cmf host id constant out of lowcore\n ...\n\nFix up conflicts in arch/s390/kernel/{smp.c,topology.c} due to the\nsysdev removal clashing with \"topology: get rid of ifdefs\" which moved\nsome of that code around.\n" }, { "commit": "b48741cce3be32a48af9a2b272f3f13a077375cf", "tree": "e4bc91713e02fa6d8f08b07de53ea8f905593dfa", "parents": [ "54b6c82ac9a124804816f244f587c0f40d25ad01", "a07613a54d700a974f3a4a657da78ef5d097315d" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:06:31 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:06:31 2012 +0000" }, "message": "Merge branch \u0027samsung/cleanup\u0027 into next/cleanup2\n" }, { "commit": "a07613a54d700a974f3a4a657da78ef5d097315d", "tree": "e4bc91713e02fa6d8f08b07de53ea8f905593dfa", "parents": [ "65db039bf7402f0a5b19cbf6dcff55ebea433b8b", "928a11ba36f999436915ea2b1eadf54301f93059" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:01:00 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:01:00 2012 +0000" }, "message": "Merge branch \u0027samsung/dt\u0027 into samsung/cleanup\n\nConflicts:\n\tarch/arm/mach-s3c64xx/Makefile\n\tarch/arm/mach-s5pc100/Makefile\n\tarch/arm/mach-s5pv210/Makefile\n\nPull in previously resolved conflicts:\n\nThe Makefiles were reorganized in the \"rmk/restart\" series and modified\nin the \"samsung/cleanup series\". This also pulls in the other conflict\nresolutions from the restart series against the samsung/dt series.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "8fdd8c49fe50394fef3e193db27222cb03c2b212", "tree": "24b13a4397127a7ac8d708af9af6e1f476bc0763", "parents": [ "0ce8c0109f548ed75535d96ec5a347b410ed1472" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 10:48:11 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 10:48:11 2012 -0500" }, "message": "isofs: inode leak on mount failure\n\nd_alloc_root() failure leaves root inode leaked...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "302bf2f3259948c93361d501b04a5ed69c3bd4f8", "tree": "22ccdf5774a28476745a94532b5ce2c2cc454d98", "parents": [ "6c2155b9cc5a193e85194bbeaae2e2e4512dd597" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Jan 04 15:59:47 2012 -0500" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:10 2012 +0100" }, "message": "ext2/3/4: delete unneeded includes of module.h\n\nDelete any instances of include module.h that were not strictly\nrequired. In the case of ext2, the declaration of MODULE_LICENSE\netc. were in inode.c but the module_init/exit were in super.c, so\nrelocate the MODULE_LICENCE/AUTHOR block to super.c which makes it\nconsistent with ext3 and ext4 at the same time.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "6c2155b9cc5a193e85194bbeaae2e2e4512dd597", "tree": "fe2e0af12ebdb2bff009f47ccdfebd8dcde2b3a2", "parents": [ "853a0c25baf96b028de1654bea1e0c8857eadf3d" ], "author": { "name": "Djalal Harouni", "email": "tixxdz@opendz.org", "time": "Tue Jan 03 02:31:52 2012 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:10 2012 +0100" }, "message": "ext{3,4}: Fix potential race when setversion ioctl updates inode\n\nThe EXT{3,4}_IOC_SETVERSION ioctl() updates i_ctime and i_generation\nwithout i_mutex. This can lead to a race with the other operations that\nupdate i_ctime. This is not a big issue but let\u0027s make the ioctl consistent\nwith how we handle e.g. other timestamp updates and use i_mutex to protect\ninode changes.\n\nSigned-off-by: Djalal Harouni \u003ctixxdz@opendz.org\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "853a0c25baf96b028de1654bea1e0c8857eadf3d", "tree": "2b72d7cafe569583322fa132ebc8c9821e8d7bce", "parents": [ "33c104d415e92a51aaf638dc3d93920cfa601e5c" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Fri Dec 23 11:53:07 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:10 2012 +0100" }, "message": "udf: Mark LVID buffer as uptodate before marking it dirty\n\nWhen we hit EIO while writing LVID, the buffer uptodate bit is cleared.\nThis then results in an anoying warning from mark_buffer_dirty() when we\nwrite the buffer again. So just set uptodate flag unconditionally.\n\nReviewed-by: Namjae Jeon \u003clinkinjeon@gmail.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "33c104d415e92a51aaf638dc3d93920cfa601e5c", "tree": "d94d7312b242ee85318188b3bc8fd23481c2f529", "parents": [ "0048278552e9752fd578c3d8deee756987c10873" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu Dec 22 16:49:05 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:09 2012 +0100" }, "message": "ext3: Don\u0027t warn from writepage when readonly inode is spotted after error\n\nWARN_ON_ONCE(IS_RDONLY(inode)) tends to trip when filesystem hits error and is\nremounted read-only. This unnecessarily scares users (well, they should be\nscared because of filesystem error, but the stack trace distracts them from the\nright source of their fear ;-). We could as well just remove the WARN_ON but\nit\u0027s not hard to fix it to not trip on filesystem with errors and not use more\ncycles in the common case so that\u0027s what we do.\n\nCC: stable@kernel.org\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "0048278552e9752fd578c3d8deee756987c10873", "tree": "0931a7ff6aa5c388eb40e2a97fdcebe59bbae337", "parents": [ "a9e36da655e54545c3289b2a0700b5c443de0edd" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu Dec 22 14:52:21 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:09 2012 +0100" }, "message": "jbd: Remove j_barrier mutex\n\nj_barrier mutex is used for serializing different journal lock operations. The\nproblem with it is that e.g. FIFREEZE ioctl results in process leaving kernel\nwith j_barrier mutex held which makes lockdep freak out. Also hibernation code\nwants to freeze filesystem but it cannot do so because it then cannot hibernate\nthe system because of mutex being locked.\n\nSo we remove j_barrier mutex and use direct wait on j_barrier_count instead.\nSince locking journal is a rare operation we don\u0027t have to care about fairness\nor such things.\n\nCC: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nAcked-by: Joel Becker \u003cjlbec@evilplan.org\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "a9e36da655e54545c3289b2a0700b5c443de0edd", "tree": "14143a3c873177b70b8b66d6f8085378a2c92908", "parents": [ "a06d789b424190e9f59da391681f908486db2554" ], "author": { "name": "Jeff Mahoney", "email": "jeffm@suse.com", "time": "Wed Dec 21 21:18:43 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:09 2012 +0100" }, "message": "reiserfs: Force inode evictions before umount to avoid crash\n\nThis patch fixes a crash in reiserfs_delete_xattrs during umount.\n\nWhen shrink_dcache_for_umount clears the dcache from\ngeneric_shutdown_super, delayed evictions are forced to disk. If an\nevicted inode has extended attributes associated with it, it will\nneed to walk the xattr tree to locate and remove them.\n\nBut since shrink_dcache_for_umount will BUG if it encounters active\ndentries, the xattr tree must be released before it\u0027s called or it will\ncrash during every umount.\n\nThis patch forces the evictions to occur before generic_shutdown_super\nby calling shrink_dcache_sb first. The additional evictions caused\nby the removal of each associated xattr file and dir will be automatically\nhandled as they\u0027re added to the LRU list.\n\nCC: reiserfs-devel@vger.kernel.org\nCC: stable@kernel.org\nSigned-off-by: Jeff Mahoney \u003cjeffm@suse.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "a06d789b424190e9f59da391681f908486db2554", "tree": "540274351d80680a8fab0325c440dab52170aaae", "parents": [ "fef2e9f3301934773e4f1b3cc5c7bffb119346b8" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Wed Dec 21 17:35:34 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:09 2012 +0100" }, "message": "reiserfs: Fix quota mount option parsing\n\nWhen jqfmt mount option is not specified on remount, we mistakenly clear\ns_jquota_fmt value stored in superblock. Fix the problem.\n\nCC: stable@kernel.org\nCC: reiserfs-devel@vger.kernel.org\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "fef2e9f3301934773e4f1b3cc5c7bffb119346b8", "tree": "32db1ddfb36294b26a5df7d87ddc19fc9dd89267", "parents": [ "d2eb8c359309ec45d6bf5b147303ab8e13be86ea" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Dec 12 15:13:50 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:08 2012 +0100" }, "message": "udf: Treat symlink component of type 2 as /\n\nCurrently, we ignore symlink component of type 2. But mkisofs and other OS\u0027\nseem to treat it as / so do the same for compatibility.\n\nReported-by: \"Gábor S.\" \u003cotnaccess@hotmail.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "d2eb8c359309ec45d6bf5b147303ab8e13be86ea", "tree": "4725da2f9f5728b41960cff7b628d0997812504c", "parents": [ "7b0b0933a3ff6052addf4d49ea99f75ab27df2d0" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Sat Dec 10 02:30:48 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:08 2012 +0100" }, "message": "udf: Fix deadlock when converting file from in-ICB one to normal one\n\nDuring BKL removal in 2.6.38, conversion of files from in-ICB format to normal\nformat got broken. We call -\u003ewritepage with i_data_sem held but udf_get_block()\nalso acquires i_data_sem thus creating A-A deadlock.\n\nWe fix the problem by dropping i_data_sem before calling -\u003ewritepage() which is\nsafe since i_mutex still protects us against any changes in the file. Also fix\npagelock - i_data_sem lock inversion in udf_expand_file_adinicb() by dropping\ni_data_sem before calling find_or_create_page().\n\nCC: stable@kernel.org\nReported-by: Matthias Matiak \u003cnetzpython@mail-on.us\u003e\nTested-by: Matthias Matiak \u003cnetzpython@mail-on.us\u003e\nReviewed-by: Namjae Jeon \u003clinkinjeon@gmail.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "7b0b0933a3ff6052addf4d49ea99f75ab27df2d0", "tree": "b410b1751843d5f1b2765900ac76beaad7f097e8", "parents": [ "ef6919c283257155def420bd247140e9fd2e9843" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Sat Dec 10 01:43:33 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:08 2012 +0100" }, "message": "udf: Cleanup calling convention of inode_getblk()\n\ninode_getblk() always returned NULL and passed results in its parameters.\nMake the function return something useful - found block number.\n\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "ef6919c283257155def420bd247140e9fd2e9843", "tree": "49c929bcb5b8be103a4ea8fe9964d0e02a0ec740", "parents": [ "1415dd8705394399d59a3df1ab48d149e1e41e77" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Fri Dec 09 00:08:58 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:07 2012 +0100" }, "message": "ext2: Fix error handling on inode bitmap corruption\n\nWhen insert_inode_locked() fails in ext2_new_inode() it most likely means inode\nbitmap got corrupted and we allocated again inode which is already in use. Also\ndoing unlock_new_inode() during error recovery is wrong since the inode does\nnot have I_NEW set. Fix the problem by informing about filesystem error and\njumping to fail: (instead of fail_drop:) which doesn\u0027t call unlock_new_inode().\n\nReviewed-by: Eric Sandeen \u003csandeen@redhat.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "1415dd8705394399d59a3df1ab48d149e1e41e77", "tree": "fb98d05d5fa83202d7b4bead058826366fc2592e", "parents": [ "d03e1292c46721f60830c5d2e334966472002ed0" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu Dec 08 21:13:46 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:07 2012 +0100" }, "message": "ext3: Fix error handling on inode bitmap corruption\n\nWhen insert_inode_locked() fails in ext3_new_inode() it most likely\nmeans inode bitmap got corrupted and we allocated again inode which\nis already in use. Also doing unlock_new_inode() during error recovery\nis wrong since inode does not have I_NEW set. Fix the problem by jumping\nto fail: (instead of fail_drop:) which declares filesystem error and\ndoes not call unlock_new_inode().\n\nReviewed-by: Eric Sandeen \u003csandeen@redhat.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "d03e1292c46721f60830c5d2e334966472002ed0", "tree": "bc5a9f63fc52e4b96a6e9faa9457cb47d70b2cc7", "parents": [ "bcdd0c1600903e9222abfcde28947406020ccb5d" ], "author": { "name": "Zheng Liu", "email": "wenqing.lz@taobao.com", "time": "Mon Dec 05 15:55:11 2011 +0800" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:07 2012 +0100" }, "message": "ext3: replace ll_rw_block with other functions\n\nll_rw_block() is deprecated. Thus we replace it with other functions.\n\nCC: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Zheng Liu \u003cwenqing.lz@taobao.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "475f1b52645a29936b9df1d8fcd45f7e56bd4a9f", "tree": "d0f9641f2f0ac6263b3c1ef4e8dfe8baf2602dd7", "parents": [ "b189e810619a676e6b931a942a3e8387f3d39c21" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Mon Jan 09 16:33:16 2012 +1100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 08 23:44:26 2012 -0800" }, "message": "net: sk_update_clone is only used in net/core/sock.c\n\nso move it there. Fixes build errors when CONFIG_INET is not defined:\n\nIn file included from include/linux/tcp.h:211:0,\n from include/linux/ipv6.h:221,\n from include/net/ipv6.h:16,\n from include/linux/sunrpc/clnt.h:26,\n from include/linux/nfs_fs.h:50,\n from init/do_mounts.c:20:\ninclude/net/sock.h: In function \u0027sk_update_clone\u0027:\ninclude/net/sock.h:1109:3: error: implicit declaration of function \u0027sock_update_memcg\u0027 [-Werror\u003dimplicit-function-declaration]\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b189e810619a676e6b931a942a3e8387f3d39c21", "tree": "5efd2b54dd6b879442d780e3f417d5cf1767f94b", "parents": [ "26e29eeda048aa6699984c4b9d6997dd1a1315db" ], "author": { "name": "françois romieu", "email": "romieu@fr.zoreil.com", "time": "Sun Jan 08 13:41:33 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 08 19:20:33 2012 -0800" }, "message": "8139cp: fix missing napi_gro_flush.\n\nThe driver uses __napi_complete and napi_gro_receive. Without it, the\ndriver hits the BUG_ON(n-\u003egro_list) assertion hard in __napi_complete.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nTested-by: Marin Glibic \u003czhilla2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0ce8c0109f548ed75535d96ec5a347b410ed1472", "tree": "c82c28de75da5b73c224cce18602d1a5680d27d7", "parents": [ "da01636a6511c3bd0c1cf546c47b8e92a837a613" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 19:50:23 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 20:19:30 2012 -0500" }, "message": "ext[34]: avoid i_nlink warnings triggered by drop_nlink/inc_nlink kludge in symlink()\n\nBoth ext3 and ext4 put the half-created symlink inode into the orphan list\nfor a while (see the comment in ext[34]_symlink() for gory details). Then,\nif everything went fine, they pull it out of the orphan list and bump the\nlink count back to 1. The thing is, inc_nlink() is going to complain about\nseeing somebody changing i_nlink from 0 to 1. With a good reason, since\nnormally something like that is a bug. Explicit set_nlink(inode, 1) does\nthe same thing as inc_nlink() here, but it does *not* complain - exactly\nbecause it should be usable in strange situations like this one.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "da01636a6511c3bd0c1cf546c47b8e92a837a613", "tree": "394f40f4763d444ace4990ff1a5d21b386f83167", "parents": [ "3850aba74873aa47fefe6900b99f42f5e656a6e7" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 19:45:28 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 20:19:12 2012 -0500" }, "message": "exofs: oops after late failure in mount\n\nWe have already set -\u003es_root, so -\u003eput_super() is going to be called.\nFreeing -\u003es_fs_info is a bloody bad idea when it\u0027s going to be\ndereferenced very shortly...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "3850aba74873aa47fefe6900b99f42f5e656a6e7", "tree": "24f91e8cf4296a86678553809a935f355ae88de0", "parents": [ "87da5b3264c8514b85c6c6e8ef51b9440eee2030" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 19:40:27 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 20:19:03 2012 -0500" }, "message": "devpts: fix double-free on mount failure\n\ndevpts_kill_sb() is called even if devpts_fill_super() fails;\nwe should not do that kfree() in the latter, especially not\nwith -\u003es_fs_info left pointing to freed object. Double kfree()\nis a Bad Thing(tm)...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "87da5b3264c8514b85c6c6e8ef51b9440eee2030", "tree": "73ba93b1d0e499d21b78ef9cf8e824c1b42c2506", "parents": [ "5b5f9560354dc5a3a27ce57a86aec6b98531ee21" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 15:59:45 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 20:18:50 2012 -0500" }, "message": "... and the same for gadgetfs\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "5b5f9560354dc5a3a27ce57a86aec6b98531ee21", "tree": "908448da30e77e931f62080e3d836cf0f070d389", "parents": [ "48fa57ac2c30a8a0b770b7ad50b4b30c1d12f005" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 15:38:27 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 20:17:17 2012 -0500" }, "message": "functionfs: unfuck failure exits on mount\n\n* if you do dput() of root dentry, do *not* follow that with iput() of root\ninode.\n* while we are at it, don\u0027t do that dput() at all - you are leaving the pointer\nin -\u003es_root and your -\u003ekill_sb() will be very unhappy with that. It will do\nproper dput(), though, so the easiest way is to leave that to it entirely.\n* freeing -\u003es_fs_info is also best left to -\u003ekill_sb() (which will do it\nanyway), especially since we leave the pointer in place.\n* that xchg() in -\u003ekill_sb() is not a bug per se, but it\u0027s a plain and simple\nmasturbation with fewer excuses than Onan had...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a0e86bd4252519321b0d102dc4ed90557aa7bee9", "tree": "13c3cb632dfb85ea6b9f5c20273d793a99b20f15", "parents": [ "7dd72f5189b257f927cc3b35d98643a5c392f5c3" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Sun Jan 08 22:44:29 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:15:21 2012 -0800" }, "message": "audit: always follow va_copy() with va_end()\n\nA call to va_copy() should always be followed by a call to va_end() in\nthe same function. In kernel/autit.c::audit_log_vformat() this is not\nalways done. This patch makes sure va_end() is always called.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7dd72f5189b257f927cc3b35d98643a5c392f5c3", "tree": "cce91f10a85be94d7a1ee21ead4547642f6f6336", "parents": [ "48fa57ac2c30a8a0b770b7ad50b4b30c1d12f005" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Sun Jan 08 22:44:19 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:15:21 2012 -0800" }, "message": "drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()\n\nWe leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :\n\nWe allocate memory:\n\n\t...\n\tstruct user_sgmap* usg;\n\tusg \u003d kmalloc(actual_fibsize - sizeof(struct aac_srb)\n\t + sizeof(struct sgmap), GFP_KERNEL);\n\nand then neglect to free it:\n\n\t...\n\tfor (i \u003d 0; i \u003c usg-\u003ecount; i++) {\n\t\tu64 addr;\n\t\tvoid* p;\n\t\tif (usg-\u003esg[i].count \u003e\n\t\t ((dev-\u003eadapter_info.options \u0026\n\t\t AAC_OPT_NEW_COMM) ?\n\t\t (dev-\u003escsi_host_ptr-\u003emax_sectors \u003c\u003c 9) :\n\t\t 65536)) {\n\t\t\trcode \u003d -EINVAL;\n\t\t\tgoto cleanup;\n\t... this \u0027goto\u0027 makes \u0027usg\u0027 go out of scope and leak the memory we\n\t allocated.\n\nOther exits properly kfree(usg), it\u0027s just here it is neglected.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nCc: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "48fa57ac2c30a8a0b770b7ad50b4b30c1d12f005", "tree": "5a0b1a32b2e1639fdd07e9f1b946d698c093c3da", "parents": [ "8e369672af8700299ab372bad9397f230b1d591a", "1583676d9e3f97371eaa726c4e061f9b23f43c44" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:05:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:05:48 2012 -0800" }, "message": "Merge tag \u0027infiniband-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\ninfiniband changes for 3.3 merge window\n\n* tag \u0027infiniband-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n rdma/core: Fix sparse warnings\n RDMA/cma: Fix endianness bugs\n RDMA/nes: Fix terminate during AE\n RDMA/nes: Make unnecessarily global nes_set_pau() static\n RDMA/nes: Change MDIO bus clock to 2.5MHz\n IB/cm: Fix layout of APR message\n IB/mlx4: Fix SL to 802.1Q priority-bits mapping for IBoE\n IB/qib: Default some module parameters optimally\n IB/qib: Optimize locking for get_txreq()\n IB/qib: Fix a possible data corruption when receiving packets\n IB/qib: Eliminate 64-bit jiffies use\n IB/qib: Fix style issues\n IB/uverbs: Protect QP multicast list\n" }, { "commit": "8e369672af8700299ab372bad9397f230b1d591a", "tree": "8676cfdb7f8c1ac5ee124aef050d541d70f876d0", "parents": [ "6950d76c531671ec389e36183311826597951ac6", "a125a3945c950caef001f22055bf201a36568533" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:05:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:05:09 2012 -0800" }, "message": "Merge branch \u0027dma-buf-merge\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027dma-buf-merge\u0027 of git://people.freedesktop.org/~airlied/linux:\n dma-buf: mark EXPERIMENTAL for 1st release.\n dma-buf: Documentation for buffer sharing framework\n dma-buf: Introduce dma buffer sharing mechanism\n" }, { "commit": "6950d76c531671ec389e36183311826597951ac6", "tree": "58294fa8afd16e4bda41a9104f8a4f68f09a61ae", "parents": [ "b7d845f8825b058b80e76320f573505afbf4a1fc", "91c8eabef1b52ef12c49ddea14152aadd9830a35" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:39:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:39:24 2012 -0800" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n max1111.c: fix checkpatch warning\n hwmon: (lm75) fix checkpatch warnings\n hwmon: (lm80) fix checkpatch messages\n hwmon: replaced strict_str* with kstr*\n hwmon: (lm75) fix checkpatch warning\n hwmon: (lm75) added error handling\n hwmon: (ltc4261) set data-\u003evalid to 0 if error\n hwmon: (f75375s) Add support for F75387SG/RG\n hwmon: (f75375s) Disable setting DC fan control mode for F75373\n hwmon: (f75375s) Initialize pwmX_mode and pwmX_enable if there is no platform data\n hwmon: (f75375s) Fix value range for PWM modes\n hwmon: (f75375s) Use standard sysfs attribute names\n hwmon: (f75375s) Fix checkpatch errors and warnings\n hwmon: (pmbus/zl6100) Only instantiate external temperature sensor if enabled\n hwmon: (pmbus/zl6100) Add support for Ericsson BMR45[0,1] and BMR46[2,3,4]\n hwmon: (pmbus/zl6100) Add support for ZL2005\n hwmon: (pmbus/adm1275) Validate device ID\n" }, { "commit": "b7d845f8825b058b80e76320f573505afbf4a1fc", "tree": "dc66dec44b489723427c9c4a9a92ef6e9f17c55b", "parents": [ "2943c833222ef87c111ee0c6b7b8519ad2983e99", "0a92815db789bd5a922d882826cf710f9b0b9d85" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:35:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:35:24 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: (36 commits)\n mfd: Clearing events requires event registers to be writable for da9052-core\n mfd: Fix annotations in da9052-core\n gpiolib: Mark da9052 driver broken\n mfd: Declare da9052_regmap_config for the bus drivers\n MFD: DA9052/53 MFD core module add SPI support v2\n MFD: DA9052/53 MFD core module\n regmap: Add irq_base accessor to regmap_irq\n regmap: Allow drivers to reinitialise the register cache at runtime\n regmap: Add trace event for successful cache reads\n regmap: Allow regmap_update_bits() users to detect changes\n regmap: Report if we actually handled an interrupt in regmap-irq\n regmap: Fix rbtreee build when not using debugfs\n regmap: Provide debugfs dump of the rbtree cache data\n regmap: Do debugfs init before cache init\n regmap: Suppress noop writes in regmap_update_bits()\n regmap: Remove indexed cache type\n regmap: Drop check whether a register is readable in regcache_read\n regmap: Properly round cache_word_size\n regmap: Add support for 10/14 register formating\n regmap: Try cached read before checking if a hardware read is possible\n ...\n" }, { "commit": "2943c833222ef87c111ee0c6b7b8519ad2983e99", "tree": "0ef8cc4f72a63b325e7ae858ec68822ec4f3c64f", "parents": [ "98793265b429a3f0b3f1750e74d67cd4d740d162", "19d671695e1931ebfd75b2b888778201aefe35ca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:28:33 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:28:33 2012 -0800" }, "message": "Merge tag \u0027md-3.3\u0027 of git://neil.brown.name/md\n\nmd update for 3.3\n\nBig change is new hot-replacement.\nA slot in an array can hold 2 devices - one that\nwants-replacement and one that is the replacement.\nOnce the replacement is built - either from the\noriginal or (in the case of errors) from elsewhere,\nthe wants-replacement device will be removed.\n\n* tag \u0027md-3.3\u0027 of git://neil.brown.name/md: (36 commits)\n md/raid1: Mark device want_replacement when we see a write error.\n md/raid1: If there is a spare and a want_replacement device, start replacement.\n md/raid1: recognise replacements when assembling arrays.\n md/raid1: handle activation of replacement device when recovery completes.\n md/raid1: Allow a failed replacement device to be removed.\n md/raid1: Allocate spare to store replacement devices and their bios.\n md/raid1: Replace use of mddev-\u003eraid_disks with conf-\u003eraid_disks.\n md/raid10: If there is a spare and a want_replacement device, start replacement.\n md/raid10: recognise replacements when assembling array.\n md/raid10: Allow replacement device to be replace old drive.\n md/raid10: handle recovery of replacement devices.\n md/raid10: Handle replacement devices during resync.\n md/raid10: writes should get directed to replacement as well as original.\n md/raid10: allow removal of failed replacement devices.\n md/raid10: preferentially read from replacement device if possible.\n md/raid10: change read_balance to return an rdev\n md/raid10: prepare data structures for handling replacement.\n md/raid5: Mark device want_replacement when we see a write error.\n md/raid5: If there is a spare and a want_replacement device, start replacement.\n md/raid5: recognise replacements when assembling array.\n ...\n" }, { "commit": "98793265b429a3f0b3f1750e74d67cd4d740d162", "tree": "b0bd717673f0c21845cf053f3fb6b75d42530af5", "parents": [ "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3", "bd1b2a555952d959f47169056fca05acf7eff81f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)\n Kconfig: acpi: Fix typo in comment.\n misc latin1 to utf8 conversions\n devres: Fix a typo in devm_kfree comment\n btrfs: free-space-cache.c: remove extra semicolon.\n fat: Spelling s/obsolate/obsolete/g\n SCSI, pmcraid: Fix spelling error in a pmcraid_err() call\n tools/power turbostat: update fields in manpage\n mac80211: drop spelling fix\n types.h: fix comment spelling for \u0027architectures\u0027\n typo fixes: aera -\u003e area, exntension -\u003e extension\n devices.txt: Fix typo of \u0027VMware\u0027.\n sis900: Fix enum typo \u0027sis900_rx_bufer_status\u0027\n decompress_bunzip2: remove invalid vi modeline\n treewide: Fix comment and string typo \u0027bufer\u0027\n hyper-v: Update MAINTAINERS\n treewide: Fix typos in various parts of the kernel, and fix some comments.\n clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR\n gpio: Kconfig: drop unknown symbol \u0027CS5535_GPIO\u0027\n leds: Kconfig: Fix typo \u0027D2NET_V2\u0027\n sound: Kconfig: drop unknown symbol ARCH_CLPS7500\n ...\n\nFix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new\nkconfig additions, close to removed commented-out old ones)\n" }, { "commit": "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3", "tree": "f0f61cdfe25f0cf269c7dcd4bf9172250c20f7a7", "parents": [ "eb59c505f8a5906ad2e053d14fab50eb8574fd6f", "282e5aaba2a0cdfde4d2c2e34bc7438cd6f7a00f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:15:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:15:27 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:\n x86: Kconfig: drop unknown symbol \u0027APM_MODULE\u0027\n" }, { "commit": "eb59c505f8a5906ad2e053d14fab50eb8574fd6f", "tree": "c6e875adc12b481b916e847e8f80b8881a0fb02c", "parents": [ "1619ed8f60959829d070d8f39cd2f8ca0e7135ce", "c233523b3d392e530033a7587d7970dc62a02361" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)\n PM / Hibernate: Implement compat_ioctl for /dev/snapshot\n PM / Freezer: fix return value of freezable_schedule_timeout_killable()\n PM / shmobile: Allow the A4R domain to be turned off at run time\n PM / input / touchscreen: Make st1232 use device PM QoS constraints\n PM / QoS: Introduce dev_pm_qos_add_ancestor_request()\n PM / shmobile: Remove the stay_on flag from SH7372\u0027s PM domains\n PM / shmobile: Don\u0027t include SH7372\u0027s INTCS in syscore suspend/resume\n PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode\n PM: Drop generic_subsys_pm_ops\n PM / Sleep: Remove forward-only callbacks from AMBA bus type\n PM / Sleep: Remove forward-only callbacks from platform bus type\n PM: Run the driver callback directly if the subsystem one is not there\n PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers\n PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.\n PM / Sleep: Merge internal functions in generic_ops.c\n PM / Sleep: Simplify generic system suspend callbacks\n PM / Hibernate: Remove deprecated hibernation snapshot ioctls\n PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()\n ARM: S3C64XX: Implement basic power domain support\n PM / shmobile: Use common always on power domain governor\n ...\n\nFix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused\nXBT_FORCE_SLEEP bit\n" }, { "commit": "1619ed8f60959829d070d8f39cd2f8ca0e7135ce", "tree": "aa2599110827affb10e64a12e85a9d11f45854b1", "parents": [ "29ad0de279002f9b6a63df5ba85328f5b633b842", "46cc1e5fce46e71f27e542125e045827a6bb776e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:07:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:07:54 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:\n GFS2: local functions should be static\n GFS2: We only need one ACL getting function\n GFS2: Fix multi-block allocation\n GFS2: decouple quota allocations from block allocations\n GFS2: split function rgblk_search\n GFS2: Fix up \"off by one\" in the previous patch\n GFS2: move toward a generic multi-block allocator\n GFS2: O_(D)SYNC support for fallocate\n GFS2: remove vestigial al_alloced\n GFS2: combine gfs2_alloc_block and gfs2_alloc_di\n GFS2: Add non-try locks back to get_local_rgrp\n GFS2: f_ra is always valid in dir readahead function\n GFS2: Fix very unlikley memory leak in ACL xattr code\n GFS2: More automated code analysis fixes\n GFS2: Add readahead to sequential directory traversal\n GFS2: Fix up REQ flags\n" }, { "commit": "29ad0de279002f9b6a63df5ba85328f5b633b842", "tree": "8284c1a50ff2ecf9defca2a47f12947977c04df1", "parents": [ "972b2c719990f91eb3b2310d44ef8a2d38955a14", "40d344ec5ee440596b1f3ae87556e20c7197757a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:05:29 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:05:29 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs\n\n* \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs: (22 commits)\n xfs: mark the xfssyncd workqueue as non-reentrant\n xfs: simplify xfs_qm_detach_gdquots\n xfs: fix acl count validation in xfs_acl_from_disk()\n xfs: remove unused XBT_FORCE_SLEEP bit\n xfs: remove XFS_QMOPT_DQSUSER\n xfs: kill xfs_qm_idtodq\n xfs: merge xfs_qm_dqinit_core into the only caller\n xfs: add a xfs_dqhold helper\n xfs: simplify xfs_qm_dqattach_grouphint\n xfs: nest qm_dqfrlist_lock inside the dquot qlock\n xfs: flatten the dquot lock ordering\n xfs: implement lazy removal for the dquot freelist\n xfs: remove XFS_DQ_INACTIVE\n xfs: cleanup xfs_qm_dqlookup\n xfs: cleanup dquot locking helpers\n xfs: remove the sync_mode argument to xfs_qm_dqflush_all\n xfs: remove xfs_qm_sync\n xfs: make sure to really flush all dquots in xfs_qm_quotacheck\n xfs: untangle SYNC_WAIT and SYNC_TRYLOCK meanings for xfs_qm_dqflush\n xfs: remove the lid_size field in struct log_item_desc\n ...\n\nFix up trivial conflict in fs/xfs/xfs_sync.c\n" }, { "commit": "972b2c719990f91eb3b2310d44ef8a2d38955a14", "tree": "b25a250ec5bec4b7b6355d214642d8b57c5cab32", "parents": [ "02550d61f49266930e674286379d3601006b2893", "c3aa077648e147783a7a53b409578234647db853" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)\n reiserfs: Properly display mount options in /proc/mounts\n vfs: prevent remount read-only if pending removes\n vfs: count unlinked inodes\n vfs: protect remounting superblock read-only\n vfs: keep list of mounts for each superblock\n vfs: switch -\u003eshow_options() to struct dentry *\n vfs: switch -\u003eshow_path() to struct dentry *\n vfs: switch -\u003eshow_devname() to struct dentry *\n vfs: switch -\u003eshow_stats to struct dentry *\n switch security_path_chmod() to struct path *\n vfs: prefer -\u003edentry-\u003ed_sb to -\u003emnt-\u003emnt_sb\n vfs: trim includes a bit\n switch mnt_namespace -\u003eroot to struct mount\n vfs: take /proc/*/mounts and friends to fs/proc_namespace.c\n vfs: opencode mntget() mnt_set_mountpoint()\n vfs: spread struct mount - remaining argument of next_mnt()\n vfs: move fsnotify junk to struct mount\n vfs: move mnt_devname\n vfs: move mnt_list to struct mount\n vfs: switch pnode.h macros to struct mount *\n ...\n" }, { "commit": "724577ca355795b0a25c93ccbeee927871ca1a77", "tree": "ca3cdb4e7f1b9ab7963503227e1ca555c3535b3f", "parents": [ "361aba569f55dd159b850489a3538253afbb3973" ], "author": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Wed Dec 28 19:21:45 2011 +0200" }, "committer": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Sun Jan 08 10:43:13 2012 +0200" }, "message": "ore: Must support none-PAGE-aligned IO\n\nNFS might send us offsets that are not PAGE aligned. So\nwe must read in the reminder of the first/last pages, in cases\nwe need it for Parity calculations.\n\nWe only add an sg segments to read the partial page. But\nwe don\u0027t mark it as read\u003dtrue because it is a lock-for-write\npage.\n\nTODO: In some cases (IO spans a single unit) we can just\nadjust the raid_unit offset/length, but this is left for\nlater Kernels.\n\n[Bug in 3.2.0 Kernel]\nCC: Stable Tree \u003cstable@kernel.org\u003e\nSigned-off-by: Boaz Harrosh \u003cbharrosh@panasas.com\u003e\n" }, { "commit": "e92b9b3b091d5fcdaed91d6fa9410deae135704b", "tree": "0f4baaefba74f6b41f302d16555c9894c0923e8f", "parents": [ "fc3e0f8aec05dd812cba2c1e31c3d1f5fc85e55c" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 22:58:27 2012 +0100" }, "committer": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 23:02:38 2012 +0100" }, "message": "via-rhine: rework suspend and resume.\n\nCover of 861ab44059350e5cab350238606cf8814abab93b.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\n" }, { "commit": "fc3e0f8aec05dd812cba2c1e31c3d1f5fc85e55c", "tree": "080fdb2ce9efb232296727d1c84e9cc3eb2ed3f1", "parents": [ "a384a33bb1c9ec2d99db2046b41f57023fa7d77b" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 22:39:37 2012 +0100" }, "committer": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 23:02:38 2012 +0100" }, "message": "via-rhine: per device debug level.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\n" }, { "commit": "a384a33bb1c9ec2d99db2046b41f57023fa7d77b", "tree": "ca829e3546ffa5add0957ab0facb666877bd4666", "parents": [ "7ab87ff4c770eed71e3777936299292739fcd0fe" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 22:19:36 2012 +0100" }, "committer": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 23:02:37 2012 +0100" }, "message": "via-rhine: RHINE_WAIT_FOR macro removal.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\n" }, { "commit": "7ab87ff4c770eed71e3777936299292739fcd0fe", "tree": "d6eac281d61f8cdf84a387b2ef455d20f058001d", "parents": [ "a5abec1e84c3d9cd197667e5fa94f25c21a2cb8e" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Fri Jan 06 21:42:26 2012 +0100" }, "committer": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 23:02:37 2012 +0100" }, "message": "via-rhine: move work from irq handler to softirq and beyond.\n\n- Tx processing is moved from the irq handler to NAPI poll\n- link events and obscure event processing is moved to its proper work queue\n\nLocking rules undergo some changes through the driver.\n\n- the driver offers the usual lock-free Tx path\n- besides the IRQ handler, the link event task schedules the napi handler.\n The driver thus adds some internal locking to prevent a loop when both\n must be disabled.\n- the reset task keeps being scheduled from the Tx watchdog handler, thus\n with implicit Tx queue disabling. It does not need to care about irq,\n only napi softirq and competing task.\n- it is not worth to add a dedicated lock between {g, s}et_wol and\n rhine_shutdown. It should not hurt no narrow it down a bit though.\n- rhine_reset_task must keep its huge spin_lock_bh protected section due\n to :\n - races for the CAM registers (see rhine_vlan_rx_{add, kill}_vid)\n - implicit use of napi_enable (see init_registers)\n - use of the same lock for stats read / update exclusion between\n napi rx processing and rhine_get_stats\n- rhine_resume requires a softirq disabled section for the same reason\n as rhine_reset_task\n- {free, request}_irq have been replaced with IntrEnable actions in\n rhine_{suspend, resume}. It is hidden behind init_registers for the\n latter.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\n" } ], "next": "a5abec1e84c3d9cd197667e5fa94f25c21a2cb8e" }