)]}' { "log": [ { "commit": "eaa02f751ff4f8abfc2e55a15c20a5a274244418", "tree": "c521e84176e140acdc03926683b525250ceee777", "parents": [ "853c6cac0dc0d9d330deb5b48c19eebafaed1841" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Mon Apr 11 16:13:41 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:05 2011 -0400" }, "message": "mmc: core: Rename erase_timeout to cmd_timeout_ms.\n\nRenames erase_timeout to cmd_timeout_ms inside struct mmc_command.\nFirst step to making host honor timeouts for non-data-transfer\ncommands. Cleans up erase timeout code.\n\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "32780cd1350e651e68bdf33b7f5b009d21d5b794", "tree": "e8e86350a3eca20cca098b488e596d2b76ecaea8", "parents": [ "f317dfeb86c83d03304a74ce5426a69422b79547" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Mon Apr 11 17:02:15 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:00:54 2011 -0400" }, "message": "mmc: quirks: Extends card quirks with MMC/SD quirks matching the CID.\n\nThe current mechanism is SDIO-only. This allows us to create\nfunction-specific quirks, without creating messy Kconfig dependencies,\nor polluting core/ with function-specific code.\n\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "f317dfeb86c83d03304a74ce5426a69422b79547", "tree": "c5f313b1afcc4318c7d86dd243fb8867b01ffb05", "parents": [ "b177bc9188c04e140e5d8928e88623a92ba751bf" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Mon Apr 11 06:11:29 2011 +0200" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:00:50 2011 -0400" }, "message": "mmc: core: fix memory leak in mmc_add_host\n\nled_trigger_register_simple() allocates memory which must not be leaked\nin the error-path of mmc_add_host. Move it past the only error-check in\nthe function.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "b177bc9188c04e140e5d8928e88623a92ba751bf", "tree": "20dbad913f51c246c38165d6fd9cb128fb365ab5", "parents": [ "14e7dc76f24577694f1c121e6ce1fd2f3d46c726" ], "author": { "name": "Ameya Palande", "email": "2ameya@gmail.com", "time": "Tue Apr 05 21:13:13 2011 +0300" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:00:41 2011 -0400" }, "message": "mmc: sdhci-pci: Fix checkpatch.pl errors\n\nThis patch fixes 21 errors and 6 warnings reported by checkpatch.pl.\n\nSigned-off-by: Ameya Palande \u003c2ameya@gmail.com\u003e\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "14e7dc76f24577694f1c121e6ce1fd2f3d46c726", "tree": "b16d3dbc8f7d0858b9df6490863892f70dd21dcb", "parents": [ "2059a02dcb84236f9db9197fa9b00418d7b8465b" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Apr 05 18:02:26 2011 +0300" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:00:05 2011 -0400" }, "message": "mmc: quirks: wl1271 is MMC_QUIRK_DISABLE_CD\n\nThe wl12xx device supports disconnecting the pull-up resistor on\nCD/DAT[3] (pin 1) of the card.\n\nTell SDIO core to disconnect that resistor during card init,\nsince we don\u0027t need it at that point (and anyway all\nhosts shall provide pull-up resistors on all data lines DAT[3:0]\nas described in section 6 of the SD physical specification).\n\nAs a result, this may save some power, but it\u0027s also generally healthy\nsince it prevents both ends from pulling up that pin, which\nresults in undesirable asymmetric physical bus.\n\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "2059a02dcb84236f9db9197fa9b00418d7b8465b", "tree": "d51b9fe1b70a7e3e7d5c24912637d22a04bf35b5", "parents": [ "0b4043d70af5871908864fa725821bc8e667542d" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Apr 05 18:02:25 2011 +0300" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:00:01 2011 -0400" }, "message": "mmc: add MMC_QUIRK_DISABLE_CD\n\n006ebd5d introduced sdio_disable_cd(), which disconnects the pull-up\nresistor on CD/DAT[3] (pin 1) of the card.\n\nMake it possible to start using sdio_disable_cd() by introducing\nMMC_QUIRK_DISABLE_CD.\n\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "0b4043d70af5871908864fa725821bc8e667542d", "tree": "665b1a5337f4cc137d5b57a0e2c8bb7323cc522f", "parents": [ "eab4068795d670b065164096805cbf15a19e9690" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Apr 05 17:50:15 2011 +0300" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:56 2011 -0400" }, "message": "mmc: quirks: wl1271 is MMC_QUIRK_NONSTD_FUNC_IF\n\nTell SDIO core to ignore the standard SDIO function interface\ncodes indicated by the wl1271. This is required because the\nwl1271 erroneously indicates its first function as a standard\nBluetooth SDIO interface, and that drives btsdio mad.\n\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "eab4068795d670b065164096805cbf15a19e9690", "tree": "5fb62e0a18163fe2c46044cb23c276a9dad64477", "parents": [ "6b93d01fe5971951911a070f51f412d50e9536dc" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Apr 05 17:50:14 2011 +0300" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:52 2011 -0400" }, "message": "mmc: add MMC_QUIRK_NONSTD_FUNC_IF\n\nIntroduce MMC_QUIRK_NONSTD_FUNC_IF to ignore the \"SDIO Standard Function\ninterface code\" as indicated by the card\u0027s FBR, and instead treat all\nfunctions as non-standard interfaces.\n\nThis is required to prevent standard drivers from facing\nerrors when trying to communicate with SDIO cards that erroneously\nindicate standard function interface codes.\n\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "6b93d01fe5971951911a070f51f412d50e9536dc", "tree": "0e0221f3af9f954bd60e469f94810730899ee374", "parents": [ "a5e9425d2010978c5f85986cc70a9fa0c0d5b912" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Apr 05 17:43:21 2011 +0300" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:47 2011 -0400" }, "message": "mmc: do not switch to 1-bit mode if not required\n\n6b5eda36 followed SDIO spec part E1 section 8, which states that\nin case SDIO interrupts are being used to wake up a suspended host,\nthen it is required to switch to 1-bit mode before stopping the clock.\n\nBefore switching to 1-bit mode (or back to 4-bit mode on resume),\nmake sure that SDIO interrupts are really being used to wake the host.\n\nThis is helpful for devices which have an external irq line (e.g.\nwl1271), and do not use SDIO interrupts to wake up the host.\n\nIn this case, switching to 1-bit mode (and back to 4-bit mode on resume)\nis not necessary.\n\nReported-by: Eliad Peller \u003celiad@wizery.com\u003e\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "a5e9425d2010978c5f85986cc70a9fa0c0d5b912", "tree": "2d58d5b79f3e0b2fe30edbb5fc1b6808b7576d81", "parents": [ "f4c5522b0a8827f39f83f928961d87e081bfe71c" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Apr 05 17:43:20 2011 +0300" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:43 2011 -0400" }, "message": "mmc: mmc_card_keep_power cleanups\n\nmmc_card_is_powered_resumed is a mouthful; instead, simply use\nmmc_card_keep_power, which also better explains the purpose of\nthe macro.\n\nEmploy mmc_card_keep_power() where possible.\n\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "f4c5522b0a8827f39f83f928961d87e081bfe71c", "tree": "3c2126f0adb2a3444b2fd152cc1a880c192c9d77", "parents": [ "766a6bf6e987ff5f5085c614b5a62a55006b6a7e" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Thu Mar 31 18:40:00 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:38 2011 -0400" }, "message": "mmc: Reliable write support.\n\nAllows reliable writes to be used for MMC writes. Reliable writes are used\nto service write REQ_FUA/REQ_META requests. Handles both the legacy and\nthe enhanced reliable write support in MMC cards.\n\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nReviewed-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "766a6bf6e987ff5f5085c614b5a62a55006b6a7e", "tree": "dd213ed5cbd1210e5ad029ab73a6698c7749c03a", "parents": [ "c7f409e39e65cb007304da718b0a7b25a0144a0a" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Thu Mar 31 09:31:19 2011 +0800" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:34 2011 -0400" }, "message": "mmc: sdhci: change CONFIG of MMC_SDHCI_TEGRA from \u0027tristate\u0027 to \u0027bool\u0027\n\nThis config option is used to decide whether tegra sdhci support\nshould be build into the sdhci-platform module. So setting it \u0027m\u0027\nis nonsense, since we can\u0027t build part of an module as a module.\nThe effect for \u0027m\u0027 will probably be the same as for \u0027n\u0027.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "c7f409e39e65cb007304da718b0a7b25a0144a0a", "tree": "f835f6e38b48e8ea5fad8c18be03071cf833c599", "parents": [ "0b38c4ebf037290eef27b31bdc37cacf804c7a48" ], "author": { "name": "Venkat Rao", "email": "vrao@broadcom.com", "time": "Fri Mar 25 20:37:47 2011 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:30 2011 -0400" }, "message": "mmc: tegra: add pm_flags\n\nEnable fast bcm4329 WIFI suspend/resume on Tegra2 board.\n\nThis patch allows the mach-tegra support to tell the tegra MMC host\ncontroller to NOT turn off power for the MMC controller the WIFI part\nlives behind. Thus bcm4329 firmware doesn\u0027t need to be reloaded.\n\nSigned-off-by: Venkat Rao \u003cvrao@broadcom.com\u003e\nTested-by: Grant Grundler \u003cgrundler@chromium.org\u003e\nReviewed-by: Olof Johansson \u003colof@lixom.net\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "0b38c4ebf037290eef27b31bdc37cacf804c7a48", "tree": "97a947537da85f161b2862d2d26221402d637194", "parents": [ "41e2a4893566ced3c46af15df5b727326881e47d" ], "author": { "name": "John Ogness", "email": "john.ogness@linutronix.de", "time": "Fri Mar 25 09:47:37 2011 +0100" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:17 2011 -0400" }, "message": "mmc: remove redundant irq disabling\n\nThere is no need to disable irq\u0027s when using the sg_copy_*_buffer()\nfunctions because those functions do that already. There are also\nno races for the mm_queue struct here that would require the irq\u0027s\nto be disabled before calling sg_copy_*_buffer().\n\nSigned-off-by: John Ogness \u003cjohn.ogness@linutronix.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "41e2a4893566ced3c46af15df5b727326881e47d", "tree": "62263d47bf1f034857e8138095af724aa61c53bb", "parents": [ "7c21738efd0b5e8c2a9ac2440e7ffbf432d6f239" ], "author": { "name": "Philip Rakity", "email": "prakity@marvell.com", "time": "Sat Mar 19 14:10:33 2011 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 20:59:13 2011 -0400" }, "message": "mmc: Ensure linux starts in eMMC user partition\n\nuBoot sometimes leaves eMMC pointing to the private boot partition.\nEnsure we always start looking at the user partition.\n\nSigned-off-by: Philip Rakity \u003cprakity@marvell.com\u003e\nSigned-off-by: Bruce Clemens \u003cbpclemens@marvell.com\u003e\nSigned-off-by: Mark F. Brown \u003cmarkb@marvell.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "7c21738efd0b5e8c2a9ac2440e7ffbf432d6f239", "tree": "d65f02ae98b229604e04df9984632272686cef9a", "parents": [ "eed631e0d741d1a1067cfc6d709fdf2363126f9c", "752d2635ebb12b6122ba05775f7d1ccfef14b275" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 16 08:47:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 16 08:47:31 2011 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm: Take lock around probes for drm_fb_helper_hotplug_event\n drm/i915: Revert i915.semaphore\u003d1 default from 47ae63e0\n vga_switcheroo: don\u0027t toggle-switch devices\n drm/radeon/kms: add some evergreen/ni safe regs\n drm/radeon/kms: fix extended lvds info parsing\n drm/radeon/kms: fix tiling reg on fusion\n" }, { "commit": "752d2635ebb12b6122ba05775f7d1ccfef14b275", "tree": "787f76b453e15a03e7db938eaace598dc36273eb", "parents": [ "8eea1be174a1ea4b86323167bbadc8a6abdca613" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Apr 22 11:03:57 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 16 12:01:43 2011 +1000" }, "message": "drm: Take lock around probes for drm_fb_helper_hotplug_event\n\nWe need to hold the dev-\u003emode_config.mutex whilst detecting the output\nstatus. But we also need to drop it for the call into\ndrm_fb_helper_single_fb_probe(), which indirectly acquires the lock when\nattaching the fbcon.\n\nFailure to do so exposes a race with normal output probing. Detected by\nadding some warnings that the mutex is held to the backend detect routines:\n\n[ 17.772456] WARNING: at drivers/gpu/drm/i915/intel_crt.c:471 intel_crt_detect+0x3e/0x373 [i915]()\n[ 17.772458] Hardware name: Latitude E6400\n[ 17.772460] Modules linked in: ....\n[ 17.772582] Pid: 11, comm: kworker/0:1 Tainted: G W 2.6.38.4-custom.2 #8\n[ 17.772584] Call Trace:\n[ 17.772591] [\u003cffffffff81046af5\u003e] ? warn_slowpath_common+0x78/0x8c\n[ 17.772603] [\u003cffffffffa03f3e5c\u003e] ? intel_crt_detect+0x3e/0x373 [i915]\n[ 17.772612] [\u003cffffffffa0355d49\u003e] ? drm_helper_probe_single_connector_modes+0xbf/0x2af [drm_kms_helper]\n[ 17.772619] [\u003cffffffffa03534d5\u003e] ? drm_fb_helper_probe_connector_modes+0x39/0x4d [drm_kms_helper]\n[ 17.772625] [\u003cffffffffa0354760\u003e] ? drm_fb_helper_hotplug_event+0xa5/0xc3 [drm_kms_helper]\n[ 17.772633] [\u003cffffffffa035577f\u003e] ? output_poll_execute+0x146/0x17c [drm_kms_helper]\n[ 17.772638] [\u003cffffffff81193c01\u003e] ? cfq_init_queue+0x247/0x345\n[ 17.772644] [\u003cffffffffa0355639\u003e] ? output_poll_execute+0x0/0x17c [drm_kms_helper]\n[ 17.772648] [\u003cffffffff8105b540\u003e] ? process_one_work+0x193/0x28e\n[ 17.772652] [\u003cffffffff8105c6bc\u003e] ? worker_thread+0xef/0x172\n[ 17.772655] [\u003cffffffff8105c5cd\u003e] ? worker_thread+0x0/0x172\n[ 17.772658] [\u003cffffffff8105c5cd\u003e] ? worker_thread+0x0/0x172\n[ 17.772663] [\u003cffffffff8105f767\u003e] ? kthread+0x7a/0x82\n[ 17.772668] [\u003cffffffff8100a724\u003e] ? kernel_thread_helper+0x4/0x10\n[ 17.772671] [\u003cffffffff8105f6ed\u003e] ? kthread+0x0/0x82\n[ 17.772674] [\u003cffffffff8100a720\u003e] ? kernel_thread_helper+0x0/0x10\n\nReported-by: Frederik Himpe \u003cfhimpe@telenet.be\u003e\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d36394\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8eea1be174a1ea4b86323167bbadc8a6abdca613", "tree": "3d1c9a591c7b905b73dc33d272bfc9f239d1d75e", "parents": [ "a67b8887ced9d54cab7759bdb19deafed37481eb" ], "author": { "name": "Andy Lutomirski", "email": "luto@mit.edu", "time": "Fri May 13 12:14:54 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 16 09:15:37 2011 +1000" }, "message": "drm/i915: Revert i915.semaphore\u003d1 default from 47ae63e0\n\nMy Q67 / i7-2600 box has rev09 Sandy Bridge graphics. It hangs\ninstantly when GNOME loads and it hangs so hard the reset button\ndoesn\u0027t work. Setting i915.semaphore\u003d0 fixes it.\n\nSemaphores were disabled in a1656b9090f7008d2941c314f5a64724bea2ae37\nin 2.6.38 and were re-enabled by\n\ncommit 47ae63e0c2e5fdb582d471dc906eb29be94c732f\nMerge: c59a333 467cffb\nAuthor: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nDate: Mon Mar 7 12:32:44 2011 +0000\n\n Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n\n Apply the trivial conflicting regression fixes, but keep GPU semaphores\n enabled.\n\n Conflicts:\n drivers/gpu/drm/i915/i915_drv.h\n drivers/gpu/drm/i915/i915_gem_execbuffer.c\n\n(It\u0027s worth noting that the offending change is i915_drv.c,\n which is not a conflict.)\n\nSigned-off-by: Andy Lutomirski \u003cluto@mit.edu\u003e\nAcked-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a67b8887ced9d54cab7759bdb19deafed37481eb", "tree": "87ad4a1f9f2b5fd48d820949c827fea7264fa885", "parents": [ "3a8ab79eae4500e6ac618a92a90cee63d6e804a8" ], "author": { "name": "Florian Mickler", "email": "florian@mickler.org", "time": "Sun May 15 16:32:50 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 16 08:57:04 2011 +1000" }, "message": "vga_switcheroo: don\u0027t toggle-switch devices\n\nIf the requested device is already active, ignore the request.\n\nThis restores the original behaviour of the interface. The change was\nprobably an unintended side effect of\n\ncommit 66b37c6777c4 vga_switcheroo: split switching into two stages\n\nwhich did not take into account to duplicate the !active check in the split-off\nstage2.\n\nFix this by factoring that check out of stage1 into the debugfs_write routine.\n\nReferences: https://bugzilla.kernel.org/show_bug.cgi?id\u003d34252\nReported-by: Igor Murzov \u003ce-mail@date.by\u003e\nTested-by: Igor Murzov \u003ce-mail@date.by\u003e\nSigned-off-by: Florian Mickler \u003cflorian@mickler.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "bd1a643e10eb8782b36b47c3602300319dd2fb00", "tree": "68915b6c23f07441ebc956a3492cd0a0797a7d8d", "parents": [ "9f6bd36c407f30c388c5de66c831e1968eec0367", "1fec70932d867416ffe620dd17005f168cc84eb5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 15:41:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 15:41:10 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n rbd: fix split bio handling\n rbd: fix leak of ops struct\n" }, { "commit": "9f6bd36c407f30c388c5de66c831e1968eec0367", "tree": "649de9788cba56933f094b095fa70bc7d8854209", "parents": [ "05bf86b4ccfd0f197da61c67bd372111d15a6620", "5f6f12ccf3aa42cfc0c5bde9228df0c843dd63f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 12:19:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 12:19:18 2011 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n libata: fix oops when LPM is used with PMP\n" }, { "commit": "5f6f12ccf3aa42cfc0c5bde9228df0c843dd63f7", "tree": "0fd92494ecaa6caf7f4d7f12524d49b149d7d304", "parents": [ "ddb503b42960792f3be580f98959add669241a04" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon May 09 16:04:11 2011 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@pobox.com", "time": "Sat May 14 14:51:40 2011 -0400" }, "message": "libata: fix oops when LPM is used with PMP\n\nae01b2493c (libata: Implement ATA_FLAG_NO_DIPM and apply it to mcp65)\nadded ATA_FLAG_NO_DIPM and made ata_eh_set_lpm() check the flag.\nHowever, @ap is NULL if @link points to a PMP link and thus the\nunconditional @ap-\u003eflags dereference leads to the following oops.\n\n BUG: unable to handle kernel NULL pointer dereference at 0000000000000018\n IP: [\u003cffffffff813f98e1\u003e] ata_eh_recover+0x9a1/0x1510\n ...\n Pid: 295, comm: scsi_eh_4 Tainted: P 2.6.38.5-core2 #1 System76, Inc. Serval Professional/Serval Professional\n RIP: 0010:[\u003cffffffff813f98e1\u003e] [\u003cffffffff813f98e1\u003e] ata_eh_recover+0x9a1/0x1510\n RSP: 0018:ffff880132defbf0 EFLAGS: 00010246\n RAX: 0000000000000000 RBX: ffff880132f40000 RCX: 0000000000000000\n RDX: ffff88013377c000 RSI: ffff880132f40000 RDI: 0000000000000000\n RBP: ffff880132defce0 R08: ffff88013377dc58 R09: ffff880132defd98\n R10: 0000000000000000 R11: 00000000ffffffff R12: 0000000000000000\n R13: 0000000000000000 R14: ffff88013377c000 R15: 0000000000000000\n FS: 0000000000000000(0000) GS:ffff8800bf700000(0000) knlGS:0000000000000000\n CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\n CR2: 0000000000000018 CR3: 0000000001a03000 CR4: 00000000000406e0\n DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n Process scsi_eh_4 (pid: 295, threadinfo ffff880132dee000, task ffff880133b416c0)\n Stack:\n 0000000000000000 ffff880132defcc0 0000000000000000 ffff880132f42738\n ffffffff813ee8f0 ffffffff813eefe0 ffff880132defd98 ffff88013377f190\n ffffffffa00b3e30 ffffffff813ef030 0000000032defc60 ffff880100000000\n Call Trace:\n [\u003cffffffff81400867\u003e] sata_pmp_error_handler+0x607/0xc30\n [\u003cffffffffa00b273f\u003e] ahci_error_handler+0x1f/0x70 [libahci]\n [\u003cffffffff813faade\u003e] ata_scsi_error+0x5be/0x900\n [\u003cffffffff813cf724\u003e] scsi_error_handler+0x124/0x650\n [\u003cffffffff810834b6\u003e] kthread+0x96/0xa0\n [\u003cffffffff8100cd64\u003e] kernel_thread_helper+0x4/0x10\n Code: 8b 95 70 ff ff ff b8 00 00 00 00 48 3b 9a 10 2e 00 00 48 0f 44 c2 48 89 85 70 ff ff ff 48 8b 8d 70 ff ff ff f6 83 69 02 00 00 01 \u003c48\u003e 8b 41 18 0f 85 48 01 00 00 48 85 c9 74 12 48 8b 51 08 48 83\n RIP [\u003cffffffff813f98e1\u003e] ata_eh_recover+0x9a1/0x1510\n RSP \u003cffff880132defbf0\u003e\n CR2: 0000000000000018\n\nFix it by testing @link-\u003eap-\u003eflags instead.\n\nstable: ATA_FLAG_NO_DIPM was added during 2.6.39 cycle but was\n backported to 2.6.37 and 38. This is a fix for that and thus\n also applicable to 2.6.37 and 38.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: \"Nathan A. Mourey II\" \u003cnmoureyii@ne.rr.com\u003e\nLKML-Reference: \u003c1304555277.2059.2.camel@localhost.localdomain\u003e\nCc: Connor H \u003ccmdkhh@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Jeff Garzik \u003cjgarzik@pobox.com\u003e\n" }, { "commit": "afa49791caae70cc3fd665a182eea61250795265", "tree": "5a1683ad60a9c789802cfb2ac657981a6e43410e", "parents": [ "22fe9446e82f1fe4b59900db4599061384efb0ad", "c590cece75728a85ea06801df3ebad2d7ad8612c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 11:24:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 11:24:32 2011 -0700" }, "message": "Merge branch \u0027fbmem\u0027\n\n* fbmem:\n Further fbcon sanity checking\n fbmem: fix remove_conflicting_framebuffers races\n" }, { "commit": "22fe9446e82f1fe4b59900db4599061384efb0ad", "tree": "f5ad2181f1c9bcd8987b6f5b36c24e1f6b8d4140", "parents": [ "ddb503b42960792f3be580f98959add669241a04" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat May 14 12:28:04 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 10:45:59 2011 -0700" }, "message": "Revert \"libata: ahci_start_engine compliant to AHCI spec\"\n\nThis reverts commit 270dac35c26433d06a89150c51e75ca0181ca7e4.\n\nThe commits causes command timeouts on AC plug/unplug. It isn\u0027t yet\nclear why. As the commit was for a single rather obscure controller,\nrevert the change for now.\n\nThe problem was reported and bisected by Gu Rui in bug#34692.\n\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d34692\n\nAlso, reported by Rafael and Michael in the following thread.\n\n http://thread.gmane.org/gmane.linux.kernel/1138771\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Gu Rui \u003cchaos.proton@gmail.com\u003e\nReported-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nReported-by: Michael Leun \u003clkml20100708@newton.leun.net\u003e\nCc: Jian Peng \u003cjipeng2005@gmail.com\u003e\nCc: Jeff Garzik \u003cjgarzik@pobox.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c590cece75728a85ea06801df3ebad2d7ad8612c", "tree": "3f3f7ade41317d86305a3839d9f2ad646945aa60", "parents": [ "712f3147aee0fbbbbed2da20b21b272c5505125e" ], "author": { "name": "Bruno Prémont", "email": "bonbons@linux-vserver.org", "time": "Sat May 14 12:24:15 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 10:28:54 2011 -0700" }, "message": "Further fbcon sanity checking\n\nThis moves the\n\n if (num_registered_fb \u003d\u003d FB_MAX)\n return -ENXIO;\n\ncheck _AFTER_ the call to do_remove_conflicting_framebuffers() as this\nwould (now in a safe way) allow a native driver to replace the\nconflicting one even if all slots in registered_fb[] are taken.\n\nThis also prevents unregistering a framebuffer that is no longer\nregistered (vga16f will unregister at module unload time even if the\nframe buffer had been unregistered earlier due to being found\nconflicting).\n\nSigned-off-by: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "712f3147aee0fbbbbed2da20b21b272c5505125e", "tree": "02bf6ff00f1978b4165c2c2d4554606bae65107e", "parents": [ "c47747fde931c02455683bd00ea43eaa62f35b0e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 16:16:41 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 14 10:23:44 2011 -0700" }, "message": "fbmem: fix remove_conflicting_framebuffers races\n\nWhen a register_framebuffer() call results in us removing old\nconflicting framebuffers, the new registration_lock doesn\u0027t protect that\nsituation. And we can\u0027t just add the same locking to the function,\nbecause these functions call each other: register_framebuffer() calls\nremove_conflicting_framebuffers, which in turn calls\nunregister_framebuffer for any conflicting entry.\n\nIn order to fix it, this just creates wrapper functions around all three\nfunctions and makes the versions that actually do the work be called\n\"do_xxx()\", leaving just the wrapper that gets the lock and calls the\nworker function.\n\nSo the rule becomes simply that \"do_xxxx()\" has to be called with the\nlock held, and now do_register_framebuffer() can just call\ndo_remove_conflicting_framebuffers(), and that in turn can call\n_do_unregister_framebuffer(), and there is no deadlock, and we can hold\nthe registration lock over the whole sequence, fixing the races.\n\nIt also makes error cases simpler, and fixes one situation where we\nwould return from unregister_framebuffer() without releasing the lock,\npointed out by Bruno Prémont.\n\nTested-by: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nTested-by: Anca Emanuel \u003canca.emanuel@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "298eaaad0edc004912513d7b9e18163bc053539b", "tree": "9e0e6dd9c54e4af80b0c671de87a71d018f79c38", "parents": [ "cf70cc5b9d6a07d21ffd521aee690d26315d1bdf", "cb68552858c64db302771469b1202ea09e696329" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 15:20:51 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 15:20:51 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n bridge: fix forwarding of IPv6\n bonding,llc: Fix structure sizeof incompatibility for some PDUs\n ipv6: restore correct ECN handling on TCP xmit\n ne-h8300: Fix regression caused during net_device_ops conversion\n hydra: Fix regression caused during net_device_ops conversion\n zorro8390: Fix regression caused during net_device_ops conversion\n sfc: Always map MCDI shared memory as uncacheable\n ehea: Fix memory hotplug oops\n libertas: fix cmdpendingq locking\n iwlegacy: fix IBSS mode crashes\n ath9k: Fix a warning due to a queued work during S3 state\n mac80211: don\u0027t start the dynamic ps timer if not associated\n" }, { "commit": "1fec70932d867416ffe620dd17005f168cc84eb5", "tree": "921f08b555d2b71e7356034aae65bed4ed37e2df", "parents": [ "11f770027b5c0de16544f3ec82b5c6f9f8d5a644" ], "author": { "name": "Yehuda Sadeh", "email": "yehuda@hq.newdream.net", "time": "Fri May 13 13:52:56 2011 -0700" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Fri May 13 13:52:57 2011 -0700" }, "message": "rbd: fix split bio handling\n\nThe rbd driver currently splits bios when they span an object boundary.\nHowever, the blk_end_request expects the completions to roll up the results\nin block device order, and the split rbd/ceph ops can complete in any\norder. This patch adds a struct rbd_req_coll to track completion of split\nrequests and ensures that the results are passed back up to the block layer\nin order.\n\nThis fixes errors where the file system gets completion of a read operation\nthat spans an object boundary before the data has actually arrived. The\nbug is easily reproduced with iozone with a working set larger than\navailable RAM.\n\nReported-by: Fyodor Ustinov \u003cufm@ufm.su\u003e\nSigned-off-by: Yehuda Sadeh \u003cyehuda@hq.newdream.net\u003e\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "087fbc9962e10a65fb0b542ecfc116ebf6cf1735", "tree": "c6cedad81ecb0bbc87eab629349cd2dcad7bba82", "parents": [ "26cf46be954a2dd391d32eeaf7d07c3a953dcc5a" ], "author": { "name": "Andy Lutomirski", "email": "luto@mit.edu", "time": "Fri May 13 12:14:54 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 12:22:51 2011 -0700" }, "message": "drm/i915: Revert i915.semaphore\u003d1 default from i915 merge\n\nMy Q67 / i7-2600 box has rev09 Sandy Bridge graphics. It hangs\ninstantly when GNOME loads and it hangs so hard the reset button\ndoesn\u0027t work. Setting i915.semaphore\u003d0 fixes it.\n\nSemaphores were disabled in a1656b9090f7 (\"drm/i915: Disable GPU\nsemaphores by default\") in 2.6.38 but were then re-enabled (by mistake?)\nby the merge 47ae63e0c2e5 (\"Merge branch \u0027drm-intel-fixes\u0027 into\ndrm-intel-next\").\n\n(It\u0027s worth noting that the offending change is i915_drv.c, which was\nnot marked as a conflict - although a \u0027git show --cc\u0027 on the merge does\nshow that neither parent had it set to 1)\n\nSigned-off-by: Andy Lutomirski \u003cluto@mit.edu\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a10e14667635dde504ed9e7ee851494c2cf2ae8e", "tree": "bf5ad736713e1fcb80fadb05825184b44d50c87e", "parents": [ "ca06707022d6ba4744198a8ebbe4994786b0c613" ], "author": { "name": "Vitalii Demianets", "email": "vitas@nppfactor.kiev.ua", "time": "Thu May 12 23:04:29 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 15:13:24 2011 -0400" }, "message": "bonding,llc: Fix structure sizeof incompatibility for some PDUs\n\nWith some combinations of arch/compiler (e.g. arm-linux-gcc) the sizeof\noperator on structure returns value greater than expected. In cases when the\nstructure is used for mapping PDU fields it may lead to unexpected results\n(such as holes and alignment problems in skb data). __packed prevents this\nundesired behavior.\n\nSigned-off-by: Vitalii Demianets \u003cvitas@nppfactor.kiev.ua\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3a8ab79eae4500e6ac618a92a90cee63d6e804a8", "tree": "e102cd13d3376ad17edee00ee15b0b6a8aee9b64", "parents": [ "05fa7ea7d23980de0014417a0e0af2048a0f9fc1" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu May 12 21:15:15 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 13 16:16:36 2011 +1000" }, "message": "drm/radeon/kms: add some evergreen/ni safe regs\n\nneed to programmed from the userspace drivers.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "05fa7ea7d23980de0014417a0e0af2048a0f9fc1", "tree": "7b8d2727e7b142dd5e097a80ef7334a07b68a402", "parents": [ "d9282fca8a763be574a2fc20b2edcc6e132cbf90" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed May 11 14:02:07 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 13 16:16:33 2011 +1000" }, "message": "drm/radeon/kms: fix extended lvds info parsing\n\nOn rev \u003c\u003d 1.1 tables, the offset is absolute,\non newer tables, it\u0027s relative.\n\nFixes:\nhttps://bugzilla.redhat.com/show_bug.cgi?id\u003d700326\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d9282fca8a763be574a2fc20b2edcc6e132cbf90", "tree": "156d3546ff2e1ae53385b9f858a036502e9ce9bb", "parents": [ "ca1376d10810bc2c20c8d0821a9ee04ca2507c01" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed May 11 03:15:24 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 13 16:15:39 2011 +1000" }, "message": "drm/radeon/kms: fix tiling reg on fusion\n\nThe location of MC_ARB_RAMCFG changed on fusion.\nI\u0027ve diffed all the other regs in evergreend.h and this\nis the only other reg that changed.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "11f770027b5c0de16544f3ec82b5c6f9f8d5a644", "tree": "7a64ef3a9a47ddd19dd22d50059a266cf626ddee", "parents": [ "446cc6345d3de6571bdd0840f48aca441488a28d" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu May 12 16:13:54 2011 -0700" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu May 12 20:59:14 2011 -0700" }, "message": "rbd: fix leak of ops struct\n\nThe ops vector must be freed by the rbd_do_request caller.\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "9ddabb055d73c63037878bb9346e52c7f2e07e96", "tree": "029448dcc4dbaabefe57dcf6b74bb467ee7b0405", "parents": [ "ca1376d10810bc2c20c8d0821a9ee04ca2507c01" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Fri Apr 29 15:30:02 2011 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Fri May 13 00:10:36 2011 +0100" }, "message": "i2c: pnx: Fix crash due to wrong init of timer-\u003edata\n\nalg_data is already a pointer which must be passed directly.\n\nReported-by: Dieter Ripp \u003cripp@systecnet.com\u003e\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Ben Dooks \u003cben-i2c@fluff.org\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "2592a7354092afd304a8c067319b15ab1e441e35", "tree": "9f011e276c70fdac0368698b3e30edd31d5ea97b", "parents": [ "0b25e0157dfa236a0629c16c8ad6f222f633f682" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu May 12 09:11:40 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 12 16:59:57 2011 -0400" }, "message": "ne-h8300: Fix regression caused during net_device_ops conversion\n\nChangeset dcd39c90290297f6e6ed8a04bb20da7ac2b043c5 (\"ne-h8300: convert to\nnet_device_ops\") broke ne-h8300 by adding 8390.o to the link. That\nmeant that lib8390.c was included twice, once in ne-h8300.c and once in\n8390.c, subject to different macros. This patch reverts that by\navoiding the wrappers in 8390.c.\n\nFix based on commits 217cbfa856dc1cbc2890781626c4032d9e3ec59f (\"mac8390:\nfix regression caused during net_device_ops conversion\") and\n4e0168fa4842e27795a75b205a510f25b62181d9 (\"mac8390: fix build with\nNET_POLL_CONTROLLER\").\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0b25e0157dfa236a0629c16c8ad6f222f633f682", "tree": "310c0de8776d9809526aedf0d637f217d157d08a", "parents": [ "cf7e032fc87d59c475df26c4d40bf45d401b2adb" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu May 12 09:11:39 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 12 16:59:57 2011 -0400" }, "message": "hydra: Fix regression caused during net_device_ops conversion\n\nChangeset 5618f0d1193d6b051da9b59b0e32ad24397f06a4 (\"hydra: convert to\nnet_device_ops\") broke hydra by adding 8390.o to the link. That\nmeant that lib8390.c was included twice, once in hydra.c and once in\n8390.c, subject to different macros. This patch reverts that by\navoiding the wrappers in 8390.c.\n\nFix based on commits 217cbfa856dc1cbc2890781626c4032d9e3ec59f (\"mac8390:\nfix regression caused during net_device_ops conversion\") and\n4e0168fa4842e27795a75b205a510f25b62181d9 (\"mac8390: fix build with\nNET_POLL_CONTROLLER\").\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cf7e032fc87d59c475df26c4d40bf45d401b2adb", "tree": "31950f192e6c3bae94db497b97d43011461e2d80", "parents": [ "d44cf14ddf5a7e61d7acf13bc430111783d9c6aa" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu May 12 09:11:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 12 16:59:57 2011 -0400" }, "message": "zorro8390: Fix regression caused during net_device_ops conversion\n\nChangeset b6114794a1c394534659f4a17420e48cf23aa922 (\"zorro8390: convert to\nnet_device_ops\") broke zorro8390 by adding 8390.o to the link. That\nmeant that lib8390.c was included twice, once in zorro8390.c and once in\n8390.c, subject to different macros. This patch reverts that by\navoiding the wrappers in 8390.c.\n\nFix based on commits 217cbfa856dc1cbc2890781626c4032d9e3ec59f (\"mac8390:\nfix regression caused during net_device_ops conversion\") and\n4e0168fa4842e27795a75b205a510f25b62181d9 (\"mac8390: fix build with\nNET_POLL_CONTROLLER\").\n\nReported-by: Christian T. Steigies \u003ccts@debian.org\u003e\nSuggested-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nTested-by: Christian T. Steigies \u003ccts@debian.org\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d44cf14ddf5a7e61d7acf13bc430111783d9c6aa", "tree": "d2e3403e4ba51327b329e57124c3ec429dd89001", "parents": [ "21ccc7936dac5ca9b3e2838bbc112a60f34e18b3", "747df2258b1b9a2e25929ef496262c339c380009" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 12 16:26:45 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 12 16:26:45 2011 -0400" }, "message": "Merge branch \u0027sfc-2.6.39\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-2.6\n" }, { "commit": "982b2035d9d7033f63db187bac55e9d8998b0266", "tree": "2608ce34afd4f81e8c275a7617b7295c52b606f9", "parents": [ "df43938bc581f831b80b14ae249078e8da3d6ef5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 12:19:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 12:19:43 2011 -0700" }, "message": "Revert \"drm/i915: Only enable the plane after setting the fb base (pre-ILK)\"\n\nThis reverts commit 49183b2818de6899383bb82bc032f9344d6791ff.\n\nQuoth Franz Melchior:\n\n \"This patch introduces a bug on my infamous \"Acer Travelmate\n 5735Z-452G32Mnss\": when KMS takes over, the frame buffer contents get\n completely garbled up on screen, with colored stripes and unreadable\n text (photo on request). Only when X11 is started, the screen gets\n restored again. Closing and re-opening the lid partly cures the\n mess, too: it makes the font readable, though horizontally stretched.\"\n\nAcked-by: Keith Packard \u003ckeithp@keithp.com\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "df43938bc581f831b80b14ae249078e8da3d6ef5", "tree": "544a9ae62e208a70cca56b5e3cb724b798eec681", "parents": [ "49f019c188aa1e0ed5c8cffbcc5533dfb0e732dd", "c47747fde931c02455683bd00ea43eaa62f35b0e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 10:42:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 10:42:36 2011 -0700" }, "message": "Merge branch \u0027fbmem\u0027\n\n* fbmem:\n fbmem: make read/write/ioctl use the frame buffer at open time\n fbcon: add lifetime refcount to opened frame buffers\n" }, { "commit": "49f019c188aa1e0ed5c8cffbcc5533dfb0e732dd", "tree": "4d60206230d1eb9182f1f565309cc90c6454c404", "parents": [ "6eaed0a438ef554a282210a04da0de27b671d817", "28350e330cfab46b60a1dbf763b678d859f9f3d9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 10:41:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 10:41:31 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: ads7846 - remove unused variable from struct ads7845_ser_req\n Input: ads7846 - make transfer buffers DMA safe\n" }, { "commit": "75c0b3b466388f2fad60fda57b6ca2c4fabbcaf7", "tree": "11de004529d01abded73a9392715baebab2e2a6d", "parents": [ "3568bd9720b4a775f28a718fcbb462ce2f386988", "a904f5f9eb7a55baacb2f4c1423cac8a8eb78a3a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 07:53:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 07:53:06 2011 -0700" }, "message": "Merge branch \u0027fixes\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027fixes\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: 6870/1: The mandatory barrier rmb() must be a dsb() in for device accesses\n ARM: 6892/1: handle ptrace requests to change PC during interrupted system calls\n ARM: 6890/1: memmap: only free allocated memmap entries when using SPARSEMEM\n ARM: zImage: the page table memory must be considered before relocation\n ARM: zImage: make sure not to relocate on top of the relocation code\n ARM: zImage: Fix bad SP address after relocating kernel\n ARM: zImage: make sure the stack is 64-bit aligned\n ARM: RiscPC: acornfb: fix section mismatches\n ARM: RiscPC: etherh: fix section mismatches\n" }, { "commit": "c47747fde931c02455683bd00ea43eaa62f35b0e", "tree": "a98fbf2b466cabbc71a685a24496e08e074ecfb2", "parents": [ "698b368275c3fa98261159253cfc79653f9dffc6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 11 14:58:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 07:46:43 2011 -0700" }, "message": "fbmem: make read/write/ioctl use the frame buffer at open time\n\nread/write/ioctl on a fbcon file descriptor has traditionally used the\nfbcon not when it was opened, but as it was at the time of the call.\nThat makes no sense, but the lack of sense is much more obvious now that\nwe properly ref-count the usage - it means that the ref-counting doesn\u0027t\nactually protect operations we do on the frame buffer.\n\nThis changes it to look at the fb_info that we got at open time, but in\norder to avoid using a frame buffer long after it has been unregistered,\nwe do verify that it is still current, and return -ENODEV if not.\n\nAcked-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nTested-by: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nTested-by: Anca Emanuel \u003canca.emanuel@gmail.com\u003e\nCc: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: Andy Whitcroft \u003candy.whitcroft@canonical.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "698b368275c3fa98261159253cfc79653f9dffc6", "tree": "b92c921fe6522ece33fbbde33cc173c9dd32d9a2", "parents": [ "9f381a61f58bb6487c93ce2233bb9992f8ea9211" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 11 14:49:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 12 07:37:51 2011 -0700" }, "message": "fbcon: add lifetime refcount to opened frame buffers\n\nThis just adds the refcount and the new registration lock logic. It\ndoes not (for example) actually change the read/write/ioctl routines to\nactually use the frame buffer that was opened: those function still end\nup alway susing whatever the current frame buffer is at the time of the\ncall.\n\nWithout this, if something holds the frame buffer open over a\nframebuffer switch, the close() operation after the switch will access a\nfb_info that has been free\u0027d by the unregistering of the old frame\nbuffer.\n\n(The read/write/ioctl operations will normally not cause problems,\nbecause they will - illogically - pick up the new fbcon instead. But a\nswitch that happens just as one of those is going on might see problems\ntoo, the window is just much smaller: one individual op rather than the\nwhole open-close sequence.)\n\nThis use-after-free is apparently fairly easily triggered by the Ubuntu\n11.04 boot sequence.\n\nAcked-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nTested-by: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nTested-by: Anca Emanuel \u003canca.emanuel@gmail.com\u003e\nCc: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: Andy Whitcroft \u003candy.whitcroft@canonical.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "747df2258b1b9a2e25929ef496262c339c380009", "tree": "7f0ff222afed691599f24473e0b8d10b36f48cf2", "parents": [ "ff538818f4a82c4cf02d2d6bd6ac5c7360b9d41d" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Wed May 11 17:41:18 2011 +0100" }, "committer": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu May 12 15:16:32 2011 +0100" }, "message": "sfc: Always map MCDI shared memory as uncacheable\n\nWe enabled write-combining for memory-mapped registers in commit\n65f0b417dee94f779ce9b77102b7d73c93723b39, but inhibited it for the\nMCDI shared memory where this is not supported. However,\nwrite-combining mappings also allow read-reordering, which may also\nbe a problem.\n\nI found that when an SFC9000-family controller is connected to an\nIntel 3000 chipset, and write-combining is enabled, the controller\nstops responding to PCIe read requests during driver initialisation\nwhile the driver is polling for completion of an MCDI command. This\nresults in an NMI and system hang. Adding read memory barriers\nbetween all reads to the shared memory area appears to reduce but not\neliminate the probability of this.\n\nWe have not yet established whether this is a bug in our BIU or in the\nPCIe bridge. For now, work around by mapping the shared memory area\nseparately.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\n" }, { "commit": "21ccc7936dac5ca9b3e2838bbc112a60f34e18b3", "tree": "b711735fea08bb340517a75e81ef6e422a7ab791", "parents": [ "78d41b35a9570b7a9a45686789df5dfaeb2b7f4c" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Tue May 10 16:17:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 12 00:09:34 2011 -0400" }, "message": "ehea: Fix memory hotplug oops\n\nThe ehea driver oopses during memory hotplug if the ports are not\nup. A simple testcase:\n\n# ifconfig ethX down\n# echo offline \u003e /sys/devices/system/memory/memory32/state\n\nOops: Kernel access of bad area, sig: 11 [#1]\nlast sysfs file: /sys/devices/system/memory/memory32/state\nREGS: c000000709393110 TRAP: 0300 Not tainted (2.6.39-rc2-01385-g7ef73bc-dirty)\nDAR: 0000000000000000, DSISR: 40000000\n...\nNIP [c000000000067c98] .__wake_up_common+0x48/0xf0\nLR [c00000000006d034] .__wake_up+0x54/0x90\nCall Trace:\n[c00000000006d034] .__wake_up+0x54/0x90\n[d000000006bb6270] .ehea_rereg_mrs+0x140/0x730 [ehea]\n[d000000006bb69c4] .ehea_mem_notifier+0x164/0x170 [ehea]\n[c0000000006fc8a8] .notifier_call_chain+0x78/0xf0\n[c0000000000b3d70] .__blocking_notifier_call_chain+0x70/0xb0\n[c000000000458d78] .memory_notify+0x28/0x40\n[c0000000001871d8] .remove_memory+0x208/0x6d0\n[c000000000458264] .memory_section_action+0x94/0x140\n[c0000000004583ec] .memory_block_change_state+0xdc/0x1d0\n[c0000000004585cc] .store_mem_state+0xec/0x160\n[c00000000044768c] .sysdev_store+0x3c/0x50\n[c00000000020b48c] .sysfs_write_file+0xec/0x1f0\n[c00000000018f86c] .vfs_write+0xec/0x1e0\n[c00000000018fa88] .SyS_write+0x58/0xd0\n\nTo fix this, initialise the waitqueues during port probe instead\nof port open.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nCc: stable@kernel.org\nAcked-by: Breno Leitao \u003cleitao@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fad632092a71bfc098989597b2a17bd8bf16b219", "tree": "4b87cb7c3219e1880fdea2d54aaf9f72bb92db6e", "parents": [ "b5121290cad7c9e1a786952da4f6d9bfbfb87597", "03a80665341bbb9a57064c2ddeca13b554d56893" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 11 19:13:16 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 11 19:13:16 2011 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/radeon/nouveau: fix build regression on alpha due to Xen changes.\n drm/radeon/kms: fix cayman acceleration\n drm/radeon: fix cayman struct accessors.\n" }, { "commit": "b5121290cad7c9e1a786952da4f6d9bfbfb87597", "tree": "a6e2c24f8bdb86e98cb4e962183d38a304436004", "parents": [ "409ab140e2ec662e473d4968e12b7ac97f5a5f4e", "c62dd365e248222903e6e3e3a8f5d8587e7e3345" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 11 19:00:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 11 19:00:15 2011 -0700" }, "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: Fix for the TWL4030 PM sleep/wakeup sequence\n mfd: Fix asic3 build error\n mfd: Fixed gpio polarity of omap-usb gpio USB-phy reset\n" }, { "commit": "409ab140e2ec662e473d4968e12b7ac97f5a5f4e", "tree": "b6ddbb6ea24387b912706790cbd9302db01c3d5d", "parents": [ "ce8453776d68982cfe93bcb28191af8ccad01f45", "badb8bb983e9cf5b7a872e0a4f6ebeac2b1ce133" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 11 18:59:45 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 11 18:59:45 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6\n\n* \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6:\n [S390] fix alloc_pgste check in init_new_context\n [S390] oprofile: fix min/max interval query checks\n [S390] replace diag10() with diag10_range() function\n [S390] disassembler: handle b280/spp instruction\n [S390] kernel: Initialize register 14 when starting new CPU\n [S390] dasd: prevent IO error during reserve/release loop\n [S390] sclp/memory hotplug: fix initial usecount of increments\n" }, { "commit": "52cd4e5c620af9e21b5298bf01844b98573505a7", "tree": "6833280fd9b65c5e59472e9d63b1f975874af05d", "parents": [ "9f381a61f58bb6487c93ce2233bb9992f8ea9211" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 11 15:13:28 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 11 18:50:44 2011 -0700" }, "message": "drivers/rtc/rtc-s3c.c: fixup wake support for rtc\n\nThe driver is not balancing set_irq and disable_irq_wake() calls, so\nensure that it keeps track of whether the wake is enabled.\n\nThe fixes the following error on S3C6410 devices:\n\n WARNING: at kernel/irq/manage.c:382 set_irq_wake+0x84/0xec()\n Unbalanced IRQ 92 wake disable\n\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: \u003cstable@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": "78d41b35a9570b7a9a45686789df5dfaeb2b7f4c", "tree": "a28432584132a7c810b6b243795aec43544205ab", "parents": [ "9bbc052d5e63512b0ce4e201ea97e12fba9fda82", "2ae1b8b35faba31a59b153cbad07f9c15de99740" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 11 19:13:08 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 11 19:13:08 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "c62dd365e248222903e6e3e3a8f5d8587e7e3345", "tree": "658308228d3e24bcad5a7e4b60cc31d3e031293c", "parents": [ "a09aee8b636a3b2b7b10ad57d60d91e9272e771d" ], "author": { "name": "Lesly A M", "email": "leslyam@ti.com", "time": "Thu Apr 14 17:57:49 2011 +0530" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Wed May 11 11:09:58 2011 +0200" }, "message": "mfd: Fix for the TWL4030 PM sleep/wakeup sequence\n\nOnly configure sleep script when the flag is TWL4030_SLEEP_SCRIPT.\n\nAdding the missing brackets for fixing the issue.\n\nSigned-off-by: Lesly A M \u003cleslyam@ti.com\u003e\nCc: Nishanth Menon \u003cnm@ti.com\u003e\nCc: David Derrick \u003cdderrick@ti.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "a09aee8b636a3b2b7b10ad57d60d91e9272e771d", "tree": "109ea647a990df912bcb943747e64db65ac71c28", "parents": [ "557f447f21621de9c5447c8702c33b53279822ce" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Thu Apr 14 22:43:47 2011 +0800" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Wed May 11 11:09:57 2011 +0200" }, "message": "mfd: Fix asic3 build error\n\nFix below compile error:\n\n CC drivers/mfd/asic3.o\ndrivers/mfd/asic3.c: In function \u0027asic3_irq_demux\u0027:\ndrivers/mfd/asic3.c:147: error: \u0027irq_data\u0027 undeclared (first use in this function)\ndrivers/mfd/asic3.c:147: error: (Each undeclared identifier is reported only once\ndrivers/mfd/asic3.c:147: error: for each function it appears in.)\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "557f447f21621de9c5447c8702c33b53279822ce", "tree": "e8daf9667f74cb9f4e9b0b28fb0136a4c48c2434", "parents": [ "9f381a61f58bb6487c93ce2233bb9992f8ea9211" ], "author": { "name": "Juergen Kilb", "email": "J.Kilb@phytec.de", "time": "Thu Apr 14 09:31:43 2011 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Wed May 11 11:09:57 2011 +0200" }, "message": "mfd: Fixed gpio polarity of omap-usb gpio USB-phy reset\n\nWith commit 19403165 a main part of ehci-omap.c moved to\ndrivers/mfd/omap-usb-host.c created by commit 17cdd29d.\nDue to this reorganisation the polarity used to reset the\nexternal USB phy changed and USB host doesn\u0027t recognize\nany devices.\n\nSigned-off-by: Juergen Kilb \u003cJ.Kilb@phytec.de\u003e\nAcked-by: Felipe Balbi \u003cbalbi@ti.com\u003e\nTested-by: Steve Sakoman \u003csteve@sakoman.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "03a80665341bbb9a57064c2ddeca13b554d56893", "tree": "a72db5aa5d2c6b30e22733e58e2c603738aec5dd", "parents": [ "1f03128251b77bfc68d1578a4f11316eb3806238" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 09 02:24:04 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 11 13:08:02 2011 +1000" }, "message": "drm/radeon/nouveau: fix build regression on alpha due to Xen changes.\n\nThe Xen changes were using DMA_ERROR_CODE which isn\u0027t defined on a few\nplatforms, however we reverted the Xen patch that caused use to try and\nuse this code path earlier in 2.6.39 cycle, so for now lets just force\nthe code to never take this path and allow it to build again on alpha.\n\nThe proper long term answer is probably to store if the dma_addr has\nbeen assigned to alongside the dma_addr in the higher level code,\nthough I think Thomas wanted to rewrite most of this anyways properly.\n\nAcked-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1f03128251b77bfc68d1578a4f11316eb3806238", "tree": "6ead5bb94de94dabcd8f784fe369dab15b0da209", "parents": [ "285e042dcd9fe9a9b7fbfdc215e4d076791ded8e" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue May 10 02:14:52 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 11 13:06:56 2011 +1000" }, "message": "drm/radeon/kms: fix cayman acceleration\n\nThe TCC disable setup was incorrect. This\nprevents the GPU from hanging when draw commands\nare issued.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "285e042dcd9fe9a9b7fbfdc215e4d076791ded8e", "tree": "f5e359b3f3e41719526fd78ca6eac02e6cbb95e7", "parents": [ "9f381a61f58bb6487c93ce2233bb9992f8ea9211" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 09 14:54:33 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 11 13:01:21 2011 +1000" }, "message": "drm/radeon: fix cayman struct accessors.\n\nWe are accessing totally the wrong struct in this case, and putting\nuninitialised values into the GPU, which it doesn\u0027t like unsurprisingly.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9f381a61f58bb6487c93ce2233bb9992f8ea9211", "tree": "579baf2e2893ea97599db9da807ed334d11f11d5", "parents": [ "21a43e397e7f66d3be44e09b54045f1a67838cc0", "9bbc052d5e63512b0ce4e201ea97e12fba9fda82" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 10 17:39:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 10 17:39:01 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)\n slcan: fix ldisc-\u003eopen retval\n net/usb: mark LG VL600 LTE modem ethernet interface as WWAN\n xfrm: Don\u0027t allow esn with disabled anti replay detection\n xfrm: Assign the inner mode output function to the dst entry\n net: dev_close() should check IFF_UP\n vlan: fix GVRP at dismantle time\n netfilter: revert a2361c8735e07322023aedc36e4938b35af31eb0\n netfilter: IPv6: fix DSCP mangle code\n netfilter: IPv6: initialize TOS field in REJECT target module\n IPVS: init and cleanup restructuring\n IPVS: Change of socket usage to enable name space exit.\n netfilter: ebtables: only call xt_compat_add_offset once per rule\n netfilter: fix ebtables compat support\n netfilter: ctnetlink: fix timestamp support for new conntracks\n pch_gbe: support ML7223 IOH\n PCH_GbE : Fixed the issue of checksum judgment\n PCH_GbE : Fixed the issue of collision detection\n NET: slip, fix ldisc-\u003eopen retval\n be2net: Fixed bugs related to PVID.\n ehea: fix wrongly reported speed and port\n ...\n" }, { "commit": "0d4420a90b51abdea71585f571bad6d789ff8eb7", "tree": "5c76c689b532980aed79d171a3547d6001a47687", "parents": [ "aae1e743fee2b5523fb31ee050295f062cb26a31" ], "author": { "name": "Oliver Hartkopp", "email": "socketcan@hartkopp.net", "time": "Tue May 10 13:12:30 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 10 15:04:07 2011 -0700" }, "message": "slcan: fix ldisc-\u003eopen retval\n\nTTY layer expects 0 if the ldisc-\u003eopen operation succeeded.\n\nReported-by: Matvejchikov Ilya \u003cmatvejchikov@gmail.com\u003e\nSigned-off-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aae1e743fee2b5523fb31ee050295f062cb26a31", "tree": "2cb410cd42e7399845696e9dca3a6958e674c11b", "parents": [ "6fa5ddcc675b937f94d05628e8997c07a80c6cb9" ], "author": { "name": "Dan Williams", "email": "dcbw@redhat.com", "time": "Mon May 09 07:43:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 10 15:03:50 2011 -0700" }, "message": "net/usb: mark LG VL600 LTE modem ethernet interface as WWAN\n\nLike other mobile broadband device ethernet interfaces, mark the LG\nVL600 with the \u0027wwan\u0027 devtype so userspace knows it needs additional\nconfiguration via the AT port before the interface can be used.\n\nSigned-off-by: Dan Williams \u003cdcbw@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2ae1b8b35faba31a59b153cbad07f9c15de99740", "tree": "6764461493979313a596e8afab05a831044c56bb", "parents": [ "eb85de3f84868ca85703a23617b4079ce79a801e" ], "author": { "name": "Paul Fox", "email": "pgf@laptop.org", "time": "Mon May 09 10:40:42 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 10 15:47:00 2011 -0400" }, "message": "libertas: fix cmdpendingq locking\n\nWe occasionally see list corruption using libertas.\n\nWhile we haven\u0027t been able to diagnose this precisely, we have spotted\na possible cause: cmdpendingq is generally modified with driver_lock\nheld. However, there are a couple of points where this is not the case.\n\nFix up those operations to execute under the lock, it seems like\nthe correct thing to do and will hopefully improve the situation.\n\nSigned-off-by: Paul Fox \u003cpgf@laptop.org\u003e\nSigned-off-by: Daniel Drake \u003cdsd@laptop.org\u003e\nAcked-by: Dan Williams \u003cdcbw@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "eb85de3f84868ca85703a23617b4079ce79a801e", "tree": "bbbdb2fbede2addfb0b3c09886f53bd858b45814", "parents": [ "99aa55b66e3553e6f7212ec1104e0fac06cc558e" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Sat May 07 17:46:21 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 10 15:46:59 2011 -0400" }, "message": "iwlegacy: fix IBSS mode crashes\n\nWe should not switch to non-IBSS channels when working in IBSS mode,\notherwise there are microcode errors, and after some time system\ncrashes.\n\nThis bug is only observable when software scan is used in IBSS mode,\nso should be considered as regression after:\n\ncommit 0263aa45293838b514b8af674a03faf040991a90\nAuthor: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nDate: Tue Mar 29 11:24:21 2011 +0200\n\n iwl3945: disable hw scan by default\n\nHowever IBSS mode check, which this patch add again, was removed by\n\ncommit b2f30e8bdd8ef5f3b5a7ef9146509585a15347d3\nAuthor: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nDate: Thu Jan 21 07:32:20 2010 -0800\n\n iwlwifi: remove IBSS channel sanity check\n\nThat commit claim that mac80211 will not use non-IBSS channel in IBSS\nmode, what definitely is not true. Bug probably should be fixed in\nmac80211, but that will require more work, so better to apply that patch\ntemporally, and provide proper mac80211 fix latter.\n\nResolves:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d34452\n\nReported-and-tested-by: Mikko Rapeli \u003cmikko.rapeli@iki.fi\u003e\nCc: stable@kernel.org # 2.6.38.5+\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "99aa55b66e3553e6f7212ec1104e0fac06cc558e", "tree": "8e81d3925d3f9dcd22589c10902d0c2afbdc4054", "parents": [ "5db1c07ced19b2eec3a149a3c624d88e02e246ae" ], "author": { "name": "Mohammed Shafi Shajakhan", "email": "mshajakhan@atheros.com", "time": "Fri May 06 20:43:11 2011 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 10 15:46:58 2011 -0400" }, "message": "ath9k: Fix a warning due to a queued work during S3 state\n\nduring suspend/S3 state drv_flush is called from mac80211 irrespective of\ninterface count. In ath9k we queue a work in ath9k_flush which we expect\nto be cancelled in the drv_stop call back. during suspend process mac80211\ncalls drv_stop only when the interface count(local-\u003ecount) is non-zero.\nunfortunately when the network manager is enabled, drv_flush is called\nwhile drv_stop is not called as local-\u003ecount reaches \u00270\u0027.\n\tSo fix this by simply checking for the device presence in the\ndrv_flush call back in the driver before queueing work or anything else.\nthis patch fixes the following WARNING\n\n\tCall Trace:\n\t[\u003cc014c6e2\u003e] warn_slowpath_common+0x72/0xa0\n\t[\u003cfc133f99\u003e] ? ieee80211_can_queue_work+0x39/0x50 [mac80211]\n\t[\u003cfc133f99\u003e] ? ieee80211_can_queue_work+0x39/0x50 [mac80211]\n\t[\u003cc014c75b\u003e] warn_slowpath_fmt+0x2b/0x30\n\t[\u003cfc133f99\u003e] ieee80211_can_queue_work+0x39/0x50 [mac80211]\n\t[\u003cfc134ed1\u003e] ieee80211_queue_delayed_work+0x21/0x50 [mac80211]\n\t[\u003cfc1e5b22\u003e] ath_tx_complete_poll_work+0xb2/0x100 [ath9k]\n\t[\u003cc016399e\u003e] run_workqueue+0x8e/0x150\n\t[\u003cfc1e5a70\u003e] ? ath_tx_complete_poll_work+0x0/0x100 [ath9k]\n\t[\u003cc0163ae4\u003e] worker_thread+0x84/0xe0\n\t[\u003cc0167a60\u003e] ? autoremove_wake_function+0x0/0x50\n\t[\u003cc0163a60\u003e] ? worker_thread+0x0/0xe0\n\t[\u003cc01677d4\u003e] kthread+0x74/0x80\n\t[\u003cc0167760\u003e] ? kthread+0x0/0x80\n\t[\u003cc0104087\u003e] kernel_thread_helper+0x7/0x10\n---[ end trace 2aff81010df9215b ]---\n\nSigned-off-by: Rajkumar Manoharan \u003crmanoharan@atheros.com\u003e\nSigned-off-by: Mohammed Shafi Shajakhan \u003cmshajakhan@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "aade6c0dfb46ff7ce7df0ed7a2ef15d2d3c47f05", "tree": "a4fca8380efa83444a7256a038ad29b545bbf6ed", "parents": [ "fdb1bb157525907163e2a0c96fe8bb19fbe867a8" ], "author": { "name": "Stefan Haberland", "email": "stefan.haberland@de.ibm.com", "time": "Tue May 10 17:13:38 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Tue May 10 17:13:42 2011 +0200" }, "message": "[S390] dasd: prevent IO error during reserve/release loop\n\nThe termination of running CQR caused by reserve/release operations\nmay lead to an IO error if reserve/release is done in a tight loop.\nPrevent this by increasing the retry counter after termination.\n\nSigned-off-by: Stefan Haberland \u003cstefan.haberland@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "fdb1bb157525907163e2a0c96fe8bb19fbe867a8", "tree": "ab07e0bb730b2afc4caf96be26c7fa2769690b25", "parents": [ "693d92a1bbc9e42681c42ed190bd42b636ca876f" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Tue May 10 17:13:37 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Tue May 10 17:13:42 2011 +0200" }, "message": "[S390] sclp/memory hotplug: fix initial usecount of increments\n\nFix initial usecount of attached and assigned storage increments so\nthey can be set offline.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "c191f6ccee11b79fb562c36007a5af31c705c9e2", "tree": "c011a1212bfb8e8b043ef4acd253bd387c3efadb", "parents": [ "a09a79f66874c905af35d5bb5e5f2fdc7b6b894d", "2fb4e61d9471867677c97bf11dba8f1e9dfa7f7c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 09 16:59:51 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 09 16:59:51 2011 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6\n\n* \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:\n drm/i915/lvds: Only act on lid notify when the device is on\n drm/i915: fix intel_crtc_clock_get pipe reads after \"cleanup cleanup\"\n drm/i915: Only enable the plane after setting the fb base (pre-ILK)\n drm/i915/dp: Be paranoid in case we disable a DP before it is attached\n drm/i915: Release object along create user fb error path\n" }, { "commit": "b0e6baf5619a6fa3eaf43b55fdb4daa362c3c916", "tree": "a8caa0dff8340c26a1a84bb096300e374aa6af95", "parents": [ "5d05a04d283061b586e8dc819cfa6f4b8cfd5948" ], "author": { "name": "Tomoya", "email": "tomoya-linux@dsn.okisemi.com", "time": "Mon May 09 01:19:37 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 09 12:45:28 2011 -0700" }, "message": "pch_gbe: support ML7223 IOH\n\nSupport new device OKI SEMICONDUCTOR ML7223 IOH(Input/Output Hub).\nThe ML7223 IOH is for MP(Media Phone) use.\nThe ML7223 is companion chip for Intel Atom E6xx series.\nThe ML7223 is completely compatible for Intel EG20T PCH.\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya-linux@dsn.okisemi.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "26822eebb25500fb0776c7c256a6af041e9f538b", "tree": "c8b09fbf2e16ca0e52818767cfbf82289936f970", "parents": [ "047ec4b5de745fa1e0b56afcb06d431046bd36a3", "14fdb152416c0fab80ecddf492c129d7da1bb8ef" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 09 12:00:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 09 12:00:49 2011 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:\n eeepc-laptop: Use ACPI handle to identify rfkill port\n [PATCH] sony-laptop: limit brightness range to DSDT provided ones\n sony-laptop: report failures on setting LCD brightness\n thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.\n" }, { "commit": "5d05a04d283061b586e8dc819cfa6f4b8cfd5948", "tree": "1c56197fe75df9f386613b2c9b1c7cc9f5a670b1", "parents": [ "ce3dad0f74e6b240f0b1dedbd8ea268a3f298d82" ], "author": { "name": "Toshiharu Okada", "email": "toshiharu-linux@dsn.okisemi.com", "time": "Fri May 06 02:53:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 09 11:55:16 2011 -0700" }, "message": "PCH_GbE : Fixed the issue of checksum judgment\n\nThe checksum judgment was mistaken.\n Judgment result\n 0:Correct 1:Wrong\n\nThis patch fixes the issue.\n\nSigned-off-by: Toshiharu Okada \u003ctoshiharu-linux@dsn.okisemi.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ce3dad0f74e6b240f0b1dedbd8ea268a3f298d82", "tree": "4b66a087f921127a4aeafa9f9a824df1255de9fe", "parents": [ "057bef938896e6266ae24ec4266d24792d27c29a" ], "author": { "name": "Toshiharu Okada", "email": "toshiharu-linux@dsn.okisemi.com", "time": "Fri May 06 02:53:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 09 11:55:15 2011 -0700" }, "message": "PCH_GbE : Fixed the issue of collision detection\n\nThe collision detection setting was invalid.\nWhen collision occurred, because data was not resent,\nthere was an issue to which a transmitting throughput falls.\n\nThis patch enables the collision detection.\n\nSigned-off-by: Toshiharu Okada \u003ctoshiharu-linux@dsn.okisemi.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "057bef938896e6266ae24ec4266d24792d27c29a", "tree": "05632350838694a8a62782e7343bf6c265b91242", "parents": [ "6709d9521df05c105343473ab8b147e2ef1e13d8" ], "author": { "name": "Matvejchikov Ilya", "email": "matvejchikov@gmail.com", "time": "Fri May 06 06:23:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 09 11:53:07 2011 -0700" }, "message": "NET: slip, fix ldisc-\u003eopen retval\n\nTTY layer expects 0 if the ldisc-\u003eopen operation succeeded.\n\nSigned-off-by : Matvejchikov Ilya \u003cmatvejchikov@gmail.com\u003e\nAcked-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6709d9521df05c105343473ab8b147e2ef1e13d8", "tree": "fc0204928fce1ddc8d5d28c419f7a4f981cc7b9d", "parents": [ "dcbe14b91a920657ff3a9ba0efb7c5b5562f956a" ], "author": { "name": "Somnath Kotur", "email": "somnath.kotur@emulex.com", "time": "Wed May 04 22:40:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 09 11:51:04 2011 -0700" }, "message": "be2net: Fixed bugs related to PVID.\n\nFixed bug to make sure \u0027pvid\u0027 retrieval will work on big endian hosts.\nFixed incorrect comparison between the Rx Completion\u0027s 16-bit VLAN TCI\nand the PVID. Now comparing only the relevant 12 bits corresponding to\nthe VID.\nRenamed \u0027vid\u0027 field under Rx Completion to \u0027vlan_tag\u0027 to reflect\naccurate description.\n\nSigned-off-by: Somnath Kotur \u003csomnath.kotur@emulex.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dcbe14b91a920657ff3a9ba0efb7c5b5562f956a", "tree": "169e1e674371320fa7a59e4c28681df324832c0e", "parents": [ "b9f47a3aaeabdce3b42829bbb27765fa340f76ba" ], "author": { "name": "Kleber Sacilotto de Souza", "email": "klebers@linux.vnet.ibm.com", "time": "Wed May 04 13:05:11 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 09 11:49:24 2011 -0700" }, "message": "ehea: fix wrongly reported speed and port\n\nCurrently EHEA reports to ethtool as supporting 10M, 100M, 1G and\n10G and connected to FIBRE independent of the hardware configuration.\nHowever, when connected to FIBRE the only supported speed is 10G\nfull-duplex, and the other speeds and modes are only supported\nwhen connected to twisted pair.\n\nSigned-off-by: Kleber Sacilotto de Souza \u003cklebers@linux.vnet.ibm.com\u003e\nAcked-by: Breno Leitao \u003cleitao@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2fb4e61d9471867677c97bf11dba8f1e9dfa7f7c", "tree": "4a1884e1fb0b26f43898ca16a71f5b757d932c1d", "parents": [ "39adb7a542db08998b4ae88f1698c4300dc39b55" ], "author": { "name": "Alex Williamson", "email": "alex.williamson@redhat.com", "time": "Thu Apr 21 16:08:14 2011 -0600" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon May 09 09:13:22 2011 -0700" }, "message": "drm/i915/lvds: Only act on lid notify when the device is on\n\nIf we\u0027re using vga switcheroo, the device may be turned off\nand poking it can return random state. This provokes an OOPS fixed\nseparately by 8ff887c847 (drm/i915/dp: Be paranoid in case we disable a\nDP before it is attached). Trying to use and respond to events on a\ndevice that has been turned off by the user is in principle a silly thing\nto do.\n\nSigned-off-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "39adb7a542db08998b4ae88f1698c4300dc39b55", "tree": "f1f2818ca04a59ccce7d8c2d33717eb67e3002f4", "parents": [ "49183b2818de6899383bb82bc032f9344d6791ff" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Apr 22 22:17:21 2011 +0100" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon May 09 09:13:21 2011 -0700" }, "message": "drm/i915: fix intel_crtc_clock_get pipe reads after \"cleanup cleanup\"\n\nDespite the fixes in 548f245ba6a31 (drm/i915: fix per-pipe reads after\n\"cleanup\"), we missed one neighbouring read that was mistakenly replaced\nwith the reg value in 9db4a9c (drm/i915: cleanup per-pipe reg usage).\nThis was preventing us from correctly determining the mode the BIOS left\nthe panel in for machines that neither have an OpRegion nor access to\nthe VBT, (e.g. the EeePC 700).\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: stable@kernel.org\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "49183b2818de6899383bb82bc032f9344d6791ff", "tree": "772319c3c38dccb88e534665bb3a0f1e01c837d6", "parents": [ "31acbcc408f412d1ba73765b846c38642be553c3" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Apr 19 21:14:14 2011 +0100" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon May 09 09:13:20 2011 -0700" }, "message": "drm/i915: Only enable the plane after setting the fb base (pre-ILK)\n\nWhen enabling the plane, it is helpful to have already pointed that\nplane to valid memory or else we may incur the wrath of a PGTBL_ER.\nThis code preserved the behaviour from the bad old days for unknown\nreasons...\n\nFound by assert_fb_bound_for_plane().\n\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d36246\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "fd98a5d78062289552fff19afb9aa6918eaee63f", "tree": "7c27dbb0c531b99609c1b0c86145397e6b47231c", "parents": [ "7f4238a0ef8858e1f9b02a874b5818f6e9846673", "4f87af46107499415afd238be104587b5a9d7ac3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 09 09:09:04 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 09 09:09:04 2011 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/radeon/kms: add pci id to acer travelmate quirk for 5730\n drm/radeon: fix order of doing things in radeon_crtc_cursor_set\n drm: mm: fix debug output\n drm/radeon/kms: ATPX switcheroo fixes\n drm/nouveau: Fix a crash at card takedown for NV40 and older cards\n" }, { "commit": "14fdb152416c0fab80ecddf492c129d7da1bb8ef", "tree": "360f8a21c47af38edaf05b778a7dba23481e6215", "parents": [ "62d2f23e8bce3e7da4db53928e810fc8a474ce70" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Mon May 09 10:44:01 2011 -0400" }, "committer": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Mon May 09 10:48:47 2011 -0400" }, "message": "eeepc-laptop: Use ACPI handle to identify rfkill port\n\nThe ACPI notification we get from rfkill events on these machines gives\nus all the information we need to identify the port that\u0027s changed. Do\nso rather than assuming that it\u0027s always bus 1.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\n" }, { "commit": "62d2f23e8bce3e7da4db53928e810fc8a474ce70", "tree": "5f463c8a917131bd38e51bc585aec253e3ba0862", "parents": [ "6192fa7109fb33591fa1078c8c1981e39da02d2d" ], "author": { "name": "Mattia Dongili", "email": "malattia@linux.it", "time": "Mon May 09 10:20:29 2011 -0400" }, "committer": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Mon May 09 10:28:47 2011 -0400" }, "message": "[PATCH] sony-laptop: limit brightness range to DSDT provided ones\n\nThe new style brightness control provides an operating range of 9 values\n(seems consistent over a large number of models sharing the same\nbrightness control methods).\nRead and use the minimum and maximum values to limit the backlight\ninterface between those boundaries.\n\nSigned-off-by: Mattia Dongili \u003cmalattia@linux.it\u003e\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\n" }, { "commit": "6192fa7109fb33591fa1078c8c1981e39da02d2d", "tree": "d7fb75fcf18338d55316170f05e59f1980e5b134", "parents": [ "9fbdaeb4f4dd14a0caa9fc35c496d5440c251a3a" ], "author": { "name": "Mattia Dongili", "email": "malattia@linux.it", "time": "Tue Apr 05 23:38:36 2011 +0900" }, "committer": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Mon May 09 10:26:44 2011 -0400" }, "message": "sony-laptop: report failures on setting LCD brightness\n\nCheck if we were successful in setting the requested brightness and\nreport failure in that case.\n\nSigned-off-by: Mattia Dongili \u003cmalattia@linux.it\u003e\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\n" }, { "commit": "9fbdaeb4f4dd14a0caa9fc35c496d5440c251a3a", "tree": "465f9c81e13a1bfffe2583726e3ecfb3a36ca9e1", "parents": [ "8b061610dac3a3b89770c85ad63b481a47b0c38e" ], "author": { "name": "Manoj Iyer", "email": "manoj.iyer@canonical.com", "time": "Sun May 08 18:04:29 2011 -0400" }, "committer": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Mon May 09 10:25:13 2011 -0400" }, "message": "thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.\n\nThe newer Lenovo ThinkPads have HKEY HID of LEN0068 instead\nof IBM0068. Added new HID so that thinkpad_acpi module will\nauto load on these newer Lenovo ThinkPads.\n\nAcked-by: Henrique de Moraes Holschuh \u003chmh@hmh.eng.br\u003e\nCc: stable@kernel.org\nSigned-off-by: Manoj Iyer \u003cmanoj.iyer@canonical.com\u003e\nSigned-off-by: Andy Lutomirski \u003cluto@mit.edu\u003e\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\n" }, { "commit": "4f87af46107499415afd238be104587b5a9d7ac3", "tree": "7f94f42cac2671efbd6b8b636401041e67792602", "parents": [ "45e5f6a2ee6aac20e393d44f8a6762104426c81b" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed May 04 11:41:47 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 09 09:16:38 2011 +1000" }, "message": "drm/radeon/kms: add pci id to acer travelmate quirk for 5730\n\nFixes:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d34082\n\nReported by: Sampo Laaksonen \u003czhamahn@gmail.com\u003e\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "45e5f6a2ee6aac20e393d44f8a6762104426c81b", "tree": "fb607aaa76c95ffc1e7b540063f91972844e185c", "parents": [ "2bbd4492552867053b5a618a2474297e2b1c355d" ], "author": { "name": "Ilija Hadzic", "email": "ihadzic@research.bell-labs.com", "time": "Wed May 04 20:15:03 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 09 09:16:05 2011 +1000" }, "message": "drm/radeon: fix order of doing things in radeon_crtc_cursor_set\n\n if object pin or object lookup in radeon_cursor_set fail, the function\n could leave inconsistent mouse width and hight values in radeon_crtc\n fixed by moving cursor width and height assignments after all\n checks have passed\n\nSigned-off-by: Ilija Hadzic \u003cihadzic@research.bell-labs.com\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "2bbd4492552867053b5a618a2474297e2b1c355d", "tree": "13f6e611009a3175af2aeebecb5a1d65cf3cd205", "parents": [ "ff68146acb98b689947692bffd38ec4ad67eb1cb" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri May 06 23:47:53 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 09 09:14:45 2011 +1000" }, "message": "drm: mm: fix debug output\n\nThe looping helper didn\u0027t do anything due to a superficial\nsemicolon. Furthermore one of the two dump functions suffered\nfrom copy\u0026paste fail.\n\nWhile staring at the code I\u0027ve also noticed that the replace\nhelper (currently unused) is a bit broken.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ff68146acb98b689947692bffd38ec4ad67eb1cb", "tree": "76e5b8e196f595f14c5b4b6fd412b2cbd03a0d5e", "parents": [ "58e73811c85d0c0e74b8d300547bbc9abaf40a38", "7a7b94ad8ce3e24d4dd97b45583911e0f03aecd6" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 09 09:14:38 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 09 09:14:38 2011 +1000" }, "message": "Merge remote branch \u0027nouveau/drm-nouveau-fixes\u0027 of /ssd/git/drm-nouveau-next into drm-fixes\n\n* \u0027nouveau/drm-nouveau-fixes\u0027 of /ssd/git/drm-nouveau-next:\n drm/nouveau: Fix a crash at card takedown for NV40 and older cards\n" }, { "commit": "58e73811c85d0c0e74b8d300547bbc9abaf40a38", "tree": "74e3960d53b2c3ac4a4d93ca6853ab6fbe1feb11", "parents": [ "8aeb96f80232e9a701b5c4715504f4c9173978bd" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri May 06 01:42:49 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 09 09:14:35 2011 +1000" }, "message": "drm/radeon/kms: ATPX switcheroo fixes\n\nWhen we switch the display mux, also switch\nthe i2c mux. Also use the start and finish\nmethods to let the sbios know that the switch\nis happening.\n\nShould fix:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d35398\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9c412942a0bb19ba18f7bd939d42eff1e132a901", "tree": "03b789e7a2aee88dcad4a63cecf90c1b9a526629", "parents": [ "e328d410826d52e9ee348aff9064c4a207f2adb1" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue May 03 07:49:25 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 08 15:45:13 2011 -0700" }, "message": "ipheth: Properly distinguish length and alignment in URBs and skbs\n\nThe USB protocol this driver implements appears to require 2 bytes of\npadding in front of each received packet. This used to be equal to\nthe value of NET_IP_ALIGN on x86, so the driver abused that constant\nand mostly worked, but this is no longer the case. The driver also\nmixed up the URB and packet lengths, resulting in 2 bytes of junk at\nthe end of the skb.\n\nIntroduce a private constant for the 2 bytes of padding; fix this\nconfusion and check for the under-length case.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7a7b94ad8ce3e24d4dd97b45583911e0f03aecd6", "tree": "9f9c6ebd78c2d7c008cc194fe3e0e631a3d97270", "parents": [ "8aeb96f80232e9a701b5c4715504f4c9173978bd" ], "author": { "name": "Jimmy Rentz", "email": "jb17bsome@gmail.com", "time": "Sun Apr 17 16:15:09 2011 -0400" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon May 09 08:42:49 2011 +1000" }, "message": "drm/nouveau: Fix a crash at card takedown for NV40 and older cards\n\nNV40 and older cards (pre NV50) reserve a vram bo for the vga memory at\ncard init. This bo is then freed at card shutdown. The problem is that\nthe ttm bo vram manager was already freed. So a crash occurs when the\nvga bo is freed. The fix is to free the vga bo prior to freeing the ttm\nbo vram manager. There might be other solutions but this seemed the\nsimplest to me.\n\nSigned-off-by: Jimmy Rentz \u003cjb17bsome@gmail.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "e328d410826d52e9ee348aff9064c4a207f2adb1", "tree": "c019d0a1395c35607084c63f98732b6f0130a33b", "parents": [ "a294865978b701e4d0d90135672749531b9a900d" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Fri May 06 08:32:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 06 13:11:57 2011 -0700" }, "message": "vmxnet3: Consistently disable irqs when taking adapter-\u003ecmd_lock\n\nUsing the vmxnet3 driver produces a lockdep warning because\nvmxnet3_set_mc(), which is called with mc-\u003emca_lock held, takes\nadapter-\u003ecmd_lock. However, there are a couple of places where\nadapter-\u003ecmd_lock is taken with softirqs enabled, lockdep warns that a\nsoftirq that tries to take mc-\u003emca_lock could happen while\nadapter-\u003ecmd_lock is held, leading to an AB-BA deadlock.\n\nI\u0027m not sure if this is a real potential deadlock or not, but the\nsimplest and best fix seems to be simply to make sure we take cmd_lock\nwith spin_lock_irqsave() everywhere -- the places with plain spin_lock\njust look like oversights.\n\nThe full enormous lockdep warning is:\n\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n [ INFO: possible irq lock inversion dependency detected ]\n 2.6.39-rc6+ #1\n ---------------------------------------------------------\n ifconfig/567 just changed the state of lock:\n (\u0026(\u0026mc-\u003emca_lock)-\u003erlock){+.-...}, at: [\u003cffffffff81531e9f\u003e] mld_ifc_timer_expire+0xff/0x280\n but this lock took another, SOFTIRQ-unsafe lock in the past:\n (\u0026(\u0026adapter-\u003ecmd_lock)-\u003erlock){+.+...}\n\n and interrupts could create inverse lock ordering between them.\n\n other info that might help us debug this:\n 4 locks held by ifconfig/567:\n #0: (rtnl_mutex){+.+.+.}, at: [\u003cffffffff8147d547\u003e] rtnl_lock+0x17/0x20\n #1: ((inetaddr_chain).rwsem){.+.+.+}, at: [\u003cffffffff810896cf\u003e] __blocking_notifier_call_chain+0x5f/0xb0\n #2: (\u0026idev-\u003emc_ifc_timer){+.-...}, at: [\u003cffffffff8106f21b\u003e] run_timer_softirq+0xeb/0x3f0\n #3: (\u0026ndev-\u003elock){++.-..}, at: [\u003cffffffff81531dd2\u003e] mld_ifc_timer_expire+0x32/0x280\n\n the shortest dependencies between 2nd lock and 1st lock:\n -\u003e (\u0026(\u0026adapter-\u003ecmd_lock)-\u003erlock){+.+...} ops: 11 {\n HARDIRQ-ON-W at:\n [\u003cffffffff8109ad86\u003e] __lock_acquire+0x7f6/0x1e10\n [\u003cffffffff8109ca4d\u003e] lock_acquire+0x9d/0x130\n [\u003cffffffff81571156\u003e] _raw_spin_lock+0x36/0x70\n [\u003cffffffffa000d212\u003e] vmxnet3_alloc_intr_resources+0x22/0x230 [vmxnet3]\n [\u003cffffffffa0014031\u003e] vmxnet3_probe_device+0x5f6/0x15c5 [vmxnet3]\n [\u003cffffffff812df67f\u003e] local_pci_probe+0x5f/0xd0\n [\u003cffffffff812dfde9\u003e] pci_device_probe+0x119/0x120\n [\u003cffffffff81373df6\u003e] driver_probe_device+0x96/0x1c0\n [\u003cffffffff81373fcb\u003e] __driver_attach+0xab/0xb0\n [\u003cffffffff81372a1e\u003e] bus_for_each_dev+0x5e/0x90\n [\u003cffffffff81373a2e\u003e] driver_attach+0x1e/0x20\n [\u003cffffffff813735b8\u003e] bus_add_driver+0xc8/0x290\n [\u003cffffffff813745b6\u003e] driver_register+0x76/0x140\n [\u003cffffffff812e0046\u003e] __pci_register_driver+0x66/0xe0\n [\u003cffffffffa001b03a\u003e] serio_raw_poll+0x3a/0x60 [serio_raw]\n [\u003cffffffff81002165\u003e] do_one_initcall+0x45/0x190\n [\u003cffffffff810aa76b\u003e] sys_init_module+0xfb/0x250\n [\u003cffffffff8157a142\u003e] system_call_fastpath+0x16/0x1b\n SOFTIRQ-ON-W at:\n [\u003cffffffff8109adb7\u003e] __lock_acquire+0x827/0x1e10\n [\u003cffffffff8109ca4d\u003e] lock_acquire+0x9d/0x130\n [\u003cffffffff81571156\u003e] _raw_spin_lock+0x36/0x70\n [\u003cffffffffa000d212\u003e] vmxnet3_alloc_intr_resources+0x22/0x230 [vmxnet3]\n [\u003cffffffffa0014031\u003e] vmxnet3_probe_device+0x5f6/0x15c5 [vmxnet3]\n [\u003cffffffff812df67f\u003e] local_pci_probe+0x5f/0xd0\n [\u003cffffffff812dfde9\u003e] pci_device_probe+0x119/0x120\n [\u003cffffffff81373df6\u003e] driver_probe_device+0x96/0x1c0\n [\u003cffffffff81373fcb\u003e] __driver_attach+0xab/0xb0\n [\u003cffffffff81372a1e\u003e] bus_for_each_dev+0x5e/0x90\n [\u003cffffffff81373a2e\u003e] driver_attach+0x1e/0x20\n [\u003cffffffff813735b8\u003e] bus_add_driver+0xc8/0x290\n [\u003cffffffff813745b6\u003e] driver_register+0x76/0x140\n [\u003cffffffff812e0046\u003e] __pci_register_driver+0x66/0xe0\n [\u003cffffffffa001b03a\u003e] serio_raw_poll+0x3a/0x60 [serio_raw]\n [\u003cffffffff81002165\u003e] do_one_initcall+0x45/0x190\n [\u003cffffffff810aa76b\u003e] sys_init_module+0xfb/0x250\n [\u003cffffffff8157a142\u003e] system_call_fastpath+0x16/0x1b\n INITIAL USE at:\n [\u003cffffffff8109a9e9\u003e] __lock_acquire+0x459/0x1e10\n [\u003cffffffff8109ca4d\u003e] lock_acquire+0x9d/0x130\n [\u003cffffffff81571156\u003e] _raw_spin_lock+0x36/0x70\n [\u003cffffffffa000d212\u003e] vmxnet3_alloc_intr_resources+0x22/0x230 [vmxnet3]\n [\u003cffffffffa0014031\u003e] vmxnet3_probe_device+0x5f6/0x15c5 [vmxnet3]\n [\u003cffffffff812df67f\u003e] local_pci_probe+0x5f/0xd0\n [\u003cffffffff812dfde9\u003e] pci_device_probe+0x119/0x120\n [\u003cffffffff81373df6\u003e] driver_probe_device+0x96/0x1c0\n [\u003cffffffff81373fcb\u003e] __driver_attach+0xab/0xb0\n [\u003cffffffff81372a1e\u003e] bus_for_each_dev+0x5e/0x90\n [\u003cffffffff81373a2e\u003e] driver_attach+0x1e/0x20\n [\u003cffffffff813735b8\u003e] bus_add_driver+0xc8/0x290\n [\u003cffffffff813745b6\u003e] driver_register+0x76/0x140\n [\u003cffffffff812e0046\u003e] __pci_register_driver+0x66/0xe0\n [\u003cffffffffa001b03a\u003e] serio_raw_poll+0x3a/0x60 [serio_raw]\n [\u003cffffffff81002165\u003e] do_one_initcall+0x45/0x190\n [\u003cffffffff810aa76b\u003e] sys_init_module+0xfb/0x250\n [\u003cffffffff8157a142\u003e] system_call_fastpath+0x16/0x1b\n }\n ... key at: [\u003cffffffffa0017590\u003e] __key.42516+0x0/0xffffffffffffda70 [vmxnet3]\n ... acquired at:\n [\u003cffffffff8109ca4d\u003e] lock_acquire+0x9d/0x130\n [\u003cffffffff81571bb5\u003e] _raw_spin_lock_irqsave+0x55/0xa0\n [\u003cffffffffa000de27\u003e] vmxnet3_set_mc+0x97/0x1a0 [vmxnet3]\n [\u003cffffffff8146ffa0\u003e] __dev_set_rx_mode+0x40/0xb0\n [\u003cffffffff81470040\u003e] dev_set_rx_mode+0x30/0x50\n [\u003cffffffff81470127\u003e] __dev_open+0xc7/0x100\n [\u003cffffffff814703c1\u003e] __dev_change_flags+0xa1/0x180\n [\u003cffffffff81470568\u003e] dev_change_flags+0x28/0x70\n [\u003cffffffff814da960\u003e] devinet_ioctl+0x730/0x800\n [\u003cffffffff814db508\u003e] inet_ioctl+0x88/0xa0\n [\u003cffffffff814541f0\u003e] sock_do_ioctl+0x30/0x70\n [\u003cffffffff814542a9\u003e] sock_ioctl+0x79/0x2f0\n [\u003cffffffff81188798\u003e] do_vfs_ioctl+0x98/0x570\n [\u003cffffffff81188d01\u003e] sys_ioctl+0x91/0xa0\n [\u003cffffffff8157a142\u003e] system_call_fastpath+0x16/0x1b\n\n -\u003e (_xmit_ETHER){+.....} ops: 6 {\n HARDIRQ-ON-W at:\n [\u003cffffffff8109ad86\u003e] __lock_acquire+0x7f6/0x1e10\n [\u003cffffffff8109ca4d\u003e] lock_acquire+0x9d/0x130\n [\u003cffffffff8157124b\u003e] _raw_spin_lock_bh+0x3b/0x70\n [\u003cffffffff81475618\u003e] __dev_mc_add+0x38/0x90\n [\u003cffffffff814756a0\u003e] dev_mc_add+0x10/0x20\n [\u003cffffffff81532c9e\u003e] igmp6_group_added+0x10e/0x1b0\n [\u003cffffffff81533f2d\u003e] ipv6_dev_mc_inc+0x2cd/0x430\n [\u003cffffffff81515e17\u003e] ipv6_add_dev+0x357/0x450\n [\u003cffffffff81519f27\u003e] addrconf_notify+0x2f7/0xb10\n [\u003cffffffff81575c1c\u003e] notifier_call_chain+0x8c/0xc0\n [\u003cffffffff81089586\u003e] raw_notifier_call_chain+0x16/0x20\n [\u003cffffffff814689b7\u003e] call_netdevice_notifiers+0x37/0x70\n [\u003cffffffff8146a944\u003e] register_netdevice+0x244/0x2d0\n [\u003cffffffff8146aa0f\u003e] register_netdev+0x3f/0x60\n [\u003cffffffffa001419b\u003e] vmxnet3_probe_device+0x760/0x15c5 [vmxnet3]\n [\u003cffffffff812df67f\u003e] local_pci_probe+0x5f/0xd0\n [\u003cffffffff812dfde9\u003e] pci_device_probe+0x119/0x120\n [\u003cffffffff81373df6\u003e] driver_probe_device+0x96/0x1c0\n [\u003cffffffff81373fcb\u003e] __driver_attach+0xab/0xb0\n [\u003cffffffff81372a1e\u003e] bus_for_each_dev+0x5e/0x90\n [\u003cffffffff81373a2e\u003e] driver_attach+0x1e/0x20\n [\u003cffffffff813735b8\u003e] bus_add_driver+0xc8/0x290\n [\u003cffffffff813745b6\u003e] driver_register+0x76/0x140\n [\u003cffffffff812e0046\u003e] __pci_register_driver+0x66/0xe0\n [\u003cffffffffa001b03a\u003e] serio_raw_poll+0x3a/0x60 [serio_raw]\n [\u003cffffffff81002165\u003e] do_one_initcall+0x45/0x190\n [\u003cffffffff810aa76b\u003e] sys_init_module+0xfb/0x250\n [\u003cffffffff8157a142\u003e] system_call_fastpath+0x16/0x1b\n INITIAL USE at:\n [\u003cffffffff8109a9e9\u003e] __lock_acquire+0x459/0x1e10\n [\u003cffffffff8109ca4d\u003e] lock_acquire+0x9d/0x130\n [\u003cffffffff8157124b\u003e] _raw_spin_lock_bh+0x3b/0x70\n [\u003cffffffff81475618\u003e] __dev_mc_add+0x38/0x90\n [\u003cffffffff814756a0\u003e] dev_mc_add+0x10/0x20\n [\u003cffffffff81532c9e\u003e] igmp6_group_added+0x10e/0x1b0\n [\u003cffffffff81533f2d\u003e] ipv6_dev_mc_inc+0x2cd/0x430\n [\u003cffffffff81515e17\u003e] ipv6_add_dev+0x357/0x450\n [\u003cffffffff81519f27\u003e] addrconf_notify+0x2f7/0xb10\n [\u003cffffffff81575c1c\u003e] notifier_call_chain+0x8c/0xc0\n [\u003cffffffff81089586\u003e] raw_notifier_call_chain+0x16/0x20\n [\u003cffffffff814689b7\u003e] call_netdevice_notifiers+0x37/0x70\n [\u003cffffffff8146a944\u003e] register_netdevice+0x244/0x2d0\n [\u003cffffffff8146aa0f\u003e] register_netdev+0x3f/0x60\n [\u003cffffffffa001419b\u003e] vmxnet3_probe_device+0x760/0x15c5 [vmxnet3]\n [\u003cffffffff812df67f\u003e] local_pci_probe+0x5f/0xd0\n [\u003cffffffff812dfde9\u003e] pci_device_probe+0x119/0x120\n [\u003cffffffff81373df6\u003e] driver_probe_device+0x96/0x1c0\n [\u003cffffffff81373fcb\u003e] __driver_attach+0xab/0xb0\n [\u003cffffffff81372a1e\u003e] bus_for_each_dev+0x5e/0x90\n [\u003cffffffff81373a2e\u003e] driver_attach+0x1e/0x20\n [\u003cffffffff813735b8\u003e] bus_add_driver+0xc8/0x290\n [\u003cffffffff813745b6\u003e] driver_register+0x76/0x140\n [\u003cffffffff812e0046\u003e] __pci_register_driver+0x66/0xe0\n [\u003cffffffffa001b03a\u003e] serio_raw_poll+0x3a/0x60 [serio_raw]\n [\u003cffffffff81002165\u003e] do_one_initcall+0x45/0x190\n [\u003cffffffff810aa76b\u003e] sys_init_module+0xfb/0x250\n [\u003cffffffff8157a142\u003e] system_call_fastpath+0x16/0x1b\n }\n ... key at: [\u003cffffffff827fd868\u003e] netdev_addr_lock_key+0x8/0x1e0\n ... acquired at:\n [\u003cffffffff8109ca4d\u003e] lock_acquire+0x9d/0x130\n [\u003cffffffff8157124b\u003e] _raw_spin_lock_bh+0x3b/0x70\n [\u003cffffffff81475618\u003e] __dev_mc_add+0x38/0x90\n [\u003cffffffff814756a0\u003e] dev_mc_add+0x10/0x20\n [\u003cffffffff81532c9e\u003e] igmp6_group_added+0x10e/0x1b0\n [\u003cffffffff81533f2d\u003e] ipv6_dev_mc_inc+0x2cd/0x430\n [\u003cffffffff81515e17\u003e] ipv6_add_dev+0x357/0x450\n [\u003cffffffff81519f27\u003e] addrconf_notify+0x2f7/0xb10\n [\u003cffffffff81575c1c\u003e] notifier_call_chain+0x8c/0xc0\n [\u003cffffffff81089586\u003e] raw_notifier_call_chain+0x16/0x20\n [\u003cffffffff814689b7\u003e] call_netdevice_notifiers+0x37/0x70\n [\u003cffffffff8146a944\u003e] register_netdevice+0x244/0x2d0\n [\u003cffffffff8146aa0f\u003e] register_netdev+0x3f/0x60\n [\u003cffffffffa001419b\u003e] vmxnet3_probe_device+0x760/0x15c5 [vmxnet3]\n [\u003cffffffff812df67f\u003e] local_pci_probe+0x5f/0xd0\n [\u003cffffffff812dfde9\u003e] pci_device_probe+0x119/0x120\n [\u003cffffffff81373df6\u003e] driver_probe_device+0x96/0x1c0\n [\u003cffffffff81373fcb\u003e] __driver_attach+0xab/0xb0\n [\u003cffffffff81372a1e\u003e] bus_for_each_dev+0x5e/0x90\n [\u003cffffffff81373a2e\u003e] driver_attach+0x1e/0x20\n [\u003cffffffff813735b8\u003e] bus_add_driver+0xc8/0x290\n [\u003cffffffff813745b6\u003e] driver_register+0x76/0x140\n [\u003cffffffff812e0046\u003e] __pci_register_driver+0x66/0xe0\n [\u003cffffffffa001b03a\u003e] serio_raw_poll+0x3a/0x60 [serio_raw]\n [\u003cffffffff81002165\u003e] do_one_initcall+0x45/0x190\n [\u003cffffffff810aa76b\u003e] sys_init_module+0xfb/0x250\n [\u003cffffffff8157a142\u003e] system_call_fastpath+0x16/0x1b\n\n -\u003e (\u0026(\u0026mc-\u003emca_lock)-\u003erlock){+.-...} ops: 6 {\n HARDIRQ-ON-W at:\n [\u003cffffffff8109ad86\u003e] __lock_acquire+0x7f6/0x1e10\n [\u003cffffffff8109ca4d\u003e] lock_acquire+0x9d/0x130\n [\u003cffffffff8157124b\u003e] _raw_spin_lock_bh+0x3b/0x70\n [\u003cffffffff81532bd5\u003e] igmp6_group_added+0x45/0x1b0\n [\u003cffffffff81533f2d\u003e] ipv6_dev_mc_inc+0x2cd/0x430\n [\u003cffffffff81515e17\u003e] ipv6_add_dev+0x357/0x450\n [\u003cffffffff81ce0d16\u003e] addrconf_init+0x4e/0x183\n [\u003cffffffff81ce0ba1\u003e] inet6_init+0x191/0x2a6\n [\u003cffffffff81002165\u003e] do_one_initcall+0x45/0x190\n [\u003cffffffff81ca4d3f\u003e] kernel_init+0xe3/0x168\n [\u003cffffffff8157b2e4\u003e] kernel_thread_helper+0x4/0x10\n IN-SOFTIRQ-W at:\n [\u003cffffffff8109ad5e\u003e] __lock_acquire+0x7ce/0x1e10\n [\u003cffffffff8109ca4d\u003e] lock_acquire+0x9d/0x130\n [\u003cffffffff8157124b\u003e] _raw_spin_lock_bh+0x3b/0x70\n [\u003cffffffff81531e9f\u003e] mld_ifc_timer_expire+0xff/0x280\n [\u003cffffffff8106f2a9\u003e] run_timer_softirq+0x179/0x3f0\n [\u003cffffffff810666d0\u003e] __do_softirq+0xc0/0x210\n [\u003cffffffff8157b3dc\u003e] call_softirq+0x1c/0x30\n [\u003cffffffff8100d42d\u003e] do_softirq+0xad/0xe0\n [\u003cffffffff81066afe\u003e] irq_exit+0x9e/0xb0\n [\u003cffffffff8157bd40\u003e] smp_apic_timer_interrupt+0x70/0x9b\n [\u003cffffffff8157ab93\u003e] apic_timer_interrupt+0x13/0x20\n [\u003cffffffff8149d857\u003e] rt_do_flush+0x87/0x2a0\n [\u003cffffffff814a16b6\u003e] rt_cache_flush+0x46/0x60\n [\u003cffffffff814e36e0\u003e] fib_disable_ip+0x40/0x60\n [\u003cffffffff814e5447\u003e] fib_inetaddr_event+0xd7/0xe0\n [\u003cffffffff81575c1c\u003e] notifier_call_chain+0x8c/0xc0\n [\u003cffffffff810896e8\u003e] __blocking_notifier_call_chain+0x78/0xb0\n [\u003cffffffff81089736\u003e] blocking_notifier_call_chain+0x16/0x20\n [\u003cffffffff814d8021\u003e] __inet_del_ifa+0xf1/0x2e0\n [\u003cffffffff814d8223\u003e] inet_del_ifa+0x13/0x20\n [\u003cffffffff814da731\u003e] devinet_ioctl+0x501/0x800\n [\u003cffffffff814db508\u003e] inet_ioctl+0x88/0xa0\n [\u003cffffffff814541f0\u003e] sock_do_ioctl+0x30/0x70\n [\u003cffffffff814542a9\u003e] sock_ioctl+0x79/0x2f0\n [\u003cffffffff81188798\u003e] do_vfs_ioctl+0x98/0x570\n [\u003cffffffff81188d01\u003e] sys_ioctl+0x91/0xa0\n [\u003cffffffff8157a142\u003e] system_call_fastpath+0x16/0x1b\n INITIAL USE at:\n [\u003cffffffff8109a9e9\u003e] __lock_acquire+0x459/0x1e10\n [\u003cffffffff8109ca4d\u003e] lock_acquire+0x9d/0x130\n [\u003cffffffff8157124b\u003e] _raw_spin_lock_bh+0x3b/0x70\n [\u003cffffffff81532bd5\u003e] igmp6_group_added+0x45/0x1b0\n [\u003cffffffff81533f2d\u003e] ipv6_dev_mc_inc+0x2cd/0x430\n [\u003cffffffff81515e17\u003e] ipv6_add_dev+0x357/0x450\n [\u003cffffffff81ce0d16\u003e] addrconf_init+0x4e/0x183\n [\u003cffffffff81ce0ba1\u003e] inet6_init+0x191/0x2a6\n [\u003cffffffff81002165\u003e] do_one_initcall+0x45/0x190\n [\u003cffffffff81ca4d3f\u003e] kernel_init+0xe3/0x168\n [\u003cffffffff8157b2e4\u003e] kernel_thread_helper+0x4/0x10\n }\n ... key at: [\u003cffffffff82801be2\u003e] __key.40877+0x0/0x8\n ... acquired at:\n [\u003cffffffff810997bc\u003e] check_usage_forwards+0x9c/0x110\n [\u003cffffffff8109a32c\u003e] mark_lock+0x19c/0x400\n [\u003cffffffff8109ad5e\u003e] __lock_acquire+0x7ce/0x1e10\n [\u003cffffffff8109ca4d\u003e] lock_acquire+0x9d/0x130\n [\u003cffffffff8157124b\u003e] _raw_spin_lock_bh+0x3b/0x70\n [\u003cffffffff81531e9f\u003e] mld_ifc_timer_expire+0xff/0x280\n [\u003cffffffff8106f2a9\u003e] run_timer_softirq+0x179/0x3f0\n [\u003cffffffff810666d0\u003e] __do_softirq+0xc0/0x210\n [\u003cffffffff8157b3dc\u003e] call_softirq+0x1c/0x30\n [\u003cffffffff8100d42d\u003e] do_softirq+0xad/0xe0\n [\u003cffffffff81066afe\u003e] irq_exit+0x9e/0xb0\n [\u003cffffffff8157bd40\u003e] smp_apic_timer_interrupt+0x70/0x9b\n [\u003cffffffff8157ab93\u003e] apic_timer_interrupt+0x13/0x20\n [\u003cffffffff8149d857\u003e] rt_do_flush+0x87/0x2a0\n [\u003cffffffff814a16b6\u003e] rt_cache_flush+0x46/0x60\n [\u003cffffffff814e36e0\u003e] fib_disable_ip+0x40/0x60\n [\u003cffffffff814e5447\u003e] fib_inetaddr_event+0xd7/0xe0\n [\u003cffffffff81575c1c\u003e] notifier_call_chain+0x8c/0xc0\n [\u003cffffffff810896e8\u003e] __blocking_notifier_call_chain+0x78/0xb0\n [\u003cffffffff81089736\u003e] blocking_notifier_call_chain+0x16/0x20\n [\u003cffffffff814d8021\u003e] __inet_del_ifa+0xf1/0x2e0\n [\u003cffffffff814d8223\u003e] inet_del_ifa+0x13/0x20\n [\u003cffffffff814da731\u003e] devinet_ioctl+0x501/0x800\n [\u003cffffffff814db508\u003e] inet_ioctl+0x88/0xa0\n [\u003cffffffff814541f0\u003e] sock_do_ioctl+0x30/0x70\n [\u003cffffffff814542a9\u003e] sock_ioctl+0x79/0x2f0\n [\u003cffffffff81188798\u003e] do_vfs_ioctl+0x98/0x570\n [\u003cffffffff81188d01\u003e] sys_ioctl+0x91/0xa0\n [\u003cffffffff8157a142\u003e] system_call_fastpath+0x16/0x1b\n\n stack backtrace:\n Pid: 567, comm: ifconfig Not tainted 2.6.39-rc6+ #1\n Call Trace:\n \u003cIRQ\u003e [\u003cffffffff810996f6\u003e] print_irq_inversion_bug+0x146/0x170\n [\u003cffffffff81099720\u003e] ? print_irq_inversion_bug+0x170/0x170\n [\u003cffffffff810997bc\u003e] check_usage_forwards+0x9c/0x110\n [\u003cffffffff8109a32c\u003e] mark_lock+0x19c/0x400\n [\u003cffffffff8109ad5e\u003e] __lock_acquire+0x7ce/0x1e10\n [\u003cffffffff8109a383\u003e] ? mark_lock+0x1f3/0x400\n [\u003cffffffff8109b497\u003e] ? __lock_acquire+0xf07/0x1e10\n [\u003cffffffff81012255\u003e] ? native_sched_clock+0x15/0x70\n [\u003cffffffff8109ca4d\u003e] lock_acquire+0x9d/0x130\n [\u003cffffffff81531e9f\u003e] ? mld_ifc_timer_expire+0xff/0x280\n [\u003cffffffff8109759d\u003e] ? lock_release_holdtime+0x3d/0x1a0\n [\u003cffffffff8157124b\u003e] _raw_spin_lock_bh+0x3b/0x70\n [\u003cffffffff81531e9f\u003e] ? mld_ifc_timer_expire+0xff/0x280\n [\u003cffffffff8157170b\u003e] ? _raw_spin_unlock+0x2b/0x40\n [\u003cffffffff81531e9f\u003e] mld_ifc_timer_expire+0xff/0x280\n [\u003cffffffff8106f2a9\u003e] run_timer_softirq+0x179/0x3f0\n [\u003cffffffff8106f21b\u003e] ? run_timer_softirq+0xeb/0x3f0\n [\u003cffffffff810122b9\u003e] ? sched_clock+0x9/0x10\n [\u003cffffffff81531da0\u003e] ? mld_gq_timer_expire+0x30/0x30\n [\u003cffffffff810666d0\u003e] __do_softirq+0xc0/0x210\n [\u003cffffffff8109455f\u003e] ? tick_program_event+0x1f/0x30\n [\u003cffffffff8157b3dc\u003e] call_softirq+0x1c/0x30\n [\u003cffffffff8100d42d\u003e] do_softirq+0xad/0xe0\n [\u003cffffffff81066afe\u003e] irq_exit+0x9e/0xb0\n [\u003cffffffff8157bd40\u003e] smp_apic_timer_interrupt+0x70/0x9b\n [\u003cffffffff8157ab93\u003e] apic_timer_interrupt+0x13/0x20\n \u003cEOI\u003e [\u003cffffffff81571f14\u003e] ? retint_restore_args+0x13/0x13\n [\u003cffffffff810974a7\u003e] ? lock_is_held+0x17/0xd0\n [\u003cffffffff8149d857\u003e] rt_do_flush+0x87/0x2a0\n [\u003cffffffff814a16b6\u003e] rt_cache_flush+0x46/0x60\n [\u003cffffffff814e36e0\u003e] fib_disable_ip+0x40/0x60\n [\u003cffffffff814e5447\u003e] fib_inetaddr_event+0xd7/0xe0\n [\u003cffffffff81575c1c\u003e] notifier_call_chain+0x8c/0xc0\n [\u003cffffffff810896e8\u003e] __blocking_notifier_call_chain+0x78/0xb0\n [\u003cffffffff81089736\u003e] blocking_notifier_call_chain+0x16/0x20\n [\u003cffffffff814d8021\u003e] __inet_del_ifa+0xf1/0x2e0\n [\u003cffffffff814d8223\u003e] inet_del_ifa+0x13/0x20\n [\u003cffffffff814da731\u003e] devinet_ioctl+0x501/0x800\n [\u003cffffffff8108a3af\u003e] ? local_clock+0x6f/0x80\n [\u003cffffffff81575898\u003e] ? do_page_fault+0x268/0x560\n [\u003cffffffff814db508\u003e] inet_ioctl+0x88/0xa0\n [\u003cffffffff814541f0\u003e] sock_do_ioctl+0x30/0x70\n [\u003cffffffff814542a9\u003e] sock_ioctl+0x79/0x2f0\n [\u003cffffffff810dfe87\u003e] ? __call_rcu+0xa7/0x190\n [\u003cffffffff81188798\u003e] do_vfs_ioctl+0x98/0x570\n [\u003cffffffff8117737e\u003e] ? fget_light+0x33e/0x430\n [\u003cffffffff81571ef9\u003e] ? retint_swapgs+0x13/0x1b\n [\u003cffffffff81188d01\u003e] sys_ioctl+0x91/0xa0\n [\u003cffffffff8157a142\u003e] system_call_fastpath+0x16/0x1b\n\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\nSigned-off-by: Shreyas N Bhatewara \u003csbhatewara@vmware.com\u003e\nSigned-off-by: Scott J. Goldman \u003cscottjg@vmware.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e5e06985bec89414ce2b3f301c24d884f609b020", "tree": "da702c3e4facd0b41faaba34ea98aa3556ce525a", "parents": [ "fa039d5f6b126fbd65eefa05db2f67e44df8f121", "c055f5b2614b4f758ae6cc86733f31fa4c2c5844" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 06 10:01:54 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 06 10:01:54 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:\n [SCSI] fix oops in scsi_run_queue()\n" }, { "commit": "52fe116376129b29572f55acc9c73ebd485052c9", "tree": "b834be7c33e2b9b2ecf78edab7299050575cf3be", "parents": [ "56f3aeb2c14b9d000dfc77f352250bc3b67af5c0" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri May 06 08:16:51 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri May 06 08:16:51 2011 +0100" }, "message": "ARM: RiscPC: acornfb: fix section mismatches\n\nWARNING: drivers/video/built-in.o(.devinit.text+0x38): Section mismatch in reference from the function acornfb_probe() to the function .init.text:acornfb_setup()\nThe function __devinit acornfb_probe() references\na function __init acornfb_setup().\nIf acornfb_setup is only used by acornfb_probe then\nannotate acornfb_setup with a matching annotation.\n\nWARNING: drivers/video/built-in.o(.devinit.text+0x3c): Section mismatch in reference from the function acornfb_probe() to the function .init.text:acornfb_init_fbinfo()\nThe function __devinit acornfb_probe() references\na function __init acornfb_init_fbinfo().\nIf acornfb_init_fbinfo is only used by acornfb_probe then\nannotate acornfb_init_fbinfo with a matching annotation.\n\nWARNING: drivers/video/built-in.o(.devinit.text+0x4c0): Section mismatch in reference from the function acornfb_probe() to the (unknown reference) .init.data:(unknown)\nThe function __devinit acornfb_probe() references\na (unknown reference) __initdata (unknown).\nIf (unknown) is only used by acornfb_probe then\nannotate (unknown) with a matching annotation.\n\nWARNING: drivers/video/built-in.o(.devinit.text+0x4c8): Section mismatch in reference from the function acornfb_probe() to the (unknown reference) .init.data:(unknown)\nThe function __devinit acornfb_probe() references\na (unknown reference) __initdata (unknown).\nIf (unknown) is only used by acornfb_probe then\nannotate (unknown) with a matching annotation.\n\nWARNING: drivers/video/built-in.o(.devinit.text+0x4cc): Section mismatch in reference from the function acornfb_probe() to the (unknown reference) .init.data:(unknown)\nThe function __devinit acornfb_probe() references\na (unknown reference) __initdata (unknown).\nIf (unknown) is only used by acornfb_probe then\nannotate (unknown) with a matching annotation.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "56f3aeb2c14b9d000dfc77f352250bc3b67af5c0", "tree": "6e0ab3d79da15087df628809ef97c48713eb6aca", "parents": [ "5895198c56d131cc696556a45f7ff0ea99ac297b" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri May 06 08:14:57 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri May 06 08:14:57 2011 +0100" }, "message": "ARM: RiscPC: etherh: fix section mismatches\n\nWARNING: drivers/net/arm/built-in.o(.data+0x0): Section mismatch in reference from the variable etherh_driver to the function .init.text:etherh_probe()\nThe variable etherh_driver references\nthe function __init etherh_probe()\nIf the reference is valid then annotate the\nvariable with __init* or __refdata (see linux/init.h) or name the variable:\n*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "87e9af6cc67d842cd92b52b81f3f14e665e7ab05", "tree": "965631795b4d21356a8d9a1935000fe9361c6ec5", "parents": [ "75bd0cbdc21d80859c80bdd5dd00125c1a3ccbca" ], "author": { "name": "Kurt Van Dijck", "email": "kurt.van.dijck@eia.be", "time": "Mon May 02 04:50:48 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 05 11:02:22 2011 -0700" }, "message": "can: fix SJA1000 dlc for RTR packets\n\nRTR frames do have a valid data length code on CAN.\nThe driver for SJA1000 did not handle that situation properly.\n\nSigned-off-by: Kurt Van Dijck \u003ckurt.van.dijck@eia.be\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "75bd0cbdc21d80859c80bdd5dd00125c1a3ccbca", "tree": "6afd25673b51f0a9fb03215c3c31d0c3b6a8dde6", "parents": [ "64f3b9e203bd06855072e295557dca1485a2ecba" ], "author": { "name": "Ming Lei", "email": "tom.leiming@gmail.com", "time": "Thu Apr 28 22:37:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 05 10:39:43 2011 -0700" }, "message": "usbnet: runtime pm: fix out of memory\n\nThis patch makes use of the EVENT_DEV_OPEN flag introduced recently to\nfix one out of memory issue, which can be reproduced on omap3/4 based\npandaboard/beagle XM easily with steps below:\n\n\t- enable runtime pm\n\techo auto \u003e /sys/devices/platform/usbhs-omap.0/ehci-omap.0/usb1/1-1/1-1.1/power/control\n\n\t- ifconfig eth0 up\n\n\t- then out of memroy happened, see [1] for kernel message.\n\nFollows my analysis:\n\t- \u0027ifconfig eth0 up\u0027 brings eth0 out of suspend, and usbnet_resume\n\tis called to schedule dev-\u003ebh, then rx urbs are submited to prepare for\n\trecieving data;\n\n\t- some usbnet devices will produce garbage rx packets flood if\n\tinfo-\u003ereset is not called in usbnet_open.\n\n\t- so there is no enough chances for usbnet_bh to handle and release\n\trecieved skb buffers since many rx interrupts consumes cpu, so out of memory\n\tfor atomic allocation in rx_submit happened.\n\nThis patch fixes the issue by simply not allowing schedule of usbnet_bh until device\nis opened.\n\n[1], dmesg\n[ 234.712005] smsc95xx 1-1.1:1.0: rpm_resume flags 0x4\n[ 234.712066] usb 1-1.1: rpm_resume flags 0x0\n[ 234.712066] usb 1-1: rpm_resume flags 0x0\n[ 234.712097] usb usb1: rpm_resume flags 0x0\n[ 234.712127] usb usb1: usb auto-resume\n[ 234.712158] ehci-omap ehci-omap.0: resume root hub\n[ 234.754028] hub 1-0:1.0: hub_resume\n[ 234.754821] hub 1-0:1.0: port 1: status 0507 change 0000\n[ 234.756011] hub 1-0:1.0: state 7 ports 3 chg 0000 evt 0000\n[ 234.756042] hub 1-0:1.0: rpm_resume flags 0x4\n[ 234.756072] usb usb1: rpm_resume flags 0x0\n[ 234.756164] usb usb1: rpm_resume returns 1\n[ 234.756195] hub 1-0:1.0: rpm_resume returns 0\n[ 234.756195] hub 1-0:1.0: rpm_suspend flags 0x4\n[ 234.756225] hub 1-0:1.0: rpm_suspend returns 0\n[ 234.756256] usb usb1: rpm_resume returns 0\n[ 234.757141] usb 1-1: usb auto-resume\n[ 234.793151] ehci-omap ehci-omap.0: GetStatus port:1 status 001005 0 ACK POWER sig\u003dse0 PE CONNECT\n[ 234.816558] usb 1-1: finish resume\n[ 234.817871] hub 1-1:1.0: hub_resume\n[ 234.818420] hub 1-1:1.0: port 1: status 0507 change 0000\n[ 234.820495] ehci-omap ehci-omap.0: reused qh eec50220 schedule\n[ 234.820495] usb 1-1: link qh256-0001/eec50220 start 1 [1/0 us]\n[ 234.820587] usb 1-1: rpm_resume returns 0\n[ 234.820800] hub 1-1:1.0: state 7 ports 5 chg 0000 evt 0000\n[ 234.820800] hub 1-1:1.0: rpm_resume flags 0x4\n[ 234.820831] hub 1-1:1.0: rpm_resume returns 0\n[ 234.820861] hub 1-1:1.0: rpm_suspend flags 0x4\n[ 234.820861] hub 1-1:1.0: rpm_suspend returns 0\n[ 234.821777] usb 1-1.1: usb auto-resume\n[ 234.868591] hub 1-1:1.0: state 7 ports 5 chg 0000 evt 0002\n[ 234.868591] hub 1-1:1.0: rpm_resume flags 0x4\n[ 234.868621] hub 1-1:1.0: rpm_resume returns 0\n[ 234.868652] hub 1-1:1.0: rpm_suspend flags 0x4\n[ 234.868652] hub 1-1:1.0: rpm_suspend returns 0\n[ 234.879486] usb 1-1.1: finish resume\n[ 234.880279] usb 1-1.1: rpm_resume returns 0\n[ 234.880310] smsc95xx 1-1.1:1.0: rpm_resume returns 0\n[ 238.880187] ksoftirqd/0: page allocation failure. order:0, mode:0x20\n[ 238.880218] Backtrace:\n[ 238.880249] [\u003cc01b9800\u003e] (dump_backtrace+0x0/0xf8) from [\u003cc065e1dc\u003e] (dump_stack+0x18/0x1c)\n[ 238.880249] r6:00000000 r5:00000000 r4:00000020 r3:00000002\n[ 238.880310] [\u003cc065e1c4\u003e] (dump_stack+0x0/0x1c) from [\u003cc026ece4\u003e] (__alloc_pages_nodemask+0x620/0x724)\n[ 238.880340] [\u003cc026e6c4\u003e] (__alloc_pages_nodemask+0x0/0x724) from [\u003cc02986d4\u003e] (kmem_getpages.clone.34+0x34/0xc8)\n[ 238.880371] [\u003cc02986a0\u003e] (kmem_getpages.clone.34+0x0/0xc8) from [\u003cc02988f8\u003e] (cache_grow.clone.42+0x84/0x154)\n[ 238.880371] r6:ef871aa4 r5:ef871a80 r4:ef81fd40 r3:00000020\n[ 238.880401] [\u003cc0298874\u003e] (cache_grow.clone.42+0x0/0x154) from [\u003cc0298b64\u003e] (cache_alloc_refill+0x19c/0x1f0)\n[ 238.880432] [\u003cc02989c8\u003e] (cache_alloc_refill+0x0/0x1f0) from [\u003cc0299804\u003e] (kmem_cache_alloc+0x90/0x190)\n[ 238.880462] [\u003cc0299774\u003e] (kmem_cache_alloc+0x0/0x190) from [\u003cc052e260\u003e] (__alloc_skb+0x34/0xe8)\n[ 238.880493] [\u003cc052e22c\u003e] (__alloc_skb+0x0/0xe8) from [\u003cbf0509f4\u003e] (rx_submit+0x2c/0x1d4 [usbnet])\n[ 238.880523] [\u003cbf0509c8\u003e] (rx_submit+0x0/0x1d4 [usbnet]) from [\u003cbf050d38\u003e] (rx_complete+0x19c/0x1b0 [usbnet])\n[ 238.880737] [\u003cbf050b9c\u003e] (rx_complete+0x0/0x1b0 [usbnet]) from [\u003cbf006fd0\u003e] (usb_hcd_giveback_urb+0xa8/0xf4 [usbcore])\n[ 238.880737] r8:eeeced34 r7:eeecec00 r6:eeecec00 r5:00000000 r4:eec2dd20\n[ 238.880767] r3:bf050b9c\n[ 238.880859] [\u003cbf006f28\u003e] (usb_hcd_giveback_urb+0x0/0xf4 [usbcore]) from [\u003cbf03c8f8\u003e] (ehci_urb_done+0xb0/0xbc [ehci_hcd])\n[ 238.880859] r6:00000000 r5:eec2dd20 r4:eeeced44 r3:eec2dd34\n[ 238.880920] [\u003cbf03c848\u003e] (ehci_urb_done+0x0/0xbc [ehci_hcd]) from [\u003cbf040204\u003e] (qh_completions+0x308/0x3bc [ehci_hcd])\n[ 238.880920] r7:00000000 r6:eeda21a0 r5:ffdfe3c0 r4:eeda21ac\n[ 238.880981] [\u003cbf03fefc\u003e] (qh_completions+0x0/0x3bc [ehci_hcd]) from [\u003cbf040ef8\u003e] (scan_async+0xb0/0x16c [ehci_hcd])\n[ 238.881011] [\u003cbf040e48\u003e] (scan_async+0x0/0x16c [ehci_hcd]) from [\u003cbf040fec\u003e] (ehci_work+0x38/0x90 [ehci_hcd])\n[ 238.881042] [\u003cbf040fb4\u003e] (ehci_work+0x0/0x90 [ehci_hcd]) from [\u003cbf042940\u003e] (ehci_irq+0x300/0x34c [ehci_hcd])\n[ 238.881072] r4:eeeced34 r3:00000001\n[ 238.881134] [\u003cbf042640\u003e] (ehci_irq+0x0/0x34c [ehci_hcd]) from [\u003cbf006828\u003e] (usb_hcd_irq+0x40/0xac [usbcore])\n[ 238.881195] [\u003cbf0067e8\u003e] (usb_hcd_irq+0x0/0xac [usbcore]) from [\u003cc0239764\u003e] (handle_irq_event_percpu+0xb8/0x240)\n[ 238.881225] r6:eec504e0 r5:0000006d r4:eec504e0 r3:bf0067e8\n[ 238.881256] [\u003cc02396ac\u003e] (handle_irq_event_percpu+0x0/0x240) from [\u003cc0239930\u003e] (handle_irq_event+0x44/0x64)\n[ 238.881256] [\u003cc02398ec\u003e] (handle_irq_event+0x0/0x64) from [\u003cc023bbd0\u003e] (handle_level_irq+0xe0/0x114)\n[ 238.881286] r6:0000006d r5:c080c14c r4:c080c100 r3:00020000\n[ 238.881317] [\u003cc023baf0\u003e] (handle_level_irq+0x0/0x114) from [\u003cc01ab090\u003e] (asm_do_IRQ+0x90/0xd0)\n[ 238.881317] r5:00000000 r4:0000006d\n[ 238.881347] [\u003cc01ab000\u003e] (asm_do_IRQ+0x0/0xd0) from [\u003cc06624d0\u003e] (__irq_svc+0x50/0x134)\n[ 238.881378] Exception stack(0xef837e20 to 0xef837e68)\n[ 238.881378] 7e20: 00000001 00185610 016cc000 c00490c0 eb380000 ef800540 00000020 00004ae0\n[ 238.881408] 7e40: 00000020 bf0509f4 60000013 ef837e9c ef837e40 ef837e68 c0226f0c c0298ca0\n[ 238.881408] 7e60: 20000013 ffffffff\n[ 238.881408] r5:fa240100 r4:ffffffff\n[ 238.881439] [\u003cc0298bb8\u003e] (__kmalloc_track_caller+0x0/0x1d0) from [\u003cc052e284\u003e] (__alloc_skb+0x58/0xe8)\n[ 238.881469] [\u003cc052e22c\u003e] (__alloc_skb+0x0/0xe8) from [\u003cbf0509f4\u003e] (rx_submit+0x2c/0x1d4 [usbnet])\n[ 238.881500] [\u003cbf0509c8\u003e] (rx_submit+0x0/0x1d4 [usbnet]) from [\u003cbf0513d8\u003e] (usbnet_bh+0x1b4/0x250 [usbnet])\n[ 238.881530] [\u003cbf051224\u003e] (usbnet_bh+0x0/0x250 [usbnet]) from [\u003cc01f912c\u003e] (tasklet_action+0xb0/0x1f8)\n[ 238.881530] r6:00000000 r5:ef9757f0 r4:ef9757ec r3:bf051224\n[ 238.881561] [\u003cc01f907c\u003e] (tasklet_action+0x0/0x1f8) from [\u003cc01f97ac\u003e] (__do_softirq+0x140/0x290)\n[ 238.881561] r8:00000006 r7:00000101 r6:00000000 r5:c0806098 r4:00000001\n[ 238.881591] r3:c01f907c\n[ 238.881622] [\u003cc01f966c\u003e] (__do_softirq+0x0/0x290) from [\u003cc01f99cc\u003e] (run_ksoftirqd+0xd0/0x1f4)\n[ 238.881622] [\u003cc01f98fc\u003e] (run_ksoftirqd+0x0/0x1f4) from [\u003cc02113b0\u003e] (kthread+0x90/0x98)\n[ 238.881652] r7:00000013 r6:c01f98fc r5:00000000 r4:ef831efc\n[ 238.881683] [\u003cc0211320\u003e] (kthread+0x0/0x98) from [\u003cc01f62f4\u003e] (do_exit+0x0/0x374)\n[ 238.881713] r6:c01f62f4 r5:c0211320 r4:ef831efc\n[ 238.881713] Mem-info:\n[ 238.881744] Normal per-cpu:\n[ 238.881744] CPU 0: hi: 186, btch: 31 usd: 38\n[ 238.881744] CPU 1: hi: 186, btch: 31 usd: 169\n[ 238.881774] HighMem per-cpu:\n[ 238.881774] CPU 0: hi: 90, btch: 15 usd: 66\n[ 238.881774] CPU 1: hi: 90, btch: 15 usd: 86\n[ 238.881805] active_anon:544 inactive_anon:71 isolated_anon:0\n[ 238.881805] active_file:926 inactive_file:2538 isolated_file:0\n[ 238.881805] unevictable:0 dirty:10 writeback:0 unstable:0\n[ 238.881805] free:57782 slab_reclaimable:864 slab_unreclaimable:186898\n[ 238.881805] mapped:632 shmem:144 pagetables:50 bounce:0\n[ 238.881835] Normal free:1328kB min:3532kB low:4412kB high:5296kB active_anon:0kB inactive_anon:0kB active_file:880kB inactive_file:848kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:780288kB mlocked:0kB dirty:36kB writeback:0kB mapped:0kB shmem:0kB slab_reclaimable:3456kB slab_unreclaimable:747592kB kernel_stack:392kB pagetables:200kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no\n[ 238.881866] lowmem_reserve[]: 0 1904 1904\n[ 238.881896] HighMem free:229800kB min:236kB low:508kB high:784kB active_anon:2176kB inactive_anon:284kB active_file:2824kB inactive_file:9304kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:243712kB mlocked:0kB dirty:4kB writeback:0kB mapped:2528kB shmem:576kB slab_reclaimable:0kB slab_unreclaimable:0kB kernel_stack:0kB pagetables:0kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no\n[ 238.881927] lowmem_reserve[]: 0 0 0\n[ 238.881958] Normal: 0*4kB 4*8kB 6*16kB 0*32kB 1*64kB 1*128kB 0*256kB 2*512kB 0*1024kB 0*2048kB 0*4096kB \u003d 1344kB\n[ 238.882019] HighMem: 6*4kB 2*8kB 4*16kB 4*32kB 1*64kB 1*128kB 0*256kB 2*512kB 3*1024kB 0*2048kB 55*4096kB \u003d 229800kB\n[ 238.882080] 3610 total pagecache pages\n[ 238.882080] 0 pages in swap cache\n[ 238.882080] Swap cache stats: add 0, delete 0, find 0/0\n[ 238.882110] Free swap \u003d 0kB\n[ 238.882110] Total swap \u003d 0kB\n[ 238.933776] 262144 pages of RAM\n[ 238.933776] 58240 free pages\n[ 238.933776] 10503 reserved pages\n[ 238.933776] 187773 slab pages\n[ 238.933807] 2475 pages shared\n[ 238.933807] 0 pages swap cached\n\nSigned-off-by: Ming Lei \u003ctom.leiming@gmail.com\u003e\nAcked-by: Oliver Neukum \u003coneukum@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "28350e330cfab46b60a1dbf763b678d859f9f3d9", "tree": "f65b4185faae70b9bc160ddece5d0465b4202743", "parents": [ "1dbe7dada2d03d1313183d439068f1f951a91244" ], "author": { "name": "Alexander Stein", "email": "alexander.stein@systec-electronic.com", "time": "Thu May 05 08:40:46 2011 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu May 05 08:50:53 2011 -0700" }, "message": "Input: ads7846 - remove unused variable from struct ads7845_ser_req\n\nSigned-off-by: Alexander Stein \u003calexander.stein@systec-electronic.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "1dbe7dada2d03d1313183d439068f1f951a91244", "tree": "49f79d5fbaf5fc982f7a7742f94ed465a69220a9", "parents": [ "bf283707d5fb174ec09215ae19860ad04ba7b67a" ], "author": { "name": "Alexander Stein", "email": "alexander.stein@systec-electronic.com", "time": "Thu May 05 08:40:14 2011 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu May 05 08:50:47 2011 -0700" }, "message": "Input: ads7846 - make transfer buffers DMA safe\n\nreq.sample needs its own cacheline otherwise accessing req.msg fetches\nit in again.\n\nNote: This effect doesn\u0027t occur if the underlying SPI driver doesn\u0027t use\nDMA at all.\n\nSigned-off-by: Alexander Stein \u003calexander.stein@systec-electronic.com\u003e\nAcked-by: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "5895198c56d131cc696556a45f7ff0ea99ac297b", "tree": "26b98358ece87f30b8788603fee48bc9a3a71728", "parents": [ "0ecb063a2976b62d5eaecbd5a70bb994fe4b5a8a", "9005fcd89c24f2a0fa6f87588b9208aae6d4d6cd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 04 14:23:41 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 04 14:23:41 2011 -0700" }, "message": "Merge branch \u0027staging-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6\n\n* \u0027staging-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:\n staging: Remove a warning for drivers/staging/wlan-ng/cfg80211.c\n staging: intel_sst: intelmid needs delay.h\n staging: solo6x10: add select SND_PCM to fix build error\n staging: usbip: vhci: fix oops on subsequent attach\n staging: ft1000: Remove unnecessary EXPORT_SYMBOLs\n staging: rts_pstor: use #ifdef instead of #if\n staging: rts_pstor: Add \u003clinux/vmalloc.h\u003e\n staging: gma500: Depend on X86\n staging: olpc: Add \u003clinux/delay.h\u003e\n" }, { "commit": "0ecb063a2976b62d5eaecbd5a70bb994fe4b5a8a", "tree": "2b599cd66f1747d4e246d906b0e240ffd7ed0263", "parents": [ "bd355f8ae6577aa6b444ab76bb1dfeb1a7002d9f", "4f0871a6c7811a433513c3788a7cce27033bb8b8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 04 14:22:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 04 14:22:53 2011 -0700" }, "message": "Merge branch \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:\n xHCI: Clear PLC in xhci_bus_resume()\n USB: fix regression in usbip by setting has_tt flag\n usb/isp1760: Report correct urb status after unlink\n omap:usb: add regulator support for EHCI\n mfd: Fix usbhs_enable error handling\n usb: musb: gadget: Fix out-of-sync runtime pm calls\n usb: musb: omap2430: Fix retention idle on musb peripheral only boards\n" }, { "commit": "bd355f8ae6577aa6b444ab76bb1dfeb1a7002d9f", "tree": "b88b57915ccc335cb1391abf3da5fa59bd5e6ac5", "parents": [ "1c08232cfe5e68c6234305a3abb64d52d89c9ead", "fca65b4ad72d28cbb43a029114d04b89f06faadb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 04 14:22:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 04 14:22:20 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n ceph: do not call __mark_dirty_inode under i_lock\n libceph: fix ceph_osdc_alloc_request error checks\n ceph: handle ceph_osdc_new_request failure in ceph_writepages_start\n libceph: fix ceph_msg_new error path\n ceph: use ihold() when i_lock is held\n" } ], "next": "1c08232cfe5e68c6234305a3abb64d52d89c9ead" }