1. 28 Mar, 2012 35 commits
  2. 26 Mar, 2012 1 commit
    • David Howells's avatar
      SELinux: selinux/xfrm.h needs net/flow.h · 778aae84
      David Howells authored
      selinux/xfrm.h needs to #include net/flow.h or else suffer:
      In file included from security/selinux/ss/services.c:69:0:
      security/selinux/include/xfrm.h: In function 'selinux_xfrm_notify_policyload':
      security/selinux/include/xfrm.h:53:14: error: 'flow_cache_genid' undeclared (first use in this function)
      security/selinux/include/xfrm.h:53:14: note: each undeclared identifier is reported only once for each function it appears in
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
  3. 23 Mar, 2012 4 commits
    • David Howells's avatar
      ARM: Fix missing linux/types.h #inclusion in asm/hardware/iop3xx.h · 15e9b9b9
      David Howells authored
      arch/arm/include/asm/hardware/iop3xx.h needs to include linux/types.h to avoid
      the following errors:
      In file included from arch/arm/plat-iop/restart.c:10:0:
      /data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h:239:1: error: unknown type name 'u32'
      /data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h: In function 'read_tmr0':
      /data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h:241:2: error: unknown type name 'u32'
      /data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h: At top level:
      /data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h:246:31: error: unknown type name 'u32'
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
    • Linus Torvalds's avatar
      Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6 · 43753826
      Linus Torvalds authored
      Pull fbdev updates for 3.4 from Florian Tobias Schandinat:
       - drivers for Samsung Exynos MIPI DSI and display port
       - i740fb to support those old Intel chips
       - large updates to OMAP, viafb and sh_mobile_lcdcfb
       - some updates to s3c-fb and udlfb, few patches to others
      Fix up conflicts in drivers/video/udlfb.c due to Key Sievers' fix making
      it in twice.
      * tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6: (156 commits)
        Revert "video:uvesafb: Fix oops that uvesafb try to execute NX-protected page"
        OMAPDSS: register dss drivers in module init
        video: pxafb: add clk_prepare/clk_unprepare calls
        fbdev: bfin_adv7393fb: Drop needless include
        fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info
        fbdev: remove dependency of FB_SH_MOBILE_MERAM from FB_SH_MOBILE_LCDC
        Revert "MAINTAINERS: add entry for exynos mipi display drivers"
        fbdev: da8xx: add support for SP10Q010 display
        fbdev: da8xx:: fix reporting of the display timing info
        drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible
        OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update
        fbdev: sh_mobile_meram: Implement system suspend/resume
        fbdev: sh_mobile_meram: Remove unneeded sanity checks
        fbdev: sh_mobile_meram: Don't perform update in register operation
        arm: mach-shmobile: Constify sh_mobile_meram_cfg structures
        fbdev: sh_mobile_lcdc: Don't store copy of platform data
        fbdev: sh_mobile_meram: Remove unused sh_mobile_meram_icb_cfg fields
        arm: mach-shmobile: Don't set MERAM ICB numbers in platform data
        fbdev: sh_mobile_meram: Allocate ICBs automatically
        fbdev: sh_mobile_meram: Use genalloc to manage MERAM allocation
    • Linus Torvalds's avatar
      Merge tag 'regmap-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · 9586c959
      Linus Torvalds authored
      Pull regmap updates from Mark Brown:
       "Things are really quieting down with the regmap API, while we're still
        seeing a trickle of new features coming in they're getting much
        smaller than they were.  It's also nice to have some features which
        support other subsystems building infrastructure on top of regmap.
        Highlights include:
        - Support for padding between the register and the value when
          interacting with the device, sometimes needed for fast interfaces.
        - Support for applying register updates to the device when restoring
          the register state.  This is intended to be used to apply updates
          supplied by manufacturers for tuning the performance of the device
          (many of which are to undocumented registers which aren't otherwise
        - Support for multi-register operations on cached registers.
        - Support for syncing only part of the register cache.
        - Stubs and parameter query functions intended to make it easier for
          other subsystems to build infrastructure on top of the regmap API.
        plus a few driver updates making use of the new features which it was
        easier to merge via this tree."
      * tag 'regmap-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: (41 commits)
        regmap: Fix future missing prototype of devres_alloc() and friends
        regmap: Rejig struct declarations for stubbed API
        regmap: Fix rbtree block base in sync
        regcache: Make sure we sync register 0 in an rbtree cache
        regmap: delete unused module.h from drivers/base/regmap files
        regmap: Add stub for regcache_sync_region()
        mfd: Improve performance of later WM1811 revisions
        regmap: Fix x86_64 breakage
        regmap: Allow drivers to sync only part of the register cache
        regmap: Supply ranges to the sync operations
        regmap: Add tracepoints for cache only and cache bypass
        regmap: Mark the cache as clean after a successful sync
        regmap: Remove default cache sync implementation
        regmap: Skip hardware defaults for LZO caches
        regmap: Expose the driver name in debugfs
        mfd: wm8400: Convert to devm_regmap_init_i2c()
        mfd: wm831x: Convert to devm_regmap_init()
        mfd: wm8994: Convert to devm_regmap_init()
        mfd/ASoC: Convert WM8994 driver to use regmap patches
        mfd: Add __devinit and __devexit annotations in wm8994
    • Linus Torvalds's avatar
      Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 · 34699403
      Linus Torvalds authored
      Pull IEEE 1394 (FireWire) subsystem updates post v3.3 from Stefan Richter:
       - Some SBP-2 initiator fixes, side product from ongoing work on a target.
       - Reintroduction of an isochronous I/O feature of the older ieee1394 driver
         stack (flush buffer completions); it was evidently rarely used but not
         actually unused.  Matching libraw1394 code is already available.
       - Be sure to prefix all kernel log messages with device name or card name,
         and other logging related cleanups.
       - Misc other small cleanups, among them a small API change that affects
         sound/firewire/ too. Clemens Ladisch is aware of it.
      * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: (26 commits)
        firewire: allow explicit flushing of iso packet completions
        firewire: prevent dropping of completed iso packet header data
        firewire: ohci: factor out iso completion flushing code
        firewire: ohci: simplify iso header pointer arithmetic
        firewire: ohci: optimize control bit checks
        firewire: ohci: remove unused excess_bytes field
        firewire: ohci: copy_iso_headers(): make comment match the code
        firewire: cdev: fix IR multichannel event documentation
        firewire: ohci: fix too-early completion of IR multichannel buffers
        firewire: ohci: move runtime debug facility out of #ifdef
        firewire: tone down some diagnostic log messages
        firewire: sbp2: replace a GFP_ATOMIC allocation
        firewire: sbp2: Fix SCSI sense data mangling
        firewire: sbp2: Ignore SBP-2 targets on the local node
        firewire: sbp2: Take into account Unit_Unique_ID
        firewire: nosy: Use the macro DMA_BIT_MASK().
        firewire: core: convert AR-req handler lock from _irqsave to _bh
        firewire: core: fix race at address_handler unregistration
        firewire: core: remove obsolete comment
        firewire: core: prefix log messages with card name