[git pull] dma-buf tree

[Dave Airlie]

On Mon, Jan 9, 2012 at 6:44 AM, Sumit Semwal <sumit.semwal at linaro.org> wrote:
> On 9 January 2012 03:38, Linus Torvalds <torvalds at linux-foundation.org> wrote:
>> On Fri, Jan 6, 2012 at 7:06 AM, Dave Airlie <airlied at linux.ie> wrote:
>>>
>>> Now we've all agreed that the initial implementation is a good baseline
>>> for us to move forward on, but its messy working with others when the core
>>> code is out of tree. So we'd like to merge the core dma-buf code now so we
>>> can all build on top of it for 3.4. I know some people would say we
>>> shouldn't merge things with no users, but it will really make our lives
>>> easier going forward to get this baseline into the tree.
>>
>> Ok, merged.
> Hi Linus,
> Thanks!
>>
>> However, I ask myself whether it's ever sane to ask the user to enable
>> this? Isn't this very much a "drivers will use 'select' to pick up the
>> intfrastructure code" kind of thing?
> Yes, you're right; I will submit a patch to change appropriately, as
> well as document it as well. Would it be ok to submit this change
> alongwith one of the first users of the framework, or would you rather
> prefer it in the rc2 / rc3 time frame?

I'll just sent this patch to Linus in -fixes if okay

commit 3b32a592ea6e49145d4dc610b85dd9042226896d
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Jan 13 09:05:14 2012 +0000

    dma-buf: drop option text so users don't select it.

    This is going to be used by other subsystems so they should select it.

    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index fcbec8a..7be9f79 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -179,7 +179,7 @@ config GENERIC_CPU_DEVICES
 source "drivers/base/regmap/Kconfig"

 config DMA_SHARED_BUFFER
-       bool "Buffer framework to be shared between drivers"
+       bool
        default n
        select ANON_INODES
        depends on EXPERIMENTAL