From /pub/scm/linux/kernel/git/torvalds/linux-2.6 e4c576b..886c35f master -> linus Switched to branch "2.6.25-mc20" warning: too many files, skipping inexact rename detection fatal: '/pub/scm/linux/kernel/git/davem/net-2.6.25.git': unable to chdir or not a git archive fatal: The remote end hung up unexpectedly error: branch 'net' not found. Already on "2.6.25-mc20" # git /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git master scsi-misc ## Merge made by recursive. Documentation/scsi/ChangeLog.megaraid_sas | 22 ++++++++++++++++++++++ drivers/scsi/ibmvscsi/ibmvscsi.c | 5 ++++- drivers/scsi/ibmvscsi/viosrp.h | 9 +++++++++ drivers/scsi/ipr.c | 2 +- drivers/scsi/megaraid/megaraid_mbox.c | 17 +++++++++++++++++ drivers/scsi/megaraid/megaraid_mbox.h | 1 + drivers/scsi/megaraid/megaraid_sas.c | 2 +- drivers/scsi/megaraid/megaraid_sas.h | 6 +++--- drivers/scsi/scsi.c | 8 ++++++++ 9 files changed, 66 insertions(+), 6 deletions(-) ## # gitfetch /pub/scm/linux/kernel/git/davem/net-2.6.25.git master net ## BRANCH master not in tree /pub/scm/linux/kernel/git/davem/net-2.6.25.git, SKIPPING ## # merge net resolve /home/jejb/net-resolve.diff ## MERGE net not in tree, SKIPPING ## # check ## Differences exist, continuing ## # label ## Created commit 46a81e8: 2.6.25-mc20 1 files changed, 1 insertions(+), 1 deletions(-) ## # diff /pub/linux/kernel/people/jejb/merge-tree/patch- ## ## # log /pub/linux/kernel/people/jejb/merge-tree/log- ##