* Re: CIFS fixes [not found] ` <alpine.LFD.1.10.0805090810390.3142@woody.linux-foundation.org> @ 2008-05-11 16:42 ` Steve French 2008-05-11 16:52 ` Linus Torvalds 0 siblings, 1 reply; 6+ messages in thread From: Steve French @ 2008-05-11 16:42 UTC (permalink / raw To: Linus Torvalds; +Cc: git I am puzzled why I see multiple messages like: Merge branch 'master' of /.../torvalds/linux-2.6 when using: git-request-pull origin git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git I only pulled once (the initial pull after your previous merge of cifs-2.6.git tree, but before I added more patches). On Fri, May 9, 2008 at 10:12 AM, Linus Torvalds <torvalds@linux-foundation.org> wrote: > > > On Thu, 8 May 2008, Steve French wrote: > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git master > > Ugh. Lots of just merging my code back (a third of all the commits were > just merges). Were there really conflicts going on that required that? It > makes the history harder to read.. > > But pulled. > > Linus > -- Thanks, Steve ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: CIFS fixes 2008-05-11 16:42 ` CIFS fixes Steve French @ 2008-05-11 16:52 ` Linus Torvalds 2008-05-11 16:53 ` Steve French 0 siblings, 1 reply; 6+ messages in thread From: Linus Torvalds @ 2008-05-11 16:52 UTC (permalink / raw To: Steve French; +Cc: git On Sun, 11 May 2008, Steve French wrote: > > I am puzzled why I see multiple messages like: > > Merge branch 'master' of /.../torvalds/linux-2.6 > > when using: > > git-request-pull origin > git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git > > I only pulled once (the initial pull after your previous merge of > cifs-2.6.git tree, but before I added more patches). You definitely pulled more than once. There's four merges by you. They don't happen by themselves. There's one on April 25, one on the 27th, one on the 28th, and then a final one on May 6th. Maybe you'd just forgotten that you did the three previous ones, because there's a delay of a week between those and the last one. Linus ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: CIFS fixes 2008-05-11 16:52 ` Linus Torvalds @ 2008-05-11 16:53 ` Steve French 2008-05-11 17:04 ` Linus Torvalds 0 siblings, 1 reply; 6+ messages in thread From: Steve French @ 2008-05-11 16:53 UTC (permalink / raw To: Linus Torvalds; +Cc: git That is not what I meant. I meant that since May 6th I only did one - and those messages still showed up. So I just ran a git-rebase origin which removed them On Sun, May 11, 2008 at 11:52 AM, Linus Torvalds <torvalds@linux-foundation.org> wrote: > > > On Sun, 11 May 2008, Steve French wrote: > > > > I am puzzled why I see multiple messages like: > > > > Merge branch 'master' of /.../torvalds/linux-2.6 > > > > when using: > > > > git-request-pull origin > > git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git > > > > I only pulled once (the initial pull after your previous merge of > > cifs-2.6.git tree, but before I added more patches). > > You definitely pulled more than once. There's four merges by you. They > don't happen by themselves. There's one on April 25, one on the 27th, one > on the 28th, and then a final one on May 6th. > > Maybe you'd just forgotten that you did the three previous ones, because > there's a delay of a week between those and the last one. > > Linus > -- Thanks, Steve ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: CIFS fixes 2008-05-11 16:53 ` Steve French @ 2008-05-11 17:04 ` Linus Torvalds 2008-05-11 17:48 ` Steve French 0 siblings, 1 reply; 6+ messages in thread From: Linus Torvalds @ 2008-05-11 17:04 UTC (permalink / raw To: Steve French; +Cc: git On Sun, 11 May 2008, Steve French wrote: > > That is not what I meant. I meant that since May 6th I only did one > - and those messages still showed up. So I just ran a git-rebase > origin which removed them You're doing something wrong then, and your rebased result is suspect. Have you done a "git fetch" to fetch what is in my current tree? Because if you haven't, then you're generating the "this is the new state" without actually taking into account that the old state was already pulled! And that *old* state contains those four merges that I got from your previous pull request! So now you likely rebased the commits that I already merged (again, because you *think* they are just local to your branch, because you haven't updated your origin reference point), and they are now duplicates of something I already have (but with different commit ID's, since your rebase has moved them around in the history). So now, if I were to pull again, I'd just get the same commits all over again, just as duplicates (plus any new ones, of course). Git would probably merge it all fine - unless your new ones were to the same area as the old ons, in which case it might be unhappy about the fact that both branches changed things in the same area - but the history would be crud. In other words: you *must*not* rebase stuff that you have already publicized. That just creates problems. The good news is that you can most likely fix it all up by just doing git fetch git rebase origin because now the *new* rebase will try to rebase it all over again, but now it will see that I already merged the old ones, so the rebase will just skip those commits, and you should have only the *real* new ones pending again. Linus ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: CIFS fixes 2008-05-11 17:04 ` Linus Torvalds @ 2008-05-11 17:48 ` Steve French 2008-05-11 19:20 ` Linus Torvalds 0 siblings, 1 reply; 6+ messages in thread From: Steve French @ 2008-05-11 17:48 UTC (permalink / raw To: Linus Torvalds; +Cc: git The rebase did fix up the obsolete commits ... but I still get the "warn: No branch of ..." message. I think that will go away when there is another newer commit in your tree. It doesn't seem to be a problem - the list of commits is right. See below: [sfrench@hera cifs-2.6]$ git fetch remote: Counting objects: 1627, done. remote: Compressing objects: 100% (178/178), done. remote: Total 1097 (delta 927), reused 1087 (delta 919) Receiving objects: 100% (1097/1097), 167.04 KiB, done. Resolving deltas: 100% (927/927), completed with 285 local objects. From /pub/scm/linux/kernel/git/torvalds/linux-2.6 28a4acb..5bb7ff7 master -> origin/master [sfrench@hera cifs-2.6]$ git rebase origin First, rewinding head to replay your work on top of it... HEAD is now at 5bb7ff7 Merge master.kernel.org:/home/rmk/linux-2.6-arm Applying [CIFS] cifs_find_tcp_session cleanup Applying [CIFS] add local struct inode pointer to cifs_setattr Applying [CIFS] when not using unix extensions, check for and set ATTR_READONLY on create and mkdir Applying [CIFS] don't allow demultiplex thread to exit until kthread_stop is called [sfrench@hera cifs-2.6]$ git-request-pull origin git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git warn: No branch of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git is at: warn: e691b9d: [CIFS] don't allow demultiplex thread to exit until kthread_stop is called warn: Are you sure you pushed HEAD there? The following changes since commit 5bb7ff795fffc9418e3039cac77b42adcaae1a57: Linus Torvalds (1): Merge master.kernel.org:/home/rmk/linux-2.6-arm are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git ..BRANCH.NOT.VERIFIED.. Cyrill Gorcunov (1): [CIFS] cifs_find_tcp_session cleanup Jeff Layton (2): [CIFS] add local struct inode pointer to cifs_setattr [CIFS] when not using unix extensions, check for and set ATTR_READONLY on create and mkdir Steve French (1): [CIFS] don't allow demultiplex thread to exit until kthread_stop is called fs/cifs/cifspdu.h | 1 + fs/cifs/cifssmb.c | 16 ++++------- fs/cifs/connect.c | 79 +++++++++++++++++++++++++++-------------------------- fs/cifs/dir.c | 16 +++++++++-- fs/cifs/inode.c | 35 ++++++++++++++--------- 5 files changed, 81 insertions(+), 66 deletions(-) On Sun, May 11, 2008 at 12:04 PM, Linus Torvalds <torvalds@linux-foundation.org> wrote: > > > On Sun, 11 May 2008, Steve French wrote: > > > > > That is not what I meant. I meant that since May 6th I only did one > > - and those messages still showed up. So I just ran a git-rebase > > origin which removed them > > You're doing something wrong then, and your rebased result is suspect. > > Have you done a "git fetch" to fetch what is in my current tree? Because > if you haven't, then you're generating the "this is the new state" without > actually taking into account that the old state was already pulled! > > And that *old* state contains those four merges that I got from your > previous pull request! > > So now you likely rebased the commits that I already merged (again, > because you *think* they are just local to your branch, because you > haven't updated your origin reference point), and they are now duplicates > of something I already have (but with different commit ID's, since your > rebase has moved them around in the history). > > So now, if I were to pull again, I'd just get the same commits all over > again, just as duplicates (plus any new ones, of course). Git would > probably merge it all fine - unless your new ones were to the same area as > the old ons, in which case it might be unhappy about the fact that both > branches changed things in the same area - but the history would be crud. > > In other words: you *must*not* rebase stuff that you have already > publicized. That just creates problems. > > The good news is that you can most likely fix it all up by just doing > > git fetch > git rebase origin > > because now the *new* rebase will try to rebase it all over again, but now > it will see that I already merged the old ones, so the rebase will just > skip those commits, and you should have only the *real* new ones pending > again. > > Linus > -- Thanks, Steve ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: CIFS fixes 2008-05-11 17:48 ` Steve French @ 2008-05-11 19:20 ` Linus Torvalds 0 siblings, 0 replies; 6+ messages in thread From: Linus Torvalds @ 2008-05-11 19:20 UTC (permalink / raw To: Steve French; +Cc: git On Sun, 11 May 2008, Steve French wrote: > > The rebase did fix up the obsolete commits ... but I still get the > "warn: No branch of ..." message. I think that will go away when > there is another newer commit in your tree. It doesn't seem to be a > problem - the list of commits is right. See below: No, see the warnings - they tell you exactly what the problem is: > [sfrench@hera cifs-2.6]$ git-request-pull origin > git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git > warn: No branch of > git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git is > at: > warn: e691b9d: [CIFS] don't allow demultiplex thread to exit until > kthread_stop is called > warn: Are you sure you pushed HEAD there? In other words: you didn't push the thing out to your public tree, so it says: "warn: Are you sure you pushed HEAD there?" IOW, if I were to pull, I wouldn't actually get any of it, because you didn't push it out yet, which is why it says it hasn't been verified! Linus ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-05-11 19:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <524f69650805082054g43823f85i623cb2c11cd01039@mail.gmail.com>
[not found] ` <alpine.LFD.1.10.0805090810390.3142@woody.linux-foundation.org>
2008-05-11 16:42 ` CIFS fixes Steve French
2008-05-11 16:52 ` Linus Torvalds
2008-05-11 16:53 ` Steve French
2008-05-11 17:04 ` Linus Torvalds
2008-05-11 17:48 ` Steve French
2008-05-11 19:20 ` Linus Torvalds
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.