)]}' { "log": [ { "commit": "36facadd9ea98f8415d0dbb63e0763b7ee9d3911", "tree": "99dea00b332ed852f2b0a4923b581dd723f03634", "parents": [ "2faa83e2a519abea1055d156ce1b42b8fa57e87b", "0b83ae960cd7d4a5ee02786ecf41ab45688999bf" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Dec 16 10:05:06 2010 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Dec 16 10:05:06 2010 -0800" }, "message": "Merge branch \u0027usb-next\u0027 into musb-merge\n\n* usb-next: (132 commits)\n USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path\n USB: uas: Ensure we only bind to a UAS interface\n USB: uas: Rename sense pipe and sense urb to status pipe and status urb\n USB: uas: Use kzalloc instead of kmalloc\n USB: uas: Fix up the Sense IU\n usb: musb: core: kill unneeded #include\u0027s\n DA8xx: assign name to MUSB IRQ resource\n usb: gadget: g_ncm added\n usb: gadget: f_ncm.c added\n usb: gadget: u_ether: prepare for NCM\n usb: pch_udc: Fix setup transfers with data out\n usb: pch_udc: Fix compile error, warnings and checkpatch warnings\n usb: add ab8500 usb transceiver driver\n USB: gadget: Implement runtime PM for MSM bus glue driver\n USB: gadget: Implement runtime PM for ci13xxx gadget\n USB: gadget: Add USB controller driver for MSM SoC\n USB: gadget: Introduce ci13xxx_udc_driver struct\n USB: gadget: Initialize ci13xxx gadget device\u0027s coherent DMA mask\n USB: gadget: Fix \"scheduling while atomic\" bugs in ci13xxx_udc\n USB: gadget: Separate out PCI bus code from ci13xxx_udc\n ...\n" }, { "commit": "5cdc5bd8b2b1190cb54548c03194b154b4892e2a", "tree": "79e9f66825a1155605a30e063ba59297a4ad0618", "parents": [ "6c34d2888221ca3df81e29f598873b4fb6cf838d", "e4a2b3565fc7ac2d70361a36337be57a59d783da" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Dec 15 09:29:38 2010 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Dec 15 09:29:38 2010 -0800" }, "message": "Merge branch \u0027musb-hw\u0027 of git://gitorious.org/usb/usb into musb\n\n* \u0027musb-hw\u0027 of git://gitorious.org/usb/usb: (43 commits)\n usb: musb: core: kill unneeded #include\u0027s\n DA8xx: assign name to MUSB IRQ resource\n arm: OMAP4430: musb: Configure musb to OTG mode\n usb: musb: Adding musb support for OMAP4430\n usb: otg: TWL6030: Add twl6030_usb file for compilation\n mfd: TWL6030: OMAP4: Registering the TWL6030-usb device\n usb: musb: TWL6030: Selecting TWL6030_USB transceiver\n usb: otg: Kconfig: Add Kconfig option for TWL6030 transceiver.\n usb: otg: Adding twl6030-usb transceiver driver for OMAP4430\n mfd: TWL6030: USBOTG VBUS event generation on\n usb: musb: add support for ux500 platform\n musb: am35x: fix compile error due to control apis\n arm: omap4: enable usb on 4430sdp\n usb: musb: drop board_set_vbus\n usb: musb: drop musb_platform_suspend/resume\n usb: musb: blackfin: usb dev_pm_ops structure\n usb: musb: am35x: usb dev_pm_ops structure\n usb: musb: omap2430: use dev_pm_ops structure\n usb: musb: omap2430: drop the nops\n usb: musb: mark musb_save/restore_context static\n ...\n" }, { "commit": "b4fe2a03422e6bd20bd8df5e428109a85c9ea961", "tree": "b6505c0599251421fef39c9fa0655f255aac9ed6", "parents": [ "85cb7f1264c4d9e60ccdce52740238222e77ccd0", "2a27a03d3a891e87ca33d27a858b4db734a4cbab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 14 17:33:40 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 14 17:33:40 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (75 commits)\n pppoe.c: Fix kernel panic caused by __pppoe_xmit\n WAN: Fix a TX IRQ causing BUG() in PC300 and PCI200SYN drivers.\n bnx2x: Advance a version number to 1.60.01-0\n bnx2x: Fixed a compilation warning\n bnx2x: LSO code was broken on BE platforms\n qlge: Fix deadlock when cancelling worker.\n net: fix skb_defer_rx_timestamp()\n cxgb4vf: Ingress Queue Entry Size needs to be 64 bytes\n phy: add the IC+ IP1001 driver\n atm: correct sysfs \u0027device\u0027 link creation and parent relationships\n MAINTAINERS: remove me from tulip\n SCTP: Fix SCTP_SET_PEER_PRIMARY_ADDR to accpet v4mapped address\n enic: Bug Fix: Pass napi reference to the isr that services receive queue\n ipv6: fix nl group when advertising a new link\n connector: add module alias\n net: Document the kernel_recvmsg() function\n r8169: Fix runtime power management\n hso: IP checksuming doesn\u0027t work on GE0301 option cards\n xfrm: Fix xfrm_state_migrate leak\n net: Convert netpoll blocking api in bonding driver to be a counter\n ...\n" }, { "commit": "3907969596091f429b7864cfe4e473a227876a96", "tree": "7c8e826af7a886a02298c1c0c00a466476c6e626", "parents": [ "66ef6aa63defa54b2c7e8edcc69e0641d2bb61ef", "23437b5c50f523a87ca5c02fd883b069ca8be7f3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 14 14:33:33 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 14 14:33:33 2010 -0800" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:\n ACPI / PM: Do not save/restore NVS on Sony Vaio VGN-NW130D\n ACPI/HEST: adjust section selection\n ACPI: eliminate unused variable warning for !ACPI_SLEEP\n ACPI/PNP: avoid section mismatch warning\n ACPI thermal: remove two unused functions\n ACPI: fix a section mismatch\n ACPI, APEI, use raw spinlock in ERST\n ACPI: video: fix build for CONFIG_ACPI\u003dn\n ACPI: video: fix build for VIDEO_OUTPUT_CONTROL\u003dn\n ACPI: fix allowing to add/remove multiple _OSI strings\n acpi: fix _OSI string setup regression\n ACPI: EC: Add another dmi match entry for MSI hardware\n ACPI battery: update status upon sysfs query\n ACPI ac: update AC status upon sysfs query\n ACPI / PM: Do not refcount power resources that can\u0027t be turned on\n ACPI / PM: Check device state before refcounting power resources\n" }, { "commit": "f9ae3e125ceb8226c94d7d0c640927fa8b7f256a", "tree": "b2ca10f25a7cf4abe488f27bf927d889b49779f4", "parents": [ "6371e82307237dede71f884ad8e8e11faa75e8be", "d70ab7f7ee0692efc880d772dc5c212174d67e3b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 14 13:32:40 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 14 13:32:40 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:\n ALSA: HDA: Quirk for Dell Vostro 320 to make microphone work\n ALSA: hda - Reset sample sizes and max bitrates when reading ELD\n ALSA: hda - Always allow basic audio irrespective of ELD info\n ALSA: hda - Do not wrongly restrict min_channels based on ELD\n ASoC: Correct WM8962 interrupt mask register read\n ASoC: WM8580: Debug BCLK and sample size\n ASoC: Fix resource leak if soc_register_ac97_dai_link failed\n ASoC: Hold client_mutex while calling snd_soc_instantiate_cards()\n ASoC: Fix swap of left and right channels for WM8993/4 speaker boost gain\n ASoC: Fix off by one error in WM8994 EQ register bank size\n ALSA: hda: Use position_fix\u003d1 for Acer Aspire 5538 to enable capture on internal mic\n ALSA: hda - Enable jack sense for Thinkpad Edge 13\n ALSA: hda - Fix ThinkPad T410[s] docking station line-out\n ALSA: hda: Use model\u003dlg quirk for LG P1 Express to enable playback and capture\n" }, { "commit": "38971ce2fac484249d697fe48a9b0851a0b62572", "tree": "5ff677e2f2225a8b7971c2bb84e1c66bc4c54d38", "parents": [ "caa4a59574a39e6574664e82b92455d41eca27a8", "5b362ac3799ff4225c40935500f520cad4d7ed66" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 14 08:51:12 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 14 08:51:12 2010 -0800" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n NFS: Fix panic after nfs_umount()\n nfs: remove extraneous and problematic calls to nfs_clear_request\n nfs: kernel should return EPROTONOSUPPORT when not support NFSv4\n NFS: Fix fcntl F_GETLK not reporting some conflicts\n nfs: Discard ACL cache on mode update\n NFS: Readdir cleanups\n NFS: nfs_readdir_search_for_cookie() don\u0027t mark as eof if cookie not found\n NFS: Fix a memory leak in nfs_readdir\n Call the filesystem back whenever a page is removed from the page cache\n NFS: Ensure we use the correct cookie in nfs_readdir_xdr_filler\n" }, { "commit": "6cc5615f7c4decd7b6c4da9317d0e0b5fbdf7290", "tree": "55a32763c3406573054b8c1189b18b5c1ca0b1e9", "parents": [ "a5dc4f898c2a0f66e2cefada6c687db82ba2fcbc", "3138b32d5e0998ba3cbd1c74bdc1887d74c5279b", "12b3b5afed67e08aa641d30e57df20dab2e33432", "bec4f22a2dbd5a26079cbddbcadf38f8c7e5381f", "12d3206466d2074ef0684aaf7759ae01a0a92560" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Dec 11 02:02:02 2010 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Dec 11 02:02:02 2010 -0500" }, "message": "Merge branches \u0027bugzilla-15418\u0027, \u0027bugzilla-21722\u0027, \u0027bugzilla-22932\u0027, \u0027misc-2.6.37\u0027 and \u0027osi-regression\u0027 into release\n" }, { "commit": "3353bebe7c89725ab2f476b9d8d618259402d52e", "tree": "97bde6ba67512ac43bf3f6891a47edb9aeeefa2b", "parents": [ "e8a7e48bb248a1196484d3f8afa53bded2b24e71" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Tue Nov 30 18:21:46 2010 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Dec 11 02:01:35 2010 -0500" }, "message": "ACPI: video: fix build for VIDEO_OUTPUT_CONTROL\u003dn\n\ndrivers/built-in.o: In function `acpi_video_bus_put_devices\u0027:\nvideo.c:(.text+0x79663): undefined reference to\n`video_output_unregister\u0027\ndrivers/built-in.o: In function `acpi_video_bus_add\u0027:\nvideo.c:(.text+0x7b0b3): undefined reference to `video_output_register\u0027\n\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "d90aa92c0c1625d7f02050e4d2924805840cda3d", "tree": "89696463c63038cb37609873951b0cdb4dc473f6", "parents": [ "cf7d7e5a1980d1116ee152d25dac382b112b9c17" ], "author": { "name": "Lin Ming", "email": "ming.m.lin@intel.com", "time": "Thu Dec 09 16:50:52 2010 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Dec 11 01:28:58 2010 -0500" }, "message": "acpi: fix _OSI string setup regression\n\ncommit b0ed7a91(ACPICA/ACPI: Add new host interfaces for _OSI suppor)\nintroduced a regression that _OSI string setup fails.\n\nThere are 2 paths to setup _OSI string.\n\nDMI:\nacpi_dmi_osi_linux -\u003e set_osi_linux -\u003e acpi_osi_setup -\u003e copy _OSI\nstring to osi_setup_string\n\nBoot command line:\nacpi_osi_setup -\u003e copy _OSI string to osi_setup_string\n\nLater, acpi_osi_setup_late will be called to handle osi_setup_string.\nIf _OSI string is \"Linux\" or \"!Linux\", then the call path is,\n\nacpi_osi_setup_late -\u003e acpi_cmdline_osi_linux -\u003e set_osi_linux -\u003e\nacpi_osi_setup -\u003e copy _OSI string to osi_setup_string\n\nThis actually never installs _OSI string(acpi_install_interface not\ncalled), but just copy the _OSI string to osi_setup_string.\n\nThis patch fixes the regression.\n\nReported-and-tested-by: Lukas Hejtmanek \u003cxhejtman@ics.muni.cz\u003e\nSigned-off-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "d9ca676bcb26e1fdff9265a3e70f697cd381c889", "tree": "72ab0bf8cb22291eb4e1a57329bb8e1df2b7649f", "parents": [ "fb890ae7d615f4b4f5689144b6832230ab2046aa" ], "author": { "name": "Dan Williams", "email": "dcbw@redhat.com", "time": "Wed Dec 08 19:40:47 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 10 15:45:05 2010 -0800" }, "message": "atm: correct sysfs \u0027device\u0027 link creation and parent relationships\n\nThe ATM subsystem was incorrectly creating the \u0027device\u0027 link for ATM\nnodes in sysfs. This led to incorrect device/parent relationships\nexposed by sysfs and udev. Instead of rolling the \u0027device\u0027 link by hand\nin the generic ATM code, pass each ATM driver\u0027s bus device down to the\nsysfs code and let sysfs do this stuff correctly.\n\nSigned-off-by: Dan Williams \u003cdcbw@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "87c0104af742af2acfcbd685f2b9a40f33770dc0", "tree": "f17e999013e443ec70bb4c05a79a44c6ae52054f", "parents": [ "8bb6a164b906bb7ca319202f85b30e3ef096cd65" ], "author": { "name": "Pavankumar Kondeti", "email": "pkondeti@codeaurora.org", "time": "Tue Dec 07 17:53:58 2010 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 10 14:23:32 2010 -0800" }, "message": "USB: OTG: msm: Add support for power management\n\nImplement runtime and system pm ops to put hardware into low power\nmode (LPM). As part of LPM, USB clocks are turned off, PHY is put\ninto suspend state and PHY comparators are turned off if VBUS/Id\nnotifications are not required from PHY.\n\nSigned-off-by: Pavankumar Kondeti \u003cpkondeti@codeaurora.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "e0c201f339fe7fc38d1b0f6f4755ff627686c7e0", "tree": "a8245f60d4e0c0e22901a15a655af45eaf17325d", "parents": [ "05570297ecbe834b1756b522412b68eaffb9ab11" ], "author": { "name": "Pavankumar Kondeti", "email": "pkondeti@codeaurora.org", "time": "Tue Dec 07 17:53:55 2010 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 10 14:23:31 2010 -0800" }, "message": "USB: Add MSM OTG Controller driver\n\nThis driver implements PHY initialization, clock management, ULPI IO ops\nand simple OTG state machine to kick host/peripheral based on Id/VBUS\nline status. VBUS/Id lines are tied to a reference voltage on some boards.\nHence provide debugfs interface to select host/peripheral mode.\n\nSigned-off-by: Pavankumar Kondeti \u003cpkondeti@codeaurora.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "352a337832774a6929c16b569abe9cedc3db01cc", "tree": "aa5c99abbb79155320ab01cb9fcd2f5a1d0691f7", "parents": [ "537baabbdfebe7f9514f05b62eac91b4bfa0bdf2" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Thu Dec 09 22:46:29 2010 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 10 14:18:36 2010 -0800" }, "message": "USB: otg: fix link breakage, when the NOP USB Xceiver is a module\n\nIf the NOP USB OTG transceiver driver is built as a module, the otg.h\nheader declares external functions, but if they are referenced from the\nkernel proper, as, e.g., in the OMAP3 case, where the omap3evm board is\ncalling the usb_nop_xceiv_register() function, linkage breaks. This patch\nfixes this problem.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "e70357e35c522776d9f56f6800af4ed7a5bdbaaf", "tree": "bb002bfcf01d284e036535e4476e616102d604c3", "parents": [ "4c42fbc99fc8656efc7d2b5e92be0d430ccefdc6" ], "author": { "name": "Hema HK", "email": "hemahk@ti.com", "time": "Fri Dec 10 18:09:52 2010 +0530" }, "committer": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Fri Dec 10 14:46:51 2010 +0200" }, "message": "mfd: TWL6030: OMAP4: Registering the TWL6030-usb device\n\nRegistering the twl6030-usb transceiver device as a child to twl6030 core.\nRemoved the NOP transceiver init call from board file.\n\nPopulated twl4030_usb_data platform data structure with the function\npointers for OMAP4430 internal PHY operation to be used by twl630-usb driver.\n\nSigned-off-by: Hema HK \u003chemahk@ti.com\u003e\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\n" }, { "commit": "fa56df915d101770a495569473b4c13b1904087b", "tree": "f10abb5731bc4c8ea62b57af760049782c913faa", "parents": [ "0349176120aa3024e96ae4fd7dc0e0181dc55f52" ], "author": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Thu Dec 02 10:55:29 2010 +0200" }, "committer": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Fri Dec 10 10:21:25 2010 +0200" }, "message": "usb: musb: drop the set_clock magic\n\nnow that platform glue layer handles\nclock completely, that function is completely\nuseless for us. Drop it.\n\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\n" }, { "commit": "3b7029670d39d22f288ece95254e9ba5ceddd6ba", "tree": "46f8a0d4991ca042e1de3fd8e51cca9d24400a32", "parents": [ "f7ec94370f417fedad4db1054228ef958d48b926" ], "author": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Thu Dec 02 09:51:00 2010 +0200" }, "committer": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Fri Dec 10 10:21:24 2010 +0200" }, "message": "usb: musb: mark -\u003eset_clock deprecated\n\n... we will completely drop that need by\nmoving clock handling to platform glue\nlayer. Marking as deprecated will allow\nus to catch all users easily.\n\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\n" }, { "commit": "f7ec94370f417fedad4db1054228ef958d48b926", "tree": "b036e02e21c04f60300394247869bdd5cda90026", "parents": [ "a023c631f546ef95d58969385825a47652ab9039" ], "author": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Thu Dec 02 09:48:58 2010 +0200" }, "committer": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Fri Dec 10 10:21:23 2010 +0200" }, "message": "usb: musb: pass platform_ops via platform_data\n\n... then we don\u0027t need to export any symbols\nfrom glue layer to musb_core.\n\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\n" }, { "commit": "05ac10dd6862a3fcce33d2203fbb2ef285e3ca87", "tree": "d56301e2a12cecc8ef75f9fc6ca121a432cc5271", "parents": [ "7c925546427a0428b84bc5ba1f28b3698e492072" ], "author": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Thu Dec 02 08:49:26 2010 +0200" }, "committer": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Fri Dec 10 10:21:10 2010 +0200" }, "message": "usb: musb: trivial search and replace patch\n\nchange all ocurrences of musb_hdrc to musb-hdrc.\n\nWe will call glue layer drivers musb-\u003cglue layer\u003e,\nso in order to keep things somewhat standard, let\u0027s\nchange the underscore into a dash.\n\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\n" }, { "commit": "d70ab7f7ee0692efc880d772dc5c212174d67e3b", "tree": "82731bc8ccd773922df644881b2570d9c3702e8a", "parents": [ "58936b29c4c3e633a92bb918409fe1f0ca148144", "2a7b1a00206895cfa444fd83477dca67a88a9d25" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Dec 09 08:24:32 2010 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Dec 09 08:24:32 2010 +0100" }, "message": "Merge branch \u0027fix/asoc\u0027 into for-linus\n" }, { "commit": "67631510a318d5a930055fe927607f483716e100", "tree": "fd98bd3ab939a22188c72d4371c263af2d756192", "parents": [ "171995e5d82dcc92bea37a7d2a2ecc21068a0f19" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Wed Dec 08 12:16:33 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 08 12:16:33 2010 -0800" }, "message": "tcp: Replace time wait bucket msg by counter\n\nRather than printing the message to the log, use a mib counter to keep\ntrack of the count of occurences of time wait bucket overflow. Reduces\nspam in logs.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f8f5d4f11dc7d321fb372b09fc8767069a18bf30", "tree": "cc615bcdfd5c4b8f5b643785b17c728e3d88769a", "parents": [ "2cedcc4f122934c3ad38dfb2a400b98a62703e6d", "47d092352c132a2d0ee4156b5dca263eaad2c17f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 08 06:34:02 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 08 06:34:02 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: wacom - add new Bamboo PT (0xdb)\n Input: add input driver for polled GPIO buttons\n Input: turbografx - fix reference counting\n Input: synaptics - fix handling of 2-button ClickPads\n Input: wacom - add IDs for two new Bamboo PTs\n Input: document struct input_absinfo\n Input: add keycodes for touchpad on/off keys\n Input: usbtouchscreen - add support for LG Flatron T1710B\n" }, { "commit": "2df485a774ba59c3f43bfe84107672c1d9b731a0", "tree": "a958e82f619290cb5cb28301e30186ef594cd7b4", "parents": [ "0de1b7e800188782973598158e0acbb9e08e6c99" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Dec 07 22:39:17 2010 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Dec 07 23:02:44 2010 -0500" }, "message": "nfs: remove extraneous and problematic calls to nfs_clear_request\n\nWhen a nfs_page is freed, nfs_free_request is called which also calls\nnfs_clear_request to clean out the lock and open contexts and free the\npagecache page.\n\nHowever, a couple of places in the nfs code call nfs_clear_request\nthemselves. What happens here if the refcount on the request is still high?\nWe\u0027ll be releasing contexts and freeing pointers while the request is\npossibly still in use.\n\nRemove those bare calls to nfs_clear_context. That should only be done when\nthe request is being freed.\n\nNote that when doing this, we need to watch out for tests of req-\u003ewb_page.\nPreviously, nfs_set_page_tag_locked() and nfs_clear_page_tag_locked()\nwould check the value of req-\u003ewb_page to figure out if the page is mapped\ninto the nfsi-\u003enfs_page_tree. We now indicate the page is mapped using\nthe new bit PG_MAPPED in req-\u003ewb_flags .\n\nReported-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "0e7d0c860a0dee49dacb7bbb248d1eba637075ad", "tree": "5b96db3517840fcb8b39c64dce3254124bf59739", "parents": [ "8ed9e0e1b602a0bcdc3bef52ec05fdab5b484341" ], "author": { "name": "Gabor Juhos", "email": "juhosg@openwrt.org", "time": "Mon Dec 06 17:14:47 2010 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Dec 06 17:15:15 2010 -0800" }, "message": "Input: add input driver for polled GPIO buttons\n\nThe existing gpio-keys driver can be usable only for GPIO lines with\ninterrupt support. Several devices have buttons connected to a GPIO\nline which is not capable to generate interrupts. This patch adds a\nnew input driver using the generic GPIO layer and the input-polldev\nto support such buttons.\n\n[Ben Gardiner \u003cbengardiner@nanometrics.ca: fold code to use more\n of the original gpio_keys infrastructure; cleanups and other\n improvements.]\n\nSigned-off-by: Gabor Juhos \u003cjuhosg@openwrt.org\u003e\nSigned-off-by: Ben Gardiner \u003cbengardiner@nanometrics.ca\u003e\nTested-by: Ben Gardiner \u003cbengardiner@nanometrics.ca\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "7787d2c2f440cc7854bed3d039bf4cc59d9e7897", "tree": "d7402ea46b2aa0a4d049e8edc61a302bda4db4d5", "parents": [ "60658f8a293750b59a8a844bf5c387139af9500a", "c9e664f1fdf34aa8cede047b206deaa8f1945af0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 06 15:51:14 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 06 15:51:14 2010 -0800" }, "message": "Merge branch \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6\n\n* \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:\n PM / Hibernate: Fix memory corruption related to swap\n PM / Hibernate: Use async I/O when reading compressed hibernation image\n" }, { "commit": "c9e664f1fdf34aa8cede047b206deaa8f1945af0", "tree": "6038002f46173ca785936ac2fe54177197f98a08", "parents": [ "9f339caf8454f0c21983111350ede93983db4340" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 03 22:57:45 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Dec 06 23:52:08 2010 +0100" }, "message": "PM / Hibernate: Fix memory corruption related to swap\n\nThere is a problem that swap pages allocated before the creation of\na hibernation image can be released and used for storing the contents\nof different memory pages while the image is being saved. Since the\nkernel stored in the image doesn\u0027t know of that, it causes memory\ncorruption to occur after resume from hibernation, especially on\nsystems with relatively small RAM that need to swap often.\n\nThis issue can be addressed by keeping the GFP_IOFS bits clear\nin gfp_allowed_mask during the entire hibernation, including the\nsaving of the image, until the system is finally turned off or\nthe hibernation is aborted. Unfortunately, for this purpose\nit\u0027s necessary to rework the way in which the hibernate and\nsuspend code manipulates gfp_allowed_mask.\n\nThis change is based on an earlier patch from Hugh Dickins.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nReported-by: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "3fcc0afbb9c93f3599ba03273e59915670b6c2c2", "tree": "0ebe1bc72db22e018db8c2bfba798810e6d68f07", "parents": [ "af745bd724e304cc94a88a2fb43d53baffbd63a5" ], "author": { "name": "Uk Kim", "email": "w0806.kim@samsung.com", "time": "Sun Dec 05 17:32:16 2010 +0900" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon Dec 06 12:43:02 2010 +0000" }, "message": "ASoC: Fix off by one error in WM8994 EQ register bank size\n\nSigned-off-by: Uk Kim \u003cw0806.kim@samsung.com\u003e\nAcked-by: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "20d6c96b5f1cad5c5da4641945ec17a1d9a1afc8", "tree": "38168dc87d58fd924adb3aaca540cd23ad1246bf", "parents": [ "4fe65cab844e6d3d7d310e66a501d5e7242ecb54" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Thu Dec 02 14:31:19 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 02 14:51:15 2010 -0800" }, "message": "mem-hotplug: introduce {un}lock_memory_hotplug()\n\nPresently hwpoison is using lock_system_sleep() to prevent a race with\nmemory hotplug. However lock_system_sleep() is a no-op if\nCONFIG_HIBERNATION\u003dn. Therefore we need a new lock.\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Kamezawa Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSuggested-by: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "64141da587241301ce8638cc945f8b67853156ec", "tree": "bf11cfe53f606a2bda2342c6286ba637c4848e34", "parents": [ "853ff88324a248a9f5da6e110850223db353ec07" ], "author": { "name": "Jeremy Fitzhardinge", "email": "jeremy@goop.org", "time": "Thu Dec 02 14:31:18 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 02 14:51:15 2010 -0800" }, "message": "vmalloc: eagerly clear ptes on vunmap\n\nOn stock 2.6.37-rc4, running:\n\n # mount lilith:/export /mnt/lilith\n # find /mnt/lilith/ -type f -print0 | xargs -0 file\n\ncrashes the machine fairly quickly under Xen. Often it results in oops\nmessages, but the couple of times I tried just now, it just hung quietly\nand made Xen print some rude messages:\n\n (XEN) mm.c:2389:d80 Bad type (saw 7400000000000001 !\u003d exp\n 3000000000000000) for mfn 1d7058 (pfn 18fa7)\n (XEN) mm.c:964:d80 Attempt to create linear p.t. with write perms\n (XEN) mm.c:2389:d80 Bad type (saw 7400000000000010 !\u003d exp\n 1000000000000000) for mfn 1d2e04 (pfn 1d1fb)\n (XEN) mm.c:2965:d80 Error while pinning mfn 1d2e04\n\nWhich means the domain tried to map a pagetable page RW, which would\nallow it to map arbitrary memory, so Xen stopped it. This is because\nvm_unmap_ram() left some pages mapped in the vmalloc area after NFS had\nfinished with them, and those pages got recycled as pagetable pages\nwhile still having these RW aliases.\n\nRemoving those mappings immediately removes the Xen-visible aliases, and\nso it has no problem with those pages being reused as pagetable pages.\nDeferring the TLB flush doesn\u0027t upset Xen because it can flush the TLB\nitself as needed to maintain its invariants.\n\nWhen unmapping a region in the vmalloc space, clear the ptes\nimmediately. There\u0027s no point in deferring this because there\u0027s no\namortization benefit.\n\nThe TLBs are left dirty, and they are flushed lazily to amortize the\ncost of the IPIs.\n\nThis specific motivation for this patch is an oops-causing regression\nsince 2.6.36 when using NFS under Xen, triggered by the NFS client\u0027s use\nof vm_map_ram() introduced in 56e4ebf877b60 (\"NFS: readdir with vmapped\npages\") . XFS also uses vm_map_ram() and could cause similar problems.\n\nSigned-off-by: Jeremy Fitzhardinge \u003cjeremy.fitzhardinge@citrix.com\u003e\nCc: Nick Piggin \u003cnpiggin@kernel.dk\u003e\nCc: Bryan Schumaker \u003cbjschuma@netapp.com\u003e\nCc: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: Alex Elder \u003caelder@sgi.com\u003e\nCc: Dave Chinner \u003cdavid@fromorbit.com\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8733cb29d60fd2ca6c1f50f69f9b90fbfcd1879b", "tree": "e6bef80539d3ada338f3f72733253b995df7e5c7", "parents": [ "eed5ee1a3ab3020168cd67fdde2500452b0628c9", "318af55ddd38bdaaa2b57f5c3bd394f3ce3a2610" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 02 12:58:36 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 02 12:58:36 2010 -0800" }, "message": "Merge branch \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:\n uio: Change mail address of Hans J. Koch\n driver core: prune docs about device_interface\n driver core: the development tree has switched to git\n" }, { "commit": "eed5ee1a3ab3020168cd67fdde2500452b0628c9", "tree": "9548c5a4851b1a1e832b7800baf1e72b33bc7a66", "parents": [ "435a5aebf609624bdf7c5a9a7705c260d0076195", "a5880a9e5bb40fbae55de60051d69a29091053c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 02 12:58:16 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 02 12:58:16 2010 -0800" }, "message": "Merge branch \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n serial: mfd: adjust the baud rate setting\n TTY: open/hangup race fixup\n TTY: don\u0027t allow reopen when ldisc is changing\n NET: wan/x25, fix ldisc-\u003eopen retval\n TTY: ldisc, fix open flag handling\n serial8250: Mark console as CON_ANYTIME\n" }, { "commit": "435a5aebf609624bdf7c5a9a7705c260d0076195", "tree": "8df55b6c2485921e33f7f877675226e487e71322", "parents": [ "2e5c26de1d9a8e824b6c098ee393edac1b6050f9", "b7a5100bc29c2cc252bf6f1e247ae14fd733fbb8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 02 12:57:35 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 02 12:57:35 2010 -0800" }, "message": "Merge branch \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:\n USB: fix autosuspend bug in usb-serial\n USB: ehci: disable LPM and PPCD for nVidia MCP89 chips\n USB: serial: ftdi_sio: Vardaan USB RS422/485 converter PID added\n USB: yurex: add .llseek fop to file_operations\n USB: ftdi_sio: Add ID for RT Systems USB-29B radio cable\n usb: musb: do not use dma for control transfers\n usb: musb: gadget: fix compilation warning\n usb: musb: clear RXCSR_AUTOCLEAR before PIO read\n usb: musb: unmap dma buffer when switching to PIO\n xhci: Don\u0027t let the USB core disable SuperSpeed ports.\n xhci: Setup array of USB 2.0 and USB 3.0 ports.\n xhci: Fix reset-device and configure-endpoint commands\n" }, { "commit": "11de3b11e08cac26d59e88efaf4e316701883552", "tree": "e4cc282e692560897c42c5fbc8df227d5da669d4", "parents": [ "6072d13c429373c5d63b69dadbbef40a9b035552" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Dec 01 14:17:06 2010 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Dec 02 09:58:00 2010 -0500" }, "message": "NFS: Fix a memory leak in nfs_readdir\n\nWe need to ensure that the entries in the nfs_cache_array get cleared\nwhen the page is removed from the page cache. To do so, we use the\nfreepage address_space operation.\n\nChange nfs_readdir_clear_array to use kmap_atomic(), so that the\nfunction can be safely called from all contexts.\n\nFinally, modify the cache_page_release helper to call\nnfs_readdir_clear_array directly, when dealing with an anonymous\npage from \u0027uncached_readdir\u0027.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "6072d13c429373c5d63b69dadbbef40a9b035552", "tree": "a2bf745efaa4092f2a8d7d9a9b160c2a7a3b303f", "parents": [ "0aded708d125a3ff7e5abaea9c2d9c6d7ebbfdcd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 01 13:35:19 2010 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Dec 02 09:55:21 2010 -0500" }, "message": "Call the filesystem back whenever a page is removed from the page cache\n\nNFS needs to be able to release objects that are stored in the page\ncache once the page itself is no longer visible from the page cache.\n\nThis patch adds a callback to the address space operations that allows\nfilesystems to perform page cleanups once the page has been removed\nfrom the page cache.\n\nOriginal patch by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n[trondmy: cover the cases of invalidate_inode_pages2() and\n truncate_inode_pages()]\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "86b17f76f462db460d6d916e105a4c44cb353e36", "tree": "b83c3f03f91867260143126ed75592353bfefaa8", "parents": [ "0417596f66dd6621f4fd46563c7c56a95311dbe8" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Nov 29 23:33:04 2010 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Nov 30 23:11:57 2010 -0800" }, "message": "Input: document struct input_absinfo\n\nAdd documentation for struct input_absinfo that is used in EVIOCGABS\nand EVIOCSABS ioctl and specify units of measure used for reporting\nresolution for an axis.\n\nAcked-by: Henrik Rydberg \u003crydberg@euromail.se\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "0417596f66dd6621f4fd46563c7c56a95311dbe8", "tree": "fb2bae90054fc8e96b1e4c0954edc97df1117736", "parents": [ "09910509ebc74643e94fe6f3feb4c23b019aeb34" ], "author": { "name": "Bastien Nocera", "email": "hadess@hadess.net", "time": "Mon Nov 29 23:33:05 2010 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Nov 30 23:11:26 2010 -0800" }, "message": "Input: add keycodes for touchpad on/off keys\n\nSome laptops will have a \"touchpad toggle\" soft button, which expects\nuser-space to turn off the touchpad themselves, some other devices will\ndo this in hardware, but send key events telling us that the touchpad\nhas been turned off/on.\n\nKEY_TOUCHPAD_ON/KEY_TOUCHPAD_OFF will be used by user-space to show a\npopup with the status of the touchpad.\n\nSigned-off-by: Bastien Nocera \u003chadess@hadess.net\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "114279be2120a916e8a04feeb2ac976a10016f2f", "tree": "866a5dfab411d18941d58f8796edab6da760213e", "parents": [ "3c77f845722158206a7209c45ccddc264d19319c" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Tue Nov 30 20:56:02 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 30 17:56:38 2010 -0800" }, "message": "exec: copy-and-paste the fixes into compat_do_execve() paths\n\nNote: this patch targets 2.6.37 and tries to be as simple as possible.\nThat is why it adds more copy-and-paste horror into fs/compat.c and\nuglifies fs/exec.c, this will be cleanuped later.\n\ncompat_copy_strings() plays with bprm-\u003evma/mm directly and thus has\ntwo problems: it lacks the RLIMIT_STACK check and argv/envp memory\nis not visible to oom killer.\n\nExport acct_arg_size() and get_arg_page(), change compat_copy_strings()\nto use get_arg_page(), change compat_do_execve() to do acct_arg_size(0)\nas do_execve() does.\n\nAdd the fatal_signal_pending/cond_resched checks into compat_count() and\ncompat_copy_strings(), this matches the code in fs/exec.c and certainly\nmakes sense.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3c77f845722158206a7209c45ccddc264d19319c", "tree": "9eace97a8b88eb68b7d5d3127041b14c202421ae", "parents": [ "37a09f07459753e7c98d4e21f1c61e8756923f81" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Tue Nov 30 20:55:34 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 30 17:56:37 2010 -0800" }, "message": "exec: make argv/envp memory visible to oom-killer\n\nBrad Spengler published a local memory-allocation DoS that\nevades the OOM-killer (though not the virtual memory RLIMIT):\nhttp://www.grsecurity.net/~spender/64bit_dos.c\n\nexecve()-\u003ecopy_strings() can allocate a lot of memory, but\nthis is not visible to oom-killer, nobody can see the nascent\nbprm-\u003emm and take it into account.\n\nWith this patch get_arg_page() increments current\u0027s MM_ANONPAGES\ncounter every time we allocate the new page for argv/envp. When\ndo_execve() succeds or fails, we change this counter back.\n\nTechnically this is not 100% correct, we can\u0027t know if the new\npage is swapped out and turn MM_ANONPAGES into MM_SWAPENTS, but\nI don\u0027t think this really matters and everything becomes correct\nonce exec changes -\u003emm or fails.\n\nReported-by: Brad Spengler \u003cspender@grsecurity.net\u003e\nReviewed-and-discussed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7fc56f0d9908fe140a01387d59954e3d0a2e7744", "tree": "88cbdeeacff090643c8b2dc6e44df82b2d1f2b6b", "parents": [ "b23f2f94136884ebeb1b5e2196f4a53086444afa" ], "author": { "name": "Luo Andy", "email": "yifei.luo@intel.com", "time": "Tue Nov 23 10:41:21 2010 +0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Nov 30 16:50:36 2010 -0800" }, "message": "usb: gadget: langwell_udc: add usb test mode support\n\nThis patch adds test mode support for Langwell gadget driver.\n\nSigned-off-by: Henry Yuan \u003chang.yuan@intel.com\u003e\nSigned-off-by: Andy Luo \u003cyifei.luo@intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "b7a5100bc29c2cc252bf6f1e247ae14fd733fbb8", "tree": "2fb2c2cc3fc49cbae321810fd13f49aa58b9b2ed", "parents": [ "8244272341f00cab845cabc445dbd3665fc01f87", "07a8cdd2bb17a4da68136d963b8bc71959bd31a5" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Nov 30 15:52:04 2010 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Nov 30 15:52:04 2010 -0800" }, "message": "Merge branch \u0027for-greg\u0027 of git://gitorious.org/usb/usb into work\n" }, { "commit": "acfa747baf73922021a047f2d87a2d866f5dbab5", "tree": "f47037d4c02341a9e4102eddd7dc6c774e6b439d", "parents": [ "e2efafbf139d2bfdfe96f2901f03189fecd172e4" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Nov 29 10:16:54 2010 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Nov 29 14:52:48 2010 -0800" }, "message": "TTY: open/hangup race fixup\n\nLike in the \"TTY: don\u0027t allow reopen when ldisc is changing\" patch,\nthis one fixes a TTY WARNING as described in the option 1) there:\n1) __tty_hangup from tty_ldisc_hangup to tty_ldisc_enable. During this\nsection tty_lock is held. However tty_lock is temporarily dropped in\nthe middle of the function by tty_ldisc_hangup.\n\nThe fix is to introduce a new flag which we set during the unlocked\nwindow and check it in tty_reopen too. The flag is TTY_HUPPING and is\ncleared after TTY_HUPPED is set.\n\nWhile at it, remove duplicate TTY_HUPPED set_bit. The one after\ncalling ops-\u003ehangup seems to be more correct. But anyway, we hold\ntty_lock, so there should be no difference.\n\nAlso document the function it does that kind of crap.\n\nNicely reproducible with two forked children:\nstatic void do_work(const char *tty)\n{\n\tif (signal(SIGHUP, SIG_IGN) \u003d\u003d SIG_ERR) exit(1);\n\tsetsid();\n\twhile (1) {\n\t\tint fd \u003d open(tty, O_RDWR|O_NOCTTY);\n\t\tif (fd \u003c 0) continue;\n\t\tif (ioctl(fd, TIOCSCTTY)) continue;\n\t\tif (vhangup()) continue;\n\t\tclose(fd);\n\t}\n\texit(0);\n}\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nReported-by: \u003cValdis.Kletnieks@vt.edu\u003e\nReported-by: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "a01af8e4a4ee1135598f157051959982418c38f8", "tree": "76c78a7cbd02204afbe7404880dfbf312ebd51a5", "parents": [ "a9735c81a43054a7e8cb8771c8e04c01fcacde10", "25888e30319f8896fc656fc68643e6a078263060" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 29 14:36:33 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 29 14:36:33 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)\n af_unix: limit recursion level\n pch_gbe driver: The wrong of initializer entry\n pch_gbe dreiver: chang author\n ucc_geth: fix ucc halt problem in half duplex mode\n inet: Fix __inet_inherit_port() to correctly increment bsockets and num_owners\n ehea: Add some info messages and fix an issue\n hso: fix disable_net\n NET: wan/x25_asy, move lapb_unregister to x25_asy_close_tty\n cxgb4vf: fix setting unicast/multicast addresses ...\n net, ppp: Report correct error code if unit allocation failed\n DECnet: don\u0027t leak uninitialized stack byte\n au1000_eth: fix invalid address accessing the MAC enable register\n dccp: fix error in updating the GAR\n tcp: restrict net.ipv4.tcp_adv_win_scale (#20312)\n netns: Don\u0027t leak others\u0027 openreq-s in proc\n Net: ceph: Makefile: Remove unnessary code\n vhost/net: fix rcu check usage\n econet: fix CVE-2010-3848\n econet: fix CVE-2010-3850\n econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849\n ...\n" }, { "commit": "72083646528d4887b920deb71b37e09bc7d227bb", "tree": "84a650b474530ae2d2d72614899532757d4bb961", "parents": [ "c66fb347946ebdd5b10908866ecc9fa05ee2cf3d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 28 16:27:19 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 28 16:27:19 2010 -0800" }, "message": "Un-inline get_pipe_info() helper function\n\nThis avoids some include-file hell, and the function isn\u0027t really\nimportant enough to be inlined anyway.\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c66fb347946ebdd5b10908866ecc9fa05ee2cf3d", "tree": "1891142352d75dcf58a1e90d8dde4d4a99c6e266", "parents": [ "71993e62a47dabddf10302807d6aa260455503f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 28 14:09:57 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 28 14:09:57 2010 -0800" }, "message": "Export \u0027get_pipe_info()\u0027 to other users\n\nAnd in particular, use it in \u0027pipe_fcntl()\u0027.\n\nThe other pipe functions do not need to use the \u0027careful\u0027 version, since\nthey are only ever called for things that are already known to be pipes.\n\nThe normal read/write/ioctl functions are called through the file\noperations structures, so if a file isn\u0027t a pipe, they\u0027d never get\ncalled. But pipe_fcntl() is special, and called directly from the\ngeneric fcntl code, and needs to use the same careful function that the\nsplice code is using.\n\nCc: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a9e40a2493d805224f900d839b06188639b7ccd6", "tree": "b33c9477a0728f6299a00a3e817aa26872019576", "parents": [ "75f5d2c9bd36047364d1fb35c0720ab37df3be02", "ee6dcfa40a50fe12a3ae0fb4d2653c66c3ed6556" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 28 12:25:02 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 28 12:25:02 2010 -0800" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n perf: Fix the software context switch counter\n perf, x86: Fixup Kconfig deps\n x86, perf, nmi: Disable perf if counters are not accessible\n perf: Fix inherit vs. context rotation bug\n" }, { "commit": "19650e8580987c0ffabc2fe2cbc16b944789df8b", "tree": "cf0cfb390a128e3b2d47daa46f59de0a62a8ff04", "parents": [ "1eb4c6362cb7d6a2f904c555c10dc45caeeefc31", "0b26a0bf6ff398185546432420bb772bcfdf8d94" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 27 07:30:30 2010 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 27 07:30:30 2010 +0900" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n NFS: Ensure we return the dirent-\u003ed_type when it is known\n NFS: Correct the array bound calculation in nfs_readdir_add_to_array\n NFS: Don\u0027t ignore errors from nfs_do_filldir()\n NFS: Fix the error handling in \"uncached_readdir()\"\n NFS: Fix a page leak in uncached_readdir()\n NFS: Fix a page leak in nfs_do_filldir()\n NFS: Assume eof if the server returns no readdir records\n NFS: Buffer overflow in -\u003edecode_dirent() should not be fatal\n Pure nfs client performance using odirect.\n SUNRPC: Fix an infinite loop in call_refresh/call_refreshresult\n" }, { "commit": "fbe6c4047f011d76be83bc2380531cd4fb6aa0e6", "tree": "c4f9bee27e330093fc2d365a2dedc84f1c524124", "parents": [ "d2f30c73aba19be828c759edcd21140390cd06e4", "4917b284db8607e414c334317b7d15239854d39c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 27 07:28:47 2010 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 27 07:28:47 2010 +0900" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n dmar, x86: Use function stubs when CONFIG_INTR_REMAP is disabled\n x86-64: Fix and clean up AMD Fam10 MMCONF enabling\n x86: UV: Address interrupt/IO port operation conflict\n x86: Use online node real index in calulate_tbl_offset()\n x86, asm: Fix binutils 2.15 build failure\n" }, { "commit": "d2f30c73aba19be828c759edcd21140390cd06e4", "tree": "b9bad75b11e21680f8f9443f0143d62be23cae78", "parents": [ "1b065fdff1c950d96e4c571abe873a9a8aaa6d51", "02a9d03772aa1ff33a26180a2da0bfb191240eda" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 27 07:28:17 2010 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 27 07:28:17 2010 +0900" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n perf symbols: Remove incorrect open-coded container_of()\n perf record: Handle restrictive permissions in /proc/{kallsyms,modules}\n x86/kprobes: Prevent kprobes to probe on save_args()\n irq_work: Drop cmpxchg() result\n perf: Fix owner-list vs exit\n x86, hw_nmi: Move backtrace_mask declaration under ARCH_HAS_NMI_WATCHDOG\n tracing: Fix recursive user stack trace\n perf,hw_breakpoint: Initialize hardware api earlier\n x86: Ignore trap bits on single step exceptions\n tracing: Force arch_local_irq_* notrace for paravirt\n tracing: Fix module use of trace_bprintk()\n" }, { "commit": "5c3b9bac28c62151f133a944fe14df5e153ae493", "tree": "f8159b142262aaa80406f2dbef744c012ffda113", "parents": [ "b127c6fb508f86542c3d5e460e1b99d2294360a6", "15ec44611904be0dcc97b84c29fbf964e5e2b36f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 27 07:16:29 2010 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 27 07:16:29 2010 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n mmc: sdhci: 8-bit bus width changes\n mmc: sdio: fix runtime PM anomalies by introducing MMC_CAP_POWER_OFF_CARD\n mmc: sdio: fix nasty oops in mmc_sdio_detect\n mmc: omap4: hsmmc: Fix improper card detection while booting\n mmc: fix rmmod race for hosts using card-detection polling\n mmc: sdhci: Fix crash on boot with C0 stepping Moorestown platforms\n mmc: sdhci-esdhc-imx: enable QUIRK_NO_MULTIBLOCK only for i.MX25 and i.MX35\n mmc: sdhci-esdhc-imx: fix timeout on i.MX\u0027s sdhci\n mmc: sdhci: Properly enable SDIO IRQ wakeups\n mmc: ushc: Return proper error code for ushc_probe()\n mmc: Fix printing of card DDR type\n" }, { "commit": "ee6dcfa40a50fe12a3ae0fb4d2653c66c3ed6556", "tree": "e77ac01a6bf2106f7a2c22f00e43cb2960d72ba5", "parents": [ "cc2067a51424dd25c10c1b1230b4222d8baec94d" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri Nov 26 13:49:04 2010 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Nov 26 15:00:59 2010 +0100" }, "message": "perf: Fix the software context switch counter\n\nStephane noticed that because the perf_sw_event() call is inside the\nperf_event_task_sched_out() call it won\u0027t get called unless we\nhave a per-task counter.\n\nReported-by: Stephane Eranian \u003ceranian@google.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "dddd3379a619a4cb8247bfd3c94ca9ae3797aa2e", "tree": "9b090784b46956d236b51c4addfcd97f575f205e", "parents": [ "02a9d03772aa1ff33a26180a2da0bfb191240eda" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Nov 24 10:05:55 2010 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Nov 26 15:00:56 2010 +0100" }, "message": "perf: Fix inherit vs. context rotation bug\n\nIt was found that sometimes children of tasks with inherited events had\none extra event. Eventually it turned out to be due to the list rotation\nno being exclusive with the list iteration in the inheritance code.\n\nCure this by temporarily disabling the rotation while we inherit the events.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003cnew-submission\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "4917b284db8607e414c334317b7d15239854d39c", "tree": "a1f3590349e1ef990e0febf789c43bb124fff448", "parents": [ "37db6c8f1d0c4b8f01dc049f3a893b725288660f" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon Nov 22 12:48:34 2010 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Nov 26 09:57:36 2010 +0100" }, "message": "dmar, x86: Use function stubs when CONFIG_INTR_REMAP is disabled\n\nThe stubs for CONFIG_INTR_REMAP disabled need to be functions\ninstead of values to eliminate build warnings.\n\n arch/x86/kernel/apic/apic.c: In function \u0027lapic_suspend\u0027:\n arch/x86/kernel/apic/apic.c:2060:3: warning: statement with no effect\n arch/x86/kernel/apic/apic.c: In function \u0027lapic_resume\u0027:\n arch/x86/kernel/apic/apic.c:2137:3: warning: statement with no effect\n\nReported-and-Tested-by: Fabio Comolli \u003cfabio.comolli@gmail.com\u003e\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nLKML-Reference: \u003c20101122124834.74429004.randy.dunlap@oracle.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e5fa506173a6ed1ca8d78ba1e390cfdebc2fd49a", "tree": "3dfa1f28f26f3b89ee13715284c15d8b0e80afa0", "parents": [ "3070fb888be52c5488976828ffc9f950872ffadc", "c07a1c6b0fc6408efda7b7f5d12f24a3eda6a5e8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 25 06:58:56 2010 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 25 06:58:56 2010 +0900" }, "message": "Merge branch \u0027fbdev-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6\n\n* \u0027fbdev-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:\n sisfb: delete osdef.h\n sisfb: move the CONFIG warning to sis_main.c\n sisfb: replace SiS_SetMemory with memset_io\n sisfb: remove InPort/OutPort wrappers\n sisfb: use CONFIG_FB_SIS_301/315 instead of SIS301/315H\n sisfb: delete redudant #define SIS_LINUX_KERNEL\n sisfb: delete dead SIS_XORG_XF86 code\n sisfb: delete fallback code for pci_map_rom()\n sisfb: delete obsolete PCI ROM bug workaround\n fbdev: Update documentation index file.\n lxfb: Program panel v/h sync output polarity correctly\n fbcmap: integer overflow bug\n fbcmap: cleanup white space in fb_alloc_cmap()\n MAINTAINERS: Add fbdev patchwork entry, tidy up file patterns.\n fbdev: da8xx: punt duplicated FBIO_WAITFORVSYNC define\n fbdev: sh_mobile_lcdcfb: fix bug in reconfig()\n" }, { "commit": "3070fb888be52c5488976828ffc9f950872ffadc", "tree": "de59e3130d6e715a45199bf28e10d43d2ec570b1", "parents": [ "68ca92aa1f980d91ac98f798b313b70864f60e4b", "dfcd6e438927ad8c54278e5b1a34a4fe76e57ad2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 25 06:58:19 2010 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 25 06:58:19 2010 +0900" }, "message": "Merge branch \u0027sh-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* \u0027sh-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:\n sh: clkfwk: Build fix for non-legacy CPG changes.\n sh: Use GCC __builtin_prefetch() to implement prefetch().\n sh: fix vsyscall compilation due to .eh_frame issue\n sh: avoid to flush all cache in sys_cacheflush\n sh: clkfwk: Disable init clk op for non-legacy clocks.\n sh: clkfwk: Kill off now unused algo_id in set_rate op.\n sh: clkfwk: Kill off unused clk_set_rate_ex().\n" }, { "commit": "c42978f7ecaa5c29bdd5fea507e09e6eff9d9f27", "tree": "f5aa36fa1714e907c14eb84c779dd07d2818045e", "parents": [ "91d95fda8594ce5e0ccd81381ee7b956cf513c59", "be6528b2e58d92ef2ffed6f130e2d42bb85dbf29" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 25 06:57:11 2010 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 25 06:57:11 2010 +0900" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:\n virtio: fix format of sysfs driver/vendor files\n Char: virtio_console, fix memory leak\n virtio: return correct capacity to users\n module: Update prototype for ref_module (formerly use_module)\n" }, { "commit": "112bc2e120a94a511858918d6866a4978f9c500e", "tree": "032f59b4eca42074de6a30e0d4c13426cbbf86c8", "parents": [ "69e83dad5207f8f03c9699e57e1febb114383cb8" ], "author": { "name": "Kirill A. Shutemov", "email": "kirill@shutemov.name", "time": "Wed Nov 24 12:56:58 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 25 06:50:40 2010 +0900" }, "message": "memcg: fix false positive VM_BUG on non-SMP\n\nFix this:\n\n kernel BUG at mm/memcontrol.c:2155!\n invalid opcode: 0000 [#1]\n last sysfs file:\n\n Pid: 18, comm: sh Not tainted 2.6.37-rc3 #3 /Bochs\n EIP: 0060:[\u003cc10731b2\u003e] EFLAGS: 00000246 CPU: 0\n EIP is at mem_cgroup_move_account+0xe2/0xf0\n EAX: 00000004 EBX: c6f931d4 ECX: c681c300 EDX: c681c000\n ESI: c681c300 EDI: ffffffea EBP: c681c000 ESP: c46f3e30\n DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068\n Process sh (pid: 18, ti\u003dc46f2000 task\u003dc6826e60 task.ti\u003dc46f2000)\n Stack:\n 00000155 c681c000 0805f000 c46ee180 c46f3e5c c7058820 c1074d37 00000000\n 08060000 c46db9a0 c46ec080 c7058820 0805f000 08060000 c46f3e98 c1074c50\n c106c75e c46f3e98 c46ec080 08060000 0805ffff c46db9a0 c46f3e98 c46e0340\n Call Trace:\n [\u003cc1074d37\u003e] ? mem_cgroup_move_charge_pte_range+0xe7/0x130\n [\u003cc1074c50\u003e] ? mem_cgroup_move_charge_pte_range+0x0/0x130\n [\u003cc106c75e\u003e] ? walk_page_range+0xee/0x1d0\n [\u003cc10725d6\u003e] ? mem_cgroup_move_task+0x66/0x90\n [\u003cc1074c50\u003e] ? mem_cgroup_move_charge_pte_range+0x0/0x130\n [\u003cc1072570\u003e] ? mem_cgroup_move_task+0x0/0x90\n [\u003cc1042616\u003e] ? cgroup_attach_task+0x136/0x200\n [\u003cc1042878\u003e] ? cgroup_tasks_write+0x48/0xc0\n [\u003cc1041e9e\u003e] ? cgroup_file_write+0xde/0x220\n [\u003cc101398d\u003e] ? do_page_fault+0x17d/0x3f0\n [\u003cc108a79d\u003e] ? alloc_fd+0x2d/0xd0\n [\u003cc1041dc0\u003e] ? cgroup_file_write+0x0/0x220\n [\u003cc1077ba2\u003e] ? vfs_write+0x92/0xc0\n [\u003cc1077c81\u003e] ? sys_write+0x41/0x70\n [\u003cc1140e3d\u003e] ? syscall_call+0x7/0xb\n Code: 03 00 74 09 8b 44 24 04 e8 1c f1 ff ff 89 73 04 8d 86 b0 00 00 00 b9 01 00 00 00 89 da 31 ff e8 65 f5 ff ff e9 4d ff ff ff 0f 0b \u003c0f\u003e 0b 0f 0b 0f 0b 90 8d b4 26 00 00 00 00 83 ec 10 8b 0d f4 e3\n EIP: [\u003cc10731b2\u003e] mem_cgroup_move_account+0xe2/0xf0 SS:ESP 0068:c46f3e30\n ---[ end trace 7daa1582159b6532 ]---\n\nlock_page_cgroup and unlock_page_cgroup are implemented using\nbit_spinlock. bit_spinlock doesn\u0027t touch the bit if we are on non-SMP\nmachine, so we can\u0027t use the bit to check whether the lock was taken.\n\nLet\u0027s introduce is_page_cgroup_locked based on bit_spin_is_locked instead\nof PageCgroupLocked to fix it.\n\n[akpm@linux-foundation.org: s/is_page_cgroup_locked/page_is_cgroup_locked/]\nSigned-off-by: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nReviewed-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujtisu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3a3a1af37f0405d15c0b64a6ce7f4878084442e0", "tree": "6f5e415d7c3606991634b66ae062c6186a462a7a", "parents": [ "50d431e8a15701b599c98afe2b464eb33c952477" ], "author": { "name": "Loïc Minier", "email": "loic.minier@linaro.org", "time": "Wed Nov 24 12:56:53 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 25 06:50:38 2010 +0900" }, "message": "include/linux/fs.h: fix userspace build\n\ndpkg uses fiemap but didn\u0027t particularly need to include stdint.h so far.\nSince 367a51a33902 (\"fs: Add FITRIM ioctl\"), build of linux/fs.h failed in\ndpkg with:\n\n In file included from ../../src/filesdb.c:27:0:\n /usr/include/linux/fs.h:37:2: error: expected specifier-qualifier-list before \u0027uint64_t\u0027\n\nUse exportable type __u64 to avoid the dependency on stdint.h.\n\nb31d42a5af18 (\"Fix compile brekage with !CONFIG_BLOCK\") fixed only the\nkernel build by including linux/types.h, but this also fixed \"make\nheaders_check\", so don\u0027t revert it.\n\nSigned-off-by: Loïc Minier \u003cloic.minier@linaro.org\u003e\nTested-by: Arnd Bergmann \u003carnd.bergmann@linaro.org\u003e\nCc: Lukas Czerner \u003clczerner@redhat.com\u003e\nCc: Dmitry Monakhov \u003cdmonakhov@openvz.org\u003e\nCc: Theodore Ts\u0027o \u003ctytso@mit.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "66fc5dff5e4f82c92723202a5de9bdec16a9331f", "tree": "4c9d2e740db2316d73c1e6bed3d6bb08cb052a73", "parents": [ "9915672d41273f5b77f1b3c29b391ffb7732b84b", "e476a5a41ad67d0e2b4a652820c49a3923eb936b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 24 09:16:14 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 24 09:16:14 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "dfd62d1d84d83f9421792c78bcf72de9bc2bb603", "tree": "4d5c240954b7958311907bc17456dbae2708c599", "parents": [ "3561d43fd289f590fdae672e5eb831b8d5cf0bf6" ], "author": { "name": "Anders Kaseorg", "email": "andersk@ksplice.com", "time": "Wed Nov 24 15:21:10 2010 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 24 15:21:11 2010 +1030" }, "message": "module: Update prototype for ref_module (formerly use_module)\n\nCommit 9bea7f23952d5948f8e5dfdff4de09bb9981fb5f renamed use_module to\nref_module (and changed its return value), but forgot to update this\nprototype in module.h.\n\nSigned-off-by: Anders Kaseorg \u003candersk@ksplice.com\u003e\nAcked-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "ea49b1669b7b405e0eb0bf877c7b7fb01f8dd19b", "tree": "e3b1685edee456e456eb0b1edd64d0f561b937af", "parents": [ "a4ec046c98283d9f36817589081e14850570739f", "9e8c32cac9929858337e29dd4e28fd87bc073ef5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 24 08:23:56 2010 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 24 08:23:56 2010 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (41 commits)\n ALSA: hda - Identify more variants for ALC269\n ALSA: hda - Fix wrong ALC269 variant check\n ALSA: hda - Enable jack sense for Thinkpad Edge 11\n ALSA: Revert \"ALSA: hda - Fix switching between dmic and mic using the same mux on IDT/STAC\"\n ALSA: hda - Fixed ALC887-VD initial error\n ALSA: atmel - Fix the return value in error path\n ALSA: hda: Use hp-laptop quirk to enable headphones automute for Asus A52J\n ALSA: snd-atmel-abdac: test wrong variable\n ALSA: azt3328: period bug fix (for PA), add missing ACK on stop timer\n ALSA: hda: Add Samsung R720 SSID for subwoofer pin fixup\n ALSA: sound/pci/asihpi/hpioctl.c: Remove unnecessary casts of pci_get_drvdata\n ALSA: sound/core/pcm_lib.c: Remove unnecessary semicolons\n ALSA: sound/ppc: Use printf extension %pR for struct resource\n ALSA: ac97: Apply quirk for Dell Latitude D610 binding Master and Headphone controls\n ASoC: uda134x - set reg_cache_default to uda134x_reg\n ASoC: Add support for MAX98089 CODEC\n ASoC: davinci: fixes for multi-component\n ASoC: Fix register cache setup WM8994 for multi-component\n ASoC: Fix dapm_seq_compare() for multi-component\n ASoC: RX1950: Fix hw_params function\n ...\n" }, { "commit": "3cbaa0f7a78d3b970b566629ee298c310780b919", "tree": "5b392ab5d59cfd87d7a6869ab6681a63d14e7d04", "parents": [ "e94571653876922bbc247c8ef13c0b7839c3e503", "cf41a51db89850033efc11c18a5257de810b5417" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 24 08:22:34 2010 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 24 08:22:34 2010 +0900" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n of/phylib: Use device tree properties to initialize Marvell PHYs.\n phylib: Add support for Marvell 88E1149R devices.\n phylib: Use common page register definition for Marvell PHYs.\n qlge: Fix incorrect usage of module parameters and netdev msg level\n ipv6: fix missing in6_ifa_put in addrconf\n SuperH IrDA: correct Baud rate error correction\n atl1c: Fix hardware type check for enabling OTP CLK\n net: allow GFP_HIGHMEM in __vmalloc()\n bonding: change list contact to netdev@vger.kernel.org\n e1000: fix screaming IRQ\n" }, { "commit": "1d8638d4038eb8709edc80e37a0bbb77253d86e9", "tree": "7eca1442ee8343500ca0cf3aa10f74e4301f1354", "parents": [ "d47844a014fada1a788719f6426bc7044f2a0fd8" ], "author": { "name": "Daniel Klaffenbach", "email": "danielklaffenbach@gmail.com", "time": "Fri Nov 19 21:25:21 2010 -0600" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 22 15:19:31 2010 -0500" }, "message": "ssb: b43-pci-bridge: Add new vendor for BCM4318\n\nAdd new vendor for Broadcom 4318.\n\nSigned-off-by: Daniel Klaffenbach \u003cdanielklaffenbach@gmail.com\u003e\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nCc: Stable \u003cstable@kernel.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "0b26a0bf6ff398185546432420bb772bcfdf8d94", "tree": "705b94c8662cf18cf8cd18c6b8c68d751d87acb7", "parents": [ "3020093f578fb6c9acc6914dfd887a1ebd1db659" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Nov 20 14:26:44 2010 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Nov 22 13:24:48 2010 -0500" }, "message": "NFS: Ensure we return the dirent-\u003ed_type when it is known\n\nStore the dirent-\u003ed_type in the struct nfs_cache_array_entry so that we\ncan use it in getdents() calls.\n\nThis fixes a regression with the new readdir code.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "90600732d8b2fbc422bc9c57bdc73513d909367f", "tree": "f1c4e7aa32b5a50e64a618a4c0f5310ff26c762c", "parents": [ "27d916d680e7b324087a75d080f215e7c34a4e8f" ], "author": { "name": "David Daney", "email": "ddaney@caviumnetworks.com", "time": "Fri Nov 19 11:58:53 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 22 08:34:23 2010 -0800" }, "message": "phylib: Add support for Marvell 88E1149R devices.\n\nThe 88E1149R is 10/100/1000 quad-gigabit Ethernet PHY. The\n.config_aneg function can be shared with 88E1118, but it needs its own\n.config_init.\n\nSigned-off-by: David Daney \u003cddaney@caviumnetworks.com\u003e\nCc: Cyril Chemparathy \u003ccyril@ti.com\u003e\nCc: Arnaud Patard \u003carnaud.patard@rtp-net.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "07a8cdd2bb17a4da68136d963b8bc71959bd31a5", "tree": "fbc64d9842b38848ee7b4d410bab626ff2abd893", "parents": [ "bb324b08165d5656d221af013ed9994a54e455be" ], "author": { "name": "Anand Gadiyar", "email": "gadiyar@ti.com", "time": "Thu Nov 18 18:54:17 2010 +0530" }, "committer": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Mon Nov 22 12:55:02 2010 +0200" }, "message": "usb: musb: do not use dma for control transfers\n\nThe Inventra DMA engine used with the MUSB controller in many\nSoCs cannot use DMA for control transfers on EP0, but can use\nDMA for all other transfers.\n\nThe USB core maps urbs for DMA if hcd-\u003eself.uses_dma is true.\n(hcd-\u003eself.uses_dma is true for MUSB as well).\n\nSplit the uses_dma flag into two - one that says if the\ncontroller needs to use PIO for control transfers, and\nanother which says if the controller uses DMA (for all\nother transfers).\n\nAlso, populate this flag for all MUSB by default.\n\n(Tested on OMAP3 and OMAP4 boards, with EHCI and MUSB HCDs\nsimultaneously in use).\n\nSigned-off-by: Maulik Mankad \u003cx0082077@ti.com\u003e\nSigned-off-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nSigned-off-by: Anand Gadiyar \u003cgadiyar@ti.com\u003e\nCc: Oliver Neukum \u003coliver@neukum.org\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: Praveena NADAHALLY \u003cpraveen.nadahally@stericsson.com\u003e\nCc: Ajay Kumar Gupta \u003cajay.gupta@ti.com\u003e\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\n" }, { "commit": "b86db4744230c94e480de56f1b7f31117edbf193", "tree": "e94240a428f525c11c8758ebdd50398cec95e7be", "parents": [ "76db8ac45fc738f7d7664fe9b56d15c594a45228", "e681c047e47c0abe67bf95857f23814372793cb0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 19 19:46:45 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 19 19:46:45 2010 -0800" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:\n ext4: Add EXT4_IOC_TRIM ioctl to handle batched discard\n fs: Do not dispatch FITRIM through separate super_operation\n ext4: ext4_fill_super shouldn\u0027t return 0 on corruption\n jbd2: fix /proc/fs/jbd2/\u003cdev\u003e when using an external journal\n ext4: missing unlock in ext4_clear_request_list()\n ext4: fix setting random pages PageUptodate\n" }, { "commit": "93bb41f4f8b89ac8b4d0a734bc59634cb0a29a89", "tree": "16ed3163dbbdb5b46ed0f3a12d059b4c2c467e95", "parents": [ "5a9ae68a349aa076bc8557ee2fcf865574459282" ], "author": { "name": "Lukas Czerner", "email": "lczerner@redhat.com", "time": "Fri Nov 19 21:18:35 2010 -0500" }, "committer": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Fri Nov 19 21:18:35 2010 -0500" }, "message": "fs: Do not dispatch FITRIM through separate super_operation\n\nThere was concern that FITRIM ioctl is not common enough to be included\nin core vfs ioctl, as Christoph Hellwig pointed out there\u0027s no real point\nin dispatching this out to a separate vector instead of just through\n-\u003eioctl.\n\nSo this commit removes ioctl_fstrim() from vfs ioctl and trim_fs\nfrom super_operation structure.\n\nSigned-off-by: Lukas Czerner \u003clczerner@redhat.com\u003e\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\n" }, { "commit": "76db8ac45fc738f7d7664fe9b56d15c594a45228", "tree": "eca23feab074d505b375e27714473f4ad337bd85", "parents": [ "caf8394524fdc039b090cd3af99157e9e76f4f06", "3105c19c450ac7c18ab28c19d364b588767261b3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 19 15:32:22 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 19 15:32:22 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n ceph: fix readdir EOVERFLOW on 32-bit archs\n ceph: fix frag offset for non-leftmost frags\n ceph: fix dangling pointer\n ceph: explicitly specify page alignment in network messages\n ceph: make page alignment explicit in osd interface\n ceph: fix comment, remove extraneous args\n ceph: fix update of ctime from MDS\n ceph: fix version check on racing inode updates\n ceph: fix uid/gid on resent mds requests\n ceph: fix rdcache_gen usage and invalidate\n ceph: re-request max_size if cap auth changes\n ceph: only let auth caps update max_size\n ceph: fix open for write on clustered mds\n ceph: fix bad pointer dereference in ceph_fill_trace\n ceph: fix small seq message skipping\n Revert \"ceph: update issue_seq on cap grant\"\n" }, { "commit": "caf8394524fdc039b090cd3af99157e9e76f4f06", "tree": "c58af82b15459a55a66bfae3a9d83a23c2d2c62c", "parents": [ "6656b3fc8aba2eb7ca00c06c7fe4917938b0b652", "0302b8622ce696af1cda22fcf207d3793350e896" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 19 15:25:59 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 19 15:25:59 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (31 commits)\n net: fix kernel-doc for sk_filter_rcu_release\n be2net: Fix to avoid firmware update when interface is not open.\n netfilter: fix IP_VS dependencies\n net: irda: irttp: sync error paths of data- and udata-requests\n ipv6: Expose reachable and retrans timer values as msecs\n ipv6: Expose IFLA_PROTINFO timer values in msecs instead of jiffies\n 3c59x: fix build failure on !CONFIG_PCI\n ipg.c: remove id [SUNDANCE, 0x1021]\n net: caif: spi: fix potential NULL dereference\n ath9k_htc: Avoid setting QoS control for non-QoS frames\n net: zero kobject in rx_queue_release\n net: Fix duplicate volatile warning.\n MAINTAINERS: Add stmmac maintainer\n bonding: fix a race in IGMP handling\n cfg80211: fix can_beacon_sec_chan, reenable HT40\n gianfar: fix signedness issue\n net: bnx2x: fix error value sign\n 8139cp: fix checksum broken\n r8169: fix checksum broken\n rds: Integer overflow in RDS cmsg handling\n ...\n" }, { "commit": "ed919b0125b26dcc052e44836f66e7e1f5c49c7e", "tree": "10abd2b197488ee2c75e693e9422668481e5e4ce", "parents": [ "4d0812c37f2f6cf6fc7ca086b5a5e572cbbe7f6d" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Fri Nov 19 09:29:09 2010 +0200" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Fri Nov 19 17:07:01 2010 -0500" }, "message": "mmc: sdio: fix runtime PM anomalies by introducing MMC_CAP_POWER_OFF_CARD\n\nSome board/card/host configurations are not capable of powering off the\ncard after boot.\n\nTo support such configurations, and to allow smoother transition to\nruntime PM behavior, MMC_CAP_POWER_OFF_CARD is added, so hosts need to\nexplicitly indicate whether it\u0027s OK to power off their cards after boot.\n\nSDIO core will enable runtime PM for a card only if that cap is set.\nAs a result, the card will be powered down after boot, and will only\nbe powered up again when a driver is loaded (and then it\u0027s up to the\ndriver to decide whether power will be kept or not).\n\nThis will prevent sdio_bus_probe() failures with setups that do not\nsupport powering off the card.\n\nReported-and-tested-by: Daniel Drake \u003cdsd@laptop.org\u003e\nReported-and-tested-by: Arnd Hannemann \u003carnd@arndnet.de\u003e\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "ed1d77b18c9f4ff06d5b42c65041aa55a1447053", "tree": "9356285fc858fa6b60af7e99e827c129a696f6c6", "parents": [ "fb3ff69d1397ce4bd2441c87b1daea67cb945ac6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 18 10:56:29 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 18 10:56:29 2010 -0800" }, "message": "hardirq.h: needs sched.h if using BKL\n\nThis really isn\u0027t the right thing to do, and strictly speaking we should\nhave the BKL depth count in the thread info right next to the preempt\ncount. The two really do go together.\n\nHowever, since that would involve a patch to all architectures, and the\nBKL is finally going away, it\u0027s simply not worth the effort to do the\nRightThing(tm). Just re-instate the \u003clinux/sched.h\u003e include that we\nused to get accidentally from the smp_lock.h one.\n\nThis is all fallout from the same old \"BKL: remove extraneous #include\n\u003csmp_lock.h\u003e\" commit.\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nTested-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fcf48a725a176ba12aa7be64c50190deaa2f86df", "tree": "5d611ba5b1eb4dd821c93ca2f9d08078b563305a", "parents": [ "0e2af2a9abf94b408ff70679b692a8644fed4aab", "3c502e7a0255d82621ff25d60cc816624830497e" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 18 10:37:51 2010 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 18 10:37:51 2010 +0100" }, "message": "Merge branch \u0027perf/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent\n" }, { "commit": "0a5b871ea4c6bfb2723ac2ffc7ef5c32452abb89", "tree": "baff02a887202414fd34bf7deacb0d1d527ede60", "parents": [ "7957f0a857754c555e07f58a3fb83ac29501478c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 17 18:36:25 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 17 18:36:25 2010 -0800" }, "message": "hardirq.h: remove now-empty #ifdef/#endif pair\n\nCommit 451a3c24b013 (\"BKL: remove extraneous #include \u003csmp_lock.h\u003e\")\nremoved the #include line that was the only thing that was surrounded by\nthe #ifdef/#endif.\n\nSo now that #ifdef is guarding nothing at all. Just remove it.\n\nReported-by: Byeong-ryeol Kim \u003cbrofkims@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7957f0a857754c555e07f58a3fb83ac29501478c", "tree": "120976183d3f871b2023a745e888d71f96fbcfb3", "parents": [ "460781b54253e3ed10a0a2a433bdc548ec952269" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 17 14:58:36 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 17 14:58:36 2010 -0800" }, "message": "Fix build failure due to hwirq.h needing smp_lock.h\n\nArnd Bergmann did an automated scripting run to find left-over instances\nof \u003clinux/smp_lock.h\u003e, and had made it trigger it on the normal BKL use\nof lock_kernel and unlock_lernel (and apparently release_kernel_lock and\nreacquire_kernel_lock too, used by the scheduler).\n\nThat resulted in commit 451a3c24b013 (\"BKL: remove extraneous #include\n\u003csmp_lock.h\u003e\").\n\nHowever, hardirq.h was the only remaining user of the old\n\u0027kernel_locked()\u0027 interface, and Arnd\u0027s script hadn\u0027t checked for that.\nSo depending on your configuration and what header files had been\nincluded, you would get errors like \"implicit declaration of function\n\u0027kernel_locked\u0027\" during the build.\n\nThe right fix is not to just re-instate the smp_lock.h include - it is\nto just remove \u0027kernel_locked()\u0027 entirely, since the only use was this\none special low-level detail. Just make hardirq.h do it directly.\n\nIn fact this simplifies and clarifies the code, because some trivial\nanalysis makes it clear that hardirq.h only ever used _one_ of the two\ndefinitions of kernel_locked(), so we can remove the other one entirely.\n\nReported-by: Zimny Lech \u003cnapohybelskurwysynom2010@gmail.com\u003e\nReported-and-acked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "451a3c24b0135bce54542009b5fde43846c7cf67", "tree": "f0fbbcc155aef2a1ffcb8aa593fe7a966d0e6900", "parents": [ "55f6561c6941713ab5ae9180525b026dd40b7d14" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 17 16:26:55 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 17 08:59:32 2010 -0800" }, "message": "BKL: remove extraneous #include \u003csmp_lock.h\u003e\n\nThe big kernel lock has been removed from all these files at some point,\nleaving only the #include.\n\nRemove this too as a cleanup.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1e7c7804884fc5751e3872f13498fd533325f8b2", "tree": "1d9a9ead0d2c7cb18e46cc35878a0d64daaeb545", "parents": [ "c353103de8795358af1584088aa471571decb307" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Tue Nov 16 12:11:02 2010 +0300" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Wed Nov 17 14:55:45 2010 +0900" }, "message": "fbcmap: integer overflow bug\n\nThere is an integer overflow in fb_set_user_cmap() because cmap-\u003elen * 2\ncan wrap. It\u0027s basically harmless. Your terminal will be messed up\nuntil you type reset.\n\nThis patch does three things to fix the bug.\n\nFirst, it checks the return value of fb_copy_cmap() in fb_alloc_cmap().\nThat is enough to fix address the overflow.\n\nSecond it checks for the integer overflow in fb_set_user_cmap().\n\nLastly I wanted to cap \"cmap-\u003elen\" in fb_set_user_cmap() much lower\nbecause it gets used to determine the size of allocation. Unfortunately\nno one knows what the limit should be. Instead what this patch does\nis makes the allocation happen with GFP_KERNEL instead of GFP_ATOMIC\nand lets the kmalloc() decide what values of cmap-\u003elen are reasonable.\nTo do this, the patch introduces a function called fb_alloc_cmap_gfp()\nwhich is like fb_alloc_cmap() except that it takes a GFP flag.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "1d6636502b23a964f4e5aac5237d1bbb76a9f912", "tree": "a904be940c83b385be9cdf33fc62041b5c56f7f5", "parents": [ "d33fdee4d090076462cfe25473f7139c3204b16e", "04e4bd1c67f941d81bff78a3b6b94194f081b7df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 16 18:46:28 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 16 18:46:28 2010 -0800" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n nfs: Ignore kmemleak false positive in nfs_readdir_make_qstr\n SUNRPC: Simplify rpc_alloc_iostats by removing pointless local variable\n nfs: trivial: remove unused nfs_wait_event macro\n NFS: readdir shouldn\u0027t read beyond the reply returned by the server\n NFS: Fix a couple of regressions in readdir.\n Revert \"NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR\"\n Regression: fix mounting NFS when NFSv3 support is not compiled\n NLM: Fix a regression in lockd\n" }, { "commit": "d33fdee4d090076462cfe25473f7139c3204b16e", "tree": "0b7cbabcd57b72baf0e5bbfa2ce97094a518adf0", "parents": [ "1e8703b2e6aefba84dd9633d90a4093ff1200b93", "1e5a74059f9059d330744eac84873b1b99657008" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 16 15:20:05 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 16 15:20:05 2010 -0800" }, "message": "Merge branch \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched: Fix cross-sched-class wakeup preemption\n sched: Fix runnable condition for stoptask\n sched: Use group weight, idle cpu metrics to fix imbalances during idle\n" }, { "commit": "fcc4a01eb8661226e80632327673f67bf6a5840b", "tree": "dc05c200ccfac2daad6d1efe413ae6fa92f1638d", "parents": [ "6ddf27cdbc218a412d7e993fdc08e30eec2042ce" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Mon Nov 15 15:57:51 2010 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Nov 16 14:03:41 2010 -0800" }, "message": "USB: use the runtime-PM autosuspend implementation\n\nThis patch (as1428) converts USB over to the new runtime-PM core\nautosuspend framework. One slightly awkward aspect of the conversion\nis that USB devices will now have two suspend-delay attributes: the\nold power/autosuspend file and the new power/autosuspend_delay_ms\nfile. One expresses the delay time in seconds and the other in\nmilliseconds, but otherwise they do the same thing. The old attribute\ncan be deprecated and then removed eventually.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "6ddf27cdbc218a412d7e993fdc08e30eec2042ce", "tree": "393232ac1a8123961b62cb72cfc4b0bc617b333c", "parents": [ "045cac6b3b067a9286dabfb789f67ae4f433f88b" ], "author": { "name": "Ming Lei", "email": "tom.leiming@gmail.com", "time": "Mon Nov 15 15:57:30 2010 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Nov 16 14:02:54 2010 -0800" }, "message": "USB: make usb_mark_last_busy use pm_runtime_mark_last_busy\n\nSince the runtime-PM core already defines a .last_busy field in\ndevice.power, this patch uses it to replace the .last_busy field\ndefined in usb_device and uses pm_runtime_mark_last_busy to implement\nusb_mark_last_busy.\n\nSigned-off-by: Ming Lei \u003ctom.leiming@gmail.com\u003e\nReviewed-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "f281233d3eba15fb225d21ae2e228fd4553d824a", "tree": "51134454ba8acb558735f90be5540f7d756483e3", "parents": [ "bdbd01ac444bffb3c9aefed3059d12554059b320" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Nov 16 02:10:29 2010 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 16 13:33:23 2010 -0800" }, "message": "SCSI host lock push-down\n\nMove the mid-layer\u0027s -\u003equeuecommand() invocation from being locked\nwith the host lock to being unlocked to facilitate speeding up the\ncritical path for drivers who don\u0027t need this lock taken anyway.\n\nThe patch below presents a simple SCSI host lock push-down as an\nequivalent transformation. No locking or other behavior should change\nwith this patch. All existing bugs and locking orders are preserved.\n\nAdditionally, add one parameter to queuecommand,\n\tstruct Scsi_Host *\nand remove one parameter from queuecommand,\n\tvoid (*done)(struct scsi_cmnd *)\n\nScsi_Host* is a convenient pointer that most host drivers need anyway,\nand \u0027done\u0027 is redundant to struct scsi_cmnd-\u003escsi_done.\n\nMinimal code disturbance was attempted with this change. Most drivers\nneeded only two one-line modifications for their host lock push-down.\n\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\nAcked-by: James Bottomley \u003cJames.Bottomley@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5685b971362651ee3d99ff3cc512c3bbd049d34d", "tree": "825dbbe8a53208725756e2486c825ea5e678a05a", "parents": [ "ac39612824e1fad8baf82c2841e42b2142af3445" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Fri Nov 12 09:23:04 2010 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Nov 16 11:56:24 2010 -0500" }, "message": "nfs: trivial: remove unused nfs_wait_event macro\n\nNothing uses this macro anymore.\n\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "8e35f8e7c61c88f9a979a4e6f7f4ffd4c158a88a", "tree": "1da21fa631fe471f6eae604dcbd3a416220de25a", "parents": [ "6800e4c0ea3e96cf78953b8b5743381cb1bb9e37" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Nov 02 09:11:55 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Nov 15 20:44:26 2010 -0500" }, "message": "NLM: Fix a regression in lockd\n\nNick Bowler reports:\nThere are no unusual messages on the client... but I just logged into\nthe server and I see lots of messages of the following form:\n\n nfsd: request from insecure port (192.168.8.199:35766)!\n nfsd: request from insecure port (192.168.8.199:35766)!\n nfsd: request from insecure port (192.168.8.199:35766)!\n nfsd: request from insecure port (192.168.8.199:35766)!\n nfsd: request from insecure port (192.168.8.199:35766)!\n\nBisected to commit 9247685088398cf21bcb513bd2832b4cd42516c4 (SUNRPC:\nProperly initialize sock_xprt.srcaddr in all cases)\n\nApparently, removing the \u0027transport-\u003esrcaddr.ss_family \u003d family\u0027 from\nxs_create_sock() triggers this due to nlmclnt_lookup_host() incorrectly\ninitialising the srcaddr family to AF_UNSPEC.\n\nReported-by: Nick Bowler \u003cnbowler@elliptictech.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "849653372d3f98332bf84e9fb814d9f9a02eeda2", "tree": "0ccb6899ceb664024cc98ddfdf4b55572c45ec32", "parents": [ "6800e4c0ea3e96cf78953b8b5743381cb1bb9e37", "549015c36baadc6e67861bba6e927259e34c4d59" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Nov 16 10:11:20 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Nov 16 10:11:20 2010 +0900" }, "message": "Merge branch \u0027common/clkfwk\u0027 into sh-fixes-for-linus\n" }, { "commit": "12b3052c3ee8f508b2c7ee4ddd63ed03423409d8", "tree": "b97d0f209f363cfad94ce9d075312274e349da89", "parents": [ "6800e4c0ea3e96cf78953b8b5743381cb1bb9e37" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Mon Nov 15 18:36:29 2010 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 15 15:40:01 2010 -0800" }, "message": "capabilities/syslog: open code cap_syslog logic to fix build failure\n\nThe addition of CONFIG_SECURITY_DMESG_RESTRICT resulted in a build\nfailure when CONFIG_PRINTK\u003dn. This is because the capabilities code\nwhich used the new option was built even though the variable in question\ndidn\u0027t exist.\n\nThe patch here fixes this by moving the capabilities checks out of the\nLSM and into the caller. All (known) LSMs should have been calling the\ncapabilities hook already so it actually makes the code organization\nbetter to eliminate the hook altogether.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nAcked-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fe9d1159b299642f9e1a9b56bbf67a24c31bb418", "tree": "530c6e41beb784adb16a1faae2839edbad2fbb7f", "parents": [ "e5c13537b0153010b4f65b9c55faa78a4c151c93", "2236baa75f704851d3cd3310569058151acb1f06" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 15 14:03:17 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 15 14:03:17 2010 -0800" }, "message": "Merge branch \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n i2c: Sanity checks on adapter registration\n i2c: Mark i2c_adapter.id as deprecated\n i2c: Drivers shouldn\u0027t include \u003clinux/i2c-id.h\u003e\n i2c: Delete unused adapter IDs\n i2c: Remove obsolete cleanup for clientdata\n" }, { "commit": "e1e18ee1cb58228a577668284c1dd03d859d7157", "tree": "9dd37fa968317bcd639446f611b9f8dc0671163f", "parents": [ "f3dc65dafa651bca6606ac0b41ead1be50d05652" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Nov 15 22:40:38 2010 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Nov 15 22:40:38 2010 +0100" }, "message": "i2c: Mark i2c_adapter.id as deprecated\n\nIt\u0027s about time to make it clear that i2c_adapter.id is deprecated.\nHopefully this will remind the last user to move over to a different\nstrategy.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nAcked-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\n" }, { "commit": "dfdee5f00cc9ce21b0a7e786039bcfec26fbcb4b", "tree": "b60683d060290bda19ce2fa868ac57dc70e2cf2a", "parents": [ "dc6641be0ea8819ef095fdcefc2b695611999a21" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Nov 15 22:40:38 2010 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Nov 15 22:40:38 2010 +0100" }, "message": "i2c: Delete unused adapter IDs\n\nDelete unused I2C adapter IDs. Special cases are:\n\n* I2C_HW_B_RIVA was still set in driver rivafb, however no other\n driver is ever looking for this value, so we can safely remove it.\n* I2C_HW_B_HDPVR is used in staging driver lirc_zilog, however no\n adapter ID is ever set to this value, so the code in question never\n runs. As the code additionally expects that I2C_HW_B_HDPVR may not\n be defined, we can delete it now and let the lirc_zilog driver\n maintainer rewrite this piece of code.\n\nBig thanks for Hans Verkuil for doing all the hard work :)\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nAcked-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\n" }, { "commit": "968ab1838a5d48f02f5b471aa1d0e59e2cc2ccbc", "tree": "0f4258c00afbb2a8ad137acf34805cfeb0ed1077", "parents": [ "22d3243de86bc92d874abb7c5b185d5c47aba323" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 15 13:37:37 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 15 13:37:37 2010 -0800" }, "message": "include/linux/kernel.h: Move logging bits to include/linux/printk.h\n\nMove the logging bits from kernel.h into printk.h so that\nthere is a bit more logical separation of the generic from\nthe printk logging specific parts.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3b42a96dc7870c53d20b419185737d3b8f7a7b74", "tree": "8aa38800e4c203842e500ef10ddf48cae3daa991", "parents": [ "9457b24a0955bbdd2e89220a75de69fe09501bba" ], "author": { "name": "Andy Whitcroft", "email": "apw@canonical.com", "time": "Mon Nov 15 06:01:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 15 11:29:30 2010 -0800" }, "message": "net: rtnetlink.h -- only include linux/netdevice.h when used by the kernel\n\nThe commit below added a new helper dev_ingress_queue to cleanly obtain the\ningress queue pointer. This necessitated including \u0027linux/netdevice.h\u0027:\n\n commit 24824a09e35402b8d58dcc5be803a5ad3937bdba\n Author: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n Date: Sat Oct 2 06:11:55 2010 +0000\n\n net: dynamic ingress_queue allocation\n\nHowever this include triggers issues for applications in userspace\nwhich use the rtnetlink interfaces. Commonly this requires they include\n\u0027net/if.h\u0027 and \u0027linux/rtnetlink.h\u0027 leading to a compiler error as below:\n\n In file included from /usr/include/linux/netdevice.h:28:0,\n from /usr/include/linux/rtnetlink.h:9,\n from t.c:2:\n /usr/include/linux/if.h:135:8: error: redefinition of ‘struct ifmap’\n /usr/include/net/if.h:112:8: note: originally defined here\n /usr/include/linux/if.h:169:8: error: redefinition of ‘struct ifreq’\n /usr/include/net/if.h:127:8: note: originally defined here\n /usr/include/linux/if.h:218:8: error: redefinition of ‘struct ifconf’\n /usr/include/net/if.h:177:8: note: originally defined here\n\nThe new helper is only defined for the kernel and protected by __KERNEL__\ntherefore we can simply pull the include down into the same protected\nsection.\n\nSigned-off-by: Andy Whitcroft \u003capw@canonical.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "70231669596fdd76dddfc2a4f53415d3dd84377e", "tree": "fead4ba8df3af3461038d1e319cfeefd7c970e78", "parents": [ "58e89c274f202d7fd59694b7b74fa676018435a2", "dce1431cb36338bda1167591689ab1f77ccf8934" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 15 08:42:07 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 15 08:42:07 2010 -0800" }, "message": "Merge branch \u0027fbdev-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6\n\n* \u0027fbdev-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:\n fsl-diu-fb: drop dead ioctl define\n MAINTAINERS: Add an fbdev git tree entry.\n OMAP: DSS: Fix documentation regarding \u0027vram\u0027 kernel parameter\n OMAP: VRAM: Fix boot-time memory allocation\n OMAP: VRAM: improve VRAM error prints\n sisfb: limit POST memory test according to PCI resource length\n fbdev: sh_mobile_lcdc: use correct number of modes, when using the default\n fbdev: sh_mobile_lcdc: use the standard CEA-861 720p timing\n fbdev: sh_mobile_hdmi: properly clean up modedb on monitor unplug\n" }, { "commit": "549015c36baadc6e67861bba6e927259e34c4d59", "tree": "6f83a18ec81461fd6b68b3e7dd86f23c7619c1ee", "parents": [ "35a96c739fd7624b8edff990a74b86b5a85342da" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Nov 15 18:48:25 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Nov 15 18:48:25 2010 +0900" }, "message": "sh: clkfwk: Disable init clk op for non-legacy clocks.\n\nPresently it\u0027s only legacy users that are using this clock op, guard it\nwith an ifdef to ensure that no new users start using it.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "35a96c739fd7624b8edff990a74b86b5a85342da", "tree": "8839201d5b6aeff69150e19194a4da0c3c7faa77", "parents": [ "9a1683d1dd14d6ed35d2884c6b79ff12fc6bef39" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Nov 15 18:18:32 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Nov 15 18:25:17 2010 +0900" }, "message": "sh: clkfwk: Kill off now unused algo_id in set_rate op.\n\nNow that clk_set_rate_ex() is gone, there is also no way to get at rate\nsetting algo id, which is now also completely unused. Kill it off before\nnew clock ops start using it.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "9a1683d1dd14d6ed35d2884c6b79ff12fc6bef39", "tree": "6345115c913581a82a042cf0dc87bb7b2ad31d7d", "parents": [ "ed10b490ea6498f76284043565d42ca3649ccca1" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Nov 15 18:14:43 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Nov 15 18:25:12 2010 +0900" }, "message": "sh: clkfwk: Kill off unused clk_set_rate_ex().\n\nWith the refactoring of the SH7722 clock framework some time ago this\nabstraction has become unecessary. Kill it off before anyone else gets\nthe bright idea to start using it.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "344ac148442e3223ac1b0e29ef3d3fb73c5ed61a", "tree": "7b654a74727c57344296768c3a2d7d03b17f37ea", "parents": [ "8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec", "0143832cc96d0bf78486297aad5c8fb2c2ead02a" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Nov 15 13:54:00 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Nov 15 13:54:00 2010 +0900" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/urgent\n" }, { "commit": "dce1431cb36338bda1167591689ab1f77ccf8934", "tree": "49bfd617bf3ba1544fddc24cdbba41dd1527107e", "parents": [ "fc5fef5ef4f94c2d9ad0cc50871a3e2da5d8bc18" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Sat Nov 13 02:06:27 2010 -0500" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Nov 15 13:49:51 2010 +0900" }, "message": "fsl-diu-fb: drop dead ioctl define\n\nThe fsl-diu-fb driver no longer uses this define, and we have a common one\nto cover this already (FBIO_WAITFORVSYNC).\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "9457b24a0955bbdd2e89220a75de69fe09501bba", "tree": "cb484848e14cc2705c4513ad3ec1f0420a4d55db", "parents": [ "80ef913f5e6a84551545016cea709f5e96d0cda6", "0597d1b99fcfc2c0eada09a698f85ed413d4ba84" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 12 17:17:55 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 12 17:17:55 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (66 commits)\n can-bcm: fix minor heap overflow\n gianfar: Do not call device_set_wakeup_enable() under a spinlock\n ipv6: Warn users if maximum number of routes is reached.\n docs: Add neigh/gc_thresh3 and route/max_size documentation.\n axnet_cs: fix resume problem for some Ax88790 chip\n ipv6: addrconf: don\u0027t remove address state on ifdown if the address is being kept\n tcp: Don\u0027t change unlocked socket state in tcp_v4_err().\n x25: Prevent crashing when parsing bad X.25 facilities\n cxgb4vf: add call to Firmware to reset VF State.\n cxgb4vf: Fail open if link_start() fails.\n cxgb4vf: flesh out PCI Device ID Table ...\n cxgb4vf: fix some errors in Gather List to skb conversion\n cxgb4vf: fix bug in Generic Receive Offload\n cxgb4vf: don\u0027t implement trivial (and incorrect) ndo_select_queue()\n ixgbe: Look inside vlan when determining offload protocol.\n bnx2x: Look inside vlan when determining checksum proto.\n vlan: Add function to retrieve EtherType from vlan packets.\n virtio-net: init link state correctly\n ucc_geth: Fix deadlock\n ucc_geth: Do not bring the whole IF down when TX failure.\n ...\n" }, { "commit": "00dad7fa99701f5ca83b9f598d1c36c9523bbbf7", "tree": "6cd0f9a4b63ed0fe25c1cfd48978209e0819e86b", "parents": [ "edaa4d668babd65e98e1452043996bbefc0285b0", "868719752d60fb04a3714d77fdeb780b4d585faf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 12 17:13:28 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 12 17:13:28 2010 -0800" }, "message": "Merge branch \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (28 commits)\n Revert \"USB: xhci: Use GFP_ATOMIC under spin_lock\"\n USB: ohci-jz4740: Fix spelling in MODULE_ALIAS\n UWB: Return UWB_RSV_ALLOC_NOT_FOUND rather than crashing on NULL dereference if kzalloc fails\n usb: core: fix information leak to userland\n usb: misc: iowarrior: fix information leak to userland\n usb: misc: sisusbvga: fix information leak to userland\n usb: subtle increased memory usage in u_serial\n USB: option: fix when the driver is loaded incorrectly for some Huawei devices.\n USB: xhci: Use GFP_ATOMIC under spin_lock\n usb: gadget: goku_udc: add registered flag bit, fixing build\n USB: ehci/mxc: compile fix\n USB: Fix FSL USB driver on non Open Firmware systems\n USB: the development of the usb tree is now in git\n usb: musb: fail unaligned DMA transfers on v1.8 and above\n USB: ftdi_sio: add device IDs for Milkymist One JTAG/serial\n usb.h: fix ioctl kernel-doc info\n usb: musb: gadget: kill duplicate code in musb_gadget_queue()\n usb: musb: Fix handling of spurious SESSREQ\n usb: musb: fix kernel oops when loading musb_hdrc module for the 2nd time\n USB: musb: blackfin: push clkin value to platform resources\n ...\n" }, { "commit": "edaa4d668babd65e98e1452043996bbefc0285b0", "tree": "a6cf4c6083ae49e8d1b7a4efc92a32864a79e534", "parents": [ "891cbd30ef456664e50bbd28436ef3006a81cf7c", "40e3465db2cffd64e069ca82ee981025554bc159" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 12 16:02:30 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 12 16:02:30 2010 -0800" }, "message": "Merge branch \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n n_gsm: Fix length handling\n n_gsm: Copy n2 over when configuring via ioctl interface\n serial: bfin_5xx: grab port lock before making port termios changes\n serial: bfin_5xx: disable CON_PRINTBUFFER for consoles\n serial: bfin_5xx: remove redundant SSYNC to improve TX speed\n serial: bfin_5xx: always include DMA headers\n vcs: make proper usage of the poll flags\n amiserial: Remove unused variable icount\n 8250: Fix tcsetattr to avoid ioctl(TIOCMIWAIT) hang\n tty_ldisc: Fix BUG() on hangup\n TTY: restore tty_ldisc_wait_idle\n SERIAL: blacklist si3052 chip\n drivers/serial/bfin_5xx.c: Fix line continuation defects\n tty: prevent DOS in the flush_to_ldisc\n 8250: add support for Kouwell KW-L221N-2\n nozomi: Fix warning from the previous TIOCGCOUNT changes\n tty: fix warning in synclink driver\n tty: Fix formatting in tty.h\n tty: the development tree is now done in git\n" }, { "commit": "0a85df004667c99efc31fab07386823eefce3be5", "tree": "2fe059bc77f52e3cdb6ab665e41dd1eba9d4fc08", "parents": [ "167c25e4c5501f8b7e37f949d23652975c5a769c" ], "author": { "name": "Hao Zheng", "email": "hzheng@nicira.com", "time": "Thu Nov 11 13:47:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 12 12:30:57 2010 -0800" }, "message": "vlan: Add function to retrieve EtherType from vlan packets.\n\nDepending on how a packet is vlan tagged (i.e. hardware accelerated or\nnot), the encapsulated protocol is stored in different locations. This\nprovides a consistent method of accessing that protocol, which is needed\nby drivers, security checks, etc.\n\nSigned-off-by: Hao Zheng \u003chzheng@nicira.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7c13a0d9a1ac6875f6380763b947f4a5a016605f", "tree": "fbf7b41bc8cc250e6f9add13541e7d1c408a33b8", "parents": [ "369cf77a6a3e41b1110506ddf43d45804103bfde", "22e091e5253da1e9ad7c0a82c2c84446fc403efe" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 12 11:04:26 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 12 11:04:26 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" } ], "next": "7803c05429c7ca4e62fc3468791b7da224866305" }