Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, Zlatko Calusic wrote: > > I see this -avz incantation mentioned everytime when rsync is > involved. But, is the -z part (compression) really necessary knowing > that we're dealing with an already compressed tree? Doesn't it put > additional strain on the rsync server without

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-20 Thread Zlatko Calusic
Linus Torvalds <[EMAIL PROTECTED]> writes: > Real merges have no patches taking place _anywhere_. And they take about > half a second. Doing an "update" of your tree should _literally_ boil down > to > > # > # "repo" needs to point to the repo we update from > # > rsync -

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Jan-Benedict Glaw
On Tue, 2005-04-19 15:43:54 -0700, Linus Torvalds <[EMAIL PROTECTED]> wrote: > On Wed, 20 Apr 2005, Martin Schlemmer wrote: > > > > Correct me if I am wrong, but the right way to do this is to set the > > hostname to just that - the hostname, and add 'domain foo.com' > > to /etc/resolv.conf. > >

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Steven Cole
On Tuesday 19 April 2005 05:38 pm, Linus Torvalds wrote: > > On Tue, 19 Apr 2005, Steven Cole wrote: > > > > I wasn't complaining about the 4 minutes, just the lack of feedback > > during the majority of that time. And most of it was after the last > > patching file message. > > That should be

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Linus Torvalds
On Tue, 19 Apr 2005, Steven Cole wrote: > > I wasn't complaining about the 4 minutes, just the lack of feedback > during the majority of that time. And most of it was after the last > patching file message. That should be exactly the thing that the new "read-tree -m" fixes. Before, when you r

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 01:04:48AM CEST, I got a letter where Steven Cole <[EMAIL PROTECTED]> told me that... > Then, the flurry of patching file blah messages, followed by a rather > pregnant pause after the last patching message. > > I wasn't complaining about the 4 minutes, just th

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Steven Cole
On Tuesday 19 April 2005 04:38 pm, Linus Torvalds wrote: > > On Tue, 19 Apr 2005, Steven Cole wrote: > > > > But perhaps a progress bar right about here might be > > a good thing for the terminally impatient. > > > > real3m54.909s > > user0m14.835s > > sys 0m10.587s > > > > 4 minutes

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Martin Schlemmer
On Tue, 2005-04-19 at 15:43 -0700, Linus Torvalds wrote: > > On Wed, 20 Apr 2005, Martin Schlemmer wrote: > > > > Correct me if I am wrong, but the right way to do this is to set the > > hostname to just that - the hostname, and add 'domain foo.com' > > to /etc/resolv.conf. > > I'll correct you

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Kenneth Johansson
Greg KH wrote: On Tue, Apr 19, 2005 at 06:27:38PM -0400, Daniel Jacobowitz wrote: On Tue, Apr 19, 2005 at 03:00:04PM -0700, Linus Torvalds wrote: On Tue, 19 Apr 2005, Greg KH wrote: It looks like your domain name isn't set up properly for your box (which is why it worked for you, but not me before,

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 12:38:17AM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > Just say no to patches. FYI, I've - per Junio's suggestion - made git merge's fast-forward to apply show-diff output as a patch instead. This is roughly equal to doing th

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 12:45:02AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > > "PB" == Petr Baudis <[EMAIL PROTECTED]> writes: > > PB> I'm wondering if doing > > PB> if [ "$(show-diff)" ]; then > PB> git diff | git apply > PB> else > PB> c

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Lars Fenneberg
Hi all! Quoting Linus Torvalds ([EMAIL PROTECTED]): > And even the ones that use domainname tend to not have a fully qualified > DNS domain there. You need to use dnsdomainname to get that, and I don't > even know how to do it with standard libc. I don't think getdomainname should be used at a

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Linus Torvalds
On Wed, 20 Apr 2005, Petr Baudis wrote: > > I will probably not buy git-export, though. (That is, it is merged, but > I won't make git frontend for it.) My "git export" already does > something different, but more importantly, "git patch" of mine already > does effectively the same thing as you

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Linus Torvalds
On Tue, 19 Apr 2005, Daniel Jacobowitz wrote: > > Easiest might be to punt to hostname --fqdn, or an equivalent to its > algorithm - which appears to be fetch the hostname from uname, do a DNS > lookup on that, and a reverse DNS lookup on the result. Hah. I'll just commit my patch, and for any

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Junio C Hamano
> "PB" == Petr Baudis <[EMAIL PROTECTED]> writes: PB> I'm wondering if doing PB> if [ "$(show-diff)" ]; then PB> git diff | git apply PB> else PB> checkout-cache -f -a PB> fi PB> would actually buy us some time; or, how common is it for people to have PB> no local changes whatsoever,

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Linus Torvalds
On Wed, 20 Apr 2005, Martin Schlemmer wrote: > > Correct me if I am wrong, but the right way to do this is to set the > hostname to just that - the hostname, and add 'domain foo.com' > to /etc/resolv.conf. I'll correct you. The fact is, that's not what people do. Not me, not kernel.org, not _

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 10:20:47PM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > Pasky? Can you check my latest git stuff, notably read-tree.c and the > changes to git-pull-script? I've made git merge to use read-tree -m, HTH. I will probably not buy

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Linus Torvalds
On Tue, 19 Apr 2005, Steven Cole wrote: > > But perhaps a progress bar right about here might be > a good thing for the terminally impatient. > > real3m54.909s > user0m14.835s > sys 0m10.587s > > 4 minutes might be long enough to cause some folks to lose hope. Well, the real operat

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Greg KH
On Tue, Apr 19, 2005 at 06:27:38PM -0400, Daniel Jacobowitz wrote: > On Tue, Apr 19, 2005 at 03:00:04PM -0700, Linus Torvalds wrote: > > > > > > On Tue, 19 Apr 2005, Greg KH wrote: > > > > > > It looks like your domain name isn't set up properly for your box (which > > > is why it worked for you

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Daniel Jacobowitz
On Tue, Apr 19, 2005 at 03:00:04PM -0700, Linus Torvalds wrote: > > > On Tue, 19 Apr 2005, Greg KH wrote: > > > > It looks like your domain name isn't set up properly for your box (which > > is why it worked for you, but not me before, causing that patch). > > No, I think it's a bug in your dom

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 12:19:01AM CEST, I got a letter where Steven Cole <[EMAIL PROTECTED]> told me that... > Linus Torvalds wrote: > > > >On Tue, 19 Apr 2005, Greg KH wrote: > > > >>Nice, it looks like the merge of this tree, and my usb tree worked just > >>fine. > > > > > >Yup, it a

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Martin Schlemmer
On Tue, 2005-04-19 at 15:00 -0700, Linus Torvalds wrote: > > On Tue, 19 Apr 2005, Greg KH wrote: > > > > It looks like your domain name isn't set up properly for your box (which > > is why it worked for you, but not me before, causing that patch). > > No, I think it's a bug in your domainname ch

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Steven Cole
Linus Torvalds wrote: On Tue, 19 Apr 2005, Greg KH wrote: Nice, it looks like the merge of this tree, and my usb tree worked just fine. Yup, it all seems to work out. [many files patched] patching file mm/mmap.c patching file net/bridge/br_sysfs_if.c patching file scripts/ver_linux ---

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Linus Torvalds
On Tue, 19 Apr 2005, Greg KH wrote: > > It looks like your domain name isn't set up properly for your box (which > is why it worked for you, but not me before, causing that patch). No, I think it's a bug in your domainname changes. I don't think you should do the domainname at all if the hostna

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Greg KH
On Tue, Apr 19, 2005 at 01:20:47PM -0700, Linus Torvalds wrote: > > > On Tue, 19 Apr 2005, Greg KH wrote: > > > > Ok, if you want some practice with "real" merges, feel free to merge from > > the following two trees whenever you are ready: > > kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Linus Torvalds
On Tue, 19 Apr 2005, Greg KH wrote: > > Ok, if you want some practice with "real" merges, feel free to merge from > the following two trees whenever you are ready: > kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6.git/ > for 11 aoe bugfix patches, and: > kernel.org/pub/scm/linux/k

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Greg KH
On Tue, Apr 19, 2005 at 12:40:44PM -0700, Linus Torvalds wrote: > I'm still working out some performance issues with merges (the actual > "merge" operation itself is very fast, but I've been trying to make the > subsequent "update the working directory tree to the right thing" be much > better). O

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Linus Torvalds
On Tue, 19 Apr 2005, Greg KH wrote: > > Nice, it looks like the merge of this tree, and my usb tree worked just > fine. Yup, it all seems to work out. > So, what does this now mean? Is your kernel.org git tree now going to > be the "real" kernel tree that you will be working off of now? Shou

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Greg KH
On Mon, Apr 18, 2005 at 09:39:38PM -0700, Greg KH wrote: > Alright, let's try some small i2c and w1 patches... > > Could you merge with: > kernel.org/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git/ Nice, it looks like the merge of this tree, and my usb tree worked just fine. So, what does thi