05 Aug, 2010

12 commits

  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
    Documentation: update broken web addresses.
    fix comment typo "choosed" -> "chosen"
    hostap:hostap_hw.c Fix typo in comment
    Fix spelling contorller -> controller in comments
    Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
    fs/Kconfig: Fix typo Userpace -> Userspace
    Removing dead MACH_U300_BS26
    drivers/infiniband: Remove unnecessary casts of private_data
    fs/ocfs2: Remove unnecessary casts of private_data
    libfc: use ARRAY_SIZE
    scsi: bfa: use ARRAY_SIZE
    drm: i915: use ARRAY_SIZE
    drm: drm_edid: use ARRAY_SIZE
    synclink: use ARRAY_SIZE
    block: cciss: use ARRAY_SIZE
    comment typo fixes: charater => character
    fix comment typos concerning "challenge"
    arm: plat-spear: fix typo in kerneldoc
    reiserfs: typo comment fix
    update email address
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (30 commits)
    Revert "HID: add support for the Wacom Intuos 4 wireless"
    HID: fix up Kconfig entry for ACRUX driver
    HID: add ACRUX game controller force feedback support
    HID: Force input registration for "VEC footpedal"
    HID: add HID_QUIRK_HIDINPUT_FORCE
    HID: hid-input.c: indentation fixes
    HID: hiddev: use usb_find_interface, get rid of BKL
    HID: ignore digitizer usage Undefined (0x00)
    HID: Add support for Conceptronic CLLRCMCE
    HID: hid-ids.h: Whitespace fixup, align using TABs
    HID: picolcd: implement refcounting of framebuffer
    HID: picolcd: do not reallocate memory on depth change
    HID: picolcd: Add minimal palette required by fbcon on 8bpp
    HID: magicmouse: Correct parsing of large X and Y motions.
    HID: magicmouse: report last touch up
    HID: picolcd: fix deferred_io init/cleanup to fb ordering
    HID: hid-ids.h: keep vendor ids in alphabetical order
    HID: add proper support for Elecom BM084 bluetooth mouse
    HID: magicmouse: enable horizontal scrolling
    HID: magicmouse: add param for scroll speed
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (39 commits)
    random: Reorder struct entropy_store to remove padding on 64bits
    padata: update API documentation
    padata: Remove padata_get_cpumask
    crypto: pcrypt - Update pcrypt cpumask according to the padata cpumask notifier
    crypto: pcrypt - Rename pcrypt_instance
    padata: Pass the padata cpumasks to the cpumask_change_notifier chain
    padata: Rearrange set_cpumask functions
    padata: Rename padata_alloc functions
    crypto: pcrypt - Dont calulate a callback cpu on empty callback cpumask
    padata: Check for valid cpumasks
    padata: Allocate cpumask dependend recources in any case
    padata: Fix cpu index counting
    crypto: geode_aes - Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
    pcrypt: Added sysfs interface to pcrypt
    padata: Added sysfs primitives to padata subsystem
    padata: Make two separate cpumasks
    padata: update documentation
    padata: simplify serialization mechanism
    padata: make padata_do_parallel to return zero on success
    padata: Handle empty padata cpumasks
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (276 commits)
    [SCSI] zfcp: Trigger logging in the FCP channel on qdio error conditions
    [SCSI] zfcp: Introduce experimental support for DIF/DIX
    [SCSI] zfcp: Enable data division support for FCP devices
    [SCSI] zfcp: Prevent access on uninitialized memory.
    [SCSI] zfcp: Post events through FC transport class
    [SCSI] zfcp: Cleanup QDIO attachment and improve processing.
    [SCSI] zfcp: Cleanup function parameters for sbal value.
    [SCSI] zfcp: Use correct width for timer_interval field
    [SCSI] zfcp: Remove SCSI device when removing unit
    [SCSI] zfcp: Use memdup_user and kstrdup
    [SCSI] zfcp: Fix retry after failed "open port" erp action
    [SCSI] zfcp: Fail erp after timeout
    [SCSI] zfcp: Use forced_reopen in terminate_rport_io callback
    [SCSI] zfcp: Register SCSI devices after successful fc_remote_port_add
    [SCSI] zfcp: Do not try "forced close" when port is already closed
    [SCSI] zfcp: Do not unblock rport from REOPEN_PORT_FORCED
    [SCSI] sd: add support for runtime PM
    [SCSI] implement runtime Power Management
    [SCSI] convert to the new PM framework
    [SCSI] Unify SAM_ and SAM_STAT_ macros
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits)
    phy/marvell: add 88ec048 support
    igb: Program MDICNFG register prior to PHY init
    e1000e: correct MAC-PHY interconnect register offset for 82579
    hso: Add new product ID
    can: Add driver for esd CAN-USB/2 device
    l2tp: fix export of header file for userspace
    can-raw: Fix skb_orphan_try handling
    Revert "net: remove zap_completion_queue"
    net: cleanup inclusion
    phy/marvell: add 88e1121 interface mode support
    u32: negative offset fix
    net: Fix a typo from "dev" to "ndev"
    igb: Use irq_synchronize per vector when using MSI-X
    ixgbevf: fix null pointer dereference due to filter being set for VLAN 0
    e1000e: Fix irq_synchronize in MSI-X case
    e1000e: register pm_qos request on hardware activation
    ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice
    net: Add getsockopt support for TCP thin-streams
    cxgb4: update driver version
    cxgb4: add new PCI IDs
    ...

    Manually fix up conflicts in:
    - drivers/net/e1000e/netdev.c: due to pm_qos registration
    infrastructure changes
    - drivers/net/phy/marvell.c: conflict between adding 88ec048 support
    and cleaning up the IDs
    - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req
    conflict (registration change vs marking it static)

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
    PM / Runtime: Add runtime PM statistics (v3)
    PM / Runtime: Make runtime_status attribute not debug-only (v. 2)
    PM: Do not use dynamically allocated objects in pm_wakeup_event()
    PM / Suspend: Fix ordering of calls in suspend error paths
    PM / Hibernate: Fix snapshot error code path
    PM / Hibernate: Fix hibernation_platform_enter()
    pm_qos: Get rid of the allocation in pm_qos_add_request()
    pm_qos: Reimplement using plists
    plist: Add plist_last
    PM: Make it possible to avoid races between wakeup and system sleep
    PNPACPI: Add support for remote wakeup
    PM: describe kernel policy regarding wakeup defaults (v. 2)
    PM / Hibernate: Fix typos in comments in kernel/power/swap.c

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
    [CPUFREQ] Remove pointless printk from p4-clockmod.
    [CPUFREQ] Fix section mismatch for powernow_cpu_init in powernow-k7.c
    [CPUFREQ] Fix section mismatch for longhaul_cpu_init.
    [CPUFREQ] Fix section mismatch for longrun_cpu_init.
    [CPUFREQ] powernow-k8: Fix misleading variable naming
    [CPUFREQ] Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
    [CPUFREQ] arch/x86/kernel/cpu/cpufreq: use for_each_pci_dev()
    [CPUFREQ] fix brace coding style issue.
    [CPUFREQ] x86 cpufreq: Make trace_power_frequency cpufreq driver independent
    [CPUFREQ] acpi-cpufreq: Fix CPU_ANY CPUFREQ_{PRE,POST}CHANGE notification
    [CPUFREQ] ondemand: don't synchronize sample rate unless multiple cpus present
    [CPUFREQ] unexport (un)lock_policy_rwsem* functions
    [CPUFREQ] ondemand: Refactor frequency increase code
    [CPUFREQ] powernow-k8: On load failure, remind the user to enable support in BIOS setup
    [CPUFREQ] powernow-k8: Limit Pstate transition latency check
    [CPUFREQ] Fix PCC driver error path
    [CPUFREQ] fix double freeing in error path of pcc-cpufreq
    [CPUFREQ] pcc driver should check for pcch method before calling _OSC
    [CPUFREQ] fix memory leak in cpufreq_add_dev
    [CPUFREQ] revert "[CPUFREQ] remove rwsem lock from CPUFREQ_GOV_STOP call (second call site)"

    Manually fix up non-data merge conflict introduced by new calling
    conventions for trace_power_start() in commit 6f4f2723d085 ("x86
    cpufreq: Make trace_power_frequency cpufreq driver independent"), which
    didn't update the intel_idle native hardware cpuidle driver.

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (88 commits)
    ips driver: make it less chatty
    intel_scu_ipc: fix size field for intel_scu_ipc_command
    intel_scu_ipc: return -EIO for error condition in busy_loop
    intel_scu_ipc: fix data packing of PMIC command on Moorestown
    Clean up command packing on MRST.
    zero the stack buffer before giving random garbage to the SCU
    Fix stack buffer size for IPC writev messages
    intel_scu_ipc: Use the new cpu identification function
    intel_scu_ipc: tidy up unused bits
    Remove indirect read write api support.
    intel_scu_ipc: Support Medfield processors
    intel_scu_ipc: detect CPU type automatically
    x86 plat: limit x86 platform driver menu to X86
    acpi ec_sys: Be more cautious about ec write access
    acpi ec: Fix possible double io port registration
    hp-wmi: acpi_drivers.h is already included through acpi.h two lines below
    hp-wmi: Fix mixing up of and/or directive
    dell-laptop: make dell_laptop_i8042_filter() static
    asus-laptop: fix asus_input_init error path
    msi-wmi: make needlessly global symbols static
    ...

    Linus Torvalds
     
  • * 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (198 commits)
    KVM: VMX: Fix host GDT.LIMIT corruption
    KVM: MMU: using __xchg_spte more smarter
    KVM: MMU: cleanup spte set and accssed/dirty tracking
    KVM: MMU: don't atomicly set spte if it's not present
    KVM: MMU: fix page dirty tracking lost while sync page
    KVM: MMU: fix broken page accessed tracking with ept enabled
    KVM: MMU: add missing reserved bits check in speculative path
    KVM: MMU: fix mmu notifier invalidate handler for huge spte
    KVM: x86 emulator: fix xchg instruction emulation
    KVM: x86: Call mask notifiers from pic
    KVM: x86: never re-execute instruction with enabled tdp
    KVM: Document KVM_GET_SUPPORTED_CPUID2 ioctl
    KVM: x86: emulator: inc/dec can have lock prefix
    KVM: MMU: Eliminate redundant temporaries in FNAME(fetch)
    KVM: MMU: Validate all gptes during fetch, not just those used for new pages
    KVM: MMU: Simplify spte fetch() function
    KVM: MMU: Add gpte_valid() helper
    KVM: MMU: Add validate_direct_spte() helper
    KVM: MMU: Add drop_large_spte() helper
    KVM: MMU: Use __set_spte to link shadow pages
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
    Input: adp5588-keypad - fix NULL dereference in adp5588_gpio_add()
    Input: cy8ctmg110 - capacitive touchscreen support
    Input: keyboard - also match braille-only keyboards
    Input: adp5588-keys - export unused GPIO pins
    Input: xpad - add product ID for Hori Fighting Stick EX2
    Input: adxl34x - fix leak and use after free
    Input: samsung-keypad - Add samsung keypad driver
    Input: i8042 - reset keyboard controller wehen resuming from S2R
    Input: synaptics - set min/max for finger width
    Input: synaptics - only report width on hardware that supports it
    Input: evdev - signal that device is writable in evdev_poll()
    Input: mousedev - signal that device is writable in mousedev_poll()
    Input: change input handlers to use bool when possible
    Input: document the MT event slot protocol
    Input: introduce MT event slots
    Input: usbtouchscreen - implement reset_resume
    Input: usbtouchscreen - implement runtime power management
    Input: usbtouchscreen - implement basic suspend/resume
    Input: Add ATMEL QT602240 touchscreen driver
    Input: fix signedness warning in input_set_keycode()
    ...

    Linus Torvalds
     
  • * 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (243 commits)
    V4L/DVB: sms: Convert IR support to use the Remote Controller core
    V4L/DVB: sms: properly initialize IR phys and IR name
    V4L/DVB: standardize names at rc-dib0700 tables
    V4L/DVB: smsusb: enable IR port for Hauppauge WinTV MiniStick
    V4L/DVB: dib0700: Fix RC protocol logic to properly handle NEC/NECx and RC-5
    V4L/DVB: dib0700: properly implement IR change_protocol
    V4L/DVB: dib0700: break keytable into NEC and RC-5 variants
    V4L/DVB: dib0700: avoid bad repeat
    V4L/DVB: Port dib0700 to rc-core
    V4L/DVB: Add a keymap file with dib0700 table
    V4L/DVB: dvb-usb: add support for rc-core mode
    V4L/DVB: dvb-usb: prepare drivers for using rc-core
    V4L/DVB: dvb-usb: get rid of struct dvb_usb_rc_key
    V4L/DVB: rj54n1cb0c: fix a comment in the driver
    V4L/DVB: V4L2: sh_vou: VOU does support the full PAL resolution too
    V4L/DVB: V4L2: sh_mobile_camera_ceu: add support for CSI2
    V4L/DVB: V4L2: soc-camera: add a MIPI CSI-2 driver for SH-Mobile platforms
    V4L/DVB: V4L2: soc-camera: export soc-camera bus type for notifications
    V4L/DVB: V4L2: mediabus: add 12-bit Bayer and YUV420 pixel formats
    V4L/DVB: mediabus: fix ambiguous pixel code names
    ...

    Linus Torvalds
     
  • …s/security-testing-2.6

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (90 commits)
    AppArmor: fix build warnings for non-const use of get_task_cred
    selinux: convert the policy type_attr_map to flex_array
    AppArmor: Enable configuring and building of the AppArmor security module
    TOMOYO: Use pathname specified by policy rather than execve()
    AppArmor: update path_truncate method to latest version
    AppArmor: core policy routines
    AppArmor: policy routines for loading and unpacking policy
    AppArmor: mediation of non file objects
    AppArmor: LSM interface, and security module initialization
    AppArmor: Enable configuring and building of the AppArmor security module
    AppArmor: update Maintainer and Documentation
    AppArmor: functions for domain transitions
    AppArmor: file enforcement routines
    AppArmor: userspace interfaces
    AppArmor: dfa match engine
    AppArmor: contexts used in attaching policy to system objects
    AppArmor: basic auditing infrastructure.
    AppArmor: misc. base functions and defines
    TOMOYO: Update version to 2.3.0
    TOMOYO: Fix quota check.
    ...

    Linus Torvalds
     

04 Aug, 2010

6 commits

  • Conflicts:
    drivers/hid/hid-ids.h

    Jiri Kosina
     
  • Below you will find an updated version from the original series bunching all patches into one big patch
    updating broken web addresses that are located in Documentation/*
    Some of the addresses date as far far back as 1995 etc... so searching became a bit difficult,
    the best way to deal with these is to use web.archive.org to locate these addresses that are outdated.
    Now there are also some addresses pointing to .spec files some are located, but some(after searching
    on the companies site)where still no where to be found. In this case I just changed the address
    to the company site this way the users can contact the company and they can locate them for the users.

    Signed-off-by: Justin P. Mattock
    Signed-off-by: Thomas Weber
    Signed-off-by: Mike Frysinger
    Cc: Paulo Marques
    Cc: Randy Dunlap
    Cc: Michael Neuling
    Signed-off-by: Jiri Kosina

    Justin P. Mattock
     
  • Jiri Kosina
     
  • * 'for-linus' of git://oss.sgi.com/xfs/xfs: (49 commits)
    xfs simplify and speed up direct I/O completions
    xfs: move aio completion after unwritten extent conversion
    direct-io: move aio_complete into ->end_io
    xfs: fix big endian build
    xfs: clean up xfs_bmap_get_bp
    xfs: simplify xfs_truncate_file
    xfs: kill the b_strat callback in xfs_buf
    xfs: remove obsolete osyncisosync mount option
    xfs: clean up filestreams helpers
    xfs: fix gcc 4.6 set but not read and unused statement warnings
    xfs: Fix build when CONFIG_XFS_POSIX_ACL=n
    xfs: fix unsigned underflow in xfs_free_eofblocks
    xfs: use GFP_NOFS for page cache allocation
    xfs: fix memory reclaim recursion deadlock on locked inode buffer
    xfs: fix xfs_trans_add_item() lockdep warnings
    xfs: simplify and remove xfs_ireclaim
    xfs: don't block on buffer read errors
    xfs: move inode shrinker unregister even earlier
    xfs: remove a dmapi leftover
    xfs: writepage always has buffers
    ...

    Linus Torvalds
     
  • * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (291 commits)
    ARM: AMBA: Add pclk support to AMBA bus infrastructure
    ARM: 6278/2: fix regression in RealView after the introduction of pclk
    ARM: 6277/1: mach-shmobile: Allow users to select HZ, default to 128
    ARM: 6276/1: mach-shmobile: remove duplicate NR_IRQS_LEGACY
    ARM: 6246/1: mmci: support larger MMCIDATALENGTH register
    ARM: 6245/1: mmci: enable hardware flow control on Ux500 variants
    ARM: 6244/1: mmci: add variant data and default MCICLOCK support
    ARM: 6243/1: mmci: pass power_mode to the translate_vdd callback
    ARM: 6274/1: add global control registers definition header file for nuc900
    mx2_camera: fix type of dma buffer virtual address pointer
    mx2_camera: Add soc_camera support for i.MX25/i.MX27
    arm/imx/gpio: add spinlock protection
    ARM: Add support for the LPC32XX arch
    ARM: LPC32XX: Arch config menu supoport and makefiles
    ARM: LPC32XX: Phytec 3250 platform support
    ARM: LPC32XX: Misc support functions
    ARM: LPC32XX: Serial support code
    ARM: LPC32XX: System suspend support
    ARM: LPC32XX: GPIO, timer, and IRQ drivers
    ARM: LPC32XX: Clock driver
    ...

    Linus Torvalds
     
  • lock_policy_rwsem_* and unlock_policy_rwsem_* functions are scheduled
    to be unexported when 2.6.33. Now there are no other callers of them
    out of cpufreq.c, unexport them and make them static.

    Signed-off-by: WANG Cong
    Cc: Venkatesh Pallipadi
    Signed-off-by: Dave Jones

    Amerigo Wang
     

03 Aug, 2010

19 commits


02 Aug, 2010

3 commits