)]}' { "log": [ { "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "17ab594fa5f6c766a3daf304d2e6b643f863c24c", "tree": "fe562c7fcd1100a1bc3b90f912813b77e5b37972", "parents": [ "80a9c430007b489823bc1b5300f4a1ba39ca1ef9" ], "author": { "name": "Brian Norris", "email": "computersforpeace@gmail.com", "time": "Fri Nov 18 11:10:10 2011 -0800" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Sun Jan 08 19:14:59 2012 -0500" }, "message": "ahci: platform support for suspend/resume\n\nAdd platform hooks for custom suspend() and resume() functions. The\ngeneric suspend/resume code in drivers/ata/ahci_platform.c is adapted\nfrom the PCI version in drivers/ata/ahci.c.\n\nSigned-off-by: Brian Norris \u003ccomputersforpeace@gmail.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "ae0751ffc77e7f21629970fdab5528c573e637f8", "tree": "e42ad3d5a5d2c5b742c6b129fd3bb532f29389f7", "parents": [ "9a6d6a2ddabbd32c07f6a38b659e5f3db319fa5a" ], "author": { "name": "Lin Ming", "email": "ming.m.lin@intel.com", "time": "Mon Dec 05 09:20:24 2011 +0800" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Sun Jan 08 19:14:57 2012 -0500" }, "message": "[SCSI] add flag to skip the runtime PM calls on the host\n\nWith previous change, now the ata port runtime suspend will happen as:\n\ndisk suspend --\u003e scsi target suspend --\u003e scsi host suspend --\u003e ata port\nsuspend\n\nata port(parent device) suspend need to schedule scsi EH which will resume\nscsi host(child device). Then the child device resume will in turn make\nparent device resume first. This is kind of recursive.\n\nThis patch adds a new flag Scsi_Host::eh_noresume.\nata port will set this flag to skip the runtime PM calls on scsi host.\n\nAcked-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "48fa57ac2c30a8a0b770b7ad50b4b30c1d12f005", "tree": "5a0b1a32b2e1639fdd07e9f1b946d698c093c3da", "parents": [ "8e369672af8700299ab372bad9397f230b1d591a", "1583676d9e3f97371eaa726c4e061f9b23f43c44" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:05:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:05:48 2012 -0800" }, "message": "Merge tag \u0027infiniband-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\ninfiniband changes for 3.3 merge window\n\n* tag \u0027infiniband-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n rdma/core: Fix sparse warnings\n RDMA/cma: Fix endianness bugs\n RDMA/nes: Fix terminate during AE\n RDMA/nes: Make unnecessarily global nes_set_pau() static\n RDMA/nes: Change MDIO bus clock to 2.5MHz\n IB/cm: Fix layout of APR message\n IB/mlx4: Fix SL to 802.1Q priority-bits mapping for IBoE\n IB/qib: Default some module parameters optimally\n IB/qib: Optimize locking for get_txreq()\n IB/qib: Fix a possible data corruption when receiving packets\n IB/qib: Eliminate 64-bit jiffies use\n IB/qib: Fix style issues\n IB/uverbs: Protect QP multicast list\n" }, { "commit": "8e369672af8700299ab372bad9397f230b1d591a", "tree": "8676cfdb7f8c1ac5ee124aef050d541d70f876d0", "parents": [ "6950d76c531671ec389e36183311826597951ac6", "a125a3945c950caef001f22055bf201a36568533" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:05:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:05:09 2012 -0800" }, "message": "Merge branch \u0027dma-buf-merge\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027dma-buf-merge\u0027 of git://people.freedesktop.org/~airlied/linux:\n dma-buf: mark EXPERIMENTAL for 1st release.\n dma-buf: Documentation for buffer sharing framework\n dma-buf: Introduce dma buffer sharing mechanism\n" }, { "commit": "b7d845f8825b058b80e76320f573505afbf4a1fc", "tree": "dc66dec44b489723427c9c4a9a92ef6e9f17c55b", "parents": [ "2943c833222ef87c111ee0c6b7b8519ad2983e99", "0a92815db789bd5a922d882826cf710f9b0b9d85" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:35:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:35:24 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: (36 commits)\n mfd: Clearing events requires event registers to be writable for da9052-core\n mfd: Fix annotations in da9052-core\n gpiolib: Mark da9052 driver broken\n mfd: Declare da9052_regmap_config for the bus drivers\n MFD: DA9052/53 MFD core module add SPI support v2\n MFD: DA9052/53 MFD core module\n regmap: Add irq_base accessor to regmap_irq\n regmap: Allow drivers to reinitialise the register cache at runtime\n regmap: Add trace event for successful cache reads\n regmap: Allow regmap_update_bits() users to detect changes\n regmap: Report if we actually handled an interrupt in regmap-irq\n regmap: Fix rbtreee build when not using debugfs\n regmap: Provide debugfs dump of the rbtree cache data\n regmap: Do debugfs init before cache init\n regmap: Suppress noop writes in regmap_update_bits()\n regmap: Remove indexed cache type\n regmap: Drop check whether a register is readable in regcache_read\n regmap: Properly round cache_word_size\n regmap: Add support for 10/14 register formating\n regmap: Try cached read before checking if a hardware read is possible\n ...\n" }, { "commit": "2943c833222ef87c111ee0c6b7b8519ad2983e99", "tree": "0ef8cc4f72a63b325e7ae858ec68822ec4f3c64f", "parents": [ "98793265b429a3f0b3f1750e74d67cd4d740d162", "19d671695e1931ebfd75b2b888778201aefe35ca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:28:33 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:28:33 2012 -0800" }, "message": "Merge tag \u0027md-3.3\u0027 of git://neil.brown.name/md\n\nmd update for 3.3\n\nBig change is new hot-replacement.\nA slot in an array can hold 2 devices - one that\nwants-replacement and one that is the replacement.\nOnce the replacement is built - either from the\noriginal or (in the case of errors) from elsewhere,\nthe wants-replacement device will be removed.\n\n* tag \u0027md-3.3\u0027 of git://neil.brown.name/md: (36 commits)\n md/raid1: Mark device want_replacement when we see a write error.\n md/raid1: If there is a spare and a want_replacement device, start replacement.\n md/raid1: recognise replacements when assembling arrays.\n md/raid1: handle activation of replacement device when recovery completes.\n md/raid1: Allow a failed replacement device to be removed.\n md/raid1: Allocate spare to store replacement devices and their bios.\n md/raid1: Replace use of mddev-\u003eraid_disks with conf-\u003eraid_disks.\n md/raid10: If there is a spare and a want_replacement device, start replacement.\n md/raid10: recognise replacements when assembling array.\n md/raid10: Allow replacement device to be replace old drive.\n md/raid10: handle recovery of replacement devices.\n md/raid10: Handle replacement devices during resync.\n md/raid10: writes should get directed to replacement as well as original.\n md/raid10: allow removal of failed replacement devices.\n md/raid10: preferentially read from replacement device if possible.\n md/raid10: change read_balance to return an rdev\n md/raid10: prepare data structures for handling replacement.\n md/raid5: Mark device want_replacement when we see a write error.\n md/raid5: If there is a spare and a want_replacement device, start replacement.\n md/raid5: recognise replacements when assembling array.\n ...\n" }, { "commit": "98793265b429a3f0b3f1750e74d67cd4d740d162", "tree": "b0bd717673f0c21845cf053f3fb6b75d42530af5", "parents": [ "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3", "bd1b2a555952d959f47169056fca05acf7eff81f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)\n Kconfig: acpi: Fix typo in comment.\n misc latin1 to utf8 conversions\n devres: Fix a typo in devm_kfree comment\n btrfs: free-space-cache.c: remove extra semicolon.\n fat: Spelling s/obsolate/obsolete/g\n SCSI, pmcraid: Fix spelling error in a pmcraid_err() call\n tools/power turbostat: update fields in manpage\n mac80211: drop spelling fix\n types.h: fix comment spelling for \u0027architectures\u0027\n typo fixes: aera -\u003e area, exntension -\u003e extension\n devices.txt: Fix typo of \u0027VMware\u0027.\n sis900: Fix enum typo \u0027sis900_rx_bufer_status\u0027\n decompress_bunzip2: remove invalid vi modeline\n treewide: Fix comment and string typo \u0027bufer\u0027\n hyper-v: Update MAINTAINERS\n treewide: Fix typos in various parts of the kernel, and fix some comments.\n clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR\n gpio: Kconfig: drop unknown symbol \u0027CS5535_GPIO\u0027\n leds: Kconfig: Fix typo \u0027D2NET_V2\u0027\n sound: Kconfig: drop unknown symbol ARCH_CLPS7500\n ...\n\nFix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new\nkconfig additions, close to removed commented-out old ones)\n" }, { "commit": "eb59c505f8a5906ad2e053d14fab50eb8574fd6f", "tree": "c6e875adc12b481b916e847e8f80b8881a0fb02c", "parents": [ "1619ed8f60959829d070d8f39cd2f8ca0e7135ce", "c233523b3d392e530033a7587d7970dc62a02361" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)\n PM / Hibernate: Implement compat_ioctl for /dev/snapshot\n PM / Freezer: fix return value of freezable_schedule_timeout_killable()\n PM / shmobile: Allow the A4R domain to be turned off at run time\n PM / input / touchscreen: Make st1232 use device PM QoS constraints\n PM / QoS: Introduce dev_pm_qos_add_ancestor_request()\n PM / shmobile: Remove the stay_on flag from SH7372\u0027s PM domains\n PM / shmobile: Don\u0027t include SH7372\u0027s INTCS in syscore suspend/resume\n PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode\n PM: Drop generic_subsys_pm_ops\n PM / Sleep: Remove forward-only callbacks from AMBA bus type\n PM / Sleep: Remove forward-only callbacks from platform bus type\n PM: Run the driver callback directly if the subsystem one is not there\n PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers\n PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.\n PM / Sleep: Merge internal functions in generic_ops.c\n PM / Sleep: Simplify generic system suspend callbacks\n PM / Hibernate: Remove deprecated hibernation snapshot ioctls\n PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()\n ARM: S3C64XX: Implement basic power domain support\n PM / shmobile: Use common always on power domain governor\n ...\n\nFix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused\nXBT_FORCE_SLEEP bit\n" }, { "commit": "972b2c719990f91eb3b2310d44ef8a2d38955a14", "tree": "b25a250ec5bec4b7b6355d214642d8b57c5cab32", "parents": [ "02550d61f49266930e674286379d3601006b2893", "c3aa077648e147783a7a53b409578234647db853" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)\n reiserfs: Properly display mount options in /proc/mounts\n vfs: prevent remount read-only if pending removes\n vfs: count unlinked inodes\n vfs: protect remounting superblock read-only\n vfs: keep list of mounts for each superblock\n vfs: switch -\u003eshow_options() to struct dentry *\n vfs: switch -\u003eshow_path() to struct dentry *\n vfs: switch -\u003eshow_devname() to struct dentry *\n vfs: switch -\u003eshow_stats to struct dentry *\n switch security_path_chmod() to struct path *\n vfs: prefer -\u003edentry-\u003ed_sb to -\u003emnt-\u003emnt_sb\n vfs: trim includes a bit\n switch mnt_namespace -\u003eroot to struct mount\n vfs: take /proc/*/mounts and friends to fs/proc_namespace.c\n vfs: opencode mntget() mnt_set_mountpoint()\n vfs: spread struct mount - remaining argument of next_mnt()\n vfs: move fsnotify junk to struct mount\n vfs: move mnt_devname\n vfs: move mnt_list to struct mount\n vfs: switch pnode.h macros to struct mount *\n ...\n" }, { "commit": "ce63920b395f1476e2d28cca16a56919289f0b62", "tree": "58105d4d6ee351b1e35df4ed027ba5deb3f07b96", "parents": [ "b3ca3839f344aa469e6f53c8bbb633e5ab9b96c8" ], "author": { "name": "Jeremy Fitzhardinge", "email": "jeremy@goop.org", "time": "Fri Dec 02 21:57:50 2011 -0800" }, "committer": { "name": "Jeremy Fitzhardinge", "email": "jeremy@goop.org", "time": "Sun Jan 08 18:31:18 2012 +1100" }, "message": "hid-input/battery: remove battery_val\n\nhidinput_get_battery_property() now directly polls the device for the\ncurrent battery strength, so there\u0027s no need for battery_val, or the\ncode to set it on the input event path.\n\nSigned-off-by: Jeremy Fitzhardinge \u003cjeremy@goop.org\u003e\n" }, { "commit": "fb8ac91b4dccbdda0ad51d499079d05143783ba4", "tree": "b85100063cf4128c79b610a0a7def43a40c98413", "parents": [ "bbc21cfd55858d7c3e55bfaa91fa934b0b13ad4d" ], "author": { "name": "Jeremy Fitzhardinge", "email": "jeremy@goop.org", "time": "Fri Dec 02 11:18:45 2011 -0800" }, "committer": { "name": "Jeremy Fitzhardinge", "email": "jeremy@goop.org", "time": "Sun Jan 08 18:30:37 2012 +1100" }, "message": "hid-input/battery: deal with both FEATURE and INPUT report batteries\n\nSome devices seem to report batteries as FEATUREs, others as INPUTs.\n\nSigned-off-by: Jeremy Fitzhardinge \u003cjeremy@goop.org\u003e\n" }, { "commit": "bbc21cfd55858d7c3e55bfaa91fa934b0b13ad4d", "tree": "8b0495e337bd64c8677c218d01bb3cc2e6211663", "parents": [ "ef5251993c3597a88b893fe22ee830092dff35f9" ], "author": { "name": "Jeremy Fitzhardinge", "email": "jeremy@goop.org", "time": "Fri Dec 02 11:12:36 2011 -0800" }, "committer": { "name": "Jeremy Fitzhardinge", "email": "jeremy@goop.org", "time": "Sun Jan 08 18:30:37 2012 +1100" }, "message": "hid-input/battery: add quirks for battery\n\nSome devices always report percentage, despite having 0/255 as their\nmin/max, so add a quirk for them.\n\nSigned-off-by: Jeremy Fitzhardinge \u003cjeremy@goop.org\u003e\n" }, { "commit": "c5a92aa3eb7425da68797a820d208edad36551f7", "tree": "92d2e8304ce9729c8feb3eeb4689cc8cd0561df5", "parents": [ "672007957846c3d556165bab635a9c9b855261fa" ], "author": { "name": "Daniel Nicoletti", "email": "dantti12@gmail.com", "time": "Fri Dec 02 03:52:22 2011 -0200" }, "committer": { "name": "Jeremy Fitzhardinge", "email": "jeremy@goop.org", "time": "Sun Jan 08 18:30:34 2012 +1100" }, "message": "hid-input: add support for HID devices reporting Battery Strength\n\nI\u0027ve sent an email earlier asking for help with a GetFeature code, and now I\nhave a second patch on top of Jeremy\u0027s to provide the battery functionality\nfor devices that support reporting it.\n\nIf I understood correctly when talking to Jeremy he said his device\nnever actually reported the status as an input event (sorry if I didn\u0027t\nunderstand it correctly), and after reading HID specs I believe it\u0027s\nreally because it was meant to be probed, I have an Apple Keyboard and\nMagic Trackpad both bluetooth batteries operated, so using PacketLogger\nI saw that Mac OSX always ask the battery status using the so called\nGetFeature.\n\nWhat my patch does is basically:\n- store the report id that matches the battery_strength\n- setup the battery if 0x6.0x20 is found, even if that is reported as a feature\n (as it was meant to be but only the MagicTrackpad does)\n- when upower or someone access /sys/class/power_supply/hid-*/capacity it\n will probe the device and return it\u0027s status.\n\nIt works great for both devices, but I have two concerns:\n- the report_features function has a duplicated code\n- it would be nice if it was possible for specific drivers to provide their own\n probe as there might be some strange devices... (but maybe it\u0027s\nalready possible)\n\nI\u0027ve talked to the upower dev and he fixed it to be able to show the\nright percentage.\n\nHere how the uevent file (in /sys/class/power_supply/hid-*/) looks like:\nPOWER_SUPPLY_NAME\u003dhid-00:22:41:D9:18:E7-battery\nPOWER_SUPPLY_PRESENT\u003d1\nPOWER_SUPPLY_ONLINE\u003d1\nPOWER_SUPPLY_CAPACITY\u003d66\nPOWER_SUPPLY_MODEL_NAME\u003dMacAdmin’s keyboard\nPOWER_SUPPLY_STATUS\u003dDischarging\n\nPOWER_SUPPLY_NAME\u003dhid-70:CD:60:F5:FF:3F-battery\nPOWER_SUPPLY_PRESENT\u003d1\nPOWER_SUPPLY_ONLINE\u003d1\nPOWER_SUPPLY_CAPACITY\u003d62\nPOWER_SUPPLY_MODEL_NAME\u003dnexx’s Trackpad\nPOWER_SUPPLY_STATUS\u003dDischarging\n\nSigned-off-by: Daniel Nicoletti \u003cdantti12@gmail.com\u003e\n" }, { "commit": "928a11ba36f999436915ea2b1eadf54301f93059", "tree": "8d7cb575d528ddd4b1165e4690401c729c1eb930", "parents": [ "237c78beb8a988453bac1993d21f025d070a0d8d", "40ba95fdf158713377d47736b1b3a9d75f4f2515" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 20:21:04 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 20:23:00 2012 +0000" }, "message": "Merge branch \u0027next/cleanup\u0027 into samsung/dt\n\nConflicts:\n\tarch/arm/mach-exynos/common.c\n\nThe common.c file gets changes from rmk/stable-devel (part of\nnext/cleanup), rmk/restart, samsung/dt and follow-on branches\nfrom the samsung tree.\n\nPulling it all together here hopefully avoids having to do\neven more conflicting merge changesets in this one file. What\na mess!\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "02550d61f49266930e674286379d3601006b2893", "tree": "2d30df688b7f428908028dd20e83b22bc799dee7", "parents": [ "2d51daaa615e4724f24e43fa01e705c40551080a", "c89810acbcf48c7004e912b2b4b862480b2d00e1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:18:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:18:52 2012 -0800" }, "message": "Merge tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\ndevicetree/next changes queued for v3.3 merge window\n\n* tag \u0027devicetree-for-linus-20120104\u0027 of git://git.secretlab.ca/git/linux-2.6:\n ARM: prom.h: Fix build error by removing unneeded header file\n irq: check domain hwirq range for DT translate\n dt: add empty of_get_node/of_put_node functions\n of/pdt: fix section mismatch warning\n i2c-designware: add OF binding support\n dt/i2c: Enumerate some of the known trivial i2c devices\n dt: reform for_each_property to for_each_property_of_node\n ARM/of: allow *machine_desc.dt_compat to be const\n of/base: Take NULL string into account for property with multiple strings\n OF/device-tree: Add some entries to vendor-prefixes.txt\n\nFix up trivial add-add conflicts in include/linux/of.h\n" }, { "commit": "fbce1c234feedb5270468aa4b1770c1cab58a960", "tree": "7391d7bcce50eab43c750c4055b056ab1892d6b2", "parents": [ "7affca3537d74365128e477b40c529d6f2fe86c8", "d0ad5e89256c351ddd40167152c24a88efcb0f6d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:15:36 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:15:36 2012 -0800" }, "message": "Merge tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nChanges queued in gpio/next for the start of the 3.3 merge window\n\n* tag \u0027gpio-for-linus-20120104\u0027 of git://git.secretlab.ca/git/linux-2.6:\n gpio: Add decode of WM8994 GPIO configuration\n gpio: Convert GPIO drivers to module_platform_driver\n gpio: Fix typo in comment in Samsung driver\n gpio: Explicitly index samsung_gpio_cfgs\n gpio: Add Linus Walleij as gpio co-maintainer\n of: Add device tree selftests\n of: create of_phandle_args to simplify return of phandle parsing data\n gpio/powerpc: Eliminate duplication of of_get_named_gpio_flags()\n gpio/microblaze: Eliminate duplication of of_get_named_gpio_flags()\n gpiolib: output basic details and consolidate gpio device drivers\n pch_gpio: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor\n pch_gpio: Support new device LAPIS Semiconductor ML7831 IOH\n spi/pl022: make the chip deselect handling thread safe\n spi/pl022: add support for pm_runtime autosuspend\n spi/pl022: disable the PL022 block when unused\n spi/pl022: move device disable to workqueue thread\n spi/pl022: skip default configuration before suspending\n spi/pl022: fix build warnings\n spi/pl022: only enable RX interrupts when TX is complete\n" }, { "commit": "7affca3537d74365128e477b40c529d6f2fe86c8", "tree": "20be92bd240029182fc89c2c4f25401b7715dcae", "parents": [ "356b95424cfb456e14a59eaa579422ce014c424b", "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)\n arm: fix up some samsung merge sysdev conversion problems\n firmware: Fix an oops on reading fw_priv-\u003efw in sysfs loading file\n Drivers:hv: Fix a bug in vmbus_driver_unregister()\n driver core: remove __must_check from device_create_file\n debugfs: add missing #ifdef HAS_IOMEM\n arm: time.h: remove device.h #include\n driver-core: remove sysdev.h usage.\n clockevents: remove sysdev.h\n arm: convert sysdev_class to a regular subsystem\n arm: leds: convert sysdev_class to a regular subsystem\n kobject: remove kset_find_obj_hinted()\n m86k: gpio - convert sysdev_class to a regular subsystem\n mips: txx9_sram - convert sysdev_class to a regular subsystem\n mips: 7segled - convert sysdev_class to a regular subsystem\n sh: dma - convert sysdev_class to a regular subsystem\n sh: intc - convert sysdev_class to a regular subsystem\n power: suspend - convert sysdev_class to a regular subsystem\n power: qe_ic - convert sysdev_class to a regular subsystem\n power: cmm - convert sysdev_class to a regular subsystem\n s390: time - convert sysdev_class to a regular subsystem\n ...\n\nFix up conflicts with \u0027struct sysdev\u0027 removal from various platform\ndrivers that got changed:\n - arch/arm/mach-exynos/cpu.c\n - arch/arm/mach-exynos/irq-eint.c\n - arch/arm/mach-s3c64xx/common.c\n - arch/arm/mach-s3c64xx/cpu.c\n - arch/arm/mach-s5p64x0/cpu.c\n - arch/arm/mach-s5pv210/common.c\n - arch/arm/plat-samsung/include/plat/cpu.h\n - arch/powerpc/kernel/sysfs.c\nand fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h\n" }, { "commit": "f3f511e1ce6f1a6f0a5bb8320e9f802e76f6b999", "tree": "bedb8b38bec1bdb3fa7159bc61822488984d3ce0", "parents": [ "356b95424cfb456e14a59eaa579422ce014c424b" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Thu Jan 05 20:16:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 07 10:16:34 2012 -0800" }, "message": "net: fix sock_clone reference mismatch with tcp memcontrol\n\nSockets can also be created through sock_clone. Because it copies\nall data in the sock structure, it also copies the memcg-related pointer,\nand all should be fine. However, since we now use reference counts in\nsocket creation, we are left with some sockets that have no reference\ncounts. It matters when we destroy them, since it leads to a mismatch.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nCC: Greg Thelen \u003cgthelen@google.com\u003e\nCC: Hiroyouki Kamezawa \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCC: Laurent Chavey \u003cchavey@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "237c78beb8a988453bac1993d21f025d070a0d8d", "tree": "9864f0924650770881141359a2d5bac623949789", "parents": [ "4eb821999086417ab42a15174b51497122fc406e", "7b9dd47136c07ffd883aff6926c7b281e4c1eea4" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 12:30:20 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 12:42:17 2012 +0000" }, "message": "Merge branch \u0027depends/rmk/for-linus\u0027 into samsung/dt\n\nConflicts:\n\tarch/arm/mach-exynos/Makefile\n\tarch/arm/mach-exynos/cpu.c -\u003e common.c\n\tarch/arm/mach-exynos/include/mach/entry-macro.S\n\tarch/arm/mach-exynos/init.c -\u003e common.c\n\tarch/arm/mach-s5p64x0/init.c -\u003e common.c\n\tarch/arm/mach-s5pv210/init.c -\u003e common.c\n\nMultiple files were moved into common.c files in the rmk/for-linus\nbranch, so this moves over the samsung/dt changes to the new\nfiles.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "40ba95fdf158713377d47736b1b3a9d75f4f2515", "tree": "17a3216542d1107f777fd82577c91aebbce597d6", "parents": [ "70d84a6431d732cbc4e68e72b6890cdd3865d43d", "0575fb754dbfc32a01f297e778533340a533ec68" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 11:51:28 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 11:51:28 2012 +0000" }, "message": "Merge branch \u0027depends/rmk/restart\u0027 into next/cleanup\n\nConflicts:\n\tarch/arm/mach-at91/at91cap9.c\n\tarch/arm/mach-at91/at91sam9260.c\n\tarch/arm/mach-at91/at91sam9261.c\n\tarch/arm/mach-at91/at91sam9263.c\n\tarch/arm/mach-at91/at91sam9g45.c\n\tarch/arm/mach-at91/at91sam9rl.c\n\tarch/arm/mach-exynos/cpu.c\n\tarch/arm/mach-shmobile/board-kota2.c\n\nThis resolves a bunch of conflicts between the arm-soc tree\nand changes from the arm tree that have gone upstream.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "c3aa077648e147783a7a53b409578234647db853", "tree": "6ad21f0a005080a1a89bcd736454bc32f0cffab4", "parents": [ "8e8b87964bc8dc5c14b6543fc933b7725f07d3ac" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Wed Dec 21 20:17:10 2011 +0100" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:20:13 2012 -0500" }, "message": "reiserfs: Properly display mount options in /proc/mounts\n\nMake reiserfs properly display mount options in /proc/mounts.\n\nCC: reiserfs-devel@vger.kernel.org\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "8e8b87964bc8dc5c14b6543fc933b7725f07d3ac", "tree": "9a14c135741f3a8ba960ff97f060a58597604a6d", "parents": [ "7ada4db88634429f4da690ad1c4eb73c93085f0c" ], "author": { "name": "Miklos Szeredi", "email": "mszeredi@suse.cz", "time": "Mon Nov 21 12:11:33 2011 +0100" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:20:13 2012 -0500" }, "message": "vfs: prevent remount read-only if pending removes\n\nIf there are any inodes on the super block that have been unlinked\n(i_nlink \u003d\u003d 0) but have not yet been deleted then prevent the\nremounting the super block read-only.\n\nReported-by: Toshiyuki Okajima \u003ctoshi.okajima@jp.fujitsu.com\u003e\nSigned-off-by: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nTested-by: Toshiyuki Okajima \u003ctoshi.okajima@jp.fujitsu.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "7ada4db88634429f4da690ad1c4eb73c93085f0c", "tree": "ed1228f0bfa9d0050d746933595004d7c6e940f9", "parents": [ "4ed5e82fe77f4147cf386327c9a63a2dd7eff518" ], "author": { "name": "Miklos Szeredi", "email": "mszeredi@suse.cz", "time": "Mon Nov 21 12:11:32 2011 +0100" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:20:12 2012 -0500" }, "message": "vfs: count unlinked inodes\n\nAdd a new counter to the superblock that keeps track of unlinked but\nnot yet deleted inodes.\n\nDo not WARN_ON if set_nlink is called with zero count, just do a\nratelimited printk. This happens on xfs and probably other\nfilesystems after an unclean shutdown when the filesystem reads inodes\nwhich already have zero i_nlink. Reported by Christoph Hellwig.\n\nSigned-off-by: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nTested-by: Toshiyuki Okajima \u003ctoshi.okajima@jp.fujitsu.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "4ed5e82fe77f4147cf386327c9a63a2dd7eff518", "tree": "f4eaeefaf5d293014457892ac31f878eece07331", "parents": [ "39f7c4db1d2d9e2e2a90abdf34811783089d217d" ], "author": { "name": "Miklos Szeredi", "email": "mszeredi@suse.cz", "time": "Mon Nov 21 12:11:31 2011 +0100" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:20:12 2012 -0500" }, "message": "vfs: protect remounting superblock read-only\n\nCurrently remouting superblock read-only is racy in a major way.\n\nWith the per mount read-only infrastructure it is now possible to\nprevent most races, which this patch attempts.\n\nBefore starting the remount read-only, iterate through all mounts\nbelonging to the superblock and if none of them have any pending\nwrites, set sb-\u003es_readonly_remount. This indicates that remount is in\nprogress and no further write requests are allowed. If the remount\nsucceeds set MS_RDONLY and reset s_readonly_remount.\n\nIf the remounting is unsuccessful just reset s_readonly_remount.\nThis can result in transient EROFS errors, despite the fact the\nremount failed. Unfortunately hodling off writes is difficult as\nremount itself may touch the filesystem (e.g. through load_nls())\nwhich would deadlock.\n\nA later patch deals with delayed writes due to nlink going to zero.\n\nSigned-off-by: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nTested-by: Toshiyuki Okajima \u003ctoshi.okajima@jp.fujitsu.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "39f7c4db1d2d9e2e2a90abdf34811783089d217d", "tree": "cbc3496ce21e26b5891bb4c4d4155853317ddfb3", "parents": [ "34c80b1d93e6e20ca9dea0baf583a5b5510d92d4" ], "author": { "name": "Miklos Szeredi", "email": "mszeredi@suse.cz", "time": "Mon Nov 21 12:11:30 2011 +0100" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:20:12 2012 -0500" }, "message": "vfs: keep list of mounts for each superblock\n\nKeep track of vfsmounts belonging to a superblock. List is protected\nby vfsmount_lock.\n\nSigned-off-by: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nTested-by: Toshiyuki Okajima \u003ctoshi.okajima@jp.fujitsu.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "34c80b1d93e6e20ca9dea0baf583a5b5510d92d4", "tree": "7dcbf0a4e09464247e6992c8f44fcc872867bd3a", "parents": [ "a6322de67b58a00e3a783ad9c87c2a11b2d67b47" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Dec 08 21:32:45 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:19:54 2012 -0500" }, "message": "vfs: switch -\u003eshow_options() to struct dentry *\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a6322de67b58a00e3a783ad9c87c2a11b2d67b47", "tree": "526d8cb03b5f357bab06907eecad4c1d444a4934", "parents": [ "d861c630e99febe5ce6055290085556c5b714b06" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Dec 08 21:37:57 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:16:55 2012 -0500" }, "message": "vfs: switch -\u003eshow_path() to struct dentry *\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "d861c630e99febe5ce6055290085556c5b714b06", "tree": "972fb0e89694197dbdbeca13920de08394abfe39", "parents": [ "64132379d509184425672e0dce1ac0a031e3f2a5" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Dec 08 21:32:45 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:16:54 2012 -0500" }, "message": "vfs: switch -\u003eshow_devname() to struct dentry *\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "64132379d509184425672e0dce1ac0a031e3f2a5", "tree": "2b7191e0e37bf061b2000935c7cf78e6fb1f3c95", "parents": [ "cdcf116d44e78c7216ba9f8be9af1cdfca7af728" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Dec 08 20:51:13 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:16:54 2012 -0500" }, "message": "vfs: switch -\u003eshow_stats to struct dentry *\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "cdcf116d44e78c7216ba9f8be9af1cdfca7af728", "tree": "2417cfd3e06ac5e2468585e8f00d580242cb5571", "parents": [ "d8c9584ea2a92879f471fd3a2be3af6c534fb035" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Dec 08 10:51:53 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:16:53 2012 -0500" }, "message": "switch security_path_chmod() to struct path *\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "ece2ccb668046610189d88d6aaf05aeb09c988a1", "tree": "a0349945f7537de2aca420b47ced23b6294f8b65", "parents": [ "d10577a8d86a0c735488d66d32289a6d66bcfa20", "a218d0fdc5f9004164ff151d274487f6799907d0", "ff01bb4832651c6d25ac509a06a10fcbd75c461c" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:15:54 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:15:54 2012 -0500" }, "message": "Merge branches \u0027vfsmount-guts\u0027, \u0027umode_t\u0027 and \u0027partitions\u0027 into Z\n" }, { "commit": "770e1b035dcb6ec3f8ee69dda0815dd1e220a683", "tree": "e6d36abfdb053fbc722aea8d7e946d6d1b93c7e1", "parents": [ "d3d0b024348c040f0d6851e2e59fc961677d5169", "7b9dd47136c07ffd883aff6926c7b281e4c1eea4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:15:25 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:15:25 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027for-linus\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (207 commits)\n ARM: 7267/1: Remove BUILD_BUG_ON from asm/bug.h\n ARM: 7269/1: mach-sa1100: fix sched_clock breakage\n ARM: 7198/1: arm/imx6: add restart support for imx6q\n ARM: restart: remove the now empty arch_reset()\n ARM: restart: remove comments about adding code to arch_reset()\n ARM: restart: lpc32xx \u0026 u300: remove unnecessary printk\n ARM: restart: plat-samsung: remove plat/reset.h and s5p_reset_hook\n ARM: restart: w90x900: use new restart hook\n ARM: restart: Versatile Express: use new restart hook\n ARM: restart: versatile: use new restart hook\n ARM: restart: u300: use new restart hook\n ARM: restart: tegra: use new restart hook\n ARM: restart: spear: use new restart hook\n ARM: restart: shark: use new restart hook\n ARM: restart: sa1100: use new restart hook\n ARM: 7252/1: restart: S5PV210: use new restart hook\n ARM: 7251/1: restart: S5PC100: use new restart hook\n ARM: 7250/1: restart: S5P64X0: use new restart hook\n ARM: 7266/1: restart: S3C64XX: use new restart hook\n ARM: 7265/1: restart: S3C24XX: use new restart hook\n ...\n\nFix up trivial conflict in arch/arm/mm/init.c due to removal of\nmemblock_init() clashing with the movement of the sorting of the meminfo\narray.\n" }, { "commit": "d3d0b024348c040f0d6851e2e59fc961677d5169", "tree": "ab018edaa027ad069c54beb9cb3d0c5b5efc2198", "parents": [ "6ed23fd6c08b3ffa17c1f841098d2fa2ab3a59dd", "9d5c627323dcf0983d699d26dd486272fc98bef2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:03:30 2012 -0800" }, "message": "Merge branch \u0027amba-modalias\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027amba-modalias\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:\n sound: aaci: Enable module alias autogeneration for AMBA drivers\n watchdog: sp805: Enable module alias autogeneration for AMBA drivers\n fbdev: amba: Enable module alias autogeneration for AMBA drivers\n serial: pl011: Enable module alias autogeneration for AMBA drivers\n serial: pl010: Enable module alias autogeneration for AMBA drivers\n spi: pl022: Enable module alias autogeneration for AMBA drivers\n rtc: pl031: Enable module alias autogeneration for AMBA drivers\n rtc: pl030: Enable module alias autogeneration for AMBA drivers\n mmc: mmci: Enable module alias autogeneration for AMBA drivers\n input: ambakmi: Enable module alias autogeneration for AMBA drivers\n gpio: pl061: Enable module alias autogeneration for AMBA drivers\n dmaengine: pl330: Enable module alias autogeneration for AMBA drivers\n dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers\n hwrng: nomadik: Enable module alias autogeneration for AMBA drivers\n ARM: amba: Auto-generate AMBA driver module aliases during modpost\n ARM: amba: Move definition of struct amba_id to mod_devicetable.h\n" }, { "commit": "6ed23fd6c08b3ffa17c1f841098d2fa2ab3a59dd", "tree": "5cb5bb5dbefbb6458eff4bdae3c091ca3c02d685", "parents": [ "5ee354a0295c34aa7da07be8490f86edee2c7883", "2174f6df7891fa331800beb72634c969f017900b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:03:02 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:03:02 2012 -0800" }, "message": "Merge branch \u0027pstore\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux\n\n* \u0027pstore\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:\n pstore: gracefully handle NULL pstore_info functions\n pstore: pass reason to backend write callback\n" }, { "commit": "e4e88f31bcb5f05f24b9ae518d4ecb44e1a7774d", "tree": "9eef6998f5bbd1a2c999011d9e0151f00c6e7297", "parents": [ "9753dfe19a85e7e45a34a56f4cb2048bb4f50e27", "ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:58:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:58:22 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (185 commits)\n powerpc: fix compile error with 85xx/p1010rdb.c\n powerpc: fix compile error with 85xx/p1023_rds.c\n powerpc/fsl: add MSI support for the Freescale hypervisor\n arch/powerpc/sysdev/fsl_rmu.c: introduce missing kfree\n powerpc/fsl: Add support for Integrated Flash Controller\n powerpc/fsl: update compatiable on fsl 16550 uart nodes\n powerpc/85xx: fix PCI and localbus properties in p1022ds.dts\n powerpc/85xx: re-enable ePAPR byte channel driver in corenet32_smp_defconfig\n powerpc/fsl: Update defconfigs to enable some standard FSL HW features\n powerpc: Add TBI PHY node to first MDIO bus\n sbc834x: put full compat string in board match check\n powerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address\n powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit\n offb: Fix setting of the pseudo-palette for \u003e8bpp\n offb: Add palette hack for qemu \"standard vga\" framebuffer\n offb: Fix bug in calculating requested vram size\n powerpc/boot: Change the WARN to INFO for boot wrapper overlap message\n powerpc/44x: Fix build error on currituck platform\n powerpc/boot: Change the load address for the wrapper to fit the kernel\n powerpc/44x: Enable CRASH_DUMP for 440x\n ...\n\nFix up a trivial conflict in arch/powerpc/include/asm/cputime.h due to\nthe additional sparse-checking code for cputime_t.\n" }, { "commit": "9753dfe19a85e7e45a34a56f4cb2048bb4f50e27", "tree": "c017a1b4a70b8447c71b01d8b320e071546b5c9d", "parents": [ "edf7c8148ec40c0fd27c0ef3f688defcc65e3913", "9f42f126154786e6e76df513004800c8c633f020" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:22:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:22:09 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1958 commits)\n net: pack skb_shared_info more efficiently\n net_sched: red: split red_parms into parms and vars\n net_sched: sfq: extend limits\n cnic: Improve error recovery on bnx2x devices\n cnic: Re-init dev-\u003estats_addr after chip reset\n net_sched: Bug in netem reordering\n bna: fix sparse warnings/errors\n bna: make ethtool_ops and strings const\n xgmac: cleanups\n net: make ethtool_ops const\n vmxnet3\" make ethtool ops const\n xen-netback: make ops structs const\n virtio_net: Pass gfp flags when allocating rx buffers.\n ixgbe: FCoE: Add support for ndo_get_fcoe_hbainfo() call\n netdev: FCoE: Add new ndo_get_fcoe_hbainfo() call\n igb: reset PHY after recovering from PHY power down\n igb: add basic runtime PM support\n igb: Add support for byte queue limits.\n e1000: cleanup CE4100 MDIO registers access\n e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove\n ...\n" }, { "commit": "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df", "tree": "d851c923f85566572112d4c0f884cff388a3cc05", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610", "ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 into Linux 3.2\n\nThis resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,\nand it fixes the build error in the arch/x86/kernel/microcode_core.c\nfile, that the merge did not catch.\n\nThe microcode_core.c patch was provided by Stephen Rothwell\n\u003csfr@canb.auug.org.au\u003e who was invaluable in the merge issues involved\nwith the large sysdev removal process in the driver-core tree.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "0db49b72bce26341274b74fd968501489a361ae3", "tree": "cdb076827aefb38d719d4c42f8ef291c36072fa8", "parents": [ "35b740e4662ef386f0c60e1b60aaf5b44db9914c", "1ac9bc6943edf7d181b4b1cc734981350d4f6bae" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:33:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:44:54 2012 -0800" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (40 commits)\n sched/tracing: Add a new tracepoint for sleeptime\n sched: Disable scheduler warnings during oopses\n sched: Fix cgroup movement of waking process\n sched: Fix cgroup movement of newly created process\n sched: Fix cgroup movement of forking process\n sched: Remove cfs bandwidth period check in tg_set_cfs_period()\n sched: Fix load-balance lock-breaking\n sched: Replace all_pinned with a generic flags field\n sched: Only queue remote wakeups when crossing cache boundaries\n sched: Add missing rcu_dereference() around -\u003ereal_parent usage\n [S390] fix cputime overflow in uptime_proc_show\n [S390] cputime: add sparse checking and cleanup\n sched: Mark parent and real_parent as __rcu\n sched, nohz: Fix missing RCU read lock\n sched, nohz: Set the NOHZ_BALANCE_KICK flag for idle load balancer\n sched, nohz: Fix the idle cpu check in nohz_idle_balance\n sched: Use jump_labels for sched_feat\n sched/accounting: Fix parameter passing in task_group_account_field\n sched/accounting: Fix user/system tick double accounting\n sched/accounting: Re-use scheduler statistics for the root cgroup\n ...\n\nFix up conflicts in\n - arch/ia64/include/asm/cputime.h, include/asm-generic/cputime.h\n\tusecs_to_cputime64() vs the sparse cleanups\n - kernel/sched/fair.c, kernel/time/tick-sched.c\n\tscheduler changes in multiple branches\n" }, { "commit": "35b740e4662ef386f0c60e1b60aaf5b44db9914c", "tree": "502a8f9499bc1b4cb3300d666dab2d01a1921224", "parents": [ "423d091dfe58d3109d84c408810a7cfa82f6f184", "9e183426bfb52bb44bf3c443d6587e4d02478603" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:58 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:58 2012 -0800" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (106 commits)\n perf kvm: Fix copy \u0026 paste error in description\n perf script: Kill script_spec__delete\n perf top: Fix a memory leak\n perf stat: Introduce get_ratio_color() helper\n perf session: Remove impossible condition check\n perf tools: Fix feature-bits rework fallout, remove unused variable\n perf script: Add generic perl handler to process events\n perf tools: Use for_each_set_bit() to iterate over feature flags\n perf tools: Unify handling of features when writing feature section\n perf report: Accept fifos as input file\n perf tools: Moving code in some files\n perf tools: Fix out-of-bound access to struct perf_session\n perf tools: Continue processing header on unknown features\n perf tools: Improve macros for struct feature_ops\n perf: builtin-record: Document and check that mmap_pages must be a power of two.\n perf: builtin-record: Provide advice if mmap\u0027ing fails with EPERM.\n perf tools: Fix truncated annotation\n perf script: look up thread using tid instead of pid\n perf tools: Look up thread names for system wide profiling\n perf tools: Fix comm for processes with named threads\n ...\n" }, { "commit": "423d091dfe58d3109d84c408810a7cfa82f6f184", "tree": "43c4385d1dc7219582f924d42db1f3e203a577bd", "parents": [ "1483b3823542c9721eddf09a077af1e02ac96b50", "919b83452b2e7c1dbced0456015508b4b9585db3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (64 commits)\n cpu: Export cpu_up()\n rcu: Apply ACCESS_ONCE() to rcu_boost() return value\n Revert \"rcu: Permit rt_mutex_unlock() with irqs disabled\"\n docs: Additional LWN links to RCU API\n rcu: Augment rcu_batch_end tracing for idle and callback state\n rcu: Add rcutorture tests for srcu_read_lock_raw()\n rcu: Make rcutorture test for hotpluggability before offlining CPUs\n driver-core/cpu: Expose hotpluggability to the rest of the kernel\n rcu: Remove redundant rcu_cpu_stall_suppress declaration\n rcu: Adaptive dyntick-idle preparation\n rcu: Keep invoking callbacks if CPU otherwise idle\n rcu: Irq nesting is always 0 on rcu_enter_idle_common\n rcu: Don\u0027t check irq nesting from rcu idle entry/exit\n rcu: Permit dyntick-idle with callbacks pending\n rcu: Document same-context read-side constraints\n rcu: Identify dyntick-idle CPUs on first force_quiescent_state() pass\n rcu: Remove dynticks false positives and RCU failures\n rcu: Reduce latency of rcu_prepare_for_idle()\n rcu: Eliminate RCU_FAST_NO_HZ grace-period hang\n rcu: Avoid needlessly IPIing CPUs at GP end\n ...\n" }, { "commit": "1483b3823542c9721eddf09a077af1e02ac96b50", "tree": "390dcff4ddfb8634ad62c7fc9c3c9d0e802e9c1e", "parents": [ "4a2164a7dbf0d3b6a1c2ef6f20c0d54350491a12", "1a9a8aefa8f0530c97f4606ab7a2fc01fe31e9c1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:01:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:01:59 2012 -0800" }, "message": "Merge branch \u0027core-printk-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-printk-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n printk, lockdep: Switch to tracked irq ops\n printk, lockdep: Remove superfluous preempt_disable()\n printk, lockdep: Disable lock debugging on zap_locks()\n" }, { "commit": "4a2164a7dbf0d3b6a1c2ef6f20c0d54350491a12", "tree": "1ef38a6a3b39f7e539fff848975a5672acc21f44", "parents": [ "15f043a65f655eb8a3aeb831a85da66de520c80f", "45aa0663cc408617b79a2b53f0a5f50e94688a48" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:54:53 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:54:53 2012 -0800" }, "message": "Merge branch \u0027core-memblock-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-memblock-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (52 commits)\n memblock: Reimplement memblock allocation using reverse free area iterator\n memblock: Kill early_node_map[]\n score: Use HAVE_MEMBLOCK_NODE_MAP\n s390: Use HAVE_MEMBLOCK_NODE_MAP\n mips: Use HAVE_MEMBLOCK_NODE_MAP\n ia64: Use HAVE_MEMBLOCK_NODE_MAP\n SuperH: Use HAVE_MEMBLOCK_NODE_MAP\n sparc: Use HAVE_MEMBLOCK_NODE_MAP\n powerpc: Use HAVE_MEMBLOCK_NODE_MAP\n memblock: Implement memblock_add_node()\n memblock: s/memblock_analyze()/memblock_allow_resize()/ and update users\n memblock: Track total size of regions automatically\n powerpc: Cleanup memblock usage\n memblock: Reimplement memblock_enforce_memory_limit() using __memblock_remove()\n memblock: Make memblock functions handle overflowing range @size\n memblock: Reimplement __memblock_remove() using memblock_isolate_range()\n memblock: Separate out memblock_isolate_range() from memblock_set_node()\n memblock: Kill memblock_init()\n memblock: Kill sentinel entries at the end of static region arrays\n memblock: Add __memblock_dump_all()\n ...\n" }, { "commit": "15f043a65f655eb8a3aeb831a85da66de520c80f", "tree": "00f5dbc80796a41ef60320a52faeb68aa5755830", "parents": [ "8c717b72dec32a50666175b62b41de24e4b39be7", "f07fdec50a13f134ea9608c8fb3f6408c58ef55e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:52 2012 -0800" }, "message": "Merge branch \u0027core-locking-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-locking-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n lockdep/waitqueues: Add better annotation\n lockdep, bug: Exclude TAINT_OOT_MODULE from disabling lock debugging\n lockdep: Print lock name in lockdep_init_error()\n init/main.c: Execute lockdep_init() as early as possible\n lockdep, kmemcheck: Annotate -\u003elock in lockdep_init_map()\n lockdep, rtmutex, bug: Show taint flags on error\n lockdep, bug: Exclude TAINT_FIRMWARE_WORKAROUND from disabling lockdep\n lockdep: Always try to set -\u003eclass_cache in register_lock_class() lockdep_init_map()\n" }, { "commit": "8c717b72dec32a50666175b62b41de24e4b39be7", "tree": "e2b4335496cbddb5cded7b1bfd7579ee33f60505", "parents": [ "07d106d0a33d6063d2061305903deb02489eba20", "dc4218bd0fe499fce2896f88101ea42dac1f60fc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:34 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:34 2012 -0800" }, "message": "Merge branch \u0027core-debugobjects-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-debugobjects-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n timer: Use debugobjects to catch deletion of uninitialized timers\n timer: Setup uninitialized timer with a stub callback\n debugobjects: Extend to assert that an object is initialized\n debugobjects: Be smarter about static objects\n" }, { "commit": "ff0b3cd4a416bc727b0797b95b229b278d2a28f2", "tree": "cd6bdc2304ee8fd751f3bd79607c7bcaf337e198", "parents": [ "b8ec61189f3b4cd9d1b2856342f5d7676151d01c" ], "author": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Tue Nov 29 16:24:16 2011 +0100" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 06 15:22:04 2012 +0100" }, "message": "watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API\n\nAdd two nowayout helpers for the Watchdog Timer Driver Kernel API.\nAnd apply this to the already converted drivers.\nNote: s3c2410_wdt lost the nowayout feature during the conversion.\n\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "d15bd7ee445d0702ad801fdaece348fdb79e6581", "tree": "6f18212787e77b9615c955506adda516206ecbac", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610" ], "author": { "name": "Sumit Semwal", "email": "sumit.semwal@ti.com", "time": "Mon Dec 26 14:53:15 2011 +0530" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 06 10:20:21 2012 +0000" }, "message": "dma-buf: Introduce dma buffer sharing mechanism\n\nThis is the first step in defining a dma buffer sharing mechanism.\n\nA new buffer object dma_buf is added, with operations and API to allow easy\nsharing of this buffer object across devices.\n\nThe framework allows:\n- creation of a buffer object, its association with a file pointer, and\n associated allocator-defined operations on that buffer. This operation is\n called the \u0027export\u0027 operation.\n- different devices to \u0027attach\u0027 themselves to this exported buffer object, to\n facilitate backing storage negotiation, using dma_buf_attach() API.\n- the exported buffer object to be shared with the other entity by asking for\n its \u0027file-descriptor (fd)\u0027, and sharing the fd across.\n- a received fd to get the buffer object back, where it can be accessed using\n the associated exporter-defined operations.\n- the exporter and user to share the scatterlist associated with this buffer\n object using map_dma_buf and unmap_dma_buf operations.\n\nAtleast one \u0027attach()\u0027 call is required to be made prior to calling the\nmap_dma_buf() operation.\n\nCouple of building blocks in map_dma_buf() are added to ease introduction\nof sync\u0027ing across exporter and users, and late allocation by the exporter.\n\nFor this first version, this framework will work with certain conditions:\n- *ONLY* exporter will be allowed to mmap to userspace (outside of this\n framework - mmap is not a buffer object operation),\n- currently, *ONLY* users that do not need CPU access to the buffer are\n allowed.\n\nMore details are there in the documentation patch.\n\nThis is based on design suggestions from many people at the mini-summits[1],\nmost notably from Arnd Bergmann \u003carnd@arndb.de\u003e, Rob Clark \u003crob@ti.com\u003e and\nDaniel Vetter \u003cdaniel@ffwll.ch\u003e.\n\nThe implementation is inspired from proof-of-concept patch-set from\nTomasz Stanislawski \u003ct.stanislaws@samsung.com\u003e, who demonstrated buffer sharing\nbetween two v4l2 devices. [2]\n\n[1]: https://wiki.linaro.org/OfficeofCTO/MemoryManagement\n[2]: http://lwn.net/Articles/454389\n\nSigned-off-by: Sumit Semwal \u003csumit.semwal@linaro.org\u003e\nSigned-off-by: Sumit Semwal \u003csumit.semwal@ti.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nReviewed-by: Dave Airlie \u003cairlied@redhat.com\u003e\nReviewed-and-Tested-by: Rob Clark \u003crob.clark@linaro.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "cc1f71942944890c7e05fc55dc4427c94b63d4f1", "tree": "2e9e1b347adb6e4457a02da6e5c2fcbdda851a28", "parents": [ "3df96909b75835d487a9178761622b0cbd7310d4" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 05 09:55:22 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 06 10:01:35 2012 +0000" }, "message": "drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)\n\nSo we have a few places where the drm drivers would like to sleep to\nbe nice to the system, mainly in the modesetting paths, but we also\nhave two cases were atomic modesetting must take place, panic writing\nand kernel debugger. So provide a central inline to determine if a\nsleep or delay should be used and use this in the intel and radeon drivers.\n\nv2: drop intel_drv.h MSLEEP macro, nobody uses it.\n\nBased on patch from Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d43941\n\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dea7e0ac45fd28f90bbc38ff226d36a9f788efbf", "tree": "1130a3d51f0f8aa8ab462f1735423e3dc37835b6", "parents": [ "e11d0b87cde80745afe4712a19cd37bca9924a5b" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Tue Jan 03 17:37:37 2012 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 06 09:34:03 2012 +0000" }, "message": "ttm: fix agp since ttm tt rework\n\nttm tt rework modified the way we allocate and populate the\nttm_tt structure, the AGP side was missing some bit to properly\nwork. Fix those and fix radeon and nouveau AGP support.\n\nTested on radeon only so far.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "93504fce28b1a387ec01f81b26637d237dca2b36", "tree": "7544b4fd960cbcbbfc17dea87aadd129eecf7b45", "parents": [ "721604a15b934f0a8d1909acb8017f029128be2f" ], "author": { "name": "Christian König", "email": "deathsimple@vodafone.de", "time": "Thu Jan 05 22:11:06 2012 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 06 09:16:09 2012 +0000" }, "message": "drm/radeon/kms: Add support for multi-ring sync in CS ioctl (v2)\n\nUse semaphores to sync buffers across rings in the CS\nioctl. Add a reloc flag to allow userspace to skip\nsync for buffers.\n\nagd5f: port to latest CS ioctl changes.\n\nv2: add ring lock/unlock to make sure changes hit the ring.\n\nSigned-off-by: Christian König \u003cdeathsimple@vodafone.de\u003e\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "721604a15b934f0a8d1909acb8017f029128be2f", "tree": "ac1dc0f837d70616b36c9b57d22eb9678c5e68fc", "parents": [ "09b4ea47d1041612b101c369969db123ac2c1511" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Thu Jan 05 22:11:05 2012 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 06 09:15:42 2012 +0000" }, "message": "drm/radeon: GPU virtual memory support v22\n\nVirtual address space are per drm client (opener of /dev/drm).\nClient are in charge of virtual address space, they need to\nmap bo into it by calling DRM_RADEON_GEM_VA ioctl.\n\nFirst 16M of virtual address space is reserved by the kernel.\n\nOnce using 2 level page table we should be able to have a small\nvram memory footprint for each pt (there would be one pt for all\ngart, one for all vram and then one first level for each virtual\naddress space).\n\nPlan include using the sub allocator for a common vm page table\narea and using memcpy to copy vm page table in \u0026 out. Or use\na gart object and copy things in \u0026 out using dma.\n\nv2: agd5f fixes:\n- Add vram base offset for vram pages. The GPU physical address of a\nvram page is FB_OFFSET + page offset. FB_OFFSET is 0 on discrete\ncards and the physical bus address of the stolen memory on\nintegrated chips.\n- VM_CONTEXT1_PROTECTION_FAULT_DEFAULT_ADDR covers all vmid\u0027s \u003e\u003d 1\n\nv3: agd5f:\n- integrate with the semaphore/multi-ring stuff\n\nv4:\n- rebase on top ttm dma \u0026 multi-ring stuff\n- userspace is now in charge of the address space\n- no more specific cs vm ioctl, instead cs ioctl has a new\n chunk\n\nv5:\n- properly handle mem \u003d\u003d NULL case from move_notify callback\n- fix the vm cleanup path\n\nv6:\n- fix update of page table to only happen on valid mem placement\n\nv7:\n- add tlb flush for each vm context\n- add flags to define mapping property (readable, writeable, snooped)\n- make ring id implicit from ib-\u003efence-\u003ering, up to each asic callback\n to then do ring specific scheduling if vm ib scheduling function\n\nv8:\n- add query for ib limit and kernel reserved virtual space\n- rename vm-\u003esize to max_pfn (maximum number of page)\n- update gem_va ioctl to also allow unmap operation\n- bump kernel version to allow userspace to query for vm support\n\nv9:\n- rebuild page table only when bind and incrementaly depending\n on bo referenced by cs and that have been moved\n- allow virtual address space to grow\n- use sa allocator for vram page table\n- return invalid when querying vm limit on non cayman GPU\n- dump vm fault register on lockup\n\nv10: agd5f:\n- Move the vm schedule_ib callback to a standalone function, remove\n the callback and use the existing ib_execute callback for VM IBs.\n\nv11:\n- rebase on top of lastest Linus\n\nv12: agd5f:\n- remove spurious backslash\n- set IB vm_id to 0 in radeon_ib_get()\n\nv13: agd5f:\n- fix handling of RADEON_CHUNK_ID_FLAGS\n\nv14:\n- fix va destruction\n- fix suspend resume\n- forbid bo to have several different va in same vm\n\nv15:\n- rebase\n\nv16:\n- cleanup left over of vm init/fini\n\nv17: agd5f:\n- cs checker\n\nv18: agd5f:\n- reworks the CS ioctl to better support multiple rings and\nVM. Rather than adding a new chunk id for VM, just re-use the\nIB chunk id and add a new flags for VM mode. Also define additional\ndwords for the flags chunk id to define the what ring we want to use\n(gfx, compute, uvd, etc.) and the priority.\n\nv19:\n- fix cs fini in weird case of no ib\n- semi working flush fix for ni\n- rebase on top of sa allocator changes\n\nv20: agd5f:\n- further CS ioctl cleanups from Christian\u0027s comments\n\nv21: agd5f:\n- integrate CS checker improvements\n\nv22: agd5f:\n- final cleanups for release, only allow VM CS on cayman\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9f42f126154786e6e76df513004800c8c633f020", "tree": "0f6247b0a7d804fbbace2d12429b7d80c3e7470e", "parents": [ "eeca6688d6599c28bc449a45facb67d7f203be74" ], "author": { "name": "Ian Campbell", "email": "Ian.Campbell@citrix.com", "time": "Thu Jan 05 07:13:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 05 14:01:21 2012 -0500" }, "message": "net: pack skb_shared_info more efficiently\n\nnr_frags can be 8 bits since 256 is plenty of fragments. This allows it to be\npacked with tx_flags.\n\nAlso by moving ip6_frag_id and dataref (both 4 bytes) next to each other we can\navoid a hole between ip6_frag_id and frag_list on 64 bit systems.\n\nSigned-off-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eeca6688d6599c28bc449a45facb67d7f203be74", "tree": "5cabbf24a3c1ee2d7757c873ba6449296a8ef7b7", "parents": [ "18cb809850fb499ad9bf288696a95f4071f73931" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jan 05 02:25:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 05 14:01:21 2012 -0500" }, "message": "net_sched: red: split red_parms into parms and vars\n\nThis patch splits the red_parms structure into two components.\n\nOne holding the RED \u0027constant\u0027 parameters, and one containing the\nvariables.\n\nThis permits a size reduction of GRED qdisc, and is a preliminary step\nto add an optional RED unit to SFQ.\n\nSFQRED will have a single red_parms structure shared by all flows, and a\nprivate red_vars per flow.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Dave Taht \u003cdave.taht@gmail.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "18cb809850fb499ad9bf288696a95f4071f73931", "tree": "6f6c7c836176385baf0f185b6f5b4092e9ac1fdf", "parents": [ "23021c21055f88a428b6deb6f803fa0d659e023f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jan 04 14:18:38 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 05 14:01:21 2012 -0500" }, "message": "net_sched: sfq: extend limits\n\nSFQ as implemented in Linux is very limited, with at most 127 flows\nand limit of 127 packets. [ So if 127 flows are active, we have one\npacket per flow ]\n\nThis patch brings to SFQ following features to cope with modern needs.\n\n- Ability to specify a smaller per flow limit of inflight packets.\n (default value being at 127 packets)\n\n- Ability to have up to 65408 active flows (instead of 127)\n\n- Ability to have head drops instead of tail drops\n (to drop old packets from a flow)\n\nExample of use : No more than 20 packets per flow, max 8000 flows, max\n20000 packets in SFQ qdisc, hash table of 65536 slots.\n\ntc qdisc add ... sfq \\\n flows 8000 \\\n depth 20 \\\n headdrop \\\n limit 20000 \\\n\tdivisor 65536\n\nRam usage :\n\n2 bytes per hash table entry (instead of previous 1 byte/entry)\n32 bytes per flow on 64bit arches, instead of 384 for QFQ, so much\nbetter cache hit ratio.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Dave Taht \u003cdave.taht@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "68bad94ed801d955535cb50dde3412944a24530c", "tree": "1c7134dffb57e4891fadd367100a7fd072089c10", "parents": [ "a95a07445ee97a2fef65befafbadcc30ca1bd145" ], "author": { "name": "Neerav Parikh", "email": "Neerav.Parikh@intel.com", "time": "Wed Jan 04 20:23:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 05 13:12:04 2012 -0500" }, "message": "netdev: FCoE: Add new ndo_get_fcoe_hbainfo() call\n\nThis adds a new ndo_get_fcoe_hbainfo() call in\nnet_device_ops for FCoE protocol stack.\n\nIf supported by the underlying device, the FCoE protocol\nstack will call this to get device specific information\nfrom the underlying device.\nThis information will then be utilized by the FCoE protocol\nstack to register Fiber Channel HBA attributes with the\nFiber Channel Management Service via Fabric Device\nManagement Interface (FDMI) as per the T11 FC-GS\nspecification.\n\nChanges in v2:\n- As per comments from David Miller aligning the parameters\nof the ndo_get_fcoe_hbainfo()\n\nSigned-off-by: Neerav Parikh \u003cNeerav.Parikh@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1032c736e81cdf490ae62f86da7efe67c3c3e61d", "tree": "a0c3919849f97dbbc5ea7c6a9ac1d7a639e44a73", "parents": [ "117ff42fd43e92d24c6aa6f3e4f0f1e1edada140", "cb00ec382b57d35b955c085198cd54a0c1fcdc94" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jan 05 10:12:45 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jan 05 10:13:24 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tdrivers/net/wireless/b43legacy/dma.c\n" }, { "commit": "e0273728564a395a13cfed70e34da4f2613d2d44", "tree": "e57de35badafff2cc3afcd8896479242b94cc3ec", "parents": [ "74c4fb058083b47571a4f76dcfce95085f2d8098", "11576c6114c3b6505aea2e0c988bedb856a0e20c", "d41c2a7011dffc60571eab8dc4e2a297ef106f44", "4371ea8202e98c8ef77ca887de3b19affbb3498f", "cd07655e732b265eb12a5804ddf7ffae945c9ab9", "78761ff9bc4e944e0b4e5df1e7eedcfdbb1a9a1a", "90120d66974ecf22c32d8cbb2347097ce4144403" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Jan 05 15:51:02 2012 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Jan 05 15:51:02 2012 +0100" }, "message": "Merge branches \u0027hyperv\u0027, \u0027multitouch\u0027, \u0027roccat\u0027, \u0027upstream\u0027, \u0027upstream-fixes\u0027, \u0027wacom\u0027 and \u0027wiimote\u0027 into for-linus\n" }, { "commit": "2e0e943436912ffe0848ece58167edfe754edb96", "tree": "b91919095c74742fa06e2105db6d859bee39b2b4", "parents": [ "a32737e1ca650504f172292dd344eb64c02311f3", "ef3a0bf5bfadbace156fa2a3b9c753df2de41df2" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:24:33 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:24:33 2012 +0000" }, "message": "Merge branch \u0027devel-stable\u0027 into for-linus\n\nConflicts:\n\tarch/arm/kernel/setup.c\n\tarch/arm/mach-shmobile/board-kota2.c\n" }, { "commit": "0a7eb243db7864640134f8c57e6856f8eb3ed7c6", "tree": "93580b87b27d341801f9724d0daba75e933d9412", "parents": [ "a9971157b6c550644fe19551c21f4b05f7e9475a" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Tue Dec 13 20:19:36 2011 -0600" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 05 10:00:16 2012 +0000" }, "message": "drm: add support for private planes\n\nIn cases where the scanout hw is sufficiently similar between \"overlay\"\nand traditional crtc layers, it might be convenient to allow the driver\nto create internal drm_plane helper objects used by the drm_crtc\nimplementation, rather than duplicate code between the plane and crtc.\nA private plane is not exposed to userspace.\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c899afedf168b6735911997d8366b7f23e7e59bc", "tree": "c8160d82bc0b70e9faa661fa5749fe64ca10e821", "parents": [ "75072323a2968c1bd1b74a48ebf5a5d7e5e10183" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Jan 04 22:18:42 2012 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Jan 04 22:19:55 2012 -0800" }, "message": "Input: ucb1400_ts - convert to threaded IRQ\n\nInstead of manually create and handler kernel thread switch to threaded\nIRQ and let kernel IRQ core manage thread for us.\n\nAcked-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "117ff42fd43e92d24c6aa6f3e4f0f1e1edada140", "tree": "c08e1c0357fde481a16489b77feb8f6073faf538", "parents": [ "1d5783030a14d1b6ee763f63c8136e581f48b365", "805a6af8dba5dfdd35ec35dc52ec0122400b2610" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 04 21:35:43 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 04 21:35:43 2012 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "4d447c9a6ebc0142d320f075c5bac6d202a79fd4", "tree": "6eb2a1a17e6de57dba5d350fc2821e2f48a8a484", "parents": [ "f157e78de5923dfb209355f3005ce1b5d64f7998" ], "author": { "name": "Haiyang Zhang", "email": "haiyangz@microsoft.com", "time": "Thu Dec 15 13:45:17 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 04 16:13:05 2012 -0800" }, "message": "net/hyperv: Add support for jumbo frame up to 64KB\n\nAllow the user set the MTU up to 65536 for Linux guests running on\nHyper-V 2008 R2 or later.\n\nSigned-off-by: Haiyang Zhang \u003chaiyangz@microsoft.com\u003e\nSigned-off-by: K. Y. Srinivasan \u003ckys@microsoft.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "18b7ede5f7ee2092aedcb578d3ac30bd5d4fc23c", "tree": "a49fe4ec2a86b37c8bed5041b8314c118b1ebead", "parents": [ "e28dbb0661ca49ada2d6a307a1ec93dd75d515e0" ], "author": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Mon Jan 02 13:35:41 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 04 15:52:42 2012 -0800" }, "message": "usb: ch9: fix up MaxStreams helper\n\nAccording to USB 3.0 Specification Table 9-22, if\nbmAttributes [4:0] are set to zero, it means \"no\nstreams supported\", but the way this helper was\ndefined on Linux, we will *always* have one stream\nwhich might cause several problems.\n\nFor example on DWC3, we would tell the controller\nendpoint has streams enabled and yet start transfers\nwith Stream ID set to 0, which would goof up the host\nside.\n\nWhile doing that, convert the macro to an inline\nfunction due to the different checks we now need.\n\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\nSigned-off-by: Sarah Sharp \u003csarah.a.sharp@linux.intel.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "b9d4e714a86a4e88c2f530c76597f7025e5851d6", "tree": "bd6636d2105de4f849160a7a435fff232d6b76d3", "parents": [ "3b85e4ab2ec1dea29374f16205917b1b5589bc81" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 04 15:05:10 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 04 15:05:10 2012 -0800" }, "message": "driver core: remove __must_check from device_create_file\n\nWith the conversion of the sysdev to a real struct device, more drivers\nare calling device_create_file, and some of them don\u0027t check the return\nvalue, which isn\u0027t wise.\n\nBut as they happen to be in parts of the kernel where a warning is\nconsidered an error (i.e. powerpc), this breaks the build. So for now,\nremove the marking on the function, which fixes the build problems.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "9e7860cee18241633eddb36a4c34c7b61d8cecbc", "tree": "a09121556e76924e32188136379091dffb0223f2", "parents": [ "73db144b58a32fc39733db6a7e1fe582072ad26a" ], "author": { "name": "Ian Campbell", "email": "Ian.Campbell@citrix.com", "time": "Wed Jan 04 09:34:49 2012 +0000" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Jan 04 17:02:03 2012 -0500" }, "message": "xen/xenbus: Reject replies with payload \u003e XENSTORE_PAYLOAD_MAX.\n\nHaogang Chen found out that:\n\n There is a potential integer overflow in process_msg() that could result\n in cross-domain attack.\n\n \tbody \u003d kmalloc(msg-\u003ehdr.len + 1, GFP_NOIO | __GFP_HIGH);\n\n When a malicious guest passes 0xffffffff in msg-\u003ehdr.len, the subsequent\n call to xb_read() would write to a zero-length buffer.\n\n The other end of this connection is always the xenstore backend daemon\n so there is no guest (malicious or otherwise) which can do this. The\n xenstore daemon is a trusted component in the system.\n\n However this seem like a reasonable robustness improvement so we should\n have it.\n\nAnd Ian when read the API docs found that:\n The payload length (len field of the header) is limited to 4096\n (XENSTORE_PAYLOAD_MAX) in both directions. If a client exceeds the\n limit, its xenstored connection will be immediately killed by\n xenstored, which is usually catastrophic from the client\u0027s point of\n view. Clients (particularly domains, which cannot just reconnect)\n should avoid this.\n\nso this patch checks against that instead.\n\nThis also avoids a potential integer overflow pointed out by Haogang Chen.\n\nSigned-off-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nCc: Haogang Chen \u003chaogangchen@gmail.com\u003e\nCC: stable@kernel.org\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "73db144b58a32fc39733db6a7e1fe582072ad26a", "tree": "f03edee848be5aa085c30d493c02a5ee1b8fc3da", "parents": [ "2e16341438c9eca15a2e0bb2ad8555bbdf24b86d" ], "author": { "name": "Jan Beulich", "email": "JBeulich@suse.com", "time": "Thu Dec 22 09:08:13 2011 +0000" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Jan 04 17:01:17 2012 -0500" }, "message": "Xen: consolidate and simplify struct xenbus_driver instantiation\n\nThe \u0027name\u0027, \u0027owner\u0027, and \u0027mod_name\u0027 members are redundant with the\nidentically named fields in the \u0027driver\u0027 sub-structure. Rather than\nswitching each instance to specify these fields explicitly, introduce\na macro to simplify this.\n\nEliminate further redundancy by allowing the drvname argument to\nDEFINE_XENBUS_DRIVER() to be blank (in which case the first entry from\nthe ID table will be used for .driver.name).\n\nAlso eliminate the questionable xenbus_register_{back,front}end()\nwrappers - their sole remaining purpose was the checking of the\n\u0027owner\u0027 field, proper setting of which shouldn\u0027t be an issue anymore\nwhen the macro gets used.\n\nv2: Restore DRV_NAME for the driver name in xen-pciback.\n\nSigned-off-by: Jan Beulich \u003cjbeulich@suse.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Ian Campbell \u003cian.campbell@citrix.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "e6bff995f8fe78f74cbe8f14bf6a31f3560b9ce4", "tree": "6f3dd815508bd265c9d272bea1a1e0300e09bef3", "parents": [ "02a9098ede0dc7e28c16a03fa7fba86a05219478" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Wed Jan 04 10:49:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 04 15:53:20 2012 -0500" }, "message": "ipv6: Check RA for sllao when configuring optimistic ipv6 address (v2)\n\nRecently Dave noticed that a test we did in ipv6_add_addr to see if we next hop\nroute for the interface we\u0027re adding an addres to was wrong (see commit\n7ffbcecbeed91e5874e9a1cfc4c0cbb07dac3069). for one, it never triggers, and two,\nit was completely wrong to begin with. This test was meant to cover this\nsection of RFC 4429:\n\n3.3 Modifications to RFC 2462 Stateless Address Autoconfiguration\n\n * (modifies section 5.5) A host MAY choose to configure a new address\n as an Optimistic Address. A host that does not know the SLLAO\n of its router SHOULD NOT configure a new address as Optimistic.\n A router SHOULD NOT configure an Optimistic Address.\n\nThis patch should bring us into proper compliance with the above clause. Since\nwe only add a SLAAC address after we\u0027ve received a RA which may or may not\ncontain a source link layer address option, we can pass a pointer to that option\nto addrconf_prefix_rcv (which may be null if the option is not present), and\nonly set the optimistic flag if the option was found in the RA.\n\nChange notes:\n(v2) modified the new parameter to addrconf_prefix_rcv to be a bool rather than\na pointer to make its use more clear as per request from davem.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCC: Hideaki YOSHIFUJI \u003cyoshfuji@linux-ipv6.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "288e0713f469c03dbc412153b5341d6dfc2c9907", "tree": "1155f2d96309acb17a23d4a384417c5de3940647", "parents": [ "9931df2692ddb7db092550ce063e674730176ecf" ], "author": { "name": "Ilan Elias", "email": "ilane@ti.com", "time": "Thu Dec 22 11:51:54 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:43 2012 -0500" }, "message": "NFC: Export a new attribute nfcid1 in target info\n\nThe nfcid1 is the NFC-A identifier.\nIt is exported as an attribute of the target info\n(returned as a response to NFC_CMD_GET_TARGET).\n\nSigned-off-by: Ilan Elias \u003cilane@ti.com\u003e\nAcked-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "004161cb52ac49bc17f6528543c1cecbd728f750", "tree": "61701dba816c42e77dc9f941d0e66a8887067919", "parents": [ "637d85a7cdfe4240a56da7d70cf95cca65ea21d3" ], "author": { "name": "Ilan Elias", "email": "ilane@ti.com", "time": "Tue Dec 20 16:57:41 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:39 2012 -0500" }, "message": "NFC: Handle error during NCI data exchange\n\nAdd support for NCI Interface Error Notification.\nWhen this notification is received and we\u0027re during a\ndata exchange transaction, indicate an error to the NFC\ncore layer via the data exchange callback.\n\nSigned-off-by: Ilan Elias \u003cilane@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" } ], "next": "637d85a7cdfe4240a56da7d70cf95cca65ea21d3" }