)]}' { "log": [ { "commit": "3621189064301a5fbb5d06ca17d966a026f4e501", "tree": "6a53dfd095471cb4c776261de4f33d664c5a7254", "parents": [ "398710379f516012c52d2ae396a9ba919bd6a7ab" ], "author": { "name": "Benoît Thébaudeau", "email": "benoit.thebaudeau@advansee.com", "time": "Wed Jun 13 18:15:34 2012 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Jun 27 14:42:00 2012 +0800" }, "message": "hwrng: mxc-rnga - fix data_present API\n\nCommit 45001e9, which added support for RNGA, ignored the previous commit\n984e976, which changed the data_present API.\n\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Sascha Hauer \u003ckernel@pengutronix.de\u003e\nCc: Alan Carvalho de Assis \u003cacassis@gmail.com\u003e\nCc: \u003clinux-arm-kernel@lists.infradead.org\u003e\nSigned-off-by: Benoît Thébaudeau \u003cbenoit.thebaudeau@advansee.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "4e3c8a1b1c63482403e9d5e3148dee1a711e4b91", "tree": "513410a63a617436c94373fa5cf6273c3a85c47c", "parents": [ "b0a4c6f2e3fce088eb597d4b9ee2075cb6399ee1", "7c8d51848a88aafdb68f42b6b650c83485ea2f84" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 11 16:31:52 2012 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 11 16:31:52 2012 +0300" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\nPull crypto fixes from Herbert Xu:\n \"This push fixes an unaligned fault on x86-32 with aesni-intel and an\n RNG failure with atmel-rng (repeated bits).\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n crypto: aesni-intel - fix unaligned cbc decrypt for x86-32\n hwrng: atmel-rng - fix race condition leading to repeated bits\n" }, { "commit": "67384fe3fd450536342330f684ea1f7dcaef8130", "tree": "98dc7f8e8c8e2905aa15a8bd8708471a2a4d1849", "parents": [ "cb05d8dedefa3066bf5d74ef88c6ca6cf4bd1c87" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Wed Jun 06 11:59:06 2012 -0300" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Jun 06 17:05:29 2012 +0200" }, "message": "char/agp: add another Ironlake host bridge\n\nThis seems to come on Gigabyte H55M-S2V and was discovered through the\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d50381 debugging.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d50381\nSigned-off-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "121daad8fd1dce63076fa55aaedd5dc3f981b334", "tree": "b8dffca034cb3763706ac7bf4aeac94a29661749", "parents": [ "ef45b834319f8a18f257a40ba4bce6b829ef1708" ], "author": { "name": "Peter Korsgaard", "email": "jacmet@sunsite.dk", "time": "Thu May 31 20:53:08 2012 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu May 31 20:53:08 2012 +1000" }, "message": "hwrng: atmel-rng - fix race condition leading to repeated bits\n\nData valid gets cleared by reading the ISR (status register) and NOT from\nreading ODATA (data register). A new data word can become available between\nchecking ISR and reading ODATA, causing us to reuse the same data word next\ntime atmel_trng_read() gets called, if that happens before the following\ndata word is ready.\n\nWith this fixed, rngtest no longer complains of \u0027Continous run\u0027 errors.\nBefore:\n\nrngtest -c 1000 \u003c /dev/hwrng\nrngtest 3\nCopyright (c) 2004 by Henrique de Moraes Holschuh\nThis is free software; see the source for copying conditions. There is NO warr.\n\nrngtest: starting FIPS tests...\nrngtest: bits received from input: 20000032\nrngtest: FIPS 140-2 successes: 923\nrngtest: FIPS 140-2 failures: 77\nrngtest: FIPS 140-2(2001-10-10) Monobit: 0\nrngtest: FIPS 140-2(2001-10-10) Poker: 0\nrngtest: FIPS 140-2(2001-10-10) Runs: 1\nrngtest: FIPS 140-2(2001-10-10) Long run: 0\nrngtest: FIPS 140-2(2001-10-10) Continuous run: 76\nrngtest: input channel speed: (min\u003d721.402; avg\u003d46003.510; max\u003d49321.338)Kibitss\nrngtest: FIPS tests speed: (min\u003d11.442; avg\u003d12.714; max\u003d12.801)Mibits/s\nrngtest: Program run time: 1931860 microseconds\n\nAfter:\n\nrngtest -c 1000 \u003c /dev/hwrng\nrngtest 3\nCopyright (c) 2004 by Henrique de Moraes Holschuh\nThis is free software; see the source for copying conditions. There is NO warr.\n\nrngtest: starting FIPS tests...\nrngtest: bits received from input: 20000032\nrngtest: FIPS 140-2 successes: 1000\nrngtest: FIPS 140-2 failures: 0\nrngtest: FIPS 140-2(2001-10-10) Monobit: 0\nrngtest: FIPS 140-2(2001-10-10) Poker: 0\nrngtest: FIPS 140-2(2001-10-10) Runs: 0\nrngtest: FIPS 140-2(2001-10-10) Long run: 0\nrngtest: FIPS 140-2(2001-10-10) Continuous run: 0\nrngtest: input channel speed: (min\u003d777.518; avg\u003d36988.482; max\u003d43115.342)Kibitss\nrngtest: FIPS tests speed: (min\u003d11.951; avg\u003d12.715; max\u003d12.887)Mibits/s\nrngtest: Program run time: 2035543 microseconds\n\nCc: stable@vger.kernel.org\nSigned-off-by: Peter Korsgaard \u003cjacmet@sunsite.dk\u003e\nReported-by: George Pontis \u003cGPontis@z9.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "f2fde3a65e88330017b816faf2ef75f141d21375", "tree": "57152ab5756e7ed1c58742e7e16f13a45ff11f21", "parents": [ "28f3d717618156c0dcd2f497d791b578a7931d87", "8c914028f5ddaa417b7d0f4b7fdc24caceaa8043" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 12:42:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 12:42:54 2012 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull main drm updates from Dave Airlie:\n \"This is the main merge window request for the drm.\n\n It\u0027s big, but jam packed will lots of features and of course 0\n regressions. (okay maybe there\u0027ll be one).\n\n Highlights:\n\n - new KMS drivers for server GPU chipsets: ast, mgag200 and cirrus\n (qemu only). These drivers use the generic modesetting drivers.\n\n - initial prime/dma-buf support for i915, nouveau, radeon, udl and\n exynos\n\n - switcheroo audio support: so GPUs with HDMI can turn off the sound\n driver without crashing stuff.\n\n - There are some patches drifting outside drivers/gpu into x86 and\n EFI for better handling of multiple video adapters in Apple Macs,\n they\u0027ve got correct acks except one trivial fixup.\n\n - Core:\n\tedid parser has better DMT and reduced blanking support,\n\tcrtc properties,\n\tplane properties,\n\n - Drivers:\n\texynos: add 2D core accel support, prime support, hdmi features\n\tintel: more Haswell support, initial Valleyview support, more\n\t hdmi infoframe fixes, update MAINTAINERS for Daniel, lots of\n\t cleanups and fixes\n\tradeon: more HDMI audio support, improved GPU lockup recovery\n\t support, remove nested mutexes, less memory copying on PCIE, fix\n\t bus master enable race (kexec), improved fence handling\n\tgma500: cleanups, 1080p support, acpi fixes\n\tnouveau: better nva3 memory reclocking, kepler accel (needs\n\t external firmware rip), async buffer moves on nv84+ hw.\n\n I\u0027ve some more dma-buf patches that rely on the dma-buf merge for vmap\n stuff, and I\u0027ve a few fixes building up, but I\u0027d decided I\u0027d better\n get rid of the main pull sooner rather than later, so the audio guys\n are also unblocked.\"\n\nFix up trivial conflict due to some duplicated changes in\ndrivers/gpu/drm/i915/intel_ringbuffer.c\n\n* \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux: (605 commits)\n drm/nouveau/nvd9: Fix GPIO initialisation sequence.\n drm/nouveau: Unregister switcheroo client on exit\n drm/nouveau: Check dsm on switcheroo unregister\n drm/nouveau: fix a minor annoyance in an output string\n drm/nouveau: turn a BUG into a WARN\n drm/nv50: decode PGRAPH DATA_ERROR \u003d 0x24\n drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks\n drm/nvd9/copy: initialise copy engine, seems to work like nvc0\n drm/nvc0/ttm: use copy engines for async buffer moves\n drm/nva3/ttm: use copy engine for async buffer moves\n drm/nv98/ttm: add in a (disabled) crypto engine buffer copy method\n drm/nv84/ttm: use crypto engine for async buffer copies\n drm/nouveau/ttm: untangle code to support accelerated buffer moves\n drm/nouveau/fbcon: use fence for sync, rather than notifier\n drm/nv98/crypt: non-stub implementation of the engine hooks\n drm/nouveau/fifo: turn all fifo modules into engine modules\n drm/nv50/graph: remove ability to do interrupt-driven context switching\n drm/nv50: remove manual context unload on context destruction\n drm/nv50: remove execution engine context saves on suspend\n drm/nv50/fifo: use hardware channel kickoff functionality\n ...\n" }, { "commit": "0bd3fbd4abeafa19ae0302d25194468b022d1a56", "tree": "1fc34b25666c97b85dfb7199e48b2e074ffde264", "parents": [ "0b87da68a0f0a7bf7f7446cf64f92e672bd68ef8", "ef45b834319f8a18f257a40ba4bce6b829ef1708" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 15:59:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 15:59:10 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\nPull crypto updates from Herbert Xu:\n - New cipher/hash driver for ARM ux500.\n - Code clean-up for aesni-intel.\n - Misc fixes.\n\nFixed up conflicts in arch/arm/mach-ux500/devices-common.h, where quite\nfrankly some of it made no sense at all (the pull brought in a\ndeclaration for the dbx500_add_platform_device_noirq() function, which\nneither exists nor is used anywhere).\n\nAlso some trivial add-add context conflicts in the Kconfig file in\ndrivers/{char/hw_random,crypto}/\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n crypto: aesni-intel - move more common code to ablk_init_common\n crypto: aesni-intel - use crypto_[un]register_algs\n crypto: ux500 - Cleanup hardware identification\n crypto: ux500 - Update DMA handling for 3.4\n mach-ux500: crypto - core support for CRYP/HASH module.\n crypto: ux500 - Add driver for HASH hardware\n crypto: ux500 - Add driver for CRYP hardware\n hwrng: Kconfig - modify default state for atmel-rng driver\n hwrng: omap - use devm_request_and_ioremap\n crypto: crypto4xx - move up err_request_irq label\n crypto, xor: Sanitize checksumming function selection output\n crypto: caam - add backward compatible string sec4.0\n" }, { "commit": "6f73b3629f774c6cba589b15fd095112b25ca923", "tree": "50a60feae71cb5f40078f552b9b08468bc7b29c9", "parents": [ "3a8580f82024e30b31c662aa49346adf7a3bcdb5", "2074b1d9d53ae696dd3f49482bad43254f40f01d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 09:02:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 09:02:42 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc updates from Benjamin Herrenschmidt:\n \"Here are the powerpc goodies for 3.5. Main highlights are:\n\n - Support for the NX crypto engine in Power7+\n - A bunch of Anton goodness, including some micro optimization of our\n syscall entry on Power7\n - I converted a pile of our thermal control drivers to the new i2c\n APIs (essentially turning the old therm_pm72 into a proper set of\n windfarm drivers). That\u0027s one more step toward removing the\n deprecated i2c APIs, there\u0027s still a few drivers to fix, but we are\n getting close\n - kexec/kdump support for 47x embedded cores\n\n The big missing thing here is no updates from Freescale. Not sure\n what\u0027s up here, but with Kumar not working for them anymore things are\n a bit in a state of flux in that area.\"\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (71 commits)\n powerpc: Fix irq distribution\n Revert \"powerpc/hw-breakpoint: Use generic hw-breakpoint interfaces for new PPC ptrace flags\"\n powerpc: Fixing a cputhread code documentation\n powerpc/crypto: Enable the PFO-based encryption device\n powerpc/crypto: Build files for the nx device driver\n powerpc/crypto: debugfs routines and docs for the nx device driver\n powerpc/crypto: SHA512 hash routines for nx encryption\n powerpc/crypto: SHA256 hash routines for nx encryption\n powerpc/crypto: AES-XCBC mode routines for nx encryption\n powerpc/crypto: AES-GCM mode routines for nx encryption\n powerpc/crypto: AES-ECB mode routines for nx encryption\n powerpc/crypto: AES-CTR mode routines for nx encryption\n powerpc/crypto: AES-CCM mode routines for nx encryption\n powerpc/crypto: AES-CBC mode routines for nx encryption\n powerpc/crypto: nx driver code supporting nx encryption\n powerpc/pseries: Enable the PFO-based RNG accelerator\n powerpc/pseries/hwrng: PFO-based hwrng driver\n powerpc/pseries: Add PFO support to the VIO bus\n powerpc/pseries: Add pseries update notifier for OFDT prop changes\n powerpc/pseries: Add new hvcall constants to support PFO\n ...\n" }, { "commit": "fb09bafda67041b74a668dc9d77735e36bd33d3b", "tree": "2dd32b65062a95045468fdcab366ecdb8e4fcac6", "parents": [ "94b5aff4c6f72fee6b0f49d49e4fa8b204e8ded9", "c3c6cc91b0ae7b3d598488ad0b593bafba4a0817" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:34:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:34:21 2012 -0700" }, "message": "Merge tag \u0027staging-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\nPull staging tree changes from Greg Kroah-Hartman:\n \"Here is the big staging tree pull request for the 3.5-rc1 merge\n window.\n\n Loads of changes here, and we just narrowly added more lines than we\n added:\n 622 files changed, 28356 insertions(+), 26059 deletions(-)\n\n But, good news is that there is a number of subsystems that moved out\n of the staging tree, to their respective \"real\" portions of the\n kernel.\n\n Code that moved out was:\n\t- iio core code\n\t- mei driver\n\t- vme core and bridge drivers\n\n There was one broken network driver that moved into staging as a step\n before it is removed from the tree (pc300), and there was a few new\n drivers added to the tree:\n\t- new iio drivers\n\t- gdm72xx wimax USB driver\n\t- ipack subsystem and 2 drivers\n\n All of the movements around have acks from the various subsystem\n maintainers, and all of this has been in the linux-next tree for a\n while.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\nFixed up various trivial conflicts, along with a non-trivial one found\nin -next and pointed out by Olof Johanssen: a clean - but incorrect -\nmerge of the arch/arm/boot/dts/at91sam9g20.dtsi file. Fix up manually\nas per Stephen Rothwell.\n\n* tag \u0027staging-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits)\n Staging: bcm: Remove two unused variables from Adapter.h\n Staging: bcm: Removes the volatile type definition from Adapter.h\n Staging: bcm: Rename all \"INT\" to \"int\" in Adapter.h\n Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h\n Staging: bcm: Correctly format all comments in Adapter.h\n Staging: bcm: Fix all whitespace issues in Adapter.h\n Staging: bcm: Properly format braces in Adapter.h\n Staging: ipack/bridges/tpci200: remove unneeded casts\n Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant\n Staging: ipack: remove board_name and bus_name fields from struct ipack_device\n Staging: ipack: improve the register of a bus and a device in the bus.\n staging: comedi: cleanup all the comedi_driver \u0027detach\u0027 functions\n staging: comedi: remove all \u0027default N\u0027 in Kconfig\n staging: line6/config.h: Delete unused header\n staging: gdm72xx depends on NET\n staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices\n staging: drm/omap: initial dmabuf/prime import support\n staging: drm/omap: dmabuf/prime mmap support\n pstore/ram: Add ECC support\n pstore/ram: Switch to persistent_ram routines\n ...\n" }, { "commit": "5d4e2d08e7fdf7339f84a1c670d296a77e02f881", "tree": "1c419660defa56191091dfdf50fdb57a72009173", "parents": [ "fb2123fad3b499f0898835b19dbb93b18d27ee98", "94ca629e40eb7e997be21d8065c25e4f3797b03f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:02:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:02:13 2012 -0700" }, "message": "Merge tag \u0027driver-core-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\nPull driver core updates from Greg Kroah-Hartman:\n \"Here\u0027s the driver core, and other driver subsystems, pull request for\n the 3.5-rc1 merge window.\n\n Outside of a few minor driver core changes, we ended up with the\n following different subsystem and core changes as well, due to\n interdependancies on the driver core:\n - hyperv driver updates\n - drivers/memory being created and some drivers moved into it\n - extcon driver subsystem created out of the old Android staging\n switch driver code\n - dynamic debug updates\n - printk rework, and /dev/kmsg changes\n\n All of this has been tested in the linux-next releases for a few weeks\n with no reported problems.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\nFix up conflicts in drivers/extcon/extcon-max8997.c where git noticed\nthat a patch to the deleted drivers/misc/max8997-muic.c driver needs to\nbe applied to this one.\n\n* tag \u0027driver-core-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (90 commits)\n uio_pdrv_genirq: get irq through platform resource if not set otherwise\n memory: tegra{20,30}-mc: Remove empty *_remove()\n printk() - isolate KERN_CONT users from ordinary complete lines\n sysfs: get rid of some lockdep false positives\n Drivers: hv: util: Properly handle version negotiations.\n Drivers: hv: Get rid of an unnecessary check in vmbus_prep_negotiate_resp()\n memory: tegra{20,30}-mc: Use dev_err_ratelimited()\n driver core: Add dev_*_ratelimited() family\n Driver Core: don\u0027t oops with unregistered driver in driver_find_device()\n printk() - restore prefix/timestamp printing for multi-newline strings\n printk: add stub for prepend_timestamp()\n ARM: tegra30: Make MC optional in Kconfig\n ARM: tegra20: Make MC optional in Kconfig\n ARM: tegra30: MC: Remove unnecessary BUG*()\n ARM: tegra20: MC: Remove unnecessary BUG*()\n printk: correctly align __log_buf\n ARM: tegra30: Add Tegra Memory Controller(MC) driver\n ARM: tegra20: Add Tegra Memory Controller(MC) driver\n printk() - restore timestamp printing at console output\n printk() - do not merge continuation lines of different threads\n ...\n" }, { "commit": "fb2123fad3b499f0898835b19dbb93b18d27ee98", "tree": "7273754cded304f52dbbef86d23dda96e0a8452a", "parents": [ "a481991467d38afb43c3921d5b5b59ccb61b04ba", "991214386dee8a3cd9adc743778f472ac8a12bbc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 15:53:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 15:53:59 2012 -0700" }, "message": "Merge tag \u0027char-misc-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc\n\nPull Char/Misc patches from Greg Kroah-Hartman:\n \"Here are a few various char/misc tree patches for the 3.5-rc1 merge\n window.\n\n Nothing major here at all, just different driver updates and some\n parport dead code removal.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027char-misc-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:\n parport: remove unused dead code from lowlevel drivers\n xilinx_hwicap: reset XHI_MAX_RETRIES\n xilinx_hwicap: add support for virtex6 FPGAs\n Support M95040 SPI EEPROM\n misc: add support for bmp18x chips to the bmp085 driver\n misc: bmp085: add device tree properties\n misc: clean up bmp085 driver\n misc: do not mark exported functions __devexit\n misc: add missing __devexit_p() annotations\n pch_phub: delete duplicate definitions\n misc: Fix irq leak in max8997_muic_probe error path\n" }, { "commit": "9bc747bea5fad819e0c0ad96e6a67ea0640dfe2b", "tree": "d500225e7a1c90a6bd17d3e63e2f6e781810db2b", "parents": [ "32b908eea9e5ecd1049008e134eadbfcd0da5e38", "0e896b1ddc1905df904df98c204bacf028219729" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:23:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:23:24 2012 -0700" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull first batch of arm-soc cleanups from Olof Johansson:\n \"These cleanups are basically all over the place. The idea is to\n collect changes with minimal impact but large number of changes so we\n can avoid them from distracting in the diffstat in the other series.\n\n A significant number of lines get removed here, in particular because\n the ixp2000 and ixp23xx platforms get removed. These have never been\n extremely popular and have fallen into disuse over time with no active\n maintainer taking care of them. The u5500 soc never made it into a\n product, so we are removing it from the ux500 platform.\n\n Many good cleanups also went into the at91 and omap platforms, as has\n been the case for a number of releases.\"\n\nTrivial modify-delete conflicts in arch/arm/mach-{ixp2000,ixp23xx}\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (152 commits)\n ARM: clps711x: Cleanup IRQ handling\n ARM clps711x: Removed unused header mach/time.h\n ARM: clps711x: Added note about support EP731x CPU to Kconfig\n ARM: clps711x: Added missing register definitions\n ARM: clps711x: Used own subarch directory for store header file\n Dove: Fix Section mismatch warnings\n ARM: orion5x: ts78xx debugging changes\n ARM: orion5x: remove PM dependency from ts78xx\n ARM: orion5x: ts78xx fix NAND resource off by one\n ARM: orion5x: ts78xx whitespace cleanups\n Orion5x: Fix Section mismatch warnings\n Orion5x: Fix warning: struct pci_dev declared inside paramter list\n ARM: clps711x: Combine header files into one for clps711x-targets\n ARM: S3C24XX: Use common macro to define resources on mach-qt2410.c\n ARM: S3C24XX: Use common macro to define resources on mach-osiris.c\n ARM: EXYNOS: Adapt to cpuidle core time keeping and irq enable\n ARM: S5PV210: Use common macro to define resources on mach-smdkv210.c\n ARM: S5PV210: Use common macro to define resources on dev-audio.c\n ARM: S5PC100: Use common macro to define resources on dev-audio.c\n ARM: S5P64X0: Use common macro to define resources on dev-audio.c\n ...\n" }, { "commit": "c14f52860e9e8a6e6db65b7d10dfea7c8f82aa1e", "tree": "f1aa07ef70a174901ae76a51f1ee1b4e514faef0", "parents": [ "72662e103c7dd305725dcf4aabcbd8f69483dfbc" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Wed May 09 15:37:32 2012 -0300" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat May 19 22:39:52 2012 +0200" }, "message": "drm/i915: hook Haswell devices in place\n\nThis patch enables i915 driver to handle Haswell devices. It should go in\nlast, when things are working stable enough.\n\nSigned-off-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "fa8b66ccd2d200b64496cfedcce90bf54fe7d6e9", "tree": "11a35ac8a4739bae2225676abeab175ec8c1d160", "parents": [ "0e93b4b304ae052ba1bc73f6d34a68556fe93429" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Apr 25 14:40:39 2012 +0530" }, "committer": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu May 17 12:14:33 2012 +0300" }, "message": "virtio: console: tell host of open ports after resume from s3/s4\n\nIf a port was open before going into one of the sleep states, the port\ncan continue normal operation after restore. However, the host has to\nbe told that the guest side of the connection is open to restore\npre-suspend state.\n\nThis wasn\u0027t noticed so far due to a bug in qemu that was fixed recently\n(which marked the guest-side connection as always open).\n\nCC: stable@vger.kernel.org # Only for 3.3\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\n" }, { "commit": "1894a253db97059bc299b834b76f665bc6586b1d", "tree": "791ad2d33cc1d28c32fa340b0a8f0c2a645c4b26", "parents": [ "d109a674a3685d43f16da5cc4cb8b927d07c436d" ], "author": { "name": "Anton Vorontsov", "email": "anton.vorontsov@linaro.org", "time": "Wed May 16 05:43:08 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 16 08:06:37 2012 -0700" }, "message": "ramoops: Move to fs/pstore/ram.c\n\nSince ramoops was converted to pstore, it has nothing to do with character\ndevices nowadays. Instead, today it is just a RAM backend for pstore.\n\nThe patch just moves things around. There are a few changes were needed\nbecause of the move:\n\n1. Kconfig and Makefiles fixups, of course.\n\n2. In pstore/ram.c we have to play a bit with MODULE_PARAM_PREFIX, this\n is needed to keep user experience the same as with ramoops driver\n (i.e. so that ramoops.foo kernel command line arguments would still\n work).\n\nSigned-off-by: Anton Vorontsov \u003canton.vorontsov@linaro.org\u003e\nAcked-by: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nAcked-by: Kees Cook \u003ckeescook@chromium.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "d109a674a3685d43f16da5cc4cb8b927d07c436d", "tree": "b7c5dc86e7e63d8a928dc22c412a80546828b13b", "parents": [ "9ba80d99c86f1b76df891afdf39b44df38bbd35b" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Thu May 03 15:45:03 2012 +1000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 16 08:06:34 2012 -0700" }, "message": "ramoops: fix printk format warnings\n\nFix printk format warnings for phys_addr_t type variables:\n\ndrivers/char/ramoops.c:246:3: warning: format \u0027%llx\u0027 expects type \u0027long long unsigned int\u0027, but argument 3 has type \u0027phys_addr_t\u0027\ndrivers/char/ramoops.c:273:2: warning: format \u0027%llx\u0027 expects type \u0027long long unsigned int\u0027, but argument 3 has type \u0027phys_addr_t\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Kees Cook \u003ckeescook@chromium.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "9ba80d99c86f1b76df891afdf39b44df38bbd35b", "tree": "f011fd0ac2adb5cf2a36b15cce0d0b135acaaf09", "parents": [ "7dd8e9be9dba1dc5f0dfec67e37076b9c56a97d7" ], "author": { "name": "Kees Cook", "email": "keescook@chromium.org", "time": "Thu May 03 15:45:02 2012 +1000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 16 08:06:33 2012 -0700" }, "message": "ramoops: use pstore interface\n\nInstead of using /dev/mem directly and forcing userspace to know (or\nextract) where the platform has defined persistent memory, how many slots\nit has, the sizes, etc, use the common pstore infrastructure to handle\nOops gathering and extraction. This presents a much easier to use\nfilesystem-based view to the memory region. This also means that any\nother tools that are written to understand pstore will automatically be\nable to process ramoops too.\n\nSigned-off-by: Kees Cook \u003ckeescook@chromium.org\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5", "tree": "518ec8f4bfd316e91bcc30f434edb78529557eba", "parents": [ "8a63b1994c500d4825ee73dc71502deffe5b135b", "4bb2d1009f671815870e8f78e826e4f9071392a7" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue May 15 17:21:26 2012 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue May 15 17:21:26 2012 +1000" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux\n\nMerge mainline to add prerequisite for ARM ux500 crypto support.\n" }, { "commit": "649e9ea0ab611ab54d4ff606475812d52b6e34fc", "tree": "ef03ce11a1460ef9075dfd904e2c90f2c530682e", "parents": [ "f2ab6219969fcb79dca6792a484b0bdc95ab1f81" ], "author": { "name": "Kent Yoder", "email": "key@linux.vnet.ibm.com", "time": "Thu Apr 12 05:08:53 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon May 14 10:49:12 2012 +1000" }, "message": "powerpc/pseries/hwrng: PFO-based hwrng driver\n\nAdds support for the Platform Facilities Option (PFO)-based hardware\nrandom number generator for POWER hardware.\n\nSigned-off-by: Michael Neuling \u003cmikey@neuling.org\u003e\nSigned-off-by: Robert Jennings \u003crcj@linux.vnet.ibm.com\u003e\nSigned-off-by: Kent Yoder \u003ckey@linux.vnet.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "7f3a781d6fd81e397c3928c9af33f1fc63232db6", "tree": "326e060d609a4c7e2775b2af7e82bfa2215a35a9", "parents": [ "6a7e2618b3dbfbf1e8ab2b4be102b2944738fb68" ], "author": { "name": "Kay Sievers", "email": "kay@vrfy.org", "time": "Wed May 09 01:37:51 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 09 15:51:09 2012 -0700" }, "message": "printk - fix compilation for CONFIG_PRINTK\u003dn\n\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Kay Sievers \u003ckay@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "e11fea92e13fb91c50bacca799a6131c81929986", "tree": "3b9204f4eccc6b488b843d6d00e65dc982c50160", "parents": [ "7ff9554bb578ba02166071d2d487b7fc7d860d62" ], "author": { "name": "Kay Sievers", "email": "kay@vrfy.org", "time": "Thu May 03 02:29:41 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon May 07 17:03:27 2012 -0700" }, "message": "kmsg: export printk records to the /dev/kmsg interface\n\nSupport for multiple concurrent readers of /dev/kmsg, with read(),\nseek(), poll() support. Output of message sequence numbers, to allow\nuserspace log consumers to reliably reconnect and reconstruct their\nstate at any given time. After open(\"/dev/kmsg\"), read() always\nreturns *all* buffered records. If only future messages should be\nread, SEEK_END can be used. In case records get overwritten while\n/dev/kmsg is held open, or records get faster overwritten than they\nare read, the next read() will return -EPIPE and the current reading\nposition gets updated to the next available record. The passed\nsequence numbers allow the log consumer to calculate the amount of\nlost messages.\n\n [root@mop ~]# cat /dev/kmsg\n 5,0,0;Linux version 3.4.0-rc1+ (kay@mop) (gcc version 4.7.0 20120315 ...\n 6,159,423091;ACPI: PCI Root Bridge [PCI0] (domain 0000 [bus 00-ff])\n 7,160,424069;pci_root PNP0A03:00: host bridge window [io 0x0000-0x0cf7] (ignored)\n SUBSYSTEM\u003dacpi\n DEVICE\u003d+acpi:PNP0A03:00\n 6,339,5140900;NET: Registered protocol family 10\n 30,340,5690716;udevd[80]: starting version 181\n 6,341,6081421;FDC 0 is a S82078B\n 6,345,6154686;microcode: CPU0 sig\u003d0x623, pf\u003d0x0, revision\u003d0x0\n 7,346,6156968;sr 1:0:0:0: Attached scsi CD-ROM sr0\n SUBSYSTEM\u003dscsi\n DEVICE\u003d+scsi:1:0:0:0\n 6,347,6289375;microcode: CPU1 sig\u003d0x623, pf\u003d0x0, revision\u003d0x0\n\nCc: Karel Zak \u003ckzak@redhat.com\u003e\nTested-by: William Douglas \u003cwilliam.douglas@intel.com\u003e\nSigned-off-by: Kay Sievers \u003ckay@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "7ff9554bb578ba02166071d2d487b7fc7d860d62", "tree": "fcd01f3dadfb451af453300663c60054d3e702cf", "parents": [ "89528127fa5f4aca0483203c87c945555d057770" ], "author": { "name": "Kay Sievers", "email": "kay@vrfy.org", "time": "Thu May 03 02:29:13 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon May 07 16:53:02 2012 -0700" }, "message": "printk: convert byte-buffer to variable-length record buffer\n\n- Record-based stream instead of the traditional byte stream\n buffer. All records carry a 64 bit timestamp, the syslog facility\n and priority in the record header.\n\n- Records consume almost the same amount, sometimes less memory than\n the traditional byte stream buffer (if printk_time is enabled). The record\n header is 16 bytes long, plus some padding bytes at the end if needed.\n The byte-stream buffer needed 3 chars for the syslog prefix, 15 char for\n the timestamp and a newline.\n\n- Buffer management is based on message sequence numbers. When records\n need to be discarded, the reading heads move on to the next full\n record. Unlike the byte-stream buffer, no old logged lines get\n truncated or partly overwritten by new ones. Sequence numbers also\n allow consumers of the log stream to get notified if any message in\n the stream they are about to read gets discarded during the time\n of reading.\n\n- Better buffered IO support for KERN_CONT continuation lines, when printk()\n is called multiple times for a single line. The use of KERN_CONT is now\n mandatory to use continuation; a few places in the kernel need trivial fixes\n here. The buffering could possibly be extended to per-cpu variables to allow\n better thread-safety for multiple printk() invocations for a single line.\n\n- Full-featured syslog facility value support. Different facilities\n can tag their messages. All userspace-injected messages enforce a\n facility value \u003e 0 now, to be able to reliably distinguish them from\n the kernel-generated messages. Independent subsystems like a\n baseband processor running its own firmware, or a kernel-related\n userspace process can use their own unique facility values. Multiple\n independent log streams can co-exist that way in the same\n buffer. All share the same global sequence number counter to ensure\n proper ordering (and interleaving) and to allow the consumers of the\n log to reliably correlate the events from different facilities.\n\nTested-by: William Douglas \u003cwilliam.douglas@intel.com\u003e\nSigned-off-by: Kay Sievers \u003ckay@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "5bc69bf9aeb73547cad8e1ce683a103fe9728282", "tree": "d3ef275532fc4391cb645f8b4d45d39d7fbb73f4", "parents": [ "c6543a6e64ad8e456674a1c4a01dd024e38b665f", "a85d4bcb8a0cd5b3c754f98ff91ef2b9b3a73bc5" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 02 09:21:50 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 02 09:22:29 2012 +0100" }, "message": "Merge tag \u0027drm-intel-next-2012-04-23\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next\n\nDaniel Vetter writes:\n\nA new drm-intel-next pull. Highlights:\n- More gmbus patches from Daniel Kurtz, I think gmbus is now ready, all\n known issues fixed.\n- Fencing cleanup and pipelined fencing removal from Chris.\n- rc6 residency interface from Ben, useful for powertop.\n- Cleanups and code reorg around the ringbuffer code (Ben\u0026me).\n- Use hw semaphores in the pageflip code from Ben.\n- More vlv stuff from Jesse, unfortunately his vlv cpu is doa, so less\n merged than I\u0027ve hoped for - we still have the unused function warning :(\n- More hsw patches from Eugeni, again, not yet enabled fully.\n- intel_pm.c refactoring from Eugeni.\n- Ironlake sprite support from Chris.\n- And various smaller improvements/fixes all over the place.\n\nNote that this pull request also contains a backmerge of -rc3 to sort out\na few things in -next. I\u0027ve also had to frob the shortlog a bit to exclude\nanything that -rc3 brings in with this pull.\n\nRegression wise we have a few strange bugs going on, but for all of them\ncloser inspection revealed that they\u0027ve been pre-existing, just now\nslightly more likely to be hit. And for most of them we have a patch\nalready. Otherwise QA has not reported any regressions, and I\u0027m also not\naware of anything bad happening in 3.4.\n\n* tag \u0027drm-intel-next-2012-04-23\u0027 of git://people.freedesktop.org/~danvet/drm-intel: (420 commits)\n drm/i915: rc6 residency (fix the fix)\n drm/i915/tv: fix open-coded ARRAY_SIZE.\n drm/i915: invalidate render cache on gen2\n drm/i915: Silence the change of LVDS sync polarity\n drm/i915: add generic power management initialization\n drm/i915: move clock gating functionality into intel_pm module\n drm/i915: move emon functionality into intel_pm module\n drm/i915: move drps, rps and rc6-related functions to intel_pm\n drm/i915: fix line breaks in intel_pm\n drm/i915: move watermarks settings into intel_pm module\n drm/i915: move fbc-related functionality into intel_pm module\n drm/i915: Refactor get_fence() to use the common fence writing routine\n drm/i915: Refactor fence clearing to use the common fence writing routine\n drm/i915: Refactor put_fence() to use the common fence writing routine\n drm/i915: Prepare to consolidate fence writing\n drm/i915: Remove the unsightly \"optimisation\" from flush_fence()\n drm/i915: Simplify fence finding\n drm/i915: Discard the unused obj-\u003elast_fenced_ring\n drm/i915: Remove unused ring-\u003esetup_seqno\n drm/i915: Remove fence pipelining\n ...\n" }, { "commit": "028fdd87b79a45544a2b6902989f2cbbf73a3eac", "tree": "2d1d99458984eb225bc2d5e4f9237b90350e24eb", "parents": [ "945478a7276407b1d435be39cde6bdaff72a7afa" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Mon Apr 30 20:00:35 2012 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Apr 30 20:00:35 2012 +1000" }, "message": "hwrng: Kconfig - modify default state for atmel-rng driver\n\nIn order to prevent building the Atmel hw_random driver for each and every\nconfiguration, add a \"default\" Kconfig state in relation with\nCONFIG_ARCH_AT91.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nReviewed-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "945478a7276407b1d435be39cde6bdaff72a7afa", "tree": "6c9e83c8affcd649ec6d75bc06d31b9f79c2ca24", "parents": [ "bdd3f7fa77257a818746caf9fbe0ea0e7bb7dde4" ], "author": { "name": "Julia Lawall", "email": "Julia.Lawall@lip6.fr", "time": "Thu Apr 19 19:19:08 2012 +0200" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Apr 27 11:28:29 2012 +1000" }, "message": "hwrng: omap - use devm_request_and_ioremap\n\nUsing devm_request_and_ioremap is more concise.\n\nSigned-off-by: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "1790625feb3904f54c82e469a2e5997c3a01f4fa", "tree": "8efcc94dfb72e0d13e4e87043514a85808b4e046", "parents": [ "73eb94a094e54cb81c41c64e59eb5d6a05ecb045" ], "author": { "name": "Daniel Borkmann", "email": "danborkmann@iogearbox.net", "time": "Thu Apr 19 09:03:09 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Apr 19 19:09:18 2012 -0700" }, "message": "xilinx_hwicap: reset XHI_MAX_RETRIES\n\nReset the XHI_MAX_RETRIES value. This allows the hardware enough time to\nwrite configuration frames during partial reconfiguration. In case of 10\nthe driver returns an error, although it should just have polled the\nregister longer.\n\nTested on an ML605 board. The patch is against the latest linus-tree.\n\nSigned-off-by: Ariane Keller \u003cariane.keller@tik.ee.ethz.ch\u003e\nSigned-off-by: Daniel Borkmann \u003cdaniel.borkmann@tik.ee.ethz.ch\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "73eb94a094e54cb81c41c64e59eb5d6a05ecb045", "tree": "50424ae9af086c44b3d5b072b5875fdd1e1b2a29", "parents": [ "b4161f0bb5f815ca6d8108062b8e3b650c18fe39" ], "author": { "name": "Daniel Borkmann", "email": "danborkmann@iogearbox.net", "time": "Wed Apr 18 23:55:08 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Apr 19 19:09:18 2012 -0700" }, "message": "xilinx_hwicap: add support for virtex6 FPGAs\n\nThis patch adds support for the virtex6 FPGA to the xilinx_hwicap driver.\n\nTested on a Xilinx ML605 board. The patch is against the latest linus-tree.\n\nSigned-off-by: Ariane Keller \u003cariane.keller@tik.ee.ethz.ch\u003e\nSigned-off-by: Daniel Borkmann \u003cdaniel.borkmann@tik.ee.ethz.ch\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "767878908e7cc28c440c5431f6591157d8bd4ae7", "tree": "5780a93e07a5643e7ee33136f54b15dd7b9cab54", "parents": [ "17038de5f16569a25343cf68668f3b657eafb00e", "e816b57a337ea3b755de72bec38c10c864f23015" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 17 11:13:03 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 17 11:16:20 2012 +0200" }, "message": "Merge tag \u0027v3.4-rc3\u0027 into drm-intel-next-queued\n\nBackmerge Linux 3.4-rc3 into drm-intel-next to resolve a few things\nthat conflict/depend upon patches in -rc3:\n- Second part of the Sandybridge workaround series - it changes some\n of the same registers.\n- Preparation for Chris Wilson\u0027s fencing cleanup - we need the fix\n from -rc3 merged before we can move around all that code.\n- Resolve the gmbus conflict - gmbus has been disabled in 3.4 again,\n but should be enabled on all generations in 3.5.\n\nConflicts:\n\tdrivers/gpu/drm/i915/intel_i2c.c\n\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "1234f4bada54cfcd4dfeeebccf0295d49174da40", "tree": "97c16b5e1e9600a62b3fd12892d86cfc3a709644", "parents": [ "1fc4ec3791729db4e2602e9afb1045aef1bc3a58" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Thu Mar 15 16:10:59 2012 +0100" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Mon Apr 16 12:47:18 2012 +0200" }, "message": "hwrng: Kconfig: remove dependency for atmel-rng driver\n\nThis will allow to select this driver for newer SoCs. Make sure to\nkeep dependency on HAVE_CLK to avoid breaking other machines.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "f4f9c1ac78c5c20150f03c370c2bd7eca44f5127", "tree": "92719848d035ddf5233a297dabb587f95652a975", "parents": [ "3dbc35a339d7c8c756cb159b9ba076fac4e7faeb", "11bbd5b6dae49fd7072ebf5eb63735827bd72f42" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:36:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:36:33 2012 -0700" }, "message": "Merge tag \u0027tty-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull tty and serial fixes from Greg KH:\n \"Here are some tty and serial fixes for 3.4-rc2.\n\n Most important here is the pl011 fix, which has been reported by about\n 100 different people, which means more people use it than I expected\n :)\n\n There are also some 8250 driver reverts due to some problems reported\n by them. And other minor fixes as well.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027tty-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n pch_uart: Add Kontron COMe-mTT10 uart clock quirk\n pch_uart: Fix MSI setting issue\n serial/8250_pci: add a \"force background timer\" flag and use it for the \"kt\" serial port\n Revert \"serial/8250_pci: setup-quirk workaround for the kt serial controller\"\n Revert \"serial/8250_pci: init-quirk msi support for kt serial controller\"\n tty/serial/omap: console can only be built-in\n serial: samsung: fix omission initialize ulcon in reset port fn()\n printk(): add KERN_CONT where needed in hpet and vt code\n tty/serial: atmel_serial: fix RS485 half-duplex problem\n tty: serial: altera_uart: Check for NULL platform_data in probe.\n isdn/gigaset: use gig_dbg() for debugging output\n omap-serial: Fix the error handling in the omap_serial probe\n serial: PL011: move interrupt clearing\n" }, { "commit": "44e4360fa3384850d65dd36fb4e6e5f2f112709b", "tree": "bca5390346511ef308933b9968cdc43ec8569b7f", "parents": [ "d833049bd20570cbbadeb5228c579f9f3aaa4e03" ], "author": { "name": "Mathieu Desnoyers", "email": "mathieu.desnoyers@efficios.com", "time": "Thu Apr 12 12:49:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/char/random.c: fix boot id uniqueness race\n\n/proc/sys/kernel/random/boot_id can be read concurrently by userspace\nprocesses. If two (or more) user-space processes concurrently read\nboot_id when sysctl_bootid is not yet assigned, a race can occur making\nboot_id differ between the reads. Because the whole point of the boot id\nis to be unique across a kernel execution, fix this by protecting this\noperation with a spinlock.\n\nGiven that this operation is not frequently used, hitting the spinlock\non each call should not be an issue.\n\nSigned-off-by: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nCc: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Greg Kroah-Hartman \u003cgreg@kroah.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ae85226ebe474c9ecfc257191edca184b70ffbc2", "tree": "c368d5ed14e2d30058d3f30ec2c0c19cad7a6858", "parents": [ "971ca4717830c03a50e1ad9993c85601a0496de7" ], "author": { "name": "Santosh Nayak", "email": "santoshprasadnayak@gmail.com", "time": "Thu Apr 05 11:31:44 2012 +0530" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 17:56:21 2012 +0100" }, "message": "agp: Use u32 __iomem annotation to silence sparse warning.\n\nReplace \"void *\" by \"u32 __iomem *\" to silence sparse warning.\n\nSigned-off-by: Santosh Nayak \u003csantoshprasadnayak@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "971ca4717830c03a50e1ad9993c85601a0496de7", "tree": "92eca136e7624d96772029c648800516ad0c548b", "parents": [ "effbc4fd8e37e41d6f2bb6bcc611c14b4fbdcf9b" ], "author": { "name": "Santosh Nayak", "email": "santoshprasadnayak@gmail.com", "time": "Thu Apr 05 11:31:08 2012 +0530" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 17:56:17 2012 +0100" }, "message": "agp: Remove \u0027break\u0027 after \u0027return\u0027 statement.\n\n\u0027break\u0027 is unnecessary after \u0027return\u0027 statement.\nRemove all such \u0027break\u0027 as clean up.\n\nSigned-off-by: Santosh Nayak \u003csantoshprasadnayak@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "effbc4fd8e37e41d6f2bb6bcc611c14b4fbdcf9b", "tree": "8bc2a6a2116f1031b0033bf1a8f9fbe92201c5c1", "parents": [ "6a7068b4ef17dfb9de3191321f1adc91fa1659ca", "ec34a01de31128e5c08e5f05c47f4a787f45a33c" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 10:27:01 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 10:27:01 2012 +0100" }, "message": "Merge branch \u0027drm-intel-next\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next\n\nDaniel Vetter wrote\nFirst pull request for 3.5-next, slightly large than usual because new\nthings kept coming in since the last pull for 3.4.\nHighlights:\n- first batch of hw enablement for vlv (Jesse et al) and hsw (Eugeni). pci\n ids are not yet added, and there\u0027s still quite a few patches to merge\n (mostly modesetting). To make QA easier I\u0027ve decided to merge this stuff\n in pieces.\n- loads of cleanups and prep patches spurred by the above. Especially vlv\n is a real frankenstein chip, but also hsw is stretching our driver\u0027s\n code design. Expect more to come in this area for 3.5.\n- more gmbus fixes, cleanups and improvements by Daniel Kurtz. Again,\n there are more patches needed (and some already queued up), but I wanted\n to split this a bit for better testing.\n- pwrite/pread rework and retuning. This series has been in the works for\n a few months already and a lot of i-g-t tests have been created for it.\n Now it\u0027s finally ready to be merged. Note that one patch in this series\n touches include/pagemap.h, that patch is acked-by akpm.\n- reduce mappable pressure and relocation throughput improvements from\n Chris.\n- mmap offset exhaustion mitigation by Chris Wilson.\n- a start at figuring out which codepaths in our messy dri1/ums+gem/kms\n driver we actually need to support by bailing out of unsupported case.\n The driver now refuses to load without kms on gen6+ and disallows a few\n ioctls that userspace never used in certain cases. More of this will\n definitely come.\n- More decoupling of global gtt and ppgtt.\n- Improved dual-link lvds detection by Takashi Iwai.\n- Shut up the compiler + plus fix the fallout (Ben)\n- Inverted panel brightness handling (mostly Acer manages to break things\n in this way).\n- Small fixlets and adjustements and some minor things to help debugging.\n\nRegression-wise QA reported quite a few issues on ivb, but all of them\nturned out to be hw stability issues which are already fixed in\ndrm-intel-fixes (QA runs the nightly regression tests on -next alone,\nwithout -fixes automatically merged in). There\u0027s still one issue open on\nsnb, it looks like occlusion query writes are not quite as cache coherent\nas we\u0027ve expected. With some of the pwrite adjustements we can now\nreliably hit this. Kernel workaround for it is in the works.\"\n\n* \u0027drm-intel-next\u0027 of git://people.freedesktop.org/~danvet/drm-intel: (101 commits)\n drm/i915: VCS is not the last ring\n drm/i915: Add a dual link lvds quirk for MacBook Pro 8,2\n drm/i915: make quirks more verbose\n drm/i915: dump the DMA fetch addr register on pre-gen6\n drm/i915/sdvo: Include YRPB as an additional TV output type\n drm/i915: disallow gem init ioctl on ilk\n drm/i915: refuse to load on gen6+ without kms\n drm/i915: extract gt interrupt handler\n drm/i915: use render gen to switch ring irq functions\n drm/i915: rip out old HWSTAM missed irq WA for vlv\n drm/i915: open code gen6+ ring irqs\n drm/i915: ring irq cleanups\n drm/i915: add SFUSE_STRAP registers for digital port detection\n drm/i915: add WM_LINETIME registers\n drm/i915: add WRPLL clocks\n drm/i915: add LCPLL control registers\n drm/i915: add SSC offsets for SBI access\n drm/i915: add port clock selection support for HSW\n drm/i915: add S PLL control\n drm/i915: add PIXCLK_GATE register\n ...\n\nConflicts:\n\tdrivers/char/agp/intel-agp.h\n\tdrivers/char/agp/intel-gtt.c\n\tdrivers/gpu/drm/i915/i915_debugfs.c\n" }, { "commit": "5da527aafed2834852fc4fe21daeaeadf7c61af3", "tree": "0cc1fcc23b165964fe30cc0bd24d568c845f60b3", "parents": [ "57c3686842114de3b0c00633591e9605c46fb769" ], "author": { "name": "Kay Sievers", "email": "kay@vrfy.org", "time": "Tue Apr 03 03:18:23 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 10:30:39 2012 -0700" }, "message": "printk(): add KERN_CONT where needed in hpet and vt code\n\nA prototype for kmsg records instead of a byte-stream buffer revealed\na couple of missing printk(KERN_CONT ...) uses. Subsequent calls produce\none record per printk() call, while all should have ended up in a single\nrecord.\n\nInstead of:\n ACPI: (supports S0 S5)\n ACPI: PCI Interrupt Link [LNKA] (IRQs 5 *10 11)\n hpet0: at MMIO 0xfed00000, IRQs 2 , 8 , 0\n\nIt prints:\n ACPI: (supports S0\n S5\n )\n ACPI: PCI Interrupt Link [LNKA] (IRQs\n 5\n *10\n 11\n )\n hpet0: at MMIO 0xfed00000, IRQs\n 2\n , 8\n , 0\n\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Len Brown \u003clenb@kernel.org\u003e\nSigned-off-by: Kay Sievers \u003ckay@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "4cae9ae052fe630e63f28be6b0b115fbf52e63fb", "tree": "53ae8eee476b5e115bc15a324acd55d8cc84facf", "parents": [ "7e508a275b9425d612b845cac534e6b35a3f95e3" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Thu Mar 29 12:32:18 2012 -0300" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 09 18:03:58 2012 +0200" }, "message": "drm/i915: add Haswell devices and their PCI IDs\n\nThis adds product definitions for desktop, mobile and server boards.\n\nv2: split into a separate patch, add .has_pch_split feature.\n\nSigned-off-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "4157368edbc3d69b05e9294a73c84fc9c96bdec4", "tree": "60072b082dad509d270a9c53427cfedb1c997b3b", "parents": [ "9479f0f8018a0317b0b5e0c2b338bec6e26fdf2d", "00a62d4bc9b9a0388abee5c5ea946b9631b149d5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 06 17:56:20 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 06 17:56:20 2012 -0700" }, "message": "Merge branch \u0027stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\nPull arch/tile bug fixes from Chris Metcalf:\n \"This includes Paul Gortmaker\u0027s change to fix the \u003casm/system.h\u003e\n disintegration issues on tile, a fix to unbreak the tilepro ethernet\n driver, and a backlog of bugfix-only changes from internal Tilera\n development over the last few months.\n\n They have all been to LKML and on linux-next for the last few days.\n The EDAC change to MAINTAINERS is an oddity but discussion on the\n linux-edac list suggested I ask you to pull that change through my\n tree since they don\u0027t have a tree to pull edac changes from at the\n moment.\"\n\n* \u0027stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (39 commits)\n drivers/net/ethernet/tile: fix netdev_alloc_skb() bombing\n MAINTAINERS: update EDAC information\n tilepro ethernet driver: fix a few minor issues\n tile-srom.c driver: minor code cleanup\n edac: say \"TILEGx\" not \"TILEPro\" for the tilegx edac driver\n arch/tile: avoid accidentally unmasking NMI-type interrupt accidentally\n arch/tile: remove bogus performance optimization\n arch/tile: return SIGBUS for addresses that are unaligned AND invalid\n arch/tile: fix finv_buffer_remote() for tilegx\n arch/tile: use atomic exchange in arch_write_unlock()\n arch/tile: stop mentioning the \"kvm\" subdirectory\n arch/tile: export the page_home() function.\n arch/tile: fix pointer cast in cacheflush.c\n arch/tile: fix single-stepping over swint1 instructions on tilegx\n arch/tile: implement panic_smp_self_stop()\n arch/tile: add \"nop\" after \"nap\" to help GX idle power draw\n arch/tile: use proper memparse() for \"maxmem\" options\n arch/tile: fix up locking in pgtable.c slightly\n arch/tile: don\u0027t leak kernel memory when we unload modules\n arch/tile: fix bug in delay_backoff()\n ...\n" }, { "commit": "fb9d78aca709b7a6389c79d6211fb384c69bb79f", "tree": "c9895e2b9a2b8ab30b1fbd8b0764a60fdcf3f4ff", "parents": [ "5d32c88f0b94061b3af2e3ade92422407282eb12", "f283d22713b0bdc147097c92c9b45855339cf1c8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 17:34:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 17:34:30 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm\n\nPull an APM fix from Jiri Kosina:\n \"One deadlock/race fix from Niel that got introduced when we were\n moving away from freezer_*_count() to wait_event_freezable().\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:\n APM: fix deadlock in APM_IOC_SUSPEND ioctl\n" }, { "commit": "5d32c88f0b94061b3af2e3ade92422407282eb12", "tree": "2e1f81aa47b2cf59625c8fba17199617e33802e6", "parents": [ "43f63c8711ce02226b7bbdafeba7b8031faf3fb4", "dac23b0d0513916498d40412818bd2c581b365f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:30:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:30:34 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge batch of fixes from Andrew Morton:\n \"The simple_open() cleanup was held back while I wanted for laggards to\n merge things.\n\n I still need to send a few checkpoint/restore patches. I\u0027ve been\n wobbly about merging them because I\u0027m wobbly about the overall\n prospects for success of the project. But after speaking with Pavel\n at the LSF conference, it sounds like they\u0027re further toward\n completion than I feared - apparently davem is at the \"has stopped\n complaining\" stage regarding the net changes. So I need to go back\n and re-review those patchs and their (lengthy) discussion.\"\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (16 patches)\n memcg swap: use mem_cgroup_uncharge_swap fix\n backlight: add driver for DA9052/53 PMIC v1\n C6X: use set_current_blocked() and block_sigmask()\n MAINTAINERS: add entry for sparse checker\n MAINTAINERS: fix REMOTEPROC F: typo\n alpha: use set_current_blocked() and block_sigmask()\n simple_open: automatically convert to simple_open()\n scripts/coccinelle/api/simple_open.cocci: semantic patch for simple_open()\n libfs: add simple_open()\n hugetlbfs: remove unregister_filesystem() when initializing module\n drivers/rtc/rtc-88pm860x.c: fix rtc irq enable callback\n fs/xattr.c:setxattr(): improve handling of allocation failures\n fs/xattr.c:listxattr(): fall back to vmalloc() if kmalloc() failed\n fs/xattr.c: suppress page allocation failure warnings from sys_listxattr()\n sysrq: use SEND_SIG_FORCED instead of force_sig()\n proc: fix mount -t proc -o AAA\n" }, { "commit": "234e340582901211f40d8c732afc49f0630ecf05", "tree": "753076500dfd883b3db56d4f5410af31d8945623", "parents": [ "9b3ae64be658a573b33d05a8dc73b08d3345fa44" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Thu Apr 05 14:25:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:25:50 2012 -0700" }, "message": "simple_open: automatically convert to simple_open()\n\nMany users of debugfs copy the implementation of default_open() when\nthey want to support a custom read/write function op. This leads to a\nproliferation of the default_open() implementation across the entire\ntree.\n\nNow that the common implementation has been consolidated into libfs we\ncan replace all the users of this function with simple_open().\n\nThis replacement was done with the following semantic patch:\n\n\u003csmpl\u003e\n@ open @\nidentifier open_f !\u003d simple_open;\nidentifier i, f;\n@@\n-int open_f(struct inode *i, struct file *f)\n-{\n(\n-if (i-\u003ei_private)\n-f-\u003eprivate_data \u003d i-\u003ei_private;\n|\n-f-\u003eprivate_data \u003d i-\u003ei_private;\n)\n-return 0;\n-}\n\n@ has_open depends on open @\nidentifier fops;\nidentifier open.open_f;\n@@\nstruct file_operations fops \u003d {\n...\n-.open \u003d open_f,\n+.open \u003d simple_open,\n...\n};\n\u003c/smpl\u003e\n\n[akpm@linux-foundation.org: checkpatch fixes]\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f283d22713b0bdc147097c92c9b45855339cf1c8", "tree": "fee788fb13479ebe013eae8c9a4b621d6ccd3057", "parents": [ "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Sun Apr 01 20:19:30 2012 +1000" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Apr 03 03:42:36 2012 +0200" }, "message": "APM: fix deadlock in APM_IOC_SUSPEND ioctl\n\nI found the Xorg server on my ARM device stuck in the \u0027msleep()\u0027 loop\nin apm_ioctl.\n\nI suspect it had attempted suspend immediately after resuming and lost\na race.\nDuring that msleep(10);, a new suspend cycle must have started and\nchanged -\u003esuspend_state to SUSPEND_PENDING, so it was never seen to\nbe SUSPEND_DONE and the loop could never exited. It would have moved on\nto SUSPEND_ACKTO but never been able to reach SUSPEND_DONE.\n\nSo change the loop to only run while SUSPEND_ACKED rather than until\nSUSPEND_DONE. This is much safer.\n\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "16418bb1da8a685e639c6c4f2d3096f762e8b0fb", "tree": "39a145c1b921d198410e88eeadf583fa4561b4ad", "parents": [ "e2e110d7596656e2badd21c48713bd01e1b40f44" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Mar 30 19:03:04 2012 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Mon Apr 02 12:14:10 2012 -0400" }, "message": "tile-srom.c driver: minor code cleanup\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "650dc07ec3b0eba8ff21da706d2b1876ada59fc3", "tree": "337809fc7c960a6c525f473d498c339aa7075ab3", "parents": [ "cc22a938fc1db0c8ef5e693a69b159c4b851dab3" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 10:08:35 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 15:59:07 2012 +0200" }, "message": "drm/i915: disable ppgtt on snb when dmar is enabled\n\nTotally unexpected that this regressed. Luckily it sounds like we just\nneed to have dmar disable on the igfx, not the entire system. At least\nthat\u0027s what a few days of testing between Tony Vroon and me indicates.\n\nReported-by: Tony Vroon \u003ctony@linx.net\u003e\nCc: Tony Vroon \u003ctony@linx.net\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d43024\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "cc22a938fc1db0c8ef5e693a69b159c4b851dab3", "tree": "9d2e52caed1d848c267dcb33997b6fc8e6b3f739", "parents": [ "e77166b5a653728f312d07e60a80819d1c54fca4" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Thu Mar 29 20:55:48 2012 -0300" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 15:58:47 2012 +0200" }, "message": "drm/i915: add Ivy Bridge GT2 Server entries\n\nThis adds PCI ID for IVB GT2 server variant which we were missing.\n\nSigned-off-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\n[danvet: fix up conflict because the patch has been diffed against next. tsk.]\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "a591afc01d9e48affbacb365558a31e53c85af45", "tree": "9bb91f4eb94ec69fc4706c4944788ec5f3586063", "parents": [ "820d41cf0cd0e94a5661e093821e2e5c6b36a9d8", "31796ac4e8f0e88f5c10f1ad6dab8f19bebe44a4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:12:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:12:23 2012 -0700" }, "message": "Merge branch \u0027x86-x32-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x32 support for x86-64 from Ingo Molnar:\n \"This tree introduces the X32 binary format and execution mode for x86:\n 32-bit data space binaries using 64-bit instructions and 64-bit kernel\n syscalls.\n\n This allows applications whose working set fits into a 32 bits address\n space to make use of 64-bit instructions while using a 32-bit address\n space with shorter pointers, more compressed data structures, etc.\"\n\nFix up trivial context conflicts in arch/x86/{Kconfig,vdso/vma.c}\n\n* \u0027x86-x32-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits)\n x32: Fix alignment fail in struct compat_siginfo\n x32: Fix stupid ia32/x32 inversion in the siginfo format\n x32: Add ptrace for x32\n x32: Switch to a 64-bit clock_t\n x32: Provide separate is_ia32_task() and is_x32_task() predicates\n x86, mtrr: Use explicit sizing and padding for the 64-bit ioctls\n x86/x32: Fix the binutils auto-detect\n x32: Warn and disable rather than error if binutils too old\n x32: Only clear TIF_X32 flag once\n x32: Make sure TS_COMPAT is cleared for x32 tasks\n fs: Remove missed -\u003efds_bits from cessation use of fd_set structs internally\n fs: Fix close_on_exec pointer in alloc_fdtable\n x32: Drop non-__vdso weak symbols from the x32 VDSO\n x32: Fix coding style violations in the x32 VDSO code\n x32: Add x32 VDSO support\n x32: Allow x32 to be configured\n x32: If configured, add x32 system calls to system call tables\n x32: Handle process creation\n x32: Signal-related system calls\n x86: Add #ifdef CONFIG_COMPAT to \u003casm/sys_ia32.h\u003e\n ...\n" }, { "commit": "532bfc851a7475fb6a36c1e953aa395798a7cca7", "tree": "a7892e5a31330dd59f31959efbe9fda1803784fd", "parents": [ "0195c00244dc2e9f522475868fa278c473ba7339", "8da00edc1069f01c34510fa405dc15d96c090a3f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 17:19:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 17:19:28 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge third batch of patches from Andrew Morton:\n - Some MM stragglers\n - core SMP library cleanups (on_each_cpu_mask)\n - Some IPI optimisations\n - kexec\n - kdump\n - IPMI\n - the radix-tree iterator work\n - various other misc bits.\n\n \"That\u0027ll do for -rc1. I still have ~10 patches for 3.4, will send\n those along when they\u0027ve baked a little more.\"\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (35 commits)\n backlight: fix typo in tosa_lcd.c\n crc32: add help text for the algorithm select option\n mm: move hugepage test examples to tools/testing/selftests/vm\n mm: move slabinfo.c to tools/vm\n mm: move page-types.c from Documentation to tools/vm\n selftests/Makefile: make `run_tests\u0027 depend on `all\u0027\n selftests: launch individual selftests from the main Makefile\n radix-tree: use iterators in find_get_pages* functions\n radix-tree: rewrite gang lookup using iterator\n radix-tree: introduce bit-optimized iterator\n fs/proc/namespaces.c: prevent crash when ns_entries[] is empty\n nbd: rename the nbd_device variable from lo to nbd\n pidns: add reboot_pid_ns() to handle the reboot syscall\n sysctl: use bitmap library functions\n ipmi: use locks on watchdog timeout set on reboot\n ipmi: simplify locking\n ipmi: fix message handling during panics\n ipmi: use a tasklet for handling received messages\n ipmi: increase KCS timeouts\n ipmi: decrease the IPMI message transaction time in interrupt mode\n ...\n" }, { "commit": "423a5bb49ec530ec8bbfc73fd2ded83da8e58684", "tree": "d70f4fedba821f80b5b4c2511fcf36aec07e9d03", "parents": [ "f60adf42ad55405d1b17e9e5c33fdb63f1eb8861" ], "author": { "name": "Corey Minyard", "email": "cminyard@mvista.com", "time": "Wed Mar 28 14:42:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 17:14:36 2012 -0700" }, "message": "ipmi: use locks on watchdog timeout set on reboot\n\nThe IPMI watchdog timer clears or extends the timer on reboot/shutdown.\nIt was using the non-locking routine for setting the watchdog timer, but\nthis was causing race conditions. Instead, use the locking version to\navoid the races. It seems to work fine.\n\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f60adf42ad55405d1b17e9e5c33fdb63f1eb8861", "tree": "b4a7689884c8ee44dc21656ab03b74f56877c672", "parents": [ "895dcfd1cab84d7e1c22af645a7f2f3c9bb5f24e" ], "author": { "name": "Corey Minyard", "email": "cminyard@mvista.com", "time": "Wed Mar 28 14:42:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 17:14:36 2012 -0700" }, "message": "ipmi: simplify locking\n\nNow that the the IPMI driver is using a tasklet, we can simplify the\nlocking in the driver and get rid of the message lock.\n\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "895dcfd1cab84d7e1c22af645a7f2f3c9bb5f24e", "tree": "bfa060ef5fb76ffb0cd5fbd168140895686d0fad", "parents": [ "7adf579c8babf62026e6aab1dee85e6b104d9936" ], "author": { "name": "Corey Minyard", "email": "cminyard@mvista.com", "time": "Wed Mar 28 14:42:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 17:14:36 2012 -0700" }, "message": "ipmi: fix message handling during panics\n\nThe part of the IPMI driver that delivered panic information to the event\nlog and extended the watchdog timeout during a panic was not properly\nhandling the messages. It used static messages to avoid allocation, but\nwasn\u0027t properly waiting for these, or wasn\u0027t properly handling the\nrefcounts.\n\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7adf579c8babf62026e6aab1dee85e6b104d9936", "tree": "23b3c94b6f97ecee2b7f6eea3f10871d737506c2", "parents": [ "828dc9da50f9632bbc5bc9dfa510619d13135015" ], "author": { "name": "Corey Minyard", "email": "cminyard@mvista.com", "time": "Wed Mar 28 14:42:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 17:14:36 2012 -0700" }, "message": "ipmi: use a tasklet for handling received messages\n\nThe IPMI driver would release a lock, deliver a message, then relock.\nThis is obviously ugly, and this patch converts the message handler\ninterface to use a tasklet to schedule work. This lets the receive\nhandler be called from an interrupt handler with interrupts enabled.\n\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "828dc9da50f9632bbc5bc9dfa510619d13135015", "tree": "643c5d2ef6b7593841ccb2ab4f5eacedafa7b9ee", "parents": [ "b88e769368a88cf28e53db158b84eda096144bce" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Wed Mar 28 14:42:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 17:14:36 2012 -0700" }, "message": "ipmi: increase KCS timeouts\n\nWe currently time out and retry KCS transactions after 1 second of waiting\nfor IBF or OBF. This appears to be too short for some hardware. The IPMI\nspec says \"All system software wait loops should include error timeouts.\nFor simplicity, such timeouts are not shown explicitly in the flow\ndiagrams. A five-second timeout or greater is recommended\". Change the\ntimeout to five seconds to satisfy the slow hardware.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b88e769368a88cf28e53db158b84eda096144bce", "tree": "09a424242dc4ab2711f82cd727ecf52f9de4a2cf", "parents": [ "09c71bfd8384278c42f56380365940508194cec0" ], "author": { "name": "Srinivas_Gowda", "email": "srinivas_g_gowda@dell.com", "time": "Wed Mar 28 14:42:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 17:14:36 2012 -0700" }, "message": "ipmi: decrease the IPMI message transaction time in interrupt mode\n\nCall the event handler immediately after starting the next message.\n\nThis change considerably decreases the IPMI transaction time (cuts off\n~9ms for a single ipmitool transaction).\n\nSigned-off-by: Srinivas_Gowda \u003csrinivas_g_gowda@dell.com\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0195c00244dc2e9f522475868fa278c473ba7339", "tree": "f97ca98ae64ede2c33ad3de05ed7bbfa4f4495ed", "parents": [ "f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5", "141124c02059eee9dbc5c86ea797b1ca888e77f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "message": "Merge tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system\n\nPull \"Disintegrate and delete asm/system.h\" from David Howells:\n \"Here are a bunch of patches to disintegrate asm/system.h into a set of\n separate bits to relieve the problem of circular inclusion\n dependencies.\n\n I\u0027ve built all the working defconfigs from all the arches that I can\n and made sure that they don\u0027t break.\n\n The reason for these patches is that I recently encountered a circular\n dependency problem that came about when I produced some patches to\n optimise get_order() by rewriting it to use ilog2().\n\n This uses bitops - and on the SH arch asm/bitops.h drags in\n asm-generic/get_order.h by a circuituous route involving asm/system.h.\n\n The main difficulty seems to be asm/system.h. It holds a number of\n low level bits with no/few dependencies that are commonly used (eg.\n memory barriers) and a number of bits with more dependencies that\n aren\u0027t used in many places (eg. switch_to()).\n\n These patches break asm/system.h up into the following core pieces:\n\n (1) asm/barrier.h\n\n Move memory barriers here. This already done for MIPS and Alpha.\n\n (2) asm/switch_to.h\n\n Move switch_to() and related stuff here.\n\n (3) asm/exec.h\n\n Move arch_align_stack() here. Other process execution related bits\n could perhaps go here from asm/processor.h.\n\n (4) asm/cmpxchg.h\n\n Move xchg() and cmpxchg() here as they\u0027re full word atomic ops and\n frequently used by atomic_xchg() and atomic_cmpxchg().\n\n (5) asm/bug.h\n\n Move die() and related bits.\n\n (6) asm/auxvec.h\n\n Move AT_VECTOR_SIZE_ARCH here.\n\n Other arch headers are created as needed on a per-arch basis.\"\n\nFixed up some conflicts from other header file cleanups and moving code\naround that has happened in the meantime, so David\u0027s testing is somewhat\nweakened by that. We\u0027ll find out anything that got broken and fix it..\n\n* tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits)\n Delete all instances of asm/system.h\n Remove all #inclusions of asm/system.h\n Add #includes needed to permit the removal of asm/system.h\n Move all declarations of free_initmem() to linux/mm.h\n Disintegrate asm/system.h for OpenRISC\n Split arch_align_stack() out from asm-generic/system.h\n Split the switch_to() wrapper out of asm-generic/system.h\n Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h\n Create asm-generic/barrier.h\n Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h\n Disintegrate asm/system.h for Xtensa\n Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]\n Disintegrate asm/system.h for Tile\n Disintegrate asm/system.h for Sparc\n Disintegrate asm/system.h for SH\n Disintegrate asm/system.h for Score\n Disintegrate asm/system.h for S390\n Disintegrate asm/system.h for PowerPC\n Disintegrate asm/system.h for PA-RISC\n Disintegrate asm/system.h for MN10300\n ...\n" }, { "commit": "64757876215fcc515403639fa0bd19e8da7ab06b", "tree": "d0d9c58d6ea73a50181b62f431a1e517a7816643", "parents": [ "4b60d29ee00cb2114075e8b5c2c23928bbd76c28" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Mar 28 13:39:34 2012 -0700" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Mar 29 00:07:38 2012 +0200" }, "message": "agp/intel: add ValleyView AGP driver\n\n... and bind it right to the PCI id.\n\nNote that there are still a few things to fix here:\n- we need to move the tlb flush to a better place in drm/i915.\n- we need to check snoop support on vlv and implement it.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n[danvet: squash follow-on patch and add todo items to commit msg.]\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "4b60d29ee00cb2114075e8b5c2c23928bbd76c28", "tree": "67d587028223587f89ab78f5f098a033d4cf482c", "parents": [ "90b107c8f7ea75ef55db4e0515dda86b245f8978" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Mar 28 13:39:33 2012 -0700" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Mar 29 00:02:25 2012 +0200" }, "message": "agp/intel: map more registers for use by the GTT code\n\nWe need to flush the Gunit TLB when we update GTT PTEs on VLV, but the\nregister for doing so is above the range we normally map. Map the whole\nregister space to make sure we can get it.\n\nv2: only map the larger space on gen7+ (Daniel)\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "750f77064a290beb162352077b52c61b04bcae0e", "tree": "736a8dd043dc4cda298762a80e7c1fbf1bb87742", "parents": [ "89e5d6f0d979f6e7dc2bbb1ebd9e239217e2e952", "b92c803ec61de59e6e4ab9b2748d8e633cec3f08" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 13:03:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 13:03:26 2012 -0700" }, "message": "Merge git://www.linux-watchdog.org/linux-watchdog\n\nPull watchdog updates from Wim Van Sebroeck:\n - Removal of the Documentation/watchdog/00-INDEX file\n - Fix boot status reporting for imx2_wdt\n - clean-up sp805_wdt, pnx4008_wdt and mpcore_wdt\n - convert printk in watchdog drivers to pr_ functions\n - change nowayout module parameter to bool for every watchdog device\n - conversion of jz4740_wdt, pnx4008_wdt, max63xx_wdt, softdog,\n ep93xx_wdt, coh901327 and txx9wdt to new watchdog API\n - Add support for the WDIOC_GETTIMELEFT ioctl call to the new watchdog\n API\n - Change the new watchdog API so that the driver updates the timeout\n value\n - two fixes for the xen_wdt driver\n\nFix up conflicts in ep93xx driver due to the same patches being merged\nthrough separate branches.\n\n* git://www.linux-watchdog.org/linux-watchdog: (33 commits)\n watchdog: txx9wdt: fix timeout\n watchdog: Convert txx9wdt driver to watchdog framework\n watchdog: coh901327_wdt.c: fix timeout\n watchdog: coh901327: convert to use watchdog core\n watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog core\n watchdog: ep93xx_wdt: timeout is an unsigned int value.\n watchdog: ep93xx_wdt: Fix timeout after conversion to watchdog core\n watchdog: Convert ep93xx driver to watchdog core\n watchdog: sp805: Use devm routines\n watchdog: sp805: replace readl/writel with lighter _relaxed variants\n watchdog: sp805: Fix documentation style comment\n watchdog: mpcore_wdt: Allow platform_get_irq() to fail\n watchdog: mpcore_wdt: Use devm routines\n watchdog: mpcore_wdt: Rename dev to pdev for pointing to struct platform_device\n watchdog: xen: don\u0027t clear is_active when xen_wdt_stop() failed\n watchdog: xen: don\u0027t unconditionally enable the watchdog during resume\n watchdog: fix compiler error for missing parenthesis\n watchdog: ep93xx_wdt.c: fix platform probe\n watchdog: ep93xx: Convert the watchdog driver into a platform device.\n watchdog: fix set_timeout operations\n ...\n" }, { "commit": "9ffc93f203c18a70623f21950f1dd473c9ec48cd", "tree": "1eb3536ae183b0bfbf7f5152a6fe4f430ae881c2", "parents": [ "96f951edb1f1bdbbc99b0cd458f9808bb83d58ae" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Remove all #inclusions of asm/system.h\n\nRemove all #inclusions of asm/system.h preparatory to splitting and killing\nit. Performed with the following command:\n\nperl -p -i -e \u0027s!^#\\s*include\\s*\u003casm/system[.]h\u003e.*\\n!!\u0027 `grep -Irl \u0027^#\\s*include\\s*\u003casm/system[.]h\u003e\u0027 *`\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "d61b7a572b292e2be409e13b4b3adf475f18fb29", "tree": "e9d30390860147136c05e66abf1edda1bc5b0562", "parents": [ "18d9946bc7e2252fe3c0f2f609ac383c627edefd", "f4e2467bad53023589cbff18dd1ab6e0aa3f004c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:03:32 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:03:32 2012 -0700" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: global cleanups\" from Arnd Bergmann:\n \"Quite a bit of code gets removed, and some stuff moved around, mostly\n the old samsung s3c24xx stuff. There should be no functional changes\n in this series otherwise. Some cleanups have dependencies on other\n arm-soc branches and will be sent in the second round.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFixed up trivial conflicts mainly due to #include\u0027s being changes on\nboth sides.\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (121 commits)\n ep93xx: Remove unnecessary includes of ep93xx-regs.h\n ep93xx: Move EP93XX_SYSCON defines to SoC private header\n ep93xx: Move crunch code to mach-ep93xx directory\n ep93xx: Make syscon access functions private to SoC\n ep93xx: Configure GPIO ports in core code\n ep93xx: Move peripheral defines to local SoC header\n ep93xx: Convert the watchdog driver into a platform device.\n ep93xx: Use ioremap for backlight driver\n ep93xx: Move GPIO defines to gpio-ep93xx.h\n ep93xx: Don\u0027t use system controller defines in audio drivers\n ep93xx: Move PHYS_BASE defines to local SoC header file\n ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver\n ARM: EXYNOS: add clock registers for exynos4x12-cpufreq\n PM / devfreq: update the name of EXYNOS clock registers that were omitted\n PM / devfreq: update the name of EXYNOS clock register\n ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock\n ARM: EXYNOS: use static declaration on regarding clock\n ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs\n ARM: OMAP2+: Fix build error after merge\n ARM: S3C24XX: remove call to s3c24xx_setup_clocks\n ...\n" }, { "commit": "86a1e1896c2710402e29a875d8d830244274244d", "tree": "1b27f5107ec51e06921e510c67eeca47ba1b5a66", "parents": [ "27c766aaacb265d625dc634bf7903f7f9fd0c697" ], "author": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Mon Mar 05 16:51:11 2012 +0100" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Tue Mar 27 20:06:02 2012 +0200" }, "message": "watchdog: nowayout is bool\n\nnowayout is actually a boolean value.\nSo make it bool for all watchdog device drivers.\n\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "0d19eac12031680dc5f5402921fb0c388e42f619", "tree": "57302fb8778b6527c35175cc1edf228dd9f7abb9", "parents": [ "56c10bf82c10588b743e75a13a7949e11b9fc942", "bba1594d348b59d6172e02bf74fba837c8273989" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 17:36:29 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 17:36:29 2012 -0700" }, "message": "Merge branch \u0027amba\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull #2 ARM updates from Russell King:\n \"Further ARM AMBA primecell updates which aren\u0027t included directly in\n the previous commit. I wanted to keep these separate as they\u0027re\n touching stuff outside arch/arm/.\"\n\n* \u0027amba\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n ARM: 7362/1: AMBA: Add module_amba_driver() helper macro for amba_driver\n ARM: 7335/1: mach-u300: do away with MMC config files\n ARM: 7280/1: mmc: mmci: Cache MMCICLOCK and MMCIPOWER register\n ARM: 7309/1: realview: fix unconnected interrupts on EB11MP\n ARM: 7230/1: mmc: mmci: Fix PIO read for small SDIO packets\n ARM: 7227/1: mmc: mmci: Prepare for SDIO before setting up DMA job\n ARM: 7223/1: mmc: mmci: Fixup use of runtime PM and use autosuspend\n ARM: 7221/1: mmc: mmci: Change from using legacy suspend\n ARM: 7219/1: mmc: mmci: Change vdd_handler to a generic ios_handler\n ARM: 7218/1: mmc: mmci: Provide option to configure bus signal direction\n ARM: 7217/1: mmc: mmci: Put power register deviations in variant data\n ARM: 7216/1: mmc: mmci: Do not release spinlock in request_end\n ARM: 7215/1: mmc: mmci: Increase max_segs from 16 to 128\n" }, { "commit": "be53bfdb8088e9d1924199cc1a96e113756b1075", "tree": "8c65eb9d82ca4c0f11c17cfdc44d5263820b415b", "parents": [ "b2094ef840697bc8ca5d17a83b7e30fad5f1e9fa", "5466c7b1683a23dbbcfb7ee4a71c4f23886001c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:08:22 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:08:22 2012 -0700" }, "message": "Merge branch \u0027drm-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm main changes from Dave Airlie:\n \"This is the main drm pull request, I\u0027m probably going to send two more\n smaller ones, will explain below.\n\n This contains a patch that is also in the fbdev tree, but it should be\n the same patch, it added an API for hot unplugging framebuffer\n devices, and I need that API for a new driver.\n\n It also contains some changes to the i2c tree which Jean has acked,\n and one change to moorestown platform stuff in x86.\n\n Highlights:\n - new drivers: UDL driver for USB displaylink devices, kms only,\n should support correct hotplug operations.\n - core: i2c speedups + better hotplug support, EDID overriding via\n firmware interface - allows user to load a firmware for a broken\n monitor/kvm from userspace, it even has documentation for it.\n - exynos: new HDMI audio + hdmi 1.4 + virtual output driver\n - gma500: code cleanup\n - radeon: cleanups, CS optimisations, streamout support and pageflip\n fix\n - nouveau: NVD9 displayport support + more reclocking work\n - i915: re-enabling GMBUS, finish gpu patch (might help hibernation\n who knows), missed irq fixes, stencil tiling fixes, interlaced\n support, aliasesd PPGTT support for SNB/IVB, swizzling for SNB/IVB,\n semaphore fixes\n\n As well as the usual bunch of cleanups and fixes all over the place.\n\n I\u0027ve got two things I\u0027d like to merge a bit later:\n\n a) AMD support for all their new radeonhd 7000 series GPU and APUs.\n AMD dropped this a bit late due to insane internal review\n processes, (please AMD just follow Intel and let open source guys\n ship stuff early) however I don\u0027t want to penalise people who own\n this hardware (since its been on sale for 3-4 months and GPU hw\n doesn\u0027t exactly have a lifetime in years) and consign them to\n using closed drivers for longer than necessary. The changes are\n well contained and just plug into the driver new gpu functionality\n so they should be fairly regression proof. I just want to give\n them a bit of a run on the hw AMD kindly sent me.\n\n b) drm prime/dma-buf interface code. This is just infrastructure\n code to expose the dma-buf stuff to drm drivers and to userspace.\n I\u0027m not planning on pushing any driver support in this cycle\n (except maybe exynos), but I\u0027d like to get the infrastructure code\n in so for the next cycle I can start getting the driver support\n into the individual drivers. We have started driver support for\n i915, nouveau and udl along with I think exynos and omap in\n staging. However this code relies on the dma-buf tree being\n pulled into your tree first since it needs the latest interfaces\n from that tree. I\u0027ll push to get that tree sent asap.\n\n (oh and any warnings you see in i915 are gcc\u0027s fault from what anyone\n can see).\"\n\nFix up trivial conflicts in arch/x86/platform/mrst/mrst.c due to the new\nmsic_thermal_platform_data() thermal function being added next to the\ntc35876x_platform_data() i2c device function..\n\n* \u0027drm-next\u0027 of git://people.freedesktop.org/~airlied/linux: (326 commits)\n drm/i915: use DDC_ADDR instead of hard-coding it\n drm/radeon: use DDC_ADDR instead of hard-coding it\n drm: remove unneeded redefinition of DDC_ADDR\n drm/exynos: added virtual display driver.\n drm: allow loading an EDID as firmware to override broken monitor\n drm/exynos: enable hdmi audio feature\n drm/exynos: add default pixel format for plane\n drm/exynos: cleanup exynos_hdmi.h\n drm/exynos: add is_local member in exynos_drm_subdrv struct\n drm/exynos: add subdrv open/close functions\n drm/exynos: remove module of exynos drm subdrv\n drm/exynos: release pending pageflip events when closed\n drm/exynos: added new funtion to get/put dma address.\n drm/exynos: update gem and buffer framework.\n drm/exynos: added mode_fixup feature and code clean.\n drm/exynos: add HDMI version 1.4 support\n drm/exynos: remove exynos_mixer.h\n gma500: Fix mmap frambuffer\n drm/radeon: Drop radeon_gem_object_(un)pin.\n drm/radeon: Restrict offset for legacy display engine.\n ...\n" }, { "commit": "5375871d432ae9fc581014ac117b96aaee3cd0c7", "tree": "be98e8255b0f927fb920fb532a598b93fa140dbe", "parents": [ "b57cb7231b2ce52d3dda14a7b417ae125fb2eb97", "dfbc2d75c1bd47c3186fa91f1655ea2f3825b0ec" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 18:55:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 18:55:10 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc merge from Benjamin Herrenschmidt:\n \"Here\u0027s the powerpc batch for this merge window. It is going to be a\n bit more nasty than usual as in touching things outside of\n arch/powerpc mostly due to the big iSeriesectomy :-) We finally got\n rid of the bugger (legacy iSeries support) which was a PITA to\n maintain and that nobody really used anymore.\n\n Here are some of the highlights:\n\n - Legacy iSeries is gone. Thanks Stephen ! There\u0027s still some bits\n and pieces remaining if you do a grep -ir series arch/powerpc but\n they are harmless and will be removed in the next few weeks\n hopefully.\n\n - The \u0027fadump\u0027 functionality (Firmware Assisted Dump) replaces the\n previous (equivalent) \"pHyp assisted dump\"... it\u0027s a rewrite of a\n mechanism to get the hypervisor to do crash dumps on pSeries, the\n new implementation hopefully being much more reliable. Thanks\n Mahesh Salgaonkar.\n\n - The \"EEH\" code (pSeries PCI error handling \u0026 recovery) got a big\n spring cleaning, motivated by the need to be able to implement a\n new backend for it on top of some new different type of firwmare.\n\n The work isn\u0027t complete yet, but a good chunk of the cleanups is\n there. Note that this adds a field to struct device_node which is\n not very nice and which Grant objects to. I will have a patch soon\n that moves that to a powerpc private data structure (hopefully\n before rc1) and we\u0027ll improve things further later on (hopefully\n getting rid of the need for that pointer completely). Thanks Gavin\n Shan.\n\n - I dug into our exception \u0026 interrupt handling code to improve the\n way we do lazy interrupt handling (and make it work properly with\n \"edge\" triggered interrupt sources), and while at it found \u0026 fixed\n a wagon of issues in those areas, including adding support for page\n fault retry \u0026 fatal signals on page faults.\n\n - Your usual random batch of small fixes \u0026 updates, including a bunch\n of new embedded boards, both Freescale and APM based ones, etc...\"\n\nI fixed up some conflicts with the generalized irq-domain changes from\nGrant Likely, hopefully correctly.\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (141 commits)\n powerpc/ps3: Do not adjust the wrapper load address\n powerpc: Remove the rest of the legacy iSeries include files\n powerpc: Remove the remaining CONFIG_PPC_ISERIES pieces\n init: Remove CONFIG_PPC_ISERIES\n powerpc: Remove FW_FEATURE ISERIES from arch code\n tty/hvc_vio: FW_FEATURE_ISERIES is no longer selectable\n powerpc/spufs: Fix double unlocks\n powerpc/5200: convert mpc5200 to use of_platform_populate()\n powerpc/mpc5200: add options to mpc5200_defconfig\n powerpc/mpc52xx: add a4m072 board support\n powerpc/mpc5200: update mpc5200_defconfig to fit for charon board\n Documentation/powerpc/mpc52xx.txt: Checkpatch cleanup\n powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board\n powerpc/44x: Add support PCI-E for APM821xx SoC and Bluestone board\n MAINTAINERS: Update PowerPC 4xx tree\n powerpc/44x: The bug fixed support for APM821xx SoC and Bluestone board\n powerpc: document the FSL MPIC message register binding\n powerpc: add support for MPIC message register API\n powerpc/fsl: Added aliased MSIIR register address to MSI node in dts\n powerpc/85xx: mpc8548cds - add 36-bit dts\n ...\n" }, { "commit": "3556485f1595e3964ba539e39ea682acbb835cee", "tree": "7f5ee254f425b1427ac0059b5f347a307f8538a1", "parents": [ "b8716614a7cc2fc15ea2a518edd04755fb08d922", "09f61cdbb32a9d812c618d3922db533542736bb0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:25:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:25:04 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull security subsystem updates for 3.4 from James Morris:\n \"The main addition here is the new Yama security module from Kees Cook,\n which was discussed at the Linux Security Summit last year. Its\n purpose is to collect miscellaneous DAC security enhancements in one\n place. This also marks a departure in policy for LSM modules, which\n were previously limited to being standalone access control systems.\n Chromium OS is using Yama, and I believe there are plans for Ubuntu,\n at least.\n\n This patchset also includes maintenance updates for AppArmor, TOMOYO\n and others.\"\n\nFix trivial conflict in \u003cnet/sock.h\u003e due to the jumo_label-\u003estatic_key\nrename.\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (38 commits)\n AppArmor: Fix location of const qualifier on generated string tables\n TOMOYO: Return error if fails to delete a domain\n AppArmor: add const qualifiers to string arrays\n AppArmor: Add ability to load extended policy\n TOMOYO: Return appropriate value to poll().\n AppArmor: Move path failure information into aa_get_name and rename\n AppArmor: Update dfa matching routines.\n AppArmor: Minor cleanup of d_namespace_path to consolidate error handling\n AppArmor: Retrieve the dentry_path for error reporting when path lookup fails\n AppArmor: Add const qualifiers to generated string tables\n AppArmor: Fix oops in policy unpack auditing\n AppArmor: Fix error returned when a path lookup is disconnected\n KEYS: testing wrong bit for KEY_FLAG_REVOKED\n TOMOYO: Fix mount flags checking order.\n security: fix ima kconfig warning\n AppArmor: Fix the error case for chroot relative path name lookup\n AppArmor: fix mapping of META_READ to audit and quiet flags\n AppArmor: Fix underflow in xindex calculation\n AppArmor: Fix dropping of allowed operations that are force audited\n AppArmor: Add mising end of structure test to caps unpacking\n ...\n" }, { "commit": "b8716614a7cc2fc15ea2a518edd04755fb08d922", "tree": "2a8a5d04066b2bd589ba2ebbeb228e2a6a178ec9", "parents": [ "31f6765266417c0d99f0e922fe82848a7c9c2ae9", "2dc9b5dbdef09840de852a4f0cc6a9c9eece7220" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:20:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:20:43 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\nPull crypto update from Herbert Xu:\n \"* sha512 bug fixes (already in your tree).\n * SHA224/SHA384 AEAD support in caam.\n * X86-64 optimised version of Camellia.\n * Tegra AES support.\n * Bulk algorithm registration interface to make driver registration easier.\n * padata race fixes.\n * Misc fixes.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)\n padata: Fix race on sequence number wrap\n padata: Fix race in the serialization path\n crypto: camellia - add assembler implementation for x86_64\n crypto: camellia - rename camellia.c to camellia_generic.c\n crypto: camellia - fix checkpatch warnings\n crypto: camellia - rename camellia module to camellia_generic\n crypto: tcrypt - add more camellia tests\n crypto: testmgr - add more camellia test vectors\n crypto: camellia - simplify key setup and CAMELLIA_ROUNDSM macro\n crypto: twofish-x86_64/i586 - set alignmask to zero\n crypto: blowfish-x86_64 - set alignmask to zero\n crypto: serpent-sse2 - combine ablk_*_init functions\n crypto: blowfish-x86_64 - use crypto_[un]register_algs\n crypto: twofish-x86_64-3way - use crypto_[un]register_algs\n crypto: serpent-sse2 - use crypto_[un]register_algs\n crypto: serpent-sse2 - remove dead code from serpent_sse2_glue.c::serpent_sse2_init()\n crypto: twofish-x86 - Remove dead code from twofish_glue_3way.c::init()\n crypto: In crypto_add_alg(), \u0027exact\u0027 wants to be initialized to 0\n crypto: caam - fix gcc 4.6 warning\n crypto: Add bulk algorithm registration interface\n ...\n" }, { "commit": "69a7aebcf019ab3ff5764525ad6858fbe23bb86d", "tree": "7211df5704b743a7667159748c670a9744164482", "parents": [ "d464c92b5234227c1698862a1906827e2e398ae0", "f1f996b66cc3908a8f5ffccc2ff41840e92f3b10" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:12:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:12:50 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull trivial tree from Jiri Kosina:\n \"It\u0027s indeed trivial -- mostly documentation updates and a bunch of\n typo fixes from Masanari.\n\n There are also several linux/version.h include removals from Jesper.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)\n kcore: fix spelling in read_kcore() comment\n constify struct pci_dev * in obvious cases\n Revert \"char: Fix typo in viotape.c\"\n init: fix wording error in mm_init comment\n usb: gadget: Kconfig: fix typo for \u0027different\u0027\n Revert \"power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c\"\n writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header\n writeback: fix typo in the writeback_control comment\n Documentation: Fix multiple typo in Documentation\n tpm_tis: fix tis_lock with respect to RCU\n Revert \"media: Fix typo in mixer_drv.c and hdmi_drv.c\"\n Doc: Update numastat.txt\n qla4xxx: Add missing spaces to error messages\n compiler.h: Fix typo\n security: struct security_operations kerneldoc fix\n Documentation: broken URL in libata.tmpl\n Documentation: broken URL in filesystems.tmpl\n mtd: simplify return logic in do_map_probe()\n mm: fix comment typo of truncate_inode_pages_range\n power: bq27x00: Fix typos in comment\n ...\n" }, { "commit": "843ec558f91b8e8fdb6efc908f2c0506407cc750", "tree": "1866dccbc298390fc8686875942324075fd83f9d", "parents": [ "71e7ff2578c3bc67fd893a9ba7f69fd563f271de", "fb8ebec00b04f921ea1614a7303f1a8e5e9e47c5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 11:24:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 11:24:39 2012 -0700" }, "message": "Merge tag \u0027tty-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull TTY/serial patches from Greg KH:\n \"tty and serial merge for 3.4-rc1\n\n Here\u0027s the big serial and tty merge for the 3.4-rc1 tree.\n\n There\u0027s loads of fixes and reworks in here from Jiri for the tty\n layer, and a number of patches from Alan to help try to wrestle the vt\n layer into a sane model.\n\n Other than that, lots of driver updates and fixes, and other minor\n stuff, all detailed in the shortlog.\"\n\n* tag \u0027tty-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (132 commits)\n serial: pxa: add clk_prepare/clk_unprepare calls\n TTY: Wrong unicode value copied in con_set_unimap()\n serial: PL011: clear pending interrupts\n serial: bfin-uart: Don\u0027t access tty circular buffer in TX DMA interrupt after it is reset.\n vt: NULL dereference in vt_do_kdsk_ioctl()\n tty: serial: vt8500: fix annotations for probe/remove\n serial: remove back and forth conversions in serial_out_sync\n serial: use serial_port_in/out vs serial_in/out in 8250\n serial: introduce generic port in/out helpers\n serial: reduce number of indirections in 8250 code\n serial: delete useless void casts in 8250.c\n serial: make 8250\u0027s serial_in shareable to other drivers.\n serial: delete last unused traces of pausing I/O in 8250\n pch_uart: Add module parameter descriptions\n pch_uart: Use existing default_baud in setup_console\n pch_uart: Add user_uartclk parameter\n pch_uart: Add Fish River Island II uart clock quirks\n pch_uart: Use uartclk instead of base_baud\n mpc5200b/uart: select more tolerant uart prescaler on low baudrates\n tty: moxa: fix bit test in moxa_start()\n ...\n" }, { "commit": "9f9d2760da8c7f94fae119fac3e13d5a1702f8f0", "tree": "e244a2969edceff750478e7d98355b76ef30aa0f", "parents": [ "ad2a8e6078a16d3b61b530f1447110841c36ae56", "b222258ac11cae3e0350fe5992ad164a7b128103" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 11:15:18 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 11:15:18 2012 -0700" }, "message": "Merge tag \u0027char-misc-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc\n\nPull char and misc patches for 3.4-rc1 from Greg KH:\n \"Not much here, just a few minor fixes and some conversions to the\n module_*_driver() functions, making the codebase smaller.\"\n\n* tag \u0027char-misc-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:\n misc: bmp085: Use unsigned long to store jiffies\n char/ramoops: included linux/err.h twice\n misc: bmp085: Handle jiffies overflow correctly\n misc: fsa9480: Remove obsolete cleanup for clientdata\n char: Fix typo in tlclk.c\n char: Fix typo in viotape.c\n cs5535-mfgpt: don\u0027t call __init function from __devinit\n MISC: convert drivers/misc/* to use module_spi_driver()\n MISC: convert drivers/misc/* to use module_i2c_driver()\n MISC: convert drivers/misc/* to use module_platform_driver()\n" }, { "commit": "9e5ed094c89e55fbf11d2e81d60be98eb12346c0", "tree": "b77c63a452580643cdede36c3038d52995e54d8e", "parents": [ "a64ae394eb7de5e39cf462c18edb202196c678fa" ], "author": { "name": "viresh kumar", "email": "viresh.kumar@st.com", "time": "Thu Mar 15 10:40:38 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Mar 16 23:32:35 2012 +0000" }, "message": "ARM: 7362/1: AMBA: Add module_amba_driver() helper macro for amba_driver\n\nFor simple modules that contain a single amba_driver without any\nadditional setup code then ends up being a block of duplicated\nboilerplate. This patch adds a new macro, module_amba_driver(),\nwhich replaces the module_init()/module_exit() registrations with\ntemplate functions.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "adfe39cd9195c35811e062578c4107db49d75436", "tree": "7736825d96d2eae5721878dec1083db84fcadd06", "parents": [ "7fa87ce726fa3a2ddd55dc994697dc0e281f9125" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Mar 16 12:08:51 2012 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Mar 16 12:08:51 2012 +0100" }, "message": "Revert \"char: Fix typo in viotape.c\"\n\nThis reverts commit a7ccf3775219bfcb2e0df73619abbe13abc6408f.\n\nIt changes deprecated code that is being removed in powerpc tree.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "ba7a4822b48fbc7afd6b567c18e316a03f46684d", "tree": "c9a14c300a21b0db0f1aaccbd295f93420420d37", "parents": [ "aba0eb84c87928992c021d33ef3ea59c931086b9" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Thu Mar 08 15:32:52 2012 +1100" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Mar 16 09:28:05 2012 +1100" }, "message": "powerpc: Remove some of the legacy iSeries specific device drivers\n\nThese drivers are specific to the PowerPC legacy iSeries platform and\ntheir Kconfig is specified in arch/powerpc. Legacy iSeries is being\nremoved, so these drivers can no longer be selected.\n\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "410235fd4d20b8feaf8930a0575d23acc088aa87", "tree": "ad21d071a29ef0ad400393328ca4ab0588d5b2b7", "parents": [ "44a1bfd95d0a6c0096e79a883197596e1ce83cc3" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Mar 05 14:52:01 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Mar 08 11:42:21 2012 -0800" }, "message": "TTY: remove unneeded tty-\u003eindex checks\n\nChecking if tty-\u003eindex is in bounds is not needed. The tty has the\nindex set in the initial open. This is done in get_tty_driver. And it\ncan be only in interval \u003c0,driver-\u003enum).\n\nSo remove the tests which check exactly this interval. Some are\nleft untouched as they check against the current backing device count.\n(Leaving apart that the check is racy in most of the cases.)\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "2f16669d322e05171c9e1cfd94f402f7399bd2a3", "tree": "6a036cd0352928dd7056976a5f457c229322d67f", "parents": [ "87cab16beb882d3f9e61a2c0184fa7cf76de1f90" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Mar 05 14:51:52 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Mar 08 11:37:58 2012 -0800" }, "message": "TTY: remove re-assignments to tty_driver members\n\nAll num, magic and owner are set by alloc_tty_driver. No need to\nre-set them on each allocation site.\n\npti driver sets something different to what it passes to\nalloc_tty_driver. It is not a bug, since we don\u0027t use the lines\nparameter in any way. Anyway this is fixed, and now we do the right\nthing.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nAcked-by: Tilman Schmidt \u003ctilman@imap.cc\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "0fb8379dab9f97e4c56de8f9ea772c10eda27561", "tree": "49877d8a6bf68aeeb4ecda4404413822b9321ea6", "parents": [ "6623d64021469b0094bb070d3eb7d0e3f5e928af" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Mar 08 10:45:55 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Mar 08 10:45:55 2012 -0800" }, "message": "tty: delete briq_panel.c driver\n\nThis driver is broken, as reported by Jiri, and to quote Ben:\n\tJust remove the driver, I don\u0027t think anybody cares.\nso I\u0027m doing just that here.\n\nReported-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Josh Boyer \u003cjwboyer@gmail.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "4e70daaf05a181b6968e29e72e9f1c16a183e92c", "tree": "34001ce04cbc2476eab137483cdb42e084ac44cf", "parents": [ "c3363c912ba743e6f981ba58c744e413fc41f943" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Feb 29 10:29:23 2012 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 05 14:06:59 2012 +0100" }, "message": "tpm_tis: fix tis_lock with respect to RCU\n\ncleanup_tis() -\u003e tpm_remove_hardware() -\u003e syncrhonize_rcu() is being\ncalled in an atomic context (tis_lock spinlock held), which is not\nallowed. Convert tis_lock to mutex.\n\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\nTested-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nAcked-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "5aa4d20dc3dae3b6003eadd83b3d71318e7528d5", "tree": "09ad4344f5d29d0a138291f06b85ea53f1013a78", "parents": [ "3734f7858f4334d51c1cd77deff3e1e66517e261" ], "author": { "name": "Danny Kukawka", "email": "danny.kukawka@bisect.de", "time": "Wed Feb 15 20:20:16 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Feb 24 14:16:43 2012 -0800" }, "message": "char/ramoops: included linux/err.h twice\n\ndrivers/char/ramoops.c included \u0027linux/err.h\u0027 twice, remove\nthe duplicate.\n\nSigned-off-by: Danny Kukawka \u003cdanny.kukawka@bisect.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "2c799cef4d145af2182594a41cb5e5b42f2535c5", "tree": "0d2f7e028e2b5e3c616243828d743b818d23c93a", "parents": [ "ee0839c22cdda7f2e5f06e2d0351e2b49e0975ff" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Feb 24 10:34:35 2012 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Feb 24 10:34:35 2012 -0800" }, "message": "ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h\n\nThis is needed to minimize io.h so the SoC specific io.h\nfor ARMs can removed.\n\nNote that minimal driver changes for DSS and RNG are needed to\ninclude cpu.h for SoC detection macros.\n\nCc: Tomi Valkeinen \u003ctomi.valkeinen@ti.com\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "9dd4ccaaf8cde924b78ba5f5b1a8ce3e7ead687f", "tree": "fcd2b60f8d41ef86ab7eb73bb3dcaf154ed4cd8d", "parents": [ "6684ba202b5ab2f36d574c72fe50c207d99b3e35" ], "author": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Fri Feb 10 14:08:52 2012 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Mon Feb 20 12:48:47 2012 -0800" }, "message": "compat: Handle COMPAT_USE_64BIT_TIME in the lp driver\n\nEnable the lp driver to be used with a compat ABI with 64-bit time.\n\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Greg Kroah-Hartman \u003cgreg@kroah.com\u003e\n" }, { "commit": "3ab1aff89477dafb1aaeafe8c8669114a02b7226", "tree": "a8445d0ca44505db9f59620c92b9fe842f9304f0", "parents": [ "968de8e24d08fcc425e112ca465d4688b89b777b" ], "author": { "name": "Tim Gardner", "email": "tim.gardner@canonical.com", "time": "Tue Dec 06 11:29:20 2011 -0700" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Feb 14 16:43:38 2012 -0200" }, "message": "TPM: Zero buffer whole after copying to userspace\n\nCommit 3321c07ae5068568cd61ac9f4ba749006a7185c9 correctly clears the TPM\nbuffer if the user specified read length is \u003e\u003d the TPM buffer length. However,\nif the user specified read length is \u003c the TPM buffer length, then part of the\nTPM buffer is left uncleared.\n\nReported-by: Seth Forshee \u003cseth.forshee@canonical.com\u003e\nCc: Debora Velarde \u003cdebora@linux.vnet.ibm.com\u003e\nCc: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: Marcel Selhorst \u003cm.selhorst@sirrix.com\u003e\nCc: tpmdd-devel@lists.sourceforge.net\nCc: stable@vger.kernel.org\nSigned-off-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "968de8e24d08fcc425e112ca465d4688b89b777b", "tree": "729714da77b246a8273b04be4220ea11d1bbacec", "parents": [ "4e401fb028b79105ed87d85fc2220c77be277ed9" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Fri Jan 20 12:58:50 2012 -0500" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Feb 14 16:43:18 2012 -0200" }, "message": "tpm_tis: Clean up after module_param cleanup\n\nCommit 90ab5ee94171b3e28de6bb42ee30b527014e0be7 changed the\nitpm module parameter from int to bool. Some other changes\nneed to be done to clean up after this change.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nCc: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "4e401fb028b79105ed87d85fc2220c77be277ed9", "tree": "8ac642d06075f499f8a102fec06cb75a0cd1e7bc", "parents": [ "4040153087478993cbf0809f444400a3c808074c" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Fri Jan 20 12:58:49 2012 -0500" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Feb 14 16:43:08 2012 -0200" }, "message": "tpm_tis: Only probe iTPMs\n\nDetect iTPMs through the vendor ID on the hardware interface and only\nprobe the device if the manufacturer is found to be Intel. This\nobsoletes a previously added delay necessary for some TPMs but not iTPMs.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "9edd576d89a5b6d3e136d7dcab654d887c0d25b7", "tree": "d19670de2256f8187321de3a41fa4a10d3c8e402", "parents": [ "e21af88d39796c907c38648c824be3d646ffbe35", "28a4d5675857f6386930a324317281cb8ed1e5d0" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Feb 10 16:52:55 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Feb 10 17:14:49 2012 +0100" }, "message": "Merge remote-tracking branch \u0027airlied/drm-fixes\u0027 into drm-intel-next-queued\n\nBack-merge from drm-fixes into drm-intel-next to sort out two things:\n\n- interlaced support: -fixes contains a bugfix to correctly clear\n interlaced configuration bits in case the bios sets up an interlaced\n mode and we want to set up the progressive mode (current kernels\n don\u0027t support interlaced). The actual feature work to support\n interlaced depends upon (and conflicts with) this bugfix.\n\n- forcewake voodoo to workaround missed IRQ issues: -fixes only enabled\n this for ivybridge, but some recent bug reports indicate that we\n need this on Sandybridge, too. But in a slightly different flavour\n and with other fixes and reworks on top. Additionally there are some\n forcewake cleanup patches heading to -next that would conflict with\n currrent -fixes.\n\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "31cf913da3664f4804a346792937a3bad15cdede", "tree": "d671d3a6b40b5306194bab1f005ecf5fc95b2f31", "parents": [ "a7ccf3775219bfcb2e0df73619abbe13abc6408f" ], "author": { "name": "Masanari Iida", "email": "standby24x7@gmail.com", "time": "Tue Feb 07 23:55:52 2012 +0900" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Feb 09 23:09:37 2012 +0100" }, "message": "char: Fix typo in tlclk.c\n\nCorrect spelling \"telclk_interrup\" to \"telclk_interrupt\" in\ndrivers/char/tlclk.c\n\nSigned-off-by: Masanari Iida \u003cstandby24x7@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "a7ccf3775219bfcb2e0df73619abbe13abc6408f", "tree": "46b896902baea6b7cd4d22e6c5f64c0797819f0d", "parents": [ "934e7d44b810691ae5aefa3308b97a402aac1a55" ], "author": { "name": "Masanari Iida", "email": "standby24x7@gmail.com", "time": "Tue Feb 07 22:33:56 2012 +0900" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Feb 09 23:09:36 2012 +0100" }, "message": "char: Fix typo in viotape.c\n\nCorrect spelling \"allocat\" to \"allocate\" in\ndrivers/char/viotape.c\n\nSigned-off-by: Masanari Iida \u003cstandby24x7@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "428ccb21b740f603a6a1f08cbe6d935fb3177620", "tree": "397bab4ab8906e62430be6b3c02c75e9ff6bec90", "parents": [ "50a4c4a94d24fe13167e3ab1dc1486623369c31a" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 09 17:15:45 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 09 21:24:18 2012 +0100" }, "message": "agp/intel-gtt: export the gtt pagetable iomapping\n\nWe need this because ppgtt page directory entries need to be in the\nglobal gtt pagetable.\n\nReviewed-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nTested-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nTested-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nReviewed-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "50a4c4a94d24fe13167e3ab1dc1486623369c31a", "tree": "6499c1453002d9b61dd5ab9d9d33ab2cb648111f", "parents": [ "7e3b8737e719c4de7dd79b096b80ece444b2f0ba" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 09 17:15:44 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 09 21:23:18 2012 +0100" }, "message": "agp/intel-gtt: export the scratch page dma address\n\nTo implement a PPGTT for drm/i915 that fully aliases the GTT, we also\nneed to properly alias the scratch page.\n\nReviewed-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nTested-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nTested-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nReviewed-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "838d51bfa31540d474b9562056379b6325ec07d7", "tree": "61f2e965229493bd9c37d52330b74a8785683a61", "parents": [ "5fb15db4376fed99f6f1cae552766f9d81f062e3" ], "author": { "name": "Masanari Iida", "email": "standby24x7@gmail.com", "time": "Tue Feb 07 23:55:52 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Feb 09 08:49:51 2012 -0800" }, "message": "char: Fix typo in tlclk.c\n\nCorrect spelling \"telclk_interrup\" to \"telclk_interrupt\" in\ndrivers/char/tlclk.c\n\nSigned-off-by: Masanari Iida \u003cstandby24x7@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "5fb15db4376fed99f6f1cae552766f9d81f062e3", "tree": "8b0bd0f43c08ad0be3fe93986812d786e01861cf", "parents": [ "815b043ddac433eecb2899cb2090495b27f77aac" ], "author": { "name": "Masanari Iida", "email": "standby24x7@gmail.com", "time": "Tue Feb 07 22:33:56 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Feb 09 08:49:50 2012 -0800" }, "message": "char: Fix typo in viotape.c\n\nCorrect spelling \"allocat\" to \"allocate\" in\ndrivers/char/viotape.c\n\nSigned-off-by: Masanari Iida \u003cstandby24x7@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c", "tree": "2750d9fc94b8fb78d9982ea4a62d586e7f0a7862", "parents": [ "2eb6038c51034bf7f9335b15ce9238a028fdd2d6", "4c2c392763a682354fac65b6a569adec4e4b5387" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Feb 09 17:02:34 2012 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Feb 09 17:02:34 2012 +1100" }, "message": "Merge branch \u0027next-queue\u0027 into next\n" }, { "commit": "972c5ae961d6e5103e2b33d935cfa4145fd47140", "tree": "350b2a76b979ba8766c09838617df67ff330eca0", "parents": [ "5196d20305d5e30d871111d3a876cf067dd94255", "7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Feb 03 23:12:42 2012 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Feb 03 23:13:05 2012 +0100" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nSync with Linus\u0027 tree to be able to apply patch to a newer\ncode (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)\n" }, { "commit": "5196d20305d5e30d871111d3a876cf067dd94255", "tree": "4c7e382703594c8af4de6be50807266c3523330a", "parents": [ "982a598ff68acad37647baba06668054568eee49" ], "author": { "name": "Michael Witten", "email": "mfwitten@gmail.com", "time": "Tue Jan 24 22:48:04 2012 +0000" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Feb 03 22:50:56 2012 +0100" }, "message": "drivers/char: comment fix: CMOS RTC update code is now in kernel/time/ntp.c\n\nThis commit updates some comments to reflect the fact that code\nfor periodically updating the CMOS RTC was moved to:\n\n kernel/time/ntp.c\n\nprobably by this commit:\n\n commit 82644459c592a28a3eab682f9b88d81019ddfe8b\n Author: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n Date: Sat Jul 21 04:37:37 2007 -0700\n\n NTP: move the cmos update code into ntp.c\n\n i386 and sparc64 have the identical code to update the cmos clock. Move it\n into kernel/time/ntp.c as there are other architectures coming along with the\n same requirements.\n\nSigned-off-by: Michael Witten \u003cmfwitten@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "590dfe2f3bbbbeee806ee91bef68ba2a6afc16d2", "tree": "133e0085397d104d5a4bad8cd8afed3df6f17138", "parents": [ "c8fe74ae9a7285767cda1a053cfe806d67f77227" ], "author": { "name": "Michal Kubecek", "email": "mkubecek@suse.cz", "time": "Wed Jan 25 16:51:05 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 26 18:36:48 2012 +0000" }, "message": "agp: fix scratch page cleanup\n\nIn error cleanup of agp_backend_initialize() and in agp_backend_cleanup(),\nagp_destroy_page() is passed virtual address of the scratch page. This\nleads to a kernel warning if the initialization fails (or upon regular\ncleanup) as pointer to struct page should be passed instead.\n\nSigned-off-by: Michal Kubecek \u003cmkubecek@suse.cz\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f4a0391dfa91155bd961673b31eb42d9d45c799d", "tree": "21186b7a48986afa47115cefaf9d385fb9f8dcf7", "parents": [ "700920eb5ba4de5417b446c9a8bb008df2b973e0" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Thu Jan 05 12:49:54 2012 -0200" }, "committer": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Thu Jan 19 21:30:09 2012 -0500" }, "message": "ima: fix Kconfig dependencies\n\nFix the following build warning:\nwarning: (IMA) selects TCG_TPM which has unmet direct dependencies\n(HAS_IOMEM \u0026\u0026 EXPERIMENTAL)\n\nSuggested-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\n" }, { "commit": "be405411f712489f2f780ab085e1069e8fb85f19", "tree": "39816de2c022f940cfeb6bd3218f9346b91f31f7", "parents": [ "93c3d65b28bab6da520c2add9cb387a0303f8b2d" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Tue Jan 17 22:07:30 2012 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 15:50:17 2012 -0800" }, "message": "tpm: fix (ACPI S3) suspend regression\n\nThis patch fixes an (ACPI S3) suspend regression introduced in commit\n68d6e6713fcb (\"tpm: Introduce function to poll for result of self test\")\nand occurring with an Infineon TPM and tpm_tis and tpm_infineon drivers\nactive.\n\nThe suspend problem occurred if the TPM was disabled and/or deactivated\nand therefore the TPM_PCRRead checking the result of the (asynchronous)\nself test returned an error code which then caused the tpm_tis driver to\nbecome inactive and this then seemed to have negatively influenced the\nsuspend support by the tpm_infineon driver... Besides that the tpm_tis\ndrive may stay active even if the TPM is disabled and/or deactivated.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nTested-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6b2d590540d219064a53638f485b75203131dfce", "tree": "e20c3b38cde1674a50db08bca8ab965b779b0404", "parents": [ "5a117db77e47e3946d1aaa7ce8deafafd9d76746" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Wed Jan 04 14:04:33 2012 -0800" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Jan 17 11:06:09 2012 +0100" }, "message": "agp/intel: Add pci id for hostbridge from has/qemu\n\nThis is needed to run the simulator.\n\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\n[danvet: added a comment in case people wonder what it\u0027s for.]\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "c2bc3a316a7281f67e36b34dac2802cbe36a9128", "tree": "53e0b78ac25109b71c47bf47f4cdbb35ef1e7e36", "parents": [ "5674124f9f16f196533abb383193bd232c9afc2f", "2dac8e54f988ab58525505d7ef982493374433c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 18:23:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 18:23:09 2012 -0800" }, "message": "Merge branch \u0027x86/rdrand\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86/rdrand\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n random: Adjust the number of loops when initializing\n random: Use arch-specific RNG to initialize the entropy store\n" }, { "commit": "2dac8e54f988ab58525505d7ef982493374433c3", "tree": "a36ddf3790f984c8331b6d44bc1baa0f08c6a842", "parents": [ "3e88bdff1c65145f7ba297ccec69c774afe4c785" ], "author": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Mon Jan 16 11:23:29 2012 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Mon Jan 16 11:33:49 2012 -0800" }, "message": "random: Adjust the number of loops when initializing\n\nWhen we are initializing using arch_get_random_long() we only need to\nloop enough times to touch all the bytes in the buffer; using\npoolwords for that does twice the number of operations necessary on a\n64-bit machine, since in the random number generator code \"word\" means\n32 bits.\n\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\nCc: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nLink: http://lkml.kernel.org/r/1324589281-31931-1-git-send-email-tytso@mit.edu\n" }, { "commit": "3e88bdff1c65145f7ba297ccec69c774afe4c785", "tree": "2d01752cdd8a5b3f1cbcad3e0ef55d6f02696efd", "parents": [ "cf833d0b9937874b50ef2867c4e8badfd64948ce" ], "author": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Thu Dec 22 16:28:01 2011 -0500" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Mon Jan 16 11:18:21 2012 -0800" }, "message": "random: Use arch-specific RNG to initialize the entropy store\n\nIf there is an architecture-specific random number generator (such as\nRDRAND for Intel architectures), use it to initialize /dev/random\u0027s\nentropy stores. Even in the worst case, if RDRAND is something like\nAES(NSA_KEY, counter++), it won\u0027t hurt, and it will definitely help\nagainst any other adversaries.\n\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nLink: http://lkml.kernel.org/r/1324589281-31931-1-git-send-email-tytso@mit.edu\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "0a80939b3e6af4b0dc93bf88ec02fd7e90a16f1b", "tree": "a112335f2b2b2a51e90531c6c67e8a3b54dcf0ef", "parents": [ "0b48d42235caf627121f440b57d376f48a9af8b6", "72db395ffadb1d33233fd123c2bf87ba0198c6c1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:32:16 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:32:16 2012 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux\n\nAutogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1\n\n* tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux:\n module_param: check that bool parameters really are bool.\n intelfbdrv.c: bailearly is an int module_param\n paride/pcd: fix bool verbose module parameter.\n module_param: make bool parameters really bool (drivers \u0026 misc)\n module_param: make bool parameters really bool (arch)\n module_param: make bool parameters really bool (core code)\n kernel/async: remove redundant declaration.\n printk: fix unnecessary module_param_name.\n lirc_parallel: fix module parameter description.\n module_param: avoid bool abuse, add bint for special cases.\n module_param: check type correctness for module_param_array\n modpost: use linker section to generate table.\n modpost: use a table rather than a giant if/else statement.\n modules: sysfs - export: taint, coresize, initsize\n kernel/params: replace DEBUGP with pr_debug\n module: replace DEBUGP with pr_debug\n module: struct module_ref should contains long fields\n module: Fix performance regression on modules with large symbol tables\n module: Add comments describing how the \"strmap\" logic works\n\nFix up conflicts in scripts/mod/file2alias.c due to the new linker-\ngenerated table approach to adding __mod_*_device_table entries. The\nARM sa11x0 mcp bus needed to be converted to that too.\n" }, { "commit": "d0b03c5fe469ed0f3d7d94372c8bf77c64fcfce8", "tree": "2eced6ed68265fb02f0ad55bc4ef7fbc8ab47cfd", "parents": [ "847cb7ef565d31484f426677e0bea081bfd2acd9" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Tue Dec 27 15:01:30 2011 +0100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Jan 13 16:38:40 2012 +1100" }, "message": "hwrng: tx4939 - use devm_request_and_ioremap\n\nReimplement a call to devm_request_mem_region followed by a call to ioremap\nor ioremap_nocache by a call to devm_request_and_ioremap.\n\nThe semantic patch that makes this transformation is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@nm@\nexpression myname;\nidentifier i;\n@@\n\nstruct platform_driver i \u003d { .driver \u003d { .name \u003d myname } };\n\n@@\nexpression dev,res,size;\nexpression nm.myname;\n@@\n\n-if (!devm_request_mem_region(dev, res-\u003estart, size,\n- \\(res-\u003ename\\|dev_name(dev)\\|myname\\))) {\n- ...\n- return ...;\n-}\n... when !\u003d res-\u003estart\n(\n-devm_ioremap(dev,res-\u003estart,size)\n+devm_request_and_ioremap(dev,res)\n|\n-devm_ioremap_nocache(dev,res-\u003estart,size)\n+devm_request_and_ioremap(dev,res)\n)\n... when any\n when !\u003d res-\u003estart\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "099469502f62fbe0d7e4f0b83a2f22538367f734", "tree": "5229c3818b2e6e09d35026d49314047121130536", "parents": [ "7c17d86a8502c2e30c2eea777ed1b830aa3b447b", "35f1526845a9d804206883e19bd257d3dcef758f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:42:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:42:54 2012 -0800" }, "message": "Merge branch \u0027akpm\u0027 (aka \"Andrew\u0027s patch-bomb, take two\")\n\nAndrew explains:\n\n - various misc stuff\n\n - Most of the rest of MM: memcg, threaded hugepages, others.\n\n - cpumask\n\n - kexec\n\n - kdump\n\n - some direct-io performance tweaking\n\n - radix-tree optimisations\n\n - new selftests code\n\n A note on this: often people will develop a new userspace-visible\n feature and will develop userspace code to exercise/test that\n feature. Then they merge the patch and the selftest code dies.\n Sometimes we paste it into the changelog. Sometimes the code gets\n thrown into Documentation/(!).\n\n This saddens me. So this patch creates a bare-bones framework which\n will henceforth allow me to ask people to include their test apps in\n the kernel tree so we can keep them alive. Then when people enhance\n or fix the feature, I can ask them to update the test app too.\n\n The infrastruture is terribly trivial at present - let\u0027s see how it\n evolves.\n\n - checkpoint/restart feature work.\n\n A note on this: this is a project by various mad Russians to perform\n c/r mainly from userspace, with various oddball helper code added\n into the kernel where the need is demonstrated.\n\n So rather than some large central lump of code, what we have is\n little bits and pieces popping up in various places which either\n expose something new or which permit something which is normally\n kernel-private to be modified.\n\n The overall project is an ongoing thing. I\u0027ve judged that the size\n and scope of the thing means that we\u0027re more likely to be successful\n with it if we integrate the support into mainline piecemeal rather\n than allowing it all to develop out-of-tree.\n\n However I\u0027m less confident than the developers that it will all\n eventually work! So what I\u0027m asking them to do is to wrap each piece\n of new code inside CONFIG_CHECKPOINT_RESTORE. So if it all\n eventually comes to tears and the project as a whole fails, it should\n be a simple matter to go through and delete all trace of it.\n\nThis lot pretty much wraps up the -rc1 merge for me.\n\n* akpm: (96 commits)\n unlzo: fix input buffer free\n ramoops: update parameters only after successful init\n ramoops: fix use of rounddown_pow_of_two()\n c/r: prctl: add PR_SET_MM codes to set up mm_struct entries\n c/r: procfs: add start_data, end_data, start_brk members to /proc/$pid/stat v4\n c/r: introduce CHECKPOINT_RESTORE symbol\n selftests: new x86 breakpoints selftest\n selftests: new very basic kernel selftests directory\n radix_tree: take radix_tree_path off stack\n radix_tree: remove radix_tree_indirect_to_ptr()\n dio: optimize cache misses in the submission path\n vfs: cache request_queue in struct block_device\n fs/direct-io.c: calculate fs_count correctly in get_more_blocks()\n drivers/parport/parport_pc.c: fix warnings\n panic: don\u0027t print redundant backtraces on oops\n sysctl: add the kernel.ns_last_pid control\n kdump: add udev events for memory online/offline\n include/linux/crash_dump.h needs elf.h\n kdump: fix crash_kexec()/smp_send_stop() race in panic()\n kdump: crashk_res init check for /sys/kernel/kexec_crash_size\n ...\n" }, { "commit": "c755201eb5c1e09f3477d0e83ae1e3aadac0e8d1", "tree": "af48ca5cc4ef2173b64e421d7ad550dc10c437f0", "parents": [ "fdb5950754eb3dedb9fea7c8828d3e51d9dbc3f7" ], "author": { "name": "Kees Cook", "email": "kees@outflux.net", "time": "Thu Jan 12 17:20:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:13 2012 -0800" }, "message": "ramoops: update parameters only after successful init\n\nIf a platform device exists on the system, but ramoops fails to attach to\nit, the module parameters are overridden before ramoops can fall back and\ntry to use passed module parameters. Move update to end of init routine.\n\nSigned-off-by: Kees Cook \u003ckeescook@chromium.org\u003e\nCc: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nCc: Sergiu Iordache \u003csergiu@chromium.org\u003e\nCc: Seiji Aguchi \u003cseiji.aguchi@hds.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "fdb5950754eb3dedb9fea7c8828d3e51d9dbc3f7" }