27 Jan, 2012

1 commit


26 Jan, 2012

1 commit

  • * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
    drm/ttm: fix two regressions since move_notify changes
    drm/radeon: avoid deadlock if GPU lockup is detected in ib_pool_get
    drm/radeon: silence out possible lock dependency warning
    drm: Fix authentication kernel crash
    gma500: Fix shmem mapping
    drm/radeon/kms: refine TMDS dual link checks
    drm/radeon/kms: use drm_detect_hdmi_monitor for picking encoder mode
    drm/radeon/kms: rework modeset sequence for DCE41 and DCE5
    drm/radeon/kms: move panel mode setup into encoder mode set
    drm/radeon/kms: move disp eng pll setup to init path
    drm/radeon: finish getting bios earlier
    drm/radeon: fix invalid memory access in radeon_atrm_get_bios()
    drm/radeon/kms: add some missing semaphore init
    drm/radeon/kms: Add an MSI quirk for Dell RS690
    gpu, drm, sis: Don't return uninitialized variable from sis_driver_load()

    Linus Torvalds
     

25 Jan, 2012

6 commits

  • If the master tries to authenticate a client using drm_authmagic and
    that client has already closed its drm file descriptor,
    either wilfully or because it was terminated, the
    call to drm_authmagic will dereference a stale pointer into kmalloc'ed memory
    and corrupt it.

    Typically this results in a hard system hang.

    This patch fixes that problem by removing any authentication tokens
    (struct drm_magic_entry) open for a file descriptor when that file
    descriptor is closed.

    Signed-off-by: Thomas Hellstrom
    Reviewed-by: Daniel Vetter
    Cc: stable@vger.kernel.org
    Signed-off-by: Dave Airlie

    Thomas Hellstrom
     
  • Quoth Len:
    "This fixes a merge-window regression due to a conflict
    between error injection and preparation to remove atomicio.c
    Here we fix that regression and complete the removal
    of atomicio.c.

    This also re-orders some idle initialization code to
    complete the merge window series that allows cpuidle
    to cope with bringing processors on-line after boot."

    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
    Use acpi_os_map_memory() instead of ioremap() in einj driver
    ACPI, APEI, EINJ, cleanup 0 vs NULL confusion
    ACPI, APEI, EINJ Allow empty Trigger Error Action Table
    thermal: Rename generate_netlink_event
    ACPI / PM: Add Sony Vaio VPCCW29FX to nonvs blacklist.
    ACPI: Remove ./drivers/acpi/atomicio.[ch]
    ACPI, APEI: Add RAM mapping support to ACPI
    ACPI, APEI: Add 64-bit read/write support for APEI on i386
    ACPI processor hotplug: Delay acpi_processor_start() call for hotplugged cores
    ACPI processor hotplug: Split up acpi_processor_add

    Linus Torvalds
     
  • Davem says:

    1) Fix JIT code generation on x86-64 for divide by zero, from Eric Dumazet.

    2) tg3 header length computation correction from Eric Dumazet.

    3) More build and reference counting fixes for socket memory cgroup
    code from Glauber Costa.

    4) module.h snuck back into a core header after all the hard work we
    did to remove that, from Paul Gortmaker and Jesper Dangaard Brouer.

    5) Fix PHY naming regression and add some new PCI IDs in stmmac, from
    Alessandro Rubini.

    6) Netlink message generation fix in new team driver, should only advertise
    the entries that changed during events, from Jiri Pirko.

    7) SRIOV VF registration and unregistration fixes, and also add a
    missing PCI ID, from Roopa Prabhu.

    8) Fix infinite loop in tx queue flush code of brcmsmac, from Stanislaw Gruszka.

    9) ftgmac100/ftmac100 build fix, missing interrupt.h include.

    10) Memory leak fix in net/hyperv do_set_mutlicast() handling, from Wei Yongjun.

    11) Off by one fix in netem packet scheduler, from Vijay Subramanian.

    12) TCP loss detection fix from Yuchung Cheng.

    13) TCP reset packet MD5 calculation uses wrong address, fix from Shawn Lu.

    14) skge carrier assertion and DMA mapping fixes from Stephen Hemminger.

    15) Congestion recovery undo performed at the wrong spot in BIC and CUBIC
    congestion control modules, fix from Neal Cardwell.

    16) Ethtool ETHTOOL_GSSET_INFO is unnecessarily restrictive, from Michał Mirosław.

    17) Fix triggerable race in ipv6 sysctl handling, from Francesco Ruggeri.

    18) Statistics bug fixes in mlx4 from Eugenia Emantayev.

    19) rds locking bug fix during info dumps, from your's truly.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (67 commits)
    rds: Make rds_sock_lock BH rather than IRQ safe.
    netprio_cgroup.h: dont include module.h from other includes
    net: flow_dissector.c missing include linux/export.h
    team: send only changed options/ports via netlink
    net/hyperv: fix possible memory leak in do_set_multicast()
    drivers/net: dsa/mv88e6xxx.c files need linux/module.h
    stmmac: added PCI identifiers
    llc: Fix race condition in llc_ui_recvmsg
    stmmac: fix phy naming inconsistency
    dsa: Add reporting of silicon revision for Marvell 88E6123/88E6161/88E6165 switches.
    tg3: fix ipv6 header length computation
    skge: add byte queue limit support
    mv643xx_eth: Add Rx Discard and Rx Overrun statistics
    bnx2x: fix compilation error with SOE in fw_dump
    bnx2x: handle CHIP_REVISION during init_one
    bnx2x: allow user to change ring size in ISCSI SD mode
    bnx2x: fix Big-Endianess in ethtool -t
    bnx2x: fixed ethtool statistics for MF modes
    bnx2x: credit-leakage fixup on vlan_mac_del_all
    macvlan: fix a possible use after free
    ...

    Linus Torvalds
     
  • A considerable effort was invested in wiping out module.h
    from being present in all the other standard includes. This
    one leaked back in, but once again isn't strictly necessary,
    so remove it.

    Signed-off-by: Paul Gortmaker
    Signed-off-by: David S. Miller

    Paul Gortmaker
     
  • This patch changes event message behaviour to send only updated records
    instead of whole list. This fixes bug on which userspace receives non-actual
    data in case multiple events occur in row.

    Signed-off-by: Jiri Pirko
    Signed-off-by: David S. Miller

    Jiri Pirko
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
    quota: Pass information that quota is stored in system file to userspace
    ext2: protect inode changes in the SETVERSION and SETFLAGS ioctls
    jbd: Issue cache flush after checkpointing

    Linus Torvalds
     

24 Jan, 2012

13 commits

  • so move its include into fs.h inside the __KERNEL__ protection.

    Signed-off-by: Stephen Rothwell
    Signed-off-by: Linus Torvalds

    Stephen Rothwell
     
  • Len Brown
     
  • Power management fixes for 3.3

    Two fixes for regressions introduced during the merge window, one fix for
    a long-standing obscure issue in the computation of hibernate image size
    and two small PM documentation fixes.

    * tag 'pm-fixes-for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
    PM / Sleep: Fix read_unlock_usermodehelper() call.
    PM / Hibernate: Rewrite unlock_system_sleep() to fix s2disk regression
    PM / Hibernate: Correct additional pages number calculation
    PM / Documentation: Fix minor issue in freezing_of_tasks.txt
    PM / Documentation: Fix spelling mistake in basic-pm-debugging.txt

    Linus Torvalds
     
  • The usual kernel-doc fixups from Randy. Some of them David acked as
    merged in his tree, this is the random left-overs.

    * kernel-doc:
    docbook: fix sched source file names in device-drivers book
    docbook: change iomap source filename in deviceiobook
    docbook: don't use serial_core.h in device-drivers book
    kernel-doc: fix kernel-doc warnings in sched
    kernel-doc: fix new warnings in cfg80211.h
    kernel-doc: fix new warning in usb.h
    kernel-doc: fix new warnings in device.h
    kernel-doc: fix new warnings in debugfs
    kernel-doc: fix new warning in regulator core
    kernel-doc: fix new warnings in pci
    kernel-doc: fix new warnings in driver-core
    kernel-doc: fix new warnings in auditsc.c
    scripts/kernel-doc: fix fatal error caused by cfg80211.h

    Linus Torvalds
     
  • Quoth Andrew:
    "Random fixes. And a simple new LED driver which I'm trying to sneak
    in while you're not looking."

    Sneaking successful.

    * akpm:
    score: fix off-by-one index into syscall table
    mm: fix rss count leakage during migration
    SHM_UNLOCK: fix Unevictable pages stranded after swap
    SHM_UNLOCK: fix long unpreemptible section
    kdump: define KEXEC_NOTE_BYTES arch specific for s390x
    mm/hugetlb.c: undo change to page mapcount in fault handler
    mm: memcg: update the correct soft limit tree during migration
    proc: clear_refs: do not clear reserved pages
    drivers/video/backlight/l4f00242t03.c: return proper error in l4f00242t03_probe if regulator_get() fails
    drivers/video/backlight/adp88x0_bl.c: fix bit testing logic
    kprobes: initialize before using a hlist
    ipc/mqueue: simplify reading msgqueue limit
    leds: add led driver for Bachmann's ot200
    mm: __count_immobile_pages(): make sure the node is online
    mm: fix NULL ptr dereference in __count_immobile_pages
    mm: fix warnings regarding enum migrate_mode

    Linus Torvalds
     
  • * git://git.samba.org/sfrench/cifs-2.6:
    CIFS: Rename *UCS* functions to *UTF16*
    [CIFS] ACL and FSCACHE support no longer EXPERIMENTAL
    [CIFS] Fix build break with multiuser patch when LANMAN disabled
    cifs: warn about impending deprecation of legacy MultiuserMount code
    cifs: fetch credentials out of keyring for non-krb5 auth multiuser mounts
    cifs: sanitize username handling
    keys: add a "logon" key type
    cifs: lower default wsize when unix extensions are not used
    cifs: better instrumentation for coalesce_t2
    cifs: integer overflow in parse_dacl()
    cifs: Fix sparse warning when calling cifs_strtoUCS
    CIFS: Add descriptions to the brlock cache functions

    Linus Torvalds
     
  • Fix new kernel-doc notation warnings:

    Warning(include/linux/sched.h:2094): No description found for parameter 'p'
    Warning(include/linux/sched.h:2094): Excess function parameter 'tsk' description in 'is_idle_task'
    Warning(kernel/sched/cpupri.c:139): No description found for parameter 'newpri'
    Warning(kernel/sched/cpupri.c:139): Excess function parameter 'pri' description in 'cpupri_set'
    Warning(kernel/sched/cpupri.c:208): Excess function parameter 'bootmem' description in 'cpupri_init'

    Signed-off-by: Randy Dunlap
    Cc: Ingo Molnar
    Cc: Peter Zijlstra
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Fix new kernel-doc warnings:

    Warning(include/net/cfg80211.h:1165): No description found for parameter 'channel_type'
    Warning(include/net/cfg80211.h:2090): No description found for parameter 'probe_resp_offload'

    Signed-off-by: Randy Dunlap
    Cc: Johannes Berg
    Cc: linux-wireless@vger.kernel.org
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Fix new kernel-doc warning:

    Warning(include/linux/usb.h:1251): No description found for parameter 'num_mapped_sgs'

    Signed-off-by: Randy Dunlap
    Cc: Greg Kroah-Hartman
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Fix new kernel-doc warnings:

    Warning(include/linux/device.h:299): No description found for parameter 'name'
    Warning(include/linux/device.h:299): No description found for parameter 'subsys'
    Warning(include/linux/device.h:299): No description found for parameter 'node'
    Warning(include/linux/device.h:299): No description found for parameter 'add_dev'
    Warning(include/linux/device.h:299): No description found for parameter 'remove_dev'
    Warning(include/linux/device.h:685): No description found for parameter 'id'
    Warning(include/linux/device.h:1009): No description found for parameter '__driver'
    Warning(include/linux/device.h:1009): No description found for parameter '__register'
    Warning(include/linux/device.h:1009): No description found for parameter '__unregister'

    Signed-off-by: Randy Dunlap
    Cc: Lars-Peter Clausen
    Cc: Greg Kroah-Hartman
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Commit cc39c6a9bbde ("mm: account skipped entries to avoid looping in
    find_get_pages") correctly fixed an infinite loop; but left a problem
    that find_get_pages() on shmem would return 0 (appearing to callers to
    mean end of tree) when it meets a run of nr_pages swap entries.

    The only uses of find_get_pages() on shmem are via pagevec_lookup(),
    called from invalidate_mapping_pages(), and from shmctl SHM_UNLOCK's
    scan_mapping_unevictable_pages(). The first is already commented, and
    not worth worrying about; but the second can leave pages on the
    Unevictable list after an unusual sequence of swapping and locking.

    Fix that by using shmem_find_get_pages_and_swap() (then ignoring the
    swap) instead of pagevec_lookup().

    But I don't want to contaminate vmscan.c with shmem internals, nor
    shmem.c with LRU locking. So move scan_mapping_unevictable_pages() into
    shmem.c, renaming it shmem_unlock_mapping(); and rename
    check_move_unevictable_page() to check_move_unevictable_pages(), looping
    down an array of pages, oftentimes under the same lock.

    Leave out the "rotate unevictable list" block: that's a leftover from
    when this was used for /proc/sys/vm/scan_unevictable_pages, whose flawed
    handling involved looking at pages at tail of LRU.

    Was there significance to the sequence first ClearPageUnevictable, then
    test page_evictable, then SetPageUnevictable here? I think not, we're
    under LRU lock, and have no barriers between those.

    Signed-off-by: Hugh Dickins
    Reviewed-by: KOSAKI Motohiro
    Cc: Minchan Kim
    Cc: Rik van Riel
    Cc: Shaohua Li
    Cc: Eric Dumazet
    Cc: Johannes Weiner
    Cc: Michel Lespinasse
    Cc: [back to 3.1 but will need respins]
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hugh Dickins
     
  • kdump only allocates memory for the prstatus ELF note. For s390x,
    besides of prstatus multiple ELF notes for various different register
    types are stored. Therefore the currently allocated memory is not
    sufficient. With this patch the KEXEC_NOTE_BYTES macro can be defined
    by architecture code and for s390x it is set to the correct size now.

    Signed-off-by: Michael Holzheu
    Cc: "Eric W. Biederman"
    Cc: Vivek Goyal
    Cc: Martin Schwidefsky
    Cc: Heiko Carstens
    Reviewed-by: Simon Horman
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Holzheu
     
  • sparc64 allmodconfig:

    In file included from include/linux/compat.h:15,
    from /usr/src/25/arch/sparc/include/asm/siginfo.h:19,
    from include/linux/signal.h:5,
    from include/linux/sched.h:73,
    from arch/sparc/kernel/asm-offsets.c:13:
    include/linux/fs.h:618: warning: parameter has incomplete type

    It seems that my sparc64 compiler (gcc-3.4.5) doesn't like the forward
    declaration of enums.

    Fix this by moving the "enum migrate_mode" definition into its own header
    file.

    Acked-by: Mel Gorman
    Cc: Rik van Riel
    Cc: Andrea Arcangeli
    Cc: Minchan Kim
    Cc: Dave Jones
    Cc: Jan Kara
    Cc: Andy Isaacson
    Cc: Nai Xia
    Cc: Johannes Weiner
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     

23 Jan, 2012

8 commits

  • It doesn't seem right for the thermal subsystem to export a symbol
    named generate_netlink_event. This function is thermal-specific and
    its name should reflect that fact. Rename it to
    thermal_generate_netlink_event.

    Signed-off-by: Jean Delvare
    Acked-by: Rafael J. Wysocki
    Acked-by: R.Durgadoss
    Signed-off-by: Len Brown

    Jean Delvare
     
  • Fixes:

    net/bluetooth/hci_core.c: In function ‘__check_enable_hs’:
    net/bluetooth/hci_core.c:2587:1: warning: return from incompatible pointer type [enabled by default]

    Signed-off-by: David S. Miller

    David S. Miller
     
  • There is a case in __sk_mem_schedule(), where an allocation
    is beyond the maximum, but yet we are allowed to proceed.
    It happens under the following condition:

    sk->sk_wmem_queued + size >= sk->sk_sndbuf

    The network code won't revert the allocation in this case,
    meaning that at some point later it'll try to do it. Since
    this is never communicated to the underlying res_counter
    code, there is an inbalance in res_counter uncharge operation.

    I see two ways of fixing this:

    1) storing the information about those allocations somewhere
    in memcg, and then deducting from that first, before
    we start draining the res_counter,
    2) providing a slightly different allocation function for
    the res_counter, that matches the original behavior of
    the network code more closely.

    I decided to go for #2 here, believing it to be more elegant,
    since #1 would require us to do basically that, but in a more
    obscure way.

    Signed-off-by: Glauber Costa
    Cc: KAMEZAWA Hiroyuki
    Cc: Johannes Weiner
    Cc: Michal Hocko
    CC: Tejun Heo
    CC: Li Zefan
    CC: Laurent Chavey
    Acked-by: Tejun Heo
    Signed-off-by: David S. Miller

    Glauber Costa
     
  • For the memcg sock code, we'll need to register allocations
    that are temporarily over limit. Let's make sure that margin
    is 0 in this case.

    I am keeping this as a separate patch, so that if any weirdness
    interaction appears in the future, we can now exactly what caused
    it.

    Suggested by Johannes Weiner

    Signed-off-by: Glauber Costa
    CC: KAMEZAWA Hiroyuki
    CC: Johannes Weiner
    CC: Michal Hocko
    CC: Tejun Heo
    CC: Li Zefan
    Acked-by: Tejun Heo
    Signed-off-by: David S. Miller

    Glauber Costa
     
  • There is still a build bug with the sock memcg code, that triggers
    with !CONFIG_NET, that survived my series of randconfig builds.

    Signed-off-by: Glauber Costa
    Reported-by: Randy Dunlap
    CC: Hiroyouki Kamezawa
    Signed-off-by: David S. Miller

    Glauber Costa
     
  • Fix new kernel-doc warning:

    Warning(include/net/sock.h:372): No description found for parameter 'sk_cgrp_prioidx'

    Signed-off-by: Randy Dunlap
    Signed-off-by: David S. Miller

    Randy Dunlap
     
  • Correctly implement a loss detection heuristic: New sequences (above
    high_seq) sent during the fast recovery are deemed lost when higher
    sequences are SACKed.

    Current code does not catch these losses, because tcp_mark_head_lost()
    does not check packets beyond high_seq. The fix is straight-forward by
    checking packets until the highest sacked packet. In addition, all the
    FLAG_DATA_LOST logic are in-effective and redundant and can be removed.

    Update the loss heuristic comments. The algorithm above is documented
    as heuristic B, but it is redundant too because heuristic A already
    covers B.

    Note that this change only marks some forward-retransmitted packets LOST.
    It does NOT forbid TCP performing further CWR on new losses. A potential
    follow-up patch under preparation is to perform another CWR on "new"
    losses such as
    1) sequence above high_seq is lost (by resetting high_seq to snd_nxt)
    2) retransmission is lost.

    Signed-off-by: Yuchung Cheng
    Signed-off-by: David S. Miller

    Yuchung Cheng
     
  • In native mode display all available staticstics.
    In SRIOV mode on VF display only SW counters statistics,
    in SRIOV mode on hypervisor display SW counters and errors (got from FW)
    statistics.

    Signed-off-by: Eugenia Emantayev
    Reviewed-by: Yevgeny Petrilin
    Signed-off-by: David S. Miller

    Eugenia Emantayev
     

21 Jan, 2012

2 commits

  • With the conversion of atomicio's routines in place (see commits
    6f68c91c55e and 700130b41f4), atomicio.[ch] can be removed, replacing
    the APEI specific pre-mapping capabilities with the more generalized
    versions that drivers/acpi/osl.c provides.

    Signed-off-by: Myron Stowe
    Signed-off-by: Len Brown

    Myron Stowe
     
  • Base ACPI (CA) currently does not support atomic 64-bit reads and writes
    (acpi_read() and acpi_write() split 64-bit loads/stores into two
    32-bit transfers) yet APEI expects 64-bit transfer capability, even
    when running on 32-bit systems.

    This patch implements 64-bit read and write routines for APEI usage.

    This patch re-factors similar functionality introduced in commit
    04c25997c97, bringing it into the ACPI subsystem in preparation for
    removing ./drivers/acpi/atomicio.[ch]. In the implementation I have
    replicated acpi_os_read_memory() and acpi_os_write_memory(), creating
    64-bit versions for APEI to utilize, as opposed to something more
    elegant. My thinking is that we should attempt to see if we can get
    ACPI's CA/OSL changed so that the existing acpi_read() and acpi_write()
    interfaces are natively 64-bit capable and then subsequently remove the
    replication.

    Signed-off-by: Myron Stowe
    Signed-off-by: Len Brown

    Myron Stowe
     

20 Jan, 2012

2 commits

  • Delay the setting up of features (cpuidle, throttling by calling
    acpi_processor_start()) to the time when the hotplugged
    core got onlined the first time and got fully
    initialized.

    Signed-off-by: Thomas Renninger
    Signed-off-by: Len Brown

    Thomas Renninger
     
  • Commit 33e638b, "PM / Sleep: Use the freezer_count() functions in
    [un]lock_system_sleep() APIs" introduced an undesirable change in the
    behaviour of unlock_system_sleep() since freezer_count() internally calls
    try_to_freeze() - which we don't need in unlock_system_sleep().

    And commit bcda53f, "PM / Sleep: Replace mutex_[un]lock(&pm_mutex) with
    [un]lock_system_sleep()" made these APIs wide-spread. This caused a
    regression in suspend-to-disk where snapshot_read() and snapshot_write()
    were getting frozen due to the try_to_freeze embedded in
    unlock_system_sleep(), since these functions were invoked when the freezing
    condition was still in effect.

    Fix this by rewriting unlock_system_sleep() by open-coding freezer_count()
    and dropping the try_to_freeze() part. Not only will this fix the
    regression but this will also ensure that the API only does what it is
    intended to do, and nothing more, under the hood.

    While at it, make the code more correct and robust by ensuring that the
    PF_FREEZER_SKIP flag gets cleared with pm_mutex held, to avoid a race with
    the freezer.

    Also, to be on the safer side, open-code freezer_do_not_count() as well
    (inside lock_system_sleep()), to ensure that any unrelated modification to
    freezer[_do_not]_count() does not break things again!

    Reported-and-tested-by: Rafael J. Wysocki
    Signed-off-by: Srivatsa S. Bhat
    Acked-by: Tejun Heo
    Signed-off-by: Rafael J. Wysocki

    Srivatsa S. Bhat
     

19 Jan, 2012

6 commits

  • Permit key_serial() to be called with a const key pointer.

    Signed-off-by: David Howells
    Signed-off-by: James Morris

    David Howells
     
  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (26 commits)
    target: Set additional sense length field in sense data
    target: Remove legacy device status check from transport_execute_tasks
    target: Remove __transport_execute_tasks() for each processing context
    target: Remove extra se_device->execute_task_lock access in fast path
    target: Drop se_device TCQ queue_depth usage from I/O path
    target: Fix possible NULL pointer with __transport_execute_tasks
    target: Remove TFO->check_release_cmd() fabric API caller
    tcm_fc: Convert ft_send_work to use target_submit_cmd
    target: Add target_submit_cmd() for process context fabric submission
    target: Make target_put_sess_cmd use target_release_cmd_kref
    target: Set response format in INQUIRY response
    target: tcm_mod_builder: small fixups
    Documentation/target: Fix tcm_mod_builder.py build breakage
    target: remove overagressive ____cacheline_aligned annoations
    tcm_loop: bump max_sectors
    target/configs: remove trailing newline from udev_path and alias
    iscsi-target: fix chap identifier simple_strtoul usage
    target: remove useless casts
    target: simplify target_check_cdb_and_preempt
    target: Move core_scsi3_check_cdb_abort_and_preempt
    ...

    Linus Torvalds
     
  • This includes initial support for the recently published ACPI 5.0 spec.
    In particular, support for the "hardware-reduced" bit that eliminates
    the dependency on legacy hardware.

    APEI has patches resulting from testing on real hardware.

    Plus other random fixes.

    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (52 commits)
    acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec
    intel_idle: Split up and provide per CPU initialization func
    ACPI processor: Remove unneeded variable passed by acpi_processor_hotadd_init V2
    ACPI processor: Remove unneeded cpuidle_unregister_driver call
    intel idle: Make idle driver more robust
    intel_idle: Fix a cast to pointer from integer of different size warning in intel_idle
    ACPI: kernel-parameters.txt : Add intel_idle.max_cstate
    intel_idle: remove redundant local_irq_disable() call
    ACPI processor: Fix error path, also remove sysdev link
    ACPI: processor: fix acpi_get_cpuid for UP processor
    intel_idle: fix API misuse
    ACPI APEI: Convert atomicio routines
    ACPI: Export interfaces for ioremapping/iounmapping ACPI registers
    ACPI: Fix possible alignment issues with GAS 'address' references
    ACPI, ia64: Use SRAT table rev to use 8bit or 16/32bit PXM fields (ia64)
    ACPI, x86: Use SRAT table rev to use 8bit or 32bit PXM fields (x86/x86-64)
    ACPI: Store SRAT table revision
    ACPI, APEI, Resolve false conflict between ACPI NVS and APEI
    ACPI, Record ACPI NVS regions
    ACPI, APEI, EINJ, Refine the fix of resource conflict
    ...

    Linus Torvalds
     
  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (57 commits)
    [media] as3645a: Fix compilation by including slab.h
    [media] s5p-fimc: Remove linux/version.h include from fimc-mdevice.c
    [media] s5p-mfc: Remove linux/version.h include from s5p_mfc.c
    [media] ds3000: using logical && instead of bitwise &
    [media] v4l2-ctrls: make control names consistent
    [media] DVB: dib0700, add support for Nova-TD LEDs
    [media] DVB: dib0700, add corrected Nova-TD frontend_attach
    [media] DVB: dib0700, separate stk7070pd initialization
    [media] DVB: dib0700, move Nova-TD Stick to a separate set
    [media] : add MODULE_FIRMWARE to dib0700
    [media] DVB-CORE: remove superfluous DTV_CMDs
    [media] s5p-jpeg: adapt to recent videobuf2 changes
    [media] s5p-g2d: fixed a bug in controls setting function
    [media] s5p-mfc: Fix volatile controls setup
    [media] drivers/media/video/s5p-mfc/s5p_mfc.c: adjust double test
    [media] drivers/media/video/s5p-fimc/fimc-capture.c: adjust double test
    [media] s5p-fimc: Fix incorrect control ID assignment
    [media] dvb_frontend: Don't call get_frontend() if idle
    [media] DocBook/dvbproperty.xml: Remove DTV_MODULATION from ISDB-T
    [media] DocBook/dvbproperty.xml: Fix ISDB-T delivery system parameters
    ...

    Linus Torvalds
     
  • SCSI updates on 20120118

    * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (49 commits)
    [SCSI] libfc: remove redundant timer init for fcp
    [SCSI] fcoe: Move fcoe_debug_logging from fcoe.h to fcoe.c
    [SCSI] libfc: Declare local functions static
    [SCSI] fcoe: fix regression on offload em matching function for initiator/target
    [SCSI] qla4xxx: Update driver version to 5.02.00-k12
    [SCSI] qla4xxx: Cleanup modinfo display
    [SCSI] qla4xxx: Update license
    [SCSI] qla4xxx: Clear the RISC interrupt bit during FW init
    [SCSI] qla4xxx: Added error logging for firmware abort
    [SCSI] qla4xxx: Disable generating pause frames in case of FW hung
    [SCSI] qla4xxx: Temperature monitoring for ISP82XX core.
    [SCSI] megaraid: fix sparse warnings
    [SCSI] sg: convert to kstrtoul_from_user()
    [SCSI] don't change sdev starvation list order without request dispatched
    [SCSI] isci: fix, prevent port from getting stuck in the 'configuring' state
    [SCSI] isci: fix start OOB
    [SCSI] isci: fix io failures while wide port links are coming up
    [SCSI] isci: allow more time for wide port targets
    [SCSI] isci: enable wide port targets
    [SCSI] isci: Fix IO fails when pull cable from phy in x4 wideport in MPC mode.
    ...

    Linus Torvalds
     
  • * git://git.infradead.org/users/willy/linux-nvme: (105 commits)
    NVMe: Set number of queues correctly
    NVMe: Version 0.8
    NVMe: Set queue flags correctly
    NVMe: Simplify nvme_unmap_user_pages
    NVMe: Mark the end of the sg list
    NVMe: Fix DMA mapping for admin commands
    NVMe: Rename IO_TIMEOUT to NVME_IO_TIMEOUT
    NVMe: Merge the nvme_bio and nvme_prp data structures
    NVMe: Change nvme_completion_fn to take a dev
    NVMe: Change get_nvmeq to take a dev instead of a namespace
    NVMe: Simplify completion handling
    NVMe: Update Identify Controller data structure
    NVMe: Implement doorbell stride capability
    NVMe: Version 0.7
    NVMe: Don't probe namespace 0
    Fix calculation of number of pages in a PRP List
    NVMe: Create nvme_identify and nvme_get_features functions
    NVMe: Fix memory leak in nvme_dev_add()
    NVMe: Fix calls to dma_unmap_sg
    NVMe: Correct sg list setup in nvme_map_user_pages
    ...

    Linus Torvalds
     

18 Jan, 2012

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)
    tg3: Fix single-vector MSI-X code
    openvswitch: Fix multipart datapath dumps.
    ipv6: fix per device IP snmp counters
    inetpeer: initialize ->redirect_genid in inet_getpeer()
    net: fix NULL-deref in WARN() in skb_gso_segment()
    net: WARN if skb_checksum_help() is called on skb requiring segmentation
    caif: Remove bad WARN_ON in caif_dev
    caif: Fix typo in Vendor/Product-ID for CAIF modems
    bnx2x: Disable AN KR work-around for BCM57810
    bnx2x: Remove AutoGrEEEn for BCM84833
    bnx2x: Remove 100Mb force speed for BCM84833
    bnx2x: Fix PFC setting on BCM57840
    bnx2x: Fix Super-Isolate mode for BCM84833
    net: fix some sparse errors
    net: kill duplicate included header
    net: sh-eth: Fix build error by the value which is not defined
    net: Use device model to get driver name in skb_gso_segment()
    bridge: BH already disabled in br_fdb_cleanup()
    net: move sock_update_memcg outside of CONFIG_INET
    mwl8k: Fixing Sparse ENDIAN CHECK warning
    ...

    Linus Torvalds