31 Oct, 2011

3 commits

  • * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    i2c: Functions for byte-swapped smbus_write/read_word_data
    i2c-algo-pca: Return standard fault codes
    i2c-algo-bit: Return standard fault codes
    i2c-algo-bit: Be verbose on bus testing failure
    i2c-algo-bit: Let user test buses without failing
    i2c/scx200_acb: Fix section mismatch warning in scx200_pci_drv
    i2c: I2C_ELEKTOR should depend on HAS_IOPORT

    Linus Torvalds
     
  • * 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (75 commits)
    KVM: SVM: Keep intercepting task switching with NPT enabled
    KVM: s390: implement sigp external call
    KVM: s390: fix register setting
    KVM: s390: fix return value of kvm_arch_init_vm
    KVM: s390: check cpu_id prior to using it
    KVM: emulate lapic tsc deadline timer for guest
    x86: TSC deadline definitions
    KVM: Fix simultaneous NMIs
    KVM: x86 emulator: convert push %sreg/pop %sreg to direct decode
    KVM: x86 emulator: switch lds/les/lss/lfs/lgs to direct decode
    KVM: x86 emulator: streamline decode of segment registers
    KVM: x86 emulator: simplify OpMem64 decode
    KVM: x86 emulator: switch src decode to decode_operand()
    KVM: x86 emulator: qualify OpReg inhibit_byte_regs hack
    KVM: x86 emulator: switch OpImmUByte decode to decode_imm()
    KVM: x86 emulator: free up some flag bits near src, dst
    KVM: x86 emulator: switch src2 to generic decode_operand()
    KVM: x86 emulator: expand decode flags to 64 bits
    KVM: x86 emulator: split dst decode to a generic decode_operand()
    KVM: x86 emulator: move memop, memopp into emulation context
    ...

    Linus Torvalds
     
  • * 'fbdev-next' of git://github.com/schandinat/linux-2.6: (270 commits)
    video: platinumfb: Add __devexit_p at necessary place
    drivers/video: fsl-diu-fb: merge diu_pool into fsl_diu_data
    drivers/video: fsl-diu-fb: merge diu_hw into fsl_diu_data
    drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported
    drivers/video: fsl-diu-fb: remove unused panel operating mode support
    drivers/video: fsl-diu-fb: use an enum for the AOI index
    drivers/video: fsl-diu-fb: add several new video modes
    drivers/video: fsl-diu-fb: remove broken screen blanking support
    drivers/video: fsl-diu-fb: move some definitions out of the header file
    drivers/video: fsl-diu-fb: fix some ioctls
    video: da8xx-fb: Increased resolution configuration of revised LCDC IP
    OMAPDSS: picodlp: add missing #include
    fb: fix au1100fb bitrot.
    mx3fb: fix NULL pointer dereference in screen blanking.
    video: irq: Remove IRQF_DISABLED
    smscufx: change edid data to u8 instead of char
    OMAPDSS: DISPC: zorder support for DSS overlays
    OMAPDSS: DISPC: VIDEO3 pipeline support
    OMAPDSS/OMAP_VOUT: Fix incorrect OMAP3-alpha compatibility setting
    video/omap: fix build dependencies
    ...

    Fix up conflicts in:
    - drivers/staging/xgifb/XGI_main_26.c
    Changes to XGIfb_pan_var()
    - drivers/video/omap/{lcd_apollon.c,lcd_ldp.c,lcd_overo.c}
    Removed (or in the case of apollon.c, merged into the generic
    DSS panel in drivers/video/omap2/displays/panel-generic-dpi.c)

    Linus Torvalds
     

30 Oct, 2011

1 commit


29 Oct, 2011

3 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (204 commits)
    [SCSI] qla4xxx: export address/port of connection (fix udev disk names)
    [SCSI] ipr: Fix BUG on adapter dump timeout
    [SCSI] megaraid_sas: Fix instance access in megasas_reset_timer
    [SCSI] hpsa: change confusing message to be more clear
    [SCSI] iscsi class: fix vlan configuration
    [SCSI] qla4xxx: fix data alignment and use nl helpers
    [SCSI] iscsi class: fix link local mispelling
    [SCSI] iscsi class: Replace iscsi_get_next_target_id with IDA
    [SCSI] aacraid: use lower snprintf() limit
    [SCSI] lpfc 8.3.27: Change driver version to 8.3.27
    [SCSI] lpfc 8.3.27: T10 additions for SLI4
    [SCSI] lpfc 8.3.27: Fix queue allocation failure recovery
    [SCSI] lpfc 8.3.27: Change algorithm for getting physical port name
    [SCSI] lpfc 8.3.27: Changed worst case mailbox timeout
    [SCSI] lpfc 8.3.27: Miscellanous logic and interface fixes
    [SCSI] megaraid_sas: Changelog and version update
    [SCSI] megaraid_sas: Add driver workaround for PERC5/1068 kdump kernel panic
    [SCSI] megaraid_sas: Add multiple MSI-X vector/multiple reply queue support
    [SCSI] megaraid_sas: Add support for MegaRAID 9360/9380 12GB/s controllers
    [SCSI] megaraid_sas: Clear FUSION_IN_RESET before enabling interrupts
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (549 commits)
    ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
    ALSA: hda - Keep EAPD turned on for old Conexant chips
    ALSA: hda/realtek - Fix missing volume controls with ALC260
    ASoC: wm8940: Properly set codec->dapm.bias_level
    ALSA: hda - Fix pin-config for ASUS W90V
    ALSA: hda - Fix surround/CLFE headphone and speaker pins order
    ALSA: hda - Fix typo
    ALSA: Update the sound git tree URL
    ALSA: HDA: Add new revision for ALC662
    ASoC: max98095: Convert codec->hw_write to snd_soc_write
    ASoC: keep pointer to resource so it can be freed
    ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
    ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
    ASoC: da7210: Add support for line out and DAC
    ASoC: da7210: Add support for DAPM
    ALSA: hda/realtek - Fix DAC assignments of multiple speakers
    ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
    ASoC: Set sgtl5000->ldo in ldo_regulator_register
    ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
    ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (83 commits)
    mmc: fix compile error when CONFIG_BLOCK is not enabled
    mmc: core: Cleanup eMMC4.5 conditionals
    mmc: omap_hsmmc: if multiblock reads are broken, disable them
    mmc: core: add workaround for controllers with broken multiblock reads
    mmc: core: Prevent too long response times for suspend
    mmc: recognise SDIO cards with SDIO_CCCR_REV 3.00
    mmc: sd: Handle SD3.0 cards not supporting UHS-I bus speed mode
    mmc: core: support HPI send command
    mmc: core: Add cache control for eMMC4.5 device
    mmc: core: Modify the timeout value for writing power class
    mmc: core: new discard feature support at eMMC v4.5
    mmc: core: mmc sanitize feature support for v4.5
    mmc: dw_mmc: modify DATA register offset
    mmc: sdhci-pci: add flag for devices that can support runtime PM
    mmc: omap_hsmmc: ensure pbias configuration is always done
    mmc: core: Add Power Off Notify Feature eMMC 4.5
    mmc: sdhci-s3c: fix potential NULL dereference
    mmc: replace printk with appropriate display macro
    mmc: core: Add default timeout value for CMD6
    mmc: sdhci-pci: add runtime pm support
    ...

    Linus Torvalds
     

28 Oct, 2011

3 commits

  • * 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86-64, doc: Remove int 0xcc from entry_64.S documentation
    x86, vsyscall: Add missing to arch/x86/mm/fault.c

    Fix up trivial conflicts in arch/x86/mm/fault.c (asm/fixmap.h vs
    asm/vsyscall.h: both work, which to use? Whatever..)

    Linus Torvalds
     
  • * 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86, random: Verify RDRAND functionality and allow it to be disabled
    x86, random: Architectural inlines to get random integers with RDRAND
    random: Add support for architectural random hooks

    Fix up trivial conflicts in drivers/char/random.c: the architectural
    random hooks touched "get_random_int()" that was simplified to use MD5
    and not do the keyptr thing any more (see commit 6e5714eaf77d: "net:
    Compute protocol sequence numbers and fragment IDs using MD5").

    Linus Torvalds
     
  • * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86, amd: Include linux/elf.h since we use stuff from asm/elf.h
    x86: cache_info: Update calculation of AMD L3 cache indices
    x86: cache_info: Kill the atomic allocation in amd_init_l3_cache()
    x86: cache_info: Kill the moronic shadow struct
    x86: cache_info: Remove bogus free of amd_l3_cache data
    x86, amd: Include elf.h explicitly, prepare the code for the module.h split
    x86-32, amd: Move va_align definition to unbreak 32-bit build
    x86, amd: Move BSP code to cpu_dev helper
    x86: Add a BSP cpu_dev helper
    x86, amd: Avoid cache aliasing penalties on AMD family 15h

    Linus Torvalds
     

27 Oct, 2011

9 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (68 commits)
    Input: adp5589-keys - add support for the ADP5585 derivatives
    Input: imx_keypad - add pm suspend and resume support
    Input: force feedback - potential integer wrap in input_ff_create()
    Input: tsc2007 - make sure that X plate resistance is specified
    Input: serio_raw - fix memory leak when closing char device
    Input: serio_raw - kick clients when disconnecting port
    Input: serio_raw - explicitly mark disconnected ports as dead
    Input: serio_raw - fix coding style issues
    Input: serio_raw - use dev_*() for messages
    Input: serio_raw - use bool for boolean data
    Input: serio_raw - perform proper locking when adding clients to list
    Input: serio_raw - rename serio_raw_list to serio_raw_client
    Input: serio_raw - use kref instead of rolling out its own refcounting
    Input: psmouse - switch to using dev_*() for messages
    Input: wacom - correct max Y value on medium bamboos
    Input: wacom - add ABS_DISTANCE to Bamboo Pen reports
    Input: wacom - remove unneeded touch pressure initialization
    Input: lm8323 - wrap suspend and resume in CONFIG_PM_SLEEP
    Input: ad7879-i2c - wrap suspend and resume in CONFIG_PM_SLEEP
    Input: synaptics_i2c - wrap suspend and resume in CONFIG_PM_SLEEP
    ...

    Linus Torvalds
     
  • * 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6:
    of_mdio: Don't phy_scan_fixups() twice
    Devicetree: Expand on ARM Primecell binding documentation
    dt: Add empty of_match_node() macro
    dt: add empty dt helpers for non-dt build
    devicetree: fix build error on drivers/tty/serial/altera_jtaguart.c
    devicetree: Add ARM pl022 spi controller binding doc
    devicetree: Add ARM pl061 gpio controller binding doc
    of/irq: of_irq_find_parent: check for parent equal to child
    MAINTAINERS: update devicetree maintainers
    dt: add helper to read 64-bit integers
    tty: use of_match_ptr() for of_match_table entry
    OF: Add of_match_ptr() macro
    dt: add empty for_each_child_of_node, of_find_property
    devicetree: Document Qualcomm and Atmel prefixes
    serial/imx: add of_alias_get_id() reference back
    dt: add of_alias_scan and of_alias_get_id
    devicetree: Add a registry of vendor prefixes

    Linus Torvalds
     
  • Takashi Iwai
     
  • Takashi Iwai
     
  • Signed-off-by: Per Forlin
    Reviewed-by: Akinobu Mita
    Signed-off-by: Chris Ball

    Per Forlin
     
  • * 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
    tools, slub: Fix off-by-one buffer corruption after readlink() call
    slub: Discard slab page when node partial > minimum partial number
    slub: correct comments error for per cpu partial
    mm: restrict access to slab files under procfs and sysfs
    slub: Code optimization in get_partial_node()
    slub: doc: update the slabinfo.c file path
    slub: explicitly document position of inserting slab to partial list
    slub: update slabinfo tools to report per cpu partial list statistics
    slub: per cpu cache for partial pages
    slub: return object pointer from get_partial() / new_slab().
    slub: pass kmem_cache_cpu pointer to get_partial()
    slub: Prepare inuse field in new_slab()
    slub: Remove useless statements in __slab_alloc
    slub: free slabs without holding locks
    slub: use print_hex_dump
    slab: use print_hex_dump

    Linus Torvalds
     
  • The previous patch which implemented a DT binding for sdhci-tegra did not
    allow all platform data fields to be initialized from DT. The following
    were missing:

    is_8bit: Implemented by this patch.

    pm_flags: Not implemented yet. There are no mainline users of this field.
    I'm not quite sure what it's for, and hence how to represent this
    in DT; the value ends up being assigned to host->mmc->pm_caps.

    While we're at it, fix the binding documentation to refer to "SD/MMC"
    instead of "eSDHC", since that's the correct name; "eSDHC" was cut/paste
    from the Freescale binding docs.

    Signed-off-by: Stephen Warren
    Signed-off-by: Chris Ball

    Stephen Warren
     
  • Add hooks to read gpio configuration out of the device tree node.

    [grant.likely: Rewrite of original patch from John Bonesio]
    Signed-off-by: Grant Likely
    [swarren: Fixed tegra_sdhci_get_ro() to retrieve pdata correctly]
    [swarren: Reworked to avoid #ifdef CONFIG_OF]
    [swarren: Reworked binding based on fsl-imx-esdhc.txt]
    [swarren: Documented binding]
    Signed-off-by: Stephen Warren
    Signed-off-by: Chris Ball

    Grant Likely
     
  • Add description on how to enable random fault injection
    for MMC IO.

    Signed-off-by: Per Forlin
    Acked-by: Akinobu Mita
    Reviewed-by: Linus Walleij
    Signed-off-by: Chris Ball

    Per Forlin
     

26 Oct, 2011

8 commits

  • Pekka Enberg
     
  • * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (46 commits)
    llist: Add back llist_add_batch() and llist_del_first() prototypes
    sched: Don't use tasklist_lock for debug prints
    sched: Warn on rt throttling
    sched: Unify the ->cpus_allowed mask copy
    sched: Wrap scheduler p->cpus_allowed access
    sched: Request for idle balance during nohz idle load balance
    sched: Use resched IPI to kick off the nohz idle balance
    sched: Fix idle_cpu()
    llist: Remove cpu_relax() usage in cmpxchg loops
    sched: Convert to struct llist
    llist: Add llist_next()
    irq_work: Use llist in the struct irq_work logic
    llist: Return whether list is empty before adding in llist_add()
    llist: Move cpu_relax() to after the cmpxchg()
    llist: Remove the platform-dependent NMI checks
    llist: Make some llist functions inline
    sched, tracing: Show PREEMPT_ACTIVE state in trace_sched_switch
    sched: Remove redundant test in check_preempt_tick()
    sched: Add documentation for bandwidth control
    sched: Return unused runtime on group dequeue
    ...

    Linus Torvalds
     
  • * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (45 commits)
    rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp()
    rcu: Remove rcu_needs_cpu_flush() to avoid false quiescent states
    rcu: Wire up RCU_BOOST_PRIO for rcutree
    rcu: Make rcu_torture_boost() exit loops at end of test
    rcu: Make rcu_torture_fqs() exit loops at end of test
    rcu: Permit rt_mutex_unlock() with irqs disabled
    rcu: Avoid having just-onlined CPU resched itself when RCU is idle
    rcu: Suppress NMI backtraces when stall ends before dump
    rcu: Prohibit grace periods during early boot
    rcu: Simplify unboosting checks
    rcu: Prevent early boot set_need_resched() from __rcu_pending()
    rcu: Dump local stack if cannot dump all CPUs' stacks
    rcu: Move __rcu_read_unlock()'s barrier() within if-statement
    rcu: Improve rcu_assign_pointer() and RCU_INIT_POINTER() documentation
    rcu: Make rcu_assign_pointer() unconditionally insert a memory barrier
    rcu: Make rcu_implicit_dynticks_qs() locals be correct size
    rcu: Eliminate in_irq() checks in rcu_enter_nohz()
    nohz: Remove nohz_cpu_mask
    rcu: Document interpretation of RCU-lockdep splats
    rcu: Allow rcutorture's stat_interval parameter to be changed at runtime
    ...

    Linus Torvalds
     
  • * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86, ioapic: Consolidate the explicit EOI code
    x86, ioapic: Restore the mask bit correctly in eoi_ioapic_irq()
    x86, kdump, ioapic: Reset remote-IRR in clear_IO_APIC
    iommu: Rename the DMAR and INTR_REMAP config options
    x86, ioapic: Define irq_remap_modify_chip_defaults()
    x86, msi, intr-remap: Use the ioapic set affinity routine
    iommu: Cleanup ifdefs in detect_intel_iommu()
    iommu: No need to set dmar_disabled in check_zero_address()
    iommu: Move IOMMU specific code to intel-iommu.c
    intr_remap: Call dmar_dev_scope_init() explicitly
    x86, x2apic: Enable the bios request for x2apic optout

    Linus Torvalds
     
  • Signed-off-by: Alexander Stein
    Signed-off-by: Takashi Iwai

    Alexander Stein
     
  • * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (79 commits)
    TTY: serial_core: Fix crash if DCD drop during suspend
    tty/serial: atmel_serial: bootconsole removed from auto-enumerates
    Revert "TTY: call tty_driver_lookup_tty unconditionally"
    tty/serial: atmel_serial: add device tree support
    tty/serial: atmel_serial: auto-enumerate ports
    tty/serial: atmel_serial: whitespace and braces modifications
    tty/serial: atmel_serial: change platform_data variable name
    tty/serial: RS485 bindings for device tree
    TTY: call tty_driver_lookup_tty unconditionally
    TTY: pty, release tty in all ptmx_open fail paths
    TTY: make tty_add_file non-failing
    TTY: drop driver reference in tty_open fail path
    8250_pci: Fix kernel panic when pch_uart is disabled
    h8300: drivers/serial/Kconfig was moved
    parport_pc: release IO region properly if unsupported ITE887x card is found
    tty: Support compat_ioctl get/set termios_locked
    hvc_console: display printk messages on console.
    TTY: snyclinkmp: forever loop in tx_load_dma_buffer()
    tty/n_gsm: avoid fifo overflow in gsm_dlci_data_output
    tty/n_gsm: fix a bug in gsm_dlci_data_output (adaption = 2 case)
    ...

    Fix up Conflicts in:
    - drivers/tty/serial/8250_pci.c
    Trivial conflict with removed duplicate device ID
    - drivers/tty/serial/atmel_serial.c
    Annoying silly conflict between "specify the port num via
    platform_data" and other changes to atmel_console_init

    Linus Torvalds
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (26 commits)
    hwmon: (w83627ehf) Better fix for negative temperature values
    hwmon: (w83627ehf) Uninline is_word_sized
    hwmon: (lm75) Document why clones are not detected
    hwmon: (w83627ehf) Move fan pins check to a separate function
    hwmon: (w83627ehf) Skip reading unused voltage registers
    hwmon: (lm75) Add support for Analog Devices ADT75
    hwmon: (pmbus_core) Simplify sign extensions
    hwmon: (pmbus) Add support for Lineage Power DC-DC converters
    hwmon: (pmbus/ltc2978) Add support for LTC3880 to LTC2978 driver
    hwmon: (pmbus/ltc2978) Explicit driver for LTC2978
    hwmon: (pmbus) Add support for TEMP2 peak attributes
    hwmon: AD7314 driver (ported from IIO)
    hwmon: (pmbus) Add support for Intersil power management chips
    hwmon: (pmbus) Always call _pmbus_read_byte in core driver
    hwmon: (pmbus) Replace EINVAL return codes with more appropriate errors
    hwmon: (pmbus) Provide more documentation
    hwmon/f71882fg: Make the decision wether to register fan attr. per fan
    hwmon/f71882fg: Add a f71882fg_create_fan_sysfs_files helper function
    hwmon/f71882fg: Make all fan/pwm attr tables 2 dimensional
    hwmon: (exynos4_tmu) Remove IRQF_DISABLED
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://github.com/ericvh/linux:
    9p: fix 9p.txt to advertise msize instead of maxdata
    net/9p: Convert net/9p protocol dumps to tracepoints
    fs/9p: change an int to unsigned int
    fs/9p: Cleanup option parsing in 9p
    9p: move dereference after NULL check
    fs/9p: inode file operation is properly initialized init_special_inode
    fs/9p: Update zero-copy implementation in 9p

    Linus Torvalds
     

25 Oct, 2011

13 commits

  • * 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (63 commits)
    PM / Clocks: Remove redundant NULL checks before kfree()
    PM / Documentation: Update docs about suspend and CPU hotplug
    ACPI / PM: Add Sony VGN-FW21E to nonvs blacklist.
    ARM: mach-shmobile: sh7372 A4R support (v4)
    ARM: mach-shmobile: sh7372 A3SP support (v4)
    PM / Sleep: Mark devices involved in wakeup signaling during suspend
    PM / Hibernate: Improve performance of LZO/plain hibernation, checksum image
    PM / Hibernate: Do not initialize static and extern variables to 0
    PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too
    PM / Hibernate: Add resumedelay kernel param in addition to resumewait
    MAINTAINERS: Update linux-pm list address
    PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvs
    PM / ACPI: Blacklist Sony Vaio known to require acpi_sleep=nonvs
    PM / Hibernate: Add resumewait param to support MMC-like devices as resume file
    PM / Hibernate: Fix typo in a kerneldoc comment
    PM / Hibernate: Freeze kernel threads after preallocating memory
    PM: Update the policy on default wakeup settings
    PM / VT: Cleanup #if defined uglyness and fix compile error
    PM / Suspend: Off by one in pm_suspend()
    PM / Hibernate: Include storage keys in hibernation image on s390
    ...

    Linus Torvalds
     
  • * 'for-next' of git://git.linaro.org/people/triad/linux-pinctrl:
    pinctrl/sirf: fix sirfsoc_get_group_pins prototype
    pinctrl: Don't copy function name when requesting a pin
    pinctrl: Don't copy pin names when registering them
    pinctrl: Remove unsafe __refdata
    pinctrl: get_group_pins() const fixes
    pinctrl: add a driver for the CSR SiRFprimaII pinmux
    pinctrl: add a driver for the U300 pinmux
    drivers: create a pin control subsystem

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
    dp83640: free packet queues on remove
    dp83640: use proper function to free transmit time stamping packets
    ipv6: Do not use routes from locally generated RAs
    |PATCH net-next] tg3: add tx_dropped counter
    be2net: don't create multiple RX/TX rings in multi channel mode
    be2net: don't create multiple TXQs in BE2
    be2net: refactor VF setup/teardown code into be_vf_setup/clear()
    be2net: add vlan/rx-mode/flow-control config to be_setup()
    net_sched: cls_flow: use skb_header_pointer()
    ipv4: avoid useless call of the function check_peer_pmtu
    TCP: remove TCP_DEBUG
    net: Fix driver name for mdio-gpio.c
    ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
    rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
    ipv4: fix ipsec forward performance regression
    jme: fix irq storm after suspend/resume
    route: fix ICMP redirect validation
    net: hold sock reference while processing tx timestamps
    tcp: md5: add more const attributes
    Add ethtool -g support to virtio_net
    ...

    Fix up conflicts in:
    - drivers/net/Kconfig:
    The split-up generated a trivial conflict with removal of a
    stale reference to Documentation/networking/net-modules.txt.
    Remove it from the new location instead.
    - fs/sysfs/dir.c:
    Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
    with Eric Biederman's changes for tagged directories.

    Linus Torvalds
     
  • * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (260 commits)
    usb: renesas_usbhs: fixup inconsistent return from usbhs_pkt_push()
    usb/isp1760: Allow to optionally trigger low-level chip reset via GPIOLIB.
    USB: gadget: midi: memory leak in f_midi_bind_config()
    USB: gadget: midi: fix range check in f_midi_out_open()
    QE/FHCI: fixed the CONTROL bug
    usb: renesas_usbhs: tidyup for smatch warnings
    USB: Fix USB Kconfig dependency problem on 85xx/QoirQ platforms
    EHCI: workaround for MosChip controller bug
    usb: gadget: file_storage: fix race on unloading
    USB: ftdi_sio.c: Use ftdi async_icount structure for TIOCMIWAIT, as in other drivers
    USB: ftdi_sio.c:Fill MSR fields of the ftdi async_icount structure
    USB: ftdi_sio.c: Fill LSR fields of the ftdi async_icount structure
    USB: ftdi_sio.c:Fill TX field of the ftdi async_icount structure
    USB: ftdi_sio.c: Fill the RX field of the ftdi async_icount structure
    USB: ftdi_sio.c: Basic icount infrastructure for ftdi_sio
    usb/isp1760: Let OF bindings depend on general CONFIG_OF instead of PPC_OF .
    USB: ftdi_sio: Support TI/Luminary Micro Stellaris BD-ICDI Board
    USB: Fix runtime wakeup on OHCI
    xHCI/USB: Make xHCI driver have a BOS descriptor.
    usb: gadget: add new usb gadget for ACM and mass storage
    ...

    Linus Torvalds
     
  • * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (38 commits)
    mm: memory hotplug: Check if pages are correctly reserved on a per-section basis
    Revert "memory hotplug: Correct page reservation checking"
    Update email address for stable patch submission
    dynamic_debug: fix undefined reference to `__netdev_printk'
    dynamic_debug: use a single printk() to emit messages
    dynamic_debug: remove num_enabled accounting
    dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
    uio: Support physical addresses >32 bits on 32-bit systems
    sysfs: add unsigned long cast to prevent compile warning
    drivers: base: print rejected matches with DEBUG_DRIVER
    memory hotplug: Correct page reservation checking
    memory hotplug: Refuse to add unaligned memory regions
    remove the messy code file Documentation/zh_CN/SubmitChecklist
    ARM: mxc: convert device creation to use platform_device_register_full
    new helper to create platform devices with dma mask
    docs/driver-model: Update device class docs
    docs/driver-model: Document device.groups
    kobj_uevent: Ignore if some listeners cannot handle message
    dynamic_debug: make netif_dbg() call __netdev_printk()
    dynamic_debug: make netdev_dbg() call __netdev_printk()
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
    MAINTAINERS: linux-m32r is moderated for non-subscribers
    linux@lists.openrisc.net is moderated for non-subscribers
    Drop default from "DM365 codec select" choice
    parisc: Kconfig: cleanup Kernel page size default
    Kconfig: remove redundant CONFIG_ prefix on two symbols
    cris: remove arch/cris/arch-v32/lib/nand_init.S
    microblaze: add missing CONFIG_ prefixes
    h8300: drop puzzling Kconfig dependencies
    MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
    tty: drop superfluous dependency in Kconfig
    ARM: mxc: fix Kconfig typo 'i.MX51'
    Fix file references in Kconfig files
    aic7xxx: fix Kconfig references to READMEs
    Fix file references in drivers/ide/
    thinkpad_acpi: Fix printk typo 'bluestooth'
    bcmring: drop commented out line in Kconfig
    btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
    doc: raw1394: Trivial typo fix
    CIFS: Don't free volume_info->UNC until we are entirely done with it.
    treewide: Correct spelling of successfully in comments
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (61 commits)
    HID: hid-magicmouse: Magic Trackpad has 1 button, not 2
    HID: Add device IDs for more SJOY adapters
    HID: primax: remove spurious dependency
    HID: support primax keyboards violating USB HID spec
    HID: usbhid: cancel timer for retry synchronously
    HID: wacom: Set input bits before registration
    HID: consolidate MacbookAir 4,1 mappings
    HID: MacbookAir4,1 and MacbookAir4,2 need entry in hid_mouse_ignore_list[]
    HID: Add support MacbookAir 4,1 keyboard
    HID: hidraw: open count should not increase if error
    HID: hiddev: potential info leak in hiddev_ioctl()
    HID: multitouch: decide if hid-multitouch needs to handle mt devices
    HID: add autodetection of multitouch devices
    HID: "hid-logitech" driver with Logitech Driving Force GT
    HID: hid-logitech-dj: fix off by one
    HID: hidraw: protect hidraw_disconnect() better
    HID: hid-multitouch: add support for the IDEACOM 6650 chip
    HID: Add full support for Logitech Unifying receivers
    HID: hidraw: free list for all error in hidraw_open
    HID: roccat: Kone now reports external profile changes via roccat device
    ...

    Linus Torvalds
     
  • * 'for-linus' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (81 commits)
    ARM: 7133/1: SMP: fix per cpu timer setup before the cpu is marked online
    ARM: 7129/1: Add __arm_ioremap_exec for mapping external memory as MT_MEMORY
    ARM: 7136/1: pl330: Fix a race condition
    ARM: smp: fix clipping of number of CPUs
    ARM: 7137/1: Fix error upon adding LL debug
    ARM: Add a few machine types to mach-types
    ARM: 7130/1: dev_archdata: add private iommu extension
    ARM: 7125/1: Add unwinding annotations for 64bit division functions
    ARM: 7120/1: remove bashism in check for multiple zreladdrs
    ARM: 7118/1: rename temp variable in read*_relaxed()
    ARM: 6217/4: mach-realview: expose PB1176 ROM using physmap and map_rom
    ARM: 7098/1: kdump: copy kernel relocation code at the kexec prepare stage
    ARM: 7062/1: cache: detect PIPT I-cache using CTR
    ARM: platform fixups: remove mdesc argument to fixup function
    ARM: 7017/1: Use generic BUG() handler
    ARM: 7102/1: mach-integrator: update defconfig
    ARM: 7087/2: mach-integrator: get timer frequency from clock
    ARM: 7086/2: mach-integrator: modernize clock event registration
    ARM: 7085/2: mach-integrator: clockevent supports oneshot mode
    ARM: 7084/1: mach-integrator: retire some timer macros
    ...

    Linus Torvalds
     
  • Jiri Kosina
     
  • * 'next' of git://selinuxproject.org/~jmorris/linux-security: (95 commits)
    TOMOYO: Fix incomplete read after seek.
    Smack: allow to access /smack/access as normal user
    TOMOYO: Fix unused kernel config option.
    Smack: fix: invalid length set for the result of /smack/access
    Smack: compilation fix
    Smack: fix for /smack/access output, use string instead of byte
    Smack: domain transition protections (v3)
    Smack: Provide information for UDS getsockopt(SO_PEERCRED)
    Smack: Clean up comments
    Smack: Repair processing of fcntl
    Smack: Rule list lookup performance
    Smack: check permissions from user space (v2)
    TOMOYO: Fix quota and garbage collector.
    TOMOYO: Remove redundant tasklist_lock.
    TOMOYO: Fix domain transition failure warning.
    TOMOYO: Remove tomoyo_policy_memory_lock spinlock.
    TOMOYO: Simplify garbage collector.
    TOMOYO: Fix make namespacecheck warnings.
    target: check hex2bin result
    encrypted-keys: check hex2bin result
    ...

    Linus Torvalds
     
  • …'pgt' (early part) and 'smp' into for-linus

    Russell King
     
  • David S. Miller
     
  • Signed-off-by: Grant Likely

    Grant Likely