1. 07 Oct, 2013 5 commits
  2. 23 Sep, 2013 13 commits
  3. 13 Sep, 2013 11 commits
  4. 07 Sep, 2013 9 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 6be48f29
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
       "Here is the crypto update for 3.12:
      
         - Added MODULE_SOFTDEP to allow pre-loading of modules.
         - Reinstated crct10dif driver using the module softdep feature.
         - Allow via rng driver to be auto-loaded.
      
         - Split large input data when necessary in nx.
         - Handle zero length messages correctly for GCM/XCBC in nx.
         - Handle SHA-2 chunks bigger than block size properly in nx.
      
         - Handle unaligned lengths in omap-aes.
         - Added SHA384/SHA512 to omap-sham.
         - Added OMAP5/AM43XX SHAM support.
         - Added OMAP4 TRNG support.
      
         - Misc fixes"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (66 commits)
        Reinstate "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework"
        hwrng: via - Add MODULE_DEVICE_TABLE
        crypto: fcrypt - Fix bitoperation for compilation with clang
        crypto: nx - fix SHA-2 for chunks bigger than block size
        crypto: nx - fix GCM for zero length messages
        crypto: nx - fix XCBC for zero length messages
        crypto: nx - fix limits to sg lists for AES-CCM
        crypto: nx - fix limits to sg lists for AES-XCBC
        crypto: nx - fix limits to sg lists for AES-GCM
        crypto: nx - fix limits to sg lists for AES-CTR
        crypto: nx - fix limits to sg lists for AES-CBC
        crypto: nx - fix limits to sg lists for AES-ECB
        crypto: nx - add offset to nx_build_sg_lists()
        padata - Register hotcpu notifier after initialization
        padata - share code between CPU_ONLINE and CPU_DOWN_FAILED, same to CPU_DOWN_PREPARE and CPU_UP_CANCELED
        hwrng: omap - reorder OMAP TRNG driver code
        crypto: omap-sham - correct dma burst size
        crypto: omap-sham - Enable Polling mode if DMA fails
        crypto: tegra-aes - bitwise vs logical and
        crypto: sahara - checking the wrong variable
        ...
      6be48f29
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 0ffb01d9
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       "A quick set of fixes, some to deal with fallout from yesterday's
        net-next merge.
      
         1) Fix compilation of bnx2x driver with CONFIG_BNX2X_SRIOV disabled,
            from Dmitry Kravkov.
      
         2) Fix a bnx2x regression caused by one of Dave Jones's mistaken
            braces changes, from Eilon Greenstein.
      
         3) Add some protective filtering in the netlink tap code, from Daniel
            Borkmann.
      
         4) Fix TCP congestion window growth regression after timeouts, from
            Yuchung Cheng.
      
         5) Correctly adjust TCP's rcv_ssthresh for out of order packets, from
            Eric Dumazet"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        tcp: properly increase rcv_ssthresh for ofo packets
        net: add documentation for BQL helpers
        mlx5: remove unused MLX5_DEBUG param in Kconfig
        bnx2x: Restore a call to config_init
        bnx2x: fix broken compilation with CONFIG_BNX2X_SRIOV is not set
        tcp: fix no cwnd growth after timeout
        net: netlink: filter particular protocols from analyzers
      0ffb01d9
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 7b4022fa
      Linus Torvalds authored
      Pull hwmon fixes from Jean Delvare.
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (emc6w201) Do not declare enum variable
        hwmon: (w83792d) Update module author
      7b4022fa
    • Linus Torvalds's avatar
      Merge tag 'gpio-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 27c7651a
      Linus Torvalds authored
      Pull GPIO updates from Linus Walleij:
       "This is the bulk of GPIO changes for the v3.12 series:
      
         - A new driver for the TZ1090 PDC which is used on the metag
           architecture.
      
         - A new driver for the Kontron ETX or COMexpress GPIO block.  This is
           found on some ETX x86 devices.
      
         - A new driver for the Fintek Super-I/O chips, used on some x86
           boards.
      
         - Added device tree probing on a few select GPIO blocks.
      
         - Drop the Exynos support from the Samsung GPIO driver.
      
           The Samsung maintainers have moved over to use the modernized pin
           control driver to provide GPIO for the modern platforms instead.
      
         - The usual bunch of non-critical fixes and cleanups"
      
      * tag 'gpio-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (36 commits)
        gpio: return -ENOTSUPP if debounce cannot be set
        gpio: improve error path in gpiolib
        gpio: add GPIO support for F71882FG and F71889F
        of: add vendor prefix for Microchip Technology Inc
        gpio: mcp23s08: rename the device tree property
        gpio: samsung: Drop support for Exynos SoCs
        gpio: pcf857x: Remove pdata argument to pcf857x_irq_domain_init()
        gpio: pcf857x: Sort headers alphabetically
        gpio: max7301: Reverting "Do not force SPI speed when using OF Platform"
        gpio: Fix bit masking in Kontron PLD GPIO driver
        gpio: pca953x: fix gpio input on gpio offsets >= 8
        drivers/gpio: simplify use of devm_ioremap_resource
        drivers/gpio/gpio-omap.c: convert comma to semicolon
        gpio-lynxpoint: Fix warning about unbalanced pm_runtime_enable
        gpio: Fix platform driver name in Kontron PLD GPIO driver
        gpio: adnp: Fix segfault if request_threaded_irq fails
        gpio: msm: Staticize local variable 'msm_gpio'
        gpio: gpiolib-of.c: make error message more meaningful by adding the node name and index
        gpio: use dev_get_platdata()
        gpio/mxc: add chained_irq_enter/exit() to mx2_gpio_irq_handler
        ...
      27c7651a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 8b8a7df9
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "A new driver for slidebar on Ideapad laptops and a bunch of assorted
        driver fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (32 commits)
        Input: add SYN_MAX and SYN_CNT constants
        Input: max11801_ts - convert to devm
        Input: egalax-ts - fix typo and improve text
        Input: MAINTAINERS - change maintainer for cyttsp driver
        Input: cyttsp4 - kill 'defined but not used' compiler warnings
        Input: add driver for slidebar on Lenovo IdeaPad laptops
        Input: omap-keypad - set up irq type from DT
        Input: omap-keypad - enable wakeup capability for keypad.
        Input: omap-keypad - clear interrupts on open
        Input: omap-keypad - convert to threaded IRQ
        Input: omap-keypad - use bitfiled instead of hardcoded values
        Input: cyttsp4 - remove useless NULL test from cyttsp4_watchdog_timer()
        Input: wacom - fix error return code in wacom_probe()
        Input: as5011 - fix error return code in as5011_probe()
        Input: keyboard, serio - simplify use of devm_ioremap_resource
        Input: tegra-kbc - simplify use of devm_ioremap_resource
        Input: htcpen - fix incorrect placement of __initdata
        Input: qt1070 - add power management ops
        Input: wistron_btns - add MODULE_DEVICE_TABLE
        Input: wistron_btns - mark the Medion MD96500 keymap as tested
        ...
      8b8a7df9
    • Linus Torvalds's avatar
      Revert "Input: introduce BTN/ABS bits for drums and guitars" · b04c99e3
      Linus Torvalds authored
      This reverts commits 61e00655, 73f8645d and 8e22ecb6:
        "Input: introduce BTN/ABS bits for drums and guitars"
        "HID: wiimote: add support for Guitar-Hero drums"
        "HID: wiimote: add support for Guitar-Hero guitars"
      
      The extra new ABS_xx values resulted in ABS_MAX no longer being a
      power-of-two, which broke the comparison logic.  It also caused the
      ioctl numbers to overflow into the next byte, causing problems for that.
      
      We'll try again for 3.13.
      Reported-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Acked-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
      Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
      Cc: Benjamin Tissoires <benjamin.tissoires@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b04c99e3
    • Dmitry Torokhov's avatar
      Merge branch 'next' into for-linus · 07176b98
      Dmitry Torokhov authored
      Merge first round of changes for 3.12 merge window.
      07176b98
    • Herbert Xu's avatar
      Reinstate "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework" · 68411521
      Herbert Xu authored
      This patch reinstates commits
      	67822649
      	39761214
      	0b95a7f8
      	31d93962
      	2d31e518
      
      Now that module softdeps are in the kernel we can use that to resolve
      the boot issue which cause the revert.
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      68411521
    • Herbert Xu's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux · eeca9fad
      Herbert Xu authored
      Merge upstream tree in order to reinstate crct10dif.
      eeca9fad
  5. 06 Sep, 2013 2 commits
    • Linus Torvalds's avatar
      Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 44598f98
      Linus Torvalds authored
      Pull ARM SoC board updates from Olof Johansson:
       "Board updates for 3.12.  Again, a bit of domain overlap with SoC and
        DT branches, but most of this is around legacy code and board support.
        We've found that platform maintainers have a hard time separating all
        of these out and might move towards fewer branches for next release.
      
         - Removal of a number of Marvell Kirkwood board files, since contents
           is now common and mostly configured via DT.
         - Device-tree updates for Marvell Dove, including irqchip and
           clocksource setup.
         - Defconfig updates.  Gotta go somewhere.  One new one for Renesas
           Lager.
         - New backlight drivers for backlights used on Renesas shmobile
           platforms.
         - Removal of Renesas leds driver.
         - Shuffling of some of the new Broadcom platforms to give room for
           others in the same mach directory.  More in 3.13"
      
      * tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
        mmc: sdhci-bcm-kona: Staticize sdhci_bcm_kona_card_event
        mmc: sdhci-bcm-kona: Remove unneeded version.h inclusion
        ARM: bcm: Make secure API call optional
        ARM: DT: binding fixup to align with vendor-prefixes.txt (drivers)
        ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-kona
        ARM: bcm: Rename board_bcm
        mmc: sdhci-bcm-kona: make linker-section warning go away
        ARM: tegra: defconfig updates
        ARM: dove: add initial DT file for Globalscale D2Plug
        ARM: dove: add GPIO IR receiver node to SolidRun CuBox
        ARM: dove: add common pinmux functions to DT
        ARM: dove: add cpu device tree node
        ARM: dove: update dove_defconfig with SI5351, PCI, and xHCI
        arch/arm/mach-kirkwood: Avoid using ARRAY_AND_SIZE(e) as a function argument
        ARM: kirkwood: fix DT building and update defconfig
        ARM: kirkwood: Remove all remaining trace of DNS-320/325 platform code
        ARM: configs: disable DEBUG_LL in bcm_defconfig
        ARM: bcm281xx: Board specific reboot code
        ARM bcm281xx: Turn on socket & network support.
        ARM: bcm281xx: Turn on L2 cache.
        ...
      44598f98
    • Linus Torvalds's avatar
      Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · b4b50fd7
      Linus Torvalds authored
      Pull ARM SoC platform changes from Olof Johansson:
       "This branch contains mostly additions and changes to platform
        enablement and SoC-level drivers.  Since there's sometimes a
        dependency on device-tree changes, there's also a fair amount of
        those in this branch.
      
        Pieces worth mentioning are:
      
         - Mbus driver for Marvell platforms, allowing kernel configuration
           and resource allocation of on-chip peripherals.
         - Enablement of the mbus infrastructure from Marvell PCI-e drivers.
         - Preparation of MSI support for Marvell platforms.
         - Addition of new PCI-e host controller driver for Tegra platforms
         - Some churn caused by sharing of macro names between i.MX 6Q and 6DL
           platforms in the device tree sources and header files.
         - Various suspend/PM updates for Tegra, including LP1 support.
         - Versatile Express support for MCPM, part of big little support.
         - Allwinner platform support for A20 and A31 SoCs (dual and quad
           Cortex-A7)
         - OMAP2+ support for DRA7, a new Cortex-A15-based SoC.
      
        The code that touches other architectures are patches moving MSI
        arch-specific functions over to weak symbols and removal of
        ARCH_SUPPORTS_MSI, acked by PCI maintainers"
      
      * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (266 commits)
        tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE
        PCI: tegra: replace devm_request_and_ioremap by devm_ioremap_resource
        ARM: tegra: Drop ARCH_SUPPORTS_MSI and sort list
        ARM: dts: vf610-twr: enable i2c0 device
        ARM: dts: i.MX51: Add one more I2C2 pinmux entry
        ARM: dts: i.MX51: Move pins configuration under "iomuxc" label
        ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog
        ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator
        ARM: dts: imx27-phytec-phycore-som: Enable AUDMUX
        ARM: dts: i.MX27: Disable AUDMUX in the template
        ARM: dts: wandboard: Add support for SDIO bcm4329
        ARM: i.MX5 clocks: Remove optional clock setup (CKIH1) from i.MX51 template
        ARM: dts: imx53-qsb: Make USBH1 functional
        ARM i.MX6Q: dts: Enable I2C1 with EEPROM and PMIC on Phytec phyFLEX-i.MX6 Ouad module
        ARM i.MX6Q: dts: Enable SPI NOR flash on Phytec phyFLEX-i.MX6 Ouad module
        ARM: dts: imx6qdl-sabresd: Add touchscreen support
        ARM: imx: add ocram clock for imx53
        ARM: dts: imx: ocram size is different between imx6q and imx6dl
        ARM: dts: imx27-phytec-phycore-som: Fix regulator settings
        ARM: dts: i.MX27: Remove clock name from CPU node
        ...
      b4b50fd7