)]}' { "log": [ { "commit": "f309532bf3e1cc1b787403d84e3039812a7dbe50", "tree": "6508ac81e94bfc137d1d9a55b973a2e0e0ac007b", "parents": [ "233e562eac549f4f719176bbddeb50c3f17a9c8d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 02 15:21:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 02 15:21:43 2012 -0700" }, "message": "tty: Revert the tty locking series, it needs more work\n\nThis reverts the tty layer change to use per-tty locking, because it\u0027s\nnot correct yet, and fixing it will require some more deep surgery.\n\nThe main revert is d29f3ef39be4 (\"tty_lock: Localise the lock\"), but\nthere are several smaller commits that built upon it, they also get\nreverted here. The list of reverted commits is:\n\n fde86d310886 - tty: add lockdep annotations\n 8f6576ad476b - tty: fix ldisc lock inversion trace\n d3ca8b64b97e - pty: Fix lock inversion\n b1d679afd766 - tty: drop the pty lock during hangup\n abcefe5fc357 - tty/amiserial: Add missing argument for tty_unlock()\n fd11b42e3598 - cris: fix missing tty arg in wait_event_interruptible_tty call\n d29f3ef39be4 - tty_lock: Localise the lock\n\nThe revert had a trivial conflict in the 68360serial.c staging driver\nthat got removed in the meantime.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fde86d310886372a377213251e72fb87aaa406c9", "tree": "d0131cf044535b71710dd61ee78b4810f5545ac3", "parents": [ "1d59d61f606547f0712aa6971f91f71154071c99" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu May 31 11:35:18 2012 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 11:59:41 2012 -0700" }, "message": "tty: add lockdep annotations\n\ntty_lock_pair() do the right thing to avoid deadlocks, but should\ninstruct LOCKDEP of this to avoid a splat.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7e5b2db77b05746613516599c916a8cc2e321077", "tree": "c3ec333ff7b77bcc8e456a3a3d19bf20f5c651b8", "parents": [ "227d1e4319ffd8729781941d92f4ae4d85beecd9", "c819baf31f5f91fbb06b2c93de2d5b8c8d096f3f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 18:27:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 18:27:19 2012 -0700" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\nPull MIPS updates from Ralf Baechle:\n \"The whole series has been sitting in -next for quite a while with no\n complaints. The last change to the series was before the weekend the\n removal of an SPI patch which Grant - even though previously acked by\n himself - appeared to raise objections. So I removed it until the\n situation is clarified. Other than that all the patches have the acks\n from their respective maintainers, all MIPS and x86 defconfigs are\n building fine and I\u0027m not aware of any problems introduced by this\n series.\n\n Among the key features for this patch series is a sizable patchset for\n Lantiq which among other things introduces support for Lantiq\u0027s\n flagship product, the FALCON SOC. It also means that the opensource\n developers behind this patchset have overtaken Lantiq\u0027s competing\n inhouse development team that was working behind closed doors.\n\n Less noteworthy the ath79 patchset which adds support for a few more\n chip variants, cleanups and fixes. Finally the usual dose of tweaking\n of generic code.\"\n\nFix up trivial conflicts in arch/mips/lantiq/xway/gpio_{ebu,stp}.c where\nprintk spelling fixes clashed with file move and eventual removal of the\nprintk.\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (81 commits)\n MIPS: lantiq: remove orphaned code\n MIPS: Remove all -Wall and almost all -Werror usage from arch/mips.\n MIPS: lantiq: implement support for FALCON soc\n MTD: MIPS: lantiq: verify that the NOR interface is available on falcon soc\n MTD: MIPS: lantiq: implement OF support\n watchdog: MIPS: lantiq: implement OF support and minor fixes\n SERIAL: MIPS: lantiq: implement OF support\n GPIO: MIPS: lantiq: convert gpio-stp-xway to OF\n GPIO: MIPS: lantiq: convert gpio-mm-lantiq to OF and of_mm_gpio\n GPIO: MIPS: lantiq: move gpio-stp and gpio-ebu to the subsystem folder\n MIPS: pci: convert lantiq driver to OF\n MIPS: lantiq: convert dma to platform driver\n MIPS: lantiq: implement support for clkdev api\n MIPS: lantiq: drop ltq_gpio_request() and gpio_to_irq()\n OF: MIPS: lantiq: implement irq_domain support\n OF: MIPS: lantiq: implement OF support\n MIPS: lantiq: drop mips_machine support\n OF: PCI: const usage needed by MIPS\n MIPS: Cavium: Remove smp_reserve_lock.\n MIPS: Move cache setup to setup_arch().\n ...\n" }, { "commit": "8f6576ad476b2a22d05ddafd2ddaee102577a4ed", "tree": "3c7e3b21dad828aa404ec5e6df5d8006cdb90815", "parents": [ "d3ca8b64b97ef4dc54d7bb0b88bbc01a1fca8cb9" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue May 29 13:45:16 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 10:42:13 2012 -0700" }, "message": "tty: fix ldisc lock inversion trace\n\nThis is caused by tty_release using tty_lock_pair to lock both sides of\nthe pty/tty pair, and then tty_ldisc_release dropping and relocking one\nside only. We can drop both fine, so drop both to avoid any lock\nordering concerns.\n\nRework the release path to fix the new locking model.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d3ca8b64b97ef4dc54d7bb0b88bbc01a1fca8cb9", "tree": "6205c4d17144485ff6ec3783463b0ed6e84bf831", "parents": [ "a01ee165a132fadb57659d26246e340d6ac53265" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue May 29 13:45:01 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 10:42:13 2012 -0700" }, "message": "pty: Fix lock inversion\n\nThe ptmx_open path takes the tty and devpts locks in the wrong order\nbecause tty_init_dev locks and returns a locked tty. As far as I can\ntell this is actually safe anyway because the tty being returned is new\nso nobody can get a reference to lock it at this point.\n\nHowever we don\u0027t even need the devpts lock at this point, it\u0027s only held\nas a byproduct of the way the locks were pushe down.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "27953437059c64d14086196eb96f43c78caa9db3", "tree": "0cfd5fb21262a6db3de0c64462847b4c0c43e9df", "parents": [ "2c757fd5d1a92086f225a75a8fac7cab242d11b0", "3c0dec5f58b3c7b3627715126d1bf9b030a076f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:42:29 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:42:29 2012 -0700" }, "message": "Merge tag \u0027clock\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc clock driver changes from Olof Johansson:\n \"The new clock subsystem was merged in linux-3.4 without any users,\n this now moves the first three platforms over to it: imx, mxs and\n spear.\n\n The series also contains the changes for the clock subsystem itself,\n since Mike preferred to have it together with the platforms that\n require these changes, in order to avoid interdependencies and\n conflicts.\"\n\nFix up trivial conflicts in arch/arm/mach-kirkwood/common.c (code\nremoved in one branch, added OF support in another) and\ndrivers/dma/imx-sdma.c (independent changes next to each other).\n\n* tag \u0027clock\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)\n clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().\n clk: Provide dummy clk_unregister()\n SPEAr: Update defconfigs\n SPEAr: Add SMI NOR partition info in dts files\n SPEAr: Switch to common clock framework\n SPEAr: Call clk_prepare() before calling clk_enable\n SPEAr: clk: Add General Purpose Timer Synthesizer clock\n SPEAr: clk: Add Fractional Synthesizer clock\n SPEAr: clk: Add Auxiliary Synthesizer clock\n SPEAr: clk: Add VCO-PLL Synthesizer clock\n SPEAr: Add DT bindings for SPEAr\u0027s timer\n ARM i.MX: remove now unused clock files\n ARM: i.MX6: implement clocks using common clock framework\n ARM i.MX35: implement clocks using common clock framework\n ARM i.MX5: implement clocks using common clock framework\n ARM: Kirkwood: Replace clock gating\n ARM: Orion: Audio: Add clk/clkdev support\n ARM: Orion: PCIE: Add support for clk\n ARM: Orion: XOR: Add support for clk\n ARM: Orion: CESA: Add support for clk\n ...\n" }, { "commit": "c819baf31f5f91fbb06b2c93de2d5b8c8d096f3f", "tree": "f42e91e56894b07555f0137b60e81c5e7505c4f4", "parents": [ "442209f31dafef9fde852858e1ce566b675b720d", "39faa24688a0574bf2f89e1a0702c176f99bad1f", "a3c8b4faeeccb33dbad6969bc9e50bf409f167e7", "baab01b26685b8f0af9092aaee73d8a70c31e55c", "9598111f49ade848aa44f431ee81a42a000c8b3c", "009d6914f14d6c12a073e9ff8506a53047c308e7" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Sat May 26 19:55:48 2012 +0100" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Sat May 26 19:55:48 2012 +0100" }, "message": "Merge branches \u0027fixes-for-linus\u0027, \u0027generic\u0027, \u0027cavium\u0027, \u0027module.h-fixes\u0027, \u0027next/ath79\u0027 and \u0027next/lantiq\u0027 into mips-for-linux-next\n" }, { "commit": "d5b4bb4d103cd601d8009f2d3a7e44586c9ae7cc", "tree": "0f3b6da2b66fc7a4278764982279c2815c913010", "parents": [ "c80ddb526331a72c9e9d1480f85f6fd7c74e3d2d", "bb8187d35f820671d6dd76700d77a6b55f95e2c5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 17:12:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 17:12:06 2012 -0700" }, "message": "Merge branch \u0027delete-mca\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull the MCA deletion branch from Paul Gortmaker:\n \"It was good that we could support MCA machines back in the day, but\n realistically, nobody is using them anymore. They were mostly limited\n to 386-sx 16MHz CPU and some 486 class machines and never more than\n 64MB of RAM. Even the enthusiast hobbyist community seems to have\n dried up close to ten years ago, based on what you can find searching\n various websites dedicated to the relatively short lived hardware.\n\n So lets remove the support relating to CONFIG_MCA. There is no point\n carrying this forward, wasting cycles doing routine maintenance on it;\n wasting allyesconfig build time on validating it, wasting I/O on git\n grep\u0027ping over it, and so on.\"\n\nLet\u0027s see if anybody screams. It generally has compiled, and James\nBottomley pointed out that there was a MCA extension from NCR that\nallowed for up to 4GB of memory and PPro-class machines. So in *theory*\nthere may be users out there.\n\nBut even James (technically listed as a maintainer) doesn\u0027t actually\nhave a system, and while Alan Cox claims to have a machine in his cellar\nthat he offered to anybody who wants to take it off his hands, he didn\u0027t\nargue for keeping MCA support either.\n\nSo we could bring it back. But somebody had better speak up and talk\nabout how they have actually been using said MCA hardware with modern\nkernels for us to do that. And David already took the patch to delete\nall the networking driver code (commit a5e371f61ad3: \"drivers/net:\ndelete all code/drivers depending on CONFIG_MCA\").\n\n* \u0027delete-mca\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n MCA: delete all remaining traces of microchannel bus support.\n scsi: delete the MCA specific drivers and driver code\n serial: delete the MCA specific 8250 support.\n arm: remove ability to select CONFIG_MCA\n" }, { "commit": "44bc40e1489622234169786b0ad5a1f4a01e1090", "tree": "cd247a6f130b8993e92ac62f76ced2b023491d09", "parents": [ "02171b4a7c5b555d08c3321332e0c45776518276", "ead91d4b8c3b1fb08a73aaa4a191230ecf717ee0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 11:16:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 11:16:40 2012 -0700" }, "message": "Merge branch \u0027x86-platform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86 platform changes from Ingo Molnar:\n \"This tree includes assorted platform driver updates and a preparatory\n series for a platform with custom DMA remapping semantics (sta2x11 I/O\n hub).\"\n\n* \u0027x86-platform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86/vsmp: Fix number of CPUs when vsmp is disabled\n keyboard: Use BIOS Keyboard variable to set Numlock\n x86/olpc/xo1/sci: Report RTC wakeup events\n x86/olpc/xo1/sci: Produce wakeup events for buttons and switches\n x86, platform: Initial support for sta2x11 I/O hub\n x86: Introduce CONFIG_X86_DMA_REMAP\n x86-32: Introduce CONFIG_X86_DEV_DMA_OPS\n" }, { "commit": "1d767cae4dbd4116fc3b2cc3251a20760f98339f", "tree": "79a1a48a67a9b4296ce062d61ee863fe7a46c77f", "parents": [ "6101167727932a929e37fb8a6eeb68bdbf54d58e", "5f19f14fed7786652b9617c633db101d26a42251" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 09:00:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 09:00:40 2012 -0700" }, "message": "Merge tag \u0027sh-for-linus\u0027 of git://github.com/pmundt/linux-sh\n\nPull SuperH updates from Paul Mundt:\n - New CPUs: SH7734 (SH-4A), SH7264 and SH7269 (SH-2A)\n - New boards: RSK2+SH7264, RSK2+SH7269\n - Unbreaking kgdb for SMP\n - Consolidation of _32/_64 page fault handling.\n - watchdog and legacy DMA chainsawing, part 1\n - Conversion to evt2irq() hwirq lookup, to support relocation of\n vectored IRQs for irqdomains.\n\n* tag \u0027sh-for-linus\u0027 of git://github.com/pmundt/linux-sh: (98 commits)\n sh: intc: Kill off special reservation interface.\n sh: Enable PIO API for hp6xx and se770x.\n sh: Kill off machvec IRQ hinting.\n sh: dma: More legacy cpu dma chainsawing.\n sh: Kill off MAX_DMA_ADDRESS leftovers.\n sh: Tidy up some of the cpu legacy dma header mess.\n sh: Move sh4a dma header from cpu-sh4 to cpu-sh4a.\n sh64: Fix up vmalloc fault range check.\n Revert \"sh: Ensure fixmap and store queue space can co-exist.\"\n serial: sh-sci: Fix for port types without BRI interrupts.\n sh: legacy PCI evt2irq migration.\n sh: cpu dma evt2irq migration.\n sh: sh7763rdp evt2irq migration.\n sh: sdk7780 evt2irq migration.\n sh: migor evt2irq migration.\n sh: landisk evt2irq migration.\n sh: kfr2r09 evt2irq migration.\n sh: ecovec24 evt2irq migration.\n sh: ap325rxa evt2irq migration.\n sh: urquell evt2irq migration.\n ...\n" }, { "commit": "94b5aff4c6f72fee6b0f49d49e4fa8b204e8ded9", "tree": "39197121b6ef8cddaa0f4057fe24b4ced58e8982", "parents": [ "5d4e2d08e7fdf7339f84a1c670d296a77e02f881", "59bd234b72fc29887839d792b7d6c7e8d2a577a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:12:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:12:24 2012 -0700" }, "message": "Merge tag \u0027tty-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull TTY updates from Greg Kroah-Hartman:\n \"Here\u0027s the big TTY/serial driver pull request for the 3.5-rc1 merge\n window.\n\n Nothing major in here, just lots of incremental changes from Alan and\n Jiri reworking some tty core things to behave better and to get a more\n solid grasp on some of the nasty tty locking issues.\n\n There are a few tty and serial driver updates in here as well.\n\n All of this has been in the linux-next releases for a while with no\n problems.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027tty-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (115 commits)\n serial: bfin_uart: Make MMR access compatible with 32 bits bf609 style controller.\n serial: bfin_uart: RTS and CTS MMRs can be either 16-bit width or 32-bit width.\n serial: bfin_uart: narrow the reboot condition in DMA tx interrupt\n serial: bfin_uart: Adapt bf5xx serial driver to bf60x serial4 controller.\n Revert \"serial_core: Update buffer overrun statistics.\"\n tty: hvc_xen: NULL dereference on allocation failure\n tty: Fix LED error return\n tty: Allow uart_register/unregister/register\n tty: move global ldisc idle waitqueue to the individual ldisc\n serial8250-em: Add DT support\n serial8250-em: clk_get() IS_ERR() error handling fix\n serial_core: Update buffer overrun statistics.\n tty: drop the pty lock during hangup\n cris: fix missing tty arg in wait_event_interruptible_tty call\n tty/amiserial: Add missing argument for tty_unlock()\n tty_lock: Localise the lock\n pty: Lock the devpts bits privately\n tty_lock: undo the old tty_lock use on the ctty\n serial8250-em: Emma Mobile UART driver V2\n Add missing call to uart_update_timeout()\n ...\n" }, { "commit": "813a95e5b4fa936bbde10ef89188932745dcd7f4", "tree": "571ca345861ffb89b45fabe26fcab4e133c8537b", "parents": [ "9f639269ed1522c7d69c54cc8b80ab8ee53fcb10", "f3f08dcb9965f42378851ce888fb7539607712e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:39:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:39:42 2012 -0700" }, "message": "Merge tag \u0027pinctrl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm soc-specific pinctrl changes from Olof Johansson:\n \"With this, five platforms are moving to the relatively new pinctrl\n subsystem for their pin management, replacing the older soc specific\n in-kernel interfaces with common code.\n\n There is quite a bit of net addition of code for each platform being\n added to the pinctrl subsystem. But the payback comes later when\n adding new boards can be done by only providing new device trees\n instead.\"\n\nFix up trivial conflicts in arch/arm/mach-ux500/{Makefile,board-mop500.c}\n\n* tag \u0027pinctrl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)\n mtd: nand: gpmi: fix compile error caused by pinctrl call\n ARM: PRIMA2: select PINCTRL and PINCTRL_SIRF in Kconfig\n ARM: nomadik: enable PINCTRL_NOMADIK where needed\n ARM: mxs: enable pinctrl support\n video: mxsfb: adopt pinctrl support\n ASoC: mxs-saif: adopt pinctrl support\n i2c: mxs: adopt pinctrl support\n mtd: nand: gpmi: adopt pinctrl support\n mmc: mxs-mmc: adopt pinctrl support\n serial: mxs-auart: adopt pinctrl support\n serial: amba-pl011: adopt pinctrl support\n spi/imx: adopt pinctrl support\n i2c: imx: adopt pinctrl support\n can: flexcan: adopt pinctrl support\n net: fec: adopt pinctrl support\n ARM: ux500: switch MSP to using pinctrl for pins\n ARM: ux500: alter MSP registration to return a device pointer\n ARM: ux500: switch to using pinctrl for uart0\n ARM: ux500: delete custom pin control system\n ARM: ux500: switch over to Nomadik pinctrl driver\n ...\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": "ceff2676b04943638c6f599ffe4e99efb89aa625", "tree": "89cec041c10a93cddf7d9bce513eda7d1b611685", "parents": [ "54f30066178d4ff2da8e62427975736131cdbf96" ], "author": { "name": "John Crispin", "email": "blogic@openwrt.org", "time": "Fri Apr 13 09:37:09 2012 +0200" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Mon May 21 14:31:54 2012 +0100" }, "message": "SERIAL: MIPS: lantiq: implement OF support\n\nAdd devicetree and handling for our new clkdev clocks. The patch is rather\nstraightforward. .of_match_table is set and the 3 irqs are now loaded from the\ndevicetree.\n\nThis series converts the lantiq target to clkdev amongst other things. The\ndriver needs to handle two clocks now. The fpi bus clock used to derive the\ndivider and the clock gate needed on some socs to make the secondary port work.\n\nSigned-off-by: John Crispin \u003cblogic@openwrt.org\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: linux-serial@vger.kernel.org\nCc: linux-mips@linux-mips.org\nPatchwork: https://patchwork.linux-mips.org/patch/3809/\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "0e8963de1fe95e7fbc30c79c1dbc7cb1ea0cf699", "tree": "73d4cd5d27b345751488f3b10799b6b4daf61bae", "parents": [ "c1dbccc3c7cc70e8211a7ad6ba55ecbc18e77a5a" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri May 18 18:21:06 2012 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri May 18 18:21:06 2012 +0900" }, "message": "serial: sh-sci: Fix for port types without BRI interrupts.\n\nIn doing the evt2irq() + muxed vector conversion for various port types\nit became apparent that some of the legacy port types will presently\nerror out due to the irq requesting logic attempting to acquire the\nnon-existent BRI IRQ. This adds some sanity checks to the request/free\npath to ensure that non-existence of a source in itself is not an error.\n\nThis should restore functionality for legacy PORT_SCI ports.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "c1dbccc3c7cc70e8211a7ad6ba55ecbc18e77a5a", "tree": "570fbd1ab42d12257a820460fae0e6e7bc891900", "parents": [ "00d6025e58c6e3b229e28cab721c568af5b1ae05", "58796ce67a80e8725220af83c5a550bf6a4dab12" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri May 18 18:13:27 2012 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri May 18 18:13:27 2012 +0900" }, "message": "Merge branch \u0027sh/evt2irq-migration\u0027 into sh-latest\n\nConflicts:\n\tarch/sh/kernel/cpu/sh3/setup-sh770x.c\n\tarch/sh/kernel/cpu/sh3/setup-sh7710.c\n\tarch/sh/kernel/cpu/sh3/setup-sh7720.c\n\tarch/sh/kernel/cpu/sh4/setup-sh7750.c\n\tarch/sh/kernel/cpu/sh4a/setup-sh7343.c\n\tarch/sh/kernel/cpu/sh4a/setup-sh7366.c\n\tarch/sh/kernel/cpu/sh4a/setup-sh7722.c\n\tarch/sh/kernel/cpu/sh4a/setup-sh7723.c\n\tarch/sh/kernel/cpu/sh4a/setup-sh7724.c\n\tarch/sh/kernel/cpu/sh4a/setup-sh7757.c\n\tarch/sh/kernel/cpu/sh4a/setup-sh7763.c\n\tarch/sh/kernel/cpu/sh4a/setup-sh7770.c\n\tarch/sh/kernel/cpu/sh4a/setup-sh7785.c\n\tarch/sh/kernel/cpu/sh4a/setup-sh7786.c\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "d157be852f6c76dc467f3a03b89263880e14c513", "tree": "4ecbc719f62e8f7bb7344efde3ca4febc20ca407", "parents": [ "281f4d9ce7326b48e4d770ef689b97edb69e97da" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed May 16 20:27:32 2012 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu May 17 19:02:14 2012 -0400" }, "message": "serial: delete the MCA specific 8250 support.\n\nThe support for CONFIG_MCA is being removed, since the 20\nyear old hardware simply isn\u0027t capable of meeting today\u0027s\nsoftware demands on CPU and memory resources.\n\nThis commit removes the MCA specific 8250 UART code.\n\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: linux-serial@vger.kernel.org\nAcked-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "59bd234b72fc29887839d792b7d6c7e8d2a577a6", "tree": "88bf5f49e90ccb7300621c23076355b392574715", "parents": [ "3c2d0ed221a22ce2c1c9fe1e2d6142374917642e" ], "author": { "name": "Sonic Zhang", "email": "sonic.zhang@analog.com", "time": "Wed May 16 14:22:26 2012 +0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu May 17 13:25:56 2012 -0700" }, "message": "serial: bfin_uart: Make MMR access compatible with 32 bits bf609 style controller.\n\nSimplify serial data width calculation and adapt to bf609 LCR bit mask.\n\nSigned-off-by: Sonic Zhang \u003csonic.zhang@analog.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "3c2d0ed221a22ce2c1c9fe1e2d6142374917642e", "tree": "2cd3baf5f365b8cf0b6f5be019594f77b409d3c0", "parents": [ "239c25b1a03cf57193b9a52623deb918adf6132e" ], "author": { "name": "Sonic Zhang", "email": "sonic.zhang@analog.com", "time": "Wed May 16 14:22:25 2012 +0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu May 17 13:25:56 2012 -0700" }, "message": "serial: bfin_uart: RTS and CTS MMRs can be either 16-bit width or 32-bit width.\n\nChange hardware flow control code to adapt to both bf5xx and bf60x.\nDisabled serial device before set termios for bf60x.\n\nSigned-off-by: Sonic Zhang \u003csonic.zhang@analog.com\u003e\nSigned-off-by: Bob Liu \u003clliubbo@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "239c25b1a03cf57193b9a52623deb918adf6132e", "tree": "8ac6c54d5b5a15d8efef65c4f40caaa8bed18fdb", "parents": [ "b06d2f20cdf57841b309d30d895b1fd502655e48" ], "author": { "name": "Sonic Zhang", "email": "sonic.zhang@analog.com", "time": "Wed May 16 14:22:24 2012 +0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu May 17 13:25:56 2012 -0700" }, "message": "serial: bfin_uart: narrow the reboot condition in DMA tx interrupt\n\nCheck if xmit buffer pointers are set to zero.\n\nSigned-off-by: Sonic Zhang \u003csonic.zhang@analog.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "b06d2f20cdf57841b309d30d895b1fd502655e48", "tree": "dd86c8d2ef8e1d97403988f9dc2d1d4bbd3e7f50", "parents": [ "55e4b8b416849753bd7eacd1f2ac3947fcf1c78e" ], "author": { "name": "Sonic Zhang", "email": "sonic.zhang@analog.com", "time": "Wed May 16 14:22:23 2012 +0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu May 17 13:25:55 2012 -0700" }, "message": "serial: bfin_uart: Adapt bf5xx serial driver to bf60x serial4 controller.\n\nThe serial4 controller on bf60x is an enhanced version of serial controller\non bf5xx. MMR size is 32 bits other than 16 bits. MMR GCTL, MCR and LCR are\ncombined into one control MMR. MSR and LSR are combined into one status MMR.\n\nThis patch adapts current bf5xx serial driver to serial4 controller on bf60x.\n\nSigned-off-by: Sonic Zhang \u003csonic.zhang@analog.com\u003e\nSigned-off-by: Bob Liu \u003clliubbo@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "55e4b8b416849753bd7eacd1f2ac3947fcf1c78e", "tree": "b00cc75f291a837475da07b60dec589d565dcd91", "parents": [ "bdb595b4a906b8124d0dc5ff852f84302e2e7955" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue May 15 09:44:22 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue May 15 09:44:22 2012 -0700" }, "message": "Revert \"serial_core: Update buffer overrun statistics.\"\n\nThis reverts commit 642180871bc91afebb6ccf40d1615a7dd33699a3.\n\nBuffer overruns are for hardware reported overruns, not software ones,\nwhich will only happen if we run out of memory and you will get lots of\n-ENOMEM errors at the same time.\n\nThanks to Alan Cox for catching this.\n\nReported-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Corbin Atkinson \u003ccorbinat@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "346f81a9a9726740461480e257366c47fbcfdaa3", "tree": "e9c210091d248de877e5c7c70168b623a8c3dc7a", "parents": [ "cc06748cf00e6a4accb18c1b70079dccffc69c37" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Feb 28 19:24:45 2012 -0500" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Tue May 15 17:48:50 2012 +0200" }, "message": "SERIAL: MIPS Swarm sb1250-duart.c driver needs module.h\n\nThis driver is a module and needs module.h, otherwise it will break when\nwe remove a bogus usage of module.h from one of the other MIPS headers.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nCc: linux-mips@linux-mips.org\nPatchwork: https://patchwork.linux-mips.org/patch/3447/\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "cc06748cf00e6a4accb18c1b70079dccffc69c37", "tree": "7ed2b4005dcd26dd52786a9114c2de373474d1d4", "parents": [ "36be50515fe2aef61533b516fa2576a2c7fe7664" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Feb 28 19:24:44 2012 -0500" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Tue May 15 17:48:50 2012 +0200" }, "message": "SERIAL: MIPS DECstation zs.c driver needs module.h\n\nThis driver is a module and needs module.h, otherwise it will break when we\nremove a bogus usage of module.h from one of the other MIPS headers.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nCc: linux-mips@linux-mips.org\nPatchwork: https://patchwork.linux-mips.org/patch/3446/\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "bdb595b4a906b8124d0dc5ff852f84302e2e7955", "tree": "a4fc2dd1b5b52690b030845a05525cec0d267cc5", "parents": [ "05f843b5d3406c29c8af7d1eb39ea9143b21d6dc" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Tue May 15 11:47:47 2012 +0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue May 15 08:48:45 2012 -0700" }, "message": "tty: hvc_xen: NULL dereference on allocation failure\n\nIf kzalloc() returns a NULL here, we pass a NULL to\nxencons_disconnect_backend() which will cause an Oops.\n\nAlso I removed the __GFP_ZERO while I was at it since kzalloc() implies\n__GFP_ZERO.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nAcked-by: Stefano Stabellini \u003cstefano.stabellini@eu.citrix.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "eea41aee2bfad4cf5c84e1cab8aa068c66206651", "tree": "6da3eaa10d8548f6770e4566e139b1128706ded7", "parents": [ "9ff00d58a915b6747ba2e843ab2d04c712b4dc32" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Mon May 14 14:41:31 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 14 10:43:24 2012 -0700" }, "message": "tty: Fix LED error return\n\n3.4-rc introduced a regression when setting the LEDS. We do the right thing\nbut then return an error code.\n\nResolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id\u003d43144\nReported-by: Christian Casteyde\nSigned-off-by: Alan Cox \u003calan@linux/intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "05f843b5d3406c29c8af7d1eb39ea9143b21d6dc", "tree": "f054e7a60b9ec0a130e4e652121d7695cda8fd53", "parents": [ "1e66cded334e6cea596c72f6f650eec351b1e959" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Mon May 14 14:41:31 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon May 14 09:04:28 2012 -0700" }, "message": "tty: Fix LED error return\n\n3.4-rc introduced a regression when setting the LEDS. We do the right thing\nbut then return an error code.\n\nResolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id\u003d43144\nReported-by: Christian Casteyde\nSigned-off-by: Alan Cox \u003calan@linux/intel.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "1e66cded334e6cea596c72f6f650eec351b1e959", "tree": "ab344befd3d74f3ff168d0ab264adb3020e60a34", "parents": [ "1541f845d123a48fbca3cee32b2963b3fb3da83a" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Mon May 14 14:51:22 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon May 14 09:04:28 2012 -0700" }, "message": "tty: Allow uart_register/unregister/register\n\nThis is legitimate but because we don\u0027t clear the drv-\u003estate pointer in the\nunregister code causes a bogus BUG().\n\nResolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id\u003d42880\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "fcd8d84a585f3578a9ebdd27e757495a27415322", "tree": "58f37676ad56d322e47d0fa7343afb85445f7649", "parents": [ "eae0185a9677d3ff0c1781ee196f2ef42deb0ea1", "66a2886d867343eff6bf2646bea2c923d0cbf620", "4f5a9fd341e8ffd825ecf56155df6fe6c3d732b1" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 17:43:35 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 17:43:59 2012 +0200" }, "message": "Merge branches \u0027spear/clock\u0027 and \u0027imx/clock\u0027 into next/clock\n\nUpdated to resolve dependencies.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "4f5a9fd341e8ffd825ecf56155df6fe6c3d732b1", "tree": "ac23c7b80154a476db3882d92f079c50c919e2fa", "parents": [ "c818f97bc3266f0fbf619f2348d951272f8ac335", "a0f5e3631b07cabf624e7d818df76d47d9d21017" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 15:30:52 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 15:30:52 2012 +0200" }, "message": "Merge branch \u0027imx/pinctrl\u0027 into imx/clock\n\nConflicts:\n\tdrivers/mmc/host/sdhci-esdhc-imx.c\n\tdrivers/net/ethernet/freescale/fec.c\n\tdrivers/spi/spi-imx.c\n\tdrivers/tty/serial/imx.c\n\nThis resolves dependencies between the pinctrl and clock changes\nin imx.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "2e174c3373bdbb4a4f35ac48d7c7fea181062f6f", "tree": "28dbab59b7add82dd59c778969ce67d376e699df", "parents": [ "258e055111d3cde2607e0d04eb91da2f7a59b591" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sun May 06 22:54:26 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sat May 12 09:43:13 2012 +0800" }, "message": "serial: mxs-auart: adopt pinctrl support\n\nCc: linux-serial@vger.kernel.org\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "258e055111d3cde2607e0d04eb91da2f7a59b591", "tree": "cc66d659a6709111ab2df1b7b41f1de334b1795d", "parents": [ "dffa27e7a8626ed2d64f027b0f844fe6fe438c11" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sun May 06 22:53:35 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sat May 12 09:43:12 2012 +0800" }, "message": "serial: amba-pl011: adopt pinctrl support\n\nCc: linux-serial@vger.kernel.org\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "93c6d8927fa692faef3d7d945bd4fe84b0185ad4", "tree": "0a971c86114656ec4e39f7789d9faeb70432c36a", "parents": [ "ea01d31a07ae182028d2398380948f5a4ee09953", "50260924afd4b745bfb6e5f1caee381a1875fc31" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri May 11 17:15:31 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri May 11 17:15:31 2012 +0200" }, "message": "Merge branch \u0027clk/mxs\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6 into next/clock\n\nShawn Guo \u003cshawn.guo@linaro.org\u003e writes:\n\n mxs common clk porting for v3.5. It depends on the following two branches.\n\n [1] git://git.linaro.org/people/mturquette/linux.git clk-next\n [2] http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git clkdev\n\n As the mxs device tree conversion will constantly touch clock files,\n to save the conflicts, the updated mxs/dt branch coming later will\n based on this pull-request.\n\n* \u0027clk/mxs\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6:\n ARM: mxs: remove now unused timer_clk argument from mxs_timer_init\n ARM: mxs: remove old clock support\n ARM: mxs: switch to common clk framework\n ARM: mxs: change the lookup name for fec phy clock\n ARM: mxs: request clock for timer\n clk: mxs: add clock support for imx28\n clk: mxs: add clock support for imx23\n clk: mxs: add mxs specific clocks\n\nIncludes an update to Linux 3.4-rc6\n\nConflicts:\n\tdrivers/clk/Makefile\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "86822f816fc9a42fd210e35d4881e988406497c0", "tree": "3bed5cb7891ef73eea4c58bdf105b98f4ff77a4a", "parents": [ "d211093fbad99e6c38e168f71ca2ede64a51fe58", "304b2c684e42af5b72d643322f783d88538dc817" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri May 11 16:18:22 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri May 11 16:18:22 2012 +0200" }, "message": "Merge branch \u0027clps711x/cleanup\u0027 into next/cleanup\n\nA single patch from Alexander Shiyan \u003cshc_work@mail.ru\u003e:\n\n* clps711x/cleanup:\n ARM: clps711x: Using a single definition for the PHYS and VIRT registers offset\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "304b2c684e42af5b72d643322f783d88538dc817", "tree": "9e5fac4f8873a228a1f433f6f1e4dc6d8ad91f2e", "parents": [ "69964ea4c7b68c9399f7977aa5b9aa6539a6a98a" ], "author": { "name": "Alexander Shiyan", "email": "shc_work@mail.ru", "time": "Sun May 06 09:21:57 2012 +0400" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri May 11 16:18:01 2012 +0200" }, "message": "ARM: clps711x: Using a single definition for the PHYS and VIRT registers offset\n\nUsing a single definition for the physical and virtual address register for all\nvariants boards clps711x. This patch also includes the use of a single function\nclps_read/write in some units.\n\nSigned-off-by: Alexander Shiyan \u003cshc_work@mail.ru\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "fed78ce4c6af1c0d516ae6f4cdc2bb8dbbca8c22", "tree": "ec3ba0c39cb7e5817f9a54005649e47e4a2d2636", "parents": [ "e62d8b8fe73518d1875371a2ee9c5fdd31eba6f8" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sun May 06 20:21:05 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Fri May 11 15:01:57 2012 +0800" }, "message": "tty: serial: imx: adopt pinctrl support\n\nCc: linux-serial@vger.kernel.org\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Dong Aisheng \u003cdong.aisheng@linaro.org\u003e\n" }, { "commit": "1541f845d123a48fbca3cee32b2963b3fb3da83a", "tree": "ace9a1f9278ea84101359d189894c71548193136", "parents": [ "3e62c413fb0c75c8cfaf086d00a9ecc6b55009d6" ], "author": { "name": "Ivo Sieben", "email": "meltedpianoman@gmail.com", "time": "Thu May 03 14:37:43 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu May 10 11:24:03 2012 -0700" }, "message": "tty: move global ldisc idle waitqueue to the individual ldisc\n\nThe global wait_queue that is used for line discipline idle handling is\nmoved to a separate wait_queue for each line instance. This prevents\nunnecessary blocking on one line, because of idle handling on another\nline.\n\nSigned-off-by: Ivo Sieben \u003cmeltedpianoman@gmail.com\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "15f99cbd071aa402e113d342448603344a337046", "tree": "56f98892d1bd38029988eb8931e2321ef7e79aa0", "parents": [ "b2212ea41dacda8cce0e7681a3a6ccc76c63802e", "41797f75486d8ca3b98d7658c2a506ac7879a8e5" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu May 10 11:51:07 2012 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu May 10 11:51:07 2012 +0900" }, "message": "Merge branch \u0027sh/rsk-updates\u0027 into sh-latest\n\nConflicts:\n\tarch/sh/Kconfig\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "3e62c413fb0c75c8cfaf086d00a9ecc6b55009d6", "tree": "75d80e1e25122b6b9f5bf157f7d27dc480f9bf2b", "parents": [ "94e792ab66d696aad2e52c91bae4cfbeefe4c9f6" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Wed May 09 15:55:14 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 09 15:11:31 2012 -0700" }, "message": "serial8250-em: Add DT support\n\nUpdate the 8250_em driver to support DT.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "94e792ab66d696aad2e52c91bae4cfbeefe4c9f6", "tree": "7305a6bc6e602c2edbb03dfd7c13168fbafa8145", "parents": [ "642180871bc91afebb6ccf40d1615a7dd33699a3" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Wed May 09 15:49:57 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 09 15:11:30 2012 -0700" }, "message": "serial8250-em: clk_get() IS_ERR() error handling fix\n\nUpdate the 8250_em driver to correctly handle the case\nwhere no clock is associated with the device.\n\nThe return value of clk_get() needs to be checked with\nIS_ERR() to avoid NULL pointer referencing.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "642180871bc91afebb6ccf40d1615a7dd33699a3", "tree": "10026174fd0c41dd5169160abfbf23928100a313", "parents": [ "b1d679afd766cf425ba1cd2a0fd17451bd212f4a" ], "author": { "name": "Corbin Atkinson", "email": "corbinat@gmail.com", "time": "Fri May 04 12:35:10 2012 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 09 14:41:54 2012 -0700" }, "message": "serial_core: Update buffer overrun statistics.\n\nCurrently, serial drivers don\u0027t report buffer overruns. When a buffer overrun\noccurs, tty_insert_flip_char returns 0, and no attempt is made to insert that\nsame character again (i.e. it is lost). This patch reports buffer overruns via\nthe buf_overrun field in the port\u0027s icount structure.\n\nSigned-off-by: Corbin Atkinson \u003ccorbin.atkinson@ni.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "b1d679afd766cf425ba1cd2a0fd17451bd212f4a", "tree": "e1f46c9c1856c654bd52d9a32d19574754f16e76", "parents": [ "fd11b42e3598779cb25feaefb1d534a39fc35009" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Wed May 09 17:03:19 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 09 14:40:27 2012 -0700" }, "message": "tty: drop the pty lock during hangup\n\nIn theory we don\u0027t need it, in practice we are hitting some ill understood\ndeadlock when we don\u0027t drop it. The old code dropped it here so we are not\nundoing anything problematic for pty. If pty could be unloaded it would be\na problem but it can\u0027t.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "b2d0b7a061bfddd27155c7dcd53f365d9dc0c7c3", "tree": "8063c6df479723b7adc509ee2aad728889faa9a4", "parents": [ "c2c21e9bb17549e8add4ff76931bcec2e2d3ad48" ], "author": { "name": "Joshua Cov", "email": "joshuacov@googlemail.com", "time": "Fri Apr 13 21:08:26 2012 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Tue May 08 14:19:41 2012 -0700" }, "message": "keyboard: Use BIOS Keyboard variable to set Numlock\n\nThe PC BIOS does provide a NUMLOCK flag containing the desired state\nof this LED. This patch sets the current state according to the data\nin the bios.\n\n[ hpa: fixed __weak declaration without definition, changed \"inline\"\n to \"static inline\" ]\n\nSigned-Off-By: Joshua Cov \u003cjoshuacov@googlemail.com\u003e\nLink: http://lkml.kernel.org/r/CAKL7Q7rvq87TNS1T_Km8fW_5OzS%2BSbYazLXKxW-6ztOxo3zorg@mail.gmail.com\nAcked-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "fd11b42e3598779cb25feaefb1d534a39fc35009", "tree": "03af637830cd5f6beb5e14852098949357713fac", "parents": [ "abcefe5fc357440bde93f97ba1c72c3b81e2cef5" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue May 08 11:17:55 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue May 08 08:58:01 2012 -0700" }, "message": "cris: fix missing tty arg in wait_event_interruptible_tty call\n\nCommit d29f3ef39be4eec0362b985305fc526d9be318cf\n\n \"tty_lock: Localise the lock\"\n\nadded a tty arg to wait_event_interruptible_tty() but it missed\nthis arch specific instance for cris, causing a compile failure.\n\nCc: Mikael Starvik \u003cstarvik@axis.com\u003e\nCc: Jesper Nilsson \u003cjesper.nilsson@axis.com\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "abcefe5fc357440bde93f97ba1c72c3b81e2cef5", "tree": "392a8dbfe176b77f855efb421fac399e00a39e4d", "parents": [ "d29f3ef39be4eec0362b985305fc526d9be318cf" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Mon May 07 21:36:06 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon May 07 16:46:53 2012 -0700" }, "message": "tty/amiserial: Add missing argument for tty_unlock()\n\ncommit d29f3ef39be4eec0362b985305fc526d9be318cf (\"tty_lock: Localise the lock\")\nmissed that d3a7b83f865b46bb7b5e1ed18a129ce1af349db4 (\"drivers/tty/amiserial.c:\nadd missing tty_unlock\") just added a new caller of tty_unlock():\n\ndrivers/tty/amiserial.c: In function ‘set_serial_info’:\ndrivers/tty/amiserial.c:1077: error: too few arguments to function ‘tty_unlock’\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "d29f3ef39be4eec0362b985305fc526d9be318cf", "tree": "35da6af15a899ca767841b864cb1ef290a0f3d4a", "parents": [ "d739e65bb21d34f0f5d3bf4048410e534fbec148" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu May 03 22:24:08 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri May 04 16:58:47 2012 -0700" }, "message": "tty_lock: Localise the lock\n\nIn each remaining case the tty_lock is associated with a specific tty. This\nmeans we can now lock on a per tty basis. We do need tty_lock_pair() for\nthe pty case. Uglier but still a step in the right direction.\n\n[fixed up calls in 3 missing drivers - gregkh]\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "d739e65bb21d34f0f5d3bf4048410e534fbec148", "tree": "4a64becf77444c5b269449cd99bc4bbe31175e7d", "parents": [ "3af502b96649ccb7462da73b0cca446c8384b155" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu May 03 22:22:09 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri May 04 16:48:37 2012 -0700" }, "message": "pty: Lock the devpts bits privately\n\nThis is a private pty affair, we don\u0027t want to tangle it with the tty_lock\nany more as we know all the other non tty locking is now handled by the vfs\nso we too can move.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "3af502b96649ccb7462da73b0cca446c8384b155", "tree": "8d2f1a77e25354c69d61192e544bedb681cbb80e", "parents": [ "22886ee96895b7a9f9d06da4dc9420b61b4ef1f7" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu May 03 22:21:53 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri May 04 16:47:38 2012 -0700" }, "message": "tty_lock: undo the old tty_lock use on the ctty\n\nget_current_tty has its own consistent locking. That means a pile of the\ntty lock cases are not needed. As get_current_tty also keeps a reference the\ntty object lifetime means we can propogate the lock removal out.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "22886ee96895b7a9f9d06da4dc9420b61b4ef1f7", "tree": "ce6a442c280827b21da66c771aaec9a4e8613193", "parents": [ "8b979f7c6bf13a57e7b6002f1175312a44773960" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Thu May 03 21:13:09 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri May 04 16:45:07 2012 -0700" }, "message": "serial8250-em: Emma Mobile UART driver V2\n\nThis is V2 of the Emma Mobile 8250 platform driver.\n\nThe hardware itself has according to the data sheet\nup to 64 byte FIFOs but at this point we only make\nuse of the 16550 compatible mode.\n\nTo support this piece of hardware the common UART\nregisters need to be remapped, and the access size\ndifferences need to be handled.\n\nThe DLL and DLM registers can due to offset collision\nnot be remapped easily, and because of that this\ndriver makes use of -\u003edl_read() and -\u003edl_write()\ncallbacks. This in turn requires a registration\nfunction that takes 8250-specific paramenters.\n\nFuture potential enhancements include DT support,\nearly platform driver console and fine grained PM.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "8b979f7c6bf13a57e7b6002f1175312a44773960", "tree": "bcf32314da50f4abb6faf25457a9d34d208fd3e0", "parents": [ "e391edb727f51094582d39a29a94a83bc9c014e8" ], "author": { "name": "Lothar Waßmann", "email": "LW@KARO-electronics.de", "time": "Thu May 03 11:37:12 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri May 04 16:42:15 2012 -0700" }, "message": "Add missing call to uart_update_timeout()\n\nThis patch fixes a problem reported here:\nhttp://article.gmane.org/gmane.linux.ports.arm.kernel/155242/match\u003dauart\n\nSigned-off-by: Lothar Waßmann \u003cLW@KARO-electronics.de\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "e391edb727f51094582d39a29a94a83bc9c014e8", "tree": "099e0294f8e2b1e929a3ee083a65ac377641d967", "parents": [ "f73fa05b90eb8c0dd3230c364cf1107f4f8f3848" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Wed May 02 17:57:17 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri May 04 16:42:14 2012 -0700" }, "message": "tty: mxser: local variables should not be exposed globally\n\nThe variable \u0027mxser_port_ops\u0027 is only referenced in this file and\nshould be marked static to prevent it from being exposed globally.\n\nQuites the sparse warning:\n\nwarning: symbol \u0027mxser_port_ops\u0027 was not declared. Should it be static?\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nCc: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "f73fa05b90eb8c0dd3230c364cf1107f4f8f3848", "tree": "b28d870c2547a170be454c3584a51278ef8dd6af", "parents": [ "e8155629ff19e05722ba057d1521baec270d780e" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Wed May 02 21:47:27 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 02 14:14:13 2012 -0700" }, "message": "serial8250: Introduce serial8250_register_8250_port()\n\nIntroduce yet another 8250 registration function.\nThis time it is serial8250_register_8250_port() and it\nallows us to register 8250 hardware instances using struct\nuart_8250_port. The new function makes it possible to\nregister 8250 hardware that makes use of 8250 specific\ncallbacks such as -\u003edl_read() and -\u003edl_write().\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "e8155629ff19e05722ba057d1521baec270d780e", "tree": "d800fc07d2b2c8eaaee42e8d88e30f61ea7593ca", "parents": [ "28bf4cf22dcd936f93dd6063696b1accdc1d5207" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Wed May 02 21:47:18 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 02 14:08:07 2012 -0700" }, "message": "serial8250: Clean up default map and dl code\n\nGet rid of unused functions and macros now when\nAlchemy and RM9K are converted over to callbacks.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "28bf4cf22dcd936f93dd6063696b1accdc1d5207", "tree": "41989eb154c5e941f75fb134190e2359815fa8d4", "parents": [ "6b4160313c239d61c3907b2aaaeeec156911c9d1" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Wed May 02 21:47:09 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 02 14:07:28 2012 -0700" }, "message": "serial8250: Use dl_read()/dl_write() on RM9K\n\nConvert the 8250 RM9K support code to make\nuse of the new dl_read()/dl_write() callbacks.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "6b4160313c239d61c3907b2aaaeeec156911c9d1", "tree": "7ab348eb327d3e3cae4304a5e75a3a0d3ca9cf35", "parents": [ "cc419fa0d38c425e4ea7bffeed931b07b0a3e461" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Wed May 02 21:47:00 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 02 14:06:19 2012 -0700" }, "message": "serial8250: Use dl_read()/dl_write() on Alchemy\n\nConvert the 8250 Alchemy support code to make\nuse of the new dl_read()/dl_write() callbacks.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "cc419fa0d38c425e4ea7bffeed931b07b0a3e461", "tree": "75a6c82980c7aa761e265b9ab7c3788fd77fa24d", "parents": [ "f9a9111b540fd67db5dab332f4b83d86c90e27b1" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Wed May 02 21:46:51 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 02 14:04:40 2012 -0700" }, "message": "serial8250: Add dl_read()/dl_write() callbacks\n\nConvert serial_dl_read() and serial_dl_write() from macro\nto 8250 specific callbacks. This change makes it easier to\nsupport 8250 hardware with non-standard DLL and DLM register\nconfigurations such as Alchemy, RM9K and upcoming Emma Mobile\nUART hardware.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "c89ff23960f3e0b72f593a48c808c25f9e7f5a93", "tree": "42d3a1ce13f59eec365a1a0b1a596ef50c78641c", "parents": [ "529acf58981440eefeaf1451387e2a0aa4825c12", "84f904ecd3aa2ccb5779b815b69c1cb592f07bb5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 02 13:47:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 02 13:47:49 2012 -0700" }, "message": "Merge tag \u0027tty-3.4-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull a TTY fix from Greg Kroah-Hartman:\n \"This is a deadlock bugfix that was easy to hit, and that the vt layer\n lock rework got wrong, so it reverts the logic back to the way it was\n in 3.3 and earlier kernels to prevent problems.\"\n\n* tag \u0027tty-3.4-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n vt: Fix deadlock on scroll-lock\n" }, { "commit": "84f904ecd3aa2ccb5779b815b69c1cb592f07bb5", "tree": "eeaf995be900b9a1beb2be751224a97cfadf422d", "parents": [ "69964ea4c7b68c9399f7977aa5b9aa6539a6a98a" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue May 01 16:12:19 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue May 01 14:01:28 2012 -0400" }, "message": "vt: Fix deadlock on scroll-lock\n\nFixing the locking accidentally replaced a race in the scroll\nlock handling with a deadlock. Turn it back into a race for\nnow.\n\nThe basic problem is that there are two paths into the tty\nstop/start helpers. One via the tty layer ^S/^Q handling\nwhere we need to take the kbd_event_lock and one via the\nspecial keyboard handler for fn_hold where we already hold\nit. Probably we need to split out into a separate LED lock\nbut for now just go back to the race as it\u0027s a bit close\nto release.\n\nReported-by: Clemens Ladisch \u003cclemens@ladisch.de\u003e\nCc: Jiri Kosina \u003cjkosina@suse.cz\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "f9a9111b540fd67db5dab332f4b83d86c90e27b1", "tree": "469a440d5c538c42c835e79c77fd3027971d0587", "parents": [ "aaa10eb1d0034eccc096f583fe308f0921617598" ], "author": { "name": "Christian Melki", "email": "christian.melki@ericsson.se", "time": "Mon Apr 30 11:21:26 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue May 01 13:40:29 2012 -0400" }, "message": "8250.c: less than 2400 baud fix.\n\nWe noticed that we were loosing data at speed less than 2400 baud.\nIt turned out our (TI16750 compatible) uart with 64 byte outgoing fifo\nwas truncated to 16 byte (bit 5 sets fifo len) when modifying the fcr\nreg.\nThe input code still fills the buffer with 64 bytes if I remember\ncorrectly and thus data is lost.\nOur fix was to remove whiping of the fcr content and just add the\nTRIGGER_1 which we want for latency.\nI can\u0027t see why this would not work on less than 2400 always, for all\nuarts ...\nOtherwise one would have to make sure the filling of the fifo re-checks\nthe current state of available fifo size (urrk).\n\nSigned-off-by: Christian Melki \u003cchristian.melki@ericsson.se\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "aaa10eb1d0034eccc096f583fe308f0921617598", "tree": "ca1dd6a5558ae1daa4ead2e3595b7493481f849d", "parents": [ "3fa10cc83fb92750af11fab81e11ad96dc75d656" ], "author": { "name": "Arnaud Patard", "email": "apatard@hupstream.com", "time": "Wed Apr 25 12:17:24 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Apr 29 22:15:29 2012 -0400" }, "message": "8250_pci: fix pch uart matching\n\nThe rules used to make 8250_pci \"ignore\" the PCH uarts are lacking pci subids\nentries, preventing it to match and thus is breaking serial port support for\ntheses systems.\n\nThis has been tested on a nanoETXexpress-TT, which has a specifici uart clock.\n\nTested-by: Erwan Velu \u003cErwan.Velu@zodiacaerospace.com\u003e\n[stable@: please apply to 3.0-stable, 3.2-stable and 3.3-stable]\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Arnaud Patard \u003capatard@hupstream.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "3fa10cc83fb92750af11fab81e11ad96dc75d656", "tree": "e583b1cafbf3b1ad5a5bab1ad481a2925b7e3742", "parents": [ "5d1a33fa5573702394a4d09a9872f3f930c06d58" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Thu Apr 26 20:13:00 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Apr 29 22:13:54 2012 -0400" }, "message": "TTY: n_tty, do not dereference user buffer\n\ncopy_from_read_buf currently copies data to a user buffer and then\nchecks if the data is single EOF. But it checks it by accessing the\nuser buffer. First, the buffer may be changed by other threads of the\nuser program already. Second, it accesses the buffer without any\nchecks. It might be write-only for example.\n\nFix this by inspecting contents of the tty (kernel) buffer instead.\nNote that \"n \u003d\u003d 1\" is necessary, but not sufficient. But we check\nlater that there is nothing left by \"!tty-\u003eread_cnt\" condition.\n\nThere is still an issue with the current code that EOF being wrapped\nto the start of the circular buffer will result in an inappropriate\nlosing of the EOF character. But this is not intended to be fixed by\nthis patch.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nReported-by: Emil Goode \u003cemilgoode@gmail.com\u003e\nCc: Howard Chu \u003chyc@symas.com\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "810b4de25e53459323ff48957b0162b48d6cbd57", "tree": "326afcfe005682f1d854b0ce003f91a65ae32f80", "parents": [ "e49f7a9997c61cf800f2db5decba68d318352ef0" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Sat Apr 28 18:53:49 2012 -0500" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 10:59:58 2012 +1000" }, "message": "tty/serial/pmac_zilog: Fix \"nobody cared\" IRQ message\n\nFollowing commit a79dd5a titled \"tty/serial/pmac_zilog: Fix suspend \u0026 resume\",\nmy Powerbook G4 Titanium showed the following stack dump:\n\n[ 36.878225] irq 23: nobody cared (try booting with the \"irqpoll\" option)\n[ 36.878251] Call Trace:\n[ 36.878291] [dfff3f00] [c000984c] show_stack+0x7c/0x194 (unreliable)\n[ 36.878322] [dfff3f40] [c00a6868] __report_bad_irq+0x44/0xf4\n[ 36.878339] [dfff3f60] [c00a6b04] note_interrupt+0x1ec/0x2ac\n[ 36.878356] [dfff3f80] [c00a48d0] handle_irq_event_percpu+0x250/0x2b8\n[ 36.878372] [dfff3fd0] [c00a496c] handle_irq_event+0x34/0x54\n[ 36.878389] [dfff3fe0] [c00a753c] handle_fasteoi_irq+0xb4/0x124\n[ 36.878412] [dfff3ff0] [c000f5bc] call_handle_irq+0x18/0x28\n[ 36.878428] [deef1f10] [c000719c] do_IRQ+0x114/0x1cc\n[ 36.878446] [deef1f40] [c0015868] ret_from_except+0x0/0x1c\n[ 36.878484] --- Exception: 501 at 0xf497610\n[ 36.878489] LR \u003d 0xfdc3dd0\n[ 36.878497] handlers:\n[ 36.878510] [\u003cc02b7424\u003e] pmz_interrupt\n[ 36.878520] Disabling IRQ #23\n\nFrom an E-mail exchange about this problem, Andreas Schwab noticed a typo\nthat resulted in the wrong condition being tested.\n\nThe patch also corrects 2 typos that incorrectly report why an error branch\nis being taken.\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "3a9465fa2dc42a8ebc2fe9144f4dfa23d5899f85", "tree": "1aab9e15d798e4ecc482948e85724179931e39ef", "parents": [ "52dac6150580f356a96b9a49715f6234fbf00d3a" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Mar 07 09:31:43 2012 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Apr 25 17:03:39 2012 +0200" }, "message": "serial i.MX: do not depend on grouped clocks\n\nthe current i.MX clock support groups together unrelated clocks\nto a single clock which is then used by the driver. This can\u0027t\nbe accomplished with the generic clock framework so we instead\nrequest the individual clocks in the driver. For i.MX there are\ngenerally three different clocks:\n\nipg: bus clock (needed to access registers)\nahb: dma relevant clock, sometimes referred to as hclk in the datasheet\nper: bit clock, pixel clock\n\nThis patch changes the driver to request the individual clocks.\nCurrently all clk_get will get the same clock until the SoCs\nare converted to the generic clock framework\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "5d1a33fa5573702394a4d09a9872f3f930c06d58", "tree": "1e1ad3fd38f2bd1ac0f375ac18e9471af2861ee2", "parents": [ "10af77c193681398e5dbe830db181d86047fcd41" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Apr 24 11:06:06 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue Apr 24 16:14:14 2012 -0700" }, "message": "vt: push the tty_lock down into the map handling\n\nWhen we do this it becomes clear the lock we should be holding is the vc\nlock, and in fact many of our other helpers are properly invoked this way.\n\nWe don\u0027t at this point guarantee not to race the keyboard code but the results\nof that appear harmless and that was true before we started as well.\n\nWe now have no users of tty_lock in the console driver...\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "10af77c193681398e5dbe830db181d86047fcd41", "tree": "b843eb8dae09a53efb410dd11d2132dba4fe4d15", "parents": [ "66f75a5d028beaf67c931435fdc3e7823125730c", "5f1a38952b7e932a1c169c28917b9a831f641bcc" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 23 09:39:23 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 23 09:39:23 2012 -0700" }, "message": "Merge 3.4-rc4 into tty-next\n\nThis resolves the merge problem with:\n\tdrivers/tty/serial/pch_uart.c\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "d3a7b83f865b46bb7b5e1ed18a129ce1af349db4", "tree": "92f4c1c7ca160b2788a27ae10e1b6c5fdfa64efc", "parents": [ "af6d17cdc8c89aeb3101f0d27cd32fc0592b40b2" ], "author": { "name": "Julia Lawall", "email": "Julia.Lawall@lip6.fr", "time": "Thu Apr 19 18:12:40 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Apr 19 19:15:35 2012 -0700" }, "message": "drivers/tty/amiserial.c: add missing tty_unlock\n\ntty_unlock is used on all other exits from the function.\n\nSigned-off-by: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nAcked-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "fb56a91922463abec52a68e26b562c4503810d40", "tree": "c82e27b784658dcf0c7a3132a25bf0920e1f21be", "parents": [ "9d773d378d9b7272c6cefad5cb41b5e57c96b7a0", "9e7f60a37d1817460ffcdfc2001a00861ac3e121", "5d920bb929a99446062a48cf90867bbca57b8e77" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu Apr 19 17:31:59 2012 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu Apr 19 17:31:59 2012 +0900" }, "message": "Merge branches \u0027sh/st-integration\u0027 and \u0027sh/stackprotector\u0027 into sh-latest\n" }, { "commit": "5f1a38952b7e932a1c169c28917b9a831f641bcc", "tree": "d392296facc07a32660da8c24ff008fbe7ff1f41", "parents": [ "0ad372b962d109323d18ac2aa118b2ad100eb8dd" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Apr 10 14:11:03 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Apr 18 16:26:46 2012 -0700" }, "message": "serial/8250_pci: fix suspend/resume vs init/exit quirks\n\nCommit e86ff4a6 \"serial/8250_pci: init-quirk msi support for kt serial\ncontroller\" introduced a regression in suspend/resume by causing msi\u0027s\nto be enabled twice without an intervening disable.\n\n00:16.3 Serial controller: Intel Corporation Patsburg KT Controller (rev 05) (prog-if 02 [16550])\n Subsystem: Intel Corporation Device 7270\n Flags: bus master, 66MHz, fast devsel, latency 0, IRQ 72\n I/O ports at 4080 [size\u003d8]\n Memory at d1c30000 (32-bit, non-prefetchable) [size\u003d4K]\n Capabilities: [c8] Power Management version 3\n Capabilities: [d0] MSI: Enable+ Count\u003d1/1 Maskable- 64bit+\n Kernel driver in use: serial\n\n[ 365.250523] sysfs: cannot create duplicate filename \u0027/devices/pci0000:00/0000:00:16.3/msi_irqs\u0027\n[ 365.250525] Modules linked in: nls_utf8 ipv6 uinput sg iTCO_wdt\n iTCO_vendor_support ioatdma dca i2c_i801 i2c_core wmi sd_mod ahci libahci isci\n libsas libata scsi_transport_sas [last unloaded: scsi_wait_scan]\n[ 365.250540] Pid: 9030, comm: kworker/u:1 Tainted: G W 3.3.0-isci-3.0.213+ #1\n[ 365.250542] Call Trace:\n[ 365.250545] [\u003cffffffff8115e955\u003e] ? sysfs_add_one+0x99/0xad\n[ 365.250548] [\u003cffffffff8102db8b\u003e] warn_slowpath_common+0x85/0x9e\n[ 365.250551] [\u003cffffffff8102dc96\u003e] warn_slowpath_fmt+0x6e/0x70\n[ 365.250555] [\u003cffffffff8115e8fa\u003e] ? sysfs_add_one+0x3e/0xad\n[ 365.250558] [\u003cffffffff8115e8b4\u003e] ? sysfs_pathname+0x3c/0x44\n[ 365.250561] [\u003cffffffff8115e8b4\u003e] ? sysfs_pathname+0x3c/0x44\n[ 365.250564] [\u003cffffffff8115e8b4\u003e] ? sysfs_pathname+0x3c/0x44\n[ 365.250567] [\u003cffffffff8115e8b4\u003e] ? sysfs_pathname+0x3c/0x44\n[ 365.250570] [\u003cffffffff8115e955\u003e] sysfs_add_one+0x99/0xad\n[ 365.250573] [\u003cffffffff8115f031\u003e] create_dir+0x72/0xa5\n[ 365.250577] [\u003cffffffff8115f194\u003e] sysfs_create_dir+0xa2/0xbe\n[ 365.250581] [\u003cffffffff81262463\u003e] kobject_add_internal+0x126/0x1f8\n[ 365.250585] [\u003cffffffff8126255b\u003e] kset_register+0x26/0x3f\n[ 365.250588] [\u003cffffffff8126275a\u003e] kset_create_and_add+0x62/0x7c\n[ 365.250592] [\u003cffffffff81293619\u003e] populate_msi_sysfs+0x34/0x103\n[ 365.250595] [\u003cffffffff81293e1c\u003e] pci_enable_msi_block+0x1b3/0x216\n[ 365.250599] [\u003cffffffff81303f7c\u003e] try_enable_msi+0x13/0x17\n[ 365.250603] [\u003cffffffff81303fb3\u003e] pciserial_resume_ports+0x21/0x42\n[ 365.250607] [\u003cffffffff81304041\u003e] pciserial_resume_one+0x50/0x57\n[ 365.250610] [\u003cffffffff81283e1a\u003e] pci_legacy_resume+0x38/0x47\n[ 365.250613] [\u003cffffffff81283e7d\u003e] pci_pm_restore+0x54/0x87\n[ 365.250616] [\u003cffffffff81283e29\u003e] ? pci_legacy_resume+0x47/0x47\n[ 365.250619] [\u003cffffffff8131e9e8\u003e] dpm_run_callback+0x48/0x7b\n[ 365.250623] [\u003cffffffff8131f39a\u003e] device_resume+0x342/0x394\n[ 365.250626] [\u003cffffffff8131f5b7\u003e] async_resume+0x21/0x49\n\nThat patch has since been reverted, but by inspection it seems that\npciserial_suspend_ports() should be invoking .exit() quirks to release\nresources acquired during .init().\n\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "0ad372b962d109323d18ac2aa118b2ad100eb8dd", "tree": "82a9c1308720f9a96ff1432c063125a0695160d4", "parents": [ "665ab0f3c8b8f86bb77b25285ac93870c7054d63" ], "author": { "name": "Sudhakar Mamillapalli", "email": "sudhakar@fb.com", "time": "Tue Apr 10 14:10:58 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Apr 18 16:26:17 2012 -0700" }, "message": "serial/8250_pci: Clear FIFOs for Intel ME Serial Over Lan device on BI\n\nWhen using Serial Over Lan (SOL) over the virtual serial port in a Intel\nmanagement engine (ME) device, on device reset the serial FIFOs need to\nbe cleared to keep the FIFO indexes in-sync between the host and the\nengine.\n\nOn a reset the serial device assertes BI, so using that as a cue FIFOs\nare cleared. So for this purpose a new handle_break callback has been\nadded. One other problem is that the serial registers might temporarily\ngo to 0 on reset of this device. So instead of using the IER register\nread, if 0 returned use the ier value in uart_8250_port. This is hidden\nunder a custom serial_in.\n\nCc: Nhan H Mai \u003cnhan.h.mai@intel.com\u003e\nSigned-off-by: Sudhakar Mamillapalli \u003csudhakar@fb.com\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "665ab0f3c8b8f86bb77b25285ac93870c7054d63", "tree": "c7d12c3559982eb3fb1847438d4b45ce034851e5", "parents": [ "bf03f65b7967df5807ddef7b99f8a41d4c94fc70", "e816b57a337ea3b755de72bec38c10c864f23015" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Apr 18 15:57:31 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Apr 18 15:57:31 2012 -0700" }, "message": "Merge 3.4-rc3 into tty-next\n\nThis allows us to pick up some changes needed for other serial patches.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "af6d17cdc8c89aeb3101f0d27cd32fc0592b40b2", "tree": "588d1835847ccec5009c9ab744ca6a2de554bce7", "parents": [ "7a6fbc9a887193a1e9f8658703881c528040afbc" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya.rohm@gmail.com", "time": "Thu Apr 12 10:47:50 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Apr 18 15:19:50 2012 -0700" }, "message": "pch_uart: Fix dma channel unallocated issue\n\nThis driver anticipates pch_uart_verify_port() is not called\nduring installation.\nHowever, actually pch_uart_verify_port() is called during\ninstallation.\nAs a result, memory access violation occurs like below.\n\n0. initial value: use_dma\u003d0\n1. starup()\n - dma channel is not allocated because use_dma\u003d0\n2. pch_uart_verify_port()\n - Set use_dma\u003d1\n3. UART processing acts DMA mode because use_dma\u003d1\n - memory access violation occurs!\n\nThis patch fixes the issue.\n\nSolution:\nWhenever pch_uart_verify_port() is called and then\ndma channel is not allocated, the channel should be allocated.\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya.rohm@gmail.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "7a6fbc9a887193a1e9f8658703881c528040afbc", "tree": "f1124704d429bc4739816ac9bf85cdf389550b63", "parents": [ "e816b57a337ea3b755de72bec38c10c864f23015" ], "author": { "name": "Alexander Shiyan", "email": "shc_work@mail.ru", "time": "Tue Mar 27 12:22:49 2012 +0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Apr 18 15:19:50 2012 -0700" }, "message": "ARM: clps711x: serial driver hungs are a result of call disable_irq within ISR\n\nSince 2.6.30-rc1 clps711x serial driver hungs system. This is a result\nof call disable_irq from ISR. synchronize_irq waits for end of interrupt\nand goes to infinite loop. This patch fix this problem.\n\nSigned-off-by: Alexander Shiyan \u003cshc_work@mail.ru\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "bf03f65b7967df5807ddef7b99f8a41d4c94fc70", "tree": "558ae56db6ddedae03eee1bc569321d8ab571d0a", "parents": [ "7c77c8decfd14a611ddcba071782a9520e4bb3f8" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Apr 10 14:10:53 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Apr 18 15:07:53 2012 -0700" }, "message": "tegra, serial8250: add -\u003ehandle_break() uart_port op\n\nThe \"KT\" serial port has another use case for a \"received break\" quirk,\nso before adding another special case to the 8250 core take this\nopportunity to push such quirks out of the core and into a uart_port op.\n\nStephen says:\n\"If the callback function is to no longer live in 8250.c itself,\n arch/arm/mach-tegra/devices.c isn\u0027t logically a good place to put it,\n and that file will be going away once we get rid of all the board files\n and move solely to device tree.\"\n\n...so since 8250_pci.c houses all the quirks for pci serial devices this\nquirk is similarly housed in of_serial.c. Once the open firmware\nconversion completes the infrastructure details\n(include/linux/of_serial.h, and the export) can all be removed to make\nthis self contained to of_serial.c.\n\nCc: Nhan H Mai \u003cnhan.h.mai@intel.com\u003e\nCc: Colin Cross \u003cccross@android.com\u003e\nCc: Olof Johansson \u003colof@lixom.net\u003e\n[stephen: kill CONFIG_SERIAL_TEGRA in favor just using CONFIG_ARCH_TEGRA]\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Sudhakar Mamillapalli \u003csudhakar@fb.com\u003e\nReported-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nAcked-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nTested-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "7c77c8decfd14a611ddcba071782a9520e4bb3f8", "tree": "d9f1925bb2a91687d54fcae0724be8dd4e5850ac", "parents": [ "4fd0690bb0c3955983560bb2767ee82e2b197f9b" ], "author": { "name": "Govindraj.R", "email": "govindraj.raja@ti.com", "time": "Tue Apr 03 19:12:34 2012 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Apr 18 15:07:05 2012 -0700" }, "message": "OMAP2+: UART: Remove cpu checks for populating errata flags\n\nCurrently the errata is populated based on cpu checks this can\nbe removed and replaced with module version check of uart ip block.\nMVR reg is provided within the uart reg map use the same\nto populate the errata and thus now errata population and handling\ncan be managed within the driver itself.\n\nCc: Paul Walmsley \u003cpaul@pwsan.com\u003e\nCc: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\nSigned-off-by: Govindraj.R \u003cgovindraj.raja@ti.com\u003e\nReviewed-by: Jon Hunter \u003cjon-hunter@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "4fd0690bb0c3955983560bb2767ee82e2b197f9b", "tree": "71ecf0b5369814f22ffef5a4321e299c9300814a", "parents": [ "e695b28664827eaad4c8a4b6f921d3fae3e0f526" ], "author": { "name": "Rajanikanth H.V", "email": "rajanikanth.hv@stericsson.com", "time": "Mon Mar 26 11:17:02 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Apr 18 15:06:38 2012 -0700" }, "message": "serial: pl011: implement workaround for CTS clear event issue\n\nProblem Observed:\n- interrupt status is set by rising or falling edge on CTS line\n- interrupt status is cleared on a .0. to .1. transition of the\n interrupt-clear register bit 1.\n- interrupt-clear register is reset by hardware once the interrupt\n status is .0..\n Remark: It seems not possible to read this register back by the\n CPU though, but internally this register exists.\n- when simultaneous set and reset event on the interrupt status\n happens, then the set-event has priority and the status remains\n .1.. As a result the interrupt-clear register is not reset to\n .0., and no new .0. to .1. transition can be detected on it when\n writing a .1. to it.\n This implies race condition, the clear must be performed at least\n one UARTCLK the riding edge of CTS RIS interrupt.\n\nFix:\n Instead of resetting UART as done in commit\n c16d51a32bbb61ac8fd96f78b5ce2fccfe0fb4c3\n \"amba pl011: workaround for uart registers lockup\" do the\n following:\n\n write .0. and then .1. to the interrupt-clear register to make\n sure that this transition is detected. According to the datasheet\n writing a .0. does not have any effect, but actually it allows to\n reset the internal interrupt-clear register.\n\n Take into account:\n The .0. needs to last at least for one clk_uart clock period\n (~ 38 MHz, 26.08ns)\n\nThis way we can do away with the tasklet and keep only a tiny\nfix triggered by the variant flag introduced in this patch.\n\nSigned-off-by: Guillaume Jaunet \u003cguillaume.jaunet@stericsson.com\u003e\nSigned-off-by: Christophe Arnal \u003cchristophe.arnal@stericsson.com\u003e\nSigned-off-by: Matthias Locher \u003cMatthias.Locher@stericsson.com\u003e\nSigned-off-by: Rajanikanth H.V \u003crajanikanth.hv@stericsson.com\u003e\nReviewed-by: Srinidhi Kasagar \u003csrinidhi.kasagar@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "a2f892060f174e5f90041167ca00eb9e68badcb8", "tree": "daf87a58266da05e2e8a3f06538df2cfd360d3bc", "parents": [ "59d59b0600e541b4e94b891148c92f2e2d18f7c0" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Fri Apr 13 10:31:32 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Apr 13 10:54:43 2012 -0700" }, "message": "TTY: hvc, fix TTY refcounting\n\nA -next commit \"TTY: HVC, use tty from tty_port\" switched the driver\nto use tty_port helper for tty refcounting. But it omitted to remove\nmanual tty refcounting from open, close and hangup. So now we are\ngetting random crashes caused by use-after-free:\nUnable to handle kernel paging request for data at address 0xc0000003f9d550\nFaulting instruction address: 0xc0000000001b7f40\nOops: Kernel access of bad area, sig: 11 [#1]\n...\nNIP: c0000000001b7f40 LR: c0000000001b7f14 CTR: c0000000000e04f0\n...\nNIP [c0000000001b7f40] .__kmalloc+0x70/0x230\nLR [c0000000001b7f14] .__kmalloc+0x44/0x230\nCall Trace:\n[c0000003f68bf930] [c0000003f68bf9b0] 0xc0000003f68bf9b0 (unreliable)\n[c0000003f68bf9e0] [c0000000001e5424] .alloc_fdmem+0x24/0x70\n[c0000003f68bfa60] [c0000000001e54f8] .alloc_fdtable+0x88/0x130\n[c0000003f68bfaf0] [c0000000001e5924] .dup_fd+0x384/0x450\n[c0000003f68bfbd0] [c00000000009a310] .copy_process+0x880/0x11d0\n[c0000003f68bfcd0] [c00000000009aee0] .do_fork+0x70/0x400\n[c0000003f68bfdc0] [c0000000000141c4] .sys_clone+0x54/0x70\n[c0000003f68bfe30] [c000000000009aa0] .ppc_clone+0x8/0xc\n\nFix that by complete removal of tty_kref_get/put in open/close/hangup\npaths.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nReported-and-tested-by: Michael Neuling \u003cmikey@neuling.org\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: ppc-dev \u003clinuxppc-dev@lists.ozlabs.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\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": "a4e02f6d83d4fcdb13bcaba76878fc5ea0da9911", "tree": "03fa3cfb50f700049f4389b642cd1e232ea3ab89", "parents": [ "ee565105ccedc63728a83f4deb1c10dc57091959" ], "author": { "name": "Shimoda, Yoshihiro", "email": "yoshihiro.shimoda.uh@renesas.com", "time": "Thu Apr 12 19:19:21 2012 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu Apr 12 19:19:21 2012 +0900" }, "message": "serial: sh-sci: Update break_ctl handling for all SCSPTR-capable regtypes.\n\nThis updates the earlier break_ctl support regardless of regtype so long\nas the requisite SCSPTR exists. This is the same approach used by\nsci_init_pins() for providing a generic solution now that we\u0027re able to\ndetect register capabilities on a per-port basis.\n\nSigned-off-by: Yoshihiro Shimoda \u003cyoshihiro.shimoda.uh@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "c56a00a165712fd73081f40044b1e64407bb1875", "tree": "fee2ca034eb2cc52e6a21880ad875e6d05307d57", "parents": [ "871bdea6f8c64517635bec352b8bec6b72a26d80" ], "author": { "name": "Xiaobing Tu", "email": "xiaobing.tu@intel.com", "time": "Fri Mar 16 03:00:26 2012 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:12:45 2012 -0700" }, "message": "tty: hold lock across tty buffer finding and buffer filling\n\ntty_buffer_request_room is well protected, but while after it returns,\n it releases the port-\u003elock. tty-\u003ebuf.tail might be modified\nby either irq handler or other threads. The patch adds more protection\nby holding the lock across tty buffer finding and buffer filling.\n\nSigned-off-by: Alek Du \u003calek.du@intel.com\u003e\nSigned-off-by: Xiaobing Tu \u003cxiaobing.tu@intel.com\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "871bdea6f8c64517635bec352b8bec6b72a26d80", "tree": "786a6dede8222338409a05e316cf58435ee97e72", "parents": [ "ef4f9d4f09265b60fcb6bfa31a614ea84a72b7a8" ], "author": { "name": "Michael Gehring", "email": "mg@ebfe.org", "time": "Wed Mar 21 01:26:45 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:10:23 2012 -0700" }, "message": "tty/vt: handle bad user buffer in {G,P}IO_CMAP ioctl\n\nset_get_cmap() ignored the result of {get,put}_user(), causing ioctl(vt,\n{G,P}IO_CMAP, 0xdeadbeef) to silently fail.\n\nAnother side effect of this: calling the PIO_CMAP ioctl with an invalid\nbuffer would zero the default colormap and the palette for all vts (all\ncolors set to black).\n\nLeave the default colormap intact and return -EFAULT when\nreading/writing to the userspace buffer fails.\n\nSigned-off-by: Michael Gehring \u003cmg@ebfe.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "ef4f9d4f09265b60fcb6bfa31a614ea84a72b7a8", "tree": "93bb73ecf28c8e1d96900e270b542ddbcab4c9a4", "parents": [ "04e2c2e3bfb1652510d4c12ac2837a8f8b08bd3a" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya.rohm@gmail.com", "time": "Mon Mar 26 14:43:06 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:08:42 2012 -0700" }, "message": "pch_uart: Fix duplicate memory release issue\n\nAdd initialize variable to prevent duplicate free memory.\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya.rohm@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "04e2c2e3bfb1652510d4c12ac2837a8f8b08bd3a", "tree": "4e8ac3efc15699567d31f35c7c2913c5b3b701b7", "parents": [ "159d4e1e73dc2c4745b3edb2f2ae51caaae37e5f" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya.rohm@gmail.com", "time": "Mon Mar 26 14:43:05 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:08:42 2012 -0700" }, "message": "pch_uart: Fix return value issue\n\nCurrently, occurring line status interrupt,\nreturned value is not set in interrupt handler function.\nAs a result, 0 can be returned.\n\nThis patch adds setting returned value.\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya.rohm@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "159d4e1e73dc2c4745b3edb2f2ae51caaae37e5f", "tree": "c1f33e1c46b2ae5c8f4abf20083f3835b65baa18", "parents": [ "5181fb3d51d2d886ec9b2fed13a9ad9d5d67ec1f" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya.rohm@gmail.com", "time": "Mon Mar 26 14:43:04 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:08:42 2012 -0700" }, "message": "pch_uart: delete unused data structure\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya.rohm@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "5181fb3d51d2d886ec9b2fed13a9ad9d5d67ec1f", "tree": "e424bb7629bb7a2c411a5a6dc81545c7320a81cb", "parents": [ "b23954a3f73a68a80f260bd3569a81ccc6d13670" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya.rohm@gmail.com", "time": "Mon Mar 26 14:43:03 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:08:42 2012 -0700" }, "message": "pch_uart: Support modem status interrupt\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya.rohm@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "b23954a3f73a68a80f260bd3569a81ccc6d13670", "tree": "ddd60d0d20a68f1557d51d52e43b3cca1c291862", "parents": [ "2a58364da0c04f8dc42cdfe7a4de9d17e536cda8" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya.rohm@gmail.com", "time": "Mon Mar 26 14:43:02 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:08:41 2012 -0700" }, "message": "pch_uart: change type to %d to %02x\n\n%02x format is easier to understand better than %d.\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya.rohm@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "2a58364da0c04f8dc42cdfe7a4de9d17e536cda8", "tree": "9de6182652ada2646547658b1ee0ee26400874fd", "parents": [ "44db113212d86a5870c2bfe8fb767fa842d68805" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya.rohm@gmail.com", "time": "Mon Mar 26 14:43:01 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:08:41 2012 -0700" }, "message": "pch_uart: change type to u8\n\nTarget uart register access size is 8bit.\nHowever, 32bit is used at 2 points.\n\nThis patch modifies type \"unsigned int\" to \"unsigned char\".\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya.rohm@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "44db113212d86a5870c2bfe8fb767fa842d68805", "tree": "465383fcfaf5faae3ed0c307d22d38d084bfb6d2", "parents": [ "f997a01e3272f08cbbf77392b846878332dafc22" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya.rohm@gmail.com", "time": "Mon Mar 26 14:43:00 2012 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:08:41 2012 -0700" }, "message": "pch_uart: Delete unused structure member\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya.rohm@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "8e32841634958d4927a85b484faf9d2c3c222e4d", "tree": "388a0ffe7224e9981497e04c7ad3ba3801e7c7f3", "parents": [ "665569d0269be3dd67b768fb65061e1b54bb2faf" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Apr 02 13:54:46 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:02:45 2012 -0700" }, "message": "TTY: 68328serial, use tty_port_block_til_ready\n\nSince the code is identical, use the tty_port_block_til_ready helper\ninstead of re-implemented variant.\n\nThe code does not perform rtsdts handling, hence we do not need to\nprovide tty port hooks for them. The default ones will be used\ninstead. The only necessary thing is to provide tty_port_operations.\nIt is empty, but has to be there...\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: linux-m68k@lists.linux-m68k.org\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "665569d0269be3dd67b768fb65061e1b54bb2faf", "tree": "e3e656a3c1f2d18a942a5033a2141c974ff70f45", "parents": [ "467712c916764859f7ea698d38d03c51bb827da8" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Apr 02 13:54:45 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:02:45 2012 -0700" }, "message": "TTY: 68328serial, use tty from tty_port\n\nAnd refcount that properly.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: linux-m68k@lists.linux-m68k.org\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "467712c916764859f7ea698d38d03c51bb827da8", "tree": "1661912712c7eb15e791f38da01382b990998573", "parents": [ "a85dd82c966a4eb1f4502e62cf49d715d191cefc" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Apr 02 13:54:44 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:02:44 2012 -0700" }, "message": "TTY: 68328serial, propagate tty\n\nWe need tty at some places, but info-\u003etty might be NULL at those. Let\nus propagate tty from callers where we know we have a valid tty. This\nwill make a switch to tty refcounting simpler.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: linux-m68k@lists.linux-m68k.org\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "a85dd82c966a4eb1f4502e62cf49d715d191cefc", "tree": "6d1e5acb8133d90c8c7cd9f81e0dfec9ac296099", "parents": [ "4a85b1fc59734ba2f2e91623d042eadc4efb7886" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Apr 02 13:54:43 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:02:44 2012 -0700" }, "message": "TTY: 68328serial, use flags from tty_port\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: linux-m68k@lists.linux-m68k.org\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "4a85b1fc59734ba2f2e91623d042eadc4efb7886", "tree": "f82ae2547dea84d0b14106d8d5c2af367ccc3043", "parents": [ "c26f0115c0fd931e6420b6f565e5f9d154ec627e" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Apr 02 13:54:42 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:02:44 2012 -0700" }, "message": "TTY: 68328serial, use close_delay/closing_wait from tty_port\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: linux-m68k@lists.linux-m68k.org\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "c26f0115c0fd931e6420b6f565e5f9d154ec627e", "tree": "f48df8305acf3be94d498cacfede0e09ddc0e686", "parents": [ "86264341bb1dafd4d38788b7c877de55b6c2f937" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Apr 02 13:54:41 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:02:44 2012 -0700" }, "message": "TTY: 68328serial, use open/close_wait from tty_port\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: linux-m68k@lists.linux-m68k.org\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "86264341bb1dafd4d38788b7c877de55b6c2f937", "tree": "1a8a7c33fc93d16c6ab55847c58290c4e657692d", "parents": [ "1bb2687c3bad13a061e98887bdfb1a6b9ad79542" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Apr 02 13:54:40 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:02:44 2012 -0700" }, "message": "TTY: 68328serial, add tty_port\n\nAnd use count and blocked_count from that.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: linux-m68k@lists.linux-m68k.org\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "1bb2687c3bad13a061e98887bdfb1a6b9ad79542", "tree": "be58f831907fef67f96804a3b80059eae44c7368", "parents": [ "107afb7a50726cb8ea9ed74d62311ddc59fef1da" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Apr 02 13:54:39 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:02:44 2012 -0700" }, "message": "TTY: 68328serial, remove 68328serial.h\n\nAll the needed stuff is moved to 68328serial.c now.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: linux-m68k@lists.linux-m68k.org\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "107afb7a50726cb8ea9ed74d62311ddc59fef1da", "tree": "40273841af4d29d1ab855128a6508306c17f222c", "parents": [ "b8aa50f2da25824d378a409bd75325653c997200" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Apr 02 13:54:38 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:02:44 2012 -0700" }, "message": "TTY: 68328serial, use ulong flags for interrupts status\n\nflags passed to local_irq_save/restore should be ulong. Switch tehem\nto that. Otherwise we get compilation warnings:\n.../68328serial.c:248:9: warning: comparison of distinct pointer types lacks a cast [enabled by default]\n.../68328serial.c:257:9: warning: comparison of distinct pointer types lacks a cast [enabled by default]\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: linux-m68k@lists.linux-m68k.org\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "b8aa50f2da25824d378a409bd75325653c997200", "tree": "52abe29d3ff92eaff5ab439ec124bdee555a631a", "parents": [ "c21e2654db10bc518b35987617337598fd91ff7e" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Apr 02 13:54:37 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:02:43 2012 -0700" }, "message": "TTY: 68328serial, remove garbage\n\n- empty functions\n- unused global variables\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: linux-m68k@lists.linux-m68k.org\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "c21e2654db10bc518b35987617337598fd91ff7e", "tree": "aad844d039af3fc5be95e195ef3e82e5a6e486eb", "parents": [ "cea4b2ce4613feae878c0352b1d76f522faef511" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Apr 02 13:54:36 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:02:43 2012 -0700" }, "message": "TTY: 68328serial, remove unused stuff from m68k_serial\n\nNot everything from struct m68k_serial is really used. So remove\nunused or only-set members of that structure. Next step is to move it\nto 68328serial.c and remove 68328serial.h completely.\n\nThis change also takes status_handle and batten_down_hatches away\nsince they use break_abort but do nothing.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: linux-m68k@lists.linux-m68k.org\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "cea4b2ce4613feae878c0352b1d76f522faef511", "tree": "8e04065fc55bae2b52de326fba849f73005d424b", "parents": [ "19ef1b7151dc58c4d90a76d364dc93721bb04e9b" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Apr 02 13:54:35 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 12:02:43 2012 -0700" }, "message": "TTY: 68328serial, remove serial_state and friends\n\nserial_state in 68328serial.h is a duplicated structure. One is\ndefined in linux/serial.h. So let us use that instead. And since the\nserial flags are identical, use ones from there too.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nCc: linux-m68k@lists.linux-m68k.org\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "19ef1b7151dc58c4d90a76d364dc93721bb04e9b", "tree": "510b743245840dc666e092d7f2f3e1dc6dc711b2", "parents": [ "7393af808fe1564ad34289b507b950445dfc06ac" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Apr 02 13:54:34 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 11:30:39 2012 -0700" }, "message": "TTY: ipwireless, use tty from tty_port\n\nIt does not make the driver less racy though. Close and hangup should\nbe rewritten and tty refcounting used properly.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Jiri Kosina \u003cjkosina@suse.cz\u003e\nAcked-by: David Sterba \u003cdsterba@suse.cz\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" } ], "next": "7393af808fe1564ad34289b507b950445dfc06ac" }