1. 16 Jan, 2012 4 commits
  2. 15 Jan, 2012 17 commits
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 122804ec
      Linus Torvalds authored
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (655 commits)
        [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver
        mb86a20s: Add a few more register settings at the init seq
        mb86a20s: Group registers into the same line
        [media] [PATCH] don't reset the delivery system on DTV_CLEAR
        [media] [BUG] it913x-fe fix typo error making SNR levels unstable
        [media] cx23885: Query the CX25840 during enum_input for status
        [media] cx25840: Add support for g_input_status
        [media] rc-videomate-m1f.c Rename to match remote controler name
        [media] drivers: media: au0828: Fix dependency for VIDEO_AU0828
        [media] convert drivers/media/* to use module_platform_driver()
        [media] drivers: video: cx231xx: Fix dependency for VIDEO_CX231XX_DVB
        [media] Exynos4 JPEG codec v4l2 driver
        [media] doc: v4l: selection: choose pixels as units for selection rectangles
        [media] v4l: s5p-tv: mixer: fix setup of VP scaling
        [media] v4l: s5p-tv: mixer: add support for selection API
        [media] v4l: emulate old crop API using extended crop/compose API
        [media] doc: v4l: add documentation for selection API
        [media] doc: v4l: add binary images for selection API
        [media] v4l: add support for selection api
        [media] hd29l2: fix review findings
        ...
      122804ec
    • Linus Torvalds's avatar
      Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block · 16008d64
      Linus Torvalds authored
      * 'for-3.3/drivers' of git://git.kernel.dk/linux-block:
        mtip32xx: do rebuild monitoring asynchronously
        xen-blkfront: Use kcalloc instead of kzalloc to allocate array
        mtip32xx: uninitialized variable in mtip_quiesce_io()
        mtip32xx: updates based on feedback
        xen-blkback: convert hole punching to discard request on loop devices
        xen/blkback: Move processing of BLKIF_OP_DISCARD from dispatch_rw_block_io
        xen/blk[front|back]: Enhance discard support with secure erasing support.
        xen/blk[front|back]: Squash blkif_request_rw and blkif_request_discard together
        mtip32xx: update to new ->make_request() API
        mtip32xx: add module.h include to avoid conflict with moduleh tree
        mtip32xx: mark a few more items static
        mtip32xx: ensure that all local functions are static
        mtip32xx: cleanup compat ioctl handling
        mtip32xx: fix warnings/errors on 32-bit compiles
        block: Add driver for Micron RealSSD pcie flash cards
      16008d64
    • Linus Torvalds's avatar
      Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-block · b3c9dd18
      Linus Torvalds authored
      * 'for-3.3/core' of git://git.kernel.dk/linux-block: (37 commits)
        Revert "block: recursive merge requests"
        block: Stop using macro stubs for the bio data integrity calls
        blockdev: convert some macros to static inlines
        fs: remove unneeded plug in mpage_readpages()
        block: Add BLKROTATIONAL ioctl
        block: Introduce blk_set_stacking_limits function
        block: remove WARN_ON_ONCE() in exit_io_context()
        block: an exiting task should be allowed to create io_context
        block: ioc_cgroup_changed() needs to be exported
        block: recursive merge requests
        block, cfq: fix empty queue crash caused by request merge
        block, cfq: move icq creation and rq->elv.icq association to block core
        block, cfq: restructure io_cq creation path for io_context interface cleanup
        block, cfq: move io_cq exit/release to blk-ioc.c
        block, cfq: move icq cache management to block core
        block, cfq: move io_cq lookup to blk-ioc.c
        block, cfq: move cfqd->icq_list to request_queue and add request->elv.icq
        block, cfq: reorganize cfq_io_context into generic and cfq specific parts
        block: remove elevator_queue->ops
        block: reorder elevator switch sequence
        ...
      
      Fix up conflicts in:
       - block/blk-cgroup.c
      	Switch from can_attach_task to can_attach
       - block/cfq-iosched.c
      	conflict with now removed cic index changes (we now use q->id instead)
      b3c9dd18
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 83c2f912
      Linus Torvalds authored
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (39 commits)
        perf tools: Fix compile error on x86_64 Ubuntu
        perf report: Fix --stdio output alignment when --showcpuutilization used
        perf annotate: Get rid of field_sep check
        perf annotate: Fix usage string
        perf kmem: Fix a memory leak
        perf kmem: Add missing closedir() calls
        perf top: Add error message for EMFILE
        perf test: Change type of '-v' option to INCR
        perf script: Add missing closedir() calls
        tracing: Fix compile error when static ftrace is enabled
        recordmcount: Fix handling of elf64 big-endian objects.
        perf tools: Add const.h to MANIFEST to make perf-tar-src-pkg work again
        perf tools: Add support for guest/host-only profiling
        perf kvm: Do guest-only counting by default
        perf top: Don't update total_period on process_sample
        perf hists: Stop using 'self' for struct hist_entry
        perf hists: Rename total_session to total_period
        x86: Add counter when debug stack is used with interrupts enabled
        x86: Allow NMIs to hit breakpoints in i386
        x86: Keep current stack in NMI breakpoints
        ...
      83c2f912
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f0ed5b9a
      Linus Torvalds authored
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, atomic: atomic64_read() take a const pointer
        x86, UV: Update Boot messages for SGI UV2 platform
      f0ed5b9a
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · a520458f
      Linus Torvalds authored
      * 'linux-next' of git://git.infradead.org/ubifs-2.6:
        UBI: use own macros for the layout volume
        UBI: fix nameless volumes handling
        UBIFS: fix non-debug configuration build
      a520458f
    • Antti Palosaari's avatar
      [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver · 12640003
      Antti Palosaari authored
      I added it by mistake. It is useless as no real hardware.
      It even uses even Cypress FX2, general USB bridge chip, default IDs
      that makes driver load all FX2 devices having default ID...
      Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      12640003
    • Richard Weinberger's avatar
      UBI: use own macros for the layout volume · 1f4f4347
      Richard Weinberger authored
      This is a minor nicification: UBI_LAYOUT_VOLUME_TYPE and
      UBI_LAYOUT_VOLUME_ALIGN are currently defined but not used -
      use them.
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
      1f4f4347
    • Richard Weinberger's avatar
      UBI: fix nameless volumes handling · 4a59c797
      Richard Weinberger authored
      Currently it's possible to create a volume without a name. E.g:
      ubimkvol -n 32 -s 2MiB -t static /dev/ubi0 -N ""
      
      After that vtbl_check() will always fail because it does not permit
      empty strings.
      
      Cc: stable@kernel.org
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
      4a59c797
    • Dominique Martinet's avatar
      UBIFS: fix non-debug configuration build · e234b5f2
      Dominique Martinet authored
      Fix a brown paperbag bug introduced by me in the previous commit. I was
      in hurry and forgot about the non-debug case completely.
      
      Artem: amend the commit message and tweak the patch to preserve alignment.
             This made the patch a bit less readable, though.
      Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
      e234b5f2
    • Jens Axboe's avatar
      85a0f7b2
    • Jens Axboe's avatar
      Revert "block: recursive merge requests" · 5d381efb
      Jens Axboe authored
      This reverts commit 27419322.
      
      We have some problems related to selection of empty queues
      that need to be resolved, evidence so far points to the
      recursive merge logic making either being the cause or at
      least the accelerator for this. So revert it for now, until
      we figure this out.
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      5d381efb
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security · c49c41a4
      Linus Torvalds authored
      * 'for-linus' of git://selinuxproject.org/~jmorris/linux-security:
        capabilities: remove __cap_full_set definition
        security: remove the security_netlink_recv hook as it is equivalent to capable()
        ptrace: do not audit capability check when outputing /proc/pid/stat
        capabilities: remove task_ns_* functions
        capabitlies: ns_capable can use the cap helpers rather than lsm call
        capabilities: style only - move capable below ns_capable
        capabilites: introduce new has_ns_capabilities_noaudit
        capabilities: call has_ns_capability from has_capability
        capabilities: remove all _real_ interfaces
        capabilities: introduce security_capable_noaudit
        capabilities: reverse arguments to security_capable
        capabilities: remove the task from capable LSM hook entirely
        selinux: sparse fix: fix several warnings in the security server cod
        selinux: sparse fix: fix warnings in netlink code
        selinux: sparse fix: eliminate warnings for selinuxfs
        selinux: sparse fix: declare selinux_disable() in security.h
        selinux: sparse fix: move selinux_complete_init
        selinux: sparse fix: make selinux_secmark_refcount static
        SELinux: Fix RCU deref check warning in sel_netport_insert()
      
      Manually fix up a semantic mis-merge wrt security_netlink_recv():
      
       - the interface was removed in commit fd778461 ("security: remove
         the security_netlink_recv hook as it is equivalent to capable()")
      
       - a new user of it appeared in commit a38f7907 ("crypto: Add
         userspace configuration API")
      
      causing no automatic merge conflict, but Eric Paris pointed out the
      issue.
      c49c41a4
    • Linus Torvalds's avatar
      Merge tag 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux · 892d208b
      Linus Torvalds authored
      Kmemleak patches
      
      Main features:
      - Handle percpu memory allocations (only scanning them, not actually
        reporting).
      - Memory hotplug support.
      
      Usability improvements:
      - Show the origin of early allocations.
      - Report previously found leaks even if kmemleak has been disabled by
        some error.
      
      * tag 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux:
        kmemleak: Add support for memory hotplug
        kmemleak: Handle percpu memory allocation
        kmemleak: Report previously found leaks even after an error
        kmemleak: When the early log buffer is exceeded, report the actual number
        kmemleak: Show where early_log issues come from
      892d208b
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers · dca88ad6
      Linus Torvalds authored
      * 'for-next' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: Split trivial #if defined(__KERNEL__) && X conditionals
        UAPI: Don't have a #elif clause in a __KERNEL__ guard in linux/soundcard.h
        UAPI: Fix AHZ multiple inclusion when __KERNEL__ is removed
        UAPI: Make linux/patchkey.h easier to parse
        UAPI: Fix nested __KERNEL__ guards in video/edid.h
        UAPI: Alter the S390 asm include guards to be recognisable by the UAPI splitter
        UAPI: Guard linux/cuda.h
        UAPI: Guard linux/pmu.h
        UAPI: Guard linux/isdn_divertif.h
        UAPI: Guard linux/sound.h
        UAPI: Rearrange definition of HZ in asm-generic/param.h
        UAPI: Make FRV use asm-generic/param.h
        UAPI: Make M32R use asm-generic/param.h
        UAPI: Make MN10300 use asm-generic/param.h
        UAPI: elf_read_implies_exec() is a kernel-only feature - so hide from userspace
        UAPI: Don't include linux/compat.h in sparc's asm/siginfo.h
        UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y lines
      dca88ad6
    • Miklos Szeredi's avatar
      fsnotify: don't BUG in fsnotify_destroy_mark() · fed47485
      Miklos Szeredi authored
      Removing the parent of a watched file results in "kernel BUG at
      fs/notify/mark.c:139".
      
      To reproduce
      
        add "-w /tmp/audit/dir/watched_file" to audit.rules
        rm -rf /tmp/audit/dir
      
      This is caused by fsnotify_destroy_mark() being called without an
      extra reference taken by the caller.
      
      Reported by Francesco Cosoleto here:
      
        https://bugzilla.novell.com/show_bug.cgi?id=689860
      
      Fix by removing the BUG_ON and adding a comment about not accessing mark after
      the iput.
      Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      CC: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fed47485
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig · 1e6c4dfd
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig:
        kconfig/streamline-config.pl: Fix parsing Makefile with variables
        kconfig/streamline-config.pl: Simplify backslash line concatination
      1e6c4dfd
  3. 14 Jan, 2012 19 commits
    • Arnaud Lacombe's avatar
      kbuild: Fix compiler warning with assertion when calling 'fwrite' · 37ae2d59
      Arnaud Lacombe authored
      Reinhard Tartler discovered a corner case of calling xfwrite() where the
      length of the string is zero.
      
      Arnaud Lacombe suggested to use assertion for the corner case, as
      fwrite(3) is currently used:
      
       1) in comment printers. Empty comment are not allowed.
       2) in a callback passed to expr_print(), where the string printed is
          either NULL OR non-empty.
       3) in the lexer, auto-generated, and unused.
      
      I feel using assertion is a good solution:
      
       1) It cleanly takes care of the above-mentioned corner case.
       2) It can be easily disabled by defining NDEBUG.
       3) It asserts xfwrite() is simply a wrapper for fwrite().
      Reported-by: default avatarReinhard Tartler <Reinhard.Tartler@informatik.uni-erlangen.de>
      Signed-off-by: default avatarArnaud Lacombe <lacombar@gmail.com>
      Signed-off-by: default avatarJean Sacren <sakiwit@gmail.com>
      Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
      37ae2d59
    • Peter Foley's avatar
      Improve update-po-config output · e2aef4d3
      Peter Foley authored
      Make the V=0 output from update-po-config be aligned correctly.
      Also remove an outdated comment and add a "GEN" statement.
      Signed-off-by: default avatarPeter Foley <pefoley2@verizon.net>
      Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
      e2aef4d3
    • Linus Torvalds's avatar
      Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 · 51be0841
      Linus Torvalds authored
      * 'fbdev-next' of git://github.com/schandinat/linux-2.6: (175 commits)
        module_param: make bool parameters really bool (drivers/video/i810)
        Revert "atmel_lcdfb: Adjust HFP calculation so it matches the manual."
        OMAPDSS: HDMI: Disable DDC internal pull up
        OMAPDSS: HDMI: Move duplicate code from boardfile
        OMAPDSS: add OrtusTech COM43H4M10XTC display support
        OMAP: DSS2: Support for UMSH-8173MD TFT panel
        ASoC: OMAP: HDMI: Move HDMI codec trigger function to generic HDMI driver
        OMAPDSS: HDMI: Create function to enable HDMI audio
        ASoC: OMAP: HDMI: Correct signature of ASoC functions
        ASoC: OMAP: HDMI: Introduce driver data for audio codec
        grvga: fix section mismatch warnings
        video: s3c-fb: Don't keep device runtime active when open
        video: s3c-fb: Hold runtime PM references when touching registers
        video: s3c-fb: Take a runtime PM reference when unblanked
        video: s3c-fb: Disable runtime PM in error paths from probe
        video: s3c-fb: Use s3c_fb_enable() to enable the framebuffer
        video: s3c-fb: Make runtime PM functional again
        drivers/video: fsl-diu-fb: merge fsl_diu_alloc() into map_video_memory()
        drivers/video: fsl-diu-fb: add default platform ops functions
        drivers/video: fsl-diu-fb: remove broken reference count enabling the display
        ...
      51be0841
    • Paolo Bonzini's avatar
      dm: do not forward ioctls from logical volumes to the underlying device · ec8013be
      Paolo Bonzini authored
      A logical volume can map to just part of underlying physical volume.
      In this case, it must be treated like a partition.
      
      Based on a patch from Alasdair G Kergon.
      
      Cc: Alasdair G Kergon <agk@redhat.com>
      Cc: dm-devel@redhat.com
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ec8013be
    • Paolo Bonzini's avatar
      block: fail SCSI passthrough ioctls on partition devices · 0bfc96cb
      Paolo Bonzini authored
      Linux allows executing the SG_IO ioctl on a partition or LVM volume, and
      will pass the command to the underlying block device.  This is
      well-known, but it is also a large security problem when (via Unix
      permissions, ACLs, SELinux or a combination thereof) a program or user
      needs to be granted access only to part of the disk.
      
      This patch lets partitions forward a small set of harmless ioctls;
      others are logged with printk so that we can see which ioctls are
      actually sent.  In my tests only CDROM_GET_CAPABILITY actually occurred.
      Of course it was being sent to a (partition on a) hard disk, so it would
      have failed with ENOTTY and the patch isn't changing anything in
      practice.  Still, I'm treating it specially to avoid spamming the logs.
      
      In principle, this restriction should include programs running with
      CAP_SYS_RAWIO.  If for example I let a program access /dev/sda2 and
      /dev/sdb, it still should not be able to read/write outside the
      boundaries of /dev/sda2 independent of the capabilities.  However, for
      now programs with CAP_SYS_RAWIO will still be allowed to send the
      ioctls.  Their actions will still be logged.
      
      This patch does not affect the non-libata IDE driver.  That driver
      however already tests for bd != bd->bd_contains before issuing some
      ioctl; it could be restricted further to forbid these ioctls even for
      programs running with CAP_SYS_ADMIN/CAP_SYS_RAWIO.
      
      Cc: linux-scsi@vger.kernel.org
      Cc: Jens Axboe <axboe@kernel.dk>
      Cc: James Bottomley <JBottomley@parallels.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      [ Make it also print the command name when warning - Linus ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0bfc96cb
    • Paolo Bonzini's avatar
      block: add and use scsi_blk_cmd_ioctl · 577ebb37
      Paolo Bonzini authored
      Introduce a wrapper around scsi_cmd_ioctl that takes a block device.
      
      The function will then be enhanced to detect partition block devices
      and, in that case, subject the ioctls to whitelisting.
      
      Cc: linux-scsi@vger.kernel.org
      Cc: Jens Axboe <axboe@kernel.dk>
      Cc: James Bottomley <JBottomley@parallels.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      577ebb37
    • Stephen Warren's avatar
      Kbuild: Use dtc's -d (dependency) option · 7c431851
      Stephen Warren authored
      This hooks dtc into Kbuild's dependency system.
      
      Thus, for example, "make dtbs" will rebuild tegra-harmony.dtb if only
      tegra20.dtsi has changed yet tegra-harmony.dts has not. The previous
      lack of this feature recently caused me to have very confusing "git
      bisect" results.
      
      For ARM, it's obvious what to add to $(targets). I'm not familiar enough
      with other architectures to know what to add there. Powerpc appears to
      already add various .dtb files into $(targets), but the other archs may
      need something added to $(targets) to work.
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
      [mmarek: Dropped arch/c6x part to avoid merging commits from the middle
      of the merge window]
      Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
      7c431851
    • Stephen Warren's avatar
      dtc: Implement -d option to write out a dependency file · 136ec204
      Stephen Warren authored
      This will allow callers to rebuild .dtb files when any of the /include/d
      .dtsi files are modified, not just the top-level .dts file.
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
      136ec204
    • Linus Torvalds's avatar
      Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6 · 81d48f0a
      Linus Torvalds authored
      2nd set of device tree changes and SPI bug fixes for v3.3
      
      * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        of/irq: Add interrupts-names property to name an irq resource
        of/address: Add reg-names property to name an iomem resource
      
      * tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        spi/tegra: depend instead of select TEGRA_SYSTEM_DMA
      81d48f0a
    • Linus Torvalds's avatar
      Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6 · f5e4e20f
      Linus Torvalds authored
      2nd round of GPIO changes for v3.3 merge window
      
      * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion
        gpio: pl061: remove combined interrupt
        gpio: pl061: convert to use generic irq chip
        GPIO: add bindings for managed devices
        ARM: realview: convert pl061 no irq to 0 instead of -1
        gpio: pl061: convert to use 0 for no irq
        gpio: pl061: use chained_irq_* functions in irq handler
        GPIO/pl061: Add suspend resume capability
        drivers/gpio/gpio-tegra.c: use devm_request_and_ioremap
      f5e4e20f
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 4964e066
      Linus Torvalds authored
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
        MIPS: Delete unused function add_temporary_entry.
        MIPS: Set default pci cache line size.
        MIPS: Flush huge TLB
        MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
        MIPS: Octeon: Add support for OCTEON II PCIe
        MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
        MIPS: Alchemy: Update cpu-feature-overrides
        MIPS: Alchemy: db1200: Improve PB1200 detection.
        MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
        MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
        MIPS: Alchemy: irq: register pm at irq init time
        MIPS: Alchemy: Touchscreen support on DB1100
        MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
        net/irda: convert au1k_ir to platform driver.
        MIPS: Alchemy: remove unused board headers
        MTD: nand: make au1550nd.c a platform_driver
        MIPS: Netlogic: Mark Netlogic chips as SMT capable
        MIPS: Netlogic: Add support for XLP 3XX cores
        MIPS: Netlogic: Merge some of XLR/XLP wakup code
        MIPS: Netlogic: Add default XLP config.
        ...
      
      Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
      traps.c} and drivers/tty/serial/Makefile
      4964e066
    • Wang YanQing's avatar
      menuconfig: let make not report error when not save configuration · c55ac154
      Wang YanQing authored
      I find every time when I choice the 'NO' button at the dialog
      which let me choice whether to save the configuration before exit
      menuconfig, it always report the blow:
      
      " GEN     /mnt/sda7/home/build/test/Makefile
        HOSTCC  scripts/kconfig/mconf.o
        HOSTLD  scripts/kconfig/mconf
      scripts/kconfig/mconf Kconfig
      
      Your configuration changes were NOT saved.
      
      make[2]: *** [menuconfig] Error 1
      make[1]: *** [menuconfig] Error 2
      make: *** [sub-make] Error 2 "
      
      This patch repair it.
      Signed-off-by: default avatarWang YanQing <udknight@gmail.com>
      Acked-by: default avatarDavidlohr Bueso <dave@gnu.org>
      Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
      c55ac154
    • John Stultz's avatar
      merge_config.sh: fix bug in final check · 320d41bb
      John Stultz authored
      Arnaud Lacombe pointed out the final checking that the requested configs
      were included in the final .config was broken.
      
      The example was that if you had a fragment that disabled
      CONFIG_DECOMPRESS_GZIP applied to a normal defconfig, there would be no
      final warning that CONFIG_DECOMPRESS_GZIP was acutally set in the final
      .config.
      
      This bug was introduced by me in v3 of the original patch, and the
      following patch reverts the invalid change.
      Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
      Reported-by: default avatarArnaud Lacombe <lacombar@gmail.com>
      Cc: Darren Hart <dvhart@linux.intel.com>
      Cc: Michal Marek <mmarek@suse.cz>
      Cc: Arnaud Lacombe <lacombar@gmail.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
      320d41bb
    • Darren Hart's avatar
      merge_config.sh: whitespace cleanup · c0c0cda2
      Darren Hart authored
      Fix whitespace usage in the clean_up routine.
      Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
      Acked-by: default avatarJohn Stultz <john.stultz@linaro.org>
      Cc: Michal Marek <mmarek@suse.cz>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
      c0c0cda2
    • Darren Hart's avatar
      merge_config.sh: use signal names compatible with dash and bash · 041b78c8
      Darren Hart authored
      The SIGHUP SIGINT and SIGTERM names caused failures when running
      merge_config.sh with the dash shell.  Dropping the "SIG" component makes
      the script work in both bash and dash.
      Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
      Acked-by: default avatarJohn Stultz <john.stultz@linaro.org>
      Cc: Michal Marek <mmarek@suse.cz>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
      041b78c8
    • john stultz's avatar
      kconfig: add merge_config.sh script · 4b5f7214
      john stultz authored
      After noticing almost every distro has their own method of managing config
      fragments, I went looking at some best practices, and wanted to try to
      consolidate some of the different approaches so this fairly simple
      infrastructure can be shared (and new distros/build systems don't have to
      implement yet another config fragment merge script).
      
      This script is most influenced by the Windriver tools used in the Yocto
      Project, reusing some portions found there.
      
      This script merges multiple config fragments, warning on any overridden
      values.  It then sets any unspecified values to their default, then
      finally checks to make sure no specified value was dropped due to
      unsatisfied dependencies.
      
      I'm sure this implementation won't work for everyone, and I expect it will
      need to evolve to adapt for various use cases.  But I think its a
      reasonable starting point.
      
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Cc: Greg Thelen <gthelen@google.com>
      Cc: Reinhard Tartler <Reinhard.Tartler@informatik.uni-erlangen.de>
      Cc: Dmitry Fink <Dmitry.Fink@palm.com>
      Cc: Darren Hart <dvhart@linux.intel.com>
      Cc: Eric B Munson <ebmunson@us.ibm.com>
      Cc: Bruce Ashfield <Bruce.Ashfield@windriver.com>
      Cc: Michal Marek <mmarek@suse.cz>
      Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
      4b5f7214
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://github.com/rustyrussell/linux · 0a80939b
      Linus Torvalds authored
      Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999  BFCB D920 0E6C D1AD B8F1
      
      * tag 'for-linus' of git://github.com/rustyrussell/linux:
        module_param: check that bool parameters really are bool.
        intelfbdrv.c: bailearly is an int module_param
        paride/pcd: fix bool verbose module parameter.
        module_param: make bool parameters really bool (drivers & misc)
        module_param: make bool parameters really bool (arch)
        module_param: make bool parameters really bool (core code)
        kernel/async: remove redundant declaration.
        printk: fix unnecessary module_param_name.
        lirc_parallel: fix module parameter description.
        module_param: avoid bool abuse, add bint for special cases.
        module_param: check type correctness for module_param_array
        modpost: use linker section to generate table.
        modpost: use a table rather than a giant if/else statement.
        modules: sysfs - export: taint, coresize, initsize
        kernel/params: replace DEBUGP with pr_debug
        module: replace DEBUGP with pr_debug
        module: struct module_ref should contains long fields
        module: Fix performance regression on modules with large symbol tables
        module: Add comments describing how the "strmap" logic works
      
      Fix up conflicts in scripts/mod/file2alias.c due to the new linker-
      generated table approach to adding __mod_*_device_table entries.  The
      ARM sa11x0 mcp bus needed to be converted to that too.
      0a80939b
    • Linus Torvalds's avatar
      Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux · 0b48d422
      Linus Torvalds authored
      * 'for-3.3' of git://linux-nfs.org/~bfields/linux: (31 commits)
        nfsd4: nfsd4_create_clid_dir return value is unused
        NFSD: Change name of extended attribute containing junction
        svcrpc: don't revert to SVC_POOL_DEFAULT on nfsd shutdown
        svcrpc: fix double-free on shutdown of nfsd after changing pool mode
        nfsd4: be forgiving in the absence of the recovery directory
        nfsd4: fix spurious 4.1 post-reboot failures
        NFSD: forget_delegations should use list_for_each_entry_safe
        NFSD: Only reinitilize the recall_lru list under the recall lock
        nfsd4: initialize special stateid's at compile time
        NFSd: use network-namespace-aware cache registering routines
        SUNRPC: create svc_xprt in proper network namespace
        svcrpc: update outdated BKL comment
        nfsd41: allow non-reclaim open-by-fh's in 4.1
        svcrpc: avoid memory-corruption on pool shutdown
        svcrpc: destroy server sockets all at once
        svcrpc: make svc_delete_xprt static
        nfsd: Fix oops when parsing a 0 length export
        nfsd4: Use kmemdup rather than duplicating its implementation
        nfsd4: add a separate (lockowner, inode) lookup
        nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile error
        ...
      0b48d422
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 8e63dd6e
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: Fix unpaired __trace_hcall_entry and __trace_hcall_exit
        powerpc: Fix RCU idle and hcall tracing
      8e63dd6e