)]}' { "log": [ { "commit": "a9c57a9c6afb41951aa08317d0cd65a66aed38df", "tree": "2dcb1dfedfd642ff03da7e1f1afc43baaebc80e1", "parents": [ "a1a38c4c6a0f73e8a9dc217c0e4e0ac483a89f25" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Tue Dec 13 09:54:06 2011 +0000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Dec 20 15:20:05 2011 +0800" }, "message": "crypto: picoxcell - fix boolean and / or confusion\n\nThe AES engine only supports 128 and 256 bit keys so we should correctly\ntest for that.\n\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nReported-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "a1a38c4c6a0f73e8a9dc217c0e4e0ac483a89f25", "tree": "3cf55cfdcf54184e417797f0960c01349f6b8fef", "parents": [ "a2ecb155a30fea933cc539fc2064fef825fd9511" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Mon Dec 12 14:59:16 2011 -0600" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Dec 20 15:20:05 2011 +0800" }, "message": "crypto: caam - remove DECO access initialization code\n\nAccess to the SEC4 DECOs (DEscriptor COntrollers) (for debug purposes)\nisn\u0027t supported or used, and its register access initialization code\nerroneously makes illegal i/o accesses that show up as errors when\nrun under simulation. Remove it until proper support (via DECORR)\nis added.\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "a2ecb155a30fea933cc539fc2064fef825fd9511", "tree": "ecb4517d5ab2e89fbc73f4df477e605907601676", "parents": [ "b028b546a6a36aa70ec504c00d3d94fae32acf86" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Mon Dec 12 14:59:15 2011 -0600" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Dec 20 15:20:04 2011 +0800" }, "message": "crypto: caam - fix polarity of \"propagate error\" logic\n\nthe polarity of the definition for error propagation was reverse\nin the initial desc.h. Fix desc.h and its users.\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "b028b546a6a36aa70ec504c00d3d94fae32acf86", "tree": "5f1493b2022ddd10eb0d2bb31b515747d7b71479", "parents": [ "1582fa814728825b56cc0a2b0fc0cc8862f83277" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Mon Dec 12 14:59:14 2011 -0600" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Dec 20 15:20:04 2011 +0800" }, "message": "crypto: caam - more desc.h cleanups\n\nmanual removal of double-spaces - no non-whitespace changes.\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "1582fa814728825b56cc0a2b0fc0cc8862f83277", "tree": "dcc1dbe2a9dbdefbb596a1f3d658833de28e93fd", "parents": [ "5e718a09e5cafc8922f3fe22206423449a2801c9" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Mon Dec 12 14:59:13 2011 -0600" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Dec 20 15:20:03 2011 +0800" }, "message": "crypto: caam - desc.h - convert spaces to tabs\n\nthis is the result of running unexpand -a on desc.h.\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "5e718a09e5cafc8922f3fe22206423449a2801c9", "tree": "58112caac5006690265ef5bc4cfacb92746c1230", "parents": [ "2cdba3cf6ffc1fbf880a6fbfa9e7bb757e3d6526" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Mon Dec 12 14:59:12 2011 -0600" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Dec 20 15:20:02 2011 +0800" }, "message": "crypto: talitos - convert talitos_error to struct device\n\nSEC2/3 h/w doesn\u0027t have a dedicated interrupt for errors,\nand the only callsite for talitos_error has already done\nthe type conversion, so simplify talitos_error to take a\npointer to a struct device.\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "2cdba3cf6ffc1fbf880a6fbfa9e7bb757e3d6526", "tree": "66ad180a5165d471e504303a9495deb5ebc6a35a", "parents": [ "0b2730d8d8b38e009607d5a094d48fcce73af547" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Mon Dec 12 14:59:11 2011 -0600" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Dec 20 15:20:02 2011 +0800" }, "message": "crypto: talitos - remove NO_IRQ references\n\nAs prescribed by Linus:\n\nhttps://lkml.org/lkml/2011/12/2/290\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "0b2730d8d8b38e009607d5a094d48fcce73af547", "tree": "995bc7a5ed2246fedf936e5e254223a632faefce", "parents": [ "741e8c2d8177eca656bc015ef83ab84d817edf8c" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Mon Dec 12 14:59:10 2011 -0600" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Dec 20 15:20:01 2011 +0800" }, "message": "crypto: talitos - fix bad kfree\n\nFix a kfree to an invalid address which causes an oops when running\non SEC v2.0 h/w (introduced in commit 702331b \"crypto: talitos - add\nhmac algorithms\").\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "741e8c2d8177eca656bc015ef83ab84d817edf8c", "tree": "95608ec1869898ff9707a32b265234dbb1ed1105", "parents": [ "b21cb324f141d16833137ef0355f686efb9bd84f" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Sat Nov 26 21:26:19 2011 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Nov 30 16:12:48 2011 +0800" }, "message": "crypto: convert drivers/crypto/* to use module_platform_driver()\n\nThis patch converts the drivers in drivers/crypto/* to use the\nmodule_platform_driver() macro which makes the code smaller and a bit\nsimpler.\n\nCc: James Hsiao \u003cjhsiao@amcc.com\u003e\nCc: Sebastian Andrzej Siewior \u003csebastian@breakpoint.cc\u003e\nCc: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Vladimir Zapolskiy \u003cvzapolskiy@gmail.com\u003e\nAcked-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "b21cb324f141d16833137ef0355f686efb9bd84f", "tree": "60295fb35826b75d870b3f273263262c135afdc6", "parents": [ "341975bf3af8f492f8e6ffc3d0fdf6f9c43e1691" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Sat Nov 26 21:11:06 2011 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Nov 30 16:12:47 2011 +0800" }, "message": "char: hw_random: convert drivers/char/hw_random/* to use module_platform_driver()\n\nThis patch converts the drivers in drivers/char/hw_random/* to use the\nmodule_platform_driver() macro which makes the code smaller and a bit\nsimpler.\n\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Josh Boyer \u003cjwboyer@linux.vnet.ibm.com\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nAcked-by: Alexander Clouter \u003calex@digriz.org.uk\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\nAcked-by: David Daney \u003cdavid.daney@cavium.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "8b4d43a4e774c02dee359c7931e47b119143f367", "tree": "2a7a6b43249e0e1878847ee4cf02f7da5eb05bb2", "parents": [ "c3e337f88a5b3784cb3c806ffd650d06adff1ea5" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Mon Nov 21 16:13:27 2011 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Nov 21 16:21:53 2011 +0800" }, "message": "crypto: caam - add support for MD5 algorithm variants\n\nspecifically, add these algorithm combinations:\n\nauthenc-hmac-md5-cbc-aes-caam\nauthenc-hmac-md5-cbc-des3_ede-caam\nauthenc-hmac-md5-cbc-des-caam\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "c3e337f88a5b3784cb3c806ffd650d06adff1ea5", "tree": "12ca78132c4ccc74257bf2ad634e1c06a062d2bd", "parents": [ "ad42d5fc85383278663ecb58a24f6547ad0ba735" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Mon Nov 21 16:13:27 2011 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Nov 21 16:21:51 2011 +0800" }, "message": "crypto: talitos - support for channel remap and 2nd IRQ\n\nSome later SEC v3.x are equipped with a second IRQ line.\nBy correctly assigning IRQ affinity, this feature can be\nused to increase performance on dual core parts, like the\nMPC8572E and P2020E.\n\nThe existence of the 2nd IRQ is determined from the device\nnode\u0027s interrupt property. If present, the driver remaps\ntwo of four channels, which in turn makes those channels\ntrigger their interrupts on the 2nd line instead of the first.\nTo handle single- and dual-IRQ combinations efficiently,\ntalitos gets two new interrupt handlers and back-half workers.\n\n[includes a fix to MCR_LO\u0027s address.]\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "ad42d5fc85383278663ecb58a24f6547ad0ba735", "tree": "acad5589157f94ceb2df9ef97cc2deb635fe0bbd", "parents": [ "5b859b6ebb18b37244d44b5300bf765694b7303c" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Mon Nov 21 16:13:27 2011 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Nov 21 16:21:50 2011 +0800" }, "message": "crypto: talitos - prepare driver for channel remap support\n\nAdd a reg member to the channel struct and use it to\naccess channels.\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "5b859b6ebb18b37244d44b5300bf765694b7303c", "tree": "7e55af4294865c2b7316f57d554613619ee0a716", "parents": [ "79b3a418e090248d00ceba40b81da9dfac753367" ], "author": { "name": "Kim Phillips", "email": "kim.phillips@freescale.com", "time": "Mon Nov 21 16:13:26 2011 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Nov 21 16:21:50 2011 +0800" }, "message": "crypto: talitos - be less noisy on startup\n\ntalitos prints every algorithm it registers at module load time.\nAlgorithms are being added that make for an excessively noisy console\n(latest HMACs patch makes an SEC 3.1 print 20 lines).\nInstead, display the SEC h/w version number, and inform the\nuser of algorithm registration status in /proc/crypto, like so:\n\ntalitos ffe30000.crypto: fsl,sec3.1 algorithms registered in /proc/crypto\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "79b3a418e090248d00ceba40b81da9dfac753367", "tree": "99ac80d75596b08206e3397a632ff7df6b5ad015", "parents": [ "d35643385628d44a5933a0755b01478eb4df5c65" ], "author": { "name": "Lee Nipper", "email": "lee.nipper@gmail.com", "time": "Mon Nov 21 16:13:25 2011 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Nov 21 16:21:48 2011 +0800" }, "message": "crypto: talitos - add hmac algorithms\n\nAdd these hmac algorithms to talitos:\n hmac(md5),\n hmac(sha1),\n hmac(sha224),\n hmac(sha256),\n hmac(sha384),\n hmac(sha512).\nThese are all type ahash.\n\nSigned-off-by: Lee Nipper \u003clee.nipper@gmail.com\u003e\n\nFixed up to not register HMAC algorithms on sec2.0 devices.\nRationale (from Lee):\n\non an 8349E Rev1.1, there\u0027s a problem with hmac for any talitos\nhmac sequence requiring an intermediate hash context (Pointer\nDWORD 1); the result is an incorrect hmac. An intermediate hash\ncontext is required for something longer than (65536-blocksize),\nand for other cases when update/finup/final are used inefficiently.\nInterestingly, a normal hash (without hmac) works perfectly\nwhen using an intermediate context.\n\nSigned-off-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "94956eed14b4b16d401c8ad36d68df0608f968cb", "tree": "60e4e1a3c2c44e8f6616db78cd6b22737b2a1f37", "parents": [ "50e696308c3fb18a4a0dae7b3a4d47469149c919", "e45a618753d5a8bc9086382f73bbc2d6a3399250" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:55:33 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:55:33 2011 -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: (47 commits)\n forcedeth: fix a few sparse warnings (variable shadowing)\n forcedeth: Improve stats counters\n forcedeth: remove unneeded stats updates\n forcedeth: Acknowledge only interrupts that are being processed\n forcedeth: fix race when unloading module\n MAINTAINERS/rds: update maintainer\n wanrouter: Remove kernel_lock annotations\n usbnet: fix oops in usbnet_start_xmit\n ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined\n etherh: Add MAINTAINERS entry for etherh\n bonding: comparing a u8 with -1 is always false\n sky2: fix regression on Yukon Optima\n netlink: clarify attribute length check documentation\n netlink: validate NLA_MSECS length\n i825xx:xscale:8390:freescale: Fix Kconfig dependancies\n macvlan: receive multicast with local address\n tg3: Update version to 3.121\n tg3: Eliminate timer race with reset_task\n tg3: Schedule at most one tg3_reset_task run\n tg3: Obtain PCI function number from device\n ...\n" }, { "commit": "e45a618753d5a8bc9086382f73bbc2d6a3399250", "tree": "5d703fb6c245a761d9d6b838ecc7d7c594c97f7b", "parents": [ "0bdfea8ba856826f5901fda608013f323c87f661" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:25 2011 -0500" }, "message": "forcedeth: fix a few sparse warnings (variable shadowing)\n\nThis fixes the following sparse warnings:\ndrivers/net/ethernet/nvidia/forcedeth.c:2113:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2102:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2155:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2102:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2227:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2215:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2271:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2215:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2986:20: warning: symbol \u0027addr\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2963:6: originally declared here\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0bdfea8ba856826f5901fda608013f323c87f661", "tree": "8527b969d9e27d5f2ded73c643dc79c0c7dd4433", "parents": [ "4687f3f364a1d5b2df815a8c58a763cab57724e8" ], "author": { "name": "Mandeep Baines", "email": "msb@google.com", "time": "Sat Nov 05 14:38:23 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: Improve stats counters\n\nRx byte count was off; instead use the hardware\u0027s count. Tx packet\ncount was counting pre-TSO packets; instead count on-the-wire packets.\nReport hardware dropped frame count as rx_fifo_errors.\n\n- The count of transmitted packets reported by the forcedeth driver\n reports pre-TSO (TCP Segmentation Offload) packet counts and not the\n count of the number of packets sent on the wire. This change fixes\n the forcedeth driver to report the correct count. Fixed the code by\n copying the count stored in the NIC H/W to the value reported by the\n driver.\n\n- Count rx_drop_frame errors as rx_fifo_errors:\n We see a lot of rx_drop_frame errors if we disable the rx bottom-halves\n for too long. Normally, rx_fifo_errors would be counted in this case.\n The rx_drop_frame error count is private to forcedeth and is not\n reported by ifconfig or sysfs. The rx_fifo_errors count is currently\n unused in the forcedeth driver. It is reported by ifconfig as overruns.\n This change reports rx_drop_frame errors as rx_fifo_errors.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4687f3f364a1d5b2df815a8c58a763cab57724e8", "tree": "9083050ec1f348c3f210172e337fcafb3b736678", "parents": [ "2a4e7a085fb44369c450c92cf8bd53b91f874a57" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:22 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: remove unneeded stats updates\n\nFunction ndo_get_stats() updates most of the stats from hardware\nregisters, making the manual updates un-needed. This change removes\nthese manual updates. Main exception is rx_missed_errors which needs\nmanual update.\n\nAnother exception is rx_packets, still updated manually in this commit\nto make sure this patch doesn\u0027t change behavior of driver. This will\nbe addressed by a future patch.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a4e7a085fb44369c450c92cf8bd53b91f874a57", "tree": "c96dd683da76b9698281521d249a11ece0ad59ea", "parents": [ "f9c4082df59e43c6667db197a4fb3eb3286f3fc1" ], "author": { "name": "Mike Ditto", "email": "mditto@google.com", "time": "Sat Nov 05 14:38:21 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: Acknowledge only interrupts that are being processed\n\nThis is to avoid a race, accidentally acknowledging an interrupt that\nwe didn\u0027t notice and won\u0027t immediately process. This is based solely\non code inspection; it is not known if there was an actual bug here.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9c4082df59e43c6667db197a4fb3eb3286f3fc1", "tree": "2bd8c50a7a0ea2b12b0f384fb656eb51e32cfbd0", "parents": [ "dd1294c4ed25725d13a6cb3d93ca0eb5fee14963" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: fix race when unloading module\n\nWhen forcedeth module is unloaded, there exists a path that can lead\nto mod_timer() after del_timer_sync(), causing an oops. This patch\nshort-circuits this unneeded path, which originates in\nnv_get_ethtool_stats().\n\nTested:\n x86_64 16-way + 3 ethtool -S infinite loops + 100Mbps incoming traffic\n + rmmod/modprobe/ifconfig in a loop\n\nInitial-Author: Salman Qazi \u003csqazi@google.com\u003e\nDiscussion: http://patchwork.ozlabs.org/patch/123548/\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a84450604d0fe08b6a2335efbedede18d3d7cc75", "tree": "013be8cd17b787a3051d1d614f794f30573467f8", "parents": [ "6f66263f8ebe1fb1f138de41ca9aa0a4860b30d0" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Tue Nov 01 20:27:43 2011 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:29:10 2011 -0800" }, "message": "device-mapper: using EXPORT_SYBOL in dm-space-map-checker.c needs export.h\n\nReported-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6f66263f8ebe1fb1f138de41ca9aa0a4860b30d0", "tree": "bf8057b31cafcd43e6c4a60551bf24ece185ff07", "parents": [ "1944ce60fe1e92506d3347f4d8e10a82b17096e4" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Tue Nov 01 18:30:49 2011 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:29:10 2011 -0800" }, "message": "device-mapper: dm-bufio.c needs to include module.h\n\nsince it uses the module facilities.\n\nReported-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1944ce60fe1e92506d3347f4d8e10a82b17096e4", "tree": "1da72242c0a525e6a46c3ddc9693d88816362a03", "parents": [ "0c073e35550879fd133bc3fe509df5b88da51278" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Sep 28 18:29:32 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:29:09 2011 -0800" }, "message": "drivers/md: change module.h -\u003e export.h in persistent-data/dm-*\n\nFor the files which are not themselves modular, we can change\nthem to include only the smaller export.h since all they are\ndoing is looking for EXPORT_SYMBOL.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "23ba07991dad5a96a024c1b45cb602eef5f83df8", "tree": "1404d618c42757a234dfb1f0efe946411ecf1b0e", "parents": [ "012641082b34433dac3cbb452e0a6ceccfd4643f" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Mon Nov 07 05:54:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:25:41 2011 -0500" }, "message": "usbnet: fix oops in usbnet_start_xmit\n\nThis patch fixes the bug added in commit v3.1-rc7-1055-gf9b491e\nSKB can be NULL at this point, at least for cdc-ncm.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nAcked-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "012641082b34433dac3cbb452e0a6ceccfd4643f", "tree": "b5fcc89c44d5508f5c669d50e2d879910618ab24", "parents": [ "1a6422f67fbf691cf8721076619aeead9183403d" ], "author": { "name": "Rose, Gregory V", "email": "gregory.v.rose@intel.com", "time": "Mon Nov 07 07:44:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:23:12 2011 -0500" }, "message": "ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined\n\nFix compiler errors and warnings with CONFIG_PCI_IOV defined and not\ndefined.\n\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3c00303206c3a1ccd86579efdc90bc35f140962e", "tree": "66170c84b5ddaeb102aea3530517a26657b6ea29", "parents": [ "83dbb15e9cd78a3619e3db36777e2f81d09b2914", "efb90582c575084723cc14302c1300cb26c7e01f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:13:52 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:13:52 2011 -0800" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:\n cpuidle: Single/Global registration of idle states\n cpuidle: Split cpuidle_state structure and move per-cpu statistics fields\n cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev-\u003eprepare()\n cpuidle: Move dev-\u003elast_residency update to driver enter routine; remove dev-\u003elast_state\n ACPI: Fix CONFIG_ACPI_DOCK\u003dn compiler warning\n ACPI: Export FADT pm_profile integer value to userspace\n thermal: Prevent polling from happening during system suspend\n ACPI: Drop ACPI_NO_HARDWARE_INIT\n ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()\n PNPACPI: Simplify disabled resource registration\n ACPI: Fix possible recursive locking in hwregs.c\n ACPI: use kstrdup()\n mrst pmu: update comment\n tools/power turbostat: less verbose debugging\n" }, { "commit": "83dbb15e9cd78a3619e3db36777e2f81d09b2914", "tree": "521737fc0829222c2739e4d50bf8546a39d6aa0e", "parents": [ "6e6bc67982573c221d12cbd123d34395f9f6e22e", "2ac863719e518ae1a8f328849e64ea26a222f079" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:01:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:01:56 2011 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux: (40 commits)\n vmwgfx: Snoop DMA transfers with non-covering sizes\n vmwgfx: Move the prefered mode first in the list\n vmwgfx: Unreference surface on cursor error path\n vmwgfx: Free prefered mode on error path\n vmwgfx: Use pointer return error codes\n vmwgfx: Fix hw cursor position\n vmwgfx: Infrastructure for explicit placement\n vmwgfx: Make the preferred autofit mode have a 60Hz vrefresh\n vmwgfx: Remove screen object active list\n vmwgfx: Screen object cleanups\n drm/radeon/kms: consolidate GART code, fix segfault after GPU lockup V2\n drm/radeon/kms: don\u0027t poll forever if MC GDDR link training fails\n drm/radeon/kms: fix DP setup on TRAVIS bridges\n drm/radeon/kms: set HPD polarity in hpd_init()\n drm/radeon/kms: add MSI module parameter\n drm/radeon/kms: Add MSI quirk for Dell RS690\n drm/radeon/kms: Add MSI quirk for HP RS690\n drm/radeon/kms: split MSI check into a separate function\n vmwgfx: Reinstate the update_layout ioctl\n drm/radeon/kms: always do extended edid probe\n ...\n" }, { "commit": "e0d65113a70f1dc514e625cc4e7a7485a4bf72df", "tree": "7320a130dc304623f5cf4b5dd8f67fb1776225ca", "parents": [ "cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2", "48e546b7f281f251893baa40769581fd15f085fb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:11:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:11:16 2011 -0800" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (226 commits)\n mtd: tests: annotate as DANGEROUS in Kconfig\n mtd: tests: don\u0027t use mtd0 as a default\n mtd: clean up usage of MTD_DOCPROBE_ADDRESS\n jffs2: add compr\u003dlzo and compr\u003dzlib options\n jffs2: implement mount option parsing and compression overriding\n mtd: nand: initialize ops.mode\n mtd: provide an alias for the redboot module name\n mtd: m25p80: don\u0027t probe device which has status of \u0027disabled\u0027\n mtd: nand_h1900 never worked\n mtd: Add DiskOnChip G3 support\n mtd: m25p80: add EON flash EN25Q32B into spi flash id table\n mtd: mark block device queue as non-rotational\n mtd: r852: make r852_pm_ops static\n mtd: m25p80: add support for at25df321a spi data flash\n mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks\n mtd: nand: switch `check_pattern()\u0027 to standard `memcmp()\u0027\n mtd: nand: invalidate cache on unaligned reads\n mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set\n mtd: nand: wait to set BBT version\n mtd: nand: scrub BBT on ECC errors\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-at91/board-usb-a9260.c\n\tMerged into board-usb-a926x.c\n - drivers/mtd/maps/lantiq-flash.c\n\tadd_mtd_partitions -\u003e mtd_device_register vs changed to use\n\tmtd_device_parse_register.\n" }, { "commit": "2ac863719e518ae1a8f328849e64ea26a222f079", "tree": "bc3900daf89dfe3f5c8cc994499a7164c16316c2", "parents": [ "d41025c0d6a7b3d80d68f07f943b72962d66ac74" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:08 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:16:55 2011 +0000" }, "message": "vmwgfx: Snoop DMA transfers with non-covering sizes\n\nEnough to get cursors working under Wayland.\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d41025c0d6a7b3d80d68f07f943b72962d66ac74", "tree": "868c2a20eebe3d7698b2c321fbc9c1e6ae0c5856", "parents": [ "e5c8dbb8141e7da81bd8179929d1298302d17128" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:07 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:16:34 2011 +0000" }, "message": "vmwgfx: Move the prefered mode first in the list\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e5c8dbb8141e7da81bd8179929d1298302d17128", "tree": "53c42a405d17cc491bf469337ea13a840c64617e", "parents": [ "55bde5b215ceb8356328f18cd82a77843bc4ffd3" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:06 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:16:14 2011 +0000" }, "message": "vmwgfx: Unreference surface on cursor error path\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "55bde5b215ceb8356328f18cd82a77843bc4ffd3", "tree": "4d9f311c7d3dc9befb69a1b6cbd6ee9fd996b635", "parents": [ "d982640914d74054d22508ccebeeda70ce5933e1" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:05 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:15:56 2011 +0000" }, "message": "vmwgfx: Free prefered mode on error path\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d982640914d74054d22508ccebeeda70ce5933e1", "tree": "1f1fbed6d9facf8154879395c61ea034afd220af", "parents": [ "da7653d6a0dcf7c3a173c87df144735e61a86c1e" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:04 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:15:54 2011 +0000" }, "message": "vmwgfx: Use pointer return error codes\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "da7653d6a0dcf7c3a173c87df144735e61a86c1e", "tree": "333e81fc4a0a667918c891ca521d8d8e77a8b188", "parents": [ "6987427a3953c5038dc14d2a090b5a6c93669428" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:12 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:15:40 2011 +0000" }, "message": "vmwgfx: Fix hw cursor position\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6987427a3953c5038dc14d2a090b5a6c93669428", "tree": "9e97ef3e0f57aead819845961cb6b892df0ac4e6", "parents": [ "1543b4dd0c4b63975ffdadccd67c3a8805f28814" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:11 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:15:18 2011 +0000" }, "message": "vmwgfx: Infrastructure for explicit placement\n\nMake it possible to use explicit placement\n(although not hooked up with a user-space interface yet)\nand relax the single framebuffer limit to only apply to implicit placement.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1543b4dd0c4b63975ffdadccd67c3a8805f28814", "tree": "fb23465df4e17c0bb702914cef5f40cbcf69807f", "parents": [ "0e708bc5d6403d1a64a0e4155f1b91e318318989" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:10 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:14:59 2011 +0000" }, "message": "vmwgfx: Make the preferred autofit mode have a 60Hz vrefresh\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0e708bc5d6403d1a64a0e4155f1b91e318318989", "tree": "896ab31125b0e5acc3295a7f7949cdb73bfdbdb9", "parents": [ "d4528b846ec8ba7ccf3116f1c2157c5e14ba46f3" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:09 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:14:31 2011 +0000" }, "message": "vmwgfx: Remove screen object active list\n\nIt isn\u0027t used for anything. Replace with an active bool.\n\nAlso make a couple of functions return void instead of int\nsince their return value wasn\u0027t checked anyway.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakbo Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d4528b846ec8ba7ccf3116f1c2157c5e14ba46f3", "tree": "21f20296be0c7bd0d84590839b25ca391b97400d", "parents": [ "c9a1be96277b3b2d2e8aff2ba69d7817ea8e46c9" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:08 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:14:11 2011 +0000" }, "message": "vmwgfx: Screen object cleanups\n\nRemove unused member.\nNo need to pin / unpin fb.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "31555213f03bca37d2c02e10946296052f4ecfcd", "tree": "8fdd0ad6f3171fe493b2888616997df29abd4b34", "parents": [ "0084e4751e63a71b30f315710f976f8bb0c2cc07" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 22:22:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 22:22:16 2011 -0800" }, "message": "Revert \"hvc_console: display printk messages on console.\"\n\nThis reverts commit 361162459f62dc0826b82c9690a741a940f457f0.\n\nIt causes an infinite loop when booting Linux under Xen, as so:\n\n [ 2.382984] console [hvc0] enabled\n [ 2.382984] console [hvc0] enabled\n [ 2.382984] console [hvc0] enabled\n ...\n\nas reported by Konrad Rzeszutek Wilk. And Rusty reports the same for\nlguest. He goes on to say:\n\n \"This is not a concurrency problem: the issue seems to be that\n calling register_console() twice on the same struct console is a bad\n idea.\"\n\nand Greg says he\u0027ll fix it up properly at some point later. Revert for now.\n\nReported-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReported-by: Rusty Russell \u003crusty@ozlabs.org\u003e\nRequested-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Miche Baker-Harvey \u003cmiche@google.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0084e4751e63a71b30f315710f976f8bb0c2cc07", "tree": "9973621cd75652f53a7c8e76470f7e01b8281678", "parents": [ "b32fc0a0629bf5894b35f33554c118aacfd0d1e2" ], "author": { "name": "Michael Neuling", "email": "mikey@neuling.org", "time": "Mon Nov 07 17:12:28 2011 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 22:21:18 2011 -0800" }, "message": "powerpc: fix building hvc_opal.c\n\nFix building following build error:\n\n drivers/tty/hvc/hvc_opal.c:244:12: error: \u0027THIS_MODULE\u0027 undeclared here (not in a function)\n\nSigned-off-by: Michael Neuling \u003cmikey@neuling.org\u003e\n[ New file from powerpc tree not following the new rules from the\n module.h split, both of which were merged today. - Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "daedd8708fe7707ed651bb1c83162f25c48a947c", "tree": "424e9aaa7d6f686b729257e753e4edf91fecb73c", "parents": [ "6a6662ced4153f6dbcfc40d7225c3cc45416039c", "6b71c52e7f848e2c9f804e175215e5965ea90d32" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:13:34 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:13:34 2011 -0800" }, "message": "Merge branch \u0027stable/cleanups-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/cleanups-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen: use static initializers in xen-balloon.c\n Xen: fix braces and tabs coding style issue in xenbus_probe.c\n Xen: fix braces coding style issue in xenbus_probe.h\n Xen: fix whitespaces,tabs coding style issue in drivers/xen/pci.c\n Xen: fix braces coding style issue in gntdev.c and grant-table.c\n Xen: fix whitespaces,tabs coding style issue in drivers/xen/events.c\n Xen: fix whitespaces,tabs coding style issue in drivers/xen/balloon.c\n\nFix up trivial whitespace-conflicts in\n drivers/xen/{balloon.c,pci.c,xenbus/xenbus_probe.c}\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "efb90582c575084723cc14302c1300cb26c7e01f", "tree": "25af70a2c40e7e404215acd9aadfa42e71e716ae", "parents": [ "e751b759e82629798c4a5e4a87eb3a30c0510154", "46bcfad7a819bd17ac4e831b04405152d59784ab", "22f4521d664030e417f41953e922f61c65f2e189", "aeae1e92daec5a38b40ad12598b97501b675a381" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 22:14:50 2011 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 22:14:50 2011 -0500" }, "message": "Merge branches \u0027acpi\u0027, \u0027idle\u0027, \u0027mrst-pmu\u0027 and \u0027pm-tools\u0027 into next\n" }, { "commit": "e751b759e82629798c4a5e4a87eb3a30c0510154", "tree": "225043e83eecdce1ac8d8ccb6d5a115c5d0b6461", "parents": [ "3bf3f8b19d2bfccc40f13c456bf339fd8f535ebc", "f7f71cfbf0c276ee3d8d856d0f35a41aed997fa4", "c1056b42a87b59375f8f81a92ef029165f44fcce", "362b646062b2073bd5c38efb42171d86e4f717e6", "18fd470a48396c8795ba7256c5973e92ffa25cb3" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 22:10:14 2011 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 22:10:14 2011 -0500" }, "message": "Merge branches \u0027atomic-io\u0027, \u0027lockdep\u0027, \u0027misc\u0027, \u0027pm-profile\u0027 and \u0027pnp-cleanup\u0027 into acpi\n" }, { "commit": "6aad3738f6a79fd0ca480eaceefe064cc471f6eb", "tree": "08fb9ec4824bf3320af01f29fe84b75f814c0fa0", "parents": [ "02ebbbd481635fd3ce7018e5bb19c18c0f1e4561", "5bda90c8f20f0af93375721533f4081a40fa6f41" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:00:42 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:00:42 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:\n target: use -\u003eexectute_task for all CDB emulation\n target: remove SCF_EMULATE_CDB_ASYNC\n target: refactor transport_emulate_control_cdb\n target: pass the se_task to the CDB emulation callback\n target: split core_scsi3_emulate_pr\n target: split core_scsi2_emulate_crh\n target: Add generic active I/O shutdown logic\n target: add back error handling in transport_complete_task\n target/pscsi: blk_make_request() returns an ERR_PTR()\n target: Remove core TRANSPORT_FREE_CMD_INTR usage\n target: Make TFO-\u003echeck_stop_free return free status\n iscsi-target: Fix non-immediate TMR handling\n iscsi-target: Add missing CMDSN_LOWER_THAN_EXP check in iscsit_handle_scsi_cmd\n target: Avoid double list_del for aborted se_tmr_req\n target: Minor cleanups to core_tmr_drain_tmr_list\n target: Fix wrong se_tmr being added to drain_tmr_list\n target: Fix incorrect se_cmd assignment in core_tmr_drain_tmr_list\n target: Check -ENOMEM to signal QUEUE_FULL from fabric callbacks\n tcm_loop: Add explict read buffer memset for SCF_SCSI_CONTROL_SG_IO_CDB\n target: Fix compile warning w/ missing module.h include\n" }, { "commit": "02ebbbd481635fd3ce7018e5bb19c18c0f1e4561", "tree": "f07caea3ac9cb50492977a2f7b1d29bbce6e6a3a", "parents": [ "addd8c92cf55bba578b8a56e0f717a0a74b31008", "536ec4f8d13433126f948d6e90821f811a4ebdf8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:54:53 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:54:53 2011 -0800" }, "message": "Merge branch \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\n* \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n scsi: drop unused Kconfig symbol\n pci: drop unused Kconfig symbol\n stmmac: drop unused Kconfig symbol\n x86: drop unused Kconfig symbol\n powerpc: drop unused Kconfig symbols\n powerpc: 40x: drop unused Kconfig symbol\n mips: drop unused Kconfig symbols\n openrisc: drop unused Kconfig symbols\n arm: at91: drop unused Kconfig symbol\n samples: drop unused Kconfig symbol\n m32r: drop unused Kconfig symbol\n score: drop unused Kconfig symbols\n sh: drop unused Kconfig symbol\n um: drop unused Kconfig symbol\n sparc: drop unused Kconfig symbol\n alpha: drop unused Kconfig symbol\n\nFix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig\nas per Michal: the STMMAC_DUAL_MAC config variable is still unused and\nshould be deleted.\n" }, { "commit": "21404b772a1c65f7b935b8c0fddc388a949f4e31", "tree": "98a4ec2e751a553c32ed5cac87dfc1a009c85a86", "parents": [ "06d381484fe8fb1ba2996c22e89595a273e3634c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:34:03 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:34:03 2011 -0800" }, "message": "hid/apple: modern macbook airs use the standard apple function key translations\n\nThis removes the use of the special \"macbookair_fn_keys\" keyboard\ntranslation table for the MacBookAir4,x models (ie the 2011 refresh).\nThey use the standard apple_fn_keys[] translation. Apparently only the\nold MacBook Air\u0027s need a different translation table.\n\nThis mirrors the change that commit da617c7cb915 (\"HID: consolidate\nMacbookAir 4,1 mappings\") did for the WELLSPRING6A ones, but does it for\nthe WELLSPRING6 model used on the MacBookAir4,2.\n\nReported-and-tested-by: Dirk Hohndel \u003chohndel@infradead.org\u003e\nCc: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCc: Joshua V Dillon \u003cjvdillon@gmail.com\u003e\nCc: Chase Douglas \u003cchase.douglas@canonical.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "06d381484fe8fb1ba2996c22e89595a273e3634c", "tree": "0d39c57cb8c501341ab8ed1d740f076b0b8c0bd0", "parents": [ "5d5a8d2d9d6cca979efe4fe1552d787fdc542603", "c9d6369978411f690513994e6e53e2e6410874a4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:31:36 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:31:36 2011 -0800" }, "message": "Merge branch \u0027stable/vmalloc-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/vmalloc-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n net: xen-netback: use API provided by xenbus module to map rings\n block: xen-blkback: use API provided by xenbus module to map rings\n xen: use generic functions instead of xen_{alloc, free}_vm_area()\n" }, { "commit": "46bcfad7a819bd17ac4e831b04405152d59784ab", "tree": "20041e788154d103edff2699f88d4a30320e3ee2", "parents": [ "4202735e8ab6ecfb0381631a0d0b58fefe0bd4e2" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Fri Oct 28 16:20:42 2011 +0530" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 21:13:58 2011 -0500" }, "message": "cpuidle: Single/Global registration of idle states\n\nThis patch makes the cpuidle_states structure global (single copy)\ninstead of per-cpu. The statistics needed on per-cpu basis\nby the governor are kept per-cpu. This simplifies the cpuidle\nsubsystem as state registration is done by single cpu only.\nHaving single copy of cpuidle_states saves memory. Rare case\nof asymmetric C-states can be handled within the cpuidle driver\nand architectures such as POWER do not have asymmetric C-states.\n\nHaving single/global registration of all the idle states,\ndynamic C-state transitions on x86 are handled by\nthe boot cpu. Here, the boot cpu would disable all the devices,\nre-populate the states and later enable all the devices,\nirrespective of the cpu that would receive the notification first.\n\nReference:\nhttps://lkml.org/lkml/2011/4/25/83\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Trinabh Gupta \u003cg.trinabh@gmail.com\u003e\nTested-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nAcked-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "4202735e8ab6ecfb0381631a0d0b58fefe0bd4e2", "tree": "189e5aab466995128c5a9d5a2a4075a5db530674", "parents": [ "b25edc42bfb9602f0503474b2c94701d5536ce60" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Fri Oct 28 16:20:33 2011 +0530" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 21:13:49 2011 -0500" }, "message": "cpuidle: Split cpuidle_state structure and move per-cpu statistics fields\n\nThis is the first step towards global registration of cpuidle\nstates. The statistics used primarily by the governor are per-cpu\nand have to be split from rest of the fields inside cpuidle_state,\nwhich would be made global i.e. single copy. The driver_data field\nis also per-cpu and moved.\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Trinabh Gupta \u003cg.trinabh@gmail.com\u003e\nTested-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nAcked-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "b25edc42bfb9602f0503474b2c94701d5536ce60", "tree": "5d3b8634606daa99fe5dc86ade108400ecf3a5fd", "parents": [ "e978aa7d7d57d04eb5f88a7507c4fb98577def77" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Fri Oct 28 16:20:24 2011 +0530" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 21:13:43 2011 -0500" }, "message": "cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev-\u003eprepare()\n\nThe cpuidle_device-\u003eprepare() mechanism causes updates to the\ncpuidle_state[].flags, setting and clearing CPUIDLE_FLAG_IGNORE\nto tell the governor not to chose a state on a per-cpu basis at\nrun-time. State demotion is now handled by the driver and it returns\nthe actual state entered. Hence, this mechanism is not required.\nAlso this removes per-cpu flags from cpuidle_state enabling\nit to be made global.\n\nReference:\nhttps://lkml.org/lkml/2011/3/25/52\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm\u003e\nSigned-off-by: Trinabh Gupta \u003cg.trinabh@gmail.com\u003e\nTested-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nAcked-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "e978aa7d7d57d04eb5f88a7507c4fb98577def77", "tree": "d6d6dfe1dba4d4749c7eafe348351aa499c3c5eb", "parents": [ "c3b92c8787367a8bb53d57d9789b558f1295cc96" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Fri Oct 28 16:20:09 2011 +0530" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 21:13:30 2011 -0500" }, "message": "cpuidle: Move dev-\u003elast_residency update to driver enter routine; remove dev-\u003elast_state\n\nCpuidle governor only suggests the state to enter using the\ngovernor-\u003eselect() interface, but allows the low level driver to\noverride the recommended state. The actual entered state\nmay be different because of software or hardware demotion. Software\ndemotion is done by the back-end cpuidle driver and can be accounted\ncorrectly. Current cpuidle code uses last_state field to capture the\nactual state entered and based on that updates the statistics for the\nstate entered.\n\nIdeally the driver enter routine should update the counters,\nand it should return the state actually entered rather than the time\nspent there. The generic cpuidle code should simply handle where\nthe counters live in the sysfs namespace, not updating the counters.\n\nReference:\nhttps://lkml.org/lkml/2011/3/25/52\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Trinabh Gupta \u003cg.trinabh@gmail.com\u003e\nTested-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nAcked-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "362b646062b2073bd5c38efb42171d86e4f717e6", "tree": "6c98cdb7aa5d9be22e2b24ca06b822455ef4b9f5", "parents": [ "c3b92c8787367a8bb53d57d9789b558f1295cc96" ], "author": { "name": "Thomas Renninger", "email": "trenn@suse.de", "time": "Fri Nov 04 03:33:46 2011 +0100" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 20:48:42 2011 -0500" }, "message": "ACPI: Export FADT pm_profile integer value to userspace\n\nThere are a lot userspace approaches to detect the usage of the\nplatform (laptop, workstation, server, ...) and adjust kernel tunables\naccordingly (io/process scheduler, power management, ...).\n\nThese approaches need constant maintaining and are ugly to implement\n(detect PCMCIA controller -\u003e laptop,\ndoes not work on recent systems anymore, ...)\nOn ACPI systems there is an easy and reliable way (if implemented\nin BIOS and most recent platforms have this value set).\n-\u003e export it to userspace.\n\nSigned-off-by: Thomas Renninger \u003ctrenn@suse.de\u003e\nAcked-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "51e20d0e3a60cf46b52ee1af598a35834919ed27", "tree": "88cc982dbe78035d8c58e90f02f86cf100c7bd0a", "parents": [ "4505a2015f4c4b2f21137cc3a6b7400b0f3e073e" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Nov 06 14:21:38 2011 +0100" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 20:38:49 2011 -0500" }, "message": "thermal: Prevent polling from happening during system suspend\n\nThe thermal driver should use a freezable workqueue to schedule\npolling to prevent thermal_zone_device_update() from being run\nduring system suspend, when the devices it relies on may be inactive.\nMake it use the system freezable workqueue for this purpose.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "4505a2015f4c4b2f21137cc3a6b7400b0f3e073e", "tree": "85c5b4da507a1b7a98ad7ede5e1abf1ad07abb46", "parents": [ "581de59e8dff8eaa52809e768a585e9ef336aa4a" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Nov 06 14:20:42 2011 +0100" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 20:32:31 2011 -0500" }, "message": "ACPI: Drop ACPI_NO_HARDWARE_INIT\n\nACPI_NO_HARDWARE_INIT is only used by acpi_early_init() and\nacpi_bus_init() when calling acpi_enable_subsystem(), but\nacpi_enable_subsystem() doesn\u0027t check that flag, so it can be\ndropped.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "3bf3f8b19d2bfccc40f13c456bf339fd8f535ebc", "tree": "08685f87741ef4460c648ca2adea4b1623cc8ca8", "parents": [ "c3b92c8787367a8bb53d57d9789b558f1295cc96" ], "author": { "name": "Luck, Tony", "email": "tony.luck@intel.com", "time": "Fri Oct 21 14:42:55 2011 -0700" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 20:30:23 2011 -0500" }, "message": "ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()\n\nCallers to __acpi_ioremap_fast() pass the bit_width that they found in the\nacpi_generic_address structure. Convert from bits to bytes when passing to\n__acpi_find_iomap() - as it wants to see bytes, not bits.\n\ncc: stable@kernel.org\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "0e4c9dc2f2e0fb6d3838eba34382fc6d2d1c381c", "tree": "14d4ba299004c27ae16169c78233babb0630f139", "parents": [ "1197ab2942f920f261952de0c392ac749a35796b", "99f8bd8556ad829e042e66c1b25a35f1bcc38981" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 17:28:13 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 17:28:13 2011 -0800" }, "message": "Merge branch \u0027rmobile-latest\u0027 of git://github.com/pmundt/linux-sh\n\n* \u0027rmobile-latest\u0027 of git://github.com/pmundt/linux-sh: (21 commits)\n ARM: mach-shmobile: ag5evm needs CONFIG_I2C\n ARM: mach-shmobile: sh73a0 and AG5EVM PINT support\n ARM: mach-shmobile: Add support for PINT though INTC macros\n ARM: mach-shmobile: SDHI0 GPIO hotplug for AG5EVM\n ARM: mach-shmobile: Use common INTC IRQ code on sh73a0\n ARM: mach-shmobile: Use common INTC IRQ code on sh7372\n ARM: mach-shmobile: Use common INTC IRQ code on sh7377\n ARM: mach-shmobile: Use common INTC IRQ code on sh7367\n ARM: mach-shmobile: sh73a0 GPIO IRQ support\n ARM: sh7372 ap4evb NOR Flash USB boot fix\n ARM: mach-shmobile: sh7372 Mackerel NOR Flash USB boot fix\n sh: intc: Allow triggering on both edges for ARM SoCs\n ARM: mach-shmobile: Break out INTC IRQ code\n ARM: mach-shmobile: Kota2 SDHI0 and SDHI1 support\n ARM: mach-shmobile: Kota2 SCIFA4 and SCIFB support\n ARM: mach-shmobile: Kota2 MMCIF support\n ARM: mach-shmobile: Kota2 GPIO LEDs support\n ARM: mach-shmobile: Kota2 GPIO Keys support\n ARM: mach-shmobile: Kota2 KEYSC support\n ARM: mach-shmobile: Kota2 SCIFA2 and SMSC911X support\n ...\n" }, { "commit": "18fd470a48396c8795ba7256c5973e92ffa25cb3", "tree": "68cb3b94c29a75039040d83531b132b6cfdbcdf4", "parents": [ "c3b92c8787367a8bb53d57d9789b558f1295cc96" ], "author": { "name": "Witold Szczeponik", "email": "Witold.Szczeponik@gmx.net", "time": "Thu Oct 27 20:56:47 2011 +0200" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 20:13:55 2011 -0500" }, "message": "PNPACPI: Simplify disabled resource registration\n\nThe attached patch simplifies 29df8d8f8702f0f53c1375015f09f04bc8d023c1. As\nthe \"pnp_xxx\" structs are not designed to cope with IORESOURCE_DISABLED, and\nhence no code can test for this value, setting this value is actually a \"no op\"\nand can be skipped altogether. It is sufficient to remove the checks for\n\"empty\" resources and continue processing.\n\nThe patch is applied against 3.1.\n\nSigned-off-by: Witold Szczeponik \u003cWitold.Szczeponik@gmx.net\u003e\nAcked-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "1197ab2942f920f261952de0c392ac749a35796b", "tree": "4922ccc8a6061e5ece6ac7420001f3bf4524ea92", "parents": [ "ec773e99ab4abce07b1ae23117179c2861831964", "96cc017c5b7ec095ef047d3c1952b6b6bbf98943" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 17:12:03 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 17:12:03 2011 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)\n powerpc/p3060qds: Add support for P3060QDS board\n powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX\n powerpc/85xx: Make kexec to interate over online cpus\n powerpc/fsl_booke: Fix comment in head_fsl_booke.S\n powerpc/85xx: issue 15 EOI after core reset for FSL CoreNet devices\n powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver\n powerpc/85xx: Add \u0027fsl,pq3-gpio\u0027 compatiable for GPIO driver\n powerpc/86xx: Correct Gianfar support for GE boards\n powerpc/cpm: Clear muram before it is in use.\n drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager\n powerpc/fsl_msi: add support for \"msi-address-64\" property\n powerpc/85xx: Setup secondary cores PIR with hard SMP id\n powerpc/fsl-booke: Fix settlbcam for 64-bit\n powerpc/85xx: Adding DCSR node to dtsi device trees\n powerpc/85xx: clean up FPGA device tree nodes for Freecsale QorIQ boards\n powerpc/85xx: fix PHYS_64BIT selection for P1022DS\n powerpc/fsl-booke: Fix setup_initial_memory_limit to not blindly map\n powerpc: respect mem\u003d setting for early memory limit setup\n powerpc: Update corenet64_smp_defconfig\n powerpc: Update mpc85xx/corenet 32-bit defconfigs\n ...\n\nFix up trivial conflicts in:\n - arch/powerpc/configs/40x/hcu4_defconfig\n\tremoved stale file, edited elsewhere\n - arch/powerpc/include/asm/udbg.h, arch/powerpc/kernel/udbg.c:\n\tadded opal and gelic drivers vs added ePAPR driver\n - drivers/tty/serial/8250.c\n\tmoved UPIO_TSI to powerpc vs removed UPIO_DWAPB support\n" }, { "commit": "f7f71cfbf0c276ee3d8d856d0f35a41aed997fa4", "tree": "946537396845cdda9f4b9803d27c577d3566901e", "parents": [ "c3b92c8787367a8bb53d57d9789b558f1295cc96" ], "author": { "name": "Rakib Mullick", "email": "rakib.mullick@gmail.com", "time": "Sun Nov 06 21:18:17 2011 +0600" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 20:09:23 2011 -0500" }, "message": "ACPI: Fix possible recursive locking in hwregs.c\n\nCalling pm-suspend might trigger a recursive lock in it\u0027s code path.\nIn function acpi_hw_clear_acpi_status, acpi_os_acquire_lock holds\nthe lock acpi_gbl_hardware_lock before calling acpi_hw_register_write(),\nthen without releasing acpi_gbl_hardware_lock, this function calls\nacpi_ev_walk_gpe_list, which tries to hold acpi_gbl_gpe_lock.\nBoth acpi_gbl_hardware_lock and acpi_gbl_gpe_lock are at same\nlock-class and which might cause lock recursion deadlock.\n\nFollowing patch fixes this scenario by just releasing\nacpi_gbl_hardware_lock before calling acpi_ev_walk_gpe_list.\n\n Changes since v0(https://lkml.org/lkml/2011/9/21/355):\n\t- Fix changelog, thanks to Lin Ming.\n\n Changes since v1 (https://lkml.org/lkml/2011/11/3/89):\n\t- Update changelog and rename goto label, courtesy Srivatsa S. Bhat.\n\nSigned-off-by: Rakib Mullick \u003crakib.mullick@gmail.com\u003e\nReviewed-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nAcked-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "ec773e99ab4abce07b1ae23117179c2861831964", "tree": "630de8df04406f7de326349169d9a61e51864c99", "parents": [ "534baf55dd16d5de9c8d045190469eef9d31ffff", "7a3f8de5a3c36e5fde130cae74a06663b59837ae" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 16:58:33 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 16:58:33 2011 -0800" }, "message": "Merge branch \u0027fixes\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027fixes\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:\n ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver\n ARM: PXA: fix gpio-pxa.h build errors\n ARM: 7142/1: davinci: mark GPIO implementation complex\n ARM: 7134/1: Revert \"EXYNOS4: Fix routing timer interrupt to offline CPU\"\n ARM: PXA: eseries: fix eseries_register_clks section mismatch warning\n ARM: PXA: fix lubbock PCMCIA driver build error\n" }, { "commit": "581de59e8dff8eaa52809e768a585e9ef336aa4a", "tree": "a89fecb0d2edb1ea9256fbe16676def28b0dff93", "parents": [ "c3b92c8787367a8bb53d57d9789b558f1295cc96" ], "author": { "name": "Thomas Meyer", "email": "thomas@m3y3r.de", "time": "Sat Aug 06 11:32:56 2011 +0200" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 19:13:44 2011 -0500" }, "message": "ACPI: use kstrdup()\n\n Use kstrdup rather than duplicating its implementation\n\n The semantic patch that makes this output is available\n in scripts/coccinelle/api/kstrdup.cocci.\n\n More information about semantic patching is available at\n http://coccinelle.lip6.fr/\n\nSigned-off-by: Thomas Meyer \u003cthomas@m3y3r.de\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "bfa02b0da66965caf46e441270af87edda4fea14", "tree": "374d3bc3993c7027eac330b3184437a27bf2e0a8", "parents": [ "2aba6cac2a84f3b80e11a680c34d55e7739b474d" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sun Nov 06 20:25:18 2011 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Sun Nov 06 20:25:18 2011 +0100" }, "message": "hwmon: (w83627ehf) Fix broken driver init\n\nCommit 2265cef2 (hwmon: (w83627ehf) Properly report PECI and AMD-SI\nsensor types) results in kernel panic if data-\u003etemp_label was not\ninitialized.\nThe problem was found with chip W83627DHG-P.\n\nAdd check if data-\u003etemp-\u003elabel was set before use.\n\nBased on incomplete patch by Alexander Beregalov.\n\nReported-by: Alexander Beregalov \u003ca.beregalov@gmail.com\u003e\nTested-by: Alexander Beregalov \u003ca.beregalov@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "2aba6cac2a84f3b80e11a680c34d55e7739b474d", "tree": "9dda2cd4be097035d67864516c05696a41503c2f", "parents": [ "c861cd3e92d92ae946e19099f198018fcb4fd887" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Sun Nov 06 20:25:18 2011 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Sun Nov 06 20:25:18 2011 +0100" }, "message": "hwmon: (coretemp) Fix for non-SMP builds\n\nThe definition of TO_ATTR_NO in the non-SMP case is wrong. As the SMP\ndefinition resolves to the correct value, just use this for both\ncases.\n\nWithout this fix the temperature attributes are named temp0_* instead\nof temp2_*, so libsensors won\u0027t pick them. Broken since kernel 3.0.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nTested-by: Phil Sutter \u003cphil@nwl.cc\u003e\nCc: stable@kernel.org\nAcked-by: Durgadoss R \u003cDurgadoss.r@intel.com\u003e\nAcked-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "c861cd3e92d92ae946e19099f198018fcb4fd887", "tree": "fab678a30a85cf80038c560221d6ab01812a3891", "parents": [ "7abec10c623d9e0416dab6919a0ea22e6283516b", "b8bc83971cc20cae3c3b65c26a804f350d74960c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 05 18:21:21 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 05 18:21:21 2011 -0700" }, "message": "Merge branch \u0027next/devel2\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/devel2\u0027 of git://git.linaro.org/people/arnd/arm-soc: (30 commits)\n ARM: mmp: register internal sram bank\n ARM: mmp: register audio sram bank\n ARM: mmp: add sram allocator\n gpio/samsung: Complain loudly if we don\u0027t know the SoC\n ARM: S3C64XX: Fix SoC identification for S3C64xx devices\n ARM: S3C2443: Remove redundant s3c_register_clocks call for init_clocks\n ARM: S3C24XX: Add devname for hsmmc1 pclk\n ARM: S3C24XX: use clk_get_rate to init fclk in common_setup_clocks\n ARM: S3C2443: Accommodate cpufreq frequency scheme in armdiv\n ARM: S3C2443: handle unset armdiv values gracefully\n ARM: S3C2443: Add get_rate operation for clk_armdiv\n ARM: S3C2416: Add comment describing the armdiv/armclk\n ARM: S3C2443: Move clk_arm and clk_armdiv to common code\n ARM: S3C24XX: Add infrastructure to transmit armdiv to common code\n ARM: S3C2416: Add armdiv_mask constant\n ARM: EXYNOS4: Add support for M-5MOLS camera on Nuri board\n ARM: EXYNOS4: Enable MFC on ORIGEN\n ARM: SAMSUNG: Add support s3c2416-adc for S3C2416/S3C2450\n ARM: SAMSUNG: Add support s3c2443-adc for S3C2443\n ARM: SAMSUNG: Allow overriding of adc device name for S3C24XX\n ...\n" }, { "commit": "7abec10c623d9e0416dab6919a0ea22e6283516b", "tree": "83aa79c369e99c4fc60eea91ebd399b7689b312e", "parents": [ "0de9adf284ec20454ecf37ffd98e7e98ba7292d6", "cfaf8fc5b59527281e9ddc2e0e04e1127936e17f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 05 18:18:05 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 05 18:18:05 2011 -0700" }, "message": "Merge branch \u0027next/cleanup3\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/cleanup3\u0027 of git://git.linaro.org/people/arnd/arm-soc: (79 commits)\n ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung\n ARM: SAMSUNG: Cleanup resources by using macro\n ARM: SAMSUNG: Cleanup plat-samsung/devs.c and devs.h\n ARM: S5P: To merge devs.c files to one devs.c\n ARM: S3C64XX: To merge devs.c files to one devs.c\n ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c\n ARM: S5P64X0: Add Power Management support\n ARM: S5P: Make the sleep code common for S5P series SoCs\n ARM: S5P: Make the common S5P PM code conditionally compile\n ARM: SAMSUNG: Move S5P header files to plat-samsung\n ARM: SAMSUNG: Move S3C24XX header files to plat-samsung\n ARM: SAMSUNG: Moving each SoC support header files\n ARM: SAMSUNG: Consolidate plat/pll.h\n ARM: SAMSUNG: Consolidate plat/pwm-clock.h\n ARM: SAMSUNG: Cleanup mach/clkdev.h\n ARM: SAMSUNG: remove sdhci default configuration setup platform helper\n ARM: EXYNOS4: Add FIMC device on SMDKV310 board\n ARM: EXYNOS4: Add header file protection macros\n ARM: EXYNOS4: Add usb ehci device to the SMDKV310\n ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk\n ...\n\nFix up conflicts in\n - arch/arm/mach-exynos4/{Kconfig,clock.c}\n\tARM_CPU_SUSPEND, various random device tables (gah!)\n - drivers/gpio/Makefile\n\tsa1100 gpio added, samsung gpio drivers merged\n" }, { "commit": "8110efc64c4790cd1bf7e30f080e5ba3faa7cb85", "tree": "708c2a1ef6bebce8eda9676c554bea366547678e", "parents": [ "06d8eb1b7d1eb34c76538dab791bc14136ebbc8f", "d6cc76856d353a3a9c43bead33210b9216dce332" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 05 17:54:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 05 17:54:18 2011 -0700" }, "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:\n PM / Freezer: Revert 27920651fe \"PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too\"\n PM / Freezer: Reimplement wait_event_freezekillable using freezer_do_not_count/freezer_count\n USB: Update last_busy time after autosuspend fails\n PM / Runtime: Automatically retry failed autosuspends\n PM / QoS: Remove redundant check\n PM / OPP: Fix build when CONFIG_PM_OPP is not set\n PM / Runtime: Fix runtime accounting calculation error\n PM / Sleep: Update freezer documentation\n PM / Sleep: Remove unused symbol \u0027suspend_cpu_hotplug\u0027\n PM / Sleep: Fix race between CPU hotplug and freezer\n ACPI / PM: Add Sony VPCEB17FX to nonvs blacklist\n" }, { "commit": "06d8eb1b7d1eb34c76538dab791bc14136ebbc8f", "tree": "56e8d92422022f7ce97d1b1eb9e2e8de757357d4", "parents": [ "cd3f07d1e6e59fade92a8edaff9315cc534199cf", "00411ee9308e4b5f4b04caaa01685f955e259373" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 05 15:39:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 05 15:39:39 2011 -0700" }, "message": "Merge git://www.linux-watchdog.org/linux-watchdog\n\n* git://www.linux-watchdog.org/linux-watchdog:\n watchdog: Convert wm831x driver to watchdog core\n watchdog: s3c2410: convert to use the watchdog framework\n Documentation: watchdog: add guide how to convert drivers to new framework\n watchdog: iTCO_wdt.c - problems with newer hardware due to SMI clearing\n watchdog: Add WDIOC_GETTIMELEFT ioctl support to w83627 watchdog driver\n watchdog: irq: Remove IRQF_DISABLED\n watchdog: Octeon: Mark octeon_wdt interrupt as IRQF_NO_THREAD\n watchdog: sc520_wdt: Remove unnecessary cast.\n" }, { "commit": "cd3f07d1e6e59fade92a8edaff9315cc534199cf", "tree": "a2f30bccdfad1826a81c098c6766c2a4345fc171", "parents": [ "dc822e57ee05856291a8c9324d2309076ee5f5e2", "f7c9c6bb14f3104608a3a83cadea10a6943d2804" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 05 15:32:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 05 15:32:53 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (45 commits)\n [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev\n [SCSI] scsi_dh_alua: Fix the time inteval for alua rtpg commands\n [SCSI] scsi_transport_iscsi: Fix documentation os parameter\n [SCSI] mv_sas: OCZ RevoDrive3 \u0026 zDrive R4 support\n [SCSI] libfc: improve flogi retries to avoid lport stuck\n [SCSI] libfc: avoid exchanges collision during lport reset\n [SCSI] libfc: fix checking FC_TYPE_BLS\n [SCSI] edd: Treat \"XPRS\" host bus type the same as \"PCI\"\n [SCSI] isci: overriding max_concurr_spinup oem parameter by max(oem, user)\n [SCSI] isci: revert bcn filtering\n [SCSI] isci: Fix hard reset timeout conditions.\n [SCSI] isci: No need to manage the pending reset bit on pending requests.\n [SCSI] isci: Remove redundant isci_request.ttype field.\n [SCSI] isci: Fix task management for SMP, SATA and on dev remove.\n [SCSI] isci: No task_done callbacks in error handler paths.\n [SCSI] isci: Handle task request timeouts correctly.\n [SCSI] isci: Fix tag leak in tasks and terminated requests.\n [SCSI] isci: Immediately fail I/O to removed devices.\n [SCSI] isci: Lookup device references through requests in completions.\n [SCSI] ipr: add definitions for additional adapter\n ...\n" }, { "commit": "7a3f8de5a3c36e5fde130cae74a06663b59837ae", "tree": "71cbf9c7ac4b1f7ad53bd033a188b16d82543feb", "parents": [ "7124cb96cadc5f9990ade39780b672b01bfc6484" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 05 22:06:17 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 05 22:26:46 2011 +0000" }, "message": "ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver\n\nThe includes in the pxa2xx_cm_x2xx PCMCIA driver are rather random;\nthe driver doesn\u0027t require anything from these headers except the\ncpu_is_xxx() macros which come from another include.\n\nThe concern is that it\u0027s getting these definitions via mach/system.h,\nwhich is supposed to only be included by arch/arm/kernel/process.c.\nAs this header is scheduled for cleanup (and elimination) keeping\nthe status quo will cause build errors. So lets fix properly and\nindependent of the future work.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "00411ee9308e4b5f4b04caaa01685f955e259373", "tree": "5e614e61fdee4237ab0675651e8df52b24b9523f", "parents": [ "25dc46e3837cd01dc1742eefb73d064f6336850f" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Oct 04 16:43:40 2011 +0100" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Sat Nov 05 21:28:59 2011 +0100" }, "message": "watchdog: Convert wm831x driver to watchdog core\n\nFairly large code churn but not much doing with that and the overall\nresult is a definite win.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "25dc46e3837cd01dc1742eefb73d064f6336850f", "tree": "8986b563b9385060f4134fe8ac19bb9d0719fe54", "parents": [ "74cd4c67392c1cee0499ba0977ec843252c7af28" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Mon Sep 26 15:40:14 2011 +0200" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Sat Nov 05 21:25:20 2011 +0100" }, "message": "watchdog: s3c2410: convert to use the watchdog framework\n\nMake this driver a user of the watchdog framework and remove now\ncentrally handled parts. Tested on a mini2440.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "deb9197b7031b8f4ed311dc47a14363da4458544", "tree": "e4a10ac64b3a3617651baa8559421d09497739ba", "parents": [ "c63b6d02be22899a5c8d47b8ee40e0534cd01a43" ], "author": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed Oct 19 23:59:26 2011 +0200" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Sat Nov 05 21:22:06 2011 +0100" }, "message": "watchdog: iTCO_wdt.c - problems with newer hardware due to SMI clearing\n\nRedhat Bugzilla: Bug 727875 - TCO_EN bit is disabled by TCO driver\nJiri Slaby: 28d41f53f broke temperature sensors on a ICH10 chipset\n\nThe iTCO_wdt driver disables the SMI. This breaks good working of newer hardware.\nThe disabling of the SMI by the TCO logic dates back from the i810-tco driver\nfrom Nils Faerber (around 28 July 2000). The reason for this was that some BIOSes\ninstall handlers reset or disable the watchdog timer instead of resetting the system.\nThe trick to fix this was to disable the SMI (by clearing the SMI_TCO_EN bit of the\nSMI_EN register) to prevent this from happening.\n\nThis however has strange effects on newer hardware. So we are in a situation that\na fix for broken old hardware affects newer hardware.\n\nThe correct solution is to make this fix an option (with the new module parameter:\nturn_SMI_watchdog_clear_off) so that the default behaviour is the unfixed version.\n\nthe next patch will be to move this in the start and stop functions of the driver\nand to add a new module parameter for the global_smi_en bit and to get rid of the\nvendor_support code.\n\nThis fix can have an effect on old (typical ICH \u0026 ICH2 chipsets) motherboards that\nhave a broken BIOS implementation concerning TCO logic. In these case the module\nparameter turn_SMI_watchdog_clear_off\u003d1 will need to be added.\n\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "c63b6d02be22899a5c8d47b8ee40e0534cd01a43", "tree": "5ac9fab3b39834efb4eff5f91cbce9d2eda48cf1", "parents": [ "86b5912880453532440358b1486410ad49ef7672" ], "author": { "name": "Greg Lee", "email": "glee@swspec.com", "time": "Mon Sep 12 20:28:46 2011 -0400" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Sat Nov 05 21:16:39 2011 +0100" }, "message": "watchdog: Add WDIOC_GETTIMELEFT ioctl support to w83627 watchdog driver\n\nAdd WDIOC_GETTIMELEFT ioctl allowing you to check how much time is left\non the watchdog counter before a reset occurs.\n\nSigned-off-by: Greg Lee \u003cglee [at] swspec.com\u003e\nSigned-off-by: Padraig Brady \u003cP@draigbrady.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\nSigned-off-by: Andrew Morton \u003cakpm@google.com\u003e\n" }, { "commit": "86b5912880453532440358b1486410ad49ef7672", "tree": "f81e5cd360cf7a3141d52384893c4367589fb39b", "parents": [ "47bfd058132e6da2a582b85033867ce8b9f5f331" ], "author": { "name": "Yong Zhang", "email": "yong.zhang0@gmail.com", "time": "Wed Sep 07 16:10:55 2011 +0800" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Sat Nov 05 21:16:15 2011 +0100" }, "message": "watchdog: irq: Remove IRQF_DISABLED\n\nThis flag is a NOOP and can be removed now.\n\nSigned-off-by: Yong Zhang \u003cyong.zhang0@gmail.com\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "47bfd058132e6da2a582b85033867ce8b9f5f331", "tree": "c5ff4c1f4d6f00a7e07f4a90ddc16452186f0050", "parents": [ "cef153a8d41195f69314d93d4b2b7395e263a3a1" ], "author": { "name": "Venkat Subbiah", "email": "venkat.subbiah@cavium.com", "time": "Mon Oct 03 17:22:04 2011 -0700" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Sat Nov 05 21:15:38 2011 +0100" }, "message": "watchdog: Octeon: Mark octeon_wdt interrupt as IRQF_NO_THREAD\n\nThis is to exclude it from force threading to allow RT patch set to work.\n\nThe watchdog timers are per-CPU and the addresses of register that reset\nthe timer are calculated based on the current CPU. Therefore we cannot\nallow it to run on a thread on a different CPU. Also we only do a\nsingle register write, which is much faster than scheduling a handler\nthread.\n\nAnd while on this line remove IRQF_DISABLED as this flag is a NOP.\n\nSigned-off-by: Venkat Subbiah\u003cvenkat.subbiah@cavium.com\u003e\nAcked-by: David Daney\u003cdavid.daney@cavium.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "cef153a8d41195f69314d93d4b2b7395e263a3a1", "tree": "c051ee4445d0a61ff738d40c566db02ad8634a5a", "parents": [ "dc822e57ee05856291a8c9324d2309076ee5f5e2" ], "author": { "name": "Sean Young", "email": "sean@mess.org", "time": "Tue Aug 23 22:30:09 2011 +0100" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Sat Nov 05 21:15:10 2011 +0100" }, "message": "watchdog: sc520_wdt: Remove unnecessary cast.\n\nSigned-off-by: Sean Young \u003csean@mess.org\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "d5240dfd3c80ad2fd17b25ca38d199ab1262ab6e", "tree": "3576b5649564fcce4e425533e72d9ac48e255732", "parents": [ "5c8a0fbba543d9428a486f0d1282bbcf3cf1d95a" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Oct 27 11:33:15 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 05 19:09:40 2011 +0000" }, "message": "ARM: PXA: fix lubbock PCMCIA driver build error\n\nFix:\n\nERROR: \"pxa2xx_configure_sockets\" [drivers/pcmcia/pxa2xx_lubbock_cs.ko] undefined!\n\nby exporting the required function.\n\nAcked-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "fba9569924e06da076cb2ad12474bbd82d69f54d", "tree": "f0b7d9c82f8dd90f0dc757a4c00afc0872fc1484", "parents": [ "3d0a8d10cfb4cc3d1877c29a866ee7d8a46aa2fa", "4598fc2c94b68740e0269db03c98a1e7ad5af773" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 18:02:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 18:02:25 2011 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (63 commits)\n dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle\n dmaengine/ep93xx_dma: add module.h include\n pch_dma: Reduce wasting memory\n pch_dma: Fix suspend issue\n dma/timberdale: free_irq() on an error path\n dma: shdma: transfer based runtime PM\n dmaengine: shdma: protect against the IRQ handler\n dmaengine i.MX DMA/SDMA: add missing include of linux/module.h\n dmaengine: delete redundant chan_id and chancnt initialization in dma drivers\n dmaengine/amba-pl08x: Check txd-\u003ellis_va before freeing dma_pool\n dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers\n serial: sh-sci: don\u0027t filter on DMA device, use only channel ID\n ARM: SAMSUNG: Remove Samsung specific enum type for dma direction\n ASoC: Samsung: Update DMA interface\n spi/s3c64xx: Merge dma control code\n spi/s3c64xx: Add support DMA engine API\n ARM: SAMSUNG: Remove S3C-PL330-DMA driver\n ARM: S5P64X0: Use generic DMA PL330 driver\n ARM: S5PC100: Use generic DMA PL330 driver\n ARM: S5PV210: Use generic DMA PL330 driver\n ...\n\nFix up fairly trivial conflicts in\n - arch/arm/mach-exynos4/{Kconfig,clock.c}\n - arch/arm/mach-s5p64x0/dma.c\n" }, { "commit": "3d0a8d10cfb4cc3d1877c29a866ee7d8a46aa2fa", "tree": "11a85044d1472f5972ae47ce10a2f446ad981e9f", "parents": [ "b4fdcb02f1e39c27058a885905bd0277370ba441", "a0eda62552eba4e1f92d5354bb65c68fb6b45f87" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 17:22:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 17:22:14 2011 -0700" }, "message": "Merge branch \u0027for-3.2/drivers\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-3.2/drivers\u0027 of git://git.kernel.dk/linux-block: (30 commits)\n virtio-blk: use ida to allocate disk index\n hpsa: add small delay when using PCI Power Management to reset for kump\n cciss: add small delay when using PCI Power Management to reset for kump\n xen/blkback: Fix two races in the handling of barrier requests.\n xen/blkback: Check for proper operation.\n xen/blkback: Fix the inhibition to map pages when discarding sector ranges.\n xen/blkback: Report VBD_WSECT (wr_sect) properly.\n xen/blkback: Support \u0027feature-barrier\u0027 aka old-style BARRIER requests.\n xen-blkfront: plug device number leak in xlblk_init() error path\n xen-blkfront: If no barrier or flush is supported, use invalid operation.\n xen-blkback: use kzalloc() in favor of kmalloc()+memset()\n xen-blkback: fixed indentation and comments\n xen-blkfront: fix a deadlock while handling discard response\n xen-blkfront: Handle discard requests.\n xen-blkback: Implement discard requests (\u0027feature-discard\u0027)\n xen-blkfront: add BLKIF_OP_DISCARD and discard request struct\n drivers/block/loop.c: remove unnecessary bdev argument from loop_clr_fd()\n drivers/block/loop.c: emit uevent on auto release\n drivers/block/cpqarray.c: use pci_dev-\u003erevision\n loop: always allow userspace partitions and optionally support automatic scanning\n ...\n\nFic up trivial header file includsion conflict in drivers/block/loop.c\n" }, { "commit": "b4fdcb02f1e39c27058a885905bd0277370ba441", "tree": "fd4cfd1994f21f44afe5e7904681fb5ac09f81b8", "parents": [ "044595d4e448305fbaec472eb7d22636d24e7d8c", "6dd9ad7df2019b1e33a372a501907db293ebcd0d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 17:06:58 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 17:06:58 2011 -0700" }, "message": "Merge branch \u0027for-3.2/core\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-3.2/core\u0027 of git://git.kernel.dk/linux-block: (29 commits)\n block: don\u0027t call blk_drain_queue() if elevator is not up\n blk-throttle: use queue_is_locked() instead of lockdep_is_held()\n blk-throttle: Take blkcg-\u003elock while traversing blkcg-\u003epolicy_list\n blk-throttle: Free up policy node associated with deleted rule\n block: warn if tag is greater than real_max_depth.\n block: make gendisk hold a reference to its queue\n blk-flush: move the queue kick into\n blk-flush: fix invalid BUG_ON in blk_insert_flush\n block: Remove the control of complete cpu from bio.\n block: fix a typo in the blk-cgroup.h file\n block: initialize the bounce pool if high memory may be added later\n block: fix request_queue lifetime handling by making blk_queue_cleanup() properly shutdown\n block: drop @tsk from attempt_plug_merge() and explain sync rules\n block: make get_request[_wait]() fail if queue is dead\n block: reorganize throtl_get_tg() and blk_throtl_bio()\n block: reorganize queue draining\n block: drop unnecessary blk_get/put_queue() in scsi_cmd_ioctl() and blk_get_tg()\n block: pass around REQ_* flags instead of broken down booleans during request alloc/free\n block: move blk_throtl prototypes to block/blk.h\n block: fix genhd refcounting in blkio_policy_parse_and_set()\n ...\n\nFix up trivial conflicts due to \"mddev_t\" -\u003e \"struct mddev\" conversion\nand making the request functions be of type \"void\" instead of \"int\" in\n - drivers/md/{faulty.c,linear.c,md.c,md.h,multipath.c,raid0.c,raid1.c,raid10.c,raid5.c}\n - drivers/staging/zram/zram_drv.c\n" }, { "commit": "589665f5a6008dbce1d0af2cb93e94a80bf78151", "tree": "4f4ec1949dd233a8474c2cb477da3637166b6e75", "parents": [ "27d240fdae2808d727ad9ce48ec029731a457524" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Fri Nov 04 08:21:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 18:37:23 2011 -0400" }, "message": "bonding: comparing a u8 with -1 is always false\n\nslave-\u003eduplex is a u8 type so the in bond_info_show_slave() when we\ncheck \"if (slave-\u003eduplex \u003d\u003d -1)\", it\u0027s always false.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "27d240fdae2808d727ad9ce48ec029731a457524", "tree": "67d1a401e21a4fdd1c7c3a798611140d65bebbea", "parents": [ "4b6cc7284ddc9a54910f111085ebf0143ef3f5bd" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Fri Nov 04 12:17:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 18:19:43 2011 -0400" }, "message": "sky2: fix regression on Yukon Optima\n\nChanges to support other Optima types, introduced an accidental\nregression that caused 88E8059 to come up in 10Mbit/sec.\n\nThe Yukon Optima supports a reverse auto-negotiation feature that\nwas incorrectly setup, and not needed. The feature could be used to\nallow wake-on-lan at higher speeds. But doing it correctly would require\nother changes to initialization.\n\nReported-by: Pavel Mateja \u003cpavel@netsafe.cz\u003e\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "433aee04a447fb2e769c4570f327d9c2a956117b", "tree": "e5cb64fd4ce0de67e2623276f920fb348e322fef", "parents": [ "729e72a10930ef765c11a5a35031ba47f18221c4" ], "author": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Nov 02 00:30:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:41:20 2011 -0400" }, "message": "i825xx:xscale:8390:freescale: Fix Kconfig dependancies\n\ni825xx and xscale are \"sub\" Kconfigs to NET_VENDOR_INTEL, so\nNET_VENDOR_INTEL should contain ALL the dependencies of the\n\"sub\" Kconfigs.\n\nSame with 8390 is a \"sub\" Kconfig to NET_VENDOR_NATSEMI, so\nNET_VENDOR_NATSEMI needs to contains ALL the dependencies.\n\nFreescale Kconfig only had fs_enet as a sub Kconfig, and already\ncontained the needed dependencies, just cleaned up the dependencies.\n\nReported-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "729e72a10930ef765c11a5a35031ba47f18221c4", "tree": "ae0bcc4d1b15ce6988bd5358c4e2beb9f3b5625e", "parents": [ "5ae7fa06bb90421bc63f1f1e56ab241b49bc7b91" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Nov 02 12:11:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:39:32 2011 -0400" }, "message": "macvlan: receive multicast with local address\n\nWhen implementing VRRP v2 using macvlan several problems were\ndiscovered. VRRP is weird in that all routers participating\nin a redundant group use the same virtual MAC address.\nMacvlan is a natural driver to use for this but it doesn\u0027t\nwork. The problem is that packets with a macvlan device\u0027s\nsource address are not received.\n\nThe problem is actually a regression that date back almost 2 years now.\nThe original problems started with:\n\ncommit 618e1b7482f7a8a4c6c6e8ccbe140e4c331df4e9\nAuthor: Arnd Bergmann \u003carnd@arndb.de\u003e\nDate: Thu Nov 26 06:07:10 2009 +0000\n\n macvlan: implement bridge, VEPA and private mode\n\nThis patches restores the original 2.6.32 behavior. Allowing multicast\npackets received with the VRRP source address to be received.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5ae7fa06bb90421bc63f1f1e56ab241b49bc7b91", "tree": "86a8d2a2a3391723fa8d384e181daaf9fc42bb48", "parents": [ "5b1906241905d9bd1abe920854b3d43c2b9c85e1" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:15:05 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:49 2011 -0400" }, "message": "tg3: Update version to 3.121\n\nThis patch updates the tg3 version to 3.121.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b1906241905d9bd1abe920854b3d43c2b9c85e1", "tree": "d259390621daa923977f00fb43415a09da565cd5", "parents": [ "db21997379906fe7657d360674e1106d80b020a4" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:15:04 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:48 2011 -0400" }, "message": "tg3: Eliminate timer race with reset_task\n\nDuring shutdown, it is impossible to reliably disable the timer and\nreset_task threads. Each thread can schedule the other, which leads to\nshutdown code that chases its tail.\n\nTo fix the problem, this patch removes the ability of tg3_reset_task to\nschedule a new timer thread. To support this change, tg3_timer no\nlonger terminates itself, but rather goes into a polling mode.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db21997379906fe7657d360674e1106d80b020a4", "tree": "aefa69f5ad536aec711d102a238d6dc10c50fa48", "parents": [ "9dc5e342703948ea7b086d063c85c0e79dac8149" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:15:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:48 2011 -0400" }, "message": "tg3: Schedule at most one tg3_reset_task run\n\nIt is possible for multiple threads in the tg3 driver to each attempt to\nschedule a run of tg3_reset_task(). The multiple tg3_reset_task\nexecutions could all wind up on the same queue (and execute serially) or\nwind up on the queues of another processor (which could execute in\nparallel). Either scenario is not what was truly desired.\n\nThis patch adds a new flag, TG3_FLAG_RESET_TASK_PENDING, and uses it to\ndetermine whether or not to schedule another run of tg3_reset_task().\nWith the new flag comes two new functions to facilitate scheduling and\ndescheduling of tg3_reset_task().\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9dc5e342703948ea7b086d063c85c0e79dac8149", "tree": "664ce50ab14d997f01f44f84a982440257413b78", "parents": [ "5bc09186deba2a016b60aa3923fc0e42838ce877" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:15:02 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:48 2011 -0400" }, "message": "tg3: Obtain PCI function number from device\n\nThis patch adds code to attempt to obtain the PCI function number from\nthe device rather than accept the number handed by the kernel. In\npass-through scenarios, the function number handed by the kernel may not\nreflect the true function of the device.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5bc09186deba2a016b60aa3923fc0e42838ce877", "tree": "e16110c073141e90e5f679fd2f385d8e1278e47b", "parents": [ "ba1142e4fb291c7bf124d93596351dca8d226a0f" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:15:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:47 2011 -0400" }, "message": "tg3: Fix irq alloc error cleanup path\n\nThis patch fixes a bug where the irq error cleanup path did not free all\nthe resources it allocated.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: Ben Li \u003cbenli@broadcom.com\u003e\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ba1142e4fb291c7bf124d93596351dca8d226a0f", "tree": "dc20e27d52a515cfad594d2d137e61a3983d7de5", "parents": [ "b9e454826f22e17d1945bd282834c87aef8d0f95" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:15:00 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:47 2011 -0400" }, "message": "tg3: Fix 4k skb error recovery path\n\nOn the error recovery resource unwind path, it is possible for the\ndriver to attempt to unmap a fragment that hadn\u0027t been mapped. This\npatch fixes the problem by correcting the \"last\" parameter supplied.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b9e454826f22e17d1945bd282834c87aef8d0f95", "tree": "e90abb4a6f8bc8bdb67b1b4bacd030bfad15b9ed", "parents": [ "78f94dc7b10d98cf4cf8498d98581500d910c6b7" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:14:59 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:47 2011 -0400" }, "message": "tg3: Fix 4k tx bd segmentation code\n\nThe new 4k tx bd segmentation code had a bug in the error cleanup path.\nIf the driver did not map all the physical fragments, the abort path\nwould wind up advancing the producer index beyond the point where the\nsetup code stopped. This would ultimately turn into a tx recovery error\nwhere the driver would expect the skb pointer to be set when it isn\u0027t.\nThis patch fixes the problem, and then makes the code a little easier to\nunderstand.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "78f94dc7b10d98cf4cf8498d98581500d910c6b7", "tree": "871e63ccac34bef1440e0aa493bd0f08b93e74ec", "parents": [ "39b02648d251dbfa27b576d55eeab4cc62228d86" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:14:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:46 2011 -0400" }, "message": "tg3: Fix APE mutex init and use\n\nAPE mutex register blocks are shared by all ports of multiport devices.\nFor some mutexing purposes, each function is assigned their own\nregister. For other cases, each function is assigned its own request\nand grant bits of a single register. For the latter cases, the tg3\ndriver is incorrectly allowing each function to use the same set of\ngrant / request bits. This patch fixes the code so that each function\nuses the appropriate bitset.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b2c0a863e14676fa5760c6d828fd373288e2f64a", "tree": "de1248abbc2a45e9798fceb2e9df57bf7440c6d9", "parents": [ "886486b792e4f6f96d4fbe8ec5bf20811cab7d6a" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Fri Nov 04 00:52:46 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Nov 04 22:28:14 2011 +0100" }, "message": "USB: Update last_busy time after autosuspend fails\n\nOriginally, the runtime PM core would send an idle notification\nwhenever a suspend attempt failed. The idle callback routine could\nthen schedule a delayed suspend for some time later.\n\nHowever this behavior was changed by commit\nf71648d73c1650b8b4aceb3856bebbde6daa3b86 (PM / Runtime: Remove idle\nnotification after failing suspend). No notifications were sent, and\nthere was no clear mechanism to retry failed suspends.\n\nThis caused problems for the usbhid driver, because it fails\nautosuspend attempts as long as a key is being held down. A companion\npatch changes the PM core\u0027s behavior, but we also need to change the\nUSB core. In particular, this patch (as1493) updates the device\u0027s\nlast_busy time when an autosuspend fails, so that the PM core will\nretry the autosuspend in the future when the delay time expires\nagain.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nTested-by: Henrik Rydberg \u003crydberg@euromail.se\u003e\nCc: \u003cstable@kernel.org\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "886486b792e4f6f96d4fbe8ec5bf20811cab7d6a", "tree": "1c638e14492c16f8f69ca71fa93b2d81d8e4eeb6", "parents": [ "6513fd6972f725291ee8ce62c7a39fb8a6c7391e" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Thu Nov 03 23:39:18 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Nov 04 22:28:14 2011 +0100" }, "message": "PM / Runtime: Automatically retry failed autosuspends\n\nOriginally, the runtime PM core would send an idle notification\nwhenever a suspend attempt failed. The idle callback routine could\nthen schedule a delayed suspend for some time later.\n\nHowever this behavior was changed by commit\nf71648d73c1650b8b4aceb3856bebbde6daa3b86 (PM / Runtime: Remove idle\nnotification after failing suspend). No notifications were sent, and\nthere was no clear mechanism to retry failed suspends.\n\nThis caused problems for the usbhid driver, because it fails\nautosuspend attempts as long as a key is being held down. Therefore\nthis patch (as1492) adds a mechanism for retrying failed\nautosuspends. If the callback routine updates the last_busy field so\nthat the next autosuspend expiration time is in the future, the\nautosuspend will automatically be rescheduled.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nTested-by: Henrik Rydberg \u003crydberg@euromail.se\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "def0c0a37d02820497fcd5a74b6cc93dbce5dc06", "tree": "4bfa6ef68b49887f3948abffbbd49d3175b16727", "parents": [ "e9db50b839c592fcd22952d7f1dccbd0a56da57d" ], "author": { "name": "venu byravarasu", "email": "vbyravarasu@nvidia.com", "time": "Thu Nov 03 10:12:14 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Nov 04 22:28:10 2011 +0100" }, "message": "PM / Runtime: Fix runtime accounting calculation error\n\nWith delta type being int, its value is made zero\nfor all values of now \u003e 0x80000000.\nHence fixing it.\n\nSigned-off-by: venu byravarasu \u003cvbyravarasu@nvidia.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "ddf6ce45a7b1193f3cf20ad234f35af3b998b8f8", "tree": "b5fd5fe26c59b75d4b588f279e827d887ccce7f6", "parents": [ "1583171492eb514e267c7b51e96846b38de0f544" ], "author": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Thu Nov 03 00:58:59 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Nov 04 22:28:09 2011 +0100" }, "message": "ACPI / PM: Add Sony VPCEB17FX to nonvs blacklist\n\nAnother entry for the nonvs blacklist, as noted by a user in\nhttps://bugzilla.redhat.com/show_bug.cgi?id\u003d641789#c12\n\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "39b02648d251dbfa27b576d55eeab4cc62228d86", "tree": "c442c1edb4242667d65340c20adee7da7afb66c2", "parents": [ "1583171492eb514e267c7b51e96846b38de0f544", "22097fd297c85ec6c2e700d506f231f7cae442e1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:14:34 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:14:34 2011 -0400" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "16dfd1faed8c5235d9a7c190b91b6d97d6cd3272", "tree": "4de59077fa4a31cac13e7ba8528e347c0ca1dc2f", "parents": [ "b31966816dcd3d8b16109f39d7c7501dc9abb010", "b8108d6886946cb50434bdbb0214ed81885da8b8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 12:14:11 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 12:14:11 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n IB/qib: Fix panic in RC error flushing logic\n IB/iser: DMA unmap TX bufs used for iSCSI/iSER headers\n IB/iser: Use separate buffers for the login request/response\n IB/mthca: Fix buddy-\u003enum_free allocation size\n" } ], "next": "22097fd297c85ec6c2e700d506f231f7cae442e1" }