1. 14 8月, 2013 5 次提交
  2. 09 8月, 2013 10 次提交
  3. 01 8月, 2013 10 次提交
  4. 10 7月, 2013 1 次提交
  5. 06 7月, 2013 3 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · b2c31107
      Linus Torvalds 提交于
      Pull crypto update from Herbert Xu:
       - Do not idle omap device between crypto operations in one session.
       - Added sha224/sha384 shims for SSSE3.
       - More optimisations for camellia-aesni-avx2.
       - Removed defunct blowfish/twofish AVX2 implementations.
       - Added unaligned buffer self-tests.
       - Added PCLMULQDQ optimisation for CRCT10DIF.
       - Added support for Freescale's DCP co-processor
       - Misc fixes.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (44 commits)
        crypto: testmgr - test hash implementations with unaligned buffers
        crypto: testmgr - test AEADs with unaligned buffers
        crypto: testmgr - test skciphers with unaligned buffers
        crypto: testmgr - check that entries in alg_test_descs are in correct order
        Revert "crypto: twofish - add AVX2/x86_64 assembler implementation of twofish cipher"
        Revert "crypto: blowfish - add AVX2/x86_64 implementation of blowfish cipher"
        crypto: camellia-aesni-avx2 - tune assembly code for more performance
        hwrng: bcm2835 - fix MODULE_LICENSE tag
        hwrng: nomadik - use clk_prepare_enable()
        crypto: picoxcell - replace strict_strtoul() with kstrtoul()
        crypto: dcp - Staticize local symbols
        crypto: dcp - Use NULL instead of 0
        crypto: dcp - Use devm_* APIs
        crypto: dcp - Remove redundant platform_set_drvdata()
        hwrng: use platform_{get,set}_drvdata()
        crypto: omap-aes - Don't idle/start AES device between Encrypt operations
        crypto: crct10dif - Use PTR_RET
        crypto: ux500 - Cocci spatch "resource_size.spatch"
        crypto: sha256_ssse3 - add sha224 support
        crypto: sha512_ssse3 - add sha384 support
        ...
      b2c31107
    • L
      Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi · 45175476
      Linus Torvalds 提交于
      Pull ubi fixes from Artem Bityutskiy:
       "A couple of fixes and clean-ups, allow for assigning user-defined UBI
        device numbers when attaching MTD devices by using the "mtd=" module
        parameter"
      
      * tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi:
        UBI: support ubi_num on mtd.ubi command line
        UBI: fastmap break out of used PEB search
        UBI: document UBI_IOCVOLUP better in user header
        UBI: do not abort init when ubi.mtd devices cannot be found
        UBI: drop redundant "UBI error" string
      45175476
    • L
      Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs · 2dd1cb5a
      Linus Torvalds 提交于
      Pull ubifs fix from Artem Bityutskiy:
       "Only a single patch which fixes a message"
      
      * tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs:
        UBIFS: correct mount message
      2dd1cb5a
  6. 05 7月, 2013 11 次提交
    • L
      Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux · 74b9272b
      Linus Torvalds 提交于
      Pull device tree updates from Grant Likely:
       "This branch contains the following changes:
         - Removal of CONFIG_OF_DEVICE, it is always enabled by CONFIG_OF
         - Remove #ifdef from linux/of_platform.h to increase compiler syntax
           coverage
         - Bug fix for address decoding on Bimini and js2x powerpc platforms.
         - miscellaneous binding changes
      
        One note on the above.  The binding changes going in from all kinds of
        different trees has gotten rather out of hand.  I picked up some
        during this cycle, but even going though my tree isn't a great fit.
      
        Ian Campbell has prototyped splitting the bindings and .dtb files into
        a separate repository.  The plan is to migrate to using that sometime
        in the next few kernel releases which should get rid of a lot of the
        churn on binding docs and .dts files"
      
      * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
        of: Fix address decoding on Bimini and js2x machines
        of: remove CONFIG_OF_DEVICE
        usb: chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE
        of: remove of_platform_driver
        ibmebus: convert of_platform_driver to platform_driver
        driver core: move to_platform_driver to platform_device.h
        mfd: DT bindings for the palmas family MFD
        ARM: dts: omap3-devkit8000: fix NAND memory binding
        of/base: fix typos
        of: remove #ifdef from linux/of_platform.h
      74b9272b
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · f5b63ac0
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
       "First round of updates for the input subsystem.
      
        You will get a new touchsreen driver for Cypress 4th generation
        devices, a driver for a special controller implementing PS/2 protocol
        in OLPC devices, and a driver for power key for SiRFprimaII PWRC.
      
        HID and bcm5497 now support for the 2013 MacBook Air.
      
        EVIOCGKEY and the rest of evdev ioctls now flush events of matching
        type from the client's event queue so that clients can be sure any
        events received after issuing EVIOCG* ioctl are new events.
      
        And a host of cleanups and improvements in other drivers"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (87 commits)
        Input: cyttsp4 - kfree xfer_buf on error path in probe()
        Input: tps6507x-ts - select INPUT_POLLDEV
        Input: bcm5974 - add support for the 2013 MacBook Air
        HID: apple: Add support for the 2013 Macbook Air
        Input: cyttsp4 - leak on error path in probe()
        Input: cyttsp4 - silence NULL dereference warning
        Input: cyttsp4 - silence shift wrap warning
        Input: tps6507x-ts - convert to polled input device infrastructure
        ARM: davinci: da850-evm: remove vref from touchscreen platform data
        Input: cyttsp4 - SPI driver for Cypress TMA4XX touchscreen devices
        Input: cyttsp4 - I2C driver for Cypress TMA4XX touchscreen devices
        Input: cyttsp4 - add core driver for Cypress TMA4XX touchscreen devices
        Input: cyttsp - I2C driver split into two modules
        Input: add OLPC AP-SP driver
        Input: nspire-keypad - remove redundant dev_err call in nspire_keypad_probe()
        Input: tps6507x-ts - remove vref from platform data
        Input: tps6507x-ts - use bool for booleans
        Input: tps6507x-ts - remove bogus unreachable code
        Input: samsung-keypad - let device core setup the default pin configuration
        Input: wacom_i2c - implement hovering capability
        ...
      f5b63ac0
    • F
      Input: cyttsp4 - kfree xfer_buf on error path in probe() · 57961e3b
      Ferruh Yigit 提交于
      If probe() fails after cd->xfer_buf allocated, it will not freed.
      Added kfree(cd->xfer_buf) with and error label.
      Signed-off-by: NFerruh Yigit <fery@cypress.com>
      Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
      57961e3b
    • L
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 98f486f1
      Linus Torvalds 提交于
      Pull i2c updates from Wolfram Sang:
       - new drivers: Kontron PLD, Wondermedia VT
       - mv64xxx driver gained sun4i support and a bigger cleanup
       - duplicate driver 'intel-mid' removed
       - added generic device tree binding for sda holding time (and
         designware driver already uses it)
       - we tried to allow driver probing with only device tree and no i2c
         ids, but I had to revert it because of side effects.  Needs some
         rethinking.
       - driver bugfixes, cleanups...
      
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (34 commits)
        i2c-designware: use div_u64 to fix link
        i2c: Kontron PLD i2c bus driver
        i2c: iop3xxx: fix build failure after waitqueue changes
        i2c-designware: make SDA hold time configurable
        i2c: mv64xxx: Set bus frequency to 100kHz if clock-frequency is not provided
        i2c: imx: allow autoloading on dt ids
        i2c: mv64xxx: Fix transfer error code
        i2c: i801: SMBus patch for Intel Coleto Creek DeviceIDs
        i2c: omap: correct usage of the interrupt enable register
        i2c-pxa: prepare clock before use
        Revert "i2c: core: make it possible to match a pure device tree driver"
        i2c: nomadik: allocate adapter number dynamically
        i2c: nomadik: support elder Nomadiks
        i2c: mv64xxx: Add Allwinner sun4i compatible
        i2c: mv64xxx: make the registers offset configurable
        i2c: mv64xxx: Add macros to access parts of registers
        i2c: vt8500: Add support for I2C bus on Wondermedia SoCs
        i2c: designware: fix race between subsequent xfers
        i2c: bfin-twi: Read and write the FIFO in loop
        i2c: core: make it possible to match a pure device tree driver
        ...
      98f486f1
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 84cbd722
      Linus Torvalds 提交于
      Pull first round of SCSI updates from James Bottomley:
       "The patch set is mostly driver updates (usf, zfcp, lpfc, mpt2sas,
        megaraid_sas, bfa, ipr) and a few bug fixes.  Also of note is that the
        Buslogic driver has been rewritten to a better coding style and 64 bit
        support added.  We also removed the libsas limitation on 16 bytes for
        the command size (currently no drivers make use of this)"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (101 commits)
        [SCSI] megaraid: minor cut and paste error fixed.
        [SCSI] ufshcd-pltfrm: remove unnecessary dma_set_coherent_mask() call
        [SCSI] ufs: fix register address in UIC error interrupt handling
        [SCSI] ufshcd-pltfrm: add missing empty slot in ufs_of_match[]
        [SCSI] ufs: use devres functions for ufshcd
        [SCSI] ufs: Fix the response UPIU length setting
        [SCSI] ufs: rework link start-up process
        [SCSI] ufs: remove version check before IS reg clear
        [SCSI] ufs: amend interrupt configuration
        [SCSI] ufs: wrap the i/o access operations
        [SCSI] storvsc: Update the storage protocol to win8 level
        [SCSI] storvsc: Increase the value of scsi timeout for storvsc devices
        [SCSI] MAINTAINERS: Add myself as the maintainer for BusLogic SCSI driver
        [SCSI] BusLogic: Port driver to 64-bit.
        [SCSI] BusLogic: Fix style issues
        [SCSI] libiscsi: Added new boot entries in the session sysfs
        [SCSI] aacraid: Fix for arrays are going offline in the system. System hangs
        [SCSI] ipr: IOA Status Code(IOASC) update
        [SCSI] sd: Update WRITE SAME heuristics
        [SCSI] fnic: potential dead lock in fnic_is_abts_pending()
        ...
      84cbd722
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 80cc38b1
      Linus Torvalds 提交于
      Pull trivial tree updates from Jiri Kosina:
       "The usual stuff from trivial tree"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
        treewide: relase -> release
        Documentation/cgroups/memory.txt: fix stat file documentation
        sysctl/net.txt: delete reference to obsolete 2.4.x kernel
        spinlock_api_smp.h: fix preprocessor comments
        treewide: Fix typo in printk
        doc: device tree: clarify stuff in usage-model.txt.
        open firmware: "/aliasas" -> "/aliases"
        md: bcache: Fixed a typo with the word 'arithmetic'
        irq/generic-chip: fix a few kernel-doc entries
        frv: Convert use of typedef ctl_table to struct ctl_table
        sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
        doc: clk: Fix incorrect wording
        Documentation/arm/IXP4xx fix a typo
        Documentation/networking/ieee802154 fix a typo
        Documentation/DocBook/media/v4l fix a typo
        Documentation/video4linux/si476x.txt fix a typo
        Documentation/virtual/kvm/api.txt fix a typo
        Documentation/early-userspace/README fix a typo
        Documentation/video4linux/soc-camera.txt fix a typo
        lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment
        ...
      80cc38b1
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 3366dd9f
      Linus Torvalds 提交于
      Pull HID updates from Jiri Kosina:
       - HID battery handling cleanup by David Herrmann
       - ELO 4000/4500 driver, which has been finally ported to be proper HID
         driver by Jiri Slaby
       - ps3remote driver functionality is now provided by generic sony
         driver, by Jiri Kosina
       - PS2/3 Buzz controllers support, by Colin Leitner
       - rework of wiimote driver including full extensions hotpluggin
         support, sub-device modularization and speaker support by David
         Herrmann
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (55 commits)
        HID: wacom: Intuos4 battery charging changes
        HID: i2c-hid: support sending HID output reports using the output register
        HID: kye: Add report fixup for Genius Gila Gaming mouse
        HID: wiimote: support Nintendo Wii U Pro Controller
        Input: make gamepad API keycodes more clear
        input: document gamepad API and add extra keycodes
        HID: explain out-of-range check better
        HID: fix false positive out of range values
        HID: wiimote: fix coccinelle warnings
        HID: roccat: check cdev_add return value
        HID: fold ps3remote driver into generic Sony driver
        HID: hyperv: convert alloc+memcpy to memdup
        HID: core: fix reporting of raw events
        HID: wiimote: discard invalid EXT data reports
        HID: wiimote: fix classic controller parsing
        HID: wiimote: init EXT/MP during device detection
        HID: wiimote: fix DRM debug-attr to correctly parse input
        HID: wiimote: add MP quirks
        HID: wiimote: remove old static extension support
        HID: wiimote: add "bboard_calib" attribute
        ...
      3366dd9f
    • L
      Merge tag 'md-3.11' of git://neil.brown.name/md · 697a067f
      Linus Torvalds 提交于
      Pull md updates from NeilBrown:
       "Mostly fixes, with a few minor features (eg 'last_sync_action' sysfs
        file)
      
        A couple marked for -stable including one recent bug which causes a
        RAID10 reshape to complete without moving any data :-(
      
        A couple more bugfixes (at least) to come, but haven't confirmed the
        right solution yet."
      
      * tag 'md-3.11' of git://neil.brown.name/md:
        md/raid10: fix bug which causes all RAID10 reshapes to move no data.
        md/raid5: allow 5-device RAID6 to be reshaped to 4-device.
        md/raid10: fix two bugs affecting RAID10 reshape.
        md: remove doubled description for sync_max, merging it within sync_min/sync_max
        MD: Remember the last sync operation that was performed
        md: fix buglet in RAID5 -> RAID0 conversion.
        md/raid10: check In_sync flag in 'enough()'.
        md/raid10: locking changes for 'enough()'.
        md: replace strict_strto*() with kstrto*()
        md: Wait for md_check_recovery before attempting device removal.
        dm-raid: silence compiler warning on rebuilds_per_group.
        DM RAID: Fix raid_resume not reviving failed devices in all cases
        DM RAID: Break-up untidy function
        DM RAID: Add ability to restore transiently failed devices on resume
      697a067f
    • L
      Merge branch 'kconfig-diet' from Dave Hansen · e61aca51
      Linus Torvalds 提交于
      Merge Kconfig menu diet patches from Dave Hansen:
       "I think the "Kernel Hacking" menu has gotten a bit out of hand.  It is
        over 120 lines long on my system with everything enabled and options
        are scattered around it haphazardly.
      
              http://sr71.net/~dave/linux/kconfig-horror.png
      
        Let's try to introduce some sanity.  This set takes that 120 lines
        down to 55 and makes it vastly easier to find some things.  It's a
        start.
      
        This set stands on its own, but there is plenty of room for follow-up
        patches.  The arch-specific debug options still end up getting stuck
        in the top-level "kernel hacking" menu.  OPTIMIZE_INLINING, for
        instance, could obviously go in to the "compiler options" menu, but
        the fact that it is defined in arch/ in a separate Kconfig file keeps
        it on its own for the moment.
      
        The Signed-off-by's in here look funky.  I changed employers while
        working on this set, so I have signoffs from both email addresses"
      
      * emailed patches from Dave Hansen <dave@sr71.net>:
        hang and lockup detection menu
        kconfig: consolidate printk options
        group locking debugging options
        consolidate compilation option configs
        consolidate runtime testing configs
        order memory debugging Kconfig options
        consolidate per-arch stack overflow debugging options
      e61aca51
    • D
      hang and lockup detection menu · 92aef8fb
      Dave Hansen 提交于
      The hard/softlockup and hung-task entries take up 6 lines
      of screen real-estate when enabled.  I bet folks don't
      mess with these _that_ often, so move them in a group
      down a level.
      Signed-off-by: NDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      92aef8fb
    • D
      kconfig: consolidate printk options · 604ff0dc
      Dave Hansen 提交于
      Same deal, take the printk-related things and hide them in a menu.
      This takes another 4 items out of the top-level menu.
      Signed-off-by: NDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      604ff0dc