)]}' { "log": [ { "commit": "b4e518547da042fdc65bd4bdafd046fed13337d5", "tree": "822699cd36da40399119d11b4820513af2eb22a7", "parents": [ "6d166fec12967063e0e709a935bba8c48fcde99e" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Dec 16 15:50:17 2011 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Feb 23 14:37:47 2012 -0700" }, "message": "irq_domain/x86: Convert x86 (embedded) to use common irq_domain\n\nThis patch removes the x86-specific definition of irq_domain and replaces\nit with the common implementation.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Sebastian Andrzej Siewior \u003cbigeasy@linutronix.de\u003e\nCc: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "ff8c3ab8161d0df52858966e0347e05791da40df", "tree": "f0c17341977c555165d332033c03067d768ed0db", "parents": [ "9f70b8eb3cd37c6ef3371f972db799250e3eb86e" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jan 24 17:09:13 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Feb 16 06:11:24 2012 -0700" }, "message": "irq_domain/powerpc: Replace custom xlate functions with library functions\n\nThis patch converts a number of the powerpc drivers to use the common library\nof irq_domain xlate functions, dropping a bunch of lines in the process.\n\nv5: - Remove tsi108 changes from patch\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Milton Miller \u003cmiltonm@bga.com\u003e\nTested-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "75294957be1dee7d22dd7d90bd31334ba410e836", "tree": "afa8e2905af88ceeba2dccb50b56c42568e18ab9", "parents": [ "5769089ac72569d024817270ab79fdf0b9046dde" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Feb 14 14:06:57 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Feb 16 06:11:23 2012 -0700" }, "message": "irq_domain: Remove \u0027new\u0027 irq_domain in favour of the ppc one\n\nThis patch removes the simplistic implementation of irq_domains and enables\nthe powerpc infrastructure for all irq_domain users. The powerpc\ninfrastructure includes support for complex mappings between Linux and\nhardware irq numbers, and can manage allocation of irq_descs.\n\nThis patch also converts the few users of irq_domain_add()/irq_domain_del()\nto call irq_domain_add_legacy() instead.\n\nv3: Fix bug that set up too many irqs in translation range.\nv2: Fix removal of irq_alloc_descs() call in gic driver\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Milton Miller \u003cmiltonm@bga.com\u003e\nTested-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "5769089ac72569d024817270ab79fdf0b9046dde", "tree": "4486ed08c14024672bf7db2e54ac8213702572cf", "parents": [ "a850a7554442f08d3e910c6eeb4ee216868dda1e" ], "author": { "name": "Benoit Cousson", "email": "b-cousson@ti.com", "time": "Tue Feb 14 14:06:56 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Feb 16 06:11:23 2012 -0700" }, "message": "mfd: twl-core.c: Fix the number of interrupts managed by twl4030\n\nTWL4030 does handle 3 different interrupts ranges: 8 for the core, 8 for\nthe power events and 18 for the GPIOs.\n\nChange the total number of interrupts managed by TWL4030 from 8 to 34.\n\nSigned-off-by: Benoit Cousson \u003cb-cousson@ti.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "a8db8cf0d894df5f1dcfd4bce9894e0dbcc01c96", "tree": "f9f2c53c57eeb04e5df60671951bcf4f2ca4966e", "parents": [ "68700650e71b6bb6636673f4f9c8ec807353d8d6" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Feb 14 14:06:54 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Feb 16 06:11:22 2012 -0700" }, "message": "irq_domain: Replace irq_alloc_host() with revmap-specific initializers\n\nEach revmap type has different arguments for setting up the revmap.\nThis patch splits up the generator functions so that each revmap type\ncan do its own setup and the user doesn\u0027t need to keep track of how\neach revmap type handles the arguments.\n\nThis patch also adds a host_data argument to the generators. There are\ncases where the host_data pointer will be needed before the function returns.\nie. the legacy map calls the .map callback for each irq before returning.\n\nv2: - Add void *host_data argument to irq_domain_add_*() functions\n - fixed failure to compile\n - Moved IRQ_DOMAIN_MAP_* defines into irqdomain.c\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Milton Miller \u003cmiltonm@bga.com\u003e\nTested-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "bae1d8f19983fbfa25559aa3cb6a81a84aa82a18", "tree": "387012cc698159bfb5851c5022d5b55db2dafadc", "parents": [ "644bd954313254b54e08b69077e16831b6e04dfa" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Feb 14 14:06:50 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Feb 14 14:06:50 2012 -0700" }, "message": "irq_domain/powerpc: Use common irq_domain structure instead of irq_host\n\nThis patch drops the powerpc-specific irq_host structures and uses the common\nirq_domain strucutres defined in linux/irqdomain.h. It also fixes all\nthe users to use the new structure names.\n\nRenaming irq_host to irq_domain has been discussed for a long time, and this\npatch is a step in the process of generalizing the powerpc virq code to be\nusable by all architecture.\n\nAn astute reader will notice that this patch actually removes the irq_host\nstructure instead of renaming it. This is because the irq_domain structure\nalready exists in include/linux/irqdomain.h and has the needed data members.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Milton Miller \u003cmiltonm@bga.com\u003e\nTested-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "3b582f393150c72b18339bc00d7ed4fb22445ed1", "tree": "ee4bfeb036cfdfe1b47d38c1177d69d2f70ba2b9", "parents": [ "19be13cfe37006bf90a61f6cb65ab8cb936099f3", "455a0e2cd80f7a2849b2e6d3be85c053ee44446b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 13 14:20:43 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 13 14:20:43 2012 -0800" }, "message": "Merge tag \u0027battery-fixes-for-v3.3-rc2\u0027 of git://git.infradead.org/users/cbou/battery-urgent\n\nJust a few small fixes for a bunch of drivers. Nothing noteworthy.\n\n* tag \u0027battery-fixes-for-v3.3-rc2\u0027 of git://git.infradead.org/users/cbou/battery-urgent:\n lp8727_charger: Add terminating entry for i2c_device_id table\n power_supply: Fix modalias for charger-manager\n lp8727_chager: Fix permissions on a header file\n bq27x00_battery: Fix flag register read\n Revert \"bq27x00_battery: Fix reporting status value for bq27500 battery\"\n" }, { "commit": "b14a29982ad90853cd71370af41adfd0009d7aa0", "tree": "639eca23b582459570667c21f4a9147ec06b1027", "parents": [ "a269c2f5a5ad2b24a19fdd723363daf18394ec85", "70d669de7356f6476db454dd8d053cd9c674a0d5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 13 14:16:07 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 13 14:16:07 2012 -0800" }, "message": "Merge branch \u0027omap-fixes-warnings\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nThis set of changes are fixing various section mismatch warnings which\nlook to be completely valid. Primerily, those which are fixed are those\nwhich can cause oopses by manipulation of driver binding via sysfs. For\nexample: calling code marked __init from driver probe __devinit\nfunctions.\n\nSome of these changes will be reworked at the next merge window when the\nunderlying reasons are sorted out. In the mean time, I think it\u0027s\nimportant to have this fixed for correctness.\n\nAlso included in this set are fixes to various error messages in OMAP -\nincluding making them gramatically correct, fixing a few spelling\nerrors, and more importantly, making them greppable by unwrapping them.\n\nTony Lindgren has acked all these patches, put them out for testing a\nweek ago, and I\u0027ve tested them on the platforms I have.\n\n* \u0027omap-fixes-warnings\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n ARM: omap: resolve nebulous \u0027Error setting wl12xx data\u0027\n ARM: omap: fix wrapped error messages in omap_hwmod.c\n ARM: omap: fix section mismatch warnings in mux.c caused by hsmmc.c\n ARM: omap: fix section mismatch warning for sdp3430_twl_gpio_setup()\n ARM: omap: fix section mismatch error for omap_4430sdp_display_init()\n ARM: omap: fix section mismatch warning for omap_secondary_startup()\n ARM: omap: preemptively fix section mismatch in omap4_sdp4430_wifi_mux_init()\n ARM: omap: fix section mismatch warning in mux.c\n ARM: omap: fix section mismatch errors in TWL PMIC driver\n ARM: omap: fix uninformative vc/i2c configuration error message\n ARM: omap: fix vc.c PMIC error message\n ARM: omap: fix prm44xx.c OMAP44XX_IRQ_PRCM build error\n" }, { "commit": "a269c2f5a5ad2b24a19fdd723363daf18394ec85", "tree": "5d5e2871bc83a4def56beb86400c68e6ce1dc27f", "parents": [ "ed5016d772b84348cb86ab3cdbc533bd4812f2bb", "6252547b8a7acced581b649af4ebf6d65f63a34b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 13 14:15:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 13 14:15:22 2012 -0800" }, "message": "Merge branch \u0027omap-fixes-urgent\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nThis pull request covers the major oopsing issues with OMAP, caused by\nthe lack of the TWL driver. Even when the TWL driver is not built in,\nwe shouldn\u0027t oops.\n\n* \u0027omap-fixes-urgent\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n ARM: omap: fix broken twl-core dependencies and ifdefs\n ARM: omap: fix oops in drivers/video/omap2/dss/dpi.c\n ARM: omap: fix oops in arch/arm/mach-omap2/vp.c when pmic is not found\n" }, { "commit": "a0bb10e86642064f6cec9e23f523127e5cfbe609", "tree": "9268898b0563af220eb7481b9e7a55314763fecd", "parents": [ "0bf68f53f164e169c2bc77f707338fc595b6ccfc" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 07 10:00:34 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Feb 13 10:00:35 2012 +0000" }, "message": "ARM: omap: fix section mismatch errors in TWL PMIC driver\n\nWARNING: drivers/mfd/built-in.o(.devinit.text+0x258): Section mismatch in reference from the function twl_probe() to the function .init.text:twl4030_power_init()\nThe function __devinit twl_probe() references\na function __init twl4030_power_init().\nIf twl4030_power_init is only used by twl_probe then\nannotate twl4030_power_init with a matching annotation.\n\ntwl4030_power_init() references other __init marked functions, so\nthese too must become __devinit.\n\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "3ec1e88b33a3bdd852ce8e014052acec7a9da8b5", "tree": "4270f8f0de4e28f090cba6d6e4047aae939d6463", "parents": [ "8df54d622a120058ee8bec38743c9b8f091c8e58", "d8c66c5d59247e25a69428aced0b79d33b9c66d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 11 10:07:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 11 10:07:11 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\nSays Jens:\n\n \"Time to push off some of the pending items. I really wanted to wait\n until we had the regression nailed, but alas it\u0027s not quite there yet.\n But I\u0027m very confident that it\u0027s \"just\" a missing expire on exit, so\n fix from Tejun should be fairly trivial. I\u0027m headed out for a week on\n the slopes.\n\n - Killing the barrier part of mtip32xx. It doesn\u0027t really support\n barriers, and it doesn\u0027t need them (writes are fully ordered).\n\n - A few fixes from Dan Carpenter, preventing overflows of integer\n multiplication.\n\n - A fixup for loop, fixing a previous commit that didn\u0027t quite solve\n the partial read problem from Dave Young.\n\n - A bio integer overflow fix from Kent Overstreet.\n\n - Improvement/fix of the door \"keep locked\" part of the cdrom shared\n code from Paolo Benzini.\n\n - A few cfq fixes from Shaohua Li.\n\n - A fix for bsg sysfs warning when removing a file it did not create\n from Stanislaw Gruszka.\n\n - Two fixes for floppy from Vivek, preventing a crash.\n\n - A few block core fixes from Tejun. One killing the over-optimized\n ioc exit path, cleaning that up nicely. Two others fixing an oops\n on elevator switch, due to calling into the scheduler merge check\n code without holding the queue lock.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: fix lockdep warning on io_context release put_io_context()\n relay: prevent integer overflow in relay_open()\n loop: zero fill bio instead of return -EIO for partial read\n bio: don\u0027t overflow in bio_get_nr_vecs()\n floppy: Fix a crash during rmmod\n floppy: Cleanup disk-\u003equeue before caling put_disk() if add_disk() was never called\n cdrom: move shared static to cdrom_device_info\n bsg: fix sysfs link remove warning\n block: don\u0027t call elevator callbacks for plug merges\n block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions\n mtip32xx: removed the irrelevant argument of mtip_hw_submit_io() and the unused member of struct driver_data\n block: strip out locking optimization in put_io_context()\n cdrom: use copy_to_user() without the underscores\n block: fix ioc locking warning\n block: fix NULL icq_cache reference\n block,cfq: change code order\n" }, { "commit": "8df54d622a120058ee8bec38743c9b8f091c8e58", "tree": "559dc9788cff370bed7b36d61f77708ff4efbaa7", "parents": [ "612b8507c5d545feed2437b3d2239929cac7688d", "70620c46ac2b45c24b0f22002fdf5ddd1f7daf81" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 10 14:18:46 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 10 14:18:46 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nQuoth David:\n\n1) GRO MAC header comparisons were ethernet specific, breaking other\n link types. This required a multi-faceted fix to cure the originally\n noted case (Infiniband), because IPoIB was lying about it\u0027s actual\n hard header length. Thanks to Eric Dumazet, Roland Dreier, and\n others.\n\n2) Fix build failure when INET_UDP_DIAG is built in and ipv6 is modular.\n From Anisse Astier.\n\n3) Off by ones and other bug fixes in netprio_cgroup from Neil Horman.\n\n4) ipv4 TCP reset generation needs to respect any network interface\n binding from the socket, otherwise route lookups might give a\n different result than all the other segments received. From Shawn\n Lu.\n\n5) Fix unintended regression in ipv4 proxy ARP responses, from Thomas\n Graf.\n\n6) Fix SKB under-allocation bug in sh_eth, from Yoshihiro Shimoda.\n\n7) Revert skge PCI mapping changes that are causing crashes for some\n folks, from Stephen Hemminger.\n\n8) IPV4 route lookups fill in the wildcarded fields of the given flow\n lookup key passed in, which is fine most of the time as this is\n exactly what the caller\u0027s want. However there are a few cases that\n want to retain the original flow key values afterwards, so handle\n those cases properly. Fix from Julian Anastasov.\n\n9) IGB/IXGBE VF lookup bug fixes from Greg Rose.\n\n10) Properly null terminate filename passed to ethtool flash device\n method, from Ben Hutchings.\n\n11) S3 resume fix in via-velocity from David Lv.\n\n12) Fix double SKB free during xmit failure in CAIF, from Dmitry\n Tarnyagin.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (72 commits)\n net: Don\u0027t proxy arp respond if iif \u003d\u003d rt-\u003edst.dev if private VLAN is disabled\n ipv4: Fix wrong order of ip_rt_get_source() and update iph-\u003edaddr.\n netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP\u003dm\n netprio_cgroup: don\u0027t allocate prio table when a device is registered\n netprio_cgroup: fix an off-by-one bug\n bna: fix error handling of bnad_get_flash_partition_by_offset()\n isdn: type bug in isdn_net_header()\n net: Make qdisc_skb_cb upper size bound explicit.\n ixgbe: ethtool: stats user buffer overrun\n ixgbe: dcb: up2tc mapping lost on disable/enable CEE DCB state\n ixgbe: do not update real num queues when netdev is going away\n ixgbe: Fix broken dependency on MAX_SKB_FRAGS being related to page size\n ixgbe: Fix case of Tx Hang in PF with 32 VFs\n ixgbe: fix vf lookup\n igb: fix vf lookup\n e1000: add dropped DMA receive enable back in for WoL\n gro: more generic L2 header check\n IPoIB: Stop lying about hard_header_len and use skb-\u003ecb to stash LL addresses\n zd1211rw: firmware needs duration_id set to zero for non-pspoll frames\n net: enable TC35815 for MIPS again\n ...\n" }, { "commit": "612b8507c5d545feed2437b3d2239929cac7688d", "tree": "d572f72dc262830cb6958ee97e1b2b886c845b31", "parents": [ "af5feae3d7e821d8c4d38103a7f53146f2590892", "28a4d5675857f6386930a324317281cb8ed1e5d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 10 09:06:25 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 10 09:06:25 2012 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm/i915: fixup interlaced bits clearing in PIPECONF on PCH_SPLIT (v2)\n drm/i915: no lvds quirk for AOpen MP45\n drm/i915: Force explicit bpp selection for intel_dp_link_required\n drm/radeon: do not continue after error from r600_ib_test\n drivers/gpu/drm/drm_ioc32.c: initialize all fields\n drm/i915: fixup interlaced bits clearing in PIPECONF on PCH_SPLIT\n drm/i915:: Disable FBC on SandyBridge\n" }, { "commit": "1282ab3f8f7bca1d3a7fb701fbe4f0f772e72ea0", "tree": "a573ae3ded43302fbb7c9b125ba9f1e45c4ae516", "parents": [ "19e00f2f1d5273dbc52eab0ebc315cae3aa44b2a", "a1c1baf00e5c08dda9c0ee25658bf0ce301102ae" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 10 09:04:37 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 10 09:04:37 2012 -0800" }, "message": "Merge tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\nCouple of regressions, couple of zero-day bugs, a minor enhancement.\nNothing really major.\n\n* tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n hwmon: (f75375s) Let f75375_update_device treat pwmX as a measured value\n hwmon: (f75375s) Fix bit shifting in f75375_write16\n hwmon: (f75375s) Fix reading of wrong register when initializing the F75387\n hwmon: (f75375s) Fix automatic pwm mode setting for F75373 \u0026 F75375\n hwmon: (w83627ehf) Remove duplicate code\n" }, { "commit": "28a4d5675857f6386930a324317281cb8ed1e5d0", "tree": "9293e17abc937153b5a5b614153c6b32bfff2434", "parents": [ "3fe89a0c799c62de68e9e6d6e33899cd7e0da901", "617cf884810b44384fe8e9431e9babeb80a2ff37" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 10 08:35:19 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 10 08:35:19 2012 +0000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux into drm-fixes\n\n* \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux:\n drm/i915: fixup interlaced bits clearing in PIPECONF on PCH_SPLIT (v2)\n drm/i915: no lvds quirk for AOpen MP45\n drm/i915: Force explicit bpp selection for intel_dp_link_required\n drm/i915: fixup interlaced bits clearing in PIPECONF on PCH_SPLIT\n drm/i915:: Disable FBC on SandyBridge\n" }, { "commit": "19e00f2f1d5273dbc52eab0ebc315cae3aa44b2a", "tree": "50a7aecb4b3b94db2dd8061b3692fe216bc371cc", "parents": [ "b05ee6bf9e6c7acc38dca1466b63bb24ae5df6f3", "197234520bd83aba2199add57a9d2678ee7f9781" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 09 13:52:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 09 13:52:57 2012 -0800" }, "message": "Merge tag \u0027tty-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nSerial/TTY fixes for the 3.3-rc3 tree\n\nJust a few new device ids, omap serial driver regression fixes, and a\nbuild fix for the 8250 driver movement.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n* tag \u0027tty-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n tty: serial: omap-serial: wakeup latency constraint is in microseconds, not milliseconds\n tty: serial: OMAP: block idle while the UART is transferring data in PIO mode\n tty: serial: OMAP: use a 1-byte RX FIFO threshold in PIO mode\n m32r: relocate drivers back out of 8250 dir\n tty: fix a build failure on sparc\n serial: samsung: Add support for EXYNOS5250\n serial: samsung: Add support for EXYNOS4212 and EXYNOS4412\n drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer\n" }, { "commit": "b05ee6bf9e6c7acc38dca1466b63bb24ae5df6f3", "tree": "434afa78fbfa784591d45a9befbaed247b26ae89", "parents": [ "b0286db49a182187d39b512ee3748ae2b4dc3b17", "67435319866f89b55721fc88ca0dbda51629e3d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 09 13:52:18 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 09 13:52:18 2012 -0800" }, "message": "Merge tag \u0027staging-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\nStaging tree patches for 3.3-rc3\n\nBig things here is the deletion of the Android pmem driver, as it\u0027s\nobsolete and no one uses it, the gma500 driver as it\u0027s already in the\ndrm portion of the kernel tree, and the pohmelfs filesystem as it\u0027s\nobsolete and a rewritten version is being proposed for the fs/ section\nof the kernel.\n\nOther than that, a smattering of different bugfixes and regressions, and\nsome omap drm api merge fixups that were needed due to api changes in\nthe main portion of the drm tree, allowing this code to build properly\nagain.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n* tag \u0027staging-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (28 commits)\n staging: pohmelfs: remove drivers/staging/pohmelfs\n staging: android/ram_console: Don\u0027t build on arches w/o ioremap\n staging: r8712u: Use asynchronous firmware loading\n staging: usbip: fix to prevent potentially using uninitialized spinlock\n staging: r8712u: Fix problem when CONFIG_R8712_AP is set\n staging: tidspbridge: fix incorrect free to drv_datap\n staging: tidspbridge: fix bridge_open memory leaks\n staging: android: lowmemorykiller: Don\u0027t wait more than one second for a process to die\n MAINTAINERS: staging: iio: add iio information\n staging: zcache: fix serialization bug in zv stats\n staging: fix go7007-usb license\n Staging: android: binder: Fix crashes when sharing a binder file between processes\n Staging: android: Remove pmem driver\n Staging: asus_oled: fix NULL-ptr crash on unloading\n Staging: asus_oled: fix image processing\n Staging: android: binder: Don\u0027t call dump_stack in binder_vma_open\n staging: r8712u: Add new Sitecom UsB ID\n zcache: Set SWIZ_BITS to 8 to reduce tmem bucket lock contention.\n zcache: fix deadlock condition\n staging: drm/omap: fix locking issue\n ...\n" }, { "commit": "b0286db49a182187d39b512ee3748ae2b4dc3b17", "tree": "f695f4c02a5cb1f5ee56b913adf6f81af03391c4", "parents": [ "ae5cdd405bfc5799c07080ec35f48283a9b0142a", "29bb5d4fd3140a7d5d02d858118c74a45f15c296" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 09 13:51:36 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 09 13:51:36 2012 -0800" }, "message": "Merge tag \u0027driver-core-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\nDriver core fixes for the 3.3-rc3 tree.\n\nA few fixes for kobject warnings that have popped up in the cpu hotplug path,\nand a regression fix for the speed of the hotplug memory code.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n* tag \u0027driver-core-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:\n driver-core: cpu: fix kobject warning when hotplugging a cpu\n ACPI: remove duplicated lines of merging problems with acpi_processor_add\n docbook: fix fatal errors in device-drivers docbook and add DMA Management section\n drivers/base/memory.c: fix memory_dev_init() long delay\n driver core: cpu: remove kernel warning when removing a cpu\n" }, { "commit": "ae5cdd405bfc5799c07080ec35f48283a9b0142a", "tree": "b79a66de09bcef5404fb6a1f7de4cf1200023823", "parents": [ "fe250923bbbbcbccc9aa7b84d05ee7a060450534", "b5266ea675c5a041e2852c7ccec4cf2d4f5e0cf4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 09 13:51:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 09 13:51:13 2012 -0800" }, "message": "Merge tag \u0027char-misc-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc\n\nMinor char-misc fixes for 3.3-rc3\n\nNothing big here, some Kconfig fixes for the MISC_DEVICES config option\nthat was being used incorrectly, and some other minor bug fixes.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n* tag \u0027char-misc-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:\n mmc: cb710 core: Add missing spin_lock_init for irq_lock of struct cb710_chip\n cs5535-mfgpt: don\u0027t call __init function from __devinit\n vmw_balloon: fix for a -Wuninitialized warning\n drivers: misc: Remove MISC_DEVICES config option\n c2port: fix build error for duramar2150 due to missing header.\n" }, { "commit": "fe250923bbbbcbccc9aa7b84d05ee7a060450534", "tree": "ece7eb383ca568dd7480a50827ec6e65f4fbb562", "parents": [ "690d137f448d4c4da9001871e6569d5636f116c7", "90451e6973a5da155c6f315a409ca0a8d3ce6b76" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 09 13:50:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 09 13:50:54 2012 -0800" }, "message": "Merge tag \u0027usb-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nUSB fixes for 3.3-rc3\n\nHere are a few minor USB fixes and a bunch of device id updates for the\nUSB drivers.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n* tag \u0027usb-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:\n USB: usbserial: add new PID number (0xa951) to the ftdi driver\n usb: ch9.h: usb_endpoint_maxp() uses __le16_to_cpu()\n usb: musb: fix a build error on mips\n uwb \u0026 wusb \u0026 usb wireless controllers: fix kconfig error \u0026 build errors\n usb: Skip PCI USB quirk handling for Netlogic XLP\n powerpc/usb: fix issue of CPU halt when missing USB PHY clock\n usb: otg: mv_otg: Add dependence\n usb: host: Distinguish Kconfig text for Freescale controllers\n USB: add new zte 3g-dongle\u0027s pid to option.c\n usb: ch9.h: usb_endpoint_maxp() uses __le16_to_cpu()\n USB: qcserial: don\u0027t enable autosuspend\n USB: qcserial: add several new serial devices\n usb: otg: mv_otg: Add dependence\n usb: gadget: zero: fix bug in loopback autoresume handling\n" }, { "commit": "027a3b617c5490b5287d98921675abcbebeb32df", "tree": "5c00f54e4e20b7f687c10c1392ad476e8eabab4d", "parents": [ "5a46e0f95664bb65e3256f3c53b14b8a627c656b" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Thu Feb 09 00:49:34 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 09 15:43:30 2012 -0500" }, "message": "bna: fix error handling of bnad_get_flash_partition_by_offset()\n\nThe current error handling doesn\u0027t work because we flash_part is a u32\nso the checks for negative error codes don\u0027t work. I considered making\nthings signed but I don\u0027t know the hardware enough to say if that\u0027s a\nproblem. Really, we don\u0027t use the error codes so just returning zero\nfor all problems is fine.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a46e0f95664bb65e3256f3c53b14b8a627c656b", "tree": "40af93d61166e8beaa8ba4271aee9ce1e4d116c6", "parents": [ "16bda13d90c8d5da243e2cfa1677e62ecce26860" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Thu Feb 09 00:46:47 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 09 15:41:29 2012 -0500" }, "message": "isdn: type bug in isdn_net_header()\n\nWe use len to store the return value from eth_header(). eth_header()\ncan return -ETH_HLEN (-14). We want to pass this back instead of\ntruncating it to 65522 and returning that.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a1c1baf00e5c08dda9c0ee25658bf0ce301102ae", "tree": "108c402ec1768118839ef9e245b3806c82929734", "parents": [ "eb2f255b2d360df3f500042a2258dcf2fcbe89a2" ], "author": { "name": "Nikolaus Schulz", "email": "schulz@macnetix.de", "time": "Wed Feb 08 18:56:11 2012 +0100" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Thu Feb 09 11:21:49 2012 -0800" }, "message": "hwmon: (f75375s) Let f75375_update_device treat pwmX as a measured value\n\nTreat pwmX as a measured value, not as a (mostly static) limit value, so\nthat it is updated more frequently from the device register.\n\nSigned-off-by: Nikolaus Schulz \u003cmail@microschulz.de\u003e\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "197234520bd83aba2199add57a9d2678ee7f9781", "tree": "8923cb1ed877f40141db03873e830df00df4840c", "parents": [ "be4b0281956c5cae4f63f31f11d07625a6988766" ], "author": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Wed Jan 25 19:50:56 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Feb 09 10:48:36 2012 -0800" }, "message": "tty: serial: omap-serial: wakeup latency constraint is in microseconds, not milliseconds\n\nThe receive FIFO wakeup latency estimate in the omap-serial driver is\nthree orders of magnitude too small. This effectively prevents the\nMPU from going to a low-power state when CONFIG_CPU_IDLE\u003dy. This is a\nmajor power management regression and masks some other FIFO-related\nbugs in the driver.\n\nFix by correcting the most egregious problem in the RX wakeup latency\nestimate. There are several other flaws in the estimator; these will\nbe fixed by a separate patch series intended for 3.4.\n\nThe difference in low-power states with this patch can be observed via\ndebugfs in pm_debug/count.\n\nThis estimate does not have any effect when CONFIG_CPU_IDLE\u003dn.\n\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\nCc: Tomi Valkeinen \u003ctomi.valkeinen@ti.com\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nAcked-by: Govindraj.R \u003cgovindraj.raja@ti.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nTested-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "be4b0281956c5cae4f63f31f11d07625a6988766", "tree": "c75f6d88a142889eec90c5ae2e023b31fb3445df", "parents": [ "0ba5f66836c9253c67c469fb4016f94ea30ff2ce" ], "author": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Wed Jan 25 19:50:52 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Feb 09 10:48:34 2012 -0800" }, "message": "tty: serial: OMAP: block idle while the UART is transferring data in PIO mode\n\nPrevent OMAP UARTs from going idle while they are still transferring\ndata in PIO mode. This works around an oversight in the OMAP UART\nhardware present in OMAP34xx and earlier: an idle UART won\u0027t send a\nwakeup when the TX FIFO threshold is reached. This causes long delays\nduring data transmission when the MPU powerdomain enters a low-power\nmode. The MPU interrupt controller is not able to respond to\ninterrupts when it\u0027s in a low-power state, so the TX buffer is not\nrefilled until another wakeup event occurs.\n\nThis fix changes the erratum i291 DMA idle workaround. Rather than\ntoggling between force-idle and no-idle, it will toggle between\nsmart-idle and no-idle. The important part of the workaround is the\nno-idle part, so this shouldn\u0027t result in any change in behavior.\n\nThis fix should work on all OMAP UARTs. Future patches intended for\nthe 3.4 merge window will make this workaround conditional on a\n\"feature\" flag, and will use the OMAP36xx+ TX event wakeup support.\n\nThanks to Kevin Hilman \u003ckhilman@ti.com\u003e for mentioning the erratum i291\nworkaround, which led to the development of this approach.\n\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Tomi Valkeinen \u003ctomi.valkeinen@ti.com\u003e\nAcked-by: Govindraj.R \u003cgovindraj.raja@ti.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nTested-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "0ba5f66836c9253c67c469fb4016f94ea30ff2ce", "tree": "df0c699312cd9de2d97164034971f0e3988554bd", "parents": [ "c8a64268d187b2ace478d2147ce5c79658aca2d2" ], "author": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Wed Jan 25 19:50:36 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Feb 09 10:48:32 2012 -0800" }, "message": "tty: serial: OMAP: use a 1-byte RX FIFO threshold in PIO mode\n\nIn the (default) PIO mode, use a one-byte RX FIFO threshold. The OMAP\nUART IP blocks do not appear to be capable of waking the system under\nan RX timeout condition. Since the previous RX FIFO threshold was 16\nbytes, this meant that omap-serial.c did not become aware of any\nreceived data until all those bytes arrived or until another UART\ninterrupt occurred. This made the serial console and presumably other\nserial applications (GPS, serial Bluetooth) unusable or extremely\nslow. A 1-byte RX FIFO threshold also allows the MPU to enter a\nlow-power consumption state while waiting for the FIFO to fill.\n\nThis can be verified using the serial console by comparing the\nbehavior when \"0123456789abcde\" is pasted in from another window, with\nthe behavior when \"0123456789abcdef\" is pasted in. Since the former\nstring is less than sixteen bytes long, the string is not echoed for\nsome time, while the latter string is echoed immediately.\n\nDMA operation is unaffected by this patch.\n\nThanks to Russell King - ARM Linux \u003clinux@arm.linux.org.uk\u003e for some\nadditional information on the standard behavior of the RX timeout\nevent, which was used to improve this commit description.\n\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\nCc: Tomi Valkeinen \u003ctomi.valkeinen@ti.com\u003e\nCc: Govindraj Raja \u003cgovindraj.r@ti.com\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nTested-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "6252547b8a7acced581b649af4ebf6d65f63a34b", "tree": "451bcae38a1607083e6f1a803bc840ec96b5e351", "parents": [ "40410715715178ec196314dd0c19150c06901f80" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 07 09:47:21 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 09 17:56:53 2012 +0000" }, "message": "ARM: omap: fix broken twl-core dependencies and ifdefs\n\nIn commit aeb5032b3f, a dependency on IRQ_DOMAIN was added, which causes\nregressions on previously working setups: a previously working non-DT\nkernel configuration now loses its PMIC support. The lack of PMIC\nsupport in turn causes the loss of other functionality the kernel had.\n\nThis dependency was added because the driver now registers its\ninterrupts with the IRQ domain code, presumably to prevent a build error.\n\nThe result is that OMAP3 oopses in the vp.c code (fixed by a previous\ncommit) due to the lack of PMIC support.\n\nHowever, even with IRQ_DOMAIN enabled, the driver oopses:\n\nUnable to handle kernel NULL pointer dereference at virtual address 00000000\npgd \u003d c0004000\n[00000000] *pgd\u003d00000000\nInternal error: Oops: 5 [#1] SMP\nModules linked in:\nCPU: 1 Not tainted (3.3.0-rc2+ #271)\nPC is at irq_domain_add+0x1c/0x134\nLR is at twl_probe+0xd0/0x370\npc : [\u003cc007bad0\u003e] lr : [\u003cc029baac\u003e] psr: 00000113\nsp : df843c48 ip : df843c68 fp : df843c64\nr10: c02b93e4 r9 : 00000000 r8 : c029b9dc\nr7 : df9d8a00 r6 : c03bef90 r5 : 00000000 r4 : c03f5240\nr3 : 00000000 r2 : c03f5240 r1 : 00000015 r0 : c03f5240\nFlags: nzcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel\nControl: 10c5387d Table: 8000404a DAC: 00000015\nProcess swapper/0 (pid: 1, stack limit \u003d 0xdf8422f0)\nStack: (0xdf843c48 to 0xdf844000)\n3c40: 00000014 00000170 00000014 c03bef90 df843c9c df843c68\n3c60: c029baac c007bac0 00000000 df9d8a20 00000001 c03cd238 c02b93e4 df9d8a20\n3c80: df9d8a04 df9d8a00 c029b9dc df8cae08 df843cc4 df843ca0 c01eee70 c029b9e8\n...\nBacktrace:\n[\u003cc007bab4\u003e] (irq_domain_add+0x0/0x134) from [\u003cc029baac\u003e] (twl_probe+0xd0/0x370)\n r6:c03bef90 r5:00000014 r4:00000170\n[\u003cc029b9dc\u003e] (twl_probe+0x0/0x370) from [\u003cc01eee70\u003e] (i2c_device_probe+0xb0/0xe4)\n[\u003cc01eedc0\u003e] (i2c_device_probe+0x0/0xe4) from [\u003cc01d1f34\u003e] (really_probe+0xa0/0x178)\n r8:df8f0070 r7:c03cd238 r6:df9d8a20 r5:df9d8a20 r4:df9d8a20\n[\u003cc01d1e94\u003e] (really_probe+0x0/0x178) from [\u003cc01d205c\u003e] (driver_probe_device+0x50/0x68)\n r7:df843d18 r6:df9d8a20 r5:c03cd238 r4:df9d8a20\n[\u003cc01d200c\u003e] (driver_probe_device+0x0/0x68) from [\u003cc01d2148\u003e] (__device_attach+0x44/0x48)\n r5:df9d8a20 r4:c03cd238\n[\u003cc01d2104\u003e] (__device_attach+0x0/0x48) from [\u003cc01d0840\u003e] (bus_for_each_drv+0x58/0x98)\n r5:c01d2104 r4:00000000\n[\u003cc01d07e8\u003e] (bus_for_each_drv+0x0/0x98) from [\u003cc01d21f8\u003e] (device_attach+0x80/0xac)\n r7:df9d8a28 r6:df9d8a54 r5:c03cd978 r4:df9d8a20\n[\u003cc01d2178\u003e] (device_attach+0x0/0xac) from [\u003cc01d1430\u003e] (bus_probe_device+0x34/0xa4)\n r6:df9d8a20 r5:c03cd978 r4:df9d8a20\n[\u003cc01d13fc\u003e] (bus_probe_device+0x0/0xa4) from [\u003cc01cffb0\u003e] (device_add+0x2a0/0x420)\n r6:00000000 r5:df9d8a20 r4:df9d8a20\n[\u003cc01cfd10\u003e] (device_add+0x0/0x420) from [\u003cc01d0150\u003e] (device_register+0x20/0x24)\n r8:df9d8a00 r7:df9d8a04 r6:df8f0048 r5:df9d8a00 r4:df9d8a20\n[\u003cc01d0130\u003e] (device_register+0x0/0x24) from [\u003cc01ef8d4\u003e] (i2c_new_device+0x118/0x180)\n r4:df9d8a20\n[\u003cc01ef7bc\u003e] (i2c_new_device+0x0/0x180) from [\u003cc01efc88\u003e] (i2c_register_adapter+0x140/0x204)\n r8:c03cd970 r7:00000000 r6:df8f0070 r5:df8a6300 r4:df8f0048\n[\u003cc01efb48\u003e] (i2c_register_adapter+0x0/0x204) from [\u003cc01efe9c\u003e] (i2c_add_numbered_adapter+0xb4/0xcc)\n r8:df8a4c54 r7:df8cae00 r6:df843e2c r5:df8f0048 r4:00000000\n[\u003cc01efde8\u003e] (i2c_add_numbered_adapter+0x0/0xcc) from [\u003cc029ce1c\u003e] (omap_i2c_probe+0x2f8/0x3b4)\n r6:00000000 r5:df8f0000 r4:df8f0070\n[\u003cc029cb24\u003e] (omap_i2c_probe+0x0/0x3b4) from [\u003cc01d3484\u003e] (platform_drv_probe+0x20/0x24)\n[\u003cc01d3464\u003e] (platform_drv_probe+0x0/0x24) from [\u003cc01d1f34\u003e] (really_probe+0xa0/0x178)\n[\u003cc01d1e94\u003e] (really_probe+0x0/0x178) from [\u003cc01d205c\u003e] (driver_probe_device+0x50/0x68)\n r7:df843ef0 r6:c03cdb2c r5:c03cdb2c r4:df8cae08\n[\u003cc01d200c\u003e] (driver_probe_device+0x0/0x68) from [\u003cc01d20e0\u003e] (__driver_attach+0x6c/0x90)\n r5:df8cae3c r4:df8cae08\n[\u003cc01d2074\u003e] (__driver_attach+0x0/0x90) from [\u003cc01d08d8\u003e] (bus_for_each_dev+0x58/0x98)\n r6:c03cdb2c r5:c01d2074 r4:00000000\n[\u003cc01d0880\u003e] (bus_for_each_dev+0x0/0x98) from [\u003cc01d1d80\u003e] (driver_attach+0x20/0x28)\n r7:df880b80 r6:c03cdb2c r5:c03cdb2c r4:c0394f28\n[\u003cc01d1d60\u003e] (driver_attach+0x0/0x28) from [\u003cc01d115c\u003e] (bus_add_driver+0xb4/0x230)\n[\u003cc01d10a8\u003e] (bus_add_driver+0x0/0x230) from [\u003cc01d278c\u003e] (driver_register+0xc8/0x154)\n[\u003cc01d26c4\u003e] (driver_register+0x0/0x154) from [\u003cc01d37e4\u003e] (platform_driver_register+0x4c/0x60)\n r8:00000000 r7:00000013 r6:c00384c8 r5:c0395180 r4:c0394f28\n[\u003cc01d3798\u003e] (platform_driver_register+0x0/0x60) from [\u003cc038626c\u003e] (omap_i2c_init_driver+0x14/0x1c)\n[\u003cc0386258\u003e] (omap_i2c_init_driver+0x0/0x1c) from [\u003cc00087b8\u003e] (do_one_initcall+0x9c/0x164)\n[\u003cc000871c\u003e] (do_one_initcall+0x0/0x164) from [\u003cc036c2f4\u003e] (kernel_init+0x90/0x138)\n[\u003cc036c264\u003e] (kernel_init+0x0/0x138) from [\u003cc00384c8\u003e] (do_exit+0x0/0x2ec)\n r5:c036c264 r4:00000000\n\u003c0\u003eCode: e24dd004 e5903014 e1a04000 e5905010 (e5933000)\n\u003c4\u003e---[ end trace 1b75b31a2719ed1c ]---\n\nThis happens because we try to register an IRQ domain with a NULL ops\nstructure, and the first thing irq_domain_add() does is try to\ndereference this ops structure.\n\nSo, fix the problem by getting rid of the incorrect OF_IRQ ifdef and\nwrapping the IRQ domain bits of the driver with an IRQ_DOMAIN ifdef\ninstead.\n\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "40410715715178ec196314dd0c19150c06901f80", "tree": "73a48e5281379835b0fdf3430486cff78a711f5f", "parents": [ "d980e0f8d858c6963d676013e976ff00ab7acb2b" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 07 09:44:55 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 09 17:56:53 2012 +0000" }, "message": "ARM: omap: fix oops in drivers/video/omap2/dss/dpi.c\n\nWhen a PMIC is not found, this driver is unable to obtain its\n\u0027vdds_dsi_reg\u0027 regulator. Even through its initialization function\nfails, other code still calls its enable function, which fails to\ncheck whether it has this regulator before asking for it to be enabled.\n\nThis fixes the oops, however a better fix would be to sort out the\nupper layers to prevent them calling into a module which failed to\ninitialize.\n\nUnable to handle kernel NULL pointer dereference at virtual address 00000038\npgd \u003d c0004000\n[00000038] *pgd\u003d00000000\nInternal error: Oops: 5 [#1] PREEMPT\nModules linked in:\nCPU: 0 Not tainted (3.3.0-rc2+ #228)\nPC is at regulator_enable+0x10/0x70\nLR is at omapdss_dpi_display_enable+0x54/0x15c\npc : [\u003cc01b9a08\u003e] lr : [\u003cc01af994\u003e] psr: 60000013\nsp : c181fd90 ip : c181fdb0 fp : c181fdac\nr10: c042eff0 r9 : 00000060 r8 : c044a164\nr7 : c042c0e4 r6 : c042bd60 r5 : 00000000 r4 : c042bd60\nr3 : c084de48 r2 : c181e000 r1 : c042bd60 r0 : 00000000\nFlags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel\nControl: 10c5387d Table: 80004019 DAC: 00000015\nProcess swapper (pid: 1, stack limit \u003d 0xc181e2e8)\nStack: (0xc181fd90 to 0xc1820000)\nfd80: c001754c c042bd60 00000000 c042bd60\nfda0: c181fdcc c181fdb0 c01af994 c01b9a04 c0016104 c042bd60 c042bd60 c044a338\nfdc0: c181fdec c181fdd0 c01b5ed0 c01af94c c042bd60 c042bd60 c1aa8000 c1aa8a0c\nfde0: c181fe04 c181fdf0 c01b5f54 c01b5ea8 c02fc18c c042bd60 c181fe3c c181fe08\nfe00: c01b2a18 c01b5f48 c01aed14 c02fc160 c01df8ec 00000002 c042bd60 00000003\nfe20: c042bd60 c1aa8000 c1aa8a0c c042eff8 c181fe84 c181fe40 c01b3874 c01b29fc\nfe40: c042eff8 00000000 c042f000 c0449db8 c044ed78 00000000 c181fe74 c042eff8\nfe60: c042eff8 c0449db8 c0449db8 c044ed78 00000000 00000000 c181fe94 c181fe88\nfe80: c01e452c c01b35e8 c181feb4 c181fe98 c01e2fdc c01e4518 c042eff8 c0449db8\nfea0: c0449db8 c181fef0 c181fecc c181feb8 c01e3104 c01e2f48 c042eff8 c042f02c\nfec0: c181feec c181fed0 c01e3190 c01e30c0 c01e311c 00000000 c01e311c c0449db8\nfee0: c181ff14 c181fef0 c01e1998 c01e3128 c18330a8 c1892290 c04165e8 c0449db8\nff00: c0449db8 c1ab60c0 c181ff24 c181ff18 c01e2e28 c01e194c c181ff54 c181ff28\nff20: c01e2218 c01e2e14 c039afed c181ff38 c04165e8 c041660c c0449db8 00000013\nff40: 00000000 c03ffdb8 c181ff7c c181ff58 c01e384c c01e217c c181ff7c c04165e8\nff60: c041660c c003a37c 00000013 00000000 c181ff8c c181ff80 c01e488c c01e3790\nff80: c181ff9c c181ff90 c03ffdcc c01e484c c181ffdc c181ffa0 c0008798 c03ffdc4\nffa0: c181ffc4 c181ffb0 c0056440 c0187810 c003a37c c04165e8 c041660c c003a37c\nffc0: 00000013 00000000 00000000 00000000 c181fff4 c181ffe0 c03ea284 c0008708\nffe0: 00000000 c03ea208 00000000 c181fff8 c003a37c c03ea214 1073cec0 01f7ee08\nBacktrace:\n[\u003cc01b99f8\u003e] (regulator_enable+0x0/0x70) from [\u003cc01af994\u003e] (omapdss_dpi_display_enable+0x54/0x15c)\n r6:c042bd60 r5:00000000 r4:c042bd60\n[\u003cc01af940\u003e] (omapdss_dpi_display_enable+0x0/0x15c) from [\u003cc01b5ed0\u003e] (generic_dpi_panel_power_on+0x34/0x78)\n r6:c044a338 r5:c042bd60 r4:c042bd60\n[\u003cc01b5e9c\u003e] (generic_dpi_panel_power_on+0x0/0x78) from [\u003cc01b5f54\u003e] (generic_dpi_panel_enable+0x18/0x28)\n r7:c1aa8a0c r6:c1aa8000 r5:c042bd60 r4:c042bd60\n[\u003cc01b5f3c\u003e] (generic_dpi_panel_enable+0x0/0x28) from [\u003cc01b2a18\u003e] (omapfb_init_display+0x28/0x150)\n r4:c042bd60\n[\u003cc01b29f0\u003e] (omapfb_init_display+0x0/0x150) from [\u003cc01b3874\u003e] (omapfb_probe+0x298/0x318)\n r8:c042eff8 r7:c1aa8a0c r6:c1aa8000 r5:c042bd60 r4:00000003\n[\u003cc01b35dc\u003e] (omapfb_probe+0x0/0x318) from [\u003cc01e452c\u003e] (platform_drv_probe+0x20/0x24)\n[\u003cc01e450c\u003e] (platform_drv_probe+0x0/0x24) from [\u003cc01e2fdc\u003e] (really_probe+0xa0/0x178)\n[\u003cc01e2f3c\u003e] (really_probe+0x0/0x178) from [\u003cc01e3104\u003e] (driver_probe_device+0x50/0x68)\n r7:c181fef0 r6:c0449db8 r5:c0449db8 r4:c042eff8\n[\u003cc01e30b4\u003e] (driver_probe_device+0x0/0x68) from [\u003cc01e3190\u003e] (__driver_attach+0x74/0x98)\n r5:c042f02c r4:c042eff8\n[\u003cc01e311c\u003e] (__driver_attach+0x0/0x98) from [\u003cc01e1998\u003e] (bus_for_each_dev+0x58/0x98)\n r6:c0449db8 r5:c01e311c r4:00000000\n[\u003cc01e1940\u003e] (bus_for_each_dev+0x0/0x98) from [\u003cc01e2e28\u003e] (driver_attach+0x20/0x28)\n r7:c1ab60c0 r6:c0449db8 r5:c0449db8 r4:c04165e8\n[\u003cc01e2e08\u003e] (driver_attach+0x0/0x28) from [\u003cc01e2218\u003e] (bus_add_driver+0xa8/0x22c)\n[\u003cc01e2170\u003e] (bus_add_driver+0x0/0x22c) from [\u003cc01e384c\u003e] (driver_register+0xc8/0x154)\n[\u003cc01e3784\u003e] (driver_register+0x0/0x154) from [\u003cc01e488c\u003e] (platform_driver_register+0x4c/0x60)\n r8:00000000 r7:00000013 r6:c003a37c r5:c041660c r4:c04165e8\n[\u003cc01e4840\u003e] (platform_driver_register+0x0/0x60) from [\u003cc03ffdcc\u003e] (omapfb_init+0x14/0x34)\n[\u003cc03ffdb8\u003e] (omapfb_init+0x0/0x34) from [\u003cc0008798\u003e] (do_one_initcall+0x9c/0x164)\n[\u003cc00086fc\u003e] (do_one_initcall+0x0/0x164) from [\u003cc03ea284\u003e] (kernel_init+0x7c/0x120)\n[\u003cc03ea208\u003e] (kernel_init+0x0/0x120) from [\u003cc003a37c\u003e] (do_exit+0x0/0x2d8)\n r5:c03ea208 r4:00000000\nCode: e1a0c00d e92dd870 e24cb004 e24dd004 (e5906038)\n---[ end trace 9e2474c2e193b223 ]---\n\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "9cc00b51a3cbb3b933065a55eaa9bfc306411b7a", "tree": "5dc0dec3837ed23e0f2f0d070ebbf98d4243cdc0", "parents": [ "5facb8e0c4dc1c8c47b71fd7f376defe16185733" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sat Jan 28 03:32:17 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu Feb 09 01:27:47 2012 -0800" }, "message": "ixgbe: ethtool: stats user buffer overrun\n\nIf the number of tx/rx queues changes the ethtool ioctl\nETHTOOL_GSTATS may overrun the userspace buffer. This\noccurs because the general practice in user space to\nquery stats is to issue a ETHTOOL_GSSET cmd to learn the\nbuffer size needed, allocate the buffer, then call\nETHTOOL_GSTIRNGS and ETHTOOL_GSTATS. If the number of\nreal_num_queues is changed or flow control attributes\nare changed after ETHTOOL_GSSET but before the\nETHTOOL_GSTRINGS/ETHTOOL_GSTATS a user space buffer\noverrun occurs.\n\nTo fix the overrun always return the max buffer size\nneeded from get_sset_count() then return all strings\nand stats from get_strings()/get_ethtool_stats().\n\nThis _will_ change the output from the ioctl() call\nwhich could break applications and script parsing in\ntheory. I believe these changes should not break existing\ntools because the only changes will be more {tx|rx}_queues\nand the {tx|rx}_pb_* stats will always be returned.\nExisting scripts already need to handle changing number\nof queues because this occurs today depending on system\nand current features. The {tx|rx}_pb_* stats are at the\nend of the output and should be handled by scripts today\nregardless.\n\nFinally get_ethtool_stats and get_strings are free-form\noutputs tools parsing these outputs should be defensive\nanyways. In the end these updates are better then\nhaving a tool segfault because of a buffer overrun.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "5facb8e0c4dc1c8c47b71fd7f376defe16185733", "tree": "a6a24fd9586d8c74ef665f1a9c01366f51059082", "parents": [ "9d837ea2b72321ffbdaf83c980923d23ae898baa" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sat Jan 28 01:22:35 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu Feb 09 01:27:41 2012 -0800" }, "message": "ixgbe: dcb: up2tc mapping lost on disable/enable CEE DCB state\n\nUsers expect the up2tc mapping to be maintained across a DCB\nenable/disable/enable transition. And since we maintain all\nthe other DCB attributes we should do this for up2tc mappings\nas well just to be consistent. Also without this we break\nuser space applications that expect this to occur that\npreviously worked.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Stephen Ko \u003cstephen.s.ko@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "9d837ea2b72321ffbdaf83c980923d23ae898baa", "tree": "a098730cda393f6122307ea7ded202232828b43b", "parents": [ "642c680e9314fc102bc1f096f48ae3974931ef42" ], "author": { "name": "Yi Zou", "email": "yi.zou@intel.com", "time": "Sat Jan 07 08:39:50 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu Feb 09 01:26:52 2012 -0800" }, "message": "ixgbe: do not update real num queues when netdev is going away\n\nIf the netdev is already in NETREG_UNREGISTERING/_UNREGISTERED state, do not\nupdate the real num tx queues. netdev_queue_update_kobjects() is already\ncalled via remove_queue_kobjects() at NETREG_UNREGISTERING time. So, when\nupper layer driver, e.g., FCoE protocol stack is monitoring the netdev\nevent of NETDEV_UNREGISTER and calls back to LLD ndo_fcoe_disable() to remove\nextra queues allocated for FCoE, the associated txq sysfs kobjects are already\nremoved, and trying to update the real num queues would cause something like\nbelow:\n\n...\nPID: 25138 TASK: ffff88021e64c440 CPU: 3 COMMAND: \"kworker/3:3\"\n #0 [ffff88021f007760] machine_kexec at ffffffff810226d9\n #1 [ffff88021f0077d0] crash_kexec at ffffffff81089d2d\n #2 [ffff88021f0078a0] oops_end at ffffffff813bca78\n #3 [ffff88021f0078d0] no_context at ffffffff81029e72\n #4 [ffff88021f007920] __bad_area_nosemaphore at ffffffff8102a155\n #5 [ffff88021f0079f0] bad_area_nosemaphore at ffffffff8102a23e\n #6 [ffff88021f007a00] do_page_fault at ffffffff813bf32e\n #7 [ffff88021f007b10] page_fault at ffffffff813bc045\n [exception RIP: sysfs_find_dirent+17]\n RIP: ffffffff81178611 RSP: ffff88021f007bc0 RFLAGS: 00010246\n RAX: ffff88021e64c440 RBX: ffffffff8156cc63 RCX: 0000000000000004\n RDX: ffffffff8156cc63 RSI: 0000000000000000 RDI: 0000000000000000\n RBP: ffff88021f007be0 R8: 0000000000000004 R9: 0000000000000008\n R10: ffffffff816fed00 R11: 0000000000000004 R12: 0000000000000000\n R13: ffffffff8156cc63 R14: 0000000000000000 R15: ffff8802222a0000\n ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018\n #8 [ffff88021f007be8] sysfs_get_dirent at ffffffff81178c07\n #9 [ffff88021f007c18] sysfs_remove_group at ffffffff8117ac27\n#10 [ffff88021f007c48] netdev_queue_update_kobjects at ffffffff813178f9\n#11 [ffff88021f007c88] netif_set_real_num_tx_queues at ffffffff81303e38\n#12 [ffff88021f007cc8] ixgbe_set_num_queues at ffffffffa0249763 [ixgbe]\n#13 [ffff88021f007cf8] ixgbe_init_interrupt_scheme at ffffffffa024ea89 [ixgbe]\n#14 [ffff88021f007d48] ixgbe_fcoe_disable at ffffffffa0267113 [ixgbe]\n#15 [ffff88021f007d68] vlan_dev_fcoe_disable at ffffffffa014fef5 [8021q]\n#16 [ffff88021f007d78] fcoe_interface_cleanup at ffffffffa02b7dfd [fcoe]\n#17 [ffff88021f007df8] fcoe_destroy_work at ffffffffa02b7f08 [fcoe]\n#18 [ffff88021f007e18] process_one_work at ffffffff8105d7ca\n#19 [ffff88021f007e68] worker_thread at ffffffff81060513\n#20 [ffff88021f007ee8] kthread at ffffffff810648b6\n#21 [ffff88021f007f48] kernel_thread_helper at ffffffff813c40f4\n\nSigned-off-by: Yi Zou \u003cyi.zou@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nTested-by: Stephen Ko \u003cstephen.s.ko@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "642c680e9314fc102bc1f096f48ae3974931ef42", "tree": "8ec26ddeda26afaecda3dc437a7602486587039e", "parents": [ "4cd6923d3481773f3fbcae5ca940c8823aa33475" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Thu Nov 10 09:09:17 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu Feb 09 01:26:46 2012 -0800" }, "message": "ixgbe: Fix broken dependency on MAX_SKB_FRAGS being related to page size\n\nThis patch fixes an issue in which RSC will generate corrupted frames when\nPAGE_SIZE is larger than 8K. Specifically it looks like that in 2.6.39 a\nchange was made so that GRO would always have at least 16 frags available\nfor coalescing, but the ixgbe RSC logic was not updated. As such the RSC\nfeature would generate a frame larger than 64K and then overflow the value\nin the IP length field.\n\nTo correct that I am now basing things on the PAGE_SIZE.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nTested-by: Stephen Ko \u003cstephen.s.ko@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "4cd6923d3481773f3fbcae5ca940c8823aa33475", "tree": "77a22f738317d40752ee48c19415f433a413e680", "parents": [ "a4b08329c74985e5cc3a44b6d2b2c59444ed8079" ], "author": { "name": "Greg Rose", "email": "gregory.v.rose@intel.com", "time": "Wed Jan 25 07:59:37 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu Feb 09 01:25:49 2012 -0800" }, "message": "ixgbe: Fix case of Tx Hang in PF with 32 VFs\n\nA check for the number of VFs allocated should have used a greater than\nequal operator instead of just greater than. This caused allocation of\nexactly 32 VFs to not enable the PF transmit and receive enables.\n\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nTested-by: Robert E Garrett \u003crobertX.e.garrett@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "a4b08329c74985e5cc3a44b6d2b2c59444ed8079", "tree": "21249e7c96cfc7e294ad0611e01e0d8f682ac986", "parents": [ "0629292117572a60465f38cdedde2f8164c3df0b" ], "author": { "name": "Greg Rose", "email": "gregory.v.rose@intel.com", "time": "Fri Feb 03 00:54:13 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu Feb 09 01:25:42 2012 -0800" }, "message": "ixgbe: fix vf lookup\n\nRecent addition of code to find already allocated VFs failed to take\naccount that systems with 2 or more multi-port SR-IOV capable controllers\nmight have already enabled VFs. Make sure that the VFs the function is\nfinding are actually subordinate to the particular instance of the adapter\nthat is looking for them and not subordinate to some device that has\npreviously enabled SR-IOV.\n\nThis bug exists in 3.2 stable as well as 3.3 release candidates.\n\nCC: stable@vger.kernel.org\nReported-by: David Ahern \u003cdaahern@cisco.com\u003e\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nTested-by: Robert E Garrett \u003crobertX.e.garrett@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "0629292117572a60465f38cdedde2f8164c3df0b", "tree": "ad9cf86ad892b17b2d2f27e0bce7ae9a09faa857", "parents": [ "b868179c47e9e8eadcd04c1f3105998e528988a3" ], "author": { "name": "Greg Rose", "email": "gregory.v.rose@intel.com", "time": "Thu Feb 02 23:51:43 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu Feb 09 01:24:29 2012 -0800" }, "message": "igb: fix vf lookup\n\nRecent addition of code to find already allocated VFs failed to take\naccount that systems with 2 or more multi-port SR-IOV capable controllers\nmight have already enabled VFs. Make sure that the VFs the function is\nfinding are actually subordinate to the particular instance of the adapter\nthat is looking for them and not subordinate to some device that has\npreviously enabled SR-IOV.\n\nThis is applicable to 3.2+ kernels.\n\nCC: stable@vger.kernel.org\nReported-by: David Ahern \u003cdaahern@cisco.com\u003e\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nTested-by: Robert E Garrett \u003crobertX.e.garrett@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "b868179c47e9e8eadcd04c1f3105998e528988a3", "tree": "9997c107f1b50f012703cf56b0a156cf2b42ae5f", "parents": [ "64db880e7488a6d31363ad17c4c0590f27fd48e5" ], "author": { "name": "Dean Nelson", "email": "dnelson@redhat.com", "time": "Thu Jan 19 17:47:24 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu Feb 09 01:24:23 2012 -0800" }, "message": "e1000: add dropped DMA receive enable back in for WoL\n\nCommit d5bc77a223b0e9b9dfb002048d2b34a79e7d0b48 broke Wake-on-LAN by\ninadvertently dropping the enabling of DMA receives.\n\nRestore the enabling of DMA receives for WoL.\n\nThis is applicable to 3.1+ stable trees.\n\nCC: stable@vger.stable.org\nReported-by: Tobias Klausmann \u003cklausman@schwarzvogel.de\u003e\nSigned-off-by: Dean Nelson \u003cdnelson@redhat.com\u003e\nTested-by: Tobias Klausmann \u003cklausman@schwarzvogel.de\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "eb2f255b2d360df3f500042a2258dcf2fcbe89a2", "tree": "f8a69f2bf4420c608fedfa99af6f6dc083f35154", "parents": [ "a367a1e08b21e995c7112ff32b5efc97d104d405" ], "author": { "name": "Nikolaus Schulz", "email": "schulz@macnetix.de", "time": "Wed Feb 08 18:56:10 2012 +0100" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Feb 08 20:47:34 2012 -0800" }, "message": "hwmon: (f75375s) Fix bit shifting in f75375_write16\n\nIn order to extract the high byte of the 16-bit word, shift the word to\nthe right, not to the left.\n\nSigned-off-by: Nikolaus Schulz \u003cmail@microschulz.de\u003e\nCc: stable@kernel.org # 2.6.32+\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "a367a1e08b21e995c7112ff32b5efc97d104d405", "tree": "1c93195ca4f85a005989c496b15954e5ddf6342c", "parents": [ "09e87e5c4f9af656af2a8a3afc03487c5d9287c3" ], "author": { "name": "Nikolaus Schulz", "email": "schulz@macnetix.de", "time": "Wed Feb 08 18:56:09 2012 +0100" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Feb 08 20:47:33 2012 -0800" }, "message": "hwmon: (f75375s) Fix reading of wrong register when initializing the F75387\n\nUnlike the other chips supported by this driver, the F75387 stores the\npwm_mode in register F75375_REG_FAN_TIMER, not F75375_REG_CONFIG1.\n\nSigned-off-by: Nikolaus Schulz \u003cmail@microschulz.de\u003e\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "09e87e5c4f9af656af2a8a3afc03487c5d9287c3", "tree": "ad3648abda472c501af6b555864fc7265a8a7f5f", "parents": [ "eb564e1dbc3685c08a52a0eea3821815fac50511" ], "author": { "name": "Nikolaus Schulz", "email": "schulz@macnetix.de", "time": "Wed Feb 08 18:56:08 2012 +0100" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Feb 08 20:47:33 2012 -0800" }, "message": "hwmon: (f75375s) Fix automatic pwm mode setting for F75373 \u0026 F75375\n\nIn order to enable temperature mode aka automatic mode for the F75373 and\nF75375 chips, the two FANx_MODE bits in the fan configuration register\nneed be set to 01, not 10.\n\nSigned-off-by: Nikolaus Schulz \u003cmail@microschulz.de\u003e\nCc: stable@kernel.org # 2.6.32+\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "eb564e1dbc3685c08a52a0eea3821815fac50511", "tree": "d05d4a33f7d34e7528bf5b3889920a6ad55ddb78", "parents": [ "d65b4e98d7ea3038b767b70fe8be959b2913f16d" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Tue Feb 07 01:46:42 2012 -0800" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Feb 08 20:47:32 2012 -0800" }, "message": "hwmon: (w83627ehf) Remove duplicate code\n\nCommit ec3e5a16446fef1891611fe3bdfa5954d1ddf5e4 slipped in some duplicate code.\nRemove it.\n\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "63082402968f4b73f10b28a8ac1f3da821aeb82d", "tree": "1d6dcb15d7b2102211453b79e7922919396d14fa", "parents": [ "19e75ed46faffbe795c306eed2a79010c7244a68", "05df1f3c2afaef5672627f2b7095f0d4c4dbc3a0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 08 19:11:00 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 08 19:11:00 2012 -0800" }, "message": "Merge branch \u0027iommu/fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu\n\nOne patch fixes an bug in the ARM/MSM IOMMU code which returned sucess\nin the unmap function even when an error occured and the other patch\nadds a workaround into the AMD IOMMU driver to better handle broken IVRS\nACPI tables (this patch fixes the case when a device is not listed in\nthe table but actually translated by the iommu).\n\n* \u0027iommu/fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:\n iommu/msm: Fix error handling in msm_iommu_unmap()\n iommu/amd: Work around broken IVRS tables\n" }, { "commit": "19e75ed46faffbe795c306eed2a79010c7244a68", "tree": "7e9068712375ddaf04942f7afe89dbe54be05026", "parents": [ "4d39aa1b998fffd481517c1dd03d83c38e1706f9", "67236c44741e250199ccd77f1115568e68cf8848" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 08 19:09:25 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 08 19:09:25 2012 -0800" }, "message": "Merge branch \u00273.3-rc-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending\n\nThis series contains pending target bug-fixes and cleanups for v3.3-rc3\nthat have been addressed the past weeks in lio-core.git.\n\nSome of the highlights include:\n\n - Fix handling for control CDBs with data greater than PAGE_SIZE (andy)\n - Use IP_FREEBIND for iscsi-target to address network portal creation\n issues with systemd (dax)\n - Allow PERSISTENT RESERVE IN for non-reservation holder (marco)\n - Fix iblock se_dev_attrib.unmap_granularity (marco)\n - Fix unsupported WRITE_SAME sense payload handling (martin)\n - Add workaround for zero-length control CDB handling (nab)\n - Fix discovery with INADDR_ANY and IN6ADDR_ANY_INIT (nab)\n - Fix target_submit_cmd() exception handling (nab)\n - Return correct ASC for unimplemented VPD pages (roland)\n - Don\u0027t zero pages used for data buffers (roland)\n - Fix return code of core_tpg_.*_lun (sebastian)\n\n* \u00273.3-rc-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (26 commits)\n target: Fix unsupported WRITE_SAME sense payload\n iscsi: use IP_FREEBIND socket option\n iblock: fix handling of large requests\n target: handle empty string writes in sysfs\n iscsi_target: in_aton needs linux/inet.h\n target: Fix iblock se_dev_attrib.unmap_granularity\n target: Fix target_submit_cmd() exception handling\n target: Change target_submit_cmd() to return void\n target: accept REQUEST_SENSE with 18bytes\n target: Fail INQUIRY commands with EVPD\u003d\u003d0 but PAGE CODE!\u003d0\n target: Return correct ASC for unimplemented VPD pages\n iscsi-target: Fix discovery with INADDR_ANY and IN6ADDR_ANY_INIT\n target: Allow control CDBs with data \u003e 1 page\n iscsi-target: Fix up a few assignments\n iscsi-target: make one-bit bitfields unsigned\n iscsi-target: Fix double list_add with iscsit_alloc_buffs reject\n iscsi-target: Fix reject release handling in iscsit_free_cmd()\n target: fix return code of core_tpg_.*_lun\n target: use save/restore lock primitive in core_dec_lacl_count()\n target: avoid multiple outputs in scsi_dump_inquiry()\n ...\n" }, { "commit": "4d39aa1b998fffd481517c1dd03d83c38e1706f9", "tree": "76c4e4cf52b148ae035f71c7c30692b6634cd343", "parents": [ "4a68d54c983514f123e99fc720951a4ee4d84270", "db91ff55bdf06736b849afc1b1fce5763bbb8d5d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 08 19:06:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 08 19:06:30 2012 -0800" }, "message": "Merge tag \u0027md-3.3-fixes\u0027 of git://neil.brown.name/md\n\nSome simple md-related fixes.\n\n1/ two small fixes to ensure we handle an interrupted resync properly.\n2/ avoid loading the bitmap multiple times in dm-raid\n\n* tag \u0027md-3.3-fixes\u0027 of git://neil.brown.name/md:\n md: two small fixes to handling interrupt resync.\n Prevent DM RAID from loading bitmap twice.\n" }, { "commit": "4a68d54c983514f123e99fc720951a4ee4d84270", "tree": "0c7c7fba0a38a65dcd061956eee0cb39c918e98a", "parents": [ "15a463532ed22db55339cda370ddd4cf664ad95d", "c88db233251b026fda775428f0250c760553e216" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 08 19:05:47 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 08 19:05:47 2012 -0800" }, "message": "Merge tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nSPI bug fixes for v3.3-rc2\n\nMinor SPI device driver changes. A rename of the pch_spi_pcidev symbol\nthat merely eliminates a modpost warning, and a Kconfig change to allow\nthe Samsung spi driver to build on EXYNOS.\n\n* tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driver\n spi: Add spi-s3c64xx driver dependency on ARCH_EXYNOS4\n" }, { "commit": "025e4ab3db07fcbf62c01e4f30d1012234beb980", "tree": "c23464148c67894ad23cd8c3b0c45fb8ad4e3660", "parents": [ "b9980cdcf2524c5fe15d8cbae9c97b3ed6385563" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 08 17:13:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 08 19:03:51 2012 -0800" }, "message": "pcmcia: fix socket refcount decrementing on each resume\n\nThis fixes a memory-corrupting bug: not only does it cause the warning,\nbut as a result of dropping the refcount to zero, it causes the\npcmcia_socket0 device structure to be freed while it still has\nreferences, causing slab caches corruption. A fatal oops quickly\nfollows this warning - often even just a \u0027dmesg\u0027 following the warning\ncauses the kernel to oops.\n\nWhile testing suspend/resume on an ARM device with PCMCIA support, and a\nCF card inserted, I found that after five suspend and resumes, the\nkernel would complain, and shortly die after with slab corruption.\n\n WARNING: at include/linux/kref.h:41 kobject_get+0x28/0x50()\n\nAs the message doesn\u0027t give a clue about which kobject, and the built-in\ndebugging in drivers/base/power/main.c happens too late, this was added\nright before each get_device():\n\n printk(\"%s: %p [%s] %u\\n\", __func__, dev, kobject_name(\u0026dev-\u003ekobj), atomic_read(\u0026dev-\u003ekobj.kref.refcount));\n\nand on the 3rd s2ram cycle, the following behaviour observed:\n\nOn the 3rd suspend/resume cycle:\n\n dpm_prepare: c1a0d998 [pcmcia_socket0] 3\n dpm_suspend: c1a0d998 [pcmcia_socket0] 3\n dpm_suspend_noirq: c1a0d998 [pcmcia_socket0] 3\n dpm_resume_noirq: c1a0d998 [pcmcia_socket0] 3\n dpm_resume: c1a0d998 [pcmcia_socket0] 3\n dpm_complete: c1a0d998 [pcmcia_socket0] 2\n\n4th:\n\n dpm_prepare: c1a0d998 [pcmcia_socket0] 2\n dpm_suspend: c1a0d998 [pcmcia_socket0] 2\n dpm_suspend_noirq: c1a0d998 [pcmcia_socket0] 2\n dpm_resume_noirq: c1a0d998 [pcmcia_socket0] 2\n dpm_resume: c1a0d998 [pcmcia_socket0] 2\n dpm_complete: c1a0d998 [pcmcia_socket0] 1\n\n5th:\n\n dpm_prepare: c1a0d998 [pcmcia_socket0] 1\n dpm_suspend: c1a0d998 [pcmcia_socket0] 1\n dpm_suspend_noirq: c1a0d998 [pcmcia_socket0] 1\n dpm_resume_noirq: c1a0d998 [pcmcia_socket0] 1\n dpm_resume: c1a0d998 [pcmcia_socket0] 1\n dpm_complete: c1a0d998 [pcmcia_socket0] 0\n ------------[ cut here ]------------\n WARNING: at include/linux/kref.h:41 kobject_get+0x28/0x50()\n Modules linked in: ucb1x00_core\n Backtrace:\n [\u003cc0212090\u003e] (dump_backtrace+0x0/0x110) from [\u003cc04799dc\u003e] (dump_stack+0x18/0x1c)\n [\u003cc04799c4\u003e] (dump_stack+0x0/0x1c) from [\u003cc021cba0\u003e] (warn_slowpath_common+0x50/0x68)\n [\u003cc021cb50\u003e] (warn_slowpath_common+0x0/0x68) from [\u003cc021cbdc\u003e] (warn_slowpath_null+0x24/0x28)\n [\u003cc021cbb8\u003e] (warn_slowpath_null+0x0/0x28) from [\u003cc0335374\u003e] (kobject_get+0x28/0x50)\n [\u003cc033534c\u003e] (kobject_get+0x0/0x50) from [\u003cc03804f4\u003e] (get_device+0x1c/0x24)\n [\u003cc0388c90\u003e] (dpm_complete+0x0/0x1a0) from [\u003cc0389cc0\u003e] (dpm_resume_end+0x1c/0x20)\n ...\n\nLooking at commit 7b24e7988263 (\"pcmcia: split up central event handler\"),\nthe following change was made to cs.c:\n\n return 0;\n }\n #endif\n-\n- send_event(skt, CS_EVENT_PM_RESUME, CS_EVENT_PRI_LOW);\n+ if (!(skt-\u003estate \u0026 SOCKET_CARDBUS) \u0026\u0026 (skt-\u003ecallback))\n+ skt-\u003ecallback-\u003eearly_resume(skt);\n return 0;\n }\n\nAnd the corresponding change in ds.c is from:\n\n-static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)\n-{\n- struct pcmcia_socket *s \u003d pcmcia_get_socket(skt);\n...\n- switch (event) {\n...\n- case CS_EVENT_PM_RESUME:\n- if (verify_cis_cache(skt) !\u003d 0) {\n- dev_dbg(\u0026skt-\u003edev, \"cis mismatch - different card\\n\");\n- /* first, remove the card */\n- ds_event(skt, CS_EVENT_CARD_REMOVAL, CS_EVENT_PRI_HIGH);\n- mutex_lock(\u0026s-\u003eops_mutex);\n- destroy_cis_cache(skt);\n- kfree(skt-\u003efake_cis);\n- skt-\u003efake_cis \u003d NULL;\n- s-\u003efunctions \u003d 0;\n- mutex_unlock(\u0026s-\u003eops_mutex);\n- /* now, add the new card */\n- ds_event(skt, CS_EVENT_CARD_INSERTION,\n- CS_EVENT_PRI_LOW);\n- }\n- break;\n...\n- }\n\n- pcmcia_put_socket(s);\n\n- return 0;\n-} /* ds_event */\n\nto:\n\n+static int pcmcia_bus_early_resume(struct pcmcia_socket *skt)\n+{\n+ if (!verify_cis_cache(skt)) {\n+ pcmcia_put_socket(skt);\n+ return 0;\n+ }\n\n+ dev_dbg(\u0026skt-\u003edev, \"cis mismatch - different card\\n\");\n\n+ /* first, remove the card */\n+ pcmcia_bus_remove(skt);\n+ mutex_lock(\u0026skt-\u003eops_mutex);\n+ destroy_cis_cache(skt);\n+ kfree(skt-\u003efake_cis);\n+ skt-\u003efake_cis \u003d NULL;\n+ skt-\u003efunctions \u003d 0;\n+ mutex_unlock(\u0026skt-\u003eops_mutex);\n\n+ /* now, add the new card */\n+ pcmcia_bus_add(skt);\n+ return 0;\n+}\n\nAs can be seen, the original function called pcmcia_get_socket() and\npcmcia_put_socket() around the guts, whereas the replacement code\ncalls pcmcia_put_socket() only in one path. This creates an imbalance\nin the refcounting.\n\nTesting with pcmcia_put_socket() put removed shows that the bug is gone:\n\n dpm_suspend: c1a10998 [pcmcia_socket0] 5\n dpm_suspend_noirq: c1a10998 [pcmcia_socket0] 5\n dpm_resume_noirq: c1a10998 [pcmcia_socket0] 5\n dpm_resume: c1a10998 [pcmcia_socket0] 5\n dpm_complete: c1a10998 [pcmcia_socket0] 5\n\nTested-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nCc: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ec44fd429879f7d4f28021f1a7f9fb0b5f831aab", "tree": "a9663df153dec41ad0805eb82a429780a1952965", "parents": [ "dc9086004b3d5db75997a645b3fe08d9138b7ad0" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Wed Feb 08 17:13:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 08 19:03:51 2012 -0800" }, "message": "drivers/leds/leds-lm3530.c: fix setting pltfm-\u003eals_vmax\n\nIn current code, pltfm-\u003eals_vmin is set to LM3530_ALS_WINDOW_mV and\npltfm-\u003eals_vmax is 0. This does not make sense. I think what we want\nhere is setting pltfm-\u003eals_vmax to LM3530_ALS_WINDOW_mV.\n\nBoth als_vmin and als_vmax local variables will be set to\npltfm-\u003eals_vmin and pltfm-\u003eals_vmax by a few lines latter. Thus also\nremove a redundant assignment for als_vmin and als_vmax in this patch.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nCc: Shreshtha Kumar Sahu \u003cshreshthakumar.sahu@stericsson.com\u003e\nAcked-by: Milo(Woogyom) Kim \u003cmilo.kim@ti.com\u003e\nTested-by: Milo(Woogyom) Kim \u003cmilo.kim@ti.com\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "67435319866f89b55721fc88ca0dbda51629e3d6", "tree": "638d70e7420b478e449e83da757df69f7c7f921e", "parents": [ "203209ef77e4d5f0ee729557b09770bce0c2d251" ], "author": { "name": "Evgeniy Polyakov", "email": "zbr@ioremap.net", "time": "Thu Feb 09 02:44:50 2012 +0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 16:19:06 2012 -0800" }, "message": "staging: pohmelfs: remove drivers/staging/pohmelfs\n\nNew pohmelfs is coming, and it is time to remove deadly old design\nhttps://lkml.org/lkml/2012/2/8/293\n\nSigned-off-by: Evgeniy Polyakov \u003czbr@ioremap.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "64db880e7488a6d31363ad17c4c0590f27fd48e5", "tree": "b3705dea9d64b78f93db5f7bead545e5ee38b2aa", "parents": [ "5ca3b72c5da47d95b83857b768def6172fbc080a", "7a73b08b50b075b114d0f608099e4634f9c73ae7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 08 19:12:12 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 08 19:12:12 2012 -0500" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "936d7de3d736e0737542641269436f4b5968e9ef", "tree": "d83c1f3ce184202d31ade4fe46e78b6b7100e0ae", "parents": [ "a1728800bed3b93b231d99e97c756f622b9991c2" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Feb 07 14:51:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 08 18:26:54 2012 -0500" }, "message": "IPoIB: Stop lying about hard_header_len and use skb-\u003ecb to stash LL addresses\n\nCommit a0417fa3a18a (\"net: Make qdisc_skb_cb upper size bound\nexplicit.\") made it possible for a netdev driver to use skb-\u003ecb\nbetween its header_ops.create method and its .ndo_start_xmit\nmethod. Use this in ipoib_hard_header() to stash away the LL address\n(GID + QPN), instead of the \"ipoib_pseudoheader\" hack. This allows\nIPoIB to stop lying about its hard_header_len, which will let us fix\nthe L2 check for GRO.\n\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "29bb5d4fd3140a7d5d02d858118c74a45f15c296", "tree": "bed72baeafecb0e33e816709c432595804dc711d", "parents": [ "15f51136719699d7204eeeccd66849a4d90ae426" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 15:11:17 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 15:11:17 2012 -0800" }, "message": "driver-core: cpu: fix kobject warning when hotplugging a cpu\n\nDue to the sysdev conversion to struct device, the cpu objects get\nreused when adding a cpu after offlining it, which causes a big warning\nthat the kobject portion is not properly initialized.\n\nSo clear out the object before we register it again, so all is quiet.\n\nReported-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nTested-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "15f51136719699d7204eeeccd66849a4d90ae426", "tree": "f8fdfc59a098dfbe6be4f30999476b58b219d476", "parents": [ "26417d475709adeddf1eedfc05ad5129b3ba7da6" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Tue Feb 07 08:20:37 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 15:07:03 2012 -0800" }, "message": "ACPI: remove duplicated lines of merging problems with acpi_processor_add\n\nThose lines have two copies.\n\nNot sure how it could happen, looks like git problem.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Thomas Renninger \u003ctrenn@suse.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "c8a64268d187b2ace478d2147ce5c79658aca2d2", "tree": "96fd34a5b828b4a181096ea8644c5d8e19e3f4eb", "parents": [ "e7c9bba7999a8e55efb96d4279c025ca587c5ecd" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Feb 08 09:05:42 2012 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 15:04:32 2012 -0800" }, "message": "m32r: relocate drivers back out of 8250 dir\n\nCommit 9bef3d4197379a995fa80f81950bbbf8d32e9e8b\n\n\t\"serial: group all the 8250 related code together\"\n\ninadvertently swept up the m32r driver in the move, because\nit had comments mentioning 8250 registers within it. However\nthese are only there by nature of the driver being based off\nthe 8250 source code -- the hardware itself does not actually\nhave any relation to the original 8250 style UARTs.\n\nReported-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "203209ef77e4d5f0ee729557b09770bce0c2d251", "tree": "21ea12162acfb3aa54e975dd3307f4da96db8e1c", "parents": [ "8c213fa59199f9673d66970d6940fa093186642f" ], "author": { "name": "Anton Vorontsov", "email": "anton.vorontsov@linaro.org", "time": "Tue Feb 07 09:13:27 2012 +0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:15 2012 -0800" }, "message": "staging: android/ram_console: Don\u0027t build on arches w/o ioremap\n\nThis patch fixes UML build:\n\n CC drivers/staging/android/ram_console.o\n drivers/staging/android/ram_console.c: In function\n \u0027ram_console_driver_probe\u0027:\n drivers/staging/android/ram_console.c:358:2: error: implicit declaration\n of function \u0027ioremap\u0027 [-Werror\u003dimplicit-function-declaration]\n cc1: some warnings being treated as errors\n make[3]: *** [drivers/staging/android/ram_console.o] Error 1\n\nSigned-off-by: Anton Vorontsov \u003canton.vorontsov@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "8c213fa59199f9673d66970d6940fa093186642f", "tree": "e7357cf1101a7b1451ab4b5c05245c34ad97436a", "parents": [ "737912e11bf5bd4874acc771d8511a6eab891fc5" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Sun Feb 05 21:12:26 2012 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:15 2012 -0800" }, "message": "staging: r8712u: Use asynchronous firmware loading\n\nIn https://bugs.archlinux.org/task/27996, failure of driver r8712u is\nreported, with a timeout during module loading due to synchronous loading\nof the firmware. The code now uses request_firmware_nowait().\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "737912e11bf5bd4874acc771d8511a6eab891fc5", "tree": "d5af155fa17a25e2ce253e32c47c13408e739fe0", "parents": [ "4c0029f01f4009d6ab149230026c9716bde96283" ], "author": { "name": "Bart Westgeest", "email": "bart@elbrys.com", "time": "Wed Jan 25 13:46:32 2012 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:15 2012 -0800" }, "message": "staging: usbip: fix to prevent potentially using uninitialized spinlock\n\nThe stub_probe function can be called as soon as the stub_driver is\nregistered. This can lead to the busid_table_lock being used before it\nis initialized. Moved calling the init_busid_table function (which\ninitalizes this spinlock) to be called earlier in the init function to\nprevent this from happening.\n\nSigned-off-by: Bart Westgeest \u003cbart@elbrys.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "4c0029f01f4009d6ab149230026c9716bde96283", "tree": "7f1ccd51b502fc311c9b36f6f579b822e16fd436", "parents": [ "44c5435064b5e6182167b40a7f259969dbcaf1b8" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Fri Feb 03 16:05:13 2012 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:15 2012 -0800" }, "message": "staging: r8712u: Fix problem when CONFIG_R8712_AP is set\n\nWhen this driver was upgraded to the vendor 20100831 version in\ncommit 93c55dda092c7 et al,, one listhead initialization was missed.\nThis broke complete operation of the driver whenever AP mode was\nenabled.\n\nThis patch fixes https://bugs.archlinux.org/task/27996.\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nCc: Stable \u003cstable@vger.stable.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "44c5435064b5e6182167b40a7f259969dbcaf1b8", "tree": "c01a542d1d9049b049ab7408aa907c730eafabec", "parents": [ "5a63177a6967698df58c6c93d0db3a3586e0b028" ], "author": { "name": "Omar Ramirez Luna", "email": "omar.ramirez@ti.com", "time": "Mon Jan 30 19:20:18 2012 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:14 2012 -0800" }, "message": "staging: tidspbridge: fix incorrect free to drv_datap\n\nThis structure is still used after it has been freed, since it\nis being allocated in probe, calls to free it have been moved to\nmodule\u0027s remove routine.\n\nThis should fix the follwoing messages when attempting to remove the\nmodule:\n drv_get_first_dev_extension: Failed to retrieve the object handle\n drv_get_first_dev_extension: Failed to retrieve the object handle\n drv_destroy: Failed to store DRV object\n mgr_destroy: Failed to store MGR object\n\nSigned-off-by: Omar Ramirez Luna \u003comar.ramirez@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "5a63177a6967698df58c6c93d0db3a3586e0b028", "tree": "7870b43e0e1b5af040b6487fb85ae451768f9728", "parents": [ "e5d7965f88a3755b2d0c54768a17032ab3a72819" ], "author": { "name": "Omar Ramirez Luna", "email": "omar.ramirez@ti.com", "time": "Mon Jan 30 19:20:17 2012 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:14 2012 -0800" }, "message": "staging: tidspbridge: fix bridge_open memory leaks\n\nThere are two members of pr_ctxt allocated during bridge_open that\nare never freed resulting in memory leaks, these are stream_id and\nnode_id, they are now freed on release of the handle (bridge_release)\nright before freeing pr_ctxt.\n\nError path for bridge_open was also fixed since the same variables\ncould result in memory leaking due to missing handling of failure\nscenarios. While at it, the indentation changes were introduced to\navoid interleaved goto statements inside big if blocks.\n\nSigned-off-by: Omar Ramirez Luna \u003comar.ramirez@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "e5d7965f88a3755b2d0c54768a17032ab3a72819", "tree": "35b617f6bfbdd667edd29eb6387a2d7e430a2c38", "parents": [ "9545f86e3a3b6fac508dd43638d633d1a1567c26" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Fri Jan 13 22:21:25 2012 +0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:14 2012 -0800" }, "message": "staging: android: lowmemorykiller: Don\u0027t wait more than one second for a process to die\n\nIf a process forked and the child process was killed by the\nlowmemorykiller, the lowmemory killer would be disabled until\nthe parent process reaped the child or it died itself.\n\nSigned-off-by: Arve Hjønnevåg \u003carve@android.com\u003e\nSigned-off-by: Anton Vorontsov \u003canton.vorontsov@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "2a4830110b90deb4ee99b1ab8c8ebb120f27c0c8", "tree": "642f3ddca90439ff7fff2b76474319de2525807c", "parents": [ "a9d3c9e3c575ee09c905e07ae7cc1d52e2548d05" ], "author": { "name": "Seth Jennings", "email": "sjenning@linux.vnet.ibm.com", "time": "Fri Dec 30 10:42:15 2011 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:14 2012 -0800" }, "message": "staging: zcache: fix serialization bug in zv stats\n\nIn a multithreaded workload, the zv_curr_dist_counts\nand zv_cumul_dist_counts statistics are being corrupted\nbecause the increments and decrements in zv_create\nand zv_free are not atomic.\n\nThis patch converts these statistics and their corresponding\nincrements/decrements/reads to atomic operations.\n\nSigned-off-by: Seth Jennings \u003csjenning@linux.vnet.ibm.com\u003e\nAcked-by: Dan Magenheimer \u003cdan.magenheimer@oracle.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "a9d3c9e3c575ee09c905e07ae7cc1d52e2548d05", "tree": "3b171886367137840c140faad57f81f1a1acb6e3", "parents": [ "bd1eff9741af27378b241b347041c724bb28e857" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Wed Feb 01 19:04:02 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:14 2012 -0800" }, "message": "staging: fix go7007-usb license\n\nAdd MODULE_LICENSE() for this source module to fix build warning:\n\nWARNING: modpost: missing MODULE_LICENSE() in drivers/staging/media/go7007/go7007-usb.o\nsee include/linux/module.h for more information\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Ross Cohen \u003crcohen@snurgle.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "bd1eff9741af27378b241b347041c724bb28e857", "tree": "47ec1db37ae76c3b8b4b2908cc6a5129191b5089", "parents": [ "b0d017e80e9f4e6b37e699b9a944646e64deb473" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Wed Feb 01 15:29:13 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:13 2012 -0800" }, "message": "Staging: android: binder: Fix crashes when sharing a binder file between processes\n\nOpening the binder driver and sharing the file returned with\nother processes (e.g. by calling fork) can crash the kernel.\nPrevent these crashes with the following changes:\n- Add a mutex to protect against two processes mmapping the\n same binder_proc.\n- After locking mmap_sem, check that the vma we want to access\n (still) points to the same mm_struct.\n- Use proc-\u003etsk instead of current to get the files struct since\n this is where we get the rlimit from.\n\nSigned-off-by: Arve Hjønnevåg \u003carve@android.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "b0d017e80e9f4e6b37e699b9a944646e64deb473", "tree": "378db42861bddf278d5e1f1b1104a0ae26485c64", "parents": [ "3589e74595a4332ebf77b5ed006f3c6686071ecd" ], "author": { "name": "Shuah Khan", "email": "shuahkhan@gmail.com", "time": "Fri Jan 27 11:40:10 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:13 2012 -0800" }, "message": "Staging: android: Remove pmem driver\n\nAddroid pmem driver is no longer used in any of the Android products.\nThis patch removes pmem driver from Android staging area\n\nReference: https://lkml.org/lkml/2012/1/23/183\n\nSigned-off-by: Shuah Khan \u003cshuahkhan@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "3589e74595a4332ebf77b5ed006f3c6686071ecd", "tree": "4f0b9e376fc2fddac45d3ffe7e5c7953f7e5d789", "parents": [ "635032cb397b396241372fa0ff36ae758e658b23" ], "author": { "name": "Pekka Paalanen", "email": "pq@iki.fi", "time": "Sun Jan 22 16:33:47 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:13 2012 -0800" }, "message": "Staging: asus_oled: fix NULL-ptr crash on unloading\n\nAsus_oled triggers the following bug on module unloading:\n\n usbcore: deregistering interface driver asus-oled\n BUG: unable to handle kernel NULL pointer dereference at 0000000000000038\n IP: [\u003cffffffff8111292b\u003e] sysfs_delete_link+0x30/0x66\n\n Call Trace:\n [\u003cffffffff81225373\u003e] device_remove_class_symlinks+0x6b/0x70\n [\u003cffffffff812256a8\u003e] device_del+0x9f/0x1ab\n [\u003cffffffff812257c5\u003e] device_unregister+0x11/0x1e\n [\u003cffffffffa000cb82\u003e] asus_oled_disconnect+0x4f/0x9e [asus_oled]\n [\u003cffffffff81277430\u003e] usb_unbind_interface+0x54/0x103\n [\u003cffffffff812276c4\u003e] __device_release_driver+0xa2/0xeb\n [\u003cffffffff81227794\u003e] driver_detach+0x87/0xad\n [\u003cffffffff812269e9\u003e] bus_remove_driver+0x91/0xc1\n [\u003cffffffff81227fb4\u003e] driver_unregister+0x66/0x6e\n [\u003cffffffff812771ed\u003e] usb_deregister+0xbb/0xc4\n [\u003cffffffffa000ce87\u003e] asus_oled_exit+0x2f/0x31 [asus_oled]\n [\u003cffffffff81068365\u003e] sys_delete_module+0x1b8/0x21b\n [\u003cffffffff810ae3de\u003e] ? do_munmap+0x2ef/0x313\n [\u003cffffffff813699bb\u003e] system_call_fastpath+0x16/0x1b\n\nThis is due to an incorrect destruction sequence in asus_oled_exit().\n\nFix the order, fixes the bug. Tested on an Asus G50V laptop only.\n\nCc: Jakub Schmidtke \u003csjakub@gmail.com\u003e\nSigned-off-by: Pekka Paalanen \u003cpq@iki.fi\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "635032cb397b396241372fa0ff36ae758e658b23", "tree": "923c967080dc10b43b94c09fae3581dd96739bba", "parents": [ "3c1b86f17068cf6476fb2d022b9c8b44dedea2e5" ], "author": { "name": "Pekka Paalanen", "email": "pq@iki.fi", "time": "Sun Jan 22 16:33:46 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:13 2012 -0800" }, "message": "Staging: asus_oled: fix image processing\n\nProgramming an image was broken, because odev-\u003ebuf_offs was not advanced\nfor val \u003d\u003d 0 in append_values(). This regression was introduced in:\n\n commit 1ff12a4aa354bed093a0240d5e6347b1e27601bc\n Author: Kevin A. Granade \u003ckevin.granade@gmail.com\u003e\n Date: Sat Sep 5 01:03:39 2009 -0500\n\n Staging: asus_oled: Cleaned up checkpatch issues.\n\nFix the image processing by special-casing val \u003d\u003d 0.\n\nI have tested this change on an Asus G50V laptop only.\n\nCc: Jakub Schmidtke \u003csjakub@gmail.com\u003e\nCc: Kevin A. Granade \u003ckevin.granade@gmail.com\u003e\nSigned-off-by: Pekka Paalanen \u003cpq@iki.fi\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "3c1b86f17068cf6476fb2d022b9c8b44dedea2e5", "tree": "9288383705799820d62f412a859a2dac99047bd9", "parents": [ "1793bf1deddc8ce25dc41925d5dbe64536c841b6" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Fri Jan 20 19:56:21 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:13 2012 -0800" }, "message": "Staging: android: binder: Don\u0027t call dump_stack in binder_vma_open\n\nIf user-space partially unmaps the driver, binder_vma_open\nwould dump the kernel stack. This is not a kernel bug however\nand will be treated as if the whole area was unmapped once\nbinder_vma_close gets called.\n\nSigned-off-by: Arve Hjønnevåg \u003carve@android.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "1793bf1deddc8ce25dc41925d5dbe64536c841b6", "tree": "047e129d0e4ec445da0a080d8aa4a00c15cbd5c3", "parents": [ "e8b4553457e78bcff90f70a31212a40a8fd4f0db" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Sat Jan 07 10:07:03 2012 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:12 2012 -0800" }, "message": "staging: r8712u: Add new Sitecom UsB ID\n\nAdd USB ID for SITECOM WLA-1000 V1 001 WLAN\n\nReported-and-tested-by: Roland Gruber \u003cpost@rolandgruber.de\u003e\nReported-and-tested-by: Dario Lucia \u003cdario.lucia@gmail.com\u003e\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nCc: Stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "e8b4553457e78bcff90f70a31212a40a8fd4f0db", "tree": "45b487b66aff49bd3c14b1d25866b0a6c519ae3c", "parents": [ "9256a4789be3dae37d00924c03546ba7958ea5a3" ], "author": { "name": "Dan Magenheimer", "email": "dan.magenheimer@oracle.com", "time": "Mon Jan 23 16:52:20 2012 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:12 2012 -0800" }, "message": "zcache: Set SWIZ_BITS to 8 to reduce tmem bucket lock contention.\n\nSWIZ_BITS \u003e 8 results in a much larger number of \"tmem_obj\"\nallocations, likely one per page-placed-in-frontswap. The\ntmem_obj is not huge (roughly 100 bytes), but it is large\nenough to add a not-insignificant memory overhead to zcache.\n\nThe SWIZ_BITS\u003d8 will get roughly the same lock contention\nwithout the space wastage.\n\nThe effect of SWIZ_BITS can be thought of as \"2^SWIZ_BITS is\nthe number of unique oids that be generated\" (This concept is\nlimited to frontswap\u0027s use of tmem).\n\nAcked-by: Seth Jennings \u003csjenning@linux.vnet.ibm.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "9256a4789be3dae37d00924c03546ba7958ea5a3", "tree": "b93a1f8cc641f11fc5da043f8ffb48a40666d84d", "parents": [ "c5b1247bd1c3ab6722acfa95213be9a16bfb664c" ], "author": { "name": "Dan Magenheimer", "email": "dan.magenheimer@oracle.com", "time": "Wed Jan 25 14:32:51 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:12 2012 -0800" }, "message": "zcache: fix deadlock condition\n\nI discovered this deadlock condition awhile ago working on RAMster\nbut it affects zcache as well. The list spinlock must be\nlocked prior to the page spinlock and released after. As\na result, the page copy must also be done while the locks are held.\n\nApplies to 3.2. Konrad, please push (via GregKH?)...\nthis is definitely a bug fix so need not be pushed during\na -rc0 window.\n\nSigned-off-by: Dan Magenheimer \u003cdan.magenheimer@oracle.com\u003e\nAcked-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "c5b1247bd1c3ab6722acfa95213be9a16bfb664c", "tree": "3ef9b02ee38d547cf00a7400186deee87e117214", "parents": [ "a9e8d70c1ac6c9ccf6852c91e082e28249564e6e" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Wed Jan 18 18:33:02 2012 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:12 2012 -0800" }, "message": "staging: drm/omap: fix locking issue\n\nThe create/free mmap offset code must be synchronized. Yet only some\ncallers of omap_gem_mmap_offset() held struct_mutex. Leading to various\ncrashes around drm_mm_insert_helper_range(). (In the free-object path,\nwhich is currently the only place we drm_gem_free_mmap_offset(),\nstruct_mutex is already held.)\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "a9e8d70c1ac6c9ccf6852c91e082e28249564e6e", "tree": "f3665e0f3bb9af917bb3d2508efe8f481966c553", "parents": [ "6b8ca4cf53e04f377944228b66ddc7d5d593e705" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Mon Jan 09 08:51:03 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:12 2012 -0800" }, "message": "drivers/staging/omapdrm/omap_fbdev.c: move free after uses\n\nMove the free after the final uses.\n\nThe semantic patch that makes this report is available\nin scripts/coccinelle/free/kfree.cocci.\n\nMore information about semantic patching is available at\nhttp://coccinelle.lip6.fr/\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "6b8ca4cf53e04f377944228b66ddc7d5d593e705", "tree": "9bf02ea019ed80036382f3421f862322f6ba3200", "parents": [ "2f53700df17bf52332056c1e85b23bcf64c77e57" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Sun Jan 08 19:37:37 2012 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:12 2012 -0800" }, "message": "staging: drm/omap: fix minimum width/height\n\nFix minimum width/height so planes could be used to implement\nhw mouse cursor.\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "2f53700df17bf52332056c1e85b23bcf64c77e57", "tree": "9c87832f29fb0129cb803a79359ca48c8d546847", "parents": [ "9a0774e0991c82a95ef5e5848b318bd15aba0dcd" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Mon Jan 16 12:51:18 2012 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:11 2012 -0800" }, "message": "staging: drm/omap: updates for DSS fifomerge API changes\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "9a0774e0991c82a95ef5e5848b318bd15aba0dcd", "tree": "4dc77726aefdda5dd3c48eaf1f026d92322f9276", "parents": [ "bb5c2d9aaaa26a55e684c175c431df95aa178233" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Mon Jan 16 12:51:17 2012 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:11 2012 -0800" }, "message": "staging: drm/omap: multiplanar and YUV support\n\nAdd support in framebuffer objects for other color formats and multi-\nplanar YUV (NV12). Since this requires changing the API between the\nplane and fb for getting scanout information (paddr, etc), take\nadvantage of the opportunity and put in place a way to allow fb\u0027s to\nbe unpinned when they are not being scanned out. Now, before start\nof scanout the plane calls omap_framebuffer_pin() which takes care\nto pin all the backing bo\u0027s, then omap_framebuffer_update_scanout()\nhowever many times to update the scanout address(es), etc, and then\nwhen finished omap_framebuffer_unpin().\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "bb5c2d9aaaa26a55e684c175c431df95aa178233", "tree": "4441d1b8c9f04577ff21fa578fa16aad667cc9e6", "parents": [ "ae43d7ca4047b126adedcf7028c1ff99ed18703c" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Mon Jan 16 12:51:16 2012 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:11 2012 -0800" }, "message": "staging: drm/omap: add drm_plane support\n\nBecause framebuffer layer and overlay scanout video pipes are basically\nthing in OMAP display subsystem (the only difference being that the first\nvideo pipe does not support scaling or YUV formats), much of the CRTC\ncode is pulled into the plane implementation, and a private plane object\nis used by the CRTC object. This avoids code duplication between the\nplane and CRTC.\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "ae43d7ca4047b126adedcf7028c1ff99ed18703c", "tree": "b3052ce49c59e91f0400e6afe8c7b924793934b7", "parents": [ "ff4f38765d0e3bcc7d992d07cb27c37adb9b16ba" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Mon Jan 16 12:51:15 2012 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:11 2012 -0800" }, "message": "staging: drm/omap: drm API update: addfb2\n\nUpdate to reflect changes in:\n\"drm: add an fb creation ioctl that takes a pixel format v5\"\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "ff4f38765d0e3bcc7d992d07cb27c37adb9b16ba", "tree": "a12833f20c388183dda8ab1f0f77cd604debc8f2", "parents": [ "b7cdd9e6323af368e26121c5b791eddc78e79fea" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Mon Jan 16 12:51:14 2012 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:11 2012 -0800" }, "message": "staging: drm/omap: drm API update: make fops struct const\n\nUpdate to reflect changes in:\n\"Make the per-driver file_operations struct const\"\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "b7cdd9e6323af368e26121c5b791eddc78e79fea", "tree": "029198d9833036b0a200fe1cc575d6b761be8b11", "parents": [ "62aa2b537c6f5957afd98e29f96897419ed5ebab" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jan 30 14:12:59 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Feb 08 14:14:11 2012 -0800" }, "message": "staging: delete gma500 driver\n\nIt\u0027s now \"properly\" merged into the DRM tree in the kernel, so delete\nthe staging version of the driver as it is far obsolete and broken.\n\nRequested-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "617cf884810b44384fe8e9431e9babeb80a2ff37", "tree": "53efc5b8d73dc556cb027304f596313c06d30749", "parents": [ "e57b6886f555ab57f40a01713304e2053efe51ec" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Feb 08 13:53:38 2012 -0800" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Feb 08 13:54:18 2012 -0800" }, "message": "drm/i915: fixup interlaced bits clearing in PIPECONF on PCH_SPLIT (v2)\n\nAn identical patch has been merged for i9xx_crtc_mode_set:\n\nCommit 59df7b1771c150163e522f33c638096ab0efbf42\nAuthor: Christian Schmidt \u003cschmidt@digadd.de\u003e\nDate: Mon Dec 19 20:03:33 2011 +0100\n\n drm/intel: Fix initialization if startup happens in interlaced mode [v2]\n\nBut that one neglected to fix up the ironlake+ path.\n\nThis should fix the issue reported by Alfonso Fiore where booting with\nonly a HDMI cable connected to his TV failed to display anything. The\nissue is that the bios set up things for 1080i and used the pannel\nfitter to scale up the lower progressive resolutions. We failed to\nclear the interlace bit in the PIPEACONF register, resulting in havoc.\n\nv2: Be more paranoid and just unconditionally clear the field before\nsetting new values.\n\nCc: Peter Ross \u003cpross@xvid.org\u003e\nCc: Alfonso Fiore \u003calfonso.fiore@gmail.com\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "306df0716aa285d378cc948fafed53c6ed895fe6", "tree": "c32e636516980e9f2708022e314f370a13198ecd", "parents": [ "5abebfdd02450fa1349daacf242e70b3736581e3" ], "author": { "name": "Dave Young", "email": "dyoung@redhat.com", "time": "Wed Feb 08 22:07:19 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Feb 08 22:07:19 2012 +0100" }, "message": "loop: zero fill bio instead of return -EIO for partial read\n\ncommit 8268f5a741 (\"deny partial write for loop dev fd\") tried to fix the\nloop device partial read information leak problem. But it changed the\nsemantics of read behavior. When we read beyond the end of the device we\nshould get 0 bytes, which is normal behavior, we should not just return\n-EIO\n\nInstead of returning -EIO, zero out the bio to avoid information leak in\ncase of partail read.\n\nSigned-off-by: Dave Young \u003cdyoung@redhat.com\u003e\nReviewed-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nTested-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Dmitry Monakhov \u003cdmonakhov@sw.ru\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "7a73b08b50b075b114d0f608099e4634f9c73ae7", "tree": "c422dce59ce7fa9a4ebf8f7512bb3879a3b83ed0", "parents": [ "a1728800bed3b93b231d99e97c756f622b9991c2", "e81a7bd55531a77d8c16d44766db4089c2983f1b" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Feb 08 14:53:43 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Feb 08 14:53:43 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "4609dff6b5d11e1ed5ff935e15f9f6022acb312b", "tree": "b1ffb94d7247ad6ba70e8d76800907a6450f7ebd", "parents": [ "3f9a5aabd0a9fe0e0cd308506f48963d79169aa7" ], "author": { "name": "Vivek Goyal", "email": "vgoyal@redhat.com", "time": "Wed Feb 08 20:03:39 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Feb 08 20:03:39 2012 +0100" }, "message": "floppy: Fix a crash during rmmod\n\nfloppy driver does not call add_disk() on all the drives hence we don\u0027t take\ngendisk reference on request queue for these drives. Don\u0027t call put_disk()\nwith disk-\u003equeue set, otherwise we try to put the reference we never took.\n\nReported-and-tested-by: Dirk Gouders \u003cgouders@et.bocholt.fh-gelsenkirchen.de\u003e\nSigned-off-by: Vivek Goyal\u003cvgoyal@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "3f9a5aabd0a9fe0e0cd308506f48963d79169aa7", "tree": "89dd32775e498dcb50da8cfc5388400c637725c5", "parents": [ "cdccaa9467b982d57b139818d15e1e994feca372" ], "author": { "name": "Vivek Goyal", "email": "vgoyal@redhat.com", "time": "Wed Feb 08 20:03:38 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Feb 08 20:03:38 2012 +0100" }, "message": "floppy: Cleanup disk-\u003equeue before caling put_disk() if add_disk() was never called\n\nadd_disk() takes gendisk reference on request queue. If driver failed during\ninitialization and never called add_disk() then that extra reference is not\ntaken. That reference is put in put_disk(). floppy driver allocates the\ndisk, allocates queue, sets disk-\u003equeue and then relizes that floppy\ncontroller is not present. It tries to tear down everything and tries to\nput a reference down in put_disk() which was never taken.\n\nIn such error cases cleanup disk-\u003equeue before calling put_disk() so that\nwe never try to put down a reference which was never taken in first place.\n\nReported-and-tested-by: Suresh Jayaraman \u003csjayaraman@suse.com\u003e\nTested-by: Dirk Gouders \u003cgouders@et.bocholt.fh-gelsenkirchen.de\u003e\nSigned-off-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "cdccaa9467b982d57b139818d15e1e994feca372", "tree": "573e6aa79bce8105b3a2508a462d03368ac5214c", "parents": [ "37b40adf2d1b4a5e51323be73ccf8ddcf3f15dd3" ], "author": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Wed Feb 08 20:03:14 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Feb 08 20:03:14 2012 +0100" }, "message": "cdrom: move shared static to cdrom_device_info\n\nThe keeplocked variable in the cdrom driver is shared across multiple\ndrives, but set in per-device ioctls. Move it to the per-device struct,\navoiding that the setting on one drive affects the driver\u0027s behavior\nwhen closing another.\n\n[ Impact: limit udev\u0027s confusion to one drive when a CD burning program\n unlocks the CD door at the end of burning. ]\n\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "e57b6886f555ab57f40a01713304e2053efe51ec", "tree": "9276fce4dd177abf87ce01b02d364450355257d8", "parents": [ "c898261c0dad617f0f1080bedc02d507a2fcfb92" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Feb 08 16:42:52 2012 +0100" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Feb 08 09:20:49 2012 -0800" }, "message": "drm/i915: no lvds quirk for AOpen MP45\n\nAccording to a bug report, it doesn\u0027t have one.\n\nCc: stable@kernel.org\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d44263\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "98e96852480566333f6dacd3223f0be15df34d60", "tree": "dab2122717f7e371d9e20c0bc3561c501d61c658", "parents": [ "8eef05dd3e70233f3e391774d612dab44c3f023b", "9f1065032ceb7e86c7c9f16bb86518857e88a172" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 15:54:02 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 15:54:02 2012 -0800" }, "message": "Merge tag \u0027fbdev-fixes-for-3.3-1\u0027 of git://github.com/schandinat/linux-2.6\n\nfbdev fixes for 3.3\n\nIt includes:\n - compile fix for fsl-diu-fb\n - fix for a suspend/resume issue in atmel_lcdfb\n - fix for a suspend/resume issue in OMAP\n - workaround for a hardware bug to avoid physical damage in OMAP\n - really trivial dead code removal in intelfb\n\n* tag \u0027fbdev-fixes-for-3.3-1\u0027 of git://github.com/schandinat/linux-2.6:\n atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume\n intelfb: remove some dead code\n drivers/video: compile fixes for fsl-diu-fb.c\n OMAPDSS: HDMI: PHY burnout fix\n OMAP: 4430SDP/Panda: add HDMI HPD gpio\n OMAP: 4430SDP/Panda: setup HDMI GPIO muxes\n OMAPDSS: remove wrong HDMI HPD muxing\n OMAP: 4430SDP/Panda: rename HPD GPIO to CT_CP_HPD\n OMAP: 4430SDP/Panda: use gpio_free_array to free HDMI gpios\n OMAPDSS: use sync versions of pm_runtime_put\n" }, { "commit": "6bd113f1f4a8c0d05c4dbadb300319e0e3526db4", "tree": "f357b1130950d8de320885810eb27fe574f6ebf5", "parents": [ "95025d6b27721ae8bbce592403fdc06e982204c8", "715252d41912941efb791a7b7bad94d2614dc5c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:35:19 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:35:19 2012 -0800" }, "message": "Merge tag \u0027ib-srpt-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\nCleanups and error path fixes for the new SRP (SCSI RDMA protocol) target.\n\n* tag \u0027ib-srpt-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n IB/srpt: Don\u0027t return freed pointer from srpt_alloc_ioctx_ring()\n IB/srpt: Fix ERR_PTR() vs. NULL checking confusion\n IB/srpt: Remove unneeded \u003clinux/version.h\u003e include\n IB/srpt: Use ARRAY_SIZE() instead of open-coding\n IB/srpt: Use DEFINE_SPINLOCK()/LIST_HEAD()\n" }, { "commit": "59c1204d464075fcb5d02e7daa6b23782dd4a088", "tree": "8d35307db2b021ccfe56ab7986daf81927f2dc18", "parents": [ "84f8bf38b9368add916e7c335b6b94a7ae927cb1" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Tue Feb 07 08:20:37 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:31:35 2012 -0800" }, "message": "ACPI: remove duplicated lines of merging problems with acpi_processor_add\n\nThose lines have two copies.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Thomas Renninger \u003ctrenn@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e25c173379d1053f0851fa924cd608fc0b16252f", "tree": "5819d87168530aacef34d3d2fadc45069de901fa", "parents": [ "abaaf3e12c74ef39c8ba185c485f63274264cb0f", "217c8b2b1978aa4a02ce040a99c59ed3b6418fe5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:06:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:06:11 2012 -0800" }, "message": "Merge branch \u0027upstream-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\n* \u0027upstream-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:\n HID: wiimote: fix invalid power_supply_powers call\n HID: wacom: Fix invalid power_supply_powers calls\n HID: hyperv: Properly disconnect the input device\n HID: usbhid: fix dead lock between open and disconect\n" }, { "commit": "abaaf3e12c74ef39c8ba185c485f63274264cb0f", "tree": "72851a2095cadb38473c1460a31942403daa2e4b", "parents": [ "71ea4efe4fc3319ab577be00d1bbcb76d3ffaf63", "2bd05db718cf452fe235c7c08083b2e60f787f3a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:05:49 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:05:49 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:\n mfd: Avoid twl6040-codec PLL reconfiguration when not needed\n mfd: Store twl6040-codec mclk configuration\n" }, { "commit": "e81a7bd55531a77d8c16d44766db4089c2983f1b", "tree": "e494b01ebfca829bc21493d6598f0622a1c3e717", "parents": [ "2e6b411971de727a5bcea4323331fdaa70a81b11" ], "author": { "name": "Tomas Vanek", "email": "Tomas.Vanek@fbl.cz", "time": "Sun Feb 05 15:51:53 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Feb 07 14:43:15 2012 -0500" }, "message": "zd1211rw: firmware needs duration_id set to zero for non-pspoll frames\n\nSome devices (iwl5100) cannot connect to zd1211rw based AP. It appears that\nzd1211 firmware messes up duration_id field if it is not set to zero by driver.\n\nSniffing traffic shows that zd1211 is transmitting frames with duration_id bits\n14 and 15 set and other bits appearing random. Setting duration_id at driver to\nzero results zd1211 outputting sane duration_id. This means that firmware is\nsetting correct values itself and expects duration_id to be zero in first\nplace.\n\nLooking at vendor driver shows that only PSPoll frames have duration_id set by\ndriver, for other frames duration_id left zero.\n\nOriginal bug-report and attached patch at:\n http://sourceforge.net/mailarchive/message.php?msg_id\u003d28759111\n\nReported-by: Tomas Vanek \u003cTomas.Vanek@fbl.cz\u003e\n[modified original patch from bug-report, added check for pspoll frame]\nSigned-off-by: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a1728800bed3b93b231d99e97c756f622b9991c2", "tree": "c891a675653853eea2adafce1c791de08ce7dee7", "parents": [ "fdb37a7f84a58ccad24abffd54ad46d23b763e13" ], "author": { "name": "Atsushi Nemoto", "email": "anemo@mba.ocn.ne.jp", "time": "Mon Feb 06 14:51:03 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 07 13:40:44 2012 -0500" }, "message": "net: enable TC35815 for MIPS again\n\n8\u003c----------------------------------------------------------------------\nFrom: Ralf Roesch \u003cralf.roesch@rw-gmbh.de\u003e\nDate: Wed, 16 Nov 2011 09:33:50 +0100\nSubject: [PATCH] net: enable TC35815 for MIPS again\n\nTX493[8,9] MIPS SoCs support 2 Ethernet channels of type TC35815\nwhich are connected to the internal PCI controller.\nAnd JMR3927 MIPS board has a TC35815 chip on board.\nThese dependencies were lost on movement to drivers/net/ethernet/toshiba.\n\nSigned-off-by: Ralf Roesch \u003cralf.roesch@rw-gmbh.de\u003e\nSigned-off-by: Atsushi Nemoto \u003canemo@mba.ocn.ne.jp\u003e\nCC: stable@vger.kernel.org [3.2+]\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fdb37a7f84a58ccad24abffd54ad46d23b763e13", "tree": "0e9dc5efda48b1eb2430ef9d27e884c5be5305f6", "parents": [ "6d25886ee2fbc05a7bf4dae5f5ae345cb73df2fd" ], "author": { "name": "Yoshihiro Shimoda", "email": "yoshihiro.shimoda.uh@renesas.com", "time": "Mon Feb 06 23:55:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 07 13:37:30 2012 -0500" }, "message": "net: sh_eth: fix skb_over_panic happen\n\nWhen this GETHER controller received a large frame (about 1800 bytes\nor more), skb_over_panic() happened. This is because the previous\ndriver set the RFLR to 0x1000 (4096 bytes) and the skb allocate size\nis smaller than 4096 bytes. So, the controller accepted such a frame.\n\nThe controller can discard a large frame by the RFLR setting.\nSo, the patch modifies the value of RFLR to mtu + ETH_HLEN +\nVLAN_HLEN + ETH_FCS_LEN.\n\nSigned-off-by: Yoshihiro Shimoda \u003cyoshihiro.shimoda.uh@renesas.com\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3f61cd879c2f112c468e8849949b6fc88c739679", "tree": "85bbd91351b97c20623dc65a0b5afe64720ae090", "parents": [ "da0912868527913eba15f5ebcfb420b32a037f1a" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Mon Feb 06 11:28:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 07 13:13:33 2012 -0500" }, "message": "bnx2x: Fix mem leak in bnx2x_tpa_stop() if build_skb() fails.\n\nWe allocate memory for \u0027new_data\u0027 with kmalloc(). If we get the memory\nwe then try to build_skb() and if that should fail (which it can) we\ndo not enter \u0027if (likely(skb)) {\u0027 and actually use \u0027new_data\u0027 but\ninstead fall through to the \u0027drop:\u0027 label and end up returning from\nthe function without ever assigning \u0027new\u0027data\u0027 to anything or freeing\nit. That leaks the memory allocated to \u0027new_data\u0027.\n\nThis patch fixes the memory leak by doing a kfree(new_data) in the\ncase where build_skb() fails (or where allocation of \u0027new_data\u0027 itself\nfails, but in taht case it\u0027s just a harmless kfree(NULL)).\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "da0912868527913eba15f5ebcfb420b32a037f1a", "tree": "4dde11f33b214f1d9c3e61a48a25964682ce328f", "parents": [ "aadf1f0fc851d71095d2773bcda73e1423e6b730" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Sat Feb 04 20:31:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 07 13:06:14 2012 -0500" }, "message": "CONFIG_TR/CONFIG_LLC: work around the problem with select\n\nAs it is, with PCI/ISA/MCA/CCW all set to n and PCMCIA set to m\nsetting TR to y will set LLC to m, with very unpleasant results -\nnet/802/psnap gets picked into obj-y, resulting in the kernel\nthat won\u0027t link - psnap calls functions from llc. The cause,\nAFAICS, is that kconfig gets rev_dep for LLC containing\n|| TR \u0026\u0026 (deps for TR)\nand even though TR is boolean, both LLC and PCMCIA are tristate\nand that thing becomes || y \u0026\u0026 (n || m), i.e. || m. The reason\nfor dependency on PCMCIA is that when none of PCI, ISA, MCA, CCW\nor PCMCIA is set there\u0027ll be no tokenring drivers, so there\u0027s no\npoint building tokenring core. Proper fix probably belongs in\nkconfig (we need strict and, such that y \u003cstrict_and\u003e m would be\ny, so that rev_deps added for tristate selected by bool would\nuse that instead of \u0026\u0026; we\u0027d have || TR \u003cstrict_and\u003e (deps for TR)\nin this case), but it\u0027s a rather intrusive change. There\u0027s an\neasy workaround in case of TR -\u003e LLC select, namely to have a def_bool y\nsymbol sitting under if TR and have that symbol selecting LLC.\nKudos to johill for suggesting that one...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aadf1f0fc851d71095d2773bcda73e1423e6b730", "tree": "01b6b0fa1c24673683a05f95749c7ce42ab12279", "parents": [ "7e2eb99cc6207e4464f018f72c67c55f2b1c93a4" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Feb 06 15:04:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 07 12:51:10 2012 -0500" }, "message": "Revert \"skge: check for PCI dma mapping errors\"\n\nAs reported by several people...\n\nThe code in rx_clean was panic\u0027ing so revert\ncommit d0249e44432aa0ffcf710b64449b8eaa3722547e.\nWill redo DMA mapping checks as new patches for a later release.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "217c8b2b1978aa4a02ce040a99c59ed3b6418fe5", "tree": "8577b6f95ee1fd924e19831528a8a1f929d7066a", "parents": [ "d7cb3dbd10c09081fafd05fcbef590ce04e402ff" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Feb 07 13:40:56 2012 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Feb 07 13:40:56 2012 +0100" }, "message": "HID: wiimote: fix invalid power_supply_powers call\n\nAnalogically to d7cb3dbd1 (\"HID: wacom: Fix invalid power_supply_powers\ncalls\"), fix also the same occurence in wiimote driver.\n\nReported-by: przemo@firszt.eu\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "4e8670e26135d8fbfd5e084fddc1a8ed9f8eb4cb", "tree": "021fb58db4c30af36a8ee47ab0c41a5fe020ab12", "parents": [ "11a3122f6cf2d988a77eb8883d0fc49cd013a6d5" ], "author": { "name": "Asai Thambi S P", "email": "asamymuthupa@micron.com", "time": "Tue Feb 07 07:54:31 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Feb 07 07:54:31 2012 +0100" }, "message": "mtip32xx: removed the irrelevant argument of mtip_hw_submit_io() and the unused member of struct driver_data\n\nRemoved the following:\n\t* irrelevant argument \u0027barrier\u0027 of mtip_hw_submit_io()\n\t* unused member \u0027eh_active\u0027 of struct driver_data\n\nSigned-off-by: Asai Thambi S P \u003casamymuthupa@micron.com\u003e\nSigned-off-by: Sam Bradshaw \u003csbradshaw@micron.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "67236c44741e250199ccd77f1115568e68cf8848", "tree": "4b09d2017a0122984b694e167aeaff2afcc931e0", "parents": [ "9f9ef6d3c08319defc29e4cf6ef2868d15ed0cc3" ], "author": { "name": "Martin Svec", "email": "martin.svec@zoner.cz", "time": "Mon Feb 06 22:13:25 2012 -0800" }, "committer": { "name": "Nicholas Bellinger", "email": "nab@linux-iscsi.org", "time": "Tue Feb 07 06:48:58 2012 +0000" }, "message": "target: Fix unsupported WRITE_SAME sense payload\n\nThis patch fixes a bug in target-core where unsupported WRITE_SAME ops\nfrom a target_check_write_same_discard() failure was incorrectly\nreturning CHECK_CONDITION w/ TCM_INVALID_CDB_FIELD sense data.\nThis was causing some clients to not properly fall back, so go ahead\nand use the correct TCM_UNSUPPORTED_SCSI_OPCODE sense for this case.\n\nReported-by: Martin Svec \u003cmartin.svec@zoner.cz\u003e\nSigned-off-by: Nicholas Bellinger \u003cnab@linux-iscsi.org\u003e\n" }, { "commit": "9f9ef6d3c08319defc29e4cf6ef2868d15ed0cc3", "tree": "dab36bf875ce037be9fc59b7fab101dce192d188", "parents": [ "5c55125f4794f4e77574fc09839cb47b0eb45b06" ], "author": { "name": "Dax Kelson", "email": "dkelson@gurulabs.com", "time": "Fri Feb 03 23:40:25 2012 -0700" }, "committer": { "name": "Nicholas Bellinger", "email": "nab@linux-iscsi.org", "time": "Tue Feb 07 06:48:53 2012 +0000" }, "message": "iscsi: use IP_FREEBIND socket option\n\nUse IP_FREEBIND socket option so that iscsi portal configuration with\nexplicit IP addresses can happen during boot, before network interfaces\nhave been assigned IPs.\n\nThis is especially important on systemd based Linux boxes where system\nboot happens asynchronously and non-trivial configuration must be done\nto get targetcli.service to start synchronously after the network is\nconfigured.\n\nReference:\nhttp://lists.fedoraproject.org/pipermail/devel/2011-October/158025.html\n\nSigned-off-by: Dax Kelson \u003cdkelson@gurulabs.com\u003e\nCc: \"Nicholas A. Bellinger\" \u003cnab@linux-iscsi.org\u003e\nCc: \"Andy Grover\" \u003cagrover@redhat.com\u003e\nCc: \"Lennart Poettering\" \u003clennart@poettering.net\u003e\nSigned-off-by: Nicholas Bellinger \u003cnab@linux-iscsi.org\u003e\n" } ], "next": "5c55125f4794f4e77574fc09839cb47b0eb45b06" }