19 Jan, 2012

6 commits

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

    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

7 commits

  • * 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
     
  • Len Brown
     
  • 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
    Signed-off-by: Tony Luck
    Signed-off-by: Len Brown

    Tony Luck
     
  • * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
    ARM: mach-shmobile: specify CHCLR registers on SH7372
    dma: shdma: fix runtime PM: clear channel buffers on reset
    dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
    dmaengine/ste_dma40: clear LNK on channel startup
    dmaengine: intel_mid_dma: remove legacy pm interface
    ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
    dmaengine: intel_mid_dma: error path fix
    dmaengine: intel_mid_dma: locking and freeing fixes
    mtd: gpmi-nand: move to dma_transfer_direction
    mtd: fix compile error for gpmi-nand
    mmc: mxs-mmc: fix the dma_transfer_direction migration
    dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
    dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
    dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
    dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
    dma: mxs-dma: fix a typo in comment
    DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
    video i.MX IPU: Fix display connections
    i.MX IPU DMA: Fix wrong burstsize settings
    dmaengine/ste_dma40: allow fixed physical channel
    ...

    Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}

    The conflicts looked pretty trivial, but I'll ask people to verify them.

    Linus Torvalds
     
  • Ben Dooks
     
  • Add initial DT support to retrieve the frequency using a
    DT attribute instead of the pdata pointer if of_node exist.

    Add documentation for omap i2c controller binding.

    Based on original patches from Manju and Grant.

    Signed-off-by: Benoit Cousson
    Cc: Ben Dooks
    Reviewed-by: Rob Herring
    Acked-by: Grant Likely
    Signed-off-by: Kevin Hilman

    Benoit Cousson
     
  • Add missing intel_idle.max_cstate in kernel-parameters.txt

    Signed-off-by Masanari Iida
    Signed-off-by: Len Brown

    Masanari Iida
     

17 Jan, 2012

13 commits

  • On ISDB-T, each layer can have its own independent modulation,
    applied to the carriers that belong to the segments associated
    with them. So, there's no sense to define a global modulation
    parameter.

    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     
  • The ISDB-T differs on its way to implement the hierarchical
    transmissions: instead of using a low-priority/high-priority
    FEC codes, it does that by using different layers, each layer
    with their groups of segments. So, those parameters don't make sense
    for ISDB-T.

    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     
  • The units for DTV_FREQUENCY are kHz for satellital delivery systems
    (DVB-S/DVB-S2/DVB-TURBO/ISDB-S). Fix it at the API spec.

    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     
  • * 'x86-syscall-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86: Move from trace_syscalls.c to asm/syscall.h
    x86, um: Fix typo in 32-bit system call modifications
    um: Use $(srctree) not $(KBUILD_SRC)
    x86, um: Mark system call tables readonly
    x86, um: Use the same style generated syscall tables as native
    um: Generate headers before generating user-offsets.s
    um: Run host archheaders, allow use of host generated headers
    kbuild, headers.sh: Don't make archheaders explicitly
    x86, syscall: Allow syscall offset to be symbolic
    x86, syscall: Re-fix typo in comment
    x86: Simplify syscallhdr.sh
    x86: Generate system call tables and unistd_*.h from tables
    checksyscalls: Use arch/x86/syscalls/syscall_32.tbl as source
    x86: Machine-readable syscall tables and scripts to process them
    trace: Include in trace_syscalls.c
    x86-64, ia32: Move compat_ni_syscall into C and its own file
    x86-64, syscall: Adjust comment spacing and remove typo
    kbuild: Add support for an "archheaders" target
    kbuild: Add support for installing generated asm headers

    Linus Torvalds
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    hwmon: (sysfs-interface) Update tempX_type attribute to be more generic
    hwmon: (adm1031) Fix coding style issues
    hwmon: (it87) Add IT8728F support
    hwmon: (coretemp) Add missing section annotations
    hwmon: (lm90) Add range check to set_update_interval
    hwmon: (lm63) Support extended lookup table of LM96163
    hwmon: (lm63) Expose automatic fan speed control lookup table
    hwmon: (lm63) Fix incorrect comment about I2C address
    hwmon: (lm63) LM64 has a dedicated pin for tachometer
    hwmon: (lm63) Add sensor type attribute for external sensor on LM96163
    hwmon: (lm63) Add support for update_interval sysfs attribute
    hwmon: (lm63) Add support for writing the external critical temperature
    hwmon: (lm63) Add support for unsigned upper temperature limits
    hwmon: (lm63) Add support for LM96163
    hwmon: (lm63) Add support for external temperature offset register
    hwmon: (lm63) Fix checkpatch errors
    hwmon: (max1111) Change sysfs interface to in[0-3]_input in millivolts

    Linus Torvalds
     
  • * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    scripts/coccinelle: improve the coverage of some semantic patches
    coccinelle: semantic patches related to devm_ functions (part 2)
    coccinelle: semantic patches related to devm_ functions (part 1)
    coccinelle.txt: update documentation to include M= option
    coccicheck: add M= option to control which dir is processed
    ctags: remove struct forward declarations
    scripts/tags.sh: Add Page flag function magic

    Linus Torvalds
     
  • The temp[1-*]_type attribute reports the temperature sensor type. Sensor type 1
    is described as "PII/Celeron Diode", which is quite restrictive; other CPUs
    may also have an embedded temperature sensor diode with similar characteristics.
    Change description to "CPU embedded diode" to be more generic.

    Signed-off-by: Guenter Roeck
    Signed-off-by: Jean Delvare

    Guenter Roeck
     
  • Until we get a datasheet for the IT8728F, treat it as fully compatible
    with the IT8721F, as it seems to work reasonably well.

    This closes kernel bug #27262.

    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • The LM63 and compatible devices have a lookup table to control the fan
    speed automatically. Expose it in sysfs. Values are cached for 5
    seconds, independently of the other register values to avoid slowing
    down "sensors". We might make the table values writable in the future.

    Signed-off-by: Jean Delvare
    Tested-by: Guenter Roeck
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • On the LM64, the tachometer function has a dedicated pin and fan speed
    monitoring is always enabled.

    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • On LM96163, the external temperature sensor type is configurable to
    either a thermal diode or a 3904 transistor. The chip reports a wrong
    temperature if misconfigured. Add writable attribute to support it.

    Signed-off-by: Guenter Roeck
    Signed-off-by: Jean Delvare

    Guenter Roeck
     
  • The update interval is configurable on LM63 and compatibles. Add
    support for it.

    Signed-off-by: Guenter Roeck
    Signed-off-by: Jean Delvare

    Guenter Roeck
     
  • LM96163 is an enhanced version of LM63 with improved PWM resolution. Add chip
    detection code as well as support for improved PWM resolution if the chip is
    configured to use it.

    Signed-off-by: Guenter Roeck
    Tested-by: Thierry Reding
    Signed-off-by: Jean Delvare

    Guenter Roeck
     

16 Jan, 2012

8 commits

  • As per the feature removal document, make the tuner type check more strict
    so that it is no longer possible to set the radio frequency through a video
    node or the TV frequency through a radio node.

    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     
  • As Rupert pointed out, the phrase "It is good practice" should be replaced
    with "You must".

    Signed-off-by: Hans Verkuil
    Cc: Rupert Eibauer
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     
  • Update the spec to the behavior implemented by the control framework.
    This should have been documented long ago but for some reason it was
    never done.

    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     
  • Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     
  • Signed-off-by: Vikas Chaudhary
    Reviewed-by: Mike Christie
    Signed-off-by: James Bottomley

    Vikas Chaudhary
     
  • Signed-off-by: Adam Radford
    Signed-off-by: James Bottomley

    adam radford
     
  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (655 commits)
    [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver
    mb86a20s: Add a few more register settings at the init seq
    mb86a20s: Group registers into the same line
    [media] [PATCH] don't reset the delivery system on DTV_CLEAR
    [media] [BUG] it913x-fe fix typo error making SNR levels unstable
    [media] cx23885: Query the CX25840 during enum_input for status
    [media] cx25840: Add support for g_input_status
    [media] rc-videomate-m1f.c Rename to match remote controler name
    [media] drivers: media: au0828: Fix dependency for VIDEO_AU0828
    [media] convert drivers/media/* to use module_platform_driver()
    [media] drivers: video: cx231xx: Fix dependency for VIDEO_CX231XX_DVB
    [media] Exynos4 JPEG codec v4l2 driver
    [media] doc: v4l: selection: choose pixels as units for selection rectangles
    [media] v4l: s5p-tv: mixer: fix setup of VP scaling
    [media] v4l: s5p-tv: mixer: add support for selection API
    [media] v4l: emulate old crop API using extended crop/compose API
    [media] doc: v4l: add documentation for selection API
    [media] doc: v4l: add binary images for selection API
    [media] v4l: add support for selection api
    [media] hd29l2: fix review findings
    ...

    Linus Torvalds
     
  • * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (39 commits)
    perf tools: Fix compile error on x86_64 Ubuntu
    perf report: Fix --stdio output alignment when --showcpuutilization used
    perf annotate: Get rid of field_sep check
    perf annotate: Fix usage string
    perf kmem: Fix a memory leak
    perf kmem: Add missing closedir() calls
    perf top: Add error message for EMFILE
    perf test: Change type of '-v' option to INCR
    perf script: Add missing closedir() calls
    tracing: Fix compile error when static ftrace is enabled
    recordmcount: Fix handling of elf64 big-endian objects.
    perf tools: Add const.h to MANIFEST to make perf-tar-src-pkg work again
    perf tools: Add support for guest/host-only profiling
    perf kvm: Do guest-only counting by default
    perf top: Don't update total_period on process_sample
    perf hists: Stop using 'self' for struct hist_entry
    perf hists: Rename total_session to total_period
    x86: Add counter when debug stack is used with interrupts enabled
    x86: Allow NMIs to hit breakpoints in i386
    x86: Keep current stack in NMI breakpoints
    ...

    Linus Torvalds
     

15 Jan, 2012

6 commits

  • Kmemleak patches

    Main features:
    - Handle percpu memory allocations (only scanning them, not actually
    reporting).
    - Memory hotplug support.

    Usability improvements:
    - Show the origin of early allocations.
    - Report previously found leaks even if kmemleak has been disabled by
    some error.

    * tag 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux:
    kmemleak: Add support for memory hotplug
    kmemleak: Handle percpu memory allocation
    kmemleak: Report previously found leaks even after an error
    kmemleak: When the early log buffer is exceeded, report the actual number
    kmemleak: Show where early_log issues come from

    Linus Torvalds
     
  • * 'fbdev-next' of git://github.com/schandinat/linux-2.6: (175 commits)
    module_param: make bool parameters really bool (drivers/video/i810)
    Revert "atmel_lcdfb: Adjust HFP calculation so it matches the manual."
    OMAPDSS: HDMI: Disable DDC internal pull up
    OMAPDSS: HDMI: Move duplicate code from boardfile
    OMAPDSS: add OrtusTech COM43H4M10XTC display support
    OMAP: DSS2: Support for UMSH-8173MD TFT panel
    ASoC: OMAP: HDMI: Move HDMI codec trigger function to generic HDMI driver
    OMAPDSS: HDMI: Create function to enable HDMI audio
    ASoC: OMAP: HDMI: Correct signature of ASoC functions
    ASoC: OMAP: HDMI: Introduce driver data for audio codec
    grvga: fix section mismatch warnings
    video: s3c-fb: Don't keep device runtime active when open
    video: s3c-fb: Hold runtime PM references when touching registers
    video: s3c-fb: Take a runtime PM reference when unblanked
    video: s3c-fb: Disable runtime PM in error paths from probe
    video: s3c-fb: Use s3c_fb_enable() to enable the framebuffer
    video: s3c-fb: Make runtime PM functional again
    drivers/video: fsl-diu-fb: merge fsl_diu_alloc() into map_video_memory()
    drivers/video: fsl-diu-fb: add default platform ops functions
    drivers/video: fsl-diu-fb: remove broken reference count enabling the display
    ...

    Linus Torvalds
     
  • Adding documentation for the new M= option which limits Coccinelle
    to a specific set of directories.

    Signed-off-by: Greg Dietsche
    Acked-by: Julia Lawall
    Signed-off-by: Michal Marek

    Greg Dietsche
     
  • Linus Torvalds
     
  • Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1

    * tag 'for-linus' of git://github.com/rustyrussell/linux:
    module_param: check that bool parameters really are bool.
    intelfbdrv.c: bailearly is an int module_param
    paride/pcd: fix bool verbose module parameter.
    module_param: make bool parameters really bool (drivers & misc)
    module_param: make bool parameters really bool (arch)
    module_param: make bool parameters really bool (core code)
    kernel/async: remove redundant declaration.
    printk: fix unnecessary module_param_name.
    lirc_parallel: fix module parameter description.
    module_param: avoid bool abuse, add bint for special cases.
    module_param: check type correctness for module_param_array
    modpost: use linker section to generate table.
    modpost: use a table rather than a giant if/else statement.
    modules: sysfs - export: taint, coresize, initsize
    kernel/params: replace DEBUGP with pr_debug
    module: replace DEBUGP with pr_debug
    module: struct module_ref should contains long fields
    module: Fix performance regression on modules with large symbol tables
    module: Add comments describing how the "strmap" logic works

    Fix up conflicts in scripts/mod/file2alias.c due to the new linker-
    generated table approach to adding __mod_*_device_table entries. The
    ARM sa11x0 mcp bus needed to be converted to that too.

    Linus Torvalds
     
  • * 'for-3.3' of git://linux-nfs.org/~bfields/linux: (31 commits)
    nfsd4: nfsd4_create_clid_dir return value is unused
    NFSD: Change name of extended attribute containing junction
    svcrpc: don't revert to SVC_POOL_DEFAULT on nfsd shutdown
    svcrpc: fix double-free on shutdown of nfsd after changing pool mode
    nfsd4: be forgiving in the absence of the recovery directory
    nfsd4: fix spurious 4.1 post-reboot failures
    NFSD: forget_delegations should use list_for_each_entry_safe
    NFSD: Only reinitilize the recall_lru list under the recall lock
    nfsd4: initialize special stateid's at compile time
    NFSd: use network-namespace-aware cache registering routines
    SUNRPC: create svc_xprt in proper network namespace
    svcrpc: update outdated BKL comment
    nfsd41: allow non-reclaim open-by-fh's in 4.1
    svcrpc: avoid memory-corruption on pool shutdown
    svcrpc: destroy server sockets all at once
    svcrpc: make svc_delete_xprt static
    nfsd: Fix oops when parsing a 0 length export
    nfsd4: Use kmemdup rather than duplicating its implementation
    nfsd4: add a separate (lockowner, inode) lookup
    nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile error
    ...

    Linus Torvalds