Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jan 19, 2012
  1. Linux 3.3-rc1

    authored
  2. Merge branches 'sched-urgent-for-linus', 'perf-urgent-for-linus' and …

    authored
    …'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
    
    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      sched/accounting, proc: Fix /proc/stat interrupts sum
    
    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      tracepoints/module: Fix disabling tracepoints with taint CRAP or OOT
      x86/kprobes: Add arch/x86/tools/insn_sanity to .gitignore
      x86/kprobes: Fix typo transferred from Intel manual
    
    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86, syscall: Need __ARCH_WANT_SYS_IPC for 32 bits
      x86, tsc: Fix SMI induced variation in quick_pit_calibrate()
      x86, opcode: ANDN and Group 17 in x86-opcode-map.txt
      x86/kconfig: Move the ZONE_DMA entry under a menu
      x86/UV2: Add accounting for BAU strong nacks
      x86/UV2: Ack BAU interrupt earlier
      x86/UV2: Remove stale no-resources test for UV2 BAU
      x86/UV2: Work around BAU bug
      x86/UV2: Fix BAU destination timeout initialization
      x86/UV2: Fix new UV2 hardware by using native UV2 broadcast mode
      x86: Get rid of dubious one-bit signed bitfield
  3. Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

    authored
    gpio bug fixes for v3.3
    
    * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
      gpio: tps65910: Use correct offset for gpio initialization
      gpio/it8761e: Restrict it8761e gpio driver to x86.
      gpio-ml-ioh: cleanup __iomem annotation usage
      gpio-ml-ioh: cleanup NULL pointer checking
      gpio-pch: cleanup __iomem annotation usage
      gpio-pch: cleanup NULL pointer checking
  4. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/viro/vfs
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
      qnx4: don't leak ->BitMap on late failure exits
      qnx4: reduce the insane nesting in qnx4_checkroot()
      qnx4: di_fname is an array, for crying out loud...
      vfs: remove printk from set_nlink()
      wake up s_wait_unfrozen when ->freeze_fs fails
  5. x86, syscall: Need __ARCH_WANT_SYS_IPC for 32 bits

    H. Peter Anvin authored H. Peter Anvin committed
    In checkin
    
      303395a x86: Generate system call tables and unistd_*.h from tables
    
    the feature macros in <asm/unistd.h> were unified between 32 and 64
    bits.  Unfortunately 32 bits requires __ARCH_WANT_SYS_IPC and this was
    inadvertently dropped.
    
    Reported-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Link: http://lkml.kernel.org/r/CALLzPKbeXN5gdngo8uYYU8mAow=XhrwBFBhKfG811f37BubQOg@mail.gmail.com
  6. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/jmorris/linux-security
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
      KEYS: Permit key_serial() to be called with a const key pointer
      keys: fix user_defined key sparse messages
      ima: fix cred sparse warning
      MPILIB: Add a missing ENOMEM check
  7. qnx4: don't leak ->BitMap on late failure exits

    Al Viro authored
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  8. qnx4: reduce the insane nesting in qnx4_checkroot()

    Al Viro authored
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  9. qnx4: di_fname is an array, for crying out loud...

    Al Viro authored
    (struct qnx4_inode_entry *)(bh->b_data + some_offset)->di_fname
    is not going to be NULL, TYVM...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  10. KEYS: Permit key_serial() to be called with a const key pointer

    David Howells authored James Morris committed
    Permit key_serial() to be called with a const key pointer.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: James Morris <jmorris@namei.org>
  11. keys: fix user_defined key sparse messages

    Mimi Zohar authored James Morris committed
    Replace the rcu_assign_pointer() calls with rcu_assign_keypointer().
    
    Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: James Morris <jmorris@namei.org>
  12. ima: fix cred sparse warning

    Mimi Zohar authored James Morris committed
    Fix ima_policy.c sparse "warning: dereference of noderef expression"
    message, by accessing cred->uid using current_cred().
    
    Changelog v1:
    - Change __cred to just cred (based on David Howell's comment)
    
    Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
    Signed-off-by: James Morris <jmorris@namei.org>
  13. uml: fix compile for x86-64

    authored
    Randy Dunlap reports that we get
    
      arch/x86/um/shared/sysdep/ptrace.h:7:20: error: redefinition of 'regs_return_value'
      arch/x86/um/shared/sysdep/ptrace.h:7:20: note: previous definition of 'regs_return_value' was here
    
    when compiling UML for x86-64.
    
    Stephen Rothwell root-caused it and says:
    
     "Caused by commit d7e7528 ("Audit: push audit success and retcode
      into arch ptrace.h") (another patch that was never in linux-next :-().
    
      This file now needs protection against double inclusion."
    
    so let's do as the man says.
    
    Reported-by: Randy Dunlap <rdunlap@xenotime.net>
    Analyzed-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. MPILIB: Add a missing ENOMEM check

    David Howells authored James Morris committed
    Add a missing ENOMEM check.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Mimi Zohar <zohar@us.ibm.com>
    Signed-off-by: James Morris <jmorris@namei.org>
  15. Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/k…

    authored
    …ernel/git/nab/target-pending
    
    * 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
      ib_srpt: Initial SRP Target merge for v3.3-rc1
Commits on Jan 18, 2012
  1. Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/…

    authored
    …git/nab/target-pending
    
    * '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
      ...
  2. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    authored
    …it/lenb/linux
    
    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
      ...
  3. tpm: fix (ACPI S3) suspend regression

    Stefan Berger authored committed
    This patch fixes an (ACPI S3) suspend regression introduced in commit
    68d6e67 ("tpm: Introduce function to poll for result of self test")
    and occurring with an Infineon TPM and tpm_tis and tpm_infineon drivers
    active.
    
    The suspend problem occurred if the TPM was disabled and/or deactivated
    and therefore the TPM_PCRRead checking the result of the (asynchronous)
    self test returned an error code which then caused the tpm_tis driver to
    become inactive and this then seemed to have negatively influenced the
    suspend support by the tpm_infineon driver...  Besides that the tpm_tis
    drive may stay active even if the TPM is disabled and/or deactivated.
    
    Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
    Tested-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. nvme: fix merge error due to change of 'make_request_fn' fn type

    authored
    The type of 'make_request_fn' changed in 5a7bbad ("block: remove
    support for bio remapping from ->make_request"), but the merge of the
    nvme driver didn't take that into account, and as a result the driver
    would compile with a warning:
    
      drivers/block/nvme.c: In function 'nvme_alloc_ns':
      drivers/block/nvme.c:1336:2: warning: passing argument 2 of 'blk_queue_make_request' from incompatible pointer type [enabled by default]
      include/linux/blkdev.h:830:13: note: expected 'void (*)(struct request_queue *, struct bio *)' but argument is of type 'int (*)(struct request_queue *, struct bio *)'
    
    It's benign, but the warning is annoying.
    
    Reported-by: Stephen Rothwell <sfr@canb.auug.org>
    Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. xen: using EXPORT_SYMBOL requires including export.h

    Stephen Rothwell authored committed
    Fix these warnings:
    
      drivers/xen/biomerge.c:14:1: warning: data definition has no type or storage class [enabled by default]
      drivers/xen/biomerge.c:14:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
      drivers/xen/biomerge.c:14:1: warning: parameter names (without types) in function declaration [enabled by default]
    
    And this build error:
    
      ERROR: "xen_biovec_phys_mergeable" [drivers/block/nvme.ko] undefined!
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. Merge branch 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linux

    authored
    * 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linux:
      i2c-eg20t: Change-company-name-OKI-SEMICONDUCTOR to LAPIS Semiconductor
      i2c-eg20t: Support new device LAPIS Semiconductor ML7831 IOH
      i2c-eg20t: modified the setting of transfer rate.
      i2c-eg20t: use i2c_add_numbered_adapter to get a fixed bus number
      i2c: OMAP: Add DT support for i2c controller
      I2C: OMAP: NACK without STP
      I2C: OMAP: correct SYSC register offset for OMAP4
  7. Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/ke…

    authored
    …rnel/git/mchehab/linux-media
    
    * '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
      ...
  8. Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/…

    authored
    …git/tiwai/sound
    
    * 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
      ASoC: Wait for WM8993 FLL to stabilise
      ASoC: core - Free platform DAPM context at platform removal.
      ASoC: dapm - Fix check for codec context in dapm_power_widgets().
      ASoC: sgtl5000: update author email address
      ASoC: Fix DMA channel leak in imx-pcm-dma-mx2 driver.
  9. gpio: tps65910: Use correct offset for gpio initialization

    Laxman Dewangan authored Grant Likely committed
    Using the correct gpio offset for setting the initial value
    of gpio when setting output direction.
    
    Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  10. Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    authored
    …t/jejb/scsi-misc-2.6
    
    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.
      ...
  11. Merge git://git.infradead.org/users/willy/linux-nvme

    authored
    * 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
      ...
  12. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

    authored
    * 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
      ...
  13. @lenb
  14. @lenb

    acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec

    Tony Luck authored lenb committed
    ACPI 5.0 provides extensions to the EINJ mechanism to specify the
    target for the error injection - by APICID for cpu related errors,
    by address for memory related errors, and by segment/bus/device/function
    for PCIe related errors. Also extensions for vendor specific error
    injections.
    
    Tested-by: Chen Gong <gong.chen@linux.intel.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  15. @lenb
  16. @lenb

    Merge branch 'apei' into release

    lenb authored
  17. @watologo1 @lenb

    intel_idle: Split up and provide per CPU initialization func

    watologo1 authored lenb committed
    Function split up, should have no functional change.
    
    Provides entry point for physically hotplugged CPUs
    to initialize and activate cpuidle.
    
    Signed-off-by: Thomas Renninger <trenn@suse.de>
    CC: Deepthi Dharwar <deepthi@linux.vnet.ibm.com>
    CC: Shaohua Li <shaohua.li@intel.com>
    CC: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Len Brown <len.brown@intel.com>
  18. @watologo1 @lenb

    ACPI processor: Remove unneeded variable passed by acpi_processor_hot…

    watologo1 authored lenb committed
    …add_init V2
    
    V2: Fix typo: pr->handle -> pr, here: acpi_processor_hotadd_init(pr)
    
    This is a very small part taken from patches which afaik
    are coming from Yunhong Jiang (for a Xen not a Linus repo?).
    
    Cleanup only: no functional change.
    
    Advantage (beside cleanup) is that other data of the pr (acpi_processor) struct
    in the acpi_processor_hotadd_init() is needed later, for example a newly
    introduced flag:
    pr->flags.need_hotplug_init
    
    Signed-off-by: Thomas Renninger <trenn@suse.de>
    CC: Bjorn Helgaas <bhelgaas@google.com>
    CC: Jiang, Yunhong <yunhong.jiang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  19. @davem330

    tg3: Fix single-vector MSI-X code

    Matt Carlson authored davem330 committed
    Kdump kernels leave MSI-X interrupts (as setup by the crashed kernel)
    enabled.  However, kdump only enables one CPU in the new environment,
    thus causing tg3 to abort MSI-X setup.  When the driver attempts to
    enable INTA or MSI interrupt modes on a kdump kernel, interrupt
    delivery fails.
    
    This patch attempts to workaround the problem by forcing the driver
    to enable a single MSI-X interrupt.  In such a configuration, the
    device's multivector interrupt mode must be disabled.
    
    Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Something went wrong with that request. Please try again.