)]}' { "log": [ { "commit": "4c5811bf463b0ef82fabbd1708f8bb2d753aeb18", "tree": "ff37d31217c3804ca05de21a55a9b5ca1ca818b2", "parents": [ "f74b9444192c60603020c61d7915b72893137edc", "9f15444fefdb33509132ff5c9be60cb315c44cb2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 17:28:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 17:28:10 2011 -0700" }, "message": "Merge branch \u0027devicetree/next\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027devicetree/next\u0027 of git://git.secretlab.ca/git/linux-2.6: (21 commits)\n tty: serial: altera_jtaguart: Add device tree support\n tty: serial: altera_uart: Add devicetree support\n dt: eliminate of_platform_driver shim code\n dt: Eliminate of_platform_{,un}register_driver\n dt/serial: Eliminate users of of_platform_{,un}register_driver\n dt/usb: Eliminate users of of_platform_{,un}register_driver\n dt/video: Eliminate users of of_platform_{,un}register_driver\n dt/net: Eliminate users of of_platform_{,un}register_driver\n dt/sound: Eliminate users of of_platform_{,un}register_driver\n dt/spi: Eliminate users of of_platform_{,un}register_driver\n dt: uartlite: merge platform and of_platform driver bindings\n dt: xilinx_hwicap: merge platform and of_platform driver bindings\n ipmi: convert OF driver to platform driver\n leds/leds-gpio: merge platform_driver with of_platform_driver\n dt/sparc: Eliminate users of of_platform_{,un}register_driver\n dt/powerpc: Eliminate users of of_platform_{,un}register_driver\n dt/powerpc: move of_bus_type infrastructure to ibmebus\n drivercore/dt: add a match table pointer to struct device\n dt: Typo fix.\n altera_ps2: Add devicetree support\n ...\n" }, { "commit": "1c48a5c93da63132b92c4bbcd18e690c51539df6", "tree": "746e990ce0f49e48e2cc9d55766485f468ca35f6", "parents": [ "793218dfea146946a076f4fe51e574db61034a3e" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Feb 17 02:43:24 2011 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Feb 28 13:22:46 2011 -0700" }, "message": "dt: Eliminate of_platform_{,un}register_driver\n\nFinal step to eliminate of_platform_bus_type. They\u0027re all just\nplatform drivers now.\n\nv2: fix type in pasemi_nand.c (thanks to Stephen Rothwell)\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4ebb24f707187196937607c60810d42f7112d7aa", "tree": "89a92b3f8dd55f3c5e0cfa73fa6446b3d490f3a8", "parents": [ "000061245a6797d542854106463b6b20fbdcb12e" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Feb 22 20:01:33 2011 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Feb 28 01:36:39 2011 -0700" }, "message": "dt/sparc: Eliminate users of of_platform_{,un}register_driver\n\nGet rid of old users of of_platform_driver in arch/sparc. Most\nof_platform_driver users can be converted to use the platform_bus\ndirectly.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n\n" }, { "commit": "000061245a6797d542854106463b6b20fbdcb12e", "tree": "08ead444b59ce33cf533b19c1c6d338dcec4649d", "parents": [ "710ac54be44e0cc53f5bf29b03d12c8706e7077a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Feb 22 19:59:54 2011 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Feb 28 01:36:39 2011 -0700" }, "message": "dt/powerpc: Eliminate users of of_platform_{,un}register_driver\n\nGet rid of old users of of_platform_driver in arch/powerpc. Most\nof_platform_driver users can be converted to use the platform_bus\ndirectly.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n\n" }, { "commit": "ce92136843cb6e14aba5fd7bc4e88dbe71e70c5a", "tree": "5ff99cc504181f37279f388bd502e624d101aa73", "parents": [ "bd1f2996b44a1c8bde76a6fecd10f36b6eb948d7" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Mon Feb 21 16:43:21 2011 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Feb 21 22:42:40 2011 +1100" }, "message": "crypto: picoxcell - add support for the picoxcell crypto engines\n\nPicochip picoXcell devices have two crypto engines, one targeted\nat IPSEC offload and the other at WCDMA layer 2 ciphering.\n\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "36be070ac600d023ada2ec107ee925f5ac5f902b", "tree": "130ba6e6f17286d2698105a3be7fc561f986e4eb", "parents": [ "3e50191d981082345572f1e80b463eb9c05989a0" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Sat Jan 29 16:01:02 2011 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Jan 29 16:01:02 2011 +1100" }, "message": "crypto: omap-sham - don\u0027t treat NULL clk as an error\n\nclk_get() returns a struct clk cookie to the driver and some platforms\nmay return NULL if they only support a single clock. clk_get() has only\nfailed if it returns a ERR_PTR() encoded pointer.\n\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nReviewed-by: Aaro Koskinen \u003caaro.koskinen@nokia.com\u003e\nReviewed-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "3e50191d981082345572f1e80b463eb9c05989a0", "tree": "8b6822d2e62065ebe5051bc494fad22421b2d7c8", "parents": [ "18c0ebd2d8194cce4b3f67e2903fa01bea892cbc" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Sat Jan 29 15:57:32 2011 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Jan 29 15:57:32 2011 +1100" }, "message": "crypto: omap-aes - don\u0027t treat NULL clk as an error\n\nclk_get() returns a struct clk cookie to the driver and some platforms\nmay return NULL if they only support a single clock. clk_get() has only\nfailed if it returns a ERR_PTR() encoded pointer.\n\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nReviewed-and-tested-by: Tobias Karnat \u003ctobias.karnat@googlemail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "27d189c02ba25851973c8582e419c0bded9f7e5b", "tree": "be142d664bc4e3cec7ab2878a243343f46e897ee", "parents": [ "a1703154200c390ab03c10224c586e815d3e31e8", "55db8387a5e8d07407f0b7c6b2526417a2bc6243" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:25:58 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:25:58 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (46 commits)\n hwrng: via_rng - Fix memory scribbling on some CPUs\n crypto: padlock - Move padlock.h into include/crypto\n hwrng: via_rng - Fix asm constraints\n crypto: n2 - use __devexit not __exit in n2_unregister_algs\n crypto: mark crypto workqueues CPU_INTENSIVE\n crypto: mv_cesa - dont return PTR_ERR() of wrong pointer\n crypto: ripemd - Set module author and update email address\n crypto: omap-sham - backlog handling fix\n crypto: gf128mul - Remove experimental tag\n crypto: af_alg - fix af_alg memory_allocated data type\n crypto: aesni-intel - Fixed build with binutils 2.16\n crypto: af_alg - Make sure sk_security is initialized on accept()ed sockets\n net: Add missing lockdep class names for af_alg\n include: Install linux/if_alg.h for user-space crypto API\n crypto: omap-aes - checkpatch --file warning fixes\n crypto: omap-aes - initialize aes module once per request\n crypto: omap-aes - unnecessary code removed\n crypto: omap-aes - error handling implementation improved\n crypto: omap-aes - redundant locking is removed\n crypto: omap-aes - DMA initialization fixes for OMAP off mode\n ...\n" }, { "commit": "21493088733e6e09dac6f54595a1b6b8ab1e68fd", "tree": "f87f31d0b52aa55930f33d3ccdf186e0b263f033", "parents": [ "0735ac1f2551d9f9d356126aaf3b1110150918e6" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Jan 07 14:52:00 2011 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Jan 07 14:52:00 2011 +1100" }, "message": "crypto: padlock - Move padlock.h into include/crypto\n\nThis patch moves padlock.h from drivers/crypto into include/crypto\nso that it may be used by the via-rng driver.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "dffa18449a334cf436c1fabfb2fcf7d4240c994b", "tree": "7833e1a1b6148f25c86f442573e95cc026f06d69", "parents": [ "c73b7d02da9bfb4fadafc118a24ee868708839b6" ], "author": { "name": "Dennis Gilmore", "email": "dgilmore@redhat.com", "time": "Thu Jan 06 17:15:31 2011 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jan 06 17:15:31 2011 +1100" }, "message": "crypto: n2 - use __devexit not __exit in n2_unregister_algs\n\nfixes fedora sparc build failure, thanks to kylem for helping with debugging\n\nSigned-off-by: Dennis Gilmore \u003cdgilmore@redhat.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e \nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "41f2977d40798ce45f4da7a1291039ffbe9e1dbc", "tree": "b7ab84472bf20adf17f74846da6b38c3fab06fcc", "parents": [ "3181c22587cfeb1fe415e55b2dd8b83c7cc33e44" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Tue Jan 04 15:37:16 2011 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Jan 04 23:34:06 2011 +1100" }, "message": "crypto: mv_cesa - dont return PTR_ERR() of wrong pointer\n\nFix a PTR_ERR() return of the wrong pointer\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "6c39d116ba308ccf9007773a090ca6d20eb68459", "tree": "4928ffd2efc23fe19431f32dfa6f188248e1d643", "parents": [ "8ad225e8e4f530f500c12ec77fd5a51caf6a2f66" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Wed Dec 29 21:52:04 2010 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Dec 29 21:52:04 2010 +1100" }, "message": "crypto: omap-sham - backlog handling fix\n\nPrevious commit \"removed redundant locking\" introduced\na bug in handling backlog.\nIn certain cases, when async request complete callback will\ncall complete() on -EINPROGRESS code, it will cause uncompleted requests.\nIt does not happen in implementation similar to crypto test manager,\nbut it will happen in implementation similar to dm-crypt.\nBacklog needs to be checked before dequeuing next request.\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "efce41b65f66251d60484781df305e8a85c9507b", "tree": "180f200c86807b8e71830a57bb765bc0ee252d22", "parents": [ "83ea7e0fe1471508ab8e8d7b317e743fe7a05a5f" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Tue Nov 30 10:13:32 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Dec 02 16:37:07 2010 +0800" }, "message": "crypto: omap-aes - checkpatch --file warning fixes\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "83ea7e0fe1471508ab8e8d7b317e743fe7a05a5f", "tree": "1358c0b0f636f882a98f90e4e596f1dc51a1e7f0", "parents": [ "67a730ce449561f6df838f0b38a2b72cbf4e3c4c" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Tue Nov 30 10:13:31 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Dec 02 16:37:07 2010 +0800" }, "message": "crypto: omap-aes - initialize aes module once per request\n\nAES module was initialized for every DMA transaction.\nThat is redundant.\nNow it is initialized once per request.\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "67a730ce449561f6df838f0b38a2b72cbf4e3c4c", "tree": "b4ef7c3a16500e9b47477bc9159000c771ef1a0a", "parents": [ "21fe9767f3bd56fd9a271dc43b93cd4608d47f4a" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Tue Nov 30 10:13:30 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Dec 02 16:37:06 2010 +0800" }, "message": "crypto: omap-aes - unnecessary code removed\n\nKey and IV should always be set before AES operation.\nSo no need to check if it has changed or not.\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "21fe9767f3bd56fd9a271dc43b93cd4608d47f4a", "tree": "05dc1fc0e660088fba7ad8b4645b8564a6cf7883", "parents": [ "eeb2b202c5b886b76c3bfa76f47e450fa69389fb" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Tue Nov 30 10:13:29 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Dec 02 16:37:06 2010 +0800" }, "message": "crypto: omap-aes - error handling implementation improved\n\nPrevious version had not error handling.\nRequest could remain uncompleted.\n\nAlso in the case of DMA error, FLAGS_INIT is unset\nand accelerator will be initialized again.\n\nBuffer size allignment is checked.\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "eeb2b202c5b886b76c3bfa76f47e450fa69389fb", "tree": "8d7c63122112203a5227639e42e418b068f0d1d5", "parents": [ "3bd2e2216bc82a83fc5048f8e61d2d22dd5d9cda" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Tue Nov 30 10:13:28 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Dec 02 16:37:06 2010 +0800" }, "message": "crypto: omap-aes - redundant locking is removed\n\nSubmitting request involved double locking for enqueuing and\ndequeuing. Now it is done under the same lock.\n\nFLAGS_BUSY is now handled under the same lock.\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "3bd2e2216bc82a83fc5048f8e61d2d22dd5d9cda", "tree": "4497403992937d9a531c04baad17de046948d845", "parents": [ "c920fa6051c1e7eb3733eaefd01e5bcdddb3d4c8" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Tue Nov 30 10:13:27 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Dec 02 16:37:05 2010 +0800" }, "message": "crypto: omap-aes - DMA initialization fixes for OMAP off mode\n\nDMA parameters for constant data were initialized during driver probe().\nIt seems that those settings sometimes are lost when devices goes to off mode.\nThis patch makes DMA initialization just before use.\nIt solves off mode problems.\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "887c883eea9867535059f3c8414c8cfc952ccff1", "tree": "2a35344c0b1de81b5b4a70bfe416c6605c5809c7", "parents": [ "a55b290b0e41e02d1969589c5d77d966ac2b7ec8" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Fri Nov 19 16:04:29 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Nov 27 16:37:19 2010 +0800" }, "message": "crypto: omap-sham - zero-copy scatterlist handling\n\nIf scatterlist have more than one entry, current driver uses\naligned buffer to copy data to to accelerator to tackle possible\nissues with DMA and SHA buffer alignment.\n\nThis commit adds more intelligence to verify SG alignment and\npossibility to use DMA directly on the data without using copy\nbuffer.\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "a55b290b0e41e02d1969589c5d77d966ac2b7ec8", "tree": "fcbff88a3f115e3bf4055d33388c72774f5e9982", "parents": [ "3c8d758ab528317ecd6d91f8651170ffd2331899" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Fri Nov 19 16:04:28 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Nov 27 16:37:19 2010 +0800" }, "message": "crypto: omap-sham - FLAGS_FIRST is redundant and removed\n\nbufcnt is 0 if it was no update requests before,\nwhich is exact meaning of FLAGS_FIRST.\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "3c8d758ab528317ecd6d91f8651170ffd2331899", "tree": "573bd8ac00f9a71ce2062bef99cd7d317b1f5aaa", "parents": [ "798eed5d9204b01862985ba0643ce5cf84114072" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Fri Nov 19 16:04:27 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Nov 27 16:37:18 2010 +0800" }, "message": "crypto: omap-sham - hash-in-progress is stored in hw format\n\nHash-in-progress is now stored in hw format.\nOnly on final call, hash is converted to correct format.\nSpeedup copy procedure and will allow to use OMAP burst mode.\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "798eed5d9204b01862985ba0643ce5cf84114072", "tree": "98f3bc95e53863ab850510ebb8a1ebff4ef22686", "parents": [ "a5d87237bb15eed8449e5a30c0bbe626e0e7f43d" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Fri Nov 19 16:04:26 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Nov 27 16:37:18 2010 +0800" }, "message": "crypto: omap-sham - crypto_ahash_final() now not need to be called.\n\nAccording to the Herbert Xu, client may not always call\ncrypto_ahash_final().\n\nIn the case of error in hash calculation resources will be\nautomatically cleaned up.\n\nBut if no hash calculation error happens and client will not call\ncrypto_ahash_final() at all, then internal buffer will not be freed,\nand clocks will not be disabled.\n\nThis patch provides support for atomic crypto_ahash_update() call.\nClocks are now enabled and disabled per update request.\n\nData buffer is now allocated as a part of request context.\nClient is obligated to free it with crypto_free_ahash().\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "a5d87237bb15eed8449e5a30c0bbe626e0e7f43d", "tree": "efa77f435272006e9ae802cf2c8d13a58997138a", "parents": [ "3e133c8bf6a6723377d94bc97aa52596e49a4090" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Fri Nov 19 16:04:25 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Nov 27 16:37:17 2010 +0800" }, "message": "crypto: omap-sham - removed redundunt locking\n\nLocking for queuing and dequeuing is combined.\ntest_and_set_bit() is also replaced with checking under dd-\u003elock.\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "3e133c8bf6a6723377d94bc97aa52596e49a4090", "tree": "e04e9dfcfbfc95ad5a529dd10b504c1dce22ae66", "parents": [ "c8eb54041acc4dedeaf0d9da34b91b8658386751" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Fri Nov 19 16:04:24 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Nov 27 16:37:17 2010 +0800" }, "message": "crypto: omap-sham - error handling improved\n\nIntroduces DMA error handling.\n\nDMA error is returned as a result code of the hash request.\nClients needs to handle error codes and may repeat hash calculation attempt.\n\nAlso in the case of DMA error, SHAM module is set to be re-initialized again.\nIt significantly improves stability against possible HW failures.\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "c8eb54041acc4dedeaf0d9da34b91b8658386751", "tree": "1f1986d9d779aad728d048b9c1a1ff4823668055", "parents": [ "0c3cf4cc9abd854dcc6488719348a75b8f328c54" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Fri Nov 19 16:04:23 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Nov 27 16:37:17 2010 +0800" }, "message": "crypto: omap-sham - DMA initialization fixes for off mode\n\nDMA parameters for constant data were initialized during driver probe().\nIt seems that those settings sometimes are lost when devices goes to off mode.\nThis patch makes DMA initialization just before use.\nIt solves off mode problems.\n\nFixes: NB#202786 - Aegis \u0026 SHA1 block off mode changes\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "0c3cf4cc9abd854dcc6488719348a75b8f328c54", "tree": "3883a2763b471a05b39890715bb9bafa8e2410a9", "parents": [ "0d258efb6a58fe047197c3b9cff8746bb176d58a" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Fri Nov 19 16:04:22 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Nov 27 16:37:16 2010 +0800" }, "message": "crypto: omap-sham - uses digest buffer in request context\n\nCurrently driver storred digest results in req-\u003eresults\nprovided by the client. But some clients do not set it\nuntil final() call. It leads to crash.\nChanged to use internal buffer to store temporary digest results.\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "c0caf7bcbfedb3f79ccec759b221bfef0646ada3", "tree": "53c4b5850b18a60e7feef1d10b255a18279cdbee", "parents": [ "c22cff08db00ef0411be088956d7934681a1f988", "c054a076a1bd4731820a9c4d638b13d5c9bf5935" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 13 09:55:56 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 13 09:55:56 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n crypto: padlock - Fix AES-CBC handling on odd-block-sized input\n crypto: n2 - dubious error check\n" }, { "commit": "c054a076a1bd4731820a9c4d638b13d5c9bf5935", "tree": "0ca6515906ce6927a7a3df6073ad5dc1eaf3f641", "parents": [ "14bd342e25ea0242369c229d33075348171b622b" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Nov 04 14:38:39 2010 -0400" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Nov 04 14:38:39 2010 -0400" }, "message": "crypto: padlock - Fix AES-CBC handling on odd-block-sized input\n\nOn certain VIA chipsets AES-CBC requires the input/output to be\na multiple of 64 bytes. We had a workaround for this but it was\nbuggy as it sent the whole input for processing when it is meant\nto only send the initial number of blocks which makes the rest\na multiple of 64 bytes.\n\nAs expected this causes memory corruption whenever the workaround\nkicks in.\n\nReported-by: Phil Sutter \u003cphil@nwl.cc\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "732eacc0542d0aa48797f675888b85d6065af837", "tree": "53205cea4b99cc8dfed8f59438cf4214ef6546ad", "parents": [ "f27c85c56b32c42bcc54a43189c1e00fdceb23ec" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Tue Oct 26 14:22:23 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 26 16:52:12 2010 -0700" }, "message": "replace nested max/min macros with {max,min}3 macro\n\nUse the new {max,min}3 macros to save some cycles and bytes on the stack.\nThis patch substitutes trivial nested macros with their counterpart.\n\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Roland Dreier \u003crolandd@cisco.com\u003e\nCc: Sean Hefty \u003csean.hefty@intel.com\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "14bd342e25ea0242369c229d33075348171b622b", "tree": "350c12e5cefd79c0baf336c0e375afac3f0fbfc7", "parents": [ "72e58063d63c5f0a7bf65312f1e3a5ed9bb5c2ff" ], "author": { "name": "Nicolas Kaiser", "email": "nikai@nikai.net", "time": "Mon Oct 25 19:25:42 2010 -0400" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Oct 25 19:25:42 2010 -0400" }, "message": "crypto: n2 - dubious error check\n\nLooks like a copy-and-paste problem to me.\n\nSigned-off-by: Nicolas Kaiser \u003cnikai@nikai.net\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "188e213dbc5758bbfb62f7ce0367c5c8de057f02", "tree": "97745d2bb8d7a1ed9b815e4ce98ad2c8dd4a22e1", "parents": [ "35da7a307c535f9c2929cae277f3df425c9f9b1e", "6d388b43d2c4ef6f0806c9bb9a5edebf00a23c6a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 12:44:34 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 12:44:34 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n crypto: Makefile - replace the use of \u003cmodule\u003e-objs with \u003cmodule\u003e-y\n crypto: hifn_795x - use cancel_delayed_work_sync()\n crypto: talitos - sparse check endian fixes\n crypto: talitos - fix checkpatch warning\n crypto: talitos - fix warning: \u0027alg\u0027 may be used uninitialized in this function\n crypto: cryptd - Adding the AEAD interface type support to cryptd\n crypto: n2_crypto - Niagara2 driver needs to depend upon CRYPTO_DES\n crypto: Kconfig - update broken web addresses\n crypto: omap-sham - Adjust DMA parameters\n crypto: fips - FIPS requires algorithm self-tests\n crypto: omap-aes - OMAP2/3 AES hw accelerator driver\n crypto: updates to enable omap aes\n padata: add missing __percpu markup in include/linux/padata.h\n MAINTAINERS: Add maintainer entries for padata/pcrypt\n" }, { "commit": "6d388b43d2c4ef6f0806c9bb9a5edebf00a23c6a", "tree": "e65d6ddcbe932751abd5aa357fcb683570444d15", "parents": [ "f4e523f2ad179f6bf5691ddc3cd2893856fafc66" ], "author": { "name": "Tracey Dent", "email": "tdent48227@gmail.com", "time": "Tue Oct 19 20:52:26 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Oct 19 20:52:26 2010 +0800" }, "message": "crypto: Makefile - replace the use of \u003cmodule\u003e-objs with \u003cmodule\u003e-y\n\nChanged \u003cmodule\u003e-objs to \u003cmodule\u003e-y in Makefile.\n\nSigned-off-by: Tracey Dent \u003ctdent48227@gmail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "f4e523f2ad179f6bf5691ddc3cd2893856fafc66", "tree": "25fc398303effaca04e9045a9ffb6f9171b6b45d", "parents": [ "a752447af5b61f19e9c50322d9b07cea9a086084" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Oct 19 20:50:23 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Oct 19 20:50:23 2010 +0800" }, "message": "crypto: hifn_795x - use cancel_delayed_work_sync()\n\nMake hifn_795x::hifn_remove() call cancel_delayed_work_sync() instead\nof calling cancel_delayed_work() followed by flush_scheduled_work().\n\nThis is to prepare for the deprecation and removal of\nflush_scheduled_work().\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "a752447af5b61f19e9c50322d9b07cea9a086084", "tree": "da100acf32163986a815beaeeeea6464de0220e7", "parents": [ "0b798247453299c895e3fa1629101dd5e94901b2" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Thu Sep 23 15:56:38 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Sep 23 15:56:38 2010 +0800" }, "message": "crypto: talitos - sparse check endian fixes\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "0b798247453299c895e3fa1629101dd5e94901b2", "tree": "18af205b2b52d981156877bd6b9adaf5a13a895f", "parents": [ "1d11911a8c572041880c8d86229f6ed971f6f7e2" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Thu Sep 23 15:56:08 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Sep 23 15:56:08 2010 +0800" }, "message": "crypto: talitos - fix checkpatch warning\n\nWARNING: kfree(NULL) is safe this check is probably not required\n+\t\tif (priv-\u003echan[i].fifo)\n+\t\t\tkfree(priv-\u003echan[i].fifo);\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "1d11911a8c572041880c8d86229f6ed971f6f7e2", "tree": "807a4c1523a490bbb30a31a62a3774933d69e429", "parents": [ "298c926c6d7f50d91d6acb76c33b83bab5b5bd5c" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Thu Sep 23 15:55:27 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Sep 23 15:55:27 2010 +0800" }, "message": "crypto: talitos - fix warning: \u0027alg\u0027 may be used uninitialized in this function\n\ndrivers/crypto/talitos.c: In function \u0027talitos_probe\u0027:\ndrivers/crypto/talitos.c:2363: warning: \u0027alg\u0027 may be used uninitialized in this function\ndrivers/crypto/talitos.c:2363: note: \u0027alg\u0027 was declared here\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "50e781613c68f426edbbc8e5c27fcba74494eb8c", "tree": "ebda7c61a427044d512e3fcc8aa07f536e6c8d08", "parents": [ "6d8de74c5caa3e2ce7c9f19c1004dbc76d7c7edb" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 12 10:44:21 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sun Sep 12 10:44:21 2010 +0800" }, "message": "crypto: n2_crypto - Niagara2 driver needs to depend upon CRYPTO_DES\n\nReported-by: Dennis Gilmore \u003cdennis@ausil.us\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "584db6a1b5b80513b272b788e5bda43da982817a", "tree": "ca280847905a7d1f8970799bfb22b7da91ff4e31", "parents": [ "e84c5480b782c4009ef65b0248be7f0864573d7e" ], "author": { "name": "Samu Onkalo", "email": "samu.p.onkalo@nokia.com", "time": "Fri Sep 03 19:20:19 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Sep 03 19:20:19 2010 +0800" }, "message": "crypto: omap-sham - Adjust DMA parameters\n\nDMA is set to use burst mode also for source channel. It should\ndescrease memory bandwidth needs.\n\nDMA synchronization is set to use prefetch mechanism. SHAM block is behind\nL4 bus and it doesn\u0027t have fifo. SHAM block is stalling as long as the new\ndata is available. It takes time to fetch data from memory and transfer it\nvia L4 bus. With prefetch enabled, data is waiting in DMA fifo and SHAM block\nreceives new data block faster.\nThis increases SHA processing speed up to 30 percent depending on the\nbus / memory load.\n\nSigned-off-by: Samu Onkalo \u003csamu.p.onkalo@nokia.com\u003e\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "537559a5b3ef854772bd89fbb43aa77d0bbfb721", "tree": "7341e9a9b9b91fbada30ef903950e5e12f5a74a1", "parents": [ "b744c679f62b368cb94c21c1dcd4618e42d88d63" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Fri Sep 03 19:16:02 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Sep 03 19:16:02 2010 +0800" }, "message": "crypto: omap-aes - OMAP2/3 AES hw accelerator driver\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "57a4955f134dcfd7761b5ba6205ffc8e9b0a1da9", "tree": "a34cd2e28272df1a5f9ff24b62d1d883db7be362", "parents": [ "3a1103703538d164551dc9b5a734a2c8ebcd27ee" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Fri Aug 13 10:06:40 2010 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Fri Aug 13 10:06:54 2010 +0200" }, "message": "[S390] zcrypt: fix Kconfig dependencies\n\nwarning: (ZCRYPT \u0026\u0026 CRYPTO \u0026\u0026 CRYPTO_HW \u0026\u0026 S390 \u0026\u0026 ZCRYPT\u003dy) selects\nZCRYPT_MONOLITHIC which has unmet direct dependencies (ZCRYPT\u003dm)\n\nZCRYPT_MONOLITHIC should not depend on ZCRYPT\u003d\"m\" when it gets\nselected if ZCRYPT\u003d\"y\".\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "58d4ea65b98f154f3326b038eecda32f90b46ea8", "tree": "636aed413349dece12c08a4bd3d1fea0254976d8", "parents": [ "26f0cf91813bdc8e61595f8ad6660251e2ee9cf6", "fbe0f8348fd6c3d016a3f48756eb729b41a67c22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6:\n mmc_spi: Fix unterminated of_match_table\n of/sparc: fix build regression from of_device changes\n of/device: Replace struct of_device with struct platform_device\n" }, { "commit": "946880fa270c18c137654af70ba939f03181c6b6", "tree": "1fc66f0f55c17be3026d55fc261f4cbddaf80e90", "parents": [ "636d17427b1ef0e97bd9df9b3b0e0f314ff889d3", "42ea573f872365b0797ddbcee2e1f1f48913f507" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:17:27 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:17:27 2010 -0700" }, "message": "Merge branch \u0027ixp4xx\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6\n\n* \u0027ixp4xx\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:\n IXP4xx: Fix LL debugging on little-endian CPU.\n IXP4xx: Fix sparse warnings in I/O primitives.\n IXP4xx: Make mdio_bus struct static in the Ethernet driver.\n IXP4xx: Fix ixp4xx_crypto little-endian operation.\n IXP4xx: Prevent HSS transmitter lockup by disabling FRaMe signals.\n ixp4xx/vulcan: add PCI support\n ixp4xx: base support for Arcom Vulcan\n" }, { "commit": "19e4875fb21a69fbf620e84769a74d189c69c58d", "tree": "c9a80978f68b5f60bd6ec2bfb44fbbab27d43c71", "parents": [ "2dc11581376829303b98eadb2de253bee065a56a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sun Aug 08 00:23:26 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sun Aug 08 01:20:06 2010 -0600" }, "message": "of/sparc: fix build regression from of_device changes\n\nCommit id 1636f8ac2b08410df4766449f7c86b912443cd99 (sparc/of: Move\nof_device fields into struct pdev_archdata) missed fixing up the\nn2_core.c and greth.c drivers. This patch makes the required changes.\n\nReported-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "2dc11581376829303b98eadb2de253bee065a56a", "tree": "dbce62559c822cd720d1819a50c488bfecdfa945", "parents": [ "fc1caf6eafb30ea185720e29f7f5eccca61ecd60" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Aug 06 09:25:50 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Aug 06 09:25:50 2010 -0600" }, "message": "of/device: Replace struct of_device with struct platform_device\n\nof_device is just an alias for platform_device, so remove it entirely. Also\nreplace to_of_device() with to_platform_device() and update comment blocks.\n\nThis patch was initially generated from the following semantic patch, and then\nedited by hand to pick up the bits that coccinelle didn\u0027t catch.\n\n@@\n@@\n-struct of_device\n+struct platform_device\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nReviewed-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "03c0c29aff7e56b722eb6c47eace222b140d0377", "tree": "47267a19b523159cf36a050ef3c35f4dbdb33016", "parents": [ "c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4", "7fb8f881c54beb05dd4d2c947dada1c636581d87" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 15:57:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 15:57:35 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6: (63 commits)\n of/platform: Register of_platform_drivers with an \"of:\" prefix\n of/address: Clean up function declarations\n of/spi: call of_register_spi_devices() from spi core code\n of: Provide default of_node_to_nid() implementation.\n of/device: Make of_device_make_bus_id() usable by other code.\n of/irq: Fix endian issues in parsing interrupt specifiers\n of: Fix phandle endian issues\n of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string\n of: remove of_default_bus_ids\n of: make of_find_device_by_node generic\n microblaze: remove references to of_device and to_of_device\n sparc: remove references to of_device and to_of_device\n powerpc: remove references to of_device and to_of_device\n of/device: Replace of_device with platform_device in includes and core code\n of/device: Protect against binding of_platform_drivers to non-OF devices\n of: remove asm/of_device.h\n of: remove asm/of_platform.h\n of/platform: remove all of_bus_type and of_platform_bus_type references\n of: Merge of_platform_bus_type with platform_bus_type\n drivercore/of: Add OF style matching to platform bus\n ...\n\nFix up trivial conflicts in arch/microblaze/kernel/Makefile due to just\nsome obj-y removals by the devicetree branch, while the microblaze\nupdates added a new file.\n" }, { "commit": "3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4", "tree": "5adc1ff2eaf64d450bf28bb6b2ce890db2567288", "parents": [ "5cf65713f87775c548e3eb48dbafa32e12f28000", "0ea6e61122196509af82cc4f36cbdaacbefb8227" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 15:31:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 15:31:02 2010 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)\n Documentation: update broken web addresses.\n fix comment typo \"choosed\" -\u003e \"chosen\"\n hostap:hostap_hw.c Fix typo in comment\n Fix spelling contorller -\u003e controller in comments\n Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -\u003e Fault\n fs/Kconfig: Fix typo Userpace -\u003e Userspace\n Removing dead MACH_U300_BS26\n drivers/infiniband: Remove unnecessary casts of private_data\n fs/ocfs2: Remove unnecessary casts of private_data\n libfc: use ARRAY_SIZE\n scsi: bfa: use ARRAY_SIZE\n drm: i915: use ARRAY_SIZE\n drm: drm_edid: use ARRAY_SIZE\n synclink: use ARRAY_SIZE\n block: cciss: use ARRAY_SIZE\n comment typo fixes: charater \u003d\u003e character\n fix comment typos concerning \"challenge\"\n arm: plat-spear: fix typo in kerneldoc\n reiserfs: typo comment fix\n update email address\n ...\n" }, { "commit": "b7c8e55db7141dcbb9d5305a3260fa0ed62a1bcc", "tree": "59fbd52d8e80e5a83d9747961d28aaf4d400613a", "parents": [ "ffd386a9a8273dcfa61705d0b349eebc7525ef87", "4015d9a865e3bcc42d88bedc8ce1551000bab664" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 15:23:14 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 15:23:14 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (39 commits)\n random: Reorder struct entropy_store to remove padding on 64bits\n padata: update API documentation\n padata: Remove padata_get_cpumask\n crypto: pcrypt - Update pcrypt cpumask according to the padata cpumask notifier\n crypto: pcrypt - Rename pcrypt_instance\n padata: Pass the padata cpumasks to the cpumask_change_notifier chain\n padata: Rearrange set_cpumask functions\n padata: Rename padata_alloc functions\n crypto: pcrypt - Dont calulate a callback cpu on empty callback cpumask\n padata: Check for valid cpumasks\n padata: Allocate cpumask dependend recources in any case\n padata: Fix cpu index counting\n crypto: geode_aes - Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)\n pcrypt: Added sysfs interface to pcrypt\n padata: Added sysfs primitives to padata subsystem\n padata: Make two separate cpumasks\n padata: update documentation\n padata: simplify serialization mechanism\n padata: make padata_do_parallel to return zero on success\n padata: Handle empty padata cpumasks\n ...\n" }, { "commit": "d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f", "tree": "854ab394486288d40fa8179cbfaf66e8bdc44b0f", "parents": [ "73b2c7165b76b20eb1290e7efebc33cfd21db1ca", "3a09b1be53d23df780a0cd0e4087a05e2ca4a00c" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "1ab1d63a85cee2545272f63a7644e9f855cb65d0", "tree": "089afe8c03370cdfaf3eeb30d09e1bcac8a67898", "parents": [ "eca3930163ba8884060ce9d9ff5ef0d9b7c7b00f" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jun 24 15:14:37 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:57:52 2010 -0600" }, "message": "of/platform: remove all of_bus_type and of_platform_bus_type references\n\nBoth of_bus_type and of_platform_bus_type are just #define aliases\nfor the platform bus. This patch removes all references to them and\nswitches to the of_register_platform_driver()/of_unregister_platform_driver()\nAPI for registering.\n\nSubsequent patches will convert each user of of_register_platform_driver()\ninto plain platform_drivers without the of_platform_driver shim. At which\npoint the of_register_platform_driver()/of_unregister_platform_driver()\nfunctions can be removed.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7260042b2d0397e7a8735ca47cd7839a5bb1210b", "tree": "da92181f60f67f1e82378e59edfd13def6a51fe7", "parents": [ "2716fbf63ee39eadc1aa9b3841b20f75b99a9bc3" ], "author": { "name": "Lee Nipper", "email": "lee.nipper@gmail.com", "time": "Mon Jul 19 14:11:24 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Jul 19 14:11:24 2010 +0800" }, "message": "crypto: talitos - fix bug in sg_copy_end_to_buffer\n\nIn function sg_copy_end_to_buffer, too much data\nis copied when a segment in the scatterlist\nhas .length greater than the requested copy length.\n\nThis patch adds the limit checks to fix this bug of over copying,\nwhich affected only the ahash algorithms.\n\nSigned-off-by: Lee Nipper \u003clee.nipper@gmail.com\u003e\nAcked-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "1fb1defbb00eb2954483a7d9a70f8a02edf51753", "tree": "2fe33651449d36368be1ca3eb8efd37e16294510", "parents": [ "a3fb1e330dd21d96c2e07dda513ad7e9af8b6ccf" ], "author": { "name": "Peter Huewe", "email": "peterhuewe@gmx.de", "time": "Thu Jul 15 21:00:41 2010 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Jul 19 13:50:21 2010 +0800" }, "message": "crypto: geode_aes - Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)\n\nThis patch converts pci_table entries, where .subvendor\u003dPCI_ANY_ID and\n.subdevice\u003dPCI_ANY_ID, .class\u003d0 and .class_mask\u003d0, to use the\nPCI_VDEVICE macro, and thus improves readability.\n\nSigned-off-by: Peter Huewe \u003cpeterhuewe@gmx.de\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "7e3de7b1be6ce0643f60aed697070e2286db32cd", "tree": "508d81d9dbffceda49c71aeec965ecaeb1321db5", "parents": [ "8b9cfdca9c52f7d39c3ccfac1668e31c20c9f42e" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Wed Jul 14 20:11:39 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Jul 14 20:11:39 2010 +0800" }, "message": "crypto: hifn_795x - Remove unused ctx variable\n\nThe below patch gets rid of an unused variable ctx reported by\nGCC when building the kernel.\n CC [M] drivers/crypto/hifn_795x.o\ndrivers/crypto/hifn_795x.c: In function \u0027hifn_flush\u0027:\ndrivers/crypto/hifn_795x.c:2021:23: warning: variable \u0027ctx\u0027 set but not used\ndrivers/crypto/hifn_795x.c: In function \u0027hifn_process_queue\u0027:\ndrivers/crypto/hifn_795x.c:2142:23: warning: variable \u0027ctx\u0027 set but not used\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b", "tree": "c2c130a74be25b0b2dff992e1a195e2728bdaadd", "parents": [ "fd0961ff67727482bb20ca7e8ea97b83e9de2ddb", "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:08:13 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:08:13 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "421f91d21ad6f799dc7b489bb33cc560ccc56f98", "tree": "aaf9f6385233fdf9277e634603156c89ede7f770", "parents": [ "65155b3708137fabee865dc4da822763c0c41208" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Fri Jun 11 12:17:00 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:05:05 2010 +0200" }, "message": "fix typos concerning \"initiali[zs]e\"\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "5e833bc4166ea524c00a95e777e4344844ed189f", "tree": "5b53201c04a434464fc68379ac2989cf8fd8027a", "parents": [ "5b04fc170382195d7d33fd08e3ccc2ad8e50e782" ], "author": { "name": "Lee Nipper", "email": "lee.nipper@gmail.com", "time": "Wed Jun 16 15:29:15 2010 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Jun 16 15:29:15 2010 +1000" }, "message": "crypto: talitos - fix ahash for multiple of blocksize\n\nCorrect ahash_process_req() to properly handle cases\nwhere the total hash amount is a multiple of the blocksize.\nThe SEC must have some data to hash during the very last\ndescriptor operation; so up to one whole blocksize\nof data is buffered until the final hash.\n\nSigned-off-by: Lee Nipper \u003clee.nipper@gmail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "0f0a8fa735bbde4b0bc3e96e4bb2e5b380a324db", "tree": "28c9205191d8472dcf3e27613d4cca162f5ae96c", "parents": [ "c9aa55e5271a53d28e93fa58759d318b403c15ba" ], "author": { "name": "Anatolij Gustschin", "email": "agust@denx.de", "time": "Thu Jun 03 16:53:49 2010 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jun 03 16:57:24 2010 +1000" }, "message": "crypto: crypto4xx - Fix build breakage\n\nFixes build error caused by the OF device_node\npointer being moved into struct device\n\nSigned-off-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "ce057297fdab808d9a071c084b7405bc6c8d14c5", "tree": "2cd70e246e45408454107e3d73658683331532f7", "parents": [ "627634293ae7f4ec864cecd4282650ceae7a5067" ], "author": { "name": "Krzysztof Hałasa", "email": "khc@pm.waw.pl", "time": "Sun Jan 10 14:20:10 2010 +0100" }, "committer": { "name": "Krzysztof Hałasa", "email": "khc@pm.waw.pl", "time": "Thu May 27 13:02:42 2010 +0200" }, "message": "IXP4xx: Fix ixp4xx_crypto little-endian operation.\n\nFixes the following on IXP425 little-endian:\n\nNPE-C: firmware functionality 0x5, revision 0x2:1\nalg: skcipher: Test 1 failed on encryption for ecb(des)-ixp4xx\n00000000: 01 23 45 67 89 ab cd e7\nalg: skcipher: Test 1 failed on encryption for ecb(des3_ede)-ixp4xx\n00000000: 73 6f 6d 65 64 61 74 61\nalg: skcipher: Test 1 failed on encryption for ecb(aes)-ixp4xx\n00000000: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff\n\nSigned-off-by: Krzysztof Hałasa \u003ckhc@pm.waw.pl\u003e\nAcked-by: Christian Hohnstaedt \u003cchohnstaedt@innominate.com\u003e\n" }, { "commit": "50d1e9302bab7d35dae7146f8c468e0943015616", "tree": "fa05320f4a297bd582686574cf94ba444e264b3f", "parents": [ "7cc2835083aedfde42de02301005a5555e00c4b1", "dc4ccfd15d4fc7a91ddf222bc5eed5cc4bcf10e6" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed May 26 11:36:58 2010 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed May 26 11:36:58 2010 +1000" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/crypto-2.6\n" }, { "commit": "7cc2835083aedfde42de02301005a5555e00c4b1", "tree": "5d9722dd33ec4dfbdca95cb977acca05e3bb8bb8", "parents": [ "026c8ec69d6077846ba8000b3301e8a62c702dc8" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Wed May 26 10:45:22 2010 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed May 26 10:45:22 2010 +1000" }, "message": "crypto: mv_cesa - fixup error handling in mv_probe()\n\nThe error handling in mv_probe() was a bit messed up. There were some \ngotos to the wrong labels so it ended up releasing stuff that that hadn\u0027t\nbeen aquired and not releasing stuff that was meant to be released. I\nshuffled it around a bit to fix it and make it clearer.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "0efbaabd1ec91476c020e96240d6ab858e9a4871", "tree": "f22a83a0c3483fbb8a97704fbef4461e69877320", "parents": [ "8db050786aaf7a43f4c7a900a103f99ea0fb493f" ], "author": { "name": "Huang Weiyi", "email": "weiyi.huang@gmail.com", "time": "Wed May 26 10:37:52 2010 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed May 26 10:37:52 2010 +1000" }, "message": "crypto: omap - remove unused #include \u003clinux/version.h\u003e\n\nRemove unused #include \u003clinux/version.h\u003e(\u0027s) in\n drivers/crypto/omap-sham.c\n\nSigned-off-by: Huang Weiyi \u003cweiyi.huang@gmail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "dc4ccfd15d4fc7a91ddf222bc5eed5cc4bcf10e6", "tree": "087e672d4a6caac9af433c0e9729612029cf8451", "parents": [ "3a2c034697558602a72e51897c6d3665bc515927" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 22 22:53:09 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 17:37:17 2010 -0700" }, "message": "n2_crypto: Add HMAC support.\n\nOne note is that, unlike with non-HMAC hashes, we can\u0027t support\nhmac(sha224) using the HMAC_SHA256 opcode.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3a2c034697558602a72e51897c6d3665bc515927", "tree": "709351d059760824a705c82a72e1f2d95a46bc40", "parents": [ "38511108a37e5551b2bfe143a957132d46f9e6e7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 22 02:45:56 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 17:37:17 2010 -0700" }, "message": "n2_crypto: Make ahash parameterization explicit.\n\nAll of the ahash -\u003edigest() ops do essentially the same thing, just\nusing different parameters.\n\nSo instead, have a single n2_hash_async_digest() and use an\nn2_ahash_alg container that provides the parameters.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "38511108a37e5551b2bfe143a957132d46f9e6e7", "tree": "886c43b6f79b9604c2bcc2dff03b56a6ead9f69e", "parents": [ "65a23d6706ce2d58e302970971e41688783bf63f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 19 23:16:05 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 17:37:16 2010 -0700" }, "message": "n2_crypto: Log algorithm success/failure in kernel log.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "65a23d6706ce2d58e302970971e41688783bf63f", "tree": "811ab592f530386d452843ce0f541909fd1e4229", "parents": [ "c9aa55e5271a53d28e93fa58759d318b403c15ba" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 22 01:11:03 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 17:37:16 2010 -0700" }, "message": "n2_crypto: Kill n2_base_ctx and helpers.\n\nUnused, and we\u0027ll do this via the request context.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c9aa55e5271a53d28e93fa58759d318b403c15ba", "tree": "a6726466da33e2be0ed943beb5cb2c9dc3ca146c", "parents": [ "527b9525256f97ad8d092bbfc8fdc3c5409f4a4d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 22 01:09:04 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 17:37:15 2010 -0700" }, "message": "n2_crypto: Plumb fallback ahash requests properly.\n\nDo this by putting the async fallback request at the end of an n2\nspecific ahash request context, then properly adjusting the request\nprivate size in our ahash -\u003ecra_init().\n\nWe also need to put the writable state bits into the n2 request\nprivate instead of the n2 cra_ctx.\n\nWith help from Herbert Xu.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "527b9525256f97ad8d092bbfc8fdc3c5409f4a4d", "tree": "1d7e37cb762b5908201908f623e7e38077a72b6c", "parents": [ "ff6c7341e0bc486c3e1b369ab7f3b325b98600d3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 22 00:50:12 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 17:37:15 2010 -0700" }, "message": "n2_crypto: Fix MAU kmem_cache name.\n\nBoth the CWQ and MAU caches unintentionally had that same name.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ff6c7341e0bc486c3e1b369ab7f3b325b98600d3", "tree": "df78d2f28e62ae1e1cbdb2c54cee5a92c2e762bc", "parents": [ "b1cdc4670b9508fcd47a15fbd12f70d269880b37" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 17:37:08 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 17:37:08 2010 -0700" }, "message": "n2_crypto: Fix build after of_device/of_platform_driver changes.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cf9b59e9d3e008591d1f54830f570982bb307a0d", "tree": "113478ce8fd8c832ba726ffdf59b82cb46356476", "parents": [ "44504b2bebf8b5823c59484e73096a7d6574471d", "f4b87dee923342505e1ddba8d34ce9de33e75050" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "message": "Merge remote branch \u0027origin\u0027 into secretlab/next-devicetree\n\nMerging in current state of Linus\u0027 tree to deal with merge conflicts and\nbuild failures in vio.c after merge.\n\nConflicts:\n\tdrivers/i2c/busses/i2c-cpm.c\n\tdrivers/i2c/busses/i2c-mpc.c\n\tdrivers/net/gianfar.c\n\nAlso fixed up one line in arch/powerpc/kernel/vio.c to use the\ncorrect node pointer.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4018294b53d1dae026880e45f174c1cc63b5d435", "tree": "6db3538eaf91b653381720a6d92f4f15634a93d0", "parents": [ "597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:13:02 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:10:40 2010 -0600" }, "message": "of: Remove duplicate fields from of_platform_driver\n\n.name, .match_table and .owner are duplicated in both of_platform_driver\nand device_driver. This patch is a removes the extra copies from struct\nof_platform_driver and converts all users to the device_driver members.\n\nThis patch is a pretty mechanical change. The usage model doesn\u0027t change\nand if any drivers have been missed, or if anything has been fixed up\nincorrectly, then it will fail with a compile time error, and the fixup\nwill be trivial. This patch looks big and scary because it touches so\nmany files, but it should be pretty safe.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Sean MacLennan \u003csmaclennan@pikatech.com\u003e\n\n" }, { "commit": "60f208d7836216885cdcd6f77a02f31dbc66f169", "tree": "03458188b947e1cddf5d0f34b316935e470f7147", "parents": [ "497f2e6b8b21407625a4fb34bc04b50eff098085" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Wed May 19 19:21:53 2010 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed May 19 19:21:53 2010 +1000" }, "message": "crypto: talitos - add support for sha224\n\nSEC h/w versions 2.1 and above support sha224 via explicit instruction.\n\nPerforming sha224 ahashes on earlier versions is still possible because\nthey support sha256 (sha224 is sha256 with different initial constants\nand a different truncation length). We do this by overriding hardware\ncontext self-initialization, and perform it manually in s/w instead.\n\nThanks to Lee for his fixes for correct execution on actual sec2.0 h/w.\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off by: Lee Nipper \u003clee.nipper@gmail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "497f2e6b8b21407625a4fb34bc04b50eff098085", "tree": "80a85aa925491e21253b41b5587712e116e712c9", "parents": [ "acbf7c627fb59dfea975f7aafeaba97921085061" ], "author": { "name": "Lee Nipper", "email": "lee.nipper@gmail.com", "time": "Wed May 19 19:20:36 2010 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed May 19 19:20:36 2010 +1000" }, "message": "crypto: talitos - add hash algorithms\n\nAdd the following alorithms to talitos:\n md5,\n sha1,\n sha256,\n sha384,\n sha512.\nThese are all type ahash.\n\nSigned-off-by: Lee Nipper \u003clee.nipper@gmail.com\u003e\nAcked-By: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "acbf7c627fb59dfea975f7aafeaba97921085061", "tree": "9a58a4a1db70854cb3df2372c2f694fb283e3423", "parents": [ "d5e4aaefd99797929e4455db48d8f9a8728f05f4" ], "author": { "name": "Lee Nipper", "email": "lee.nipper@gmail.com", "time": "Wed May 19 19:19:33 2010 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed May 19 19:19:33 2010 +1000" }, "message": "crypto: talitos - second prepare step for adding ahash algorithms\n\nUsed talitos_alg_template in talitos_crypto_alg\nso that it will accommodate ahash algorithms.\nAdded some preparation code for ahash allocation and removal.\nNo actual algorithms yet.\n\nSigned-off-by: Lee Nipper \u003clee.nipper@gmail.com\u003e\nAcked-By: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "d5e4aaefd99797929e4455db48d8f9a8728f05f4", "tree": "c187f2bc2148dd272255257d56eee9176c306e28", "parents": [ "0a625fd2abaa0aa0a6852b153d429dbc784748cc" ], "author": { "name": "Lee Nipper", "email": "lee.nipper@gmail.com", "time": "Wed May 19 19:18:38 2010 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed May 19 19:18:38 2010 +1000" }, "message": "crypto: talitos - prepare for adding ahash algorithms \n\nNo functional changes.\nUse a union in talitos_alg_template for the crypto_alg\nso that we can add a member later for ahash_alg.\n\nSigned-off-by: Lee Nipper \u003clee.nipper@gmail.com\u003e\nAcked-By: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "0a625fd2abaa0aa0a6852b153d429dbc784748cc", "tree": "5d3664ed5681b4235bd9a112589d8c9dcbeb8021", "parents": [ "bf06099db18a1244957076e51847c644cfe46808" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 19 14:14:04 2010 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed May 19 14:14:04 2010 +1000" }, "message": "crypto: n2 - Add Niagara2 crypto driver\n\nCurrent deficiencies:\n\n1) No HMAC hash support yet.\n\n2) Although the algs are registered as ASYNC they always run\n synchronously.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "3385329a0a0f1d31ca1d011c7887006a7e5a9902", "tree": "eea8526deb7ea189cd241cdb11f507ae06ab930a", "parents": [ "3789ae7dcd29fa146b23dc30377925d1f73c8adf" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 19 13:56:37 2010 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed May 19 13:56:37 2010 +1000" }, "message": "crypto: hifn_795x - Rename ablkcipher_walk to hifn_cipher_walk\n\nThis is in preparation for the generic ablkcipher_walk helpers that\nwill be added to the crypto layer.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "61c7a080a5a061c976988fd4b844dfb468dda255", "tree": "8cb492b73f2755c38a6164d770da34d5af6486a0", "parents": [ "d12d42f744f805a9ccc33cd76f04b237cd83ce56" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:12:29 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 18 16:10:44 2010 -0600" }, "message": "of: Always use \u0027struct device.of_node\u0027 to get device node pointer.\n\nThe following structure elements duplicate the information in\n\u0027struct device.of_node\u0027 and so are being eliminated. This patch\nmakes all readers of these elements use device.of_node instead.\n\n(struct of_device *)-\u003enode\n(struct dev_archdata *)-\u003eprom_node (sparc)\n(struct dev_archdata *)-\u003eof_node (powerpc \u0026 microblaze)\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "5bdd5ded95b3188d58ba43ac801b8849cbea1b16", "tree": "43365aa1aead72399ab2f74730a2213a8ee150a4", "parents": [ "edc774ed0c7d75e92b53105b386a5b0ce94d4525" ], "author": { "name": "Tobias Klauser", "email": "tklauser@distanz.ch", "time": "Fri May 14 14:58:05 2010 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri May 14 14:58:05 2010 +1000" }, "message": "crypto: mv_cesa - Use resource_size\n\nUse the resource_size function instead of manually calculating the\nresource size. This reduces the chance of introducing off-by-one errors.\n\nSigned-off-by: Tobias Klauser \u003ctklauser@distanz.ch\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "df2071bd081408318d659cd14a9cf6ff23d874c9", "tree": "b31291b5fd4b9f84c629833afbfaa8d431857475", "parents": [ "97e3d94aac1c3e95bd04d1b186479a4df3663ab8", "be1066bbcd443a65df312fdecea7e4959adedb45" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon May 03 11:28:58 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon May 03 11:28:58 2010 +0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n" }, { "commit": "8628e7c89075834fc7b44629d09ff4f9043af114", "tree": "ac9e440a8452e13a56243714009ba8c6a110da2e", "parents": [ "ee5500c45c4860a84bba502c6d9ef5af6395dad6" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@nokia.com", "time": "Mon May 03 11:10:59 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon May 03 11:10:59 2010 +0800" }, "message": "crypto: omap - sha1 \u0026 md5 driver\n\nEarlier kernel contained omap sha1 and md5 driver, which was not maintained,\nwas not ported to new crypto APIs and removed from the source tree.\n\n- implements async crypto API using dma and cpu.\n- supports multiple sham instances if available\n- hmac\n- concurrent requests\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@nokia.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "99700716a9b2e117fd50c6d3f1fd5edeef6dc6d2", "tree": "cc937985a3ca6f8f2450431595e31ce815aa421a", "parents": [ "750052dd2400cd09e0864d75b63c2c0bf605056f" ], "author": { "name": "Chihau Chau", "email": "chihau@gmail.com", "time": "Mon Apr 19 21:02:41 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Apr 19 21:02:41 2010 +0800" }, "message": "crypto: geode-aes - Fix some code style issues\n\nThis fixes some code style issues like:\n\n- Use #include \u003clinux/io.h\u003e instead of \u003casm/io.h\u003e and #include\n \u003clinux/delay.h\u003e instead of \u003casm/delay.h\u003e\n\n- Use \"foo *bar\" instead of \"foo * bar\"\n\n- Add a space after the for or while sentence and before the open\n parenthesis \u0027(\u0027\n\n- Don\u0027t use assignments in a if condition\n\nSigned-off-by: Chihau Chau \u003cchihau@gmail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "750052dd2400cd09e0864d75b63c2c0bf605056f", "tree": "eb357fcc1f7961453da0c5e494dc7eab8319e0b2", "parents": [ "0c5c6c4bae8fe9ae3d86b44c332eb1267df1ec99" ], "author": { "name": "Uri Simchoni", "email": "uri@jdland.co.il", "time": "Thu Apr 08 19:34:55 2010 +0300" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Apr 13 16:50:49 2010 +0800" }, "message": "crypto: mv_cesa - Add sha1 and hmac(sha1) async hash drivers\n\nAdd sha1 and hmac(sha1) async hash drivers\n\nSigned-off-by: Uri Simchoni \u003curi@jdland.co.il\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "0c5c6c4bae8fe9ae3d86b44c332eb1267df1ec99", "tree": "25dd8045449682dcb0c241d957ce8410f9e787f0", "parents": [ "f0d03deaad05d9cc99cd2ee0475c9ecd726c19ae" ], "author": { "name": "Uri Simchoni", "email": "uri@jdland.co.il", "time": "Thu Apr 08 19:33:26 2010 +0300" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Apr 13 16:50:48 2010 +0800" }, "message": "crypto: mv_cesa - Support processing of data from previous requests\n\nSupport processing of data from previous requests (as in hashing\nupdate/final requests).\n\nSigned-off-by: Uri Simchoni \u003curi@jdland.co.il\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "f0d03deaad05d9cc99cd2ee0475c9ecd726c19ae", "tree": "df89583294ee0bfe790b874608182c51788b9bc0", "parents": [ "a58094ac5f95d6969e5c52ff096d2fd2864542af" ], "author": { "name": "Uri Simchoni", "email": "uri@jdland.co.il", "time": "Thu Apr 08 19:31:48 2010 +0300" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Apr 13 16:50:48 2010 +0800" }, "message": "crypto: mv_cesa - Make the copy-back of data optional\n\nMake the copy-back of data optional (not done in hashing requests)\n\nSigned-off-by: Uri Simchoni \u003curi@jdland.co.il\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "a58094ac5f95d6969e5c52ff096d2fd2864542af", "tree": "64ea1061de285e1da28c51939635da90fcc32ba5", "parents": [ "7a5f691ef03f4c01d2703b5ec4ddd4c17e645dec" ], "author": { "name": "Uri Simchoni", "email": "uri@jdland.co.il", "time": "Thu Apr 08 19:30:19 2010 +0300" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Apr 13 16:50:48 2010 +0800" }, "message": "crypto: mv_cesa - Execute some code via function pointers rathr than direct calls\n\nExecute some code via function pointers rathr than direct calls\n(to allow customization in the hashing request)\n\nSigned-off-by: Uri Simchoni \u003curi@jdland.co.il\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "7a5f691ef03f4c01d2703b5ec4ddd4c17e645dec", "tree": "67fa772a181fe2051fe09f124a246eebaadc21e8", "parents": [ "3b61a90502481045f56c1c41a2af35ee48ca8b80" ], "author": { "name": "Uri Simchoni", "email": "uri@jdland.co.il", "time": "Thu Apr 08 19:29:16 2010 +0300" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Apr 13 16:50:48 2010 +0800" }, "message": "crypto: mv_cesa - Rename a variable to a more suitable name\n\nRename a variable to a more suitable name\n\nSigned-off-by: Uri Simchoni \u003curi@jdland.co.il\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "3b61a90502481045f56c1c41a2af35ee48ca8b80", "tree": "beb3cdd6aff9ffcfd8c6336bb94da55d5c05aade", "parents": [ "15d4dd3594221f11a7730fcf2d5f9942b96cdd7e" ], "author": { "name": "Uri Simchoni", "email": "uri@jdland.co.il", "time": "Thu Apr 08 19:27:33 2010 +0300" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Apr 13 16:50:47 2010 +0800" }, "message": "crypto: mv_cesa - Enqueue generic async requests\n\nEnqueue generic async requests rather than ablkcipher requests\nin the driver\u0027s queue\n\nSigned-off-by: Uri Simchoni \u003curi@jdland.co.il\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "15d4dd3594221f11a7730fcf2d5f9942b96cdd7e", "tree": "6a907ecf99f7ac734db64af03778f63456f660de", "parents": [ "f565e67ec1b8f4a95d21550f9b879fe86b4132e0" ], "author": { "name": "Uri Simchoni", "email": "uri@jdland.co.il", "time": "Thu Apr 08 19:27:02 2010 +0300" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Apr 13 16:50:47 2010 +0800" }, "message": "crypto: mv_cesa - Fix situations where the src sglist spans more data than the request asks for\n\nFix for situations where the source scatterlist spans more data than the\nrequest nbytes\n\nSigned-off-by: Uri Simchoni \u003curi@jdland.co.il\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "f565e67ec1b8f4a95d21550f9b879fe86b4132e0", "tree": "6b28a4f9cc75145f985615087b6e33e59cec550c", "parents": [ "6bc6fcd609080461682c5cc0a1e3bf4345d6419d" ], "author": { "name": "Uri Simchoni", "email": "uri@jdland.co.il", "time": "Thu Apr 08 19:26:34 2010 +0300" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Apr 13 16:50:47 2010 +0800" }, "message": "crypto: mv_cesa - Fix situation where the dest sglist is organized differently than the source sglist\n\nBugfix for situations where the destination scatterlist has a different\nbuffer structure than the source scatterlist (e.g. source has one 2K\nbuffer and dest has 2 1K buffers)\n\nSigned-off-by: Uri Simchoni \u003curi@jdland.co.il\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "6bc6fcd609080461682c5cc0a1e3bf4345d6419d", "tree": "89f6df9bf0872ce7f448be78efaf174fba6598ce", "parents": [ "0328ac267564089d9cedfb568f936d30a6debd21" ], "author": { "name": "Uri Simchoni", "email": "uri@jdland.co.il", "time": "Thu Apr 08 19:25:56 2010 +0300" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Apr 13 16:50:47 2010 +0800" }, "message": "crypto: mv_cesa - Remove compiler warning in mv_cesa driver\n\nRemove compiler warning\n\nSigned-off-by: Uri Simchoni \u003curi@jdland.co.il\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "0328ac267564089d9cedfb568f936d30a6debd21", "tree": "5b09ffe2ab987396d724a214624b84b51d506edd", "parents": [ "975d260355fca4734b545a0e3366672af0356905" ], "author": { "name": "Uri Simchoni", "email": "uri@jdland.co.il", "time": "Thu Apr 08 19:25:37 2010 +0300" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Apr 13 16:50:46 2010 +0800" }, "message": "crypto: mv_cesa - Invoke the user callback from a softirq context\n\nInvoke the user callback from a softirq context\n\nSigned-off-by: Uri Simchoni \u003curi@jdland.co.il\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "318ae2edc3b29216abd8a2510f3f80b764f06858", "tree": "ce595adde342f57f379d277b25e4dd206988a052", "parents": [ "25cf84cf377c0aae5dbcf937ea89bc7893db5176", "3e58974027b04e84f68b964ef368a6cd758e2f84" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\tDocumentation/filesystems/proc.txt\n\tarch/arm/mach-u300/include/mach/debug-macro.S\n\tdrivers/net/qlge/qlge_ethtool.c\n\tdrivers/net/qlge/qlge_main.c\n\tdrivers/net/typhoon.c\n" }, { "commit": "37d4008484977f60d5d37499a2670c79b214dd46", "tree": "e73ef4b7c3eee1543e13d7be2ecb1593e77eb123", "parents": [ "68c6b859846bd078b37c6ca5f3882032f129e72d", "8d0c123f8b710561cfd34f6e1a5bebc27988edbe" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 26 16:50:02 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 26 16:50:02 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)\n crypto: aes_generic - Fix checkpatch errors\n crypto: fcrypt - Fix checkpatch errors\n crypto: ecb - Fix checkpatch errors\n crypto: des_generic - Fix checkpatch errors\n crypto: deflate - Fix checkpatch errors\n crypto: crypto_null - Fix checkpatch errors\n crypto: cipher - Fix checkpatch errors\n crypto: crc32 - Fix checkpatch errors\n crypto: compress - Fix checkpatch errors\n crypto: cast6 - Fix checkpatch errors\n crypto: cast5 - Fix checkpatch errors\n crypto: camellia - Fix checkpatch errors\n crypto: authenc - Fix checkpatch errors\n crypto: api - Fix checkpatch errors\n crypto: anubis - Fix checkpatch errors\n crypto: algapi - Fix checkpatch errors\n crypto: blowfish - Fix checkpatch errors\n crypto: aead - Fix checkpatch errors\n crypto: ablkcipher - Fix checkpatch errors\n crypto: pcrypt - call the complete function on error\n ...\n" }, { "commit": "1537a3638cbf741d3826c1002026cce487a6bee0", "tree": "ccb28bc0cbad64686c7cff704a6e7ee898aff35f", "parents": [ "b5218a87cbe0f01d551b2dae90b54cad8ded72df" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Fri Jan 29 15:57:49 2010 +0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Feb 05 12:22:45 2010 +0100" }, "message": "tree-wide: fix \u0027lenght\u0027 typo in comments and code\n\nSome misspelled occurences of \u0027octet\u0027 and some comments were also fixed\nas I was on it.\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Jiri Kosina \u003ctrivial@kernel.org\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Junio C Hamano \u003cgitster@pobox.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "e054f1647162d7098a9ff619405a72bd7c417213", "tree": "0a8cdd87ee5bbe0e2058a96415c785f7a6e1e478", "parents": [ "7d6f75eb21b84cdc5dfb09789974f02b42a89058" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Thu Feb 04 11:39:13 2010 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Feb 04 11:39:13 2010 +1100" }, "message": "crypto: geode-aes - Fix cip/blk confusion\n\na crypto_cipher cip member was set where a crypto_cipher blk members\nshould have been.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "a8d7ac279743077965afeca0c9ed748507b68e89", "tree": "d5bf192117944ba3c461fcd586c470c0713f3191", "parents": [ "a996996dd75a9086b12d1cb4010f26e1748993f0" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Feb 01 09:17:56 2010 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Feb 02 06:50:25 2010 +1100" }, "message": "crypto: padlock-sha - Add import/export support\n\nAs the padlock driver for SHA uses a software fallback to perform\npartial hashing, it must implement custom import/export functions.\nOtherwise hmac which depends on import/export for prehashing will\nnot work with padlock-sha.\n\nReported-by: Wolfgang Walter \u003cwolfgang.walter@stwm.de\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "6c3f975a4cafaf4dcc9795385da6d42caa37ddeb", "tree": "8b3bde1c51b123dc0fc4ad49640c1081e0688a05", "parents": [ "73c89c15b959adf06366722c4be8d2eddec0a529" ], "author": { "name": "Márton Németh", "email": "nm127@freemail.hu", "time": "Sun Jan 17 21:54:01 2010 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sun Jan 17 21:54:01 2010 +1100" }, "message": "crypto: Make Open Firmware device id constant\n\nFrom: Márton Németh \u003cnm127@freemail.hu\u003e\n\nThe match_table field of the struct of_device_id is constant in \u003clinux/of_platform.h\u003e\nso it is worth to make the initialization data also constant.\n\nThe semantic match that finds this kind of pattern is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r@\ndisable decl_init,const_decl_init;\nidentifier I1, I2, x;\n@@\n\tstruct I1 {\n\t ...\n\t const struct I2 *x;\n\t ...\n\t};\n@s@\nidentifier r.I1, y;\nidentifier r.x, E;\n@@\n\tstruct I1 y \u003d {\n\t .x \u003d E,\n\t};\n@c@\nidentifier r.I2;\nidentifier s.E;\n@@\n\tconst struct I2 E[] \u003d ... ;\n@depends on !c@\nidentifier r.I2;\nidentifier s.E;\n@@\n+\tconst\n\tstruct I2 E[] \u003d ...;\n// \u003c/smpl\u003e\n\nSigned-off-by: Márton Németh \u003cnm127@freemail.hu\u003e\nCc: Julia Lawall \u003cjulia@diku.dk\u003e\nCc: cocci@diku.dk\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "faad98f29606d9d3c6bddae7c88693be37d2fb43", "tree": "9462c09c670c708bb6f4955832b52ce8b87a36b1", "parents": [ "d7ac769068df87ca8c7f72d99cf67ead16739f18" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Fri Jan 08 14:19:21 2010 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Jan 08 14:19:21 2010 +1100" }, "message": "crypto: geode-aes - access .cip instead of .blk in cipher mode\n\nThe fallback code in cipher mode touch the union fallback.blk instead\nof fallback.cip. This is wrong because we use the cipher and not the\nblockcipher. This did not show any side effects yet because both types /\nstructs contain the same element right now.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: Sebastian Andrzej Siewior \u003csebastian@breakpoint.cc\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "d0316554d3586cbea60592a41391b5def2553d6f", "tree": "5e7418f0bacbc68cec5dfd1541e03eb56870aa02", "parents": [ "fb0bbb92d42d5bd0ab224605444efdfed06d6934", "51e99be00ce2713cbb841cedc997cafa6e26c7f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 14 09:58:24 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 14 09:58:24 2009 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (34 commits)\n m68k: rename global variable vmalloc_end to m68k_vmalloc_end\n percpu: add missing per_cpu_ptr_to_phys() definition for UP\n percpu: Fix kdump failure if booted with percpu_alloc\u003dpage\n percpu: make misc percpu symbols unique\n percpu: make percpu symbols in ia64 unique\n percpu: make percpu symbols in powerpc unique\n percpu: make percpu symbols in x86 unique\n percpu: make percpu symbols in xen unique\n percpu: make percpu symbols in cpufreq unique\n percpu: make percpu symbols in oprofile unique\n percpu: make percpu symbols in tracer unique\n percpu: make percpu symbols under kernel/ and mm/ unique\n percpu: remove some sparse warnings\n percpu: make alloc_percpu() handle array types\n vmalloc: fix use of non-existent percpu variable in put_cpu_var()\n this_cpu: Use this_cpu_xx in trace_functions_graph.c\n this_cpu: Use this_cpu_xx for ftrace\n this_cpu: Use this_cpu_xx in nmi handling\n this_cpu: Use this_cpu operations in RCU\n this_cpu: Use this_cpu ops for VM statistics\n ...\n\nFix up trivial (famous last words) global per-cpu naming conflicts in\n\tarch/x86/kvm/svm.c\n\tmm/slab.c\n" }, { "commit": "d014d043869cdc591f3a33243d3481fa4479c2d0", "tree": "63626829498e647ba058a1ce06419fe7e4d5f97d", "parents": [ "6ec22f9b037fc0c2e00ddb7023fad279c365324d", "6070d81eb5f2d4943223c96e7609a53cdc984364" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Dec 07 18:36:35 2009 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Dec 07 18:36:35 2009 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\n\tkernel/irq/chip.c\n" } ], "next": "af901ca181d92aac3a7dc265144a9081a86d8f39" }