lkml.org 
[lkml]   [2011]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the security-testing tree with the tree
    Hi James,

    Today's linux-next merge of the security-testing tree produced a large
    number of conflicts in files not modified by the security-testing tree.
    I assume that this is a bug in "git merge" but I cannot complete the
    merge as such.

    I have used the security-testing tree from next-20110628 for today.

    More information for the git experts:

    The security-testing tree is at
    git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
    and I am trying to merge branch "next" into linux-next at commit
    9fd8fab5e299a ("Merge remote-tracking branch 'voltage/for-next'").

    I can merge commit 0e4ae0e0dec6 ("TOMOYO: Make several options
    configurable") from the security testing tree without conflict and also
    commit 25e75dff519b ("AppArmor: Fix masking of capabilities in complain
    mode").

    I cannot merge commit bcd05ca10420 ("Merge branch 'for-security' of
    git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev into next")
    which is the child of the above two commits.

    The tree to commit 25e75dff519b only containes two simple commits
    (modifying 2 files) and is based on v3.0-rc5. The tree to commit
    bcd05ca10420 containes several commits and is based on commit
    06e86849cf40 ("Merge branch 'pm-fixes' of
    git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6") from
    Linus' tree (between v3.0-rc2 and v3.0-rc2).

    After attempting the merge I get this:

    $ git status
    # On branch master
    # Changes to be committed:
    #
    # deleted: Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
    # modified: Documentation/accounting/cgroupstats.txt
    # modified: Documentation/cgroups/blkio-controller.txt
    # modified: Documentation/cgroups/cgroups.txt
    # modified: Documentation/cgroups/cpuacct.txt
    # modified: Documentation/cgroups/cpusets.txt
    .
    . [lots elided]
    .
    # modified: tools/perf/util/PERF-VERSION-GEN
    # modified: tools/perf/util/trace-event-parse.c
    #
    # Unmerged paths:
    # (use "git add/rm <file>..." as appropriate to mark resolution)
    #
    # both modified: arch/arm/mach-shmobile/board-ag5evm.c
    # both modified: arch/arm/mm/context.c
    # both modified: arch/arm/mm/proc-v7.S
    # both modified: arch/arm/plat-mxc/devices/platform-imx-dma.c
    # both modified: arch/arm/plat-s5p/include/plat/map-s5p.h
    # both modified: arch/m68k/Kconfig.nommu
    # both modified: block/blk-throttle.c
    # both modified: drivers/gpu/drm/nouveau/nouveau_fence.c
    # deleted by them: drivers/net/usb/kalmia.c
    # both modified: drivers/net/wireless/iwlegacy/iwl-dev.h
    # both modified: drivers/net/wireless/iwlegacy/iwl4965-base.c
    # both modified: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
    # both modified: drivers/net/wireless/iwlwifi/iwl-agn.c
    # both modified: drivers/net/wireless/rtlwifi/pci.c
    # deleted by them: drivers/video/backlight/adp8870_bl.c
    # both modified: fs/namei.c
    # both modified: fs/nfs/nfs4proc.c
    # both modified: fs/nfs/pnfs.c
    # both modified: fs/proc/base.c
    # both modified: net/bluetooth/rfcomm/sock.c
    # both modified: net/ipv4/ip_output.c
    # both modified: net/netfilter/ipvs/ip_vs_core.c
    # both modified: sound/pci/hda/patch_via.c
    # both modified: sound/soc/codecs/ad1836.h
    # both modified: sound/soc/soc-cache.c
    #

    None of the "Unmerged paths" are modified in the tree I am merging in.

    The linux-next tree will be published later today and James' tree is
    available already (I can publis my copy of it if James modifies his).

    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2011-06-30 06:31    [W:3.622 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site