Re: [U-Boot] [PATCH 2/3] fix checkpatch errors

2008-09-09 Thread Hugo Villeneuve
git diff ${GITDIFF_OPTS} ${commit} >> [EMAIL PROTECTED] wrote: > Dear Georg Schardt, > > In message <[EMAIL PROTECTED]> you wrote: >> >> - create my own testing branch: "git branch testing" >> - switch to this branch: "git checkout testing" >> - copy/modify files >> - add the new files with "git

Re: [U-Boot] [PATCH 2/3] fix checkpatch errors

2008-09-08 Thread Haavard Skinnemoen
JerryVanBaren <[EMAIL PROTECTED]> wrote: > Georg Schardt wrote: > > --- > > include/configs/FX12MM.h | 12 ++-- > > 1 files changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/include/configs/FX12MM.h b/include/configs/FX12MM.h > > index b47e403..8b8d41c 100644 > > --- a/inclu

Re: [U-Boot] [PATCH 2/3] fix checkpatch errors

2008-09-08 Thread Wolfgang Denk
Dear JerryVanBaren, In message <[EMAIL PROTECTED]> you wrote: > Georg Schardt wrote: ... > > -#define RM_SYSTEMACE_CMDS | CFG_CMD_FAT > > +#define RM_SYSTEMACE_CMDS ( | CFG_CMD_FAT ) ... > Philosophical question: is it better to put silly parenthesis around > #defines to make checkpa

Re: [U-Boot] [PATCH 2/3] fix checkpatch errors

2008-09-08 Thread JerryVanBaren
Georg Schardt wrote: > --- > include/configs/FX12MM.h | 12 ++-- > 1 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/include/configs/FX12MM.h b/include/configs/FX12MM.h > index b47e403..8b8d41c 100644 > --- a/include/configs/FX12MM.h > +++ b/include/configs/FX12MM.h > @@

Re: [U-Boot] [PATCH 2/3] fix checkpatch errors

2008-09-07 Thread Georg Schardt
Hi again, > This all looks good so far > > >> - then i try "git rebase master" and get the message "Current branch >> master is up to date" >> > > Hm... the "current branch master" makes be believe that you might have > checked out the master branch now? You should still have the "testing"

Re: [U-Boot] [PATCH 2/3] fix checkpatch errors

2008-09-07 Thread Wolfgang Denk
Dear Georg Schardt, In message <[EMAIL PROTECTED]> you wrote: > > - create my own testing branch: "git branch testing" > - switch to this branch: "git checkout testing" > - copy/modify files > - add the new files with "git add board/xilinx/fx12mm/" > - commit the changes with "git commit -a" > -

Re: [U-Boot] [PATCH 2/3] fix checkpatch errors

2008-09-07 Thread Georg Schardt
Dear Wolfgang Denk, thank you for the help. I use the following commands: - create my own testing branch: "git branch testing" - switch to this branch: "git checkout testing" - copy/modify files - add the new files with "git add board/xilinx/fx12mm/" - commit the changes with "git commit -a" - cr

Re: [U-Boot] [PATCH 2/3] fix checkpatch errors

2008-09-06 Thread Wolfgang Denk
Dear Georg Schardt, In message <[EMAIL PROTECTED]> you wrote: > > i tried to rebase my local testing-branch with my local master-branch, > but i always get the message that the branch is up to date. Which exact commands are you using? Best regards, Wolfgang Denk -- DENX Software Engineerin

Re: [U-Boot] [PATCH 2/3] fix checkpatch errors

2008-09-06 Thread Georg Schardt
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 i tried to rebase my local testing-branch with my local master-branch, but i always get the message that the branch is up to date. then i merge my master-branch with "git pull . testing" with the testing-branch, but "git format-patch origin" creat

Re: [U-Boot] [PATCH 2/3] fix checkpatch errors

2008-09-06 Thread Wolfgang Denk
Dear Georg Schardt, In message <[EMAIL PROTECTED]> you wrote: > --- > include/configs/FX12MM.h | 12 ++-- > 1 files changed, 6 insertions(+), 6 deletions(-) This file does not even exist yet. Please fix the code in your local branch, rebase your patch, and resubmit a cleaned up patch.