19 Sep, 2011

1 commit

  • * git://github.com/davem330/net: (62 commits)
    ipv6: don't use inetpeer to store metrics for routes.
    can: ti_hecc: include linux/io.h
    IRDA: Fix global type conflicts in net/irda/irsysctl.c v2
    net: Handle different key sizes between address families in flow cache
    net: Align AF-specific flowi structs to long
    ipv4: Fix fib_info->fib_metrics leak
    caif: fix a potential NULL dereference
    sctp: deal with multiple COOKIE_ECHO chunks
    ibmveth: Fix checksum offload failure handling
    ibmveth: Checksum offload is always disabled
    ibmveth: Fix issue with DMA mapping failure
    ibmveth: Fix DMA unmap error
    pch_gbe: support ML7831 IOH
    pch_gbe: added the process of FIFO over run error
    pch_gbe: fixed the issue which receives an unnecessary packet.
    sfc: Use 64-bit writes for TX push where possible
    Revert "sfc: Use write-combining to reduce TX latency" and follow-ups
    bnx2x: Fix ethtool advertisement
    bnx2x: Fix 578xx link LED
    bnx2x: Fix XMAC loopback test
    ...

    Linus Torvalds
     

16 Sep, 2011

2 commits


15 Sep, 2011

2 commits

  • Revert the post-3.0 commit 82f9d486e59f5 ("memcg: add
    memory.vmscan_stat").

    The implementation of per-memcg reclaim statistics violates how memcg
    hierarchies usually behave: hierarchically.

    The reclaim statistics are accounted to child memcgs and the parent
    hitting the limit, but not to hierarchy levels in between. Usually,
    hierarchical statistics are perfectly recursive, with each level
    representing the sum of itself and all its children.

    Since this exports statistics to userspace, this may lead to confusion
    and problems with changing things after the release, so revert it now,
    we can try again later.

    Signed-off-by: Johannes Weiner
    Acked-by: KAMEZAWA Hiroyuki
    Cc: Daisuke Nishimura
    Cc: Michal Hocko
    Cc: Ying Han
    Cc: Balbir Singh
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Johannes Weiner
     
  • * git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6: (25 commits)
    [SCSI] bnx2i: Fixed the endian on TTT for NOP out transmission
    [SCSI] libfc: fix referencing to fc_fcp_pkt from the frame pointer via fr_fsp()
    [SCSI] libfc: block SCSI eh thread for blocked rports
    [SCSI] libfc: fix fc_eh_host_reset
    [SCSI] fcoe: Fix deadlock between fip's recv_work and rtnl
    [SCSI] qla2xxx: Update version number to 8.03.07.07-k.
    [SCSI] qla2xxx: Set the task attributes after memsetting fcp cmnd.
    [SCSI] qla2xxx: Correct inadvertent loop state transitions during port-update handling.
    [SCSI] qla2xxx: Save and restore irq in the response queue interrupt handler.
    [SCSI] qla2xxx: Double check for command completion if abort mailbox command fails.
    [SCSI] qla2xxx: Acquire hardware lock while manipulating dsd list.
    [SCSI] qla2xxx: Fix qla24xx revision check while enabling interrupts.
    [SCSI] qla2xxx: T10 DIF - Fix incorrect error reporting.
    [SCSI] qla2xxx: T10 DIF - Handle uninitalized sectors.
    [SCSI] hpsa: fix physical device lun and target numbering problem
    [SCSI] hpsa: fix problem that OBDR devices are not detected
    [SCSI] isci: add version number
    [SCSI] isci: fix event-get pointer increment
    [SCSI] isci: dynamic interrupt coalescing
    [SCSI] isci: Leave requests alone if already terminating.
    ...

    Linus Torvalds
     

13 Sep, 2011

2 commits


12 Sep, 2011

1 commit

  • * 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus:
    [media] vp7045: fix buffer setup
    [media] nuvoton-cir: simplify raw IR sample handling
    [media] [Resend] viacam: Don't explode if pci_find_bus() returns NULL
    [media] v4l2: Fix documentation of the codec device controls
    [media] gspca - sonixj: Fix the darkness of sensor om6802 in 320x240
    [media] gspca - sonixj: Fix wrong register mask for sensor om6802
    [media] gspca - ov519: Fix LED inversion of some ov519 webcams
    [media] pwc: precedence bug in pwc_init_controls()

    Linus Torvalds
     

11 Sep, 2011

1 commit


06 Sep, 2011

1 commit


02 Sep, 2011

1 commit


25 Aug, 2011

3 commits

  • Signed-off-by: Christoph Hellwig
    Reviewed-by: Dave Chinner
    Signed-off-by: Alex Elder

    Christoph Hellwig
     
  • The description of pm_runtime_irq_safe() has to be updated to follow
    the code after commit 02b2677 (PM / Runtime: Allow _put_sync() from
    interrupts-disabled context).

    Signed-off-by: Rafael J. Wysocki
    Acked-by: Kevin Hilman

    Rafael J. Wysocki
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits)
    bridge: fix a possible net_device leak
    net: Documentation: RFC 2553bis is now RFC 3493
    atm: br2684: Fix oops due to skb->dev being NULL
    ipv6: Fix ipv6_getsockopt for IPV6_2292PKTOPTIONS
    net: netdev-features.txt update to Documentation/networking/00-INDEX
    vlan: reset headers on accel emulation path
    forcedeth: call vlan_mode only if hw supports vlans
    via-velocity: remove non-tagged packet filtering
    bonding:reset backup and inactive flag of slave
    net_sched: fix port mirror/redirect stats reporting
    sit tunnels: propagate IPv6 transport class to IPv4 Type of Service
    gianfar: reduce stack usage in gianfar_ethtool.c
    net: minor update to Documentation/networking/scaling.txt
    net: add missing entries to Documentation/networking/00-INDEX
    gianfar: prevent buggy hw rx vlan tagging
    net: sh_eth: Fix build by forgot including linux/interrupt.h
    drivers/net/can/sja1000/plx_pci.c: eliminate double free
    usbnet/cdc_ncm: Don't use stack variables for DMA
    vmxnet3: Don't enable vlan filters in promiscuous mode.
    iwlagn: sysfs couldn't find the priv pointer
    ...

    Linus Torvalds
     

24 Aug, 2011

1 commit


23 Aug, 2011

1 commit


20 Aug, 2011

1 commit

  • * 'for-linus' of git://git.kernel.dk/linux-block: (23 commits)
    Revert "cfq: Remove special treatment for metadata rqs."
    block: fix flush machinery for stacking drivers with differring flush flags
    block: improve rq_affinity placement
    blktrace: add FLUSH/FUA support
    Move some REQ flags to the common bio/request area
    allow blk_flush_policy to return REQ_FSEQ_DATA independent of *FLUSH
    xen/blkback: Make description more obvious.
    cfq-iosched: Add documentation about idling
    block: Make rq_affinity = 1 work as expected
    block: swim3: fix unterminated of_device_id table
    block/genhd.c: remove useless cast in diskstats_show()
    drivers/cdrom/cdrom.c: relax check on dvd manufacturer value
    drivers/block/drbd/drbd_nl.c: use bitmap_parse instead of __bitmap_parse
    bsg-lib: add module.h include
    cfq-iosched: Reduce linked group count upon group destruction
    blk-throttle: correctly determine sync bio
    loop: fix deadlock when sysfs and LOOP_CLR_FD race against each other
    loop: add BLK_DEV_LOOP_MIN_COUNT=%i to allow distros 0 pre-allocated loop devices
    loop: add management interface for on-demand device allocation
    loop: replace linked list of allocated devices with an idr index
    ...

    Linus Torvalds
     

19 Aug, 2011

1 commit


16 Aug, 2011

1 commit

  • * 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs:
    Docs: MSI-HOWTO: MSI -> MSIs
    Docs: MSI-HOWTO: Insert a comma
    Docs: MSI-HOWTO: can -> could
    Docs: MSI-HOWTO: Use `unknown ...' rather than `... know about.'
    Docs: MSI-HOWTO: may -> might
    Docs: MSI-HOWTO: Insert a comma
    Docs: MSI-HOWTO: API -> function
    Docs: MSI-HOWTO: , -> ;
    Docs: MSI-HOWTO: Move a sentence to another paragraph
    Docs: MSI-HOWTO: Insert `that'
    Docs: MSI-HOWTO: Offset modifier with a comma, and insert `yet' for emphasis
    Docs: MSI-HOWTO: Put the `because' subordinate clause first
    Docs: MSI-HOWTO: Streamline some wording
    Docs: MSI-HOWTO: `asked for' -> `requested'
    Docs: MSI-HOWTO: Use present tense and streamline some wording
    Docs: MSI-HOWTO: Use the subjunctive, and change `can' to `may'

    Linus Torvalds
     

15 Aug, 2011

2 commits


14 Aug, 2011

10 commits


13 Aug, 2011

1 commit

  • * 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-tip:
    x86-64: Rework vsyscall emulation and add vsyscall= parameter
    x86-64: Wire up getcpu syscall
    x86: Remove unnecessary compile flag tweaks for vsyscall code
    x86-64: Add vsyscall:emulate_vsyscall trace event
    x86-64: Add user_64bit_mode paravirt op
    x86-64, xen: Enable the vvar mapping
    x86-64: Work around gold bug 13023
    x86-64: Move the "user" vsyscall segment out of the data segment.
    x86-64: Pad vDSO to a page boundary

    Linus Torvalds
     

12 Aug, 2011

1 commit


11 Aug, 2011

1 commit

  • There are three choices:

    vsyscall=native: Vsyscalls are native code that issues the
    corresponding syscalls.

    vsyscall=emulate (default): Vsyscalls are emulated by instruction
    fault traps, tested in the bad_area path. The actual contents of
    the vsyscall page is the same as the vsyscall=native case except
    that it's marked NX. This way programs that make assumptions about
    what the code in the page does will not be confused when they read
    that code.

    vsyscall=none: Trying to execute a vsyscall will segfault.

    Signed-off-by: Andy Lutomirski
    Link: http://lkml.kernel.org/r/8449fb3abf89851fd6b2260972666a6f82542284.1312988155.git.luto@mit.edu
    Signed-off-by: H. Peter Anvin

    Andy Lutomirski
     

10 Aug, 2011

1 commit

  • Describes RSS, RPS, RFS, accelerated RFS, and XPS.

    This version incorporates comments by Randy Dunlap and Rick Jones.
    Besides text cleanup, it adds an explicit "Suggested Configuration"
    heading to each section.

    Signed-off-by: Willem de Bruijn
    Acked-By: Rick Jones
    Signed-off-by: David S. Miller

    Willem de Bruijn
     

08 Aug, 2011

1 commit

  • Commit 655f8919d549ad1872e24d826b6ce42530516d2e
    bonding: add min links parameter to 802.3ad

    and commit ebd8e4977a87cb81d93c62a9bff0102a9713722f
    bonding: add all_slaves_active parameter

    introduced new options to bonding, but didn't provide the documentation
    for those options.

    V2: add the default value for both options.
    V3: document the exact behavior of min_links default value.

    Signed-off-by: Nicolas de Pesloüan
    Signed-off-by: David S. Miller

    Nicolas de Pesloüan
     

07 Aug, 2011

3 commits

  • * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
    PM / Runtime: Allow _put_sync() from interrupts-disabled context
    PM / Domains: Fix pm_genpd_poweron()

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (38 commits)
    acer-wmi: support Lenovo ideapad S205 wifi switch
    acerhdf.c: spaces in aliased changed to *
    platform-drivers-x86: ideapad-laptop: add missing ideapad_input_exit in ideapad_acpi_add error path
    x86 driver: fix typo in TDP override enabling
    Platform: fix samsung-laptop DMI identification for N150/N210/220/N230
    dell-wmi: Add keys for Dell XPS L502X
    platform-drivers-x86: samsung-q10: make dmi_check_callback return 1
    Platform: Samsung Q10 backlight driver
    platform-drivers-x86: intel_scu_ipc: convert to DEFINE_PCI_DEVICE_TABLE
    platform-drivers-x86: intel_rar_register: convert to DEFINE_PCI_DEVICE_TABLE
    platform-drivers-x86: intel_menlow: add missing return AE_OK for intel_menlow_register_sensor()
    platform-drivers-x86: intel_mid_thermal: fix memory leak
    platform-drivers-x86: msi-wmi: add missing sparse_keymap_free in msi_wmi_init error path
    Samsung Laptop platform driver: support N510
    asus-wmi: add uwb rfkill support
    asus-wmi: add gps rfkill support
    asus-wmi: add CWAP support and clarify the meaning of WAPF bits
    asus-wmi: return proper value in store_cpufv()
    asus-wmi: check for temp1 presence
    asus-wmi: add thermal sensor
    ...

    Linus Torvalds
     
  • Patch reviewers now recommend not splitting long user-visible strings,
    such as printk messages, even if they exceed 80 columns. This avoids
    breaking grep. However, that recommendation did not actually appear
    anywhere in Documentation/CodingStyle.

    See, for example, the thread at
    http://news.gmane.org/find-root.php?message_id=%3c1312215262.11635.15.camel%40Joe%2dLaptop%3e

    Signed-off-by: Josh Triplett
    Signed-off-by: Linus Torvalds

    Josh Triplett
     

06 Aug, 2011

1 commit

  • Currently the use of pm_runtime_put_sync() is not safe from
    interrupts-disabled context because rpm_idle() will release the
    spinlock and enable interrupts for the idle callbacks. This enables
    interrupts during a time where interrupts were expected to be
    disabled, and can have strange side effects on drivers that expected
    interrupts to be disabled.

    This is not a bug since the documentation clearly states that only
    _put_sync_suspend() is safe in IRQ-safe mode.

    However, pm_runtime_put_sync() could be made safe when in IRQ-safe
    mode by releasing the spinlock but not re-enabling interrupts, which
    is what this patch aims to do.

    Problem was found when using some buggy drivers that set
    pm_runtime_irq_safe() and used _put_sync() in interrupts-disabled
    context.

    Reported-by: Colin Cross
    Tested-by: Nishanth Menon
    Signed-off-by: Kevin Hilman
    Signed-off-by: Rafael J. Wysocki

    Kevin Hilman