1. 07 Oct, 2012 18 commits
    • Tony Prisk's avatar
      vt8500: Fix build warning when no framebuffer selected · a4ee7770
      Tony Prisk authored
      
      
      Check for framebuffer defines before declaring variables in vt8500.c
      Removes a compile-time warning about unused variables.
      Signed-off-by: default avatarTony Prisk <linux@prisktech.co.nz>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      a4ee7770
    • Tony Prisk's avatar
      dtb: Add arch-vt8500 board files to arch/arm/boot/dts/Makefile · ed304be1
      Tony Prisk authored
      
      
      Add board files (vt8500-bv07, wm8505-ref and wm8650-mid)
      to allow 'make dtbs' on arch-vt8500.
      Signed-off-by: default avatarTony Prisk <linux@prisktech.co.nz>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      ed304be1
    • Stephen Warren's avatar
      ARM: bcm2835: fix typos in DT binding documentation · 53f40352
      Stephen Warren authored
      
      
      The compatible value shouldn't include ".txt", which was probably cut
      and paste from the filename.
      Reported-by: default avatarDomenico Andreoli <cavokz@gmail.com>
      Signed-off-by: default avatarStephen Warren <swarren@wwwdotorg.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      53f40352
    • Stephen Warren's avatar
      ARM: tegra: remove "Tegra board type" comment from Kconfig · 6dd41a1f
      Stephen Warren authored
      
      
      Since the complete conversion to device tree, there are no board-
      specific Kconfig options left, so remove the useless Kconfig entry.
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Reviewed-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      6dd41a1f
    • Stephen Warren's avatar
      ARM: tegra: fix invalid unit-address in tegra*.dtsi · bbfc33bd
      Stephen Warren authored
      
      
      Unit addresses, whilst written in hex, don't contain a 0x prefix.
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Reviewed-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      bbfc33bd
    • Olof Johansson's avatar
      ARM: tegra: fix mismerges of header file inclusions · 823bba8f
      Olof Johansson authored
      
      
      Another mishandled merge conflict by me, where the header file renames
      and the removal of gpio includes clashed and I chose the wrong end result.
      
      Fixes build breakage for tegra_defconfig.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      823bba8f
    • Olof Johansson's avatar
      ARM: iop: fix mismerge of Kconfig · c0f72d7c
      Olof Johansson authored
      
      
      I mismerged one of the branches that moves around gpio header file usage,
      and messed up for IOP. This fixes the obvious compilation failures caused
      by it.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      c0f72d7c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · 0e51793e
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "This is the first chunk of ARM updates for this merge window.
        Conflicts are expected in two files - asm/timex.h and
        mach-integrator/integrator_cp.c.  Nothing particularly stands out more
        than anything else.
      
        Most of the growth is down to the opcodes stuff from Dave Martin,
        which is countered by Rob's patches to use more of the asm-generic
        headers on ARM."
      
      (A few more conflicts grew since then, but it all looked fairly trivial)
      
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (44 commits)
        ARM: 7548/1: include linux/sched.h in syscall.h
        ARM: 7541/1: Add ARM ERRATA 775420 workaround
        ARM: ensure vm_struct has its phys_addr member filled in
        ARM: 7540/1: kexec: Check segment memory addresses
        ARM: 7539/1: kexec: scan for dtb magic in segments
        ARM: 7538/1: delay: add registration mechanism for delay timer sources
        ARM: 7536/1: smp: Formalize an IPI for wakeup
        ARM: 7525/1: ptrace: use updated syscall number for syscall auditing
        ARM: 7524/1: support syscall tracing
        ARM: 7519/1: integrator: convert platform devices to Device Tree
        ARM: 7518/1: integrator: convert AMBA devices to device tree
        ARM: 7517/1: integrator: initial device tree support
        ARM: 7516/1: plat-versatile: add DT support to FPGA IRQ
        ARM: 7515/1: integrator: check PL010 base address from resource
        ARM: 7514/1: integrator: call common init function from machine
        ARM: 7522/1: arch_timers: register a time/cycle counter
        ARM: 7523/1: arch_timers: enable the use of the virtual timer
        ARM: 7531/1: mark kernelmode mem{cpy,set} non-experimental
        ARM: 7520/1: Build dtb files in all target
        ARM: Fix build warning in arch/arm/mm/alignment.c
        ...
      0e51793e
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze · 5cad3598
      Linus Torvalds authored
      Pull microblaze arch updates from Michal Simek.
      
      * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
        Revert "microblaze_mmu_v2: Update signal returning address"
        microblaze: Added more support for PCI
        microblaze: Prefer to use pr_XXX instead of printk(KERN_XX)
        microblaze: Fix bug with passing command line
        microblaze: Remove PAGE properties duplication
        microblaze: Remove additional andi which has been already done
        microblaze: Use predefined macro for ESR_DIZ
        microblaze: Support 4k/16k/64k pages
        microblaze: Do not used hardcoded value in exception handler
        microblaze: Added fdt chosen capability for timer
        microblaze: Add support for ioreadXX/iowriteXX_rep
        microblaze: Improve failure handling for GPIO reset
        microblaze: clinkage.h
      5cad3598
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 638c87a9
      Linus Torvalds authored
      Pull IMA bugfix (security subsystem) from James Morris.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        ima: fix bug in argument order
      638c87a9
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 7cb9cf02
      Linus Torvalds authored
      Pull m68knommu arch updates from Greg Ungerer:
       "Most of it is a cleanup of the ColdFire hardware header files.  We
        have had a few occurrances of bugs caused by inconsistent definitions
        of peripheral addresses.  These patches make them all consistent, and
        also clean out a bunch of old crap.  Overall we remove about 1000
        lines."
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (27 commits)
        m68knommu: fix inconsistent formating in ColdFire 5407 definitions
        m68knommu: fix inconsistent formating in ColdFire 5307 definitions
        m68knommu: fix inconsistent formating in ColdFire 527x definitions
        m68knommu: fix inconsistent formating in ColdFire 5272 definitions
        m68knommu: fix inconsistent formating in ColdFire 523x definitions
        m68knommu: clean up ColdFire 54xx General Timer definitions
        m68knommu: clean up Pin Assignment definitions for the 54xx ColdFire CPU
        m68knommu: fix multi-function pin setup for FEC module on ColdFire 523x
        m68knommu: move ColdFire slice timer address defiens to 54xx header
        m68knommu: use read/write IO access functions in ColdFire m532x setup code
        m68knommu: modify ColdFire 532x GPIO register definitions to be consistent
        m68knommu: remove a lot of unsed definitions for 532x ColdFire
        m68knommu: use definitions for the ColdFire 528x FEC multi-function pins
        m68knommu: remove address offsets relative to IPSBAR for ColdFire 527x
        m68knommu: remove unused ColdFire 5282 register definitions
        m68knommu: fix wrong register offsets used for ColdFire 5272 multi-function pins
        m68knommu: make ColdFire 5249 MBAR2 register definitions absolute addresses
        m68knommu: make remaining ColdFire 5272 register definitions absolute addresses
        m68knommu: make ColdFire Park and Assignment register definitions absolute addresses
        m68knommu: make ColdFire Chip Select register definitions absolute addresses
        ...
      7cb9cf02
    • Linus Torvalds's avatar
      Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · dc92b1f9
      Linus Torvalds authored
      Pull virtio changes from Rusty Russell:
       "New workflow: same git trees pulled by linux-next get sent straight to
        Linus.  Git is awkward at shuffling patches compared with quilt or mq,
        but that doesn't happen often once things get into my -next branch."
      
      * 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (24 commits)
        lguest: fix occasional crash in example launcher.
        virtio-blk: Disable callback in virtblk_done()
        virtio_mmio: Don't attempt to create empty virtqueues
        virtio_mmio: fix off by one error allocating queue
        drivers/virtio/virtio_pci.c: fix error return code
        virtio: don't crash when device is buggy
        virtio: remove CONFIG_VIRTIO_RING
        virtio: add help to CONFIG_VIRTIO option.
        virtio: support reserved vqs
        virtio: introduce an API to set affinity for a virtqueue
        virtio-ring: move queue_index to vring_virtqueue
        virtio_balloon: not EXPERIMENTAL any more.
        virtio-balloon: dependency fix
        virtio-blk: fix NULL checking in virtblk_alloc_req()
        virtio-blk: Add REQ_FLUSH and REQ_FUA support to bio path
        virtio-blk: Add bio-based IO path for virtio-blk
        virtio: console: fix error handling in init() function
        tools: Fix pthread flag for Makefile of trace-agent used by virtio-trace
        tools: Add guest trace agent as a user tool
        virtio/console: Allocate scatterlist according to the current pipe size
        ...
      dc92b1f9
    • Linus Torvalds's avatar
      Merge tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 5e090ed7
      Linus Torvalds authored
      Pull late ARM soc platform updates from Olof Johansson:
       "This branch contains updates to OMAP and Marvell platforms (kirkwood,
        dove, mvebu) that came in after we had done the big multiplatform
        merges, so they were kept separate from the rest, and not separated
        into the traditional topics of cleanup/driver/platform features.
      
        For OMAP, the updates are:
         - Runtime PM conversions for the GPMC and RNG IP blocks
         - Preparation patches for the OMAP common clock framework conversion
         - clkdev alias additions required by other drivers
         - Performance Monitoring Unit (PMU) support for OMAP2, 3, and
           non-4430 OMAP4
         - OMAP hwmod code and data improvements
         - Preparation patches for the IOMMU runtime PM conversion
         - Preparation patches for OMAP4 full-chip retention support
      
        For Kirkwood/Dove/mvebu:
         - New driver for "address decoder controller" for mvebu, which is a
           piece of hardware that configures addressable devices and
           peripherals.  First user is the boot rom aperture on armada XP
           since it is needed for SMP support.
         - New device tree bindings for peripherals such as gpio-fan, iconnect
           nand, mv_cesa and the above address decoder controller.
         - Some defconfig updates, mostly to enable new DT boards and a few
           drivers.
         - New drivers using the pincontrol subsystem for dove, kirkwood and
           mvebu
         - New clean gpio driver for mvebu"
      
      * tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (98 commits)
        ARM: mvebu: fix build breaks from multi-platform conversion
        ARM: OMAP4460/4470: PMU: Enable PMU for OMAP4460/70
        ARM: OMAP2+: PMU: Add runtime PM support
        ARM: OMAP4430: PMU: prepare to create PMU device via HWMOD
        ARM: OMAP2+: PMU: Convert OMAP2/3 devices to use HWMOD
        ARM: OMAP3: hwmod data: Add debugss HWMOD data
        ARM: OMAP2+: clockdomain/hwmod: add workaround for EMU clockdomain idle problems
        ARM: OMAP: Add a timer attribute for timers that can interrupt the DSP
        hwrng: OMAP: remove SoC restrictions from driver registration
        ARM: OMAP: split OMAP1, OMAP2+ RNG device registration
        hwrng: OMAP: convert to use runtime PM
        hwrng: OMAP: store per-device data in per-device variables, not file statics
        ARM: OMAP2xxx: hwmod/CM: add RNG integration data
        ARM: OMAP2+: gpmc: minimal driver support
        ARM: OMAP2+: gpmc: Adapt to HWMOD
        ARM: OMAP2/3: hwmod data: add gpmc
        ARM: OMAP4: hwmod data: add mmu hwmod for ipu and dsp
        ARM: OMAP3: hwmod data: add mmu data for iva and isp
        ARM: OMAP: iommu: fix including iommu.h without IOMMU_API selected
        ARM: OMAP4: hwmod data: add missing HWMOD_NO_IDLEST flags to some PRCM IP blocks
        ...
      5e090ed7
    • Linus Torvalds's avatar
      Merge tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 84424026
      Linus Torvalds authored
      Pull ARM soc defconfig updates from Olof Johansson:
       "This might be the last time we do a standalone defconfig branch, since
        we now prefer to get them with the rest of the subarch updates
        instead.  These add a handful of useful options on various platforms,
        enable new boards and SoCs, etc."
      
      * tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: tegra: defconfig updates
        ARM: LPC32xx: Defconfig update
        ARM: mach-shmobile: marzen: defconfig update
        ARM: mxs_defconfig: Add SPI and LRADC support
        ARM: s3c6400_defconfig: enable more boards in defconfig
        ARM: imx_v6_v7_defconfig: Remove CONFIG_DEFAULT_MMAP_MIN_ADDR
        ARM: imx_v6_v7_defconfig: Add Chipidea USB driver support
        ARM: mxs_defconfig: Add framebuffer support
        ARM: mxs_defconfig: Add LED, PWM and MTD_CHAR support
        ARM: mxs_defconfig: Enable USB host
      84424026
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 0b8e74c6
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
       "The first part of the media updates for Kernel 3.7.
      
        This series contain:
      
         - A major tree renaming patch series: now, drivers are organized
           internally by their used bus, instead of by V4L2 and/or DVB API,
           providing a cleaner driver location for hybrid drivers that
           implement both APIs, and allowing to cleanup the Kconfig items and
           make them more intuitive for the end user;
      
         - Media Kernel developers are typically very lazy with their duties
           of keeping the MAINTAINERS entries for their drivers updated.  As
           now the tree is more organized, we're doing an effort to add/update
           those entries for the drivers that aren't currently orphan;
      
         - Several DVB USB drivers got moved to a new DVB USB v2 core; the new
           core fixes several bugs (as the existing one that got bitroted).
           Now, suspend/resume finally started to work fine (at least with
           some devices - we should expect more work with regards to it);
      
         - added multistream support for DVB-T2, and unified the API for
           DVB-S2 and ISDB-S.  Backward binary support is preserved;
      
         - as usual, a few new drivers, some V4L2 core improvements and lots
           of drivers improvements and fixes.
      
        There are some points to notice on this series:
      
         1) you should expect a trivial merge conflict on your tree, with the
            removal of Documentation/feature-removal-schedule.txt: this series
            would be adding two additional entries there.  I opted to not
            rebase it due to this recent change;
      
         2) With regards to the PCTV 520e udev-related breakage, I opted to
            fix it in a way that the patches can be backported to 3.5 even
            without your firmware fix patch.  This way, Greg doesn't need to
            rush backporting your patch (as there are still the firmware cache
            and firmware path customization issues to be addressed there).
      
            I'll send later a patch (likely after the end of the merge window)
            reverting the rest of the DRX-K async firmware request, fully
            restoring its original behaviour to allow media drivers to
            initialize everything serialized as before for 3.7 and upper.
      
         3) I'm planning to work on this weekend to test the DMABUF patches
            for V4L2.  The patches are on my queue for several Kernel cycles,
            but, up to now, there is/was no way to test the series locally.
      
            I have some concerns about this particular changeset with regards
            to security issues, and with regards to the replacement of the old
            VIDIOC_OVERLAY ioctl's that is broken on modern systems, due to
            GPU drivers change.  The Overlay API allows direct PCI2PCI
            transfers from a media capture card into the GPU framebuffer, but
            its API is crappy.  Also, the only existing X11 driver that
            implements it requires a XV extension that is not available
            anymore on modern drivers.  The DMABUF can do the same thing, but
            with it is promising to be a properly-designed API.  If I can
            successfully test this series and be happy with it, I should be
            asking you to pull them next week."
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (717 commits)
        em28xx: regression fix: use DRX-K sync firmware requests on em28xx
        drxk: allow loading firmware synchrousnously
        em28xx: Make all em28xx extensions to be initialized asynchronously
        [media] tda18271: properly report read errors in tda18271_get_id
        [media] tda18271: delay IR & RF calibration until init() if delay_cal is set
        [media] MAINTAINERS: add Michael Krufky as tda827x maintainer
        [media] MAINTAINERS: add Michael Krufky as tda8290 maintainer
        [media] MAINTAINERS: add Michael Krufky as cxusb maintainer
        [media] MAINTAINERS: add Michael Krufky as lg2160 maintainer
        [media] MAINTAINERS: add Michael Krufky as lgdt3305 maintainer
        [media] MAINTAINERS: add Michael Krufky as mxl111sf maintainer
        [media] MAINTAINERS: add Michael Krufky as mxl5007t maintainer
        [media] MAINTAINERS: add Michael Krufky as tda18271 maintainer
        [media] s5p-tv: Report only multi-plane capabilities in vidioc_querycap
        [media] s5p-mfc: Fix misplaced return statement in s5p_mfc_suspend()
        [media] exynos-gsc: Add missing static storage class specifiers
        [media] exynos-gsc: Remove <linux/version.h> header file inclusion
        [media] s5p-fimc: Fix incorrect condition in fimc_lite_reqbufs()
        [media] s5p-tv: Fix potential NULL pointer dereference error
        [media] s5k6aa: Fix possible NULL pointer dereference
        ...
      0b8e74c6
    • Linus Torvalds's avatar
      Merge tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore · 7f60ba38
      Linus Torvalds authored
      Pull pstore changes from Anton Vorontsov:
      
       1) We no longer ad-hoc to the function tracer "high level"
          infrastructure and no longer use its debugfs knobs.  The change
          slightly touches kernel/trace directory, but it got the needed ack
          from Steven Rostedt:
      
            http://lkml.org/lkml/2012/8/21/688
      
       2) Added maintainers entry;
      
       3) A bunch of fixes, nothing special.
      
      * tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore:
        pstore: Avoid recursive spinlocks in the oops_in_progress case
        pstore/ftrace: Convert to its own enable/disable debugfs knob
        pstore/ram: Add missing platform_device_unregister
        MAINTAINERS: Add pstore maintainers
        pstore/ram: Mark ramoops_pstore_write_buf() as notrace
        pstore/ram: Fix printk format warning
        pstore/ram: Fix possible NULL dereference
      7f60ba38
    • Linus Torvalds's avatar
      Merge tag 'for-v3.7' of git://git.infradead.org/battery-2.6 · e665faa4
      Linus Torvalds authored
      Pull battery updates from Anton Vorontsov:
       "1. New drivers:
           - Marvell 88pm860x charger and battery drivers;
           - Texas Instruments LP8788 charger driver;
        2. Two new power supply properties: whether a battery is authentic,
           and chargers' maximal currents and voltages;
        3. A lot of TI LP8727 Charger cleanups;
        4. New features for Charger Manager, mainly now we can disable
           specific regulators;
        5. Random fixes and cleanups for other drivers."
      
      Fix up trivial conflicts in <linux/mfd/88pm860x.h>
      
      * tag 'for-v3.7' of git://git.infradead.org/battery-2.6: (52 commits)
        pda_power: Remove ac_draw_failed goto and label
        charger-manager: Add support sysfs entry for charger
        charger-manager: Support limit of maximum possible
        charger-manager: Check fully charged state of battery periodically
        lp8727_charger: More pure cosmetic improvements
        lp8727_charger: Fix checkpatch warning
        lp8727_charger: Add description in the private data
        lp8727_charger: Fix a typo - chg_parm to chg_param
        lp8727_charger: Make some cosmetic changes in lp8727_delayed_func()
        lp8727_charger: Clean up lp8727_charger_changed()
        lp8727_charger: Return if the battery is discharging
        lp8727_charger: Make lp8727_charger_get_propery() simpler
        lp8727_charger: Make lp8727_ctrl_switch() inline
        lp8727_charger: Make lp8727_init_device() shorter
        lp8727_charger: Clean up lp8727_is_charger_attached()
        lp8727_charger: Use specific definition
        lp8727_charger: Clean up lp8727 definitions
        lp8727_charger: Use the definition rather than enum
        lp8727_charger: Fix code for getting battery temp
        lp8727_charger: Clear interrrupts at inital time
        ...
      e665faa4
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · ca4da694
      Linus Torvalds authored
      Pull infiniband changes from Roland Dreier:
        "Second batch of changes for the 3.7 merge window:
         - Late-breaking fix for IPoIB on mlx4 SR-IOV VFs.
         - Fix for IPoIB build breakage with CONFIG_INFINIBAND_IPOIB_CM=n (new
           netlink config changes are to blame).
         - Make sure retry count values are in range in RDMA CM.
         - A few nes hardware driver fixes and cleanups.
         - Have iSER initiator use >1 interrupt vectors if available."
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        RDMA/cma: Check that retry count values are in range
        IB/iser: Add more RX CQs to scale out processing of SCSI responses
        RDMA/nes: Bump the version number of nes driver
        RDMA/nes: Remove unused module parameter "send_first"
        RDMA/nes: Remove unnecessary if-else statement
        RDMA/nes: Add missing break to switch.
        mlx4_core: Adjust flow steering attach wrapper so that IB works on SR-IOV VFs
        IPoIB: Fix build with CONFIG_INFINIBAND_IPOIB_CM=n
      ca4da694
  2. 06 Oct, 2012 3 commits
    • Linus Torvalds's avatar
      Merge branch 'uapi-prep' of git://git.infradead.org/users/dhowells/linux-headers · ed5062dd
      Linus Torvalds authored
      Pull UAPI disintegration fixes from David Howells:
       "There are three main parts:
      
       (1) I found I needed some more fixups in the wake of testing Arm64
           (some asm/unistd.h files had weird guards that caused problems -
           mostly in arches for which I don't have a compiler) and some
           __KERNEL__ splitting needed to take place in Arm64.
      
       (2) I found that c6x was missing some __KERNEL__ guards in its
           asm/signal.h.  Mark Salter pointed me at a tree with a patch to
           remove that file entirely and use the asm-generic variant instead.
      
       (3) Lastly, m68k turned out to have a header installation problem due
           to it lacking a kvm_para.h file.
      
           The conditional installation bits for linux/kvm_para.h, linux/kvm.h
           and linux/a.out.h weren't very well specified - and didn't work if
           an arch didn't have the asm/ version of that file, but there *was*
           an asm-generic/ version.
      
           It seems the "ifneq $((wildcard ...),)" for each of those three
           headers in include/kernel/Kbuild is invoked twice during header
           installation, and the second time it matches on the just installed
           asm-generic/kvm_para.h file and thus incorrectly installs
           linux/kvm_para.h as well.
      
           Most arches actually have an asm/kvm_para.h, so this wasn't
           detectable in those."
      
      * 'uapi-prep' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)
        c6x: remove c6x signal.h
        UAPI: Split compound conditionals containing __KERNEL__ in Arm64
        UAPI: Fix the guards on various asm/unistd.h files
        c6x: make dsk6455 the default config
      ed5062dd
    • Linus Torvalds's avatar
      Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux · 125b79d7
      Linus Torvalds authored
      Pull SLAB changes from Pekka Enberg:
       "New and noteworthy:
      
        * More SLAB allocator unification patches from Christoph Lameter and
          others.  This paves the way for slab memcg patches that hopefully
          will land in v3.8.
      
        * SLAB tracing improvements from Ezequiel Garcia.
      
        * Kernel tainting upon SLAB corruption from Dave Jones.
      
        * Miscellanous SLAB allocator bug fixes and improvements from various
          people."
      
      * 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux: (43 commits)
        slab: Fix build failure in __kmem_cache_create()
        slub: init_kmem_cache_cpus() and put_cpu_partial() can be static
        mm/slab: Fix kmem_cache_alloc_node_trace() declaration
        Revert "mm/slab: Fix kmem_cache_alloc_node_trace() declaration"
        mm, slob: fix build breakage in __kmalloc_node_track_caller
        mm/slab: Fix kmem_cache_alloc_node_trace() declaration
        mm/slab: Fix typo _RET_IP -> _RET_IP_
        mm, slub: Rename slab_alloc() -> slab_alloc_node() to match SLAB
        mm, slab: Rename __cache_alloc() -> slab_alloc()
        mm, slab: Match SLAB and SLUB kmem_cache_alloc_xxx_trace() prototype
        mm, slab: Replace 'caller' type, void* -> unsigned long
        mm, slob: Add support for kmalloc_track_caller()
        mm, slab: Remove silly function slab_buffer_size()
        mm, slob: Use NUMA_NO_NODE instead of -1
        mm, sl[au]b: Taint kernel when we detect a corrupted slab
        slab: Only define slab_error for DEBUG
        slab: fix the DEADLOCK issue on l3 alien lock
        slub: Zero initial memory segment for kmem_cache and kmem_cache_node
        Revert "mm/sl[aou]b: Move sysfs_slab_add to common"
        mm/sl[aou]b: Move kmem_cache refcounting to common code
        ...
      125b79d7
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.7-arm-tag' of... · f1c6872e
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.7-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull ADM Xen support from Konrad Rzeszutek Wilk:
      
        Features:
         * Allow a Linux guest to boot as initial domain and as normal guests
           on Xen on ARM (specifically ARMv7 with virtualized extensions).  PV
           console, block and network frontend/backends are working.
        Bug-fixes:
         * Fix compile linux-next fallout.
         * Fix PVHVM bootup crashing.
      
        The Xen-unstable hypervisor (so will be 4.3 in a ~6 months), supports
        ARMv7 platforms.
      
        The goal in implementing this architecture is to exploit the hardware
        as much as possible.  That means use as little as possible of PV
        operations (so no PV MMU) - and use existing PV drivers for I/Os
        (network, block, console, etc).  This is similar to how PVHVM guests
        operate in X86 platform nowadays - except that on ARM there is no need
        for QEMU.  The end result is that we share a lot of the generic Xen
        drivers and infrastructure.
      
        Details on how to compile/boot/etc are available at this Wiki:
      
          http://wiki.xen.org/wiki/Xen_ARMv7_with_Virtualization_Extensions
      
        and this blog has links to a technical discussion/presentations on the
        overall architecture:
      
          http://blog.xen.org/index.php/2012/09/21/xensummit-sessions-new-pvh-virtualisation-mode-for-arm-cortex-a15arm-servers-and-x86/
      
      * tag 'stable/for-linus-3.7-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (21 commits)
        xen/xen_initial_domain: check that xen_start_info is initialized
        xen: mark xen_init_IRQ __init
        xen/Makefile: fix dom-y build
        arm: introduce a DTS for Xen unprivileged virtual machines
        MAINTAINERS: add myself as Xen ARM maintainer
        xen/arm: compile netback
        xen/arm: compile blkfront and blkback
        xen/arm: implement alloc/free_xenballooned_pages with alloc_pages/kfree
        xen/arm: receive Xen events on ARM
        xen/arm: initialize grant_table on ARM
        xen/arm: get privilege status
        xen/arm: introduce CONFIG_XEN on ARM
        xen: do not compile manage, balloon, pci, acpi, pcpu and cpu_hotplug on ARM
        xen/arm: Introduce xen_ulong_t for unsigned long
        xen/arm: Xen detection and shared_info page mapping
        docs: Xen ARM DT bindings
        xen/arm: empty implementation of grant_table arch specific functions
        xen/arm: sync_bitops
        xen/arm: page.h definitions
        xen/arm: hypercalls
        ...
      f1c6872e
  3. 05 Oct, 2012 19 commits