03 Nov, 2012

1 commit

  • Pull input subsystem fixes from Dmitry Torokhov:
    "Just a few driver fixes."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: tsc40 - remove wrong announcement of pressure support
    Input: lpc32xx-keys - select INPUT_MATRIXKMAP
    Input: pxa27x_keypad - clear pending interrupts on keypad config
    Input: wacom - correct bad Cintiq 24HD check
    Input: wacom - add INPUT_PROP_DIRECT flag to Cintiq 24HD
    Input: egalax_ts - get gpio from devicetree

    Linus Torvalds
     

30 Oct, 2012

2 commits


29 Oct, 2012

1 commit

  • Pull arm-soc fixes from Arnd Bergmann:
    "Bug fixes for a number of ARM platforms, mostly OMAP, imx and at91.

    These come a little later than I had hoped but unfortunately we had a
    few of these patches cause regressions themselves and had to work out
    how to deal with those in the meantime."

    * tag 'fixes-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
    Revert "ARM i.MX25: Fix PWM per clock lookups"
    ARM: versatile: fix versatile_defconfig
    ARM: mvebu: update defconfig with 3.7 changes
    ARM: at91: fix at91x40 build
    ARM: socfpga: Fix socfpga compilation with early_printk() enabled
    ARM: SPEAr: Remove unused empty files
    MAINTAINERS: Add arm-soc tree entry
    ARM: dts: mxs: add the "clock-names" for gpmi-nand
    ARM: ux500: Correct SDI5 address and add some format changes
    ARM: ux500: Specify AMBA Primecell IDs for Nomadik I2C in DT
    ARM: ux500: Fix build error relating to IRQCHIP_SKIP_SET_WAKE
    ARM: at91: drop duplicated config SOC_AT91SAM9 entry
    ARM: at91/i2c: change id to let i2c-at91 work
    ARM: at91/i2c: change id to let i2c-gpio work
    ARM: at91/dts: at91sam9g20ek_common: Fix typos in buttons labels.
    ARM: at91: fix external interrupt specification in board code
    ARM: at91: fix external interrupts in non-DT case
    ARM: at91: at91sam9g10: fix SOC type detection
    ARM: at91/tc: fix typo in the DT document
    ARM: AM33XX: Fix configuration of dmtimer parent clock by dmtimer driverDate:Wed, 17 Oct 2012 13:55:55 -0500
    ...

    Linus Torvalds
     

27 Oct, 2012

1 commit

  • Pull driver core fixes from Greg Kroah-Hartman:
    "Here are a number of firmware core fixes for 3.7, and some other minor
    fixes. And some documentation updates thrown in for good measure.

    All have been in the linux-next tree for a while.

    Signed-off-by: Greg Kroah-Hartman "

    * tag 'driver-core-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
    Documentation:Chinese translation of Documentation/arm64/memory.txt
    Documentation:Chinese translation of Documentation/arm64/booting.txt
    Documentation:Chinese translation of Documentation/IRQ.txt
    firmware loader: document kernel direct loading
    sysfs: sysfs_pathname/sysfs_add_one: Use strlcat() instead of strcat()
    dynamic_debug: Remove unnecessary __used
    firmware loader: sync firmware cache by async_synchronize_full_domain
    firmware loader: let direct loading back on 'firmware_buf'
    firmware loader: fix one reqeust_firmware race
    firmware loader: cancel uncache work before caching firmware

    Linus Torvalds
     

26 Oct, 2012

4 commits


25 Oct, 2012

3 commits

  • The irq_to_gpio() is old, most platforms use GENERIC_GPIO framework
    and don't support this API anymore.

    The i.MX6q sabrelite platform equips an egalax touchscreen controller,
    and this platform already transfered to GENERIC_GPIO framework, to
    support this driver, we use a more generic way to get gpio.

    Add a return value checking for waking up the controller in the probe
    function, this guarantee only a workable device can pass init.

    [dmitry.torokhov@gmail.com: Make driver depend on CONFIG_OF as it is
    now required.]

    Acked-by Zhang Jiejing
    Reviewed-by: Shawn Guo
    Signed-off-by: Hui Wang
    Signed-off-by: Dmitry Torokhov

    Hui Wang
     
  • Pull pinctrl fixes from Linus Walleij:
    "This fixes a few pinctrl problems seen since v3.7-rc1:
    - Section tagging for init code
    - Use proper pointers to lookup struct device * in the bcm2835
    (a.k.a. Raspberry Pi)
    - Remove duplicate #includes
    - Fix bad return values in errorpath
    - Remove extraneous pull function from the sirf driver causing build
    errors
    - Provide compilation stubs for the Nomadik pinctrl driver when used
    with legacy systems without PRCMU units
    - Various irqdomain fixes in the Nomadik driver as predicted
    - Various smallish bugs in the Tegra driver, most also targeted for
    stable
    - Removed a deadlocking mutex in the groups debugfs show function"

    * tag 'pinctrl-v3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
    pinctrl/nomadik: pass DT node to the irqdomain
    pinctrl/nomadik: use zero as default irq_start
    pinctrl: fix missing unlock on error in pinctrl_groups_show()
    pinctrl/nomadik: use irq_create_mapping()
    pinctrl: remove mutex lock in groups show
    pinctrl: tegra: correct bank for pingroup and drv pingroup
    pinctrl: tegra: set low power mode bank width to 2
    dt: Document: correct tegra20/30 pinctrl slew-rate name

    Linus Torvalds
     
  • Signed-off-by: Josh Wu
    Signed-off-by: Nicolas Ferre
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Cc: stable [v3.4]

    Josh Wu
     

24 Oct, 2012

1 commit


22 Oct, 2012

1 commit

  • Commit 9919cba7 ("watchdog: Update documentation") moved the
    NMI watchdog documentation from nmi_watchdog.txt to
    lockup-watchdogs.txt. Update the index file accordingly.

    Signed-off-by: Jean Delvare
    Cc: Fernando Luis Vazquez Cao
    Cc: Randy Dunlap
    Cc: Don Zickus
    Link: http://lkml.kernel.org/r/20121021120551.4656d99b@endymion.delvare
    Signed-off-by: Ingo Molnar

    Jean Delvare
     

20 Oct, 2012

1 commit


19 Oct, 2012

1 commit

  • Pull media fixes from Mauro Carvalho Chehab:
    "Media fixes for:
    - one Kconfig fix patch;
    - one patch fixing DocBook breakage due to the drivers/media UAPI
    changes;
    - the remaining UAPI media changes (DVB API).

    I'm aware that is is a little late for the UAPI renames for the DVB
    API, but IMHO, it is better to merge it for 3.7, due to two reasons:

    1) There is a major rename at 3.7 (not only uapi changes, but also
    the entire media drivers were reorganized on 3.7, in order to
    simplify the Kconfig logic, and easy drivers selection, especially
    for hybrid devices). By confining all those renames there at 3.7
    it will cause all the harm at for media developers on just one
    shot. Stable backports upstream and at distros will likely
    welcome it as well, as they won't need to check what changed on
    3.7 and what was postponed for on 3.8.

    2) The V4L2 DocBook Makefile creates a cross-reference between the
    media API headers and the specs. This helps us _a_lot_ to be sure
    that all API improvements are properly documented. Every time a
    header changes from one place to another, DocBook/media/Makefile
    needs to be patched. Currently, the DocBook breakage patch
    depends on the DVB UAPI."

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
    [media] Kconfig: Fix dependencies for driver autoselect options
    DocBook/media/Makefile: Fix build due to uapi breakage
    UAPI: (Scripted) Disintegrate include/linux/dvb

    Linus Torvalds
     

18 Oct, 2012

2 commits


17 Oct, 2012

4 commits


15 Oct, 2012

4 commits

  • Update file paths in Documentation/DocBook/networking.tmpl for uapi headers.

    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • TjMax for the CE4100 series of Atom CPUs was previously reported to be
    110 degrees C.

    cpuinfo logs on the web show existing CPU types CE4110, CE4150, and CE4170,
    reported as "model name : Intel(R) Atom(TM) CPU CE41{1|5|7}0 @ 1.{2|6}0GHz"
    with model 28 (0x1c) and stepping 10 (0x0a). Add the three known variants
    to the tjmax table.

    Signed-off-by: Guenter Roeck
    cc: stable@vger.kernel.org
    Acked-by: Jean Delvare

    Guenter Roeck
     
  • This config item has not carried much meaning for a while now and is
    almost always enabled by default. As agreed during the Linux kernel
    summit, remove it.

    CC: Jean Delvare
    CC: Guenter Roeck
    CC: Rob Landley
    Signed-off-by: Kees Cook
    Signed-off-by: Guenter Roeck

    Kees Cook
     
  • Pull module signing support from Rusty Russell:
    "module signing is the highlight, but it's an all-over David Howells frenzy..."

    Hmm "Magrathea: Glacier signing key". Somebody has been reading too much HHGTTG.

    * 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (37 commits)
    X.509: Fix indefinite length element skip error handling
    X.509: Convert some printk calls to pr_devel
    asymmetric keys: fix printk format warning
    MODSIGN: Fix 32-bit overflow in X.509 certificate validity date checking
    MODSIGN: Make mrproper should remove generated files.
    MODSIGN: Use utf8 strings in signer's name in autogenerated X.509 certs
    MODSIGN: Use the same digest for the autogen key sig as for the module sig
    MODSIGN: Sign modules during the build process
    MODSIGN: Provide a script for generating a key ID from an X.509 cert
    MODSIGN: Implement module signature checking
    MODSIGN: Provide module signing public keys to the kernel
    MODSIGN: Automatically generate module signing keys if missing
    MODSIGN: Provide Kconfig options
    MODSIGN: Provide gitignore and make clean rules for extra files
    MODSIGN: Add FIPS policy
    module: signature checking hook
    X.509: Add a crypto key parser for binary (DER) X.509 certificates
    MPILIB: Provide a function to read raw data into an MPI
    X.509: Add an ASN.1 decoder
    X.509: Add simple ASN.1 grammar compiler
    ...

    Linus Torvalds
     

14 Oct, 2012

1 commit

  • Pull md updates from NeilBrown:
    - "discard" support, some dm-raid improvements and other assorted bits
    and pieces.

    * tag 'md-3.7' of git://neil.brown.name/md: (29 commits)
    md: refine reporting of resync/reshape delays.
    md/raid5: be careful not to resize_stripes too big.
    md: make sure manual changes to recovery checkpoint are saved.
    md/raid10: use correct limit variable
    md: writing to sync_action should clear the read-auto state.
    Subject: [PATCH] md:change resync_mismatches to atomic64_t to avoid races
    md/raid5: make sure to_read and to_write never go negative.
    md: When RAID5 is dirty, force reconstruct-write instead of read-modify-write.
    md/raid5: protect debug message against NULL derefernce.
    md/raid5: add some missing locking in handle_failed_stripe.
    MD: raid5 avoid unnecessary zero page for trim
    MD: raid5 trim support
    md/bitmap:Don't use IS_ERR to judge alloc_page().
    md/raid1: Don't release reference to device while handling read error.
    raid: replace list_for_each_continue_rcu with new interface
    add further __init annotations to crypto/xor.c
    DM RAID: Fix for "sync" directive ineffectiveness
    DM RAID: Fix comparison of index and quantity for "rebuild" parameter
    DM RAID: Add rebuild capability for RAID10
    DM RAID: Move 'rebuild' checking code to its own function
    ...

    Linus Torvalds
     

13 Oct, 2012

3 commits

  • Pull ACPI & Thermal updates from Len Brown:
    "The generic Linux thermal layer is gaining some new capabilities
    (generic cooling via cpufreq) and some new customers (ARM).

    Also, an ACPI EC bug fix plus a regression fix."

    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (30 commits)
    tools/power/acpi/acpidump: remove duplicated include from acpidump.c
    ACPI idle, CPU hotplug: Fix NULL pointer dereference during hotplug
    cpuidle / ACPI: fix potential NULL pointer dereference
    ACPI: EC: Add a quirk for CLEVO M720T/M730T laptop
    ACPI: EC: Make the GPE storm threshold a module parameter
    thermal: Exynos: Fix NULL pointer dereference in exynos_unregister_thermal()
    Thermal: Fix bug on cpu_cooling, cooling device's id conflict problem.
    thermal: exynos: Use devm_* functions
    ARM: exynos: add thermal sensor driver platform data support
    thermal: exynos: register the tmu sensor with the kernel thermal layer
    thermal: exynos5: add exynos5250 thermal sensor driver support
    hwmon: exynos4: move thermal sensor driver to driver/thermal directory
    thermal: add generic cpufreq cooling implementation
    Fix a build error.
    thermal: Fix potential NULL pointer accesses
    thermal: add Renesas R-Car thermal sensor support
    thermal: fix potential out-of-bounds memory access
    Thermal: Introduce locking for cdev.thermal_instances list.
    Thermal: Unify the code for both active and passive cooling
    Thermal: Introduce simple arbitrator for setting device cooling state
    ...

    Linus Torvalds
     
  • Pull misc SCSI updates from James Bottomley:
    "This is an assorted set of stragglers into the merge window with
    driver updates for megaraid_sas, lpfc, bfi and mvumi. It also
    includes some fairly major fixes for virtio-scsi (scatterlist init),
    scsi_debug (off by one error), storvsc (use after free) and qla2xxx
    (potential deadlock).

    Signed-off-by: James Bottomley "

    * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (49 commits)
    [SCSI] storvsc: Account for in-transit packets in the RESET path
    [SCSI] qla2xxx: fix potential deadlock on ha->hardware_lock
    [SCSI] scsi_debug: Fix off-by-one bug when unmapping region
    [SCSI] Shorten the path length of scsi_cmd_to_driver()
    [SCSI] virtio-scsi: support online resizing of disks
    [SCSI] virtio-scsi: fix LUNs greater than 255
    [SCSI] virtio-scsi: initialize scatterlist structure
    [SCSI] megaraid_sas: Version, Changelog, Copyright update
    [SCSI] megaraid_sas: Remove duplicate code
    [SCSI] megaraid_sas: Add SystemPD FastPath support
    [SCSI] megaraid_sas: Add array boundary check for SystemPD
    [SCSI] megaraid_sas: Load io_request DataLength in bytes
    [SCSI] megaraid_sas: Add module param for configurable MSI-X vector count
    [SCSI] megaraid_sas: Remove un-needed completion_lock spinlock calls
    [SCSI] lpfc 8.3.35: Update lpfc version for 8.3.35 driver release
    [SCSI] lpfc 8.3.35: Fixed not reporting logical link speed to SCSI midlayer when QoS not on
    [SCSI] lpfc 8.3.35: Fix error with fabric service parameters causing performance issues
    [SCSI] lpfc 8.3.35: Fixed SCSI host create showing wrong link speed on SLI3 HBA ports
    [SCSI] lpfc 8.3.35: Fixed not checking solicition in progress bit when verifying FCF record for use
    [SCSI] lpfc 8.3.35: Fixed messages for misconfigured port errors
    ...

    Linus Torvalds
     
  • Pull nfsd update from J Bruce Fields:
    "Another relatively quiet cycle. There was some progress on my
    remaining 4.1 todo's, but a couple of them were just of the form
    "check that we do X correctly", so didn't have much affect on the
    code.

    Other than that, a bunch of cleanup and some bugfixes (including an
    annoying NFSv4.0 state leak and a busy-loop in the server that could
    cause it to peg the CPU without making progress)."

    * 'for-3.7' of git://linux-nfs.org/~bfields/linux: (46 commits)
    UAPI: (Scripted) Disintegrate include/linux/sunrpc
    UAPI: (Scripted) Disintegrate include/linux/nfsd
    nfsd4: don't allow reclaims of expired clients
    nfsd4: remove redundant callback probe
    nfsd4: expire old client earlier
    nfsd4: separate session allocation and initialization
    nfsd4: clean up session allocation
    nfsd4: minor free_session cleanup
    nfsd4: new_conn_from_crses should only allocate
    nfsd4: separate connection allocation and initialization
    nfsd4: reject bad forechannel attrs earlier
    nfsd4: enforce per-client sessions/no-sessions distinction
    nfsd4: set cl_minorversion at create time
    nfsd4: don't pin clientids to pseudoflavors
    nfsd4: fix bind_conn_to_session xdr comment
    nfsd4: cast readlink() bug argument
    NFSD: pass null terminated buf to kstrtouint()
    nfsd: remove duplicate init in nfsd4_cb_recall
    nfsd4: eliminate redundant nfs4_free_stateid
    fs/nfsd/nfs4idmap.c: adjust inconsistent IS_ERR and PTR_ERR
    ...

    Linus Torvalds
     

12 Oct, 2012

3 commits

  • Pull second set of media updates from Mauro Carvalho Chehab:
    "Despite its size, most of the stuff here is trivial. This series
    contains:

    - s5p-mfc: additions at the driver and at the core to support H.264
    hardware codec;
    - Some improvements at s5p and davinci embedded drivers;
    - Some V4L2 compliance fixes applied on a few drivers;
    - Several random trivial patches, including several fixes and a few
    new board support additions;

    Notes:

    1) Some Exynos media patches were dependent on some -arm fixes that
    got merged on changeset 782cd9e. That's why this pull request is
    based that changeset.

    2) As promised, I reviewed the pending VB2 DMABUF series.

    While setting a test environment, it was noticed that the upstream
    support for Samsung Exynos 4 boards (smdk310 and Origen) are
    broken upstream, likely due to regressions: both defconfigs are
    wrong and regulator settings for both boards are broken. That,
    allied with some bug at the dummy regulator driver, causes OOPSes
    during boot time.

    Long story short: even fixing the above, the proposed patches
    OOPSed when running the DMABUF test. Not sure yet if the OOPSes
    are due to some other undetected regressions, or due to some bug
    on the patches.

    Due to the above, DMABUF patches for vb2 got NACKed for 3.7."

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (109 commits)
    [media] m5mols: Add missing #include
    [media] stk1160: Add support for S-Video input
    Revert "[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check"
    [media] dvb: LNA implementation changes
    [media] v4l2-ioctl: fix W=1 warnings
    [media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID
    [media] omap3isp: Fix compilation error in ispreg.h
    [media] rc-msi-digivox-ii: Add full scan keycodes
    [media] cx25821: testing the wrong variable
    [media] tda18271-common: hold the I2C adapter during write transfers
    [media] ds3000: add module parameter to force firmware upload
    [media] drivers/media: Remove unnecessary semicolon
    [media] winbond: remove space from driver name
    [media] iguanair: cannot send data from the stack
    [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
    [media] dvb-usb: print small buffers via %*ph
    [media] uvc: Add return code check at vb2_queue_init()
    [media] em28xx: Replace memcpy with struct assignment
    [media] bt8xx: Add video4linux control V4L2_CID_COLOR_KILLER
    [media] mem2mem_testdev: Use devm_kzalloc() in probe
    ...

    Conflicts:
    arch/arm/mach-davinci/include/mach/da8xx.h

    Linus Torvalds
     
  • Pull second set of ARM updates from Russell King:
    "This is the second set of ARM updates for this merge window.

    Contained within are changes to allow the kernel to boot in hypervisor
    mode on CPUs supporting virtualization, and cache flushing support to
    the point of inner sharable unification, which are used by the
    suspend/resume code to avoid having to do a full cache flush.

    Also included is one fix for VFP code identified by Michael Olbrich."

    * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm:
    ARM: vfp: fix saving d16-d31 vfp registers on v6+ kernels
    ARM: 7549/1: HYP: fix boot on some ARM1136 cores
    ARM: 7542/1: mm: fix cache LoUIS API for xscale and feroceon
    ARM: mm: update __v7_setup() to the new LoUIS cache maintenance API
    ARM: kernel: update __cpu_disable to use cache LoUIS maintenance API
    ARM: kernel: update cpu_suspend code to use cache LoUIS operations
    ARM: mm: rename jump labels in v7_flush_dcache_all function
    ARM: mm: implement LoUIS API for cache maintenance ops
    ARM: virt: arch_timers: enable access to physical timers
    ARM: virt: Add CONFIG_ARM_VIRT_EXT option
    ARM: virt: Add boot-time diagnostics
    ARM: virt: Update documentation for hyp mode entry support
    ARM: zImage/virt: hyp mode entry support for the zImage loader
    ARM: virt: allow the kernel to be entered in HYP mode
    ARM: opcodes: add __ERET/__MSR_ELR_HYP instruction encoding

    Linus Torvalds
     
  • Applied on the top of changeset 782cd9e, as some of those patches
    depend on some fixes that went via -arm tree.

    * staging/for_v3.7: (109 commits)
    [media] m5mols: Add missing #include
    [media] stk1160: Add support for S-Video input
    Revert "[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check"
    [media] dvb: LNA implementation changes
    [media] v4l2-ioctl: fix W=1 warnings
    [media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID
    [media] omap3isp: Fix compilation error in ispreg.h
    [media] rc-msi-digivox-ii: Add full scan keycodes
    [media] cx25821: testing the wrong variable
    [media] tda18271-common: hold the I2C adapter during write transfers
    [media] ds3000: add module parameter to force firmware upload
    [media] drivers/media: Remove unnecessary semicolon
    [media] winbond: remove space from driver name
    [media] iguanair: cannot send data from the stack
    [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
    [media] dvb-usb: print small buffers via %*ph
    [media] uvc: Add return code check at vb2_queue_init()
    [media] em28xx: Replace memcpy with struct assignment
    [media] bt8xx: Add video4linux control V4L2_CID_COLOR_KILLER
    [media] mem2mem_testdev: Use devm_kzalloc() in probe
    ...

    Mauro Carvalho Chehab
     

11 Oct, 2012

6 commits

  • Conflicts:
    arch/arm/kernel/smp.c

    Russell King
     
  • DM RAID: Add code to validate replacement slots for RAID10 arrays

    RAID10 can handle 'copies - 1' failures for each mirror group. This code
    ensures the user has provided a valid array - one whose devices specified for
    rebuild do not exceed the amount of redundancy available.

    Signed-off-by: Jonathan Brassow
    Signed-off-by: NeilBrown

    Jonathan Brassow
     
  • Pull i2c-embedded changes from Wolfram Sang:
    "The changes for i2c-embedded include:

    - massive rework of the omap driver
    - massive rework of the at91 driver. In fact, the old driver gets
    removed; I am okay with this approach since the old driver was
    depending on BROKEN and its limitations made it practically
    unusable, so people used bitbanging instead. But even if there are
    users, there is no platform_data or module parameter which would
    need to be converted. It is just another driver doing I2C
    transfers, just way better. Modifications of arch/arm/at91 related
    files have proper acks from the maintainer.
    - new driver for R-Car I2C
    - devicetree and generic_clock conversions and fixes
    - usual driver fixes and changes.

    The rework patches have come a long way and lots of people have been
    involved in creating/testing them. Most patches have been in
    linux-next at least since 3.6-rc5. A few have been added in the last
    week, I have to admit.

    An unexpected (but welcome :)) peak in private life is the cause for
    that. The "late" patches shouldn't cause any merge conflicts and I
    will have a special eye on them during the stabilization phase. This
    is an exception and I want to have the patches in place properly in
    time again for the next kernels."

    * 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (44 commits)
    MXS: Implement DMA support into mxs-i2c
    i2c: add Renesas R-Car I2C driver
    i2c: s3c2410: use clk_prepare_enable and clk_disable_unprepare
    ARM: OMAP: convert I2C driver to PM QoS for MPU latency constraints
    i2c: nomadik: Add Device Tree support to the Nomadik I2C driver
    i2c: algo: pca: Fix chip reset function for PCA9665
    i2c: mpc: Wait for STOP to hit the bus
    i2c: davinci: preparation for switch to common clock framework
    omap-i2c: fix incorrect log message when using a device tree
    i2c: omap: sanitize exit path
    i2c: omap: switch over to autosuspend API
    i2c: omap: remove unnecessary pm_runtime_suspended check
    i2c: omap: switch to threaded IRQ support
    i2c: omap: remove redundant status read
    i2c: omap: get rid of the "complete" label
    i2c: omap: resize fifos before each message
    i2c: omap: simplify IRQ exit path
    i2c: omap: always return IRQ_HANDLED
    i2c: omap: simplify errata check
    i2c: omap: bus: add a receiver flag
    ...

    Linus Torvalds
     
  • Pull ARM SoC fixes from Olof Johansson:
    "A series of fixes (and in some cases, some cleanups):

    Via Tony Lindgren:
    - A collection of OMAP regression fixes, in particular because
    firmware no longer sets up all pin states before starting the
    kernel.
    - cpufreq fixes for OMAP (Rafael is on vacation and this was
    pre-agreed).
    - A longer series of misc regression fixes and cleanups, warning
    removals, etc for OMAP

    From Arnd Bergmann:
    - A series of warning fixes for various platforms (defconfig builds)

    Misc:
    - A couple of tegra fixes, one for i.MX, some vt8500 fixes, etc."

    * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)
    ARM: pxa: armcore: fix PCI PIO warnings
    ARM: integrator: use __iomem pointers for MMIO, part 2
    ARM: assabet: fix bogus warning in get_assabet_scr (again)
    ARM: shmobile: mark shmobile_init_late as __init
    ARM: integrator_cp: fix build failure
    ARM: OMAP4/AM335x: hwmod: fix disable_module regression in hardreset handling
    ARM: OMAP3: fix workaround for EMU clockdomain
    arm/omap: Replace board_ref_clock with enum values
    ARM: OMAP2+: remove duplicated include from board-omap3stalker.c
    arch/arm/plat-omap/omap-pm-noop.c: Remove unecessary semicolon
    arch/arm/mach-omap2: Remove unecessary semicolon
    arch/arm/mach-omap1/devices.c: Remove unecessary semicolon
    ARM/dts: omap5-evm: pinmux configuration for audio
    ARM/dts: Add pinctrl driver entries for omap5
    ARM/dts: omap4-panda: pinmux configuration for audio
    ARM/dts: omap4-sdp: pinmux configuration for audio
    ARM/dts: omap5-evm: Disable unused McBSP3
    ARM/dts: omap4-sdp: Disable unused McBSP3
    ARM/dts: omap4-panda: Disable unused audio IPs
    ARM: OMAP: board-omap4panda: Pin mux configuration for audio needs
    ...

    Linus Torvalds
     
  • Pull block IO update from Jens Axboe:
    "Core block IO bits for 3.7. Not a huge round this time, it contains:

    - First series from Kent cleaning up and generalizing bio allocation
    and freeing.

    - WRITE_SAME support from Martin.

    - Mikulas patches to prevent O_DIRECT crashes when someone changes
    the block size of a device.

    - Make bio_split() work on data-less bio's (like trim/discards).

    - A few other minor fixups."

    Fixed up silent semantic mis-merge as per Mikulas Patocka and Andrew
    Morton. It is due to the VM no longer using a prio-tree (see commit
    6b2dbba8b6ac: "mm: replace vma prio_tree with an interval tree").

    So make set_blocksize() use mapping_mapped() instead of open-coding the
    internal VM knowledge that has changed.

    * 'for-3.7/core' of git://git.kernel.dk/linux-block: (26 commits)
    block: makes bio_split support bio without data
    scatterlist: refactor the sg_nents
    scatterlist: add sg_nents
    fs: fix include/percpu-rwsem.h export error
    percpu-rw-semaphore: fix documentation typos
    fs/block_dev.c:1644:5: sparse: symbol 'blkdev_mmap' was not declared
    blockdev: turn a rw semaphore into a percpu rw semaphore
    Fix a crash when block device is read and block size is changed at the same time
    block: fix request_queue->flags initialization
    block: lift the initial queue bypass mode on blk_register_queue() instead of blk_init_allocated_queue()
    block: ioctl to zero block ranges
    block: Make blkdev_issue_zeroout use WRITE SAME
    block: Implement support for WRITE SAME
    block: Consolidate command flag and queue limit checks for merges
    block: Clean up special command handling logic
    block/blk-tag.c: Remove useless kfree
    block: remove the duplicated setting for congestion_threshold
    block: reject invalid queue attribute values
    block: Add bio_clone_bioset(), bio_clone_kmalloc()
    block: Consolidate bio_alloc_bioset(), bio_kmalloc()
    ...

    Linus Torvalds
     
  • Pull hwmon updates from Jean Delvare:
    "Only trivial things this time"

    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    hwmon: Drop needless includes of
    hwmon: Add missing inclusions of
    hwmon: Add missing inclusions of
    hwmon: Fix spelling of Celsius
    hwmon: Update Alexey Fisher's name

    Linus Torvalds
     

10 Oct, 2012

1 commit

  • Pull NFS client updates from Trond Myklebust:
    "Features include:

    - Remove CONFIG_EXPERIMENTAL dependency from NFSv4.1
    Aside from the issues discussed at the LKS, distros are shipping
    NFSv4.1 with all the trimmings.
    - Fix fdatasync()/fsync() for the corner case of a server reboot.
    - NFSv4 OPEN access fix: finally distinguish correctly between
    open-for-read and open-for-execute permissions in all situations.
    - Ensure that the TCP socket is closed when we're in CLOSE_WAIT
    - More idmapper bugfixes
    - Lots of pNFS bugfixes and cleanups to remove unnecessary state and
    make the code easier to read.
    - In cases where a pNFS read or write fails, allow the client to
    resume trying layoutgets after two minutes of read/write-
    through-mds.
    - More net namespace fixes to the NFSv4 callback code.
    - More net namespace fixes to the NFSv3 locking code.
    - More NFSv4 migration preparatory patches.
    Including patches to detect network trunking in both NFSv4 and
    NFSv4.1
    - pNFS block updates to optimise LAYOUTGET calls."

    * tag 'nfs-for-3.7-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (113 commits)
    pnfsblock: cleanup nfs4_blkdev_get
    NFS41: send real read size in layoutget
    NFS41: send real write size in layoutget
    NFS: track direct IO left bytes
    NFSv4.1: Cleanup ugliness in pnfs_layoutgets_blocked()
    NFSv4.1: Ensure that the layout sequence id stays 'close' to the current
    NFSv4.1: Deal with seqid wraparound in the pNFS return-on-close code
    NFSv4 set open access operation call flag in nfs4_init_opendata_res
    NFSv4.1: Remove the dependency on CONFIG_EXPERIMENTAL
    NFSv4 reduce attribute requests for open reclaim
    NFSv4: nfs4_open_done first must check that GETATTR decoded a file type
    NFSv4.1: Deal with wraparound when updating the layout "barrier" seqid
    NFSv4.1: Deal with wraparound issues when updating the layout stateid
    NFSv4.1: Always set the layout stateid if this is the first layoutget
    NFSv4.1: Fix another refcount issue in pnfs_find_alloc_layout
    NFSv4: don't put ACCESS in OPEN compound if O_EXCL
    NFSv4: don't check MAY_WRITE access bit in OPEN
    NFS: Set key construction data for the legacy upcall
    NFSv4.1: don't do two EXCHANGE_IDs on mount
    NFS: nfs41_walk_client_list(): re-lock before iterating
    ...

    Linus Torvalds