)]}' { "log": [ { "commit": "286fed412a134e76be55899bc628c6fa59cb70da", "tree": "aebb2c7db1204cbffaf40febab8770fa1acadc6e", "parents": [ "b6e45f866465f42b53d803b0c574da0fc508a0e9" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jan 06 11:44:11 2012 -0800" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jan 19 12:28:42 2012 -0800" }, "message": "drm/i915: Hold gt_lock during reset\n\nThis ensures that no register reads occur while the forcewake state of\nthe hardware is indeterminate during the reset operation.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "b6e45f866465f42b53d803b0c574da0fc508a0e9", "tree": "276400002339e2475f01074430b32373a76179c8", "parents": [ "9f1f46a45a681d357d1ceedecec3671a5ae957f4" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jan 06 11:34:04 2012 -0800" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jan 19 12:27:24 2012 -0800" }, "message": "drm/i915: Move reset forcewake processing to gen6_do_reset\n\nNo reason to have half of the reset split from the other half.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "9f1f46a45a681d357d1ceedecec3671a5ae957f4", "tree": "fbb1ccb3dc2afded75087e2d187a5160e356849f", "parents": [ "8109021313c7a3d8947677391ce6ab9cd0bb1d28" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Dec 14 13:57:03 2011 +0100" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jan 19 11:51:31 2012 -0800" }, "message": "drm/i915: protect force_wake_(get|put) with the gt_lock\n\nThe problem this patch solves is that the forcewake accounting\nnecessary for register reads is protected by dev-\u003estruct_mutex. But the\nhangcheck and error_capture code need to access registers without\ngrabbing this mutex because we hold it while waiting for the gpu.\nSo a new lock is required. Because currently the error_state capture\nis called from the error irq handler and the hangcheck code runs from\na timer, it needs to be an irqsafe spinlock (note that the registers\nused by the irq handler (neglecting the error handling part) only uses\nregisters that don\u0027t need the forcewake dance).\n\nWe could tune this down to a normal spinlock when we rework the\nerror_state capture and hangcheck code to run from a workqueue. But\nwe don\u0027t have any read in a fastpath that needs forcewake, so I\u0027ve\ndecided to not care much about overhead.\n\nThis prevents tests/gem_hangcheck_forcewake from i-g-t from killing my\nsnb on recent kernels - something must have slightly changed the\ntimings. On previous kernels it only trigger a WARN about the broken\nlocking.\n\nv2: Drop the previous patch for the register writes.\n\nv3: Improve the commit message per Chris Wilson\u0027s suggestions.\n\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "8109021313c7a3d8947677391ce6ab9cd0bb1d28", "tree": "65f80997225cecdf43ab2a7f7ae0817d169bc3f0", "parents": [ "00c2064b7766c4e24af42e21da1903aedc8ca4c0" ], "author": { "name": "Daniel Vetter", "email": "daniel@ffwll.ch", "time": "Fri Jan 13 16:20:06 2012 -0800" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jan 13 16:20:06 2012 -0800" }, "message": "drm/i915: convert force_wake_get to func pointer in the gpu reset code\n\nThis was forgotten in the original multi-threaded forcewake\nconversion:\n\ncommit 8d715f0024f64ad1b1be85d8c081cf577944c847\nAuthor: Keith Packard \u003ckeithp at keithp.com\u003e\nDate: Fri Nov 18 20:39:01 2011 -0800\n\n drm/i915: add multi-threaded forcewake support\n\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter at ffwll.ch\u003e\nReviewed-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "00c2064b7766c4e24af42e21da1903aedc8ca4c0", "tree": "513399b011821207a8543cddc602c07ffa2c2b9d", "parents": [ "96c0a2f52c45d8ec0a2b70810f4693530feaba5d" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jan 13 15:48:39 2012 -0800" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jan 13 15:49:27 2012 -0800" }, "message": "drm/i915: sprite init failure on pre-SNB is not a failure\n\nWe can call the plane init function unconditionally, but don\u0027t need to\ncomplain if it fails, since that will only happen if we\u0027re out of\nmemory (and other things will fail) or if we\u0027re on the wrong platform\n(which is ok).\n\nAnd remove the DRM_ERRORs from the sprite code itself to avoid dmesg\nspam.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "96c0a2f52c45d8ec0a2b70810f4693530feaba5d", "tree": "23bb41a135cbc0b85e0c02fa36e5738182356ba5", "parents": [ "7885d2052bd94395e337709cfba093a41f273ff1" ], "author": { "name": "Rohit Jain", "email": "rohit.jain@intel.com", "time": "Thu Jan 12 12:19:44 2012 +0530" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jan 13 08:37:44 2012 -0800" }, "message": "drm/i915: VBT Parser cleanup for eDP block\n\nSupport for parsing parameters for S3D support and T3 optimization\nsupport is implemented. The order for the bdb_edp struct was also\nmade similar to that indicated in spec.\n\nSigned-off-by: Rohit Jain \u003crohit.jain@intel.com\u003e\nReviewed-by: Shobhit Kumar \u003cshobhit.kumar@intel.com\u003e\nReviewed-by: Vijay A. Purushothaman \u003cvijay.a.purushothaman@intel.com\u003e\nReviewed-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nAcked-by: Jesse Barnes \u003cjesse.barnes@intel.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "7885d2052bd94395e337709cfba093a41f273ff1", "tree": "1bbfc9465d5573198cca8214f14415d5a8371c33", "parents": [ "a190d703f0cd1de301b80c3219cf891c2779d15f" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jan 12 14:51:17 2012 -0800" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jan 12 21:36:38 2012 -0800" }, "message": "drm/i915: mask transcoder select bits before setting them on LVDS\n\nThe transcoder port may changed from mode set to mode set, so make sure\nto mask out the selection bits before setting the right ones or we\u0027ll\nget black screens when going from transcoder B to A.\n\nTested-by: Vincent Vanackere \u003cvincent.vanackere@gmail.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "a190d703f0cd1de301b80c3219cf891c2779d15f", "tree": "05410e7425fc113ec8847a5752dc56ecf8a146c3", "parents": [ "1a464cbb3d483f2f195b614cffa4aa1b910a0440", "44306ab302687b519a31aa498b954c1e26f95a6b" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jan 12 12:51:06 2012 -0800" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jan 12 12:51:06 2012 -0800" }, "message": "Merge branch \u0027drm-intel-next-fixes\u0027 into drm-intel-fixes\n" }, { "commit": "44306ab302687b519a31aa498b954c1e26f95a6b", "tree": "deaf794564f71ee66d3c70a65afff054d4d7a039", "parents": [ "8ca4013d702dae4913fbb625aabf4c2966cdf1f0" ], "author": { "name": "Joel Sass", "email": "jsass@disklessworkstations.com", "time": "Tue Jan 10 13:03:55 2012 -0500" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jan 12 12:35:42 2012 -0800" }, "message": "drm/i915: Add Clientron E830 to the ignore LVDS list\n\nSigned-off-by: Joel Sass \u003cjsass@disklessworkstations.com\u003e\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "8ca4013d702dae4913fbb625aabf4c2966cdf1f0", "tree": "74f9d8fe3f517e7be9da6d0bcbcdea05eeaed0ee", "parents": [ "07c1e8c1462fa7324de4c36ae9e55da2abd79cee" ], "author": { "name": "Duncan Laurie", "email": "dlaurie@chromium.org", "time": "Tue Oct 25 15:42:21 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jan 12 12:30:25 2012 -0800" }, "message": "CHROMIUM: i915: Add DMI override to skip CRT initialization on ZGB\n\nThis is the method used to override LVDS in intel_lvds and appears to be\nan effective way to ensure that the driver does not enable VGA hotplug.\n\nThis is the same patch from 2.6.32 kernel in R12 but ported to 2.6.38,\nwill send upstream next.\n\nSigned-off-by: Duncan Laurie \u003cdlaurie@chromium.org\u003e\n\nBUG\u003dchrome-os-partner:117\nTEST\u003dCheck PORT_HOTPLUG_EN to see if hotplug interrupt is disabled.\nRun the following command as root, specifically looking at bit 9:\nmmio_read32 $[$(pci_read32 0 2 0 0x10) + 0x61110] \u003d 0x00000000\n\nChange-Id: Id8240f9fb31d058d8d79ee72f7b4615c43893f5a\nReviewed-on: http://gerrit.chromium.org/gerrit/1390\nReviewed-by: Olof Johansson \u003colofj@chromium.org\u003e\nTested-by: Duncan Laurie \u003cdlaurie@chromium.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "1a464cbb3d483f2f195b614cffa4aa1b910a0440", "tree": "af57dee6436532dbb546b8670e9e1f6910d489b5", "parents": [ "dbe950f201a8edd353b0bd9079e8d536ee4ce37c", "095f979a539245a46b9e5d600ec9c720b4d928e5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 11:04:36 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 11:04:36 2012 -0800" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux: (307 commits)\n drm/nouveau/pm: fix build with HWMON off\n gma500: silence gcc warnings in mid_get_vbt_data()\n drm/ttm: fix condition (and vs or)\n drm/radeon: double lock typo in radeon_vm_bo_rmv()\n drm/radeon: use after free in radeon_vm_bo_add()\n drm/sis|via: don\u0027t return stack garbage from free_mem ioctl\n drm/radeon/kms: remove pointless CS flags priority struct\n drm/radeon/kms: check if vm is supported in VA ioctl\n drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)\n radeon: Fix disabling PCI bus mastering on big endian hosts.\n ttm: fix agp since ttm tt rework\n agp: Fix multi-line warning message whitespace\n drm/ttm/dma: Fix accounting error when calling ttm_mem_global_free_page and don\u0027t try to free freed pages.\n drm/ttm/dma: Only call set_pages_array_wb when the page is not in WB pool.\n drm/radeon/kms: sync across multiple rings when doing bo moves v3\n drm/radeon/kms: Add support for multi-ring sync in CS ioctl (v2)\n drm/radeon: GPU virtual memory support v22\n drm: make DRM_UNLOCKED ioctls with their own mutex\n drm: no need to hold global mutex for static data\n drm/radeon/benchmark: common modes sweep ignores 640x480@32\n ...\n\nFix up trivial conflicts in radeon/evergreen.c and vmwgfx/vmwgfx_kms.c\n" }, { "commit": "dbe950f201a8edd353b0bd9079e8d536ee4ce37c", "tree": "dffbada6b3d33cc67383758570de22b4f45693b6", "parents": [ "f62f61917d72c1fb0101ad405664f6fc868d676b", "da733563be5a9da26fe81d9f007262d00b846e22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:55:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:55:52 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (64 commits)\n Input: tc3589x-keypad - add missing kerneldoc\n Input: ucb1400-ts - switch to using dev_xxx() for diagnostic messages\n Input: ucb1400_ts - convert to threaded IRQ\n Input: ucb1400_ts - drop inline annotations\n Input: usb1400_ts - add __devinit/__devexit section annotations\n Input: ucb1400_ts - set driver owner\n Input: ucb1400_ts - convert to use dev_pm_ops\n Input: psmouse - make sure we do not use stale methods\n Input: evdev - do not block waiting for an event if fd is nonblock\n Input: evdev - if no events and non-block, return EAGAIN not 0\n Input: evdev - only allow reading events if a full packet is present\n Input: add driver for pixcir i2c touchscreens\n Input: samsung-keypad - implement runtime power management support\n Input: tegra-kbc - report wakeup key for some platforms\n Input: tegra-kbc - add device tree bindings\n Input: add driver for AUO In-Cell touchscreens using pixcir ICs\n Input: mpu3050 - configure the sampling method\n Input: mpu3050 - ensure we enable interrupts\n Input: mpu3050 - add of_match table for device-tree probing\n Input: sentelic - document the latest hardware\n ...\n\nFix up fairly trivial conflicts (device tree matching conflicting with\nsome independent cleanups) in drivers/input/keyboard/samsung-keypad.c\n" }, { "commit": "f62f61917d72c1fb0101ad405664f6fc868d676b", "tree": "cedeb85a8d1c97dc3be0b667734b0fe4e0dd84b6", "parents": [ "d04baa157d1b35cbd27c87b4a13111d9675b61f3", "420174afdc7023c000e5b5b1b6fe9e028470c713" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:48:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:48:28 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (68 commits)\n hid-input/battery: add FEATURE quirk\n hid-input/battery: remove battery_val\n hid-input/battery: power-supply type really *is* a battery\n hid-input/battery: make the battery setup common for INPUTs and FEATUREs\n hid-input/battery: deal with both FEATURE and INPUT report batteries\n hid-input/battery: add quirks for battery\n hid-input/battery: remove apparently redundant kmalloc\n hid-input: add support for HID devices reporting Battery Strength\n HID: hid-multitouch: add support 9 new Xiroku devices\n HID: multitouch: add support for 3M 32\"\n HID: multitouch: add support of Atmel multitouch panels\n HID: usbhid: defer LED setting to a workqueue\n HID: usbhid: hid-core: submit queued urbs before suspend\n HID: usbhid: remove LED_ON\n HID: emsff: use symbolic name instead of hardcoded PID constant\n HID: Enable HID_QUIRK_MULTI_INPUT for Trio Linker Plus II\n HID: Kconfig: fix syntax\n HID: introduce proper dependency of HID_BATTERY on POWER_SUPPLY\n HID: multitouch: support PixArt optical touch screen\n HID: make parser more verbose about parsing errors by default\n ...\n\nFix up rename/delete conflict in drivers/hid/hid-hyperv.c (removed in\nstaging, moved in this branch) and similarly for the rules for same file\nin drivers/staging/hv/{Kconfig,Makefile}.\n" }, { "commit": "d04baa157d1b35cbd27c87b4a13111d9675b61f3", "tree": "c46966fbea1c34bed2bd38629ce948d5a088281c", "parents": [ "88266917b518e2ca954d85983470592aaaf82993", "5c41dc3a79150e93e5d050871a10b761be8281a1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:36:08 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:36:08 2012 -0800" }, "message": "Merge tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6\n\nSCSI updates for post 3.2 merge window\n\n* tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (67 commits)\n [SCSI] lpfc 8.3.28: Update driver version to 8.3.28\n [SCSI] lpfc 8.3.28: Add Loopback support for SLI4 adapters\n [SCSI] lpfc 8.3.28: Critical Miscellaneous fixes\n [SCSI] Lpfc 8.3.28: FC and SCSI Discovery Fixes\n [SCSI] lpfc 8.3.28: Add support for ABTS failure handling\n [SCSI] lpfc 8.3.28: SLI fixes and added SLI4 support\n [SCSI] lpfc 8.3.28: Miscellaneous fixes in sysfs and mgmt interfaces\n [SCSI] mpt2sas: Removed redundant calling of _scsih_probe_devices() from _scsih_probe\n [SCSI] mac_scsi: Remove obsolete IRQ_FLG_* users\n [SCSI] qla4xxx: Update driver version to 5.02.00-k10\n [SCSI] qla4xxx: check for FW alive before calling chip_reset\n [SCSI] qla4xxx: Fix qla4xxx_dump_buffer to dump buffer correctly\n [SCSI] qla4xxx: Fix the IDC locking mechanism\n [SCSI] qla4xxx: Wait for disable_acb before doing set_acb\n [SCSI] qla4xxx: Don\u0027t recover adapter if device state is FAILED\n [SCSI] qla4xxx: fix call trace on rmmod with ql4xdontresethba\u003d1\n [SCSI] qla4xxx: Fix CPU lockups when ql4xdontresethba set\n [SCSI] qla4xxx: Perform context resets in case of context failures.\n [SCSI] iscsi class: export pid of process that created\n [SCSI] mpt2sas: Remove unused duplicate diag_buffer_enable param\n ...\n" }, { "commit": "88266917b518e2ca954d85983470592aaaf82993", "tree": "e8c6e77cf6c70de0dbe655ce3cd4401391a06b6e", "parents": [ "269d430131b699c2cadf58495f025a4092959ef5", "e2bf7c4c22939bd83814d8da40a352d246030b1b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:29:23 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:29:23 2012 -0800" }, "message": "Merge git://www.linux-watchdog.org/linux-watchdog\n\n* git://www.linux-watchdog.org/linux-watchdog:\n watchdog: omap_wdt.c: fix the WDIOC_GETBOOTSTATUS ioctl if not implemented.\n watchdog: new driver for VIA chipsets\n watchdog: ath79_wdt: flush register writes\n drivers/watchdog/lantiq_wdt.c: drop iounmap for devm_ allocated data\n watchdog: documentation: describe nowayout in coversion-guide\n watchdog: documentation: update index file\n watchdog: Convert wm831x driver to devm_kzalloc()\n watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API\n watchdog: convert drivers/watchdog/* to use module_platform_driver()\n watchdog: Use DEFINE_SPINLOCK() for static spinlocks\n watchdog: Convert Wolfson drivers to module_platform_driver\n" }, { "commit": "269d430131b699c2cadf58495f025a4092959ef5", "tree": "d9972cd7e03f82b6ac59bc471fb59e49dc6fcaab", "parents": [ "d52739c62e0096dccea59f012d80256c6e359a98", "0c437c4ae71c0a8110eb21c06b99853c7056b317" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:20:34 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:20:34 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (40 commits)\n regulator: set constraints.apply_uV to 0 in of_get_fixed_voltage_config\n regulator: max8925: fix enabled/disabled judgement mistake\n regulator: add regulator_bulk_force_disable function\n regulator: pass regulator_register of_node in fixed voltage driver\n regulator: add regulator_force_disable() definition for !CONFIG_REGULATOR\n regulator: Enable supply regulator if child rail is enabled.\n regulator: mc13892: Convert to devm_kzalloc()\n regulator: mc13783: Convert to devm_kzalloc()\n regulator: Fix checking return value of create_regulator\n regulator: Fix the error handling if create_regulator fails\n regulator: Export regulator_is_supported_voltage()\n regulator: mc13892: add device tree probe support\n regulator: mc13892: remove the unnecessary prefix from regulator name\n regulator: Convert wm831x regulator drivers to devm_kzalloc()\n regulator: da9052: Staticize non-exported symbols\n regulator: Replace kzalloc with devm_kzalloc and if-else with a switch-case for da9052-regulator\n regulator: Update da9052-regulator for DT changes\n regulator: DA9052/53 Regulator support\n regulator: pass device_node to of_get_regulator_init_data()\n regulator: If a single voltage is set with device tree then set apply_uV\n ...\n" }, { "commit": "d52739c62e0096dccea59f012d80256c6e359a98", "tree": "4df8ae0640c360eb79b6d0511f084b2337e21e12", "parents": [ "abce00f962a11ed6f748c2569e11695a30716b53", "0d2006bbf09e817f125ba1e42b2549bc2c5d7351" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:19:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:19:57 2012 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (31 commits)\n pinctrl: remove unnecessary max pin number\n pinctrl: correct a offset while enumerating pins\n pinctrl: some typo fixes\n pinctrl: rename U300 and SIRF pin controllers\n pinctrl: pass name instead of device to pin_config_*\n pinctrl: add \"struct seq_file;\" to pinconf.h\n pinctrl: conjure names for unnamed pins\n pinctrl: add a group-specific hog macro\n pinctrl: don\u0027t create a device for each pin controller\n arm/u300: don\u0027t use PINMUX_MAP_PRIMARY*\n pinctrl: implement PINMUX_MAP_SYS_HOG\n pinctrl: add a pin config interface\n pinctrl/coh901: driver to request its pins\n pinctrl: u300-pinmux: register proper GPIO ranges\n pinctrl: move the U300 GPIO driver to pinctrl\n ARM: u300: localize GPIO assignments\n pinctrl: make it possible to add multiple maps\n pinctrl: make a copy of pinmux map\n pinctrl: GPIO direction support for muxing\n pinctrl: print pin range in GPIO range debugs\n ...\n" }, { "commit": "abce00f962a11ed6f748c2569e11695a30716b53", "tree": "f76a7d999dc47bb84cc72b2691aa47080ef97262", "parents": [ "90160371b3a3e67ef78d68210a94dd30664a703d", "318893e1429a9d50569a0379d1e20b0ecc45c555" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:19:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:19:17 2012 -0800" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://github.com/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of git://github.com/jgarzik/libata-dev:\n ahci: support the STA2X11 I/O Hub\n pata_bf54x: fix BMIDE status register emulation\n ata: add ata port hibernate callbacks\n ata: update ata port\u0027s runtime status during system resume\n [SCSI] runtime resume parent for child\u0027s system-resume\n ahci: platform support for suspend/resume\n libata-core: kill duplicate statement in ata_do_set_mode()\n pata_of_platform: remove direct dependency on OF_IRQ\n SATA/PATA: convert drivers/ata/* to use module_platform_driver()\n pata_cs5536: forward port changes from cs5536\n libata-sff: use ATAPI_{COD|IO}\n ata: add ata port runtime PM callbacks\n ata: add ata port system PM callbacks\n [SCSI] sd: check runtime PM status in sd_shutdown\n [SCSI] check runtime PM status in system PM\n [SCSI] add flag to skip the runtime PM calls on the host\n ata: make ata port as parent device of scsi host\n ahci: start engine only during soft/hard resets\n" }, { "commit": "90160371b3a3e67ef78d68210a94dd30664a703d", "tree": "2841ea811be129133cf9b83d9c3badd96e7ffab4", "parents": [ "ae5cfc0546ca2698b9dcddf72accbd70e57590a0", "6c254de16a1d14c1ac931d3aa08dc88ac9fc582b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:09:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:09:59 2012 -0800" }, "message": "Merge branch \u0027stable/for-linus-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/for-linus-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (37 commits)\n xen/pciback: Expand the warning message to include domain id.\n xen/pciback: Fix \"device has been assigned to X domain!\" warning\n xen/pciback: Move the PCI_DEV_FLAGS_ASSIGNED ops to the \"[un|]bind\"\n xen/xenbus: don\u0027t reimplement kvasprintf via a fixed size buffer\n xenbus: maximum buffer size is XENSTORE_PAYLOAD_MAX\n xen/xenbus: Reject replies with payload \u003e XENSTORE_PAYLOAD_MAX.\n Xen: consolidate and simplify struct xenbus_driver instantiation\n xen-gntalloc: introduce missing kfree\n xen/xenbus: Fix compile error - missing header for xen_initial_domain()\n xen/netback: Enable netback on HVM guests\n xen/grant-table: Support mappings required by blkback\n xenbus: Use grant-table wrapper functions\n xenbus: Support HVM backends\n xen/xenbus-frontend: Fix compile error with randconfig\n xen/xenbus-frontend: Make error message more clear\n xen/privcmd: Remove unused support for arch specific privcmp mmap\n xen: Add xenbus_backend device\n xen: Add xenbus device driver\n xen: Add privcmd device driver\n xen/gntalloc: fix reference counts on multi-page mappings\n ...\n" }, { "commit": "ae5cfc0546ca2698b9dcddf72accbd70e57590a0", "tree": "eb0fcb5ed1dbfbfe7a3c8ac564a42144b5eed88b", "parents": [ "3dcf6c1b6b29f327ec24a1986aaa8eba399b463f", "dc6821e0cfe74802aefd2067b40fcdc03fc4599e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:09:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:09:48 2012 -0800" }, "message": "Merge branch \u0027stable/for-linus-fixes-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/for-linus-fixes-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen/mmu: Fix compile errors introduced by x86/memblock mismerge.\n" }, { "commit": "3dcf6c1b6b29f327ec24a1986aaa8eba399b463f", "tree": "51e8d0659aa3e4aa50ac94cf13051fef135bda19", "parents": [ "e4e11180dfa545233e5145919b75b7fac88638df", "da69dee073a27ee2d4e50c9b19e9faf8776857eb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 09:57:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 09:57:11 2012 -0800" }, "message": "Merge branch \u0027kvm-updates/3.3\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/3.3\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (74 commits)\n KVM: PPC: Whitespace fix for kvm.h\n KVM: Fix whitespace in kvm_para.h\n KVM: PPC: annotate kvm_rma_init as __init\n KVM: x86 emulator: implement RDPMC (0F 33)\n KVM: x86 emulator: fix RDPMC privilege check\n KVM: Expose the architectural performance monitoring CPUID leaf\n KVM: VMX: Intercept RDPMC\n KVM: SVM: Intercept RDPMC\n KVM: Add generic RDPMC support\n KVM: Expose a version 2 architectural PMU to a guests\n KVM: Expose kvm_lapic_local_deliver()\n KVM: x86 emulator: Use opcode::execute for Group 9 instruction\n KVM: x86 emulator: Use opcode::execute for Group 4/5 instructions\n KVM: x86 emulator: Use opcode::execute for Group 1A instruction\n KVM: ensure that debugfs entries have been created\n KVM: drop bsp_vcpu pointer from kvm struct\n KVM: x86: Consolidate PIT legacy test\n KVM: x86: Do not rely on implicit inclusions\n KVM: Make KVM_INTEL depend on CPU_SUP_INTEL\n KVM: Use memdup_user instead of kmalloc/copy_from_user\n ...\n" }, { "commit": "095f979a539245a46b9e5d600ec9c720b4d928e5", "tree": "f8632cdddd2c041d751111511d05fedd136fc432", "parents": [ "96067adf55bd93618cec4b6de08aebaad8203c9b" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jan 10 10:13:16 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jan 10 10:13:16 2012 +0000" }, "message": "drm/nouveau/pm: fix build with HWMON off\n\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "96067adf55bd93618cec4b6de08aebaad8203c9b", "tree": "1ddabb7a000e5ffd6702a6afaecbb2d2e3238e4b", "parents": [ "7920aa5a9d841fc7a10ff53a5a775f821d7a6ba1" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Wed Jan 04 10:26:10 2012 +0300" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jan 10 10:01:22 2012 +0000" }, "message": "gma500: silence gcc warnings in mid_get_vbt_data()\n\nAdd a cast here to silence a Gcc warning.\ndrivers/gpu/drm/gma500/mid_bios.c:214:28: warning:\n cast from pointer to integer of different size [-Wpointer-to-int-cast]\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7920aa5a9d841fc7a10ff53a5a775f821d7a6ba1", "tree": "4604bbb97b3f0a69b5921aa71b804d0c71e9aa98", "parents": [ "a7eef882a8d37be46459faa5020648af7ccf6ad2" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Thu Dec 08 09:50:54 2011 +0300" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jan 10 10:00:42 2012 +0000" }, "message": "drm/ttm: fix condition (and vs or)\n\nThe \"if (!p \u0026\u0026 !p-\u003edev)\" condition isn\u0027t right because || was intended\ninstead of \u0026\u0026. But actually, \"p\" is the list cursor and so it\u0027s always\nnon-NULL and we can just remove that bit. We can remove the another\nsimilar check as well.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nAcked-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e4e11180dfa545233e5145919b75b7fac88638df", "tree": "bfdb18eee49aa55fd3d6170a422164e772736a1b", "parents": [ "37cfc3f67db9f2d907f6bfcfae590cdbbef623e8", "adc0e91ab142abe93f5b0d7980ada8a7676231fe" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 17:37:37 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 17:37:37 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n vfs: new helper - d_make_root()\n dcache: use a dispose list in select_parent\n ceph: d_alloc_root() may fail\n ext4: fix failure exits\n isofs: inode leak on mount failure\n" }, { "commit": "adc0e91ab142abe93f5b0d7980ada8a7676231fe", "tree": "27ee89f960b7e2d6cd5179d914bc252324122c26", "parents": [ "b48f03b319ba78f3abf9a7044d1f436d8d90f4f9" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 16:49:21 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 19:23:45 2012 -0500" }, "message": "vfs: new helper - d_make_root()\n\nd_alloc_root() with iput() in case of allocation failure...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "b48f03b319ba78f3abf9a7044d1f436d8d90f4f9", "tree": "7ddc8f545787d28825413946519ed88ea19edb24", "parents": [ "3c5184ef1216dd476c9c67f22a199d90ac4d5892" ], "author": { "name": "Dave Chinner", "email": "david@fromorbit.com", "time": "Tue Aug 23 18:56:24 2011 +1000" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 19:22:52 2012 -0500" }, "message": "dcache: use a dispose list in select_parent\n\nselect_parent currently abuses the dentry cache LRU to provide\ncleanup features for child dentries that need to be freed. It moves\nthem to the tail of the LRU, then tells shrink_dcache_parent() to\ncalls __shrink_dcache_sb to unconditionally move them to a dispose\nlist (as DCACHE_REFERENCED is ignored). __shrink_dcache_sb() has to\nrelock the dentries to move them off the LRU onto the dispose list,\nbut otherwise does not touch the dentries that select_parent() moved\nto the tail of the LRU. It then passses the dispose list to\nshrink_dentry_list() which tries to free the dentries.\n\nIOWs, the use of __shrink_dcache_sb() is superfluous - we can build\nexactly the same list of dentries for disposal directly in\nselect_parent() and call shrink_dentry_list() instead of calling\n__shrink_dcache_sb() to do that. This means that we avoid long holds\non the lru lock walking the LRU moving dentries to the dispose list\nWe also avoid the need to relock each dentry just to move it off the\nLRU, reducing the numebr of times we lock each dentry to dispose of\nthem in shrink_dcache_parent() from 3 to 2 times.\n\nFurther, we remove one of the two callers of __shrink_dcache_sb().\nThis also means that __shrink_dcache_sb can be moved into back into\nprune_dcache_sb() and we no longer have to handle referenced\ndentries conditionally, simplifying the code.\n\nSigned-off-by: Dave Chinner \u003cdchinner@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "37cfc3f67db9f2d907f6bfcfae590cdbbef623e8", "tree": "b573983938838dd76b40a7b53b3744472041720f", "parents": [ "38e5781bbf8e82c1635ea845e0d07b2228a5ac7a", "6e4d177dc07b1c4d8e6ef061fe5ffcc7e7646546" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:47:06 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:47:06 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:\n sparc32: remove unused file: include/asm/pgtsun4.h\n sparc32: fix PAGE_SIZE definition\n sparc32: enable different preemptions models\n sparc32: support atomic64_t\n apbuart: fix section mismatch warning\n sparc32: drop useless preprocessor conditional in atomic_32.h\n sparc32: drop unused atomic24 support\n" }, { "commit": "38e5781bbf8e82c1635ea845e0d07b2228a5ac7a", "tree": "69ced9c509c864a67122c5e1337f14cd1d9e988d", "parents": [ "979ecef5b89a8003902299566d9cdc08de34a3ee", "a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:46:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:46:52 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:\n igmp: Avoid zero delay when receiving odd mixture of IGMP queries\n netdev: make net_device_ops const\n bcm63xx: make ethtool_ops const\n usbnet: make ethtool_ops const\n net: Fix build with INET disabled.\n net: introduce netif_addr_lock_nested() and call if when appropriate\n net: correct lock name in dev_[uc/mc]_sync documentations.\n net: sk_update_clone is only used in net/core/sock.c\n 8139cp: fix missing napi_gro_flush.\n pktgen: set correct max and min in pktgen_setup_inject()\n smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h\n asix: fix infinite loop in rx_fixup()\n net: Default UDP and UNIX diag to \u0027n\u0027.\n r6040: fix typo in use of MCR0 register bits\n net: fix sock_clone reference mismatch with tcp memcontrol\n" }, { "commit": "979ecef5b89a8003902299566d9cdc08de34a3ee", "tree": "2a695d557adab1dec5263f014789f5b59238bac8", "parents": [ "e8cbce976050a9f874a8b07012ddeb9b9eb59603", "8c3b2296f1aa13d7504d2c09bc819cef3759562a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:44:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:44:15 2012 -0800" }, "message": "Merge tag \u0027clk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nclock management changes for i.MX\n\nAnother simple series related to clock management, this time only for\nimx.\n\n* tag \u0027clk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: mxs: select HAVE_CLK_PREPARE for clock\n clk: add config option HAVE_CLK_PREPARE into Kconfig\n ASoC: mxs-saif: convert to clk_prepare/clk_unprepare\n video: mxsfb: convert to clk_prepare/clk_unprepare\n serial: mxs-auart: convert to clk_prepare/clk_unprepare\n net: flexcan: convert to clk_prepare/clk_unprepare\n mtd: gpmi-lib: convert to clk_prepare/clk_unprepare\n mmc: mxs-mmc: convert to clk_prepare/clk_unprepare\n dma: mxs-dma: convert to clk_prepare/clk_unprepare\n net: fec: add clk_prepare/clk_unprepare\n ARM: mxs: convert platform code to clk_prepare/clk_unprepare\n clk: add helper functions clk_prepare_enable and clk_disable_unprepare\n\nFix up trivial conflicts in drivers/net/ethernet/freescale/fec.c due to\ncommit 0ebafefcaa7a (\"net: fec: add clk_prepare/clk_unprepare\") clashing\ntrivially with commit e163cc97f9ac (\"net/fec: fix the .remove code\").\n" }, { "commit": "e8cbce976050a9f874a8b07012ddeb9b9eb59603", "tree": "3660d00f49a70e20c74c3d41027ea8598ad926d7", "parents": [ "b3c37522928b5452588fc202eaa0f11f6e339256", "27fdb577435e336e4b00b9e51626f9002b88a86c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:40:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:40:48 2012 -0800" }, "message": "Merge tag \u0027timer\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\ntimer changes for msm\n\nA very simple series. We used to have more churn in the timer\narea, so this is kept separate. Will probably put this into the\ndrivers series next time.\n\n* tag \u0027timer\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n msm: timer: Use clockevents_config_and_register()\n msm: timer: Setup interrupt after registering clockevent\n msm: timer: Remove SoC specific #ifdefs\n msm: timer: Remove msm_clocks[] and simplify code\n msm: timer: Fix ONESHOT mode interrupts\n msm: timer: Use GPT for clockevents and DGT for clocksource\n msm: timer: Cleanup #includes and #defines\n msm: timer: Tighten #ifdef for local timer support\n" }, { "commit": "b3c37522928b5452588fc202eaa0f11f6e339256", "tree": "37bfe21d9977b15271903d1a4b304289a232e364", "parents": [ "2ac9d7aaccbd598b5bd19ac40761b723bb675442", "6d0a5636fba5a3f82ec80ab124dd4748344549c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:59 2012 -0800" }, "message": "Merge tag \u0027pm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\npower management changes for omap and imx\n\nA significant part of the changes for these two platforms went into\npower management, so they are split out into a separate branch.\n\n* tag \u0027pm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (65 commits)\n ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1\n ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation\n ARM: imx6q: resume PL310 only when CACHE_L2X0 defined\n ARM: imx6q: build pm code only when CONFIG_PM selected\n ARM: mx5: use generic irq chip pm interface for pm functions on\n ARM: omap: pass minimal SoC/board data for UART from dt\n arm/dts: Add minimal device tree support for omap2420 and omap2430\n omap-serial: Add minimal device tree support\n omap-serial: Use default clock speed (48Mhz) if not specified\n omap-serial: Get rid of all pdev-\u003eid usage\n ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init\n ARM: OMAP4: PRM: use PRCM interrupt handler\n ARM: OMAP3: pm: use prcm chain handler\n ARM: OMAP: hwmod: add support for selecting mpu_irq for each wakeup pad\n ARM: OMAP2+: mux: add support for PAD wakeup interrupts\n ARM: OMAP: PRCM: add suspend prepare / finish support\n ARM: OMAP: PRCM: add support for chain interrupt handler\n ARM: OMAP3/4: PRM: add functions to read pending IRQs, PRM barrier\n ARM: OMAP2+: hwmod: Add API to enable IO ring wakeup\n ARM: OMAP2+: mux: add wakeup-capable hwmod mux entries to dynamic list\n ...\n" }, { "commit": "2ac9d7aaccbd598b5bd19ac40761b723bb675442", "tree": "09132a44e33798aaa5e80f10bf025b510015cab3", "parents": [ "5ede3ceb7b2c2843e153a1803edbdc8c56655950", "dcf7ec5ee62a78123057a1e286c88ca739717409" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:22 2012 -0800" }, "message": "Merge tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nDriver specific changes\n\nAgain, a lot of platforms have changes in here: pxa, samsung, omap,\nat91, imx, ...\n\n* tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)\n ARM: sa1100: clean up of the clock support\n ARM: pxa: add dummy clock for sa1100-rtc\n RTC: sa1100: support sa1100, pxa and mmp soc families\n RTC: sa1100: remove redundant code of setting alarm\n RTC: sa1100: Clean out ost register\n Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()\n pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()\n ARM: EXYNOS: Modified files for SPI consolidation work\n ARM: S5P64X0: Enable SDHCI support\n ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names\n ARM: S5P64X0: Add HSMMC setup for host Controller\n ARM: EXYNOS: Add USB OHCI support to ORIGEN board\n USB: Add Samsung Exynos OHCI diver\n ARM: EXYNOS: Add USB OHCI support to SMDKV310 board\n ARM: EXYNOS: Add USB OHCI device\n net: macb: fix build break with !CONFIG_OF\n i2c: tegra: Support DVC controller in device tree\n i2c: tegra: Add __devinit/exit to probe/remove\n net/at91_ether: use gpio_is_valid for phy IRQ line\n ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT\n ...\n" }, { "commit": "5ede3ceb7b2c2843e153a1803edbdc8c56655950", "tree": "4cfa82b619f7d39b671e4a2a213f4d040b09c486", "parents": [ "6d889d03ab1417645e76e129834f76204bae37c0", "3e2762c8f1141ae8dc708034ea41d6827818c328" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:38:51 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:38:51 2012 -0800" }, "message": "Merge tag \u0027devel\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nNew feature development\n\nThis adds support for new features, and contains stuff from most\nplatforms. A number of these patches could have fit into other\nbranches, too, but were small enough not to cause too much\nconfusion here.\n\n* tag \u0027devel\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)\n mfd/db8500-prcmu: remove support for early silicon revisions\n ARM: ux500: fix the smp_twd clock calculation\n ARM: ux500: remove support for early silicon revisions\n ARM: ux500: update register files\n ARM: ux500: register DB5500 PMU dynamically\n ARM: ux500: update ASIC detection for U5500\n ARM: ux500: support DB8520\n ARM: picoxcell: implement watchdog restart\n ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C\n ARM: OMAP3: hwmod data: disable multiblock reads on MMC1/2 on OMAP34xx/35xx \u003c\u003d ES2.1\n ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP4\n ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3\n ARM: OMAP: hwmod data: Add support for AM35xx UART4/ttyO3\n ARM: Orion: Remove address map info from all platform data structures\n ARM: Orion: Get address map from plat-orion instead of via platform_data\n ARM: Orion: mbus_dram_info consolidation\n ARM: Orion: Consolidate the address map setup\n ARM: Kirkwood: Add configuration for MPP12 as GPIO\n ARM: Kirkwood: Recognize A1 revision of 6282 chip\n ARM: ux500: update the MOP500 GPIO assignments\n ...\n" }, { "commit": "6d889d03ab1417645e76e129834f76204bae37c0", "tree": "577e37b5597b27f6de25bbbc634a0f17ccfb15f7", "parents": [ "7400c12eb069df781894a94dfa5c865f3fe3e2d4", "421b759b86eb8a914cbbd11f6d09a74f411762c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:37:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:37:41 2012 -0800" }, "message": "Merge tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nBoard-level changes\n\nThis adds and extends support for specific boards on a number of\nARM platforms: omap, imx, samsung, tegra, ...\n\n* tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)\n Enable 32 bit flash support for iMX21ADS board\n ARM: mx31pdk: Add MC13783 RTC support\n iomux-mx25: configuration to support CSPI3 on CSI pins\n MX1:apf9328: Add i2c support\n mioa701: add newly available DoC G3 chip\n arm/tegra: remove __initdata annotation from pinmux tables\n arm/tegra: Use bus notifiers to trigger pinmux setup\n arm/tegra: Refactor board-*-pinmux.c to share code\n arm/tegra: Fix mistake in Trimslice\u0027s pinmux\n arm/tegra: Rework Seaboard-vs-Ventana pinmux table\n arm/tegra: Remove useless entries from ventana_pinmux[]\n arm/tegra: PCIe: Remove include of mach/pinmux.h\n arm/tegra: Harmony PCIe: Don\u0027t touch pinmux\n arm/tegra: Add AUXDATA for tegra-pinmux and tegra-gpio\n arm/tegra: Split Seaboard GPIO table to allow for Ventana\n ARM: imx6q: generate imx6q dtb files\n arm/imx6q: Rename Sabreauto to Armadillo2\n arm/imx6q-sabrelite: add enet phy ksz9021rn fixup\n arm/imx6: add imx6q sabrelite board support\n dts/imx: rename uart labels to consistent with hw spec\n ...\n" }, { "commit": "7400c12eb069df781894a94dfa5c865f3fe3e2d4", "tree": "53a0922933c0eabcef8e9ba23af0c629952ff44b", "parents": [ "190a44e65b0f32eaf5b4db3969f5eb224f83a7a2", "23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:33:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:33:17 2012 -0800" }, "message": "Merge tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nSoC-level changes for tegra and omap\n\nThis adds support for the new tegra30 SoC, as well as small\nchanges to support minor variations of existing omap SoCs.\n\n* tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (26 commits)\n arm/tegra: Compile tegra_dt_init_irq only when CONFIG_OF\n arm/tegra: Make MACH_TEGRA_DT depend on ARCH_TEGRA_2x_SOC\n arm/tegra: Delete tegra_init_clock()\n arm/tegra: Fix section mismatch errors in tegra30 pinmux\n arm/tegra: Fix section mismatch errors in tegra20 pinmux\n arm/tegra: refresh defconfig for tegra30\n arm/tegra: add support for tegra30 based board cardhu\n arm/tegra: implement support for tegra30\n arm/tegra: pinmux tables and definitions for tegra30\n arm/tegra: add new fields to struct tegra_pingroup_desc\n arm/tegra: prepare pinmux code for multiple tegra variants\n arm/tegra: rename tegra20 pinmux files\n arm/tegra: generalize L2 cache initialization\n arm/tegra: use PMC reset\n arm/tegra: rename board-dt.c to board-dt-tegra20.c\n arm/tegra: prepare early init for multiple tegra variants\n arm/tegra: don\u0027t export clk_measure_input_freq\n arm/tegra: prepare clock code for multiple tegra variants\n arm/tegra: cleanup tegra20 support\n arm/tegra: clk_get should not be fatal\n ...\n\nFix up trivial conflict in arch/arm/mach-tegra/board-dt-tegra20.c\n" }, { "commit": "190a44e65b0f32eaf5b4db3969f5eb224f83a7a2", "tree": "577c9a3949ba06e62d082eb11894b7045ebe3ef3", "parents": [ "dfc1ebe76663d582a01c9dc572395cf8086d01de", "b48741cce3be32a48af9a2b272f3f13a077375cf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:30:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:30:28 2012 -0800" }, "message": "Merge tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nCleanups for the Samsung platforms\n\nVarious cleanup changes that the device driver changes are built upon.\nSince the samsung cleanups depend on the device tree series, which\ndepends on the first set of cleanups for tegra.\n\n* tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: EXYNOS: Use gpio_request_one\n ARM: S5PV210: Use gpio_request_one\n ARM: S3C64XX: Modified according to SPI consolidation work\n ARM: S5PV210: Modified files for SPI consolidation work\n ARM: S5P64X0: Modified files for SPI consolidation work\n ARM: S5PC100: Modified files for SPI consolidation work\n ARM: S3C64XX: Modified files for SPI consolidation work\n ARM: SAMSUNG: Consolidation of SPI platform devices to plat-samsung\n ARM: SAMSUNG: Remove SPI bus clocks from platform data\n ARM: S5PV210: Add SPI clkdev support\n ARM: S5P64X0: Add SPI clkdev support\n ARM: S5PC100: Add SPI clkdev support\n ARM: S3C64XX: Add SPI clkdev support\n spi/s3c64xx: Use bus clocks created using clkdev\n mmc: sdhci-s3c: Use generic clock names for sdhci bus clock options\n ARM: SAMSUNG: Add lookup of sdhci-s3c clocks using generic names\n ARM: SAMSUNG: Remove SDHCI bus clocks from platform data\n ARM: SAMSUNG: Use kmemdup rather than duplicating its implementation\n ARM: EXYNOS: remove exynos4_scu_enable()\n" }, { "commit": "dfc1ebe76663d582a01c9dc572395cf8086d01de", "tree": "54a5ac91214a90f82c27b6e38099a4470837729e", "parents": [ "acc952c1f373bf3f66cc7a10680eee1762bed40b", "b001befe58691ef3627458cd814e8cee7f845c5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:28:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:28:38 2012 -0800" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nDevice tree conversions for samsung and tegra\n\nBoth platforms had some initial device tree support, but this adds\nmuch more to actually make it usable.\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)\n ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN\n ARM: EXYNOS: Add Exynos4 device tree enabled board file\n rtc: rtc-s3c: Add device tree support\n input: samsung-keypad: Add device tree support\n ARM: S5PV210: Modify platform data for pl330 driver\n ARM: S5PC100: Modify platform data for pl330 driver\n ARM: S5P64x0: Modify platform data for pl330 driver\n ARM: EXYNOS: Add a alias for pdma clocks\n ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build\n ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers\n DMA: PL330: Add device tree support\n ARM: EXYNOS: Modify platform data for pl330 driver\n DMA: PL330: Infer transfer direction from transfer request instead of platform data\n DMA: PL330: move filter function into driver\n serial: samsung: Fix build for non-Exynos4210 devices\n serial: samsung: add device tree support\n serial: samsung: merge probe() function from all SoC specific extensions\n serial: samsung: merge all SoC specific port reset functions\n ARM: SAMSUNG: register uart clocks to clock lookup list\n serial: samsung: remove all uses of get_clksrc and set_clksrc\n ...\n\nFix up fairly trivial conflicts in arch/arm/mach-s3c2440/clock.c and\ndrivers/tty/serial/Kconfig both due to just adding code close to\nchanges.\n" }, { "commit": "acc952c1f373bf3f66cc7a10680eee1762bed40b", "tree": "de1135ffe304f4d8e53d282e5bb1bde5db04e0ae", "parents": [ "57e964e1ae9bd4f699ae1074430bcf81a9a11377", "40ba95fdf158713377d47736b1b3a9d75f4f2515" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:21:03 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:21:03 2012 -0800" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nCleanups on various subarchitectures\n\nCleanup patches for various ARM platforms and some of their associated\ndrivers, the bulk of these is for mach-91.\n\nArnd ended up pulling in the restart branch from Russell in order to\nfix up some simple but annoying merge conflicts.\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)\n arm/at91: fix build of stamp9g20\n ARM: u300: delete memory.h\n MAINTAINERS: add maintainer entry for Picochip picoxcell\n ARM: picoxcell: move io mappings to common.c\n ARM: picoxcell: don\u0027t reserve irq_descs\n ARM: picoxcell: remove mach/memory.h\n ARM: at91: delete the pcontrol_g20_defconfig\n arm/tegra: Remove code that\u0027s ifndef CONFIG_ARM_GIC\n arm/tegra: remove unused defines\n arm/tegra: fix variable formatting in makefile\n ARM: davinci: vpif: move code to driver core header from platform\n ARM: at91/gpio: fix display of number of irq setuped\n ARM: at91/gpio: drop PIN_BASE\n ARM: at91/udc: use gpio_is_valid to check the gpio\n ARM: at91/ohci: use gpio_is_valid to check the gpio\n ARM: at91/nand: use gpio_is_valid to check the gpio\n ARM: at91/mmc: use gpio_is_valid to check the gpio\n ARM: at91/ide: use gpio_is_valid to check the gpio\n ARM: at91/pata: use gpio_is_valid to check the gpio\n ARM: at91/soc: use gpio_is_valid to check the gpio\n ...\n" }, { "commit": "57e964e1ae9bd4f699ae1074430bcf81a9a11377", "tree": "8c1fc5199e18a55cece4aa72bbaf2ca909bd1453", "parents": [ "4dee6b64ee7cfef94b47733c6d9fef07f8051c7c", "39fbc76272225fb991ffdfac1e08974506cfa3eb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:20:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:20:39 2012 -0800" }, "message": "Merge tag \u0027fixes-non-critical\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nNon-critical bug fixes\n\nSimple bug fixes that were not considered important enough for inclusion\ninto 3.2.\n\n* tag \u0027fixes-non-critical\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n MAINTAINERS: update pxa and mmp\n ARM: pxa: Include linux/export.h in balloon3.c\n ARM: OMAP4: clock: Add CPU local timer clock node\n ARM: OMAP4: hwmod: Don\u0027t wait for the idle status if modulemode is not supported\n ARM: OMAP: AM3517/3505: fix crash on boot due to incorrect voltagedomain data\n ARM: OMAP: hwmod data: fix the panic on Nokia RM-680 during boot\n ARM: OMAP2+: DMA: Workaround for invalid destination position\n ARM: OMAP2+: DMA: Workaround for invalid source position\n" }, { "commit": "4dee6b64ee7cfef94b47733c6d9fef07f8051c7c", "tree": "78bf53f15f2b0dbcb6b6c1e74faf32545f4ba8bb", "parents": [ "6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5" ], "author": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Jan 09 17:15:42 2012 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:19:33 2012 -0800" }, "message": "tracing/mm: Move include of trace/events/kmem.h out of header into slab.c\n\nIncluding trace/events/*.h TRACE_EVENT() macro headers in other headers\ncan cause strange side effects if another trace/event/*.h header\nincludes that header. Having trace/events/kmem.h inside slab_def.h\ncaused a compile error in sparc64 when changes were done to some header\nfiles. Moving the kmem.h trace header out of slab.h and into slab.c\nfixes the problem.\n\nNote, both slub.c and slob.c already include the trace/events/kmem.h\nfile. Only slab.c had it missing.\n\nLink: http://lkml.kernel.org/r/20120105190405.1e3191fb5a43b2a0f1655e1f@canb.auug.org.au\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "07c1e8c1462fa7324de4c36ae9e55da2abd79cee", "tree": "a63b70ca032659120000821247115a502dd49f7d", "parents": [ "5e5b7fa2ad84f7806d0c7f5af8e1440bc91b4ec7" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Sat Jan 07 23:40:35 2012 -0200" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jan 09 14:17:53 2012 -0800" }, "message": "drm/i915: handle 3rd pipe\n\nWe don\u0027t need to check 3rd pipe specifically, as it shares PLL with some\nother one.\n\nSigned-off-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "5e5b7fa2ad84f7806d0c7f5af8e1440bc91b4ec7", "tree": "d84e789b76090510e58c31d0ef4d5194b0a37075", "parents": [ "a05a586239c66a256ea1fbae859e742e4c91c8d9" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Sat Jan 07 23:40:34 2012 -0200" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jan 09 14:17:25 2012 -0800" }, "message": "drm/i915: simplify pipe checking\n\nThis is also handled by i915_reg.h, so just reuse this trick to reduce\nuniverse entropy.\n\nSigned-off-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Cyril Brulebois \u003ckibi@debian.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27", "tree": "8e1ac7654905142f37d74d8e3e376325a5eb48b1", "parents": [ "e5686ad82ca2aeed7a8f24ffca115c0b7478dec9" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Mon Jan 09 14:06:46 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 14:06:46 2012 -0800" }, "message": "igmp: Avoid zero delay when receiving odd mixture of IGMP queries\n\nCommit 5b7c84066733c5dfb0e4016d939757b38de189e4 (\u0027ipv4: correct IGMP\nbehavior on v3 query during v2-compatibility mode\u0027) added yet another\ncase for query parsing, which can result in max_delay \u003d 0. Substitute\na value of 1, as in the usual v3 case.\n\nReported-by: Simon McVittie \u003csmcv@debian.org\u003e\nReferences: http://bugs.debian.org/654876\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e5686ad82ca2aeed7a8f24ffca115c0b7478dec9", "tree": "e8adf108c0474879f18845d51556279ce9325c23", "parents": [ "1aff0cbe9d51236efba2e721a34e2c15779f95f3" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jan 05 19:10:25 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 14:05:23 2012 -0800" }, "message": "netdev: make net_device_ops const\n\nMore drivers where net_device_ops should be const.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1aff0cbe9d51236efba2e721a34e2c15779f95f3", "tree": "b0ed0d690cc5c42122b50ae6b41c3b905d71e2ee", "parents": [ "bc689c9788f2cc9829d01d84083bc1714b969b15" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jan 05 19:10:24 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 14:05:23 2012 -0800" }, "message": "bcm63xx: make ethtool_ops const\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc689c9788f2cc9829d01d84083bc1714b969b15", "tree": "80417749027b979ecc11875d0cdbb5cc78113713", "parents": [ "3969eb3859e4fad4b32ca8f96d4ec8551c20704a" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jan 05 19:10:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 14:05:23 2012 -0800" }, "message": "usbnet: make ethtool_ops const\n\nThe ethtool_ops table of function pointers should be const.\nFix all the usb network drivers.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a05a586239c66a256ea1fbae859e742e4c91c8d9", "tree": "9906ad5075a5834d14c318c1a08b913ab8b00182", "parents": [ "ba68e086223a5f149f37bf8692c8cdbf1b0ba3ef" ], "author": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Tue Dec 20 08:54:15 2011 -0800" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jan 09 14:02:41 2012 -0800" }, "message": "drm/i915: Print debugfs object list sizes in KiB instead of bytes.\n\nThey\u0027re all in increments of pages, so this just makes it easier on\nthe eyes.\n\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "3969eb3859e4fad4b32ca8f96d4ec8551c20704a", "tree": "06620d8c94d92ab187f6ce8e72f2d0453d734314", "parents": [ "2429f7ac2ef429378536d87fcbbf6f424aa5b47f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 13:44:23 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 13:44:23 2012 -0800" }, "message": "net: Fix build with INET disabled.\n\n\u003e net/core/sock.c: In function \u0027sk_update_clone\u0027:\n\u003e net/core/sock.c:1278:3: error: implicit declaration of function \u0027sock_update_memcg\u0027\n\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3c5184ef1216dd476c9c67f22a199d90ac4d5892", "tree": "f6bd6d77ee9d1260892c8e8589497eaa2f5efbab", "parents": [ "94bf608a18fa4421315275a81c5489734599297a" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 16:34:32 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 16:36:12 2012 -0500" }, "message": "ceph: d_alloc_root() may fail\n\n... and ceph_init_dentry(NULL) will oops\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5", "tree": "33e64fc453619978c3ecc86c7ec3649db3b4d8dc", "parents": [ "db0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3", "933393f58fef9963eac61db8093689544e29a600" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 13:08:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 13:08:28 2012 -0800" }, "message": "Merge branch \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n percpu: Remove irqsafe_cpu_xxx variants\n\nFix up conflict in arch/x86/include/asm/percpu.h due to clash with\ncebef5beed3d (\"x86: Fix and improve percpu_cmpxchg{8,16}b_double()\")\nwhich edited the (now removed) irqsafe_cpu_cmpxchg*_double code.\n" }, { "commit": "db0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3", "tree": "8f38957c01b18edddd44d49ecc3beeac08a20b4e", "parents": [ "ac69e0928054ff29a5049902fb477f9c7605c773", "0d19ea866562e46989412a0676412fa0983c9ce7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:59:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:59:24 2012 -0800" }, "message": "Merge branch \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\n* \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits)\n cgroup: fix to allow mounting a hierarchy by name\n cgroup: move assignement out of condition in cgroup_attach_proc()\n cgroup: Remove task_lock() from cgroup_post_fork()\n cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end()\n cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static\n cgroup: only need to check oldcgrp\u003d\u003dnewgrp once\n cgroup: remove redundant get/put of task struct\n cgroup: remove redundant get/put of old css_set from migrate\n cgroup: Remove unnecessary task_lock before fetching css_set on migration\n cgroup: Drop task_lock(parent) on cgroup_fork()\n cgroups: remove redundant get/put of css_set from css_set_check_fetched()\n resource cgroups: remove bogus cast\n cgroup: kill subsys-\u003ecan_attach_task(), pre_attach() and attach_task()\n cgroup, cpuset: don\u0027t use ss-\u003epre_attach()\n cgroup: don\u0027t use subsys-\u003ecan_attach_task() or -\u003eattach_task()\n cgroup: introduce cgroup_taskset and use it in subsys-\u003ecan_attach(), cancel_attach() and attach()\n cgroup: improve old cgroup handling in cgroup_attach_proc()\n cgroup: always lock threadgroup during migration\n threadgroup: extend threadgroup_lock() to cover exit and exec\n threadgroup: rename signal-\u003ethreadgroup_fork_lock to -\u003egroup_rwsem\n ...\n\nFix up conflict in kernel/cgroup.c due to commit e0197aae59e5: \"cgroups:\nfix a css_set not found bug in cgroup_attach_proc\" that already\nmentioned that the bug is fixed (differently) in Tejun\u0027s cgroup\npatchset. This one, in other words.\n" }, { "commit": "94bf608a18fa4421315275a81c5489734599297a", "tree": "69b0022e0f47a5af7888c7e97459302373bfa338", "parents": [ "8fdd8c49fe50394fef3e193db27222cb03c2b212" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 15:53:24 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 15:57:20 2012 -0500" }, "message": "ext4: fix failure exits\n\na) leaking root dentry is bad\nb) in case of failed ext4_mb_init() we don\u0027t want to do ext4_mb_release()\nc) OTOH, in the same case we *do* want ext4_ext_release()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "ac69e0928054ff29a5049902fb477f9c7605c773", "tree": "05be6b9285186823452e0adeffe40e1dfee6e354", "parents": [ "9e203936eac786f9268d6a13e6442d2accef1829", "302bf2f3259948c93361d501b04a5ed69c3bd4f8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:51:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:51:21 2012 -0800" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:\n ext2/3/4: delete unneeded includes of module.h\n ext{3,4}: Fix potential race when setversion ioctl updates inode\n udf: Mark LVID buffer as uptodate before marking it dirty\n ext3: Don\u0027t warn from writepage when readonly inode is spotted after error\n jbd: Remove j_barrier mutex\n reiserfs: Force inode evictions before umount to avoid crash\n reiserfs: Fix quota mount option parsing\n udf: Treat symlink component of type 2 as /\n udf: Fix deadlock when converting file from in-ICB one to normal one\n udf: Cleanup calling convention of inode_getblk()\n ext2: Fix error handling on inode bitmap corruption\n ext3: Fix error handling on inode bitmap corruption\n ext3: replace ll_rw_block with other functions\n ext3: NULL dereference in ext3_evict_inode()\n jbd: clear revoked flag on buffers before a new transaction started\n ext3: call ext3_mark_recovery_complete() when recovery is really needed\n" }, { "commit": "9e203936eac786f9268d6a13e6442d2accef1829", "tree": "1da906e1c099b3afacf3b358b8981931c4da45fd", "parents": [ "993ecff81aa6d50d694704de2647a5529ff2f166", "724577ca355795b0a25c93ccbeee927871ca1a77" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:51:01 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:51:01 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.open-osd.org/linux-open-osd\n\n* \u0027for-linus\u0027 of git://git.open-osd.org/linux-open-osd:\n ore: Must support none-PAGE-aligned IO\n ore: fix BUG_ON, too few sgs when reading\n ore: Fix crash in case of an IO error.\n ore: FIX breakage when MISC_FILESYSTEMS is not set\n" }, { "commit": "993ecff81aa6d50d694704de2647a5529ff2f166", "tree": "047a313e86f63e22f1eff63945bea2e8e8147222", "parents": [ "12e55508921865aefdd80fd17afe70c191afbd1b", "b1c770c273a4787069306fc82aab245e9ac72e9d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:50:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:50:15 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs\n\n* \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs:\n xfs: fix endian conversion issue in discard code\n" }, { "commit": "2429f7ac2ef429378536d87fcbbf6f424aa5b47f", "tree": "15e0fd0c42f6e10ede9f1cf84553c2a01e593d81", "parents": [ "ab16ebf375f0513d6b0f5193de84186a3fc0c33b" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Mon Jan 09 06:36:54 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 12:46:58 2012 -0800" }, "message": "net: introduce netif_addr_lock_nested() and call if when appropriate\n\ndev_uc_sync() and dev_mc_sync() are acquiring netif_addr_lock for\ndestination device of synchronization. Since netif_addr_lock is\nalready held at the time for source device, this triggers lockdep\ndeadlock warning.\n\nThere\u0027s no way this deadlock can happen so use spin_lock_nested() to\nsilence the warning.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ab16ebf375f0513d6b0f5193de84186a3fc0c33b", "tree": "5f4581eac2a8a155a7dc41be0ea47e0c35761f2c", "parents": [ "475f1b52645a29936b9df1d8fcd45f7e56bd4a9f" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Mon Jan 09 06:18:34 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 12:46:58 2012 -0800" }, "message": "net: correct lock name in dev_[uc/mc]_sync documentations.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "12e55508921865aefdd80fd17afe70c191afbd1b", "tree": "476b3226fd9602b36bed0934409959bdd24a7eb5", "parents": [ "55b81e6f2795484ea8edf5805c95c007cacfa736", "4d447c9a6ebc0142d320f075c5bac6d202a79fd4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:18:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:18:17 2012 -0800" }, "message": "Merge branch \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\n* \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits)\n net/hyperv: Add support for jumbo frame up to 64KB\n net/hyperv: Add NETVSP protocol version negotiation\n net/hyperv: Remove unnecessary kmap_atomic in netvsc driver\n staging/rtl8192e: Register against lib80211\n staging/rtl8192e: Convert to lib80211_crypt_info\n staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops\n staging/rtl8192e: Add lib80211.h to rtllib.h\n staging/mei: add watchdog device registration wrappers\n drm/omap: GEM, deal with cache\n staging: vt6656: int.c, int.h: Change return of function to void\n staging: usbip: removed unused definitions from header\n staging: usbip: removed dead code from receive function\n staging:iio: Drop {mark,unmark}_in_use callbacks\n staging:iio: Drop buffer mark_param_change callback\n staging:iio: Drop the unused buffer enable() and is_enabled() callbacks\n staging:iio: Drop buffer busy flag\n staging:iio: Make sure a device is only opened once at a time\n staging:iio: Disallow modifying buffer size when buffer is enabled\n staging:iio: Disallow changing scan elements in all buffered modes\n staging:iio: Use iio_buffer_enabled instead of open coding it\n ...\n\nFix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of\nmodule_init due to using module_i2c_driver() helper, next to removal of\nMODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).\n" }, { "commit": "55b81e6f2795484ea8edf5805c95c007cacfa736", "tree": "c3724975107857fcc03b5dd649c462e4f72397be", "parents": [ "5983faf942f260023e547f3c5f38c1033c35cc9b", "08e87d0d773dc9ca5faf4c3306e238ed0ea129b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:47 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:47 2012 -0800" }, "message": "Merge branch \u0027usb-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\n* \u0027usb-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (232 commits)\n USB: Add USB-ID for Multiplex RC serial adapter to cp210x.c\n xhci: Clean up 32-bit build warnings.\n USB: update documentation for usbmon\n usb: usb-storage doesn\u0027t support dynamic id currently, the patch disables the feature to fix an oops\n drivers/usb/class/cdc-acm.c: clear dangling pointer\n drivers/usb/dwc3/dwc3-pci.c: introduce missing kfree\n drivers/usb/host/isp1760-if.c: introduce missing kfree\n usb: option: add ZD Incorporated HSPA modem\n usb: ch9: fix up MaxStreams helper\n USB: usb-skeleton.c: cleanup open_count\n USB: usb-skeleton.c: fix open/disconnect race\n xhci: Properly handle COMP_2ND_BW_ERR\n USB: remove dead code from suspend/resume path\n USB: add quirk for another camera\n drivers: usb: wusbcore: Fix dependency for USB_WUSB\n xhci: Better debugging for critical host errors.\n xhci: Be less verbose during URB cancellation.\n xhci: Remove debugging about ring structure allocation.\n xhci: Remove debugging about toggling cycle bits.\n xhci: Remove debugging for individual transfers.\n ...\n" }, { "commit": "5983faf942f260023e547f3c5f38c1033c35cc9b", "tree": "f54ce89de5d9f7a05e99948937ac5456df09df30", "parents": [ "21a2cb565a74bf794d343ce22300c5f6c1568ae1", "995234da19b927f42722d796e8270384f33be11c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:24 2012 -0800" }, "message": "Merge branch \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\n* \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (65 commits)\n tty: serial: imx: move del_timer_sync() to avoid potential deadlock\n imx: add polled io uart methods\n imx: Add save/restore functions for UART control regs\n serial/imx: let probing fail for the dt case without a valid alias\n serial/imx: propagate error from of_alias_get_id instead of using -ENODEV\n tty: serial: imx: Allow UART to be a source for wakeup\n serial: driver for m32 arch should not have DEC alpha errata\n serial/documentation: fix documented name of DCD cpp symbol\n atmel_serial: fix spinlock lockup in RS485 code\n tty: Fix memory leak in virtual console when enable unicode translation\n serial: use DIV_ROUND_CLOSEST instead of open coding it\n serial: add support for 400 and 800 v3 series Titan cards\n serial: bfin-uart: Remove ASYNC_CTS_FLOW flag for hardware automatic CTS.\n serial: bfin-uart: Enable hardware automatic CTS only when CTS pin is available.\n serial: make FSL errata depend on 8250_CONSOLE, not just 8250\n serial: add irq handler for Freescale 16550 errata.\n serial: manually inline serial8250_handle_port\n serial: make 8250 timeout use the specified IRQ handler\n serial: export the key functions for an 8250 IRQ handler\n serial: clean up parameter passing for 8250 Rx IRQ handling\n ...\n" }, { "commit": "21a2cb565a74bf794d343ce22300c5f6c1568ae1", "tree": "5cf49d94bc8cc31a299417b8a362f0645b41c543", "parents": [ "c99516ca854770000c277b2680a15581c691e18c", "2a5ac6f7a9c0a24adcf68e0dd634afbe083191c1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:08:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:08:59 2012 -0800" }, "message": "Merge branch \u0027char-misc-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc\n\n* \u0027char-misc-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:\n isl29020: Remove a redundant semi-colon from return statement\n BMP085: Remove redundant semi-colon from return statement\n drivers:misc: ti-st: DEBUG uart, baud rate mods\n drivers:misc: ti-st: flush UART upon fw failure\n drivers:misc: ti-st: protect registrations\n char_dev.c: fix up some whitespace errors\n s390: tape_class.h: remove kobj_map.h inclusion\n misc: ad525x_dpot: Add support for SPI module device table matching\n" }, { "commit": "421b759b86eb8a914cbbd11f6d09a74f411762c6", "tree": "505ca7f23987d8eaaa519a7e8506b854e2c0d030", "parents": [ "e067096c8d57d191f29d734cd5692695c95cc36e", "a07613a54d700a974f3a4a657da78ef5d097315d" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 17:06:36 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 17:06:36 2012 +0000" }, "message": "Merge branch \u0027samsung/cleanup\u0027 into next/boards\n\nConflicts:\n\tarch/arm/mach-imx/mach-imx6q.c\n\tarch/arm/mach-omap2/board-ti8168evm.c\n\tarch/arm/mach-s3c64xx/Kconfig\n\tarch/arm/mach-tegra/Makefile\n\tarch/arm/mach-tegra/board-dt-tegra20.c\n\tarch/arm/mach-tegra/common.c\n\nLots of relatively simple conflicts between the board\nchanges and stuff from the arm tree. This pulls in\nthe resolution from the samsung/cleanup tree, so we\ndon\u0027t get conflicting merges.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "dc6821e0cfe74802aefd2067b40fcdc03fc4599e", "tree": "ce7e455e8367090c561b18fff59a5d0fd919a750", "parents": [ "d4bbf7e7759afc172e2bfbc5c416324590049cdd" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Sat Jan 07 21:27:38 2012 -0500" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Mon Jan 09 12:05:05 2012 -0500" }, "message": "xen/mmu: Fix compile errors introduced by x86/memblock mismerge.\n\nThe git commit d4bbf7e7759afc172e2bfbc5c416324590049cdd\n\"Merge branch \u0027master\u0027 into x86/memblock\" mismerged the 32-bit\nsection causing:\n\narch/x86/xen/mmu.c: In function ‘xen_setup_kernel_pagetable’:\narch/x86/xen/mmu.c:1855: error: expected ‘;’ before ‘)’ token\narch/x86/xen/mmu.c:1855: error: expected statement before ‘)’ token\n\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "c99516ca854770000c277b2680a15581c691e18c", "tree": "b2bc5a297f3996668cea3f9445645d25b607f644", "parents": [ "72f318897e50c29b91efd1ed24515a93c138a2ba", "0ce8c0109f548ed75535d96ec5a347b410ed1472" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 08:31:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 08:31:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n ext[34]: avoid i_nlink warnings triggered by drop_nlink/inc_nlink kludge in symlink()\n exofs: oops after late failure in mount\n devpts: fix double-free on mount failure\n ... and the same for gadgetfs\n functionfs: unfuck failure exits on mount\n" }, { "commit": "dcf7ec5ee62a78123057a1e286c88ca739717409", "tree": "fa3f19434638a942ba66d236dde4d9aaadf8b370", "parents": [ "15db3e823c3246e3bd31fe454f5c8927eb85caf2", "142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:16:29 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:16:29 2012 +0000" }, "message": "Merge branch \u0027samsung/driver\u0027 into next/drivers\n\nConflicts:\n\tarch/arm/mach-mxs/include/mach/common.h\n\nPull in previous samsung conflict merges and do a trivial\nmerge of an mxs double-add conflict.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6", "tree": "8cced517382b7087df4e89a9e2a00ccac9676a92", "parents": [ "155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511", "a07613a54d700a974f3a4a657da78ef5d097315d" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:14:07 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:14:07 2012 +0000" }, "message": "Merge branch \u0027samsung/cleanup\u0027 into samsung/driver\n\nConflicts:\n\tarch/arm/mach-s5p64x0/cpu.c -\u003e common.c\n\nMore changes to a file that got moved into common.c,\nsee previous conflict resolutions.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "72f318897e50c29b91efd1ed24515a93c138a2ba", "tree": "7e7ef8138d5afacd1be4655e4458dc4cee432d1e", "parents": [ "a0e86bd4252519321b0d102dc4ed90557aa7bee9", "2fa1d4fce599809e6bd7d95756709a5faef30710" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 08:11:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 08:11:13 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (31 commits)\n [S390] disassembler: mark exception causing instructions\n [S390] Enable exception traces by default\n [S390] return address of compat signals\n [S390] sysctl: get rid of dead declaration\n [S390] dasd: fix fixpoint divide exception in define_extent\n [S390] dasd: add sanity check to detect path connection error\n [S390] qdio: fix kernel panic for zfcp 31-bit\n [S390] Add s390x description to Documentation/kdump/kdump.txt\n [S390] Add VMCOREINFO_SYMBOL(high_memory) to vmcoreinfo\n [S390] dasd: fix expiration handling for recovery requests\n [S390] outstanding interrupts vs. smp_send_stop\n [S390] ipc: call generic sys_ipc demultiplexer\n [S390] zcrypt: Fix error return codes.\n [S390] zcrypt: Rework length parameter checking.\n [S390] cleanup trap handling\n [S390] Remove Kerntypes leftovers\n [S390] topology: increase poll frequency if change is anticipated\n [S390] entry[64].S improvements\n [S390] make arch/s390 subdirectories depend on config option\n [S390] kvm: move cmf host id constant out of lowcore\n ...\n\nFix up conflicts in arch/s390/kernel/{smp.c,topology.c} due to the\nsysdev removal clashing with \"topology: get rid of ifdefs\" which moved\nsome of that code around.\n" }, { "commit": "b48741cce3be32a48af9a2b272f3f13a077375cf", "tree": "e4bc91713e02fa6d8f08b07de53ea8f905593dfa", "parents": [ "54b6c82ac9a124804816f244f587c0f40d25ad01", "a07613a54d700a974f3a4a657da78ef5d097315d" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:06:31 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:06:31 2012 +0000" }, "message": "Merge branch \u0027samsung/cleanup\u0027 into next/cleanup2\n" }, { "commit": "a07613a54d700a974f3a4a657da78ef5d097315d", "tree": "e4bc91713e02fa6d8f08b07de53ea8f905593dfa", "parents": [ "65db039bf7402f0a5b19cbf6dcff55ebea433b8b", "928a11ba36f999436915ea2b1eadf54301f93059" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:01:00 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:01:00 2012 +0000" }, "message": "Merge branch \u0027samsung/dt\u0027 into samsung/cleanup\n\nConflicts:\n\tarch/arm/mach-s3c64xx/Makefile\n\tarch/arm/mach-s5pc100/Makefile\n\tarch/arm/mach-s5pv210/Makefile\n\nPull in previously resolved conflicts:\n\nThe Makefiles were reorganized in the \"rmk/restart\" series and modified\nin the \"samsung/cleanup series\". This also pulls in the other conflict\nresolutions from the restart series against the samsung/dt series.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "8fdd8c49fe50394fef3e193db27222cb03c2b212", "tree": "24b13a4397127a7ac8d708af9af6e1f476bc0763", "parents": [ "0ce8c0109f548ed75535d96ec5a347b410ed1472" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 10:48:11 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 09 10:48:11 2012 -0500" }, "message": "isofs: inode leak on mount failure\n\nd_alloc_root() failure leaves root inode leaked...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "6c254de16a1d14c1ac931d3aa08dc88ac9fc582b", "tree": "27d2034808f672a73fe3c0cc81d77c7286373ba7", "parents": [ "3167355801505886209374daf86a452034e34ee8" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Jan 04 14:16:45 2012 -0500" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Mon Jan 09 10:24:11 2012 -0500" }, "message": "xen/pciback: Expand the warning message to include domain id.\n\nWhen a PCI device is transferred to another domain and it is still\nin usage (from the internal perspective), mention which other\ndomain is using it to aid in debugging.\n\n[v2: Truncate the verbose message per Jan Beulich suggestion]\n[v3: Suggestions from Ian Campbell on the wording]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nAcked-by: Jan Beulich \u003cjbeulich@suse.com\u003e\n" }, { "commit": "302bf2f3259948c93361d501b04a5ed69c3bd4f8", "tree": "22ccdf5774a28476745a94532b5ce2c2cc454d98", "parents": [ "6c2155b9cc5a193e85194bbeaae2e2e4512dd597" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Jan 04 15:59:47 2012 -0500" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:10 2012 +0100" }, "message": "ext2/3/4: delete unneeded includes of module.h\n\nDelete any instances of include module.h that were not strictly\nrequired. In the case of ext2, the declaration of MODULE_LICENSE\netc. were in inode.c but the module_init/exit were in super.c, so\nrelocate the MODULE_LICENCE/AUTHOR block to super.c which makes it\nconsistent with ext3 and ext4 at the same time.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "6c2155b9cc5a193e85194bbeaae2e2e4512dd597", "tree": "fe2e0af12ebdb2bff009f47ccdfebd8dcde2b3a2", "parents": [ "853a0c25baf96b028de1654bea1e0c8857eadf3d" ], "author": { "name": "Djalal Harouni", "email": "tixxdz@opendz.org", "time": "Tue Jan 03 02:31:52 2012 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:10 2012 +0100" }, "message": "ext{3,4}: Fix potential race when setversion ioctl updates inode\n\nThe EXT{3,4}_IOC_SETVERSION ioctl() updates i_ctime and i_generation\nwithout i_mutex. This can lead to a race with the other operations that\nupdate i_ctime. This is not a big issue but let\u0027s make the ioctl consistent\nwith how we handle e.g. other timestamp updates and use i_mutex to protect\ninode changes.\n\nSigned-off-by: Djalal Harouni \u003ctixxdz@opendz.org\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "853a0c25baf96b028de1654bea1e0c8857eadf3d", "tree": "2b72d7cafe569583322fa132ebc8c9821e8d7bce", "parents": [ "33c104d415e92a51aaf638dc3d93920cfa601e5c" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Fri Dec 23 11:53:07 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:10 2012 +0100" }, "message": "udf: Mark LVID buffer as uptodate before marking it dirty\n\nWhen we hit EIO while writing LVID, the buffer uptodate bit is cleared.\nThis then results in an anoying warning from mark_buffer_dirty() when we\nwrite the buffer again. So just set uptodate flag unconditionally.\n\nReviewed-by: Namjae Jeon \u003clinkinjeon@gmail.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "33c104d415e92a51aaf638dc3d93920cfa601e5c", "tree": "d94d7312b242ee85318188b3bc8fd23481c2f529", "parents": [ "0048278552e9752fd578c3d8deee756987c10873" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu Dec 22 16:49:05 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:09 2012 +0100" }, "message": "ext3: Don\u0027t warn from writepage when readonly inode is spotted after error\n\nWARN_ON_ONCE(IS_RDONLY(inode)) tends to trip when filesystem hits error and is\nremounted read-only. This unnecessarily scares users (well, they should be\nscared because of filesystem error, but the stack trace distracts them from the\nright source of their fear ;-). We could as well just remove the WARN_ON but\nit\u0027s not hard to fix it to not trip on filesystem with errors and not use more\ncycles in the common case so that\u0027s what we do.\n\nCC: stable@kernel.org\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "0048278552e9752fd578c3d8deee756987c10873", "tree": "0931a7ff6aa5c388eb40e2a97fdcebe59bbae337", "parents": [ "a9e36da655e54545c3289b2a0700b5c443de0edd" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu Dec 22 14:52:21 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:09 2012 +0100" }, "message": "jbd: Remove j_barrier mutex\n\nj_barrier mutex is used for serializing different journal lock operations. The\nproblem with it is that e.g. FIFREEZE ioctl results in process leaving kernel\nwith j_barrier mutex held which makes lockdep freak out. Also hibernation code\nwants to freeze filesystem but it cannot do so because it then cannot hibernate\nthe system because of mutex being locked.\n\nSo we remove j_barrier mutex and use direct wait on j_barrier_count instead.\nSince locking journal is a rare operation we don\u0027t have to care about fairness\nor such things.\n\nCC: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nAcked-by: Joel Becker \u003cjlbec@evilplan.org\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "a9e36da655e54545c3289b2a0700b5c443de0edd", "tree": "14143a3c873177b70b8b66d6f8085378a2c92908", "parents": [ "a06d789b424190e9f59da391681f908486db2554" ], "author": { "name": "Jeff Mahoney", "email": "jeffm@suse.com", "time": "Wed Dec 21 21:18:43 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:09 2012 +0100" }, "message": "reiserfs: Force inode evictions before umount to avoid crash\n\nThis patch fixes a crash in reiserfs_delete_xattrs during umount.\n\nWhen shrink_dcache_for_umount clears the dcache from\ngeneric_shutdown_super, delayed evictions are forced to disk. If an\nevicted inode has extended attributes associated with it, it will\nneed to walk the xattr tree to locate and remove them.\n\nBut since shrink_dcache_for_umount will BUG if it encounters active\ndentries, the xattr tree must be released before it\u0027s called or it will\ncrash during every umount.\n\nThis patch forces the evictions to occur before generic_shutdown_super\nby calling shrink_dcache_sb first. The additional evictions caused\nby the removal of each associated xattr file and dir will be automatically\nhandled as they\u0027re added to the LRU list.\n\nCC: reiserfs-devel@vger.kernel.org\nCC: stable@kernel.org\nSigned-off-by: Jeff Mahoney \u003cjeffm@suse.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "a06d789b424190e9f59da391681f908486db2554", "tree": "540274351d80680a8fab0325c440dab52170aaae", "parents": [ "fef2e9f3301934773e4f1b3cc5c7bffb119346b8" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Wed Dec 21 17:35:34 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:09 2012 +0100" }, "message": "reiserfs: Fix quota mount option parsing\n\nWhen jqfmt mount option is not specified on remount, we mistakenly clear\ns_jquota_fmt value stored in superblock. Fix the problem.\n\nCC: stable@kernel.org\nCC: reiserfs-devel@vger.kernel.org\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "fef2e9f3301934773e4f1b3cc5c7bffb119346b8", "tree": "32db1ddfb36294b26a5df7d87ddc19fc9dd89267", "parents": [ "d2eb8c359309ec45d6bf5b147303ab8e13be86ea" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Dec 12 15:13:50 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:08 2012 +0100" }, "message": "udf: Treat symlink component of type 2 as /\n\nCurrently, we ignore symlink component of type 2. But mkisofs and other OS\u0027\nseem to treat it as / so do the same for compatibility.\n\nReported-by: \"Gábor S.\" \u003cotnaccess@hotmail.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "d2eb8c359309ec45d6bf5b147303ab8e13be86ea", "tree": "4725da2f9f5728b41960cff7b628d0997812504c", "parents": [ "7b0b0933a3ff6052addf4d49ea99f75ab27df2d0" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Sat Dec 10 02:30:48 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:08 2012 +0100" }, "message": "udf: Fix deadlock when converting file from in-ICB one to normal one\n\nDuring BKL removal in 2.6.38, conversion of files from in-ICB format to normal\nformat got broken. We call -\u003ewritepage with i_data_sem held but udf_get_block()\nalso acquires i_data_sem thus creating A-A deadlock.\n\nWe fix the problem by dropping i_data_sem before calling -\u003ewritepage() which is\nsafe since i_mutex still protects us against any changes in the file. Also fix\npagelock - i_data_sem lock inversion in udf_expand_file_adinicb() by dropping\ni_data_sem before calling find_or_create_page().\n\nCC: stable@kernel.org\nReported-by: Matthias Matiak \u003cnetzpython@mail-on.us\u003e\nTested-by: Matthias Matiak \u003cnetzpython@mail-on.us\u003e\nReviewed-by: Namjae Jeon \u003clinkinjeon@gmail.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "7b0b0933a3ff6052addf4d49ea99f75ab27df2d0", "tree": "b410b1751843d5f1b2765900ac76beaad7f097e8", "parents": [ "ef6919c283257155def420bd247140e9fd2e9843" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Sat Dec 10 01:43:33 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:08 2012 +0100" }, "message": "udf: Cleanup calling convention of inode_getblk()\n\ninode_getblk() always returned NULL and passed results in its parameters.\nMake the function return something useful - found block number.\n\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "ef6919c283257155def420bd247140e9fd2e9843", "tree": "49c929bcb5b8be103a4ea8fe9964d0e02a0ec740", "parents": [ "1415dd8705394399d59a3df1ab48d149e1e41e77" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Fri Dec 09 00:08:58 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:07 2012 +0100" }, "message": "ext2: Fix error handling on inode bitmap corruption\n\nWhen insert_inode_locked() fails in ext2_new_inode() it most likely means inode\nbitmap got corrupted and we allocated again inode which is already in use. Also\ndoing unlock_new_inode() during error recovery is wrong since the inode does\nnot have I_NEW set. Fix the problem by informing about filesystem error and\njumping to fail: (instead of fail_drop:) which doesn\u0027t call unlock_new_inode().\n\nReviewed-by: Eric Sandeen \u003csandeen@redhat.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "1415dd8705394399d59a3df1ab48d149e1e41e77", "tree": "fb98d05d5fa83202d7b4bead058826366fc2592e", "parents": [ "d03e1292c46721f60830c5d2e334966472002ed0" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu Dec 08 21:13:46 2011 +0100" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:07 2012 +0100" }, "message": "ext3: Fix error handling on inode bitmap corruption\n\nWhen insert_inode_locked() fails in ext3_new_inode() it most likely\nmeans inode bitmap got corrupted and we allocated again inode which\nis already in use. Also doing unlock_new_inode() during error recovery\nis wrong since inode does not have I_NEW set. Fix the problem by jumping\nto fail: (instead of fail_drop:) which declares filesystem error and\ndoes not call unlock_new_inode().\n\nReviewed-by: Eric Sandeen \u003csandeen@redhat.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "d03e1292c46721f60830c5d2e334966472002ed0", "tree": "bc5a9f63fc52e4b96a6e9faa9457cb47d70b2cc7", "parents": [ "bcdd0c1600903e9222abfcde28947406020ccb5d" ], "author": { "name": "Zheng Liu", "email": "wenqing.lz@taobao.com", "time": "Mon Dec 05 15:55:11 2011 +0800" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jan 09 13:52:07 2012 +0100" }, "message": "ext3: replace ll_rw_block with other functions\n\nll_rw_block() is deprecated. Thus we replace it with other functions.\n\nCC: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Zheng Liu \u003cwenqing.lz@taobao.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "a7eef882a8d37be46459faa5020648af7ccf6ad2", "tree": "572a177cb3000fd09335c5accb48970496f51bbc", "parents": [ "55ba70c40661b61f98c4188c428f265009af1aa5" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Mon Jan 09 15:45:41 2012 +0300" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 09 12:49:48 2012 +0000" }, "message": "drm/radeon: double lock typo in radeon_vm_bo_rmv()\n\nThe second lock should be an unlock or it causes a deadlock.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "55ba70c40661b61f98c4188c428f265009af1aa5", "tree": "69055d80f453910904969bc441f4d0d7e78b05d0", "parents": [ "b5215ef1a877cd81a2558f3ddbcf784671a27588" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Mon Jan 09 15:44:50 2012 +0300" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 09 12:49:21 2012 +0000" }, "message": "drm/radeon: use after free in radeon_vm_bo_add()\n\n\"bo_va\" is dereferenced in the error message.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b5215ef1a877cd81a2558f3ddbcf784671a27588", "tree": "9bef1f5e9814906da9144ff8dc62006bc9e163cb", "parents": [ "f0afb5d443748ee91a34e3a13cb454b0047be9ec" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 08 22:42:27 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 09 12:11:39 2012 +0000" }, "message": "drm/sis|via: don\u0027t return stack garbage from free_mem ioctl\n\nFallout from my \"kill drm_sman\" refactor. Unfortunately gcc seems to\nhave failed me and not warned about this.\n\nTested-by: Jakob Bornecrantz \u003cwallbraker@gmail.com\u003e (on via)\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f0afb5d443748ee91a34e3a13cb454b0047be9ec", "tree": "0ae6150b0615fef085edb5ae4e9d4a517f40ef2f", "parents": [ "67e915e49a12ee08c22cb1db746bafd909988f85" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Fri Jan 06 09:38:16 2012 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 09 12:10:13 2012 +0000" }, "message": "drm/radeon/kms: remove pointless CS flags priority struct\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: Christian König \u003cdeathsimple@vodafone.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "67e915e49a12ee08c22cb1db746bafd909988f85", "tree": "6786118f5a2930e675e66a27e3cdc1a12c54b55a", "parents": [ "cc1f71942944890c7e05fc55dc4427c94b63d4f1" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Fri Jan 06 09:38:15 2012 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 09 12:10:09 2012 +0000" }, "message": "drm/radeon/kms: check if vm is supported in VA ioctl\n\nAdd a VM manager enabled field and use it to check if\nvm is enabled.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: jglisse@redhat.com\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "420174afdc7023c000e5b5b1b6fe9e028470c713", "tree": "a50385761d11bef88689c53317d52f431bab3f9a", "parents": [ "e0273728564a395a13cfed70e34da4f2613d2d44", "652aa6a9ac4a5f8d3e1fa3f6466646519e83c01e" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jan 09 11:24:59 2012 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jan 09 11:24:59 2012 +0100" }, "message": "Merge branch \u0027hid-battery\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into for-linus\n" }, { "commit": "475f1b52645a29936b9df1d8fcd45f7e56bd4a9f", "tree": "d0f9641f2f0ac6263b3c1ef4e8dfe8baf2602dd7", "parents": [ "b189e810619a676e6b931a942a3e8387f3d39c21" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Mon Jan 09 16:33:16 2012 +1100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 08 23:44:26 2012 -0800" }, "message": "net: sk_update_clone is only used in net/core/sock.c\n\nso move it there. Fixes build errors when CONFIG_INET is not defined:\n\nIn file included from include/linux/tcp.h:211:0,\n from include/linux/ipv6.h:221,\n from include/net/ipv6.h:16,\n from include/linux/sunrpc/clnt.h:26,\n from include/linux/nfs_fs.h:50,\n from init/do_mounts.c:20:\ninclude/net/sock.h: In function \u0027sk_update_clone\u0027:\ninclude/net/sock.h:1109:3: error: implicit declaration of function \u0027sock_update_memcg\u0027 [-Werror\u003dimplicit-function-declaration]\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "da733563be5a9da26fe81d9f007262d00b846e22", "tree": "db28291df94a2043af2123911984c5c173da4e6f", "parents": [ "6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076", "dab78d7924598ea4031663dd10db814e2e324928" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Sun Jan 08 23:38:23 2012 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Sun Jan 08 23:38:23 2012 -0800" }, "message": "Merge branch \u0027next\u0027 into for-linus\n" }, { "commit": "b189e810619a676e6b931a942a3e8387f3d39c21", "tree": "5efd2b54dd6b879442d780e3f417d5cf1767f94b", "parents": [ "26e29eeda048aa6699984c4b9d6997dd1a1315db" ], "author": { "name": "françois romieu", "email": "romieu@fr.zoreil.com", "time": "Sun Jan 08 13:41:33 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 08 19:20:33 2012 -0800" }, "message": "8139cp: fix missing napi_gro_flush.\n\nThe driver uses __napi_complete and napi_gro_receive. Without it, the\ndriver hits the BUG_ON(n-\u003egro_list) assertion hard in __napi_complete.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nTested-by: Marin Glibic \u003czhilla2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0ce8c0109f548ed75535d96ec5a347b410ed1472", "tree": "c82c28de75da5b73c224cce18602d1a5680d27d7", "parents": [ "da01636a6511c3bd0c1cf546c47b8e92a837a613" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 19:50:23 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 20:19:30 2012 -0500" }, "message": "ext[34]: avoid i_nlink warnings triggered by drop_nlink/inc_nlink kludge in symlink()\n\nBoth ext3 and ext4 put the half-created symlink inode into the orphan list\nfor a while (see the comment in ext[34]_symlink() for gory details). Then,\nif everything went fine, they pull it out of the orphan list and bump the\nlink count back to 1. The thing is, inc_nlink() is going to complain about\nseeing somebody changing i_nlink from 0 to 1. With a good reason, since\nnormally something like that is a bug. Explicit set_nlink(inode, 1) does\nthe same thing as inc_nlink() here, but it does *not* complain - exactly\nbecause it should be usable in strange situations like this one.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "da01636a6511c3bd0c1cf546c47b8e92a837a613", "tree": "394f40f4763d444ace4990ff1a5d21b386f83167", "parents": [ "3850aba74873aa47fefe6900b99f42f5e656a6e7" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 19:45:28 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 20:19:12 2012 -0500" }, "message": "exofs: oops after late failure in mount\n\nWe have already set -\u003es_root, so -\u003eput_super() is going to be called.\nFreeing -\u003es_fs_info is a bloody bad idea when it\u0027s going to be\ndereferenced very shortly...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "3850aba74873aa47fefe6900b99f42f5e656a6e7", "tree": "24f91e8cf4296a86678553809a935f355ae88de0", "parents": [ "87da5b3264c8514b85c6c6e8ef51b9440eee2030" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 19:40:27 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 20:19:03 2012 -0500" }, "message": "devpts: fix double-free on mount failure\n\ndevpts_kill_sb() is called even if devpts_fill_super() fails;\nwe should not do that kfree() in the latter, especially not\nwith -\u003es_fs_info left pointing to freed object. Double kfree()\nis a Bad Thing(tm)...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "87da5b3264c8514b85c6c6e8ef51b9440eee2030", "tree": "73ba93b1d0e499d21b78ef9cf8e824c1b42c2506", "parents": [ "5b5f9560354dc5a3a27ce57a86aec6b98531ee21" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 15:59:45 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 20:18:50 2012 -0500" }, "message": "... and the same for gadgetfs\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "5b5f9560354dc5a3a27ce57a86aec6b98531ee21", "tree": "908448da30e77e931f62080e3d836cf0f070d389", "parents": [ "48fa57ac2c30a8a0b770b7ad50b4b30c1d12f005" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 15:38:27 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jan 08 20:17:17 2012 -0500" }, "message": "functionfs: unfuck failure exits on mount\n\n* if you do dput() of root dentry, do *not* follow that with iput() of root\ninode.\n* while we are at it, don\u0027t do that dput() at all - you are leaving the pointer\nin -\u003es_root and your -\u003ekill_sb() will be very unhappy with that. It will do\nproper dput(), though, so the easiest way is to leave that to it entirely.\n* freeing -\u003es_fs_info is also best left to -\u003ekill_sb() (which will do it\nanyway), especially since we leave the pointer in place.\n* that xchg() in -\u003ekill_sb() is not a bug per se, but it\u0027s a plain and simple\nmasturbation with fewer excuses than Onan had...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "318893e1429a9d50569a0379d1e20b0ecc45c555", "tree": "78ae2f04ce3706867cf6f957271ff467b3416cf3", "parents": [ "909fefc2511120ec71178f752c195c7b0b30269e" ], "author": { "name": "Alessandro Rubini", "email": "rubini@gnudd.com", "time": "Fri Jan 06 13:33:39 2012 +0100" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Sun Jan 08 19:24:06 2012 -0500" }, "message": "ahci: support the STA2X11 I/O Hub\n\nThe AHCI controller found in the STA2X11 chip uses BAR number 0\ninstead of 5. Also, the chip\u0027s fixup code sets a special DMA mask\nfor all of its PCI functions, and the mask must be preserved here.\n\nSigned-off-by: Alessandro Rubini \u003crubini@gnudd.com\u003e\nAcked-by: Giancarlo Asnaghi \u003cgiancarlo.asnaghi@st.com\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" } ], "next": "909fefc2511120ec71178f752c195c7b0b30269e" }