Permalink
Commits on Aug 5, 2013
  1. Hibernate: introduced SNAPSHOT_SIG_HASH config for select hash algorithm

    This patch introduced SNAPSHOT_SIG_HASH config for user to select which
    hash algorithm will be used during signature generation of snapshot.
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Aug 5, 2013
Commits on Aug 1, 2013
  1. Hibernate: show the verification time for monitor performance

    Show the verification time for monitor the performance of SHA256 and RSA
    verification.
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Jul 30, 2013
  2. Hibernate: adapt to UEFI secure boot with signature check

    In current solution, the snapshot signature check used the RSA key-pair
    that are generated by bootloader(e.g. shim) and pass the key-pair to
    kernel through EFI variables. I choice to binding the snapshot
    signature check mechanism with UEFI secure boot for provide stronger
    protection of hibernate. Current behavior is following:
    
     + UEFI Secure Boot ON, Kernel found key-pair from shim:
       Will do the S4 signature check.
    
     + UEFI Secure Boot ON, Kernel didn't find key-pair from shim:
       Will lock down S4 function.
    
     + UEFI Secure Boot OFF
       Will NOT do the S4 signature check.
       Ignore any keys from bootloader.
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Jul 30, 2013
  3. Hibernate: introduced SNAPSHOT_VERIFICATION config to switch signatur…

    …e check
    
    This patch introduced SNAPSHOT_VERIFICATION kernel config for switching
    signature check of hibernate snapshot image.
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Jul 29, 2013
  4. Hibernate: fix the race condition of remove S4 sign key

    This patch fix the race condition of remove S4 sign key. It moved the
    code of reload sign key  to software_resume() in hibernate.c after we
    confirmed the snapshot image doesn't in swap partition. We ignore the
    errors, -ENOENT, -ENODEV and -NENXIO to ignore the checking result before
    swap partition available. It avoid the S4 sign key removed before we
    load it after S4 resume success.
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Jul 27, 2013
  5. Hibernate: Avoid S4 sign key data included in snapshot image

    This patch add swsusp_page_is_sign_key() method to hibernate_key.c and
    check the page is S4 sign key data when collect saveable page in
    snapshot.c to avoid sign key data included in snapshot image.
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Jul 25, 2013
  6. Hibernate: generate and verify signature of snapshot

    This patch add the code for generate/verify signature of snapshot, it
    put the signature to snapshot header. This approach can support both
    on userspace hibernate and in-kernel hibernate.
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Aug 1, 2013
  7. Hibernate: introduced RSA key-pair to verify signature of snapshot

    Introduced a hibernate_key.c file to query the key pair from EFI variables
    and maintain key pair for check signature of S4 snapshot image. We
    loaded the private key when snapshot image stored success.
    
    This patch introduced 2 EFI variables for store the key to sign S4 image and
    verify signature when S4 wake up. The names and GUID are:
      S4SignKey-fe141863-c070-478e-b8a3-878a5dc9ef21
      S4WakeKey-fe141863-c070-478e-b8a3-878a5dc9ef21
    
    S4SignKey is used by EFI bootloader to pass the RSA private key that packaged
    by PKCS#8 format, kernel will read and parser it when system boot and reload
    it when S4 resume. EFI bootloader need gnerate a new private key when every
    time system boot.
    
    S4WakeKey is used to pass the RSA public key that packaged by X.509
    certificate, kernel will read and parser it for check the signature of
    S4 snapshot image when S4 resume.
    
    The follow-up patch will remove S4SignKey and S4WakeKey after load them
    to kernel for avoid anyone can access it through efivarfs.
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Aug 1, 2013
  8. efi: Enable secure boot lockdown automatically when enabled in firmware

    The firmware has a set of flags that indicate whether secure boot is enabled
    and enforcing. Use them to indicate whether the kernel should lock itself
    down.  We also indicate the machine is in secure boot mode by adding the
    EFI_SECURE_BOOT bit for use with efi_enabled.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Josh Boyer <jwboyer@redhat.com>
    Acked-by: Lee, Chun-Yi <jlee@suse.com>
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Matthew Garrett committed with Lee, Chun-Yi Sep 20, 2012
  9. Secure boot: Add a dummy kernel parameter that will switch on Secure …

    …Boot mode
    
    This forcibly drops CAP_COMPROMISE_KERNEL from both cap_permitted and cap_bset
    in the init_cred struct, which everything else inherits from.  This works on
    any machine and can be used to develop even if the box doesn't have UEFI.
    
    Signed-off-by: Josh Boyer <jwboyer@redhat.com>
    Acked-by: Lee, Chun-Yi <jlee@suse.com>
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Josh Boyer committed with Lee, Chun-Yi Sep 20, 2012
  10. Secure boot: Add new capability

    Secure boot adds certain policy requirements, including that root must not
    be able to do anything that could cause the kernel to execute arbitrary code.
    The simplest way to handle this would seem to be to add a new capability
    and gate various functionality on that. We'll then strip it from the initial
    capability set if required.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Acked-by: Lee, Chun-Yi <jlee@suse.com>
    Matthew Garrett committed with Lee, Chun-Yi Sep 20, 2012
  11. asymmetric keys: explicitly add the leading zero byte to encoded message

    Per PKCS1 spec, the EMSA-PKCS1-v1_5 encoded message is leading by 0x00 0x01 in
    its first 2 bytes. The leading zero byte is suppressed by MPI so we pass a
    pointer to the _preceding_ byte to RSA_verify() in original code, but it has
    risk for the byte is not zero because it's not in EM buffer's scope, neither
    RSA_verify() nor mpi_get_buffer() didn't take care the leading byte.
    
    To avoid the risk, that's better we explicitly add the leading zero byte to EM
    for pass to RSA_verify(). This patch allocate a _EM buffer to capture the
    result from RSA_I2OSP(), then set the first byte to zero in EM and copy the
    remaining bytes from _EM.
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Jun 16, 2013
  12. asymmetric keys: support parsing PKCS #8 private key information

    Add ASN.1 files and parser to support parsing PKCS #8 private key
    information. It's better then direct parsing pure private key because
    PKCS #8 has a privateKeyAlgorithm to indicate the algorithm of private
    key, e.g. RSA from PKCS #1
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Jul 9, 2013
  13. asymmetric keys: implement RSASP1

    Implement RSASP1 and fill-in the following data to public key signature
    structure: signature length (pkcs->k), signature octet
    strings (pks->S) and MPI of signature (pks->rsa.s).
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Jun 20, 2013
  14. asymmetric keys: implement OS2IP in rsa

    Implement Octet String to Integer conversion [RFC3447 sec 4.2] in rsa.c. It's
    the second step of signature generation operation.
    
    This patch is temporary set non-RSASP1 message to pks->S for debugging.
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Jun 16, 2013
  15. asymmetric keys: separate the length checking of octet string from RS…

    …A_I2OSP
    
    Due to RSA_I2OSP is not only used by signature verification path but also used
    in signature generation path. So, separate the length checking of octet string
    because it's not for generate 0x00 0x01 leading string when used in signature
    generation.
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Jun 20, 2013
  16. asymmetric keys: implement EMSA_PKCS1-v1_5-ENCODE in rsa

    Implement EMSA_PKCS1-v1_5-ENCODE [RFC3447 sec 9.2] in rsa.c. It's the
    first step of signature generation operation (RSASSA-PKCS1-v1_5-SIGN).
    
    This patch is temporary set emLen to pks->k, and temporary set EM to
    pks->S for debugging. We will replace the above values to real signature
    after implement RSASP1.
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Jun 14, 2013
  17. asymmetric keys: add interface and skeleton for implement signature g…

    …eneration
    
    Add generate_signature interface on signature.c, asymmetric-subtype and
    rsa.c for prepare to implement signature generation.
    
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Lee, Chun-Yi committed Aug 1, 2013
Commits on Jul 30, 2013
  1. Merge tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/ieee1394/linux1394
    
    Pull firewire regression fix from Stefan Richter:
     "This fixes corrupted video capture, seen with IIDC/DCAM video and
      certain buffer settings.  (Regression since v3.4 inclusive.)"
    
    * tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
      firewire: fix libdc1394/FlyCap2 iso event regression
    torvalds committed Jul 30, 2013
  2. Merge tag 'arc-v3.11-fixes' of git://git.kernel.org/pub/scm/linux/ker…

    …nel/git/vgupta/arc
    
    Pull ARC fix from Vineet Gupta:
     "SMP build breakage fix"
    
    * tag 'arc-v3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
      ARC: SMP build breakage
    torvalds committed Jul 30, 2013
Commits on Jul 29, 2013
  1. Linux 3.11-rc3

    torvalds committed Jul 29, 2013
  2. Merge tag 'pinctrl-for-v3.11-2' of git://git.kernel.org/pub/scm/linux…

    …/kernel/git/linusw/linux-pinctrl
    
    Pull pin control fixes from Linus Walleij:
     - Driver fixes for AM33xx, SIRF and PFC pin controllers
     - Fix a compile warning from the pinctrl single-register driver
     - Fix a little nasty memory leak
    
    * tag 'pinctrl-for-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
      pinctrl: fix a memleak when freeing maps
      pinctrl: pinctrl-single: fix compile warning when no CONFIG_PM
      pinctrl: sh-pfc: fix SDHI0 VccQ regulator on sh73a0 with DT
      arm/dts: sirf: fix the pingroup name mismatch between drivers and dts
      pinctrl: sirf: add usp0_uart_nostreamctrl pin group for usp-uart without flowctrl
      pinctrl: sirf: fix the pin number and mux bit for usp0
      pinctrl: am33xx dt binding: correct include path
    torvalds committed Jul 29, 2013
  3. Merge tag 'trace-fixes-3.11-rc2' of git://git.kernel.org/pub/scm/linu…

    …x/kernel/git/rostedt/linux-trace
    
    Pull tracing fixes from Steven Rostedt:
     "Oleg is working on fixing a very tight race between opening a event
      file and deleting that event at the same time (both must be done as
      root).
    
      I also found a bug while testing Oleg's patches which has to do with a
      race with kprobes using the function tracer.
    
      There's also a deadlock fix that was introduced with the previous
      fixes"
    
    * tag 'trace-fixes-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
      tracing: Remove locking trace_types_lock from tracing_reset_all_online_cpus()
      ftrace: Add check for NULL regs if ops has SAVE_REGS set
      tracing: Kill trace_cpu struct/members
      tracing: Change tracing_fops/snapshot_fops to rely on tracing_get_cpu()
      tracing: Change tracing_entries_fops to rely on tracing_get_cpu()
      tracing: Change tracing_stats_fops to rely on tracing_get_cpu()
      tracing: Change tracing_buffers_fops to rely on tracing_get_cpu()
      tracing: Change tracing_pipe_fops() to rely on tracing_get_cpu()
      tracing: Introduce trace_create_cpu_file() and tracing_get_cpu()
    torvalds committed Jul 29, 2013
  4. Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …it/jejb/scsi
    
    Pull SCSI fixes from James Bottomley:
     "This is five bug fixes, two of which fix long standing problems
      causing crashes (sd and mvsas).  The remaining three are hung (isci
      race) or lost (qla2xxx, isci) devices"
    
    * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
      [SCSI] isci: fix breakage caused by >16byte CDB patch
      [SCSI] mvsas: Fix kernel panic on tile due to unaligned data access
      [SCSI] sd: fix crash when UA received on DIF enabled device
      [SCSI] qla2xxx: Properly set the tagging for commands.
      [SCSI] isci: Fix a race condition in the SSP task management path
    torvalds committed Jul 29, 2013
Commits on Jul 27, 2013
  1. firewire: fix libdc1394/FlyCap2 iso event regression

    Commit 18d6271 (firewire: prevent dropping of completed iso packet
    header data) was intended to be an obvious bug fix, but libdc1394 and
    FlyCap2 depend on the old behaviour by ignoring all returned information
    and thus not noticing that not all packets have been received yet.  The
    result was that the video frame buffers would be saved before they
    contained the correct data.
    
    Reintroduce the old behaviour for old clients.
    
    Tested-by: Stepan Salenikovich <stepan.salenikovich@gmail.com>
    Tested-by: Josep Bosch <jep250@gmail.com>
    Cc: <stable@vger.kernel.org> # 3.4+
    Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    cladisch committed with Stefan Richter Jul 22, 2013
Commits on Jul 26, 2013
  1. ARC: SMP build breakage

    Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
    vineetgarc committed Jul 26, 2013
  2. Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    Pull drm fixes from Dave Airlie:
     "This is just a regular fixes pull apart from the qxl one, it has
      radeon and intel bits in it,
    
      The intel fixes are for a regression with the RC6 fix and a 3.10 hdmi
      regression, whereas radeon is more DPM fixes, a few lockup fixes and
      some rn50/r100 DAC fixes"
    
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm/radeon/dpm: fix r600_enable_sclk_control()
      drm/radeon/dpm: implement force performance levels for rv6xx
      drm/radeon/dpm: fix displaygap programming on rv6xx
      drm/radeon/dpm: fix a typo in the rv6xx mclk setup
      drm/i915: initialize gt_lock early with other spin locks
      drm/i915: fix hdmi portclock limits
      drm/radeon: fix combios tables on older cards
      drm/radeon: improve dac adjust heuristics for legacy pdac
      drm/radeon: Another card with wrong primary dac adj
      drm/radeon: fix endian issues with DP handling (v3)
      drm/radeon/vm: only align the pt base to 32k
      drm/radeon: wait for 3D idle before using CP DMA
    torvalds committed Jul 26, 2013
  3. Merge branch 'qxl-fixes' of git://people.freedesktop.org/~airlied/linux

    Pull qxl drm fixes from Dave Airlie:
     "Okay as I warned, the qxl driver was running a bit free and loose with
      its ttm object reservations and the new lockdep enabled reservation
      tracking shone a bright light into it, it also with the new
      reservations mutexes hits a possible deadlock during boot.
    
      The first patch is a real fix to render the console correctly as the
      driver used to just drop irq renderering as too hard, this also fixes
      a sleeping while atomic warning.
    
      The other two patches are the big ugly ones that redo how the driver
      allocates objects and reserves them and makes things all work
      properly, I've tested this in a VM, and compared to the current code
      which hits a lockdep warning and the sleep while atomic warning before
      failing.
    
      So sorry this is coming in late, I should have tested qxl before
      merging the mutex code, but I'd rather just fix qxl with this than
      revert the reservations code at this point"
    
    * 'qxl-fixes' of git://people.freedesktop.org/~airlied/linux:
      qxl: convert qxl driver to proper use for reservations
      qxl: allow creation of pre-pinned objects and use for releases.
      drm/qxl: add delayed fb operations
    torvalds committed Jul 26, 2013
  4. Merge tag 'pm+acpi-3.11-rc3' of git://git.kernel.org/pub/scm/linux/ke…

    …rnel/git/rafael/linux-pm
    
    Pull ACPI and power management fixes from Rafael Wysocki:
     "These are just two fixes, a revert of the would-be backlight fix that
      didn't work and an intel_pstate fix for two problems related to
      maximum P-state selection.
    
      Specifics:
    
       - Revert of the ACPI video commit that I hoped would help fix
         backlight problems related to Windows 8 compatibility on some
         systems.  Unfortunately, it turned out to cause problems to happen
         too.
    
       - Fix for two problems in intel_pstate, a possible failure to respond
         to a load change on a quiet system and a possible failure to select
         the highest available P-state on some systems.  From Dirk
         Brandewie"
    
    * tag 'pm+acpi-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
      Revert "ACPI / video / i915: No ACPI backlight if firmware expects Windows 8"
      cpufreq / intel_pstate: Change to scale off of max P-state
    torvalds committed Jul 26, 2013
  5. Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/cmarinas/linux-aarch64
    
    Pull arm64 fixes from Catalin Marinas:
     - Stack size increased to 16K (similar to other 64-bit architectures)
     - Additional cache flushing for secondary CPUs boot mode
    
    * tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
      arm64: Change kernel stack size to 16K
      arm64: Fix definition of arm_pm_restart to match the declaration
      arm64: virt: ensure visibility of __boot_cpu_mode
    torvalds committed Jul 26, 2013
  6. Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    …nel/git/arm/arm-soc
    
    Pull ARM SoC fixes from Olof Johansson:
     "This is a largeish batch of fixes, mostly because I missed -rc2 due to
      travel/vacation.  So in number these are a bit more than ideal unless
      you amortize them over two -rcs.
    
      Quick breakdown:
       - Defconfig updates
         - Making multi_v7_defconfig useful on more hardware to encourage
           single-image usage
         - Davinci and nomadik updates due to new code merged this merge
           window
       - Fixes for UART on Samsung platforms, both PM and clock-related
       - A handful of warning fixes from defconfig builds, including for
         max8925 backlight and pxamci (both with appropriate acks)
       - Exynos5440 fixes for LPAE configuration, PM
       - ...plus a bunch of other smaller changes all over the place
    
      I expect to switch to regressions-or-severe-bugs-only fixes from here
      on out"
    
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits)
      mfd: max8925: fix dt code for backlight
      ARM: omap5: Only select errata 798181 if SMP
      ARM: EXYNOS: Update CONFIG_ARCH_NR_GPIO for Exynos
      ARM: EXYNOS: Fix low level debug support
      ARM: SAMSUNG: Save/restore only selected uart's registers
      ARM: SAMSUNG: Add SAMSUNG_PM config option to select pm
      ARM: S3C24XX: Add missing clkdev entries for s3c2440 UART
      ARM: multi_v7_defconfig: Select USB chipidea driver
      ARM: pxa: propagate errors from regulator_enable() to pxamci
      ARM: zynq: fix compilation warning
      ARM: keystone: fix compilation warning
      ARM: highbank: Only touch common coherency control register fields
      ARM: footbridge: fix overlapping PCI mappings
      dmaengine: shdma: fix a build failure on platforms with no DMA support
      ARM: STi: Set correct ARM ERRATAs.
      ARM: dts: STi: Fix pinconf setup for STiH416 serial2
      ARM: nomadik: configure for NO_HZ and HRTIMERS
      ARM: nomadik: update defconfig base
      ARM: nomadik: Update MMC defconfigs
      ARM: davinci: defconfig: enable EDMA driver
      ...
    torvalds committed Jul 26, 2013
  7. Merge tag 'usb-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/gregkh/usb
    
    Pull USB fixes from Greg KH:
     "Here are a number of USB fixes for 3.11-rc3.
    
      Lots of little things, nothing major.  A number of new device ids,
      build fixes for DMA, and a bunch of other minor things.  All of these
      have been in the linux-next tree"
    
    * tag 'usb-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (40 commits)
      usb: Clear both buffers when clearing a control transfer TT buffer.
      usb/gadget: free opts struct on error recovery
      USB: mos7840: fix memory leak in open
      usb: serial: option.c: remove ONDA MT825UP product ID fromdriver
      usb: serial: option: add Olivetti Olicard 200
      usb: serial: option: blacklist ONDA MT689DC QMI interface
      xhci: fix null pointer dereference on ring_doorbell_for_active_rings
      usb: host: xhci: Enable XHCI_SPURIOUS_SUCCESS for all controllers with xhci 1.0
      usb: fix build warning in pci-quirks.h when CONFIG_PCI is not enabled
      usb: xhci: Mark two functions __maybe_unused
      xhci: Avoid NULL pointer deref when host dies.
      usb: serial: option: Add ONYX 3G device support
      USB: ti_usb_3410_5052: fix dynamic-id matching
      usb: option: add TP-LINK MA260
      USB: option: add D-Link DWM-152/C1 and DWM-156/C1
      USB: EHCI: Fix resume signalling on remote wakeup
      USB: cp210x: add MMB and PI ZigBee USB Device Support
      usb: cp210x support SEL C662 Vendor/Device
      USB: option: append Petatel NP10T device to GSM modems list
      USB: misc: Add Manhattan Hi-Speed USB DVI Converter to sisusbvga
      ...
    torvalds committed Jul 26, 2013
  8. Merge tag 'tty-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/gregkh/tty
    
    Pull tty/serial fixes from Greg KH:
     "Here are 3 fixes for TTY and serial issues that have been reported.
      Nothing huge, but nice to get fixed"
    
    * tag 'tty-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
      serial: tegra: correct help message in Kconfig from 'ttyHS' to 'ttyTHS'
      tty/8250_early: Don't truncate last character of options
      TTY: snyclinkmp: calculating wrong addresses
    torvalds committed Jul 26, 2013
  9. Merge tag 'staging-3.11-rc3' of git://git.kernel.org/pub/scm/linux/ke…

    …rnel/git/gregkh/staging
    
    Pull staging fixes from Greg KH:
     "Here are some tiny drivers/staging/ fixes for 3.11-rc3
    
      A number of bugfixes, all pretty tiny, but resolve issues that have
      been reported (the kstrtos32 change fixes a data corruption problem
      that Dan found).  And a MAINTAINERS file update for the comedi
      drivers"
    
    * tag 'staging-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
      MAINTAINERS: Update the list of maintainers for staging/comedi driver.
      staging: tidspbridge: replace strict_strtol() with kstrtos32()
      staging: android: logger: Correct write offset reset on error
      staging: zram: protect zram_reset_device() call
      staging: gdm72xx: potential use after free in send_qos_list()
      staging: drm/imx: drop "select OF_VIDEOMODE"
      staging: frontier: use after free in disconnect()
      staging: comedi: fix a race between do_cmd_ioctl() and read/write
      staging: comedi: COMEDI_CANCEL ioctl should wake up read/write
    torvalds committed Jul 26, 2013
  10. Merge tag 'char-misc-3.11-rc3' of git://git.kernel.org/pub/scm/linux/…

    …kernel/git/gregkh/char-misc
    
    Pull char/misc patches from Greg KH:
     "Here are some char/misc patches for 3.11-rc3.  It's pretty much just:
       - mei fixes
       - hyperv fixes
       - new ja_JP translation update
      all tiny stuff, but fixes for issues people have reported."
    
    * tag 'char-misc-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
      HOWTO ja_JP sync
      mei: me: fix waiting for hw ready
      mei: don't have to clean the state on power up
      mei: me: fix reset state machine
      mei: hbm: fix typo in error message
      Tools: hv: KVP: Fix a bug in IPV6 subnet enumeration
      Drivers: hv: balloon: Do not post pressure status if interrupted
      Drivers: hv: balloon: Fix a bug in the hot-add code
      Drivers: hv: vmbus: incorrect device name is printed when child device is unregistered
    torvalds committed Jul 26, 2013