Skip to content
Tag: sunxi-drivers-…
Commits on Dec 20, 2013
  1. ARM: sun4i/sun7i: RTC driver

    carlocaione authored and mripard committed Nov 16, 2013
    This patch introduces the driver for the RTC in the Allwinner A10 and
    A20 SoCs.
    Signed-off-by: Carlo Caione <>
    Acked-by: Alessandro Zummo <>
    Signed-off-by: Maxime Ripard <>
  2. ARM: sun4i/sun7i: DT documentation for RTC driver

    carlocaione authored and mripard committed Nov 16, 2013
    Add DT documentation for SUNXI RTC driver
    Signed-off-by: Carlo Caione <>
    Signed-off-by: Maxime Ripard <>
Commits on Nov 22, 2013
  1. reset: Add Allwinner SoCs Reset Controller Driver

    mripard committed Sep 24, 2013
    The Allwinner A31 and most of the other Allwinner SoCs have an IP
    maintaining a few other IPs in the SoC in reset by default. Among these
    IPs are the A31's High Speed Timers, hence why we can't use the regular
    driver construct in every cases, and need to call the registering
    function directly during machine initialisation.
    Apart from this, the implementation is fairly straightforward, and could
    easily be moved to a generic MMIO-based reset controller driver if the
    need ever arise.
    Signed-off-by: Maxime Ripard <>
    Acked-by: Philipp Zabel <>
  2. Linux 3.13-rc1

    torvalds committed Nov 22, 2013
  3. Merge tag 'ecryptfs-3.13-rc1-quiet-checkers' of git://…

    torvalds committed Nov 22, 2013
    Pull minor eCryptfs fix from Tyler Hicks:
     "Quiet static checkers by removing unneeded conditionals"
    * tag 'ecryptfs-3.13-rc1-quiet-checkers' of git://
      eCryptfs: file->private_data is always valid
  4. Merge tag 'sound-fix2-3.13-rc1' of git://…

    torvalds committed Nov 22, 2013
    Pull second set of sound fixes from Takashi Iwai:
     "A collection of small fixes in HD-audio quirks and runtime PM, ASoC
      rcar, abs8500 and other codecs.  Most of commits are for stable
      kernels, too"
    * tag 'sound-fix2-3.13-rc1' of git://
      ALSA: hda - Set current_headset_type to ALC_HEADSET_TYPE_ENUM (janitorial)
      ALSA: hda - Provide missing pin configs for VAIO with ALC260
      ALSA: hda - Add headset quirk for Dell Inspiron 3135
      ALSA: hda - Fix the headphone jack detection on Sony VAIO TX
      ALSA: hda - Fix missing bass speaker on ASUS N550
      ALSA: hda - Fix unbalanced runtime PM notification at resume
      ASoC: arizona: Set FLL to free-run before disabling
      ALSA: hda - A casual Dell Headset quirk
      ASoC: rcar: fixup dma_async_issue_pending() timing
      ASoC: rcar: off by one in rsnd_scu_set_route()
      ASoC: wm5110: Add post SYSCLK register patch for rev D chip
      ASoC: ab8500: Revert to using custom I/O functions
      ALSA: hda - Also enable mute/micmute LED control for "Lenovo dock" fixup
      ALSA: firewire-lib: include sound/asound.h to refer to snd_pcm_format_t
      ALSA: hda - Select FW_LOADER from CONFIG_SND_HDA_CODEC_CA0132_DSP
      ALSA: hda - Enable mute/mic-mute LEDs for more Thinkpads with Realtek codec
      ASoC: rcar: fixup mod access before checking
  5. Merge branch 'drm-fixes' of git://

    torvalds committed Nov 22, 2013
    Pull DRM fixes from Dave Airlie:
     "I was going to leave this until post -rc1 but sysfs fixes broke
      hotplug in userspace, so I had to fix it harder, otherwise a set of
      pulls from intel, radeon and vmware,
      The vmware/ttm changes are bit larger but since its early and they are
      unlikely to break anything else I put them in, it lets vmware work
      with dri3"
    * 'drm-fixes' of git:// (36 commits)
      drm/sysfs: fix hotplug regression since lifetime changes
      drm/exynos: g2d: fix memory leak to userptr
      drm/i915: Fix gen3 self-refresh watermarks
      drm/ttm: Remove set_need_resched from the ttm fault handler
      drm/ttm: Don't move non-existing data
      drm/radeon: hook up backlight functions for CI and KV family.
      drm/i915: Replicate BIOS eDP bpp clamping hack for hsw
      drm/i915: Do not enable package C8 on unsupported hardware
      drm/i915: Hold pc8 lock around toggling pc8.gpu_idle
      drm/i915: encoder->get_config is no longer optional
      drm/i915/tv: add ->get_config callback
      drm/radeon/cik: Add macrotile mode array query
      drm/radeon/cik: Return backend map information to userspace
      drm/vmwgfx: Make vmwgfx dma buffers prime aware
      drm/vmwgfx: Make surfaces prime-aware
      drm/vmwgfx: Hook up the prime ioctls
      drm/ttm: Add a minimal prime implementation for ttm base objects
      drm/vmwgfx: Fix false lockdep warning
      drm/ttm: Allow execbuf util reserves without ticket
      drm/i915: restore the early forcewake cleanup
  6. Merge tag 'pci-v3.13-fixes-1' of git://…

    torvalds committed Nov 22, 2013
    Pull PCI updates from Bjorn Helgaas:
       - Remove duplicate disable from pcie_portdrv_remove() (Yinghai Lu)
       - Fix whitespace, capitalization, and spelling errors (Bjorn Helgaas)"
    * tag 'pci-v3.13-fixes-1' of git://
      PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove()
      PCI: Fix whitespace, capitalization, and spelling errors
  7. Merge branch 'for-next' of git://…

    torvalds committed Nov 22, 2013
    Pull SCSI target updates from Nicholas Bellinger:
     "Things have been quiet this round with mostly bugfixes, percpu
      conversions, and other minor iscsi-target conformance testing changes.
      The highlights include:
       - Add demo_mode_discovery attribute for iscsi-target (Thomas)
       - Convert tcm_fc(FCoE) to use percpu-ida pre-allocation
       - Add send completion interrupt coalescing for ib_isert
       - Convert target-core to use percpu-refcounting for se_lun
       - Fix mutex_trylock usage bug in iscsit_increment_maxcmdsn
       - tcm_loop updates (Hannes)
       - target-core ALUA cleanups + prep for v3.14 SCSI Referrals support (Hannes)
      v3.14 is currently shaping to be a busy development cycle in target
      land, with initial support for T10 Referrals and T10 DIF currently on
      the roadmap"
    * 'for-next' of git:// (40 commits)
      iscsi-target: chap auth shouldn't match username with trailing garbage
      iscsi-target: fix extract_param to handle buffer length corner case
      iscsi-target: Expose default_erl as TPG attribute
      target_core_configfs: split up ALUA supported states
      target_core_alua: Make supported states configurable
      target_core_alua: Store supported ALUA states
      target_core_alua: Rename ALUA_ACCESS_STATE_OPTIMIZED
      target_core_alua: spellcheck
      target core: rename (ex,im)plict -> (ex,im)plicit
      percpu-refcount: Add percpu-refcount.o to obj-y
      iscsi-target: Do not reject non-immediate CmdSNs exceeding MaxCmdSN
      iscsi-target: Convert iscsi_session statistics to atomic_long_t
      target: Convert se_device statistics to atomic_long_t
      target: Fix delayed Task Aborted Status (TAS) handling bug
      iscsi-target: Reject unsupported multi PDU text command sequence
      ib_isert: Avoid duplicate iscsit_increment_maxcmdsn call
      iscsi-target: Fix mutex_trylock usage in iscsit_increment_maxcmdsn
      target: Core does not need blkdev.h
      target: Pass through I/O topology for block backstores
      iser-target: Avoid using FRMR for single dma entry requests
  8. Merge tag 'hwmon-for-linus' of git://…

    torvalds committed Nov 22, 2013
    Pull hwmon fixes from Guenter Roeck:
     - acpi_power_meter: Fix return value check from call to
     - nct6775: Fix/improve NCT6791 support
     - lm75: Add support for GMT G751
    * tag 'hwmon-for-linus' of git://
      hwmon: (acpi_power_meter) Fix acpi_bus_get_device() return value check
      hwmon: (nct6775) NCT6791 supports weight control only for CPUFAN
      hwmon: (nct6775) Monitor additional temperature registers
      hwmon: (lm75) Add support for GMT G751 chip
  9. Merge git://

    torvalds committed Nov 22, 2013
    Pull networking fixes from David Miller:
     1) Fix memory leaks and other issues in mwifiex driver, from Amitkumar
     2) skb_segment() can choke on packets using frag lists, fix from
        Herbert Xu with help from Eric Dumazet and others.
     3) IPv4 output cached route instantiation properly handles races
        involving two threads trying to install the same route, but we
        forgot to propagate this logic to input routes as well.  Fix from
        Alexei Starovoitov.
     4) Put protections in place to make sure that recvmsg() paths never
        accidently copy uninitialized memory back into userspace and also
        make sure that we never try to use more that sockaddr_storage for
        building the on-kernel-stack copy of a sockaddr.  Fixes from Hannes
        Frederic Sowa.
     5) R8152 driver transmit flow bug fixes from Hayes Wang.
     6) Fix some minor fallouts from genetlink changes, from Johannes Berg
        and Michael Opdenacker.
     7) AF_PACKET sendmsg path can race with netdevice unregister notifier,
        fix by using RCU to make sure the network device doesn't go away
        from under us.  Fix from Daniel Borkmann.
    * git:// (43 commits)
      gso: handle new frag_list of frags GRO packets
      genetlink: fix genl_set_err() group ID
      genetlink: fix genlmsg_multicast() bug
      packet: fix use after free race in send path when dev is released
      xen-netback: stop the VIF thread before unbinding IRQs
      wimax: remove dead code
      net/phy: Add the autocross feature for forced links on VSC82x4
      net/phy: Add VSC8662 support
      net/phy: Add VSC8574 support
      net/phy: Add VSC8234 support
      net: add BUG_ON if kernel advertises msg_namelen > sizeof(struct sockaddr_storage)
      net: rework recvmsg handler msg_name and msg_namelen logic
      bridge: flush br's address entry in fdb when remove the
      net: core: Always propagate flag changes to interfaces
      ipv4: fix race in concurrent ip_route_input_slow()
      r8152: fix incorrect type in assignment
      r8152: support stopping/waking tx queue
      r8152: modify the tx flow
      r8152: fix tx/rx memory overflow
      netfilter: ebt_ip6: fix source and destination matching
  10. Merge branch 'fixes' of git://

    torvalds committed Nov 22, 2013
    Pull ARM fixes from Russell King:
     "Some small fixes for this merge window, most of them quite self
      explanatory - the biggest thing here is a fix for the ARMv7 LPAE
      suspend/resume support"
    * 'fixes' of git://
      ARM: 7894/1: kconfig: select GENERIC_CLOCKEVENTS if HAVE_ARM_ARCH_TIMER
      ARM: 7893/1: bitops: only emit .arch_extension mp if CONFIG_SMP
      ARM: 7892/1: Fix warning for V7M builds
      ARM: 7888/1: seccomp: not compatible with ARM OABI
      ARM: 7886/1: make OABI default to off
      ARM: 7885/1: Save/Restore 64-bit TTBR registers on LPAE suspend/resume
      ARM: 7884/1: mm: Fix ECC mem policy printk
      ARM: 7883/1: fix mov to mvn conversion in case of 64 bit phys_addr_t and BE
      ARM: 7882/1: mm: fix __phys_to_virt to work with 64 bit phys_addr_t in BE case
      ARM: 7881/1: __fixup_smp read of SCU config should do byteswap in BE case
      ARM: Fix nommu.c build warning
  11. Merge branch 'next' of git://

    torvalds committed Nov 22, 2013
    Pull KVM fixes from Gleb Natapov.
    * 'next' of git://
      KVM: kvm_clear_guest_page(): fix empty_zero_page usage
      kvm: mmu: delay mmu audit activation
      arm/arm64: KVM: Fix hyp mappings of vmalloc regions
  12. Merge git://

    torvalds committed Nov 22, 2013
    Pull aio fixes from Benjamin LaHaise.
    * git://
      aio: nullify aio->ring_pages after freeing it
      aio: prevent double free in ioctx_alloc
      aio: Fix a trinity splat
  13. Merge branch 'for-3.13' of git://

    torvalds committed Nov 22, 2013
    Pull nfsd bugfixes from Bruce Fields:
     "A couple nfsd bugfixes"
    * 'for-3.13' of git://
      nfsd4: fix xdr decoding of large non-write compounds
      nfsd: make sure to balance get/put_write_access
      nfsd: split up nfsd_setattr
  14. Merge tag 'gfs2-fixes' of git://…

    torvalds committed Nov 22, 2013
    Pull GFS2 fixes from Steven Whitehouse:
     "A couple of small, but important bug fixes for GFS2.  The first one
      fixes a possible NULL pointer dereference, and the second one resolves
      a reference counting issue in one of the lesser used paths through
    * tag 'gfs2-fixes' of git://
      GFS2: Fix ref count bug relating to atomic_open
      GFS2: fix potential NULL pointer dereference
  15. Merge branch 'for-linus' of git://…

    torvalds committed Nov 22, 2013
    Pull btrfs fixes from Chris Mason:
     "Almost all of these are bug fixes.  Dave Sterba's documentation update
      is the big exception because he removed our promises to set any
      machine running Btrfs on fire"
    * 'for-linus' of git://
      Documentation: filesystems: update btrfs tools section
      Documentation: filesystems: add new btrfs mount options
      btrfs: update kconfig help text
      btrfs: fix bio_size_ok() for max_sectors > 0xffff
      btrfs: Use trace condition for get_extent tracepoint
      btrfs: fix typo in the log message
      Btrfs: fix list delete warning when removing ordered root from the list
      Btrfs: print bytenr instead of page pointer in check-int
      Btrfs: remove dead codes from ctree.h
      Btrfs: don't wait for ordered data outside desired range
      Btrfs: fix lockdep error in async commit
      Btrfs: avoid heavy operations in btrfs_commit_super
      Btrfs: fix __btrfs_start_workers retval
      Btrfs: disable online raid-repair on ro mounts
      Btrfs: do not inc uncorrectable_errors counter on ro scrubs
      Btrfs: only drop modified extents if we logged the whole inode
      Btrfs: make sure to copy everything if we rename
      Btrfs: don't BUG_ON() if we get an error walking backrefs
  16. Merge tag 'xfs-for-linus-v3.13-rc1-2' of git://

    torvalds committed Nov 22, 2013
    Pull second xfs update from Ben Myers:
     "There are a couple of patches that I wasn't quite sure about in time
      for our initial 3.13 pull request, a bugfix, and an update to add Dave
      Here we have a performance fix for inode iversion, increased inode
      cluster size for v5 superblock filesystems, a fix for error handling
      in xfs_bmap_add_attrfork, and a MAINTAINERS update to add Dave"
    * tag 'xfs-for-linus-v3.13-rc1-2' of git://
      xfs: open code inc_inode_iversion when logging an inode
      xfs: increase inode cluster size for v5 filesystems
      xfs: fix unlock in xfs_bmap_add_attrfork
      xfs: update maintainers
  17. Merge branch 'slab/next' of git://…

    torvalds committed Nov 22, 2013
    Pull SLAB changes from Pekka Enberg:
     "The patches from Joonsoo Kim switch mm/slab.c to use 'struct page' for
      slab internals similar to mm/slub.c.  This reduces memory usage and
      improves performance:
      Rest of the changes are bug fixes from various people"
    * 'slab/next' of git:// (21 commits)
      mm, slub: fix the typo in mm/slub.c
      mm, slub: fix the typo in include/linux/slub_def.h
      slub: Handle NULL parameter in kmem_cache_flags
      slab: replace non-existing 'struct freelist *' with 'void *'
      slab: fix to calm down kmemleak warning
      slub: proper kmemleak tracking if CONFIG_SLUB_DEBUG disabled
      slab: rename slab_bufctl to slab_freelist
      slab: remove useless statement for checking pfmemalloc
      slab: use struct page for slab management
      slab: replace free and inuse in struct slab with newly introduced active
      slab: remove SLAB_LIMIT
      slab: remove kmem_bufctl_t
      slab: change the management method of free objects of the slab
      slab: use __GFP_COMP flag for allocating slab pages
      slab: use well-defined macro, virt_to_slab()
      slab: overloading the RCU head over the LRU for RCU free
      slab: remove cachep in struct slab_rcu
      slab: remove nodeid in struct slab
      slab: remove colouroff in struct slab
      slab: change return type of kmem_getpages() to struct page
  18. Merge branch 'merge' of git://…

    torvalds committed Nov 22, 2013
    Pull third set of powerpc updates from Benjamin Herrenschmidt:
     "This is a small collection of random bug fixes and a few improvements
      of Oops output which I deemed valuable enough to include as well.
      The fixes are essentially recent build breakage and regressions, and a
      couple of older bugs such as the DTL log duplication, the EEH issue
      with PCI_COMMAND_MASTER and the problem with small contexts passed to
      get/set_context with VSX enabled"
    * 'merge' of git://
      powerpc/signals: Mark VSX not saved with small contexts
      powerpc/pseries: Fix SMP=n build of rng.c
      powerpc: Make cpu_to_chip_id() available when SMP=n
      powerpc/vio: Fix a dma_mask issue of vio
      powerpc: booke: Fix build failures
      powerpc: ppc64 address space capped at 32TB, mmap randomisation disabled
      powerpc: Only print PACATMSCRATCH in oops when TM is active
      powerpc/pseries: Duplicate dtl entries sometimes sent to userspace
      powerpc: Remove a few lines of oops output
      powerpc: Print DAR and DSISR on machine check oopses
      powerpc: Fix __get_user_pages_fast() irq handling
      powerpc/eeh: More accurate log
      powerpc/eeh: Enable PCI_COMMAND_MASTER for PCI bridges
  19. ALSA: hda - Set current_headset_type to ALC_HEADSET_TYPE_ENUM (janito…

    David Henningsson authored and tiwai committed Nov 22, 2013
    current_headset_type should be of the HEADSET_TYPE enum, not the
    are both 0, this patch is just janitorial.
    Signed-off-by: David Henningsson <>
    Signed-off-by: Takashi Iwai <>
  20. ALSA: hda - Provide missing pin configs for VAIO with ALC260

    tiwai committed Nov 22, 2013
    Some models (or maybe depending on BIOS version) of Sony VAIO with
    ALC260 give no proper pin configurations as default, resulting in the
    non-working speaker, etc.  Just provide the whole pin configurations
    via a fixup.
    Reported-by: Matthew Markus <>
    Cc: <>
    Signed-off-by: Takashi Iwai <>
  21. Merge branch 'akpm' (fixes from Andrew)

    torvalds committed Nov 22, 2013
    Merge patches from Andrew Morton:
     "13 fixes"
    * emailed patches from Andrew Morton <>:
      mm: place page->pmd_huge_pte to right union
      MAINTAINERS: add keyboard driver to Hyper-V file list
      x86, mm: do not leak page->ptl for pmd page tables
      ipc,shm: correct error return value in shmctl (SHM_UNLOCK)
      mm, mempolicy: silence gcc warning
      block/partitions/efi.c: fix bound check
      ARM: drivers/rtc/rtc-at91rm9200.c: disable interrupts at shutdown
      mm: hugetlbfs: fix hugetlbfs optimization
      kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS cleanly
      ipc,shm: fix shm_file deletion races
      mm: thp: give transparent hugepage code a separate copy_page
      checkpatch: fix "Use of uninitialized value" warnings
      configfs: fix race between dentry put and lookup
  22. Merge branch 'for-linus2' of git://…

    torvalds committed Nov 22, 2013
    Pull security subsystem updates from James Morris:
     "In this patchset, we finally get an SELinux update, with Paul Moore
      taking over as maintainer of that code.
      Also a significant update for the Keys subsystem, as well as
      maintenance updates to Smack, IMA, TPM, and Apparmor"
    and since I wanted to know more about the updates to key handling,
    here's the explanation from David Howells on that:
     "Okay.  There are a number of separate bits.  I'll go over the big bits
      and the odd important other bit, most of the smaller bits are just
      fixes and cleanups.  If you want the small bits accounting for, I can
      do that too.
       (1) Keyring capacity expansion.
            KEYS: Consolidate the concept of an 'index key' for key access
            KEYS: Introduce a search context structure
            KEYS: Search for auth-key by name rather than target key ID
            Add a generic associative array implementation.
            KEYS: Expand the capacity of a keyring
         Several of the patches are providing an expansion of the capacity of a
         keyring.  Currently, the maximum size of a keyring payload is one page.
         Subtract a small header and then divide up into pointers, that only gives
         you ~500 pointers on an x86_64 box.  However, since the NFS idmapper uses
         a keyring to store ID mapping data, that has proven to be insufficient to
         the cause.
         Whatever data structure I use to handle the keyring payload, it can only
         store pointers to keys, not the keys themselves because several keyrings
         may point to a single key.  This precludes inserting, say, and rb_node
         struct into the key struct for this purpose.
         I could make an rbtree of records such that each record has an rb_node
         and a key pointer, but that would use four words of space per key stored
         in the keyring.  It would, however, be able to use much existing code.
         I selected instead a non-rebalancing radix-tree type approach as that
         could have a better space-used/key-pointer ratio.  I could have used the
         radix tree implementation that we already have and insert keys into it by
         their serial numbers, but that means any sort of search must iterate over
         the whole radix tree.  Further, its nodes are a bit on the capacious side
         for what I want - especially given that key serial numbers are randomly
         allocated, thus leaving a lot of empty space in the tree.
         So what I have is an associative array that internally is a radix-tree
         with 16 pointers per node where the index key is constructed from the key
         type pointer and the key description.  This means that an exact lookup by
         type+description is very fast as this tells us how to navigate directly to
         the target key.
         I made the data structure general in lib/assoc_array.c as far as it is
         concerned, its index key is just a sequence of bits that leads to a
         pointer.  It's possible that someone else will be able to make use of it
         also.  FS-Cache might, for example.
       (2) Mark keys as 'trusted' and keyrings as 'trusted only'.
            KEYS: verify a certificate is signed by a 'trusted' key
            KEYS: Make the system 'trusted' keyring viewable by userspace
            KEYS: Add a 'trusted' flag and a 'trusted only' flag
            KEYS: Separate the kernel signature checking keyring from module signing
         These patches allow keys carrying asymmetric public keys to be marked as
         being 'trusted' and allow keyrings to be marked as only permitting the
         addition or linkage of trusted keys.
         Keys loaded from hardware during kernel boot or compiled into the kernel
         during build are marked as being trusted automatically.  New keys can be
         loaded at runtime with add_key().  They are checked against the system
         keyring contents and if their signatures can be validated with keys that
         are already marked trusted, then they are marked trusted also and can
         thus be added into the master keyring.
         Patches from Mimi Zohar make this usable with the IMA keyrings also.
       (3) Remove the date checks on the key used to validate a module signature.
            X.509: Remove certificate date checks
         It's not reasonable to reject a signature just because the key that it was
         generated with is no longer valid datewise - especially if the kernel
         hasn't yet managed to set the system clock when the first module is
         loaded - so just remove those checks.
       (4) Make it simpler to deal with additional X.509 being loaded into the kernel.
            KEYS: Load *.x509 files into kernel keyring
            KEYS: Have make canonicalise the paths of the X.509 certs better to deduplicate
         The builder of the kernel now just places files with the extension ".x509"
         into the kernel source or build trees and they're concatenated by the
         kernel build and stuffed into the appropriate section.
       (5) Add support for userspace kerberos to use keyrings.
            KEYS: Add per-user_namespace registers for persistent per-UID kerberos caches
            KEYS: Implement a big key type that can save to tmpfs
         Fedora went to, by default, storing kerberos tickets and tokens in tmpfs.
         We looked at storing it in keyrings instead as that confers certain
         advantages such as tickets being automatically deleted after a certain
         amount of time and the ability for the kernel to get at these tokens more
         To make this work, two things were needed:
         (a) A way for the tickets to persist beyond the lifetime of all a user's
             sessions so that cron-driven processes can still use them.
             The problem is that a user's session keyrings are deleted when the
             session that spawned them logs out and the user's user keyring is
             deleted when the UID is deleted (typically when the last log out
             happens), so neither of these places is suitable.
             I've added a system keyring into which a 'persistent' keyring is
             created for each UID on request.  Each time a user requests their
             persistent keyring, the expiry time on it is set anew.  If the user
             doesn't ask for it for, say, three days, the keyring is automatically
             expired and garbage collected using the existing gc.  All the kerberos
             tokens it held are then also gc'd.
         (b) A key type that can hold really big tickets (up to 1MB in size).
             The problem is that Active Directory can return huge tickets with lots
             of auxiliary data attached.  We don't, however, want to eat up huge
             tracts of unswappable kernel space for this, so if the ticket is
             greater than a certain size, we create a swappable shmem file and dump
             the contents in there and just live with the fact we then have an
             inode and a dentry overhead.  If the ticket is smaller than that, we
             slap it in a kmalloc()'d buffer"
    * 'for-linus2' of git:// (121 commits)
      KEYS: Fix keyring content gc scanner
      KEYS: Fix error handling in big_key instantiation
      KEYS: Fix UID check in keyctl_get_persistent()
      KEYS: The RSA public key algorithm needs to select MPILIB
      ima: define '_ima' as a builtin 'trusted' keyring
      ima: extend the measurement list to include the file signature
      kernel/system_certificate.S: use real contents instead of macro GLOBAL()
      KEYS: fix error return code in big_key_instantiate()
      KEYS: Fix keyring quota misaccounting on key replacement and unlink
      KEYS: Fix a race between negating a key and reading the error set
      KEYS: Make BIG_KEYS boolean
      apparmor: remove the "task" arg from may_change_ptraced_domain()
      apparmor: remove parent task info from audit logging
      apparmor: remove tsk field from the apparmor_audit_struct
      apparmor: fix capability to not use the current task, during reporting
      Smack: Ptrace access check mode
      ima: provide hash algo info in the xattr
      ima: enable support for larger default filedata hash algorithms
      ima: define kernel parameter 'ima_template=' to change configured default
      ima: add Kconfig default measurement list template
  23. Merge git://

    torvalds committed Nov 22, 2013
    Pull audit updates from Eric Paris:
     "Nothing amazing.  Formatting, small bug fixes, couple of fixes where
      we didn't get records due to some old VFS changes, and a change to how
      we collect execve info..."
    Fixed conflict in fs/exec.c as per Eric and linux-next.
    * git:// (28 commits)
      audit: fix type of sessionid in audit_set_loginuid()
      audit: call audit_bprm() only once to add AUDIT_EXECVE information
      audit: move audit_aux_data_execve contents into audit_context union
      audit: remove unused envc member of audit_aux_data_execve
      audit: Kill the unused struct audit_aux_data_capset
      audit: do not reject all AUDIT_INODE filter types
      audit: suppress stock memalloc failure warnings since already managed
      audit: log the audit_names record type
      audit: add child record before the create to handle case where create fails
      audit: use given values in tty_audit enable api
      audit: use nlmsg_len() to get message payload length
      audit: use memset instead of trying to initialize field by field
      audit: fix info leak in AUDIT_GET requests
      audit: update AUDIT_INODE filter rule to comparator function
      audit: audit feature to set loginuid immutable
      audit: audit feature to only allow unsetting the loginuid
      audit: allow unsetting the loginuid (with priv)
      audit: loginuid functions coding style
      selinux: apply selinux checks on new audit message types
  24. mm: place page->pmd_huge_pte to right union

    Kirill A. Shutemov authored and torvalds committed Nov 21, 2013
    I don't know what went wrong, mis-merge or something, but ->pmd_huge_pte
    placed in wrong union within struct page.
    In original patch[1] it's placed to union with ->lru and ->slab, but in
    commit e009bb3 ("mm: implement split page table lock for PMD
    level") it's in union with ->index and ->freelist.
    That union seems also unused for pages with table tables and safe to
    re-use, but it's not what I've tested.
    Let's move it to original place.  It fixes indentation at least.  :)
    Signed-off-by: Kirill A. Shutemov <>
    Reviewed-by: Naoya Horiguchi <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  25. MAINTAINERS: add keyboard driver to Hyper-V file list

    haiyangz authored and torvalds committed Nov 21, 2013
    Signed-off-by: Haiyang Zhang <>
    Cc: Dmitry Torokhov <>
    Cc: "K. Y. Srinivasan" <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  26. x86, mm: do not leak page->ptl for pmd page tables

    Kirill A. Shutemov authored and torvalds committed Nov 21, 2013
    There are two code paths how page with pmd page table can be freed:
    pmd_free() and pmd_free_tlb().
    I've missed the second one and didn't add page table destructor call
    there.  It leads to leak of page->ptl for pmd page tables, if
    dynamically allocated page->ptl is in use.
    The patch adds the missed destructor and modifies documentation
    Signed-off-by: Kirill A. Shutemov <>
    Reported-by: Andrey Vagin <>
    Tested-by: Andrey Vagin <>
    Cc: Ingo Molnar <>
    Cc: Peter Zijlstra <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  27. ipc,shm: correct error return value in shmctl (SHM_UNLOCK)

    Jesper Nilsson authored and torvalds committed Nov 21, 2013
    Commit 2caacaa ("ipc,shm: shorten critical region for shmctl")
    restructured the ipc shm to shorten critical region, but introduced a
    path where the return value could be -EPERM, even if the operation
    actually was performed.
    Before the commit, the err return value was reset by the return value
    from security_shm_shmctl() after the if (!ns_capable(...)) statement.
    Now, we still exit the if statement with err set to -EPERM, and in the
    case of SHM_UNLOCK, it is not reset at all, and used as the return value
    from shmctl.
    To fix this, we only set err when errors occur, leaving the fallthrough
    case alone.
    Signed-off-by: Jesper Nilsson <>
    Cc: Davidlohr Bueso <>
    Cc: Rik van Riel <>
    Cc: Michel Lespinasse <>
    Cc: Al Viro <>
    Cc: <>	[3.12.x]
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  28. mm, mempolicy: silence gcc warning

    David Rientjes authored and torvalds committed Nov 21, 2013
    Fengguang Wu reports that compiling mm/mempolicy.c results in a warning:
      mm/mempolicy.c: In function 'mpol_to_str':
      mm/mempolicy.c:2878:2: error: format not a string literal and no format arguments
    Kees says this is because he is using -Wformat-security.
    Silence the warning.
    Signed-off-by: David Rientjes <>
    Reported-by: Fengguang Wu <>
    Suggested-by: Kees Cook <>
    Acked-by: Kees Cook <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  29. block/partitions/efi.c: fix bound check

    Antti P Miettinen authored and torvalds committed Nov 21, 2013
    Use ARRAY_SIZE instead of sizeof to get proper max for label length.
    Since this is just a read out of bounds it's not that bad, but the
    problem becomes user-visible eg if one tries to use DEBUG_PAGEALLOC and
    DEBUG_RODATA, at least with some enhancements from Hiroshi.  Of course
    the destination array can contain garbage when we read beyond the end of
    source array so that would be another user-visible problem.
    Signed-off-by: Antti P Miettinen <>
    Reviewed-by: Hiroshi Doyu <>
    Tested-by: Hiroshi Doyu <>
    Cc: Will Drewry <>
    Cc: Matt Fleming <>
    Acked-by: Davidlohr Bueso <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  30. ARM: drivers/rtc/rtc-at91rm9200.c: disable interrupts at shutdown

    jhovold authored and torvalds committed Nov 21, 2013
    Make sure RTC-interrupts are disabled at shutdown.
    As the RTC is generally powered by backup power (VDDBU), its interrupts
    are not disabled on wake-up, user, watchdog or software reset.  This
    could cause troubles on other systems (e.g.  older kernels) if an
    interrupt occurs before a handler has been installed at next boot.
    Let us be well-behaved and disable them on clean shutdowns at least (as
    do the RTT-based rtc-at91sam9 driver).
    Signed-off-by: Johan Hovold <>
    Acked-by: Nicolas Ferre <>
    Cc: Jean-Christophe Plagniol-Villard <>
    Cc: Andrew Victor <>
    Cc: Alessandro Zummo <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  31. mm: hugetlbfs: fix hugetlbfs optimization

    Andrea Arcangeli authored and torvalds committed Nov 21, 2013
    Commit 7cb2ef5 ("mm: fix aio performance regression for database
    caused by THP") can cause dereference of a dangling pointer if
    split_huge_page runs during PageHuge() if there are updates to the
    tail_page->private field.
    Also it is repeating compound_head twice for hugetlbfs and it is running
    compound_head+compound_trans_head for THP when a single one is needed in
    both cases.
    The new code within the PageSlab() check doesn't need to verify that the
    THP page size is never bigger than the smallest hugetlbfs page size, to
    avoid memory corruption.
    A longstanding theoretical race condition was found while fixing the
    above (see the change right after the skip_unlock label, that is
    relevant for the compound_lock path too).
    By re-establishing the _mapcount tail refcounting for all compound
    pages, this also fixes the below problem:
      echo 0 >/sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages
      BUG: Bad page state in process bash  pfn:59a01
      page:ffffea000139b038 count:0 mapcount:10 mapping:          (null) index:0x0
      page flags: 0x1c00000000008000(tail)
      Modules linked in:
      CPU: 6 PID: 2018 Comm: bash Not tainted 3.12.0+ torvalds#25
      Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
      Call Trace:
    Signed-off-by: Khalid Aziz <>
    Signed-off-by: Andrea Arcangeli <>
    Tested-by: Khalid Aziz <>
    Cc: Pravin Shelar <>
    Cc: Greg Kroah-Hartman <>
    Cc: Ben Hutchings <>
    Cc: Christoph Lameter <>
    Cc: Johannes Weiner <>
    Cc: Mel Gorman <>
    Cc: Rik van Riel <>
    Cc: Andi Kleen <>
    Cc: Minchan Kim <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  32. kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS cleanly

    Yuanhan Liu authored and torvalds committed Nov 21, 2013
    Remove CONFIG_USE_GENERIC_SMP_HELPERS left by commit 0a06ff0
    ("kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS").
    Signed-off-by: Yuanhan Liu <>
    Cc: Christoph Hellwig <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  33. ipc,shm: fix shm_file deletion races

    gthelen authored and torvalds committed Nov 21, 2013
    When IPC_RMID races with other shm operations there's potential for
    use-after-free of the shm object's associated file (shm_file).
    Here's the race before this patch:
      TASK 1                     TASK 2
      ------                     ------
                                 shp = shm_obtain_object_check()
    The oops is caused because shm_destroy() calls fput() after dropping the
    ipc_lock.  fput() clears the file's f_inode, f_path.dentry, and
    f_path.mnt, which causes various NULL pointer references in task 2.  I
    reliably see the oops in task 2 if with shmlock, shmu
    This patch fixes the races by:
    1) set shm_file=NULL in shm_destroy() while holding ipc_object_lock().
    2) modify at risk operations to check shm_file while holding
    Example workloads, which each trigger oops...
    Workload 1:
      while true; do
        id=$(shmget 1 4096)
        shm_rmid $id &
        shmlock $id &
      The oops stack shows accessing NULL f_inode due to racing fput:
    Workload 2:
      while true; do
        id=$(shmget 1 4096)
        shmat $id 4096 &
        shm_rmid $id &
      The oops stack is similar to workload 1 due to NULL f_inode:
    Workload 3:
      while true; do
        id=$(shmget 1 4096)
        shmlock $id
        shm_rmid $id &
        shmunlock $id &
      The oops stack shows second fput tripping on an NULL f_inode.  The
      first fput() completed via from shm_destroy(), but a racing thread did
      a get_file() and queued this fput():
    Fixes: c2c737a ("ipc,shm: shorten critical region for shmat")
    Fixes: 2caacaa ("ipc,shm: shorten critical region for shmctl")
    Signed-off-by: Greg Thelen <>
    Cc: Davidlohr Bueso <>
    Cc: Rik van Riel <>
    Cc: Manfred Spraul <>
    Cc: <>  # 3.10.17+ 3.11.6+
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
You can’t perform that action at this time.