lkml.org 
[lkml]   [2010]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the block tree with Linus' tree
    Hi Jens,

    Today's linux-next merge of the block tree got a conflict in
    block/Kconfig between commit 67523c48aa74d5637848edeccf285af1c60bf14a
    ("cgroups: blkio subsystem as module") from Linus' tree and commit
    910ac735bad53ce54741a72a5b19ab69794ae069 ("block: make CONFIG_BLK_CGROUP
    visible") from the block tree.

    I used the block tree version.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2010-03-17 02:55    [W:0.018 / U:64.424 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site