25 Aug, 2011

1 commit

  • * 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
     

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
     

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

4 commits

  • 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
     
  • Create /sys/devices/platform/ideapad/cfg for showing cfg value.

    Signed-off-by: Ike Panhc
    Signed-off-by: Matthew Garrett

    Ike Panhc
     
  • we can now autodetect internal 3G device and already have the threeg
    rfkill device. So, we plan to remove threeg sysfs support for it's no
    longer necessary.

    We also plan to remove interface sysfs file that exposed which ACPI-WMI
    interface that was used by acer-wmi driver. It will replaced by information
    log when acer-wmi initial.

    We keep it around for userspace compatibility reasons, schedule removal
    in 2012.

    Cc: Carlos Corbacho
    Cc: Matthew Garrett
    Cc: Dmitry Torokhov
    Cc: Corentin Chary
    Acked-by: Thomas Renninger
    Signed-off-by: Lee, Chun-Yi
    Signed-off-by: Matthew Garrett

    Lee, Chun-Yi
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (54 commits)
    ipv6: check for IPv4 mapped addresses when connecting IPv6 sockets
    mlx4: decreasing ref count when removing mac
    net: Fix security_socket_sendmsg() bypass problem.
    net: Cap number of elements for sendmmsg
    net: sendmmsg should only return an error if no messages were sent
    ixgbe: fix PHY link setup for 82599
    ixgbe: fix __ixgbe_notify_dca() bail out code
    igb: fix WOL on second port of i350 device
    e1000e: minor re-order of #include files
    e1000e: remove unnecessary check for NULL pointer
    intel drivers: repair missing flush operations
    macb: restore wrap bit when performing underrun cleanup
    cdc_ncm: fix endianness problem.
    irda: use PCI_VENDOR_ID_*
    mlx4: Fixing Ethernet unicast packet steering
    net: fix NULL dereferences in check_peer_redir()
    bnx2x: Clear MDIO access warning during first driver load
    bnx2x: Fix BCM578xx MAC test
    bnx2x: Fix BCM54618se invalid link indication
    bnx2x: Fix BCM84833 link
    ...

    Linus Torvalds
     

05 Aug, 2011

2 commits

  • There are always questions about why CFQ is idling on various conditions.
    Recent ones is Christoph asking again why to idle on REQ_NOIDLE. His
    assertion is that XFS is relying more and more on workqueues and is
    concerned that CFQ idling on IO from every workqueue will impact
    XFS badly.

    So he suggested that I add some more documentation about CFQ idling
    and that can provide more clarity on the topic and also gives an
    opprotunity to poke a hole in theory and lead to improvements.

    So here is my attempt at that. Any comments are welcome.

    Signed-off-by: Vivek Goyal
    Signed-off-by: Jens Axboe

    Vivek Goyal
     
  • H. Peter Anvin
     

04 Aug, 2011

7 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: ad7879 - fix deficient device disable
    Input: gpio_keys - fix two typos in devicetree documentation
    Input: mma8450 - add device tree probe support
    Input: gpio_keys - return proper error code if memory allocation fails
    Input: lm8323 - add missing device_remove_file for dev_attr_time
    Input: tegra-kbc - fix computation of polling time
    Input: kxtj9 - explicitly include module.h
    Input: psmouse - hgpk.c needs module.h

    Linus Torvalds
     
  • * 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
    cpuidle: stop depending on pm_idle
    x86 idle: move mwait_idle_with_hints() to where it is used
    cpuidle: replace xen access to x86 pm_idle and default_idle
    cpuidle: create bootparam "cpuidle.off=1"
    mrst_pmu: driver for Intel Moorestown Power Management Unit

    Linus Torvalds
     
  • * 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
    ACPI, APEI, EINJ Param support is disabled by default
    APEI GHES: 32-bit buildfix
    ACPI: APEI build fix
    ACPI, APEI, GHES: Add hardware memory error recovery support
    HWPoison: add memory_failure_queue()
    ACPI, APEI, GHES, Error records content based throttle
    ACPI, APEI, GHES, printk support for recoverable error via NMI
    lib, Make gen_pool memory allocator lockless
    lib, Add lock-less NULL terminated single list
    Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG
    ACPI, APEI, Add WHEA _OSC support
    ACPI, APEI, Add APEI bit support in generic _OSC call
    ACPI, APEI, GHES, Support disable GHES at boot time
    ACPI, APEI, GHES, Prevent GHES to be built as module
    ACPI, APEI, Use apei_exec_run_optional in APEI EINJ and ERST
    ACPI, APEI, Add apei_exec_run_optional
    ACPI, APEI, GHES, Do not ratelimit fatal error printk before panic
    ACPI, APEI, ERST, Fix erst-dbg long record reading issue
    ACPI, APEI, ERST, Prevent erst_dbg from loading if ERST is disabled

    Linus Torvalds
     
  • Update kernel-parameters.txt to point users to the authoritative comment
    for name_to_dev_t. In addition, updates other places where some
    name_to_dev_t behavior was discussed. All other references to root=
    appear to be for explicit sample usage or just side comments when
    discussing other kernel parameters.

    Signed-off-by: Will Drewry
    Cc: Kay Sievers
    Cc: Randy Dunlap
    Cc: Namhyung Kim
    Cc: Trond Myklebust
    Cc: Jens Axboe
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Will Drewry
     
  • init_fault_attr_dentries() is used to export fault_attr via debugfs.
    But it can only export it in debugfs root directory.

    Per Forlin is working on mmc_fail_request which adds support to inject
    data errors after a completed host transfer in MMC subsystem.

    The fault_attr for mmc_fail_request should be defined per mmc host and
    export it in debugfs directory per mmc host like
    /sys/kernel/debug/mmc0/mmc_fail_request.

    init_fault_attr_dentries() doesn't help for mmc_fail_request. So this
    introduces fault_create_debugfs_attr() which is able to create a
    directory in the arbitrary directory and replace
    init_fault_attr_dentries().

    [akpm@linux-foundation.org: extraneous semicolon, per Randy]
    Signed-off-by: Akinobu Mita
    Tested-by: Per Forlin
    Cc: Jens Axboe
    Cc: Christoph Lameter
    Cc: Pekka Enberg
    Cc: Matt Mackall
    Cc: Randy Dunlap
    Cc: Stephen Rothwell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Akinobu Mita
     
  • useful for disabling cpuidle to fall back
    to architecture-default idle loop

    cpuidle drivers and governors will fail to register.
    on x86 they'll say so:

    intel_idle: intel_idle yielding to (null)
    ACPI: acpi_idle yielding to (null)

    Signed-off-by: Len Brown

    Len Brown
     
  • Randy Dunlap
     

03 Aug, 2011

3 commits

  • Some trivial conflicts due to other various merges
    adding to the end of common lists sooner than this one.

    arch/ia64/Kconfig
    arch/powerpc/Kconfig
    arch/x86/Kconfig
    lib/Kconfig
    lib/Makefile

    Signed-off-by: Len Brown

    Len Brown
     
  • EINJ parameter support is only usable for some specific BIOS.
    Originally, it is expected to have no harm for BIOS does not support
    it. But now, we found it will cause issue (memory overwriting) for
    some BIOS. So param support is disabled by default and only enabled
    when newly added module parameter named "param_extension" is
    explicitly specified.

    Signed-off-by: Huang Ying
    Cc: Matthew Garrett
    Acked-by: Don Zickus
    Acked-by: Tony Luck
    Signed-off-by: Len Brown

    Huang Ying
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (28 commits)
    ACPI: delete stale reference in kernel-parameters.txt
    ACPI: add missing _OSI strings
    ACPI: remove NID_INVAL
    thermal: make THERMAL_HWMON implementation fully internal
    thermal: split hwmon lookup to a separate function
    thermal: hide CONFIG_THERMAL_HWMON
    ACPI print OSI(Linux) warning only once
    ACPI: DMI workaround for Asus A8N-SLI Premium and Asus A8N-SLI DELUX
    ACPI / Battery: propagate sysfs error in acpi_battery_add()
    ACPI / Battery: avoid acpi_battery_add() use-after-free
    ACPI: introduce "acpi_rsdp=" parameter for kdump
    ACPI: constify ops structs
    ACPI: fix CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
    ACPI: fix 80 char overflow
    ACPI / Battery: Resolve the race condition in the sysfs_remove_battery()
    ACPI / Battery: Add the check before refresh sysfs in the battery_notify()
    ACPI / Battery: Add the hibernation process in the battery_notify()
    ACPI / Battery: Rename acpi_battery_quirks2 with acpi_battery_quirks
    ACPI / Battery: Change 16-bit signed negative battery current into correct value
    ACPI / Battery: Add the power unit macro
    ...

    Linus Torvalds