[PATCH] W1: w1_netlink: New init/fini netlink callbacks.

tree 7d144ae862363a5fd6bfa031cca04a42cc79d879 parent 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 author Evgeniy Polyakov [EMAIL PROTECTED] Wed, 27 Jul 2005 13:10:11 +0400 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:41:25 -0700 [PATCH] W1: w1_netlink: New init/fini netlink

[PATCH] w1: Added inline functions on top of container_of().

tree f100b05ab42f54740b967a24ba07d79518337f8e parent 5e8eb8501212eb92826ccf191f9ca8c186f531c3 author Evgeniy Polyakov [EMAIL PROTECTED] Thu, 11 Aug 2005 17:27:49 +0400 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:41:26 -0700 [PATCH] w1: Added inline functions on top of

[PATCH] w1: Added add/remove slave callbacks.

tree 2d49373e06fd65aae5217aad864fafb849c8cda2 parent ea7d8f65c865ebfa1d7cd67c360a87333ff013c1 author Evgeniy Polyakov [EMAIL PROTECTED] Thu, 11 Aug 2005 17:27:50 +0400 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:41:26 -0700 [PATCH] w1: Added add/remove slave callbacks.

[PATCH] w1: Added DS2433 driver.

tree 3fb57983caf779f0648baebf18672f232a3c8c58 parent 7c8f5703de91ade517d4fd6c3cc8e08dbba2b739 author Evgeniy Polyakov [EMAIL PROTECTED] Thu, 11 Aug 2005 17:27:50 +0400 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:41:27 -0700 [PATCH] w1: Added DS2433 driver. Work by Ben

[PATCH] w1_ds2433: Added crc16 protection and read caching.

tree 678a0f192d7b72270ea3431f642baca9566a249b parent a45f105ad4b456f99f622642056ae533f70710b7 author Evgeniy Polyakov [EMAIL PROTECTED] Wed, 17 Aug 2005 15:24:37 +0400 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:41:27 -0700 [PATCH] w1_ds2433: Added crc16 protection and read

[PATCH] PCI Hotplug: rpaphp: Remove unused stuff

tree 8d835e6dd4147db7568e070fa4cdf3e2785e3ce5 parent 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 author John Rose [EMAIL PROTECTED] Mon, 25 Jul 2005 20:16:37 -0500 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:57:22 -0700 [PATCH] PCI Hotplug: rpaphp: Remove unused stuff Subject

[PATCH] PCI Hotplug: rpaphp: Remove rpaphp_find_pci

tree 83ca671af8a9e2560d8bed3c63fbffa59d96af58 parent 9c209c919df95f83aa042b3352c43841ad15a02b author John Rose [EMAIL PROTECTED] Mon, 25 Jul 2005 20:16:53 -0500 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:57:23 -0700 [PATCH] PCI Hotplug: rpaphp: Remove rpaphp_find_pci The

[PATCH] PCI: Move PCI fixup data into r/o section

tree df919b98bb9621dc01773ebf5238b35619bd0b4f parent d42c69972b853fd33a26c8c7405624be41a22136 author [EMAIL PROTECTED] [EMAIL PROTECTED] Tue, 26 Jul 2005 13:28:14 -0700 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:57:23 -0700 [PATCH] PCI: Move PCI fixup data into r/o section

[PATCH] PCI: fix up pretty-names removal patch

tree be78aa954e7062d55afd3bca108e272944ea1580 parent 982245f01734e9d5a3ab98b2b2e9761ae7719094 author Andrew Morton [EMAIL PROTECTED] Wed, 27 Jul 2005 14:07:11 -0700 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:57:24 -0700 [PATCH] PCI: fix up pretty-names removal patch

[PATCH] arch/386/pci: remap_pfn_range - io_remap_pfn_range

tree fb51cb27e7f4192ca88ea2966a1e14d5e8991847 parent 4352dfd5cd9172f1ee425924a463b43e6157b840 author Michael S. Tsirkin [EMAIL PROTECTED] Sun, 31 Jul 2005 11:51:45 +0300 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:57:24 -0700 [PATCH] arch/386/pci: remap_pfn_range -

[PATCH] PCI Hotplug: use bus_slot number for name

tree ca41930bb82ce02147f58df7b288fdf8a6b3e9b2 parent 346d38823b59d65c3c1365971776b52e0661b7e5 author Kristen Accardi [EMAIL PROTECTED] Sat, 06 Aug 2005 02:16:06 -0700 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:57:24 -0700 [PATCH] PCI Hotplug: use bus_slot number for name

[PATCH] PCI: restore BAR values after D3hot-D0 for devices that need it

tree 39efa08fb7b0b7991bbfc4772f4fc3de0e8d11fa parent 1248d636122e4ec9d7802b850904e3bb48a0da23 author John W. Linville [EMAIL PROTECTED] Wed, 27 Jul 2005 18:19:44 -0400 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:57:24 -0700 [PATCH] PCI: restore BAR values after D3hot-D0 for

[PATCH] Make sparc64 use setup-res.c

tree 215690b947b14fa18cbb2810db1a4082ad607e7a parent 064b53dbcc977dbf2753a67c2b8fc1c061d74f21 author David S. Miller [EMAIL PROTECTED] Tue, 09 Aug 2005 03:19:08 -0700 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:57:25 -0700 [PATCH] Make sparc64 use setup-res.c There were

[PATCH] PCI: Fix regression in pci_enable_device_bars

tree c3bbf898ee5c45299dd111853c9756a594fa6ecf parent 95a629657dbe28e44a312c47815b3dc3f1ce0970 author Alan Stern [EMAIL PROTECTED] Wed, 10 Aug 2005 23:18:44 -0400 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:57:25 -0700 [PATCH] PCI: Fix regression in pci_enable_device_bars

[PATCH] PCI: remove pci_find_device from parport_pc.c

tree 3d805afabce3f64466b4360839a3596befa95338 parent 11f3859b1e85dd408756c72e228cfb5aa7230c87 author Jiri Slaby [EMAIL PROTECTED] Wed, 10 Aug 2005 02:09:39 +0200 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:57:25 -0700 [PATCH] PCI: remove pci_find_device from parport_pc.c

[PATCH] PCI Hotplug: SGI hotplug driver fixes

tree 4537680974632dc626368d4fe53e932243d13ac1 parent c9d8073fd2a0bcb5df973654e988282b523cf553 author Prarit Bhargava [EMAIL PROTECTED] Fri, 12 Aug 2005 18:13:34 -0400 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 04:57:25 -0700 [PATCH] PCI Hotplug: SGI hotplug driver fixes

[PATCH] PCI: Support PCM PM CAP version 3

tree 96a3e57f3b61c137bb8904a08779aa8ab41c2559 parent cecf4864cf52a4a243a62b2856a6a155edbb55e8 author Daniel Ritz [EMAIL PROTECTED] Thu, 18 Aug 2005 05:32:19 -0700 committer Greg Kroah-Hartman [EMAIL PROTECTED] Fri, 09 Sep 2005 05:04:30 -0700 [PATCH] PCI: Support PCM PM CAP version 3 - support

[SPARC64]: Inline membar()'s again.

tree f30c8caa998261fc0983121021184f0f6cc555b4 parent 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 author David S. Miller [EMAIL PROTECTED] Fri, 09 Sep 2005 04:37:53 -0700 committer David S. Miller [EMAIL PROTECTED] Fri, 09 Sep 2005 04:37:53 -0700 [SPARC64]: Inline membar()'s again. Since GCC has to

[IPV6]: Support several new sockopt / ancillary data in Advanced API (RFC3542).

tree 92149276982a827457e9c556c7ef82ec3b09fb52 parent 4706df3d3c42af802597d82c8b1542c3d52eab23 author YOSHIFUJI Hideaki [EMAIL PROTECTED] Thu, 08 Sep 2005 09:59:17 +0900 committer YOSHIFUJI Hideaki [EMAIL PROTECTED] Thu, 08 Sep 2005 09:59:17 +0900 [IPV6]: Support several new sockopt / ancillary

[NET]: Optimize pskb_trim_rcsum()

tree 5700dfd0ceab3b435a7fc91cc25e56bb911ce2a9 parent 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 author Stephen Hemminger [EMAIL PROTECTED] Fri, 09 Sep 2005 02:32:03 -0700 committer David S. Miller [EMAIL PROTECTED] Fri, 09 Sep 2005 02:32:03 -0700 [NET]: Optimize pskb_trim_rcsum() Since packets

[IPV4] udp: trim forgets about CHECKSUM_HW

tree 295885afa3300455fa1b7cb0dd18a543d73fc744 parent 0e4e4220f10bf8f58a8606f0cb28538088c64b1a author Stephen Hemminger [EMAIL PROTECTED] Fri, 09 Sep 2005 02:32:21 -0700 committer David S. Miller [EMAIL PROTECTED] Fri, 09 Sep 2005 02:32:21 -0700 [IPV4] udp: trim forgets about CHECKSUM_HW A UDP

[NET]: Need struct sock forward decl in net/compat.h

tree c10785ae043fe527cea839c4153e4bfede48cc20 parent e308e25c97f06cf704e65eeb773412f5460a3b93 author David S. Miller [EMAIL PROTECTED] Fri, 09 Sep 2005 02:32:46 -0700 committer David S. Miller [EMAIL PROTECTED] Fri, 09 Sep 2005 02:32:46 -0700 [NET]: Need struct sock forward decl in net/compat.h

[IPV6]: Need to use pskb_trim_rcsum().

tree a3052c4ffdfa8451a182c49837a92054f5688672 parent e50ef933e649a2b43aa10c8a60c491543b8b4c02 author Stephen Hemminger [EMAIL PROTECTED] Fri, 09 Sep 2005 02:57:43 -0700 committer David S. Miller [EMAIL PROTECTED] Fri, 09 Sep 2005 02:57:43 -0700 [IPV6]: Need to use pskb_trim_rcsum(). Fix

[BNX2]: Fix bug in irq handler and add prefetch

tree 8cb7f7e657fae69a1f59509d586182a37c2635ed parent 2e66fc41169c90d93b7811caf7e7822de6aa2259 author Michael Chan [EMAIL PROTECTED] Fri, 09 Sep 2005 03:15:32 -0700 committer David S. Miller [EMAIL PROTECTED] Fri, 09 Sep 2005 03:15:32 -0700 [BNX2]: Fix bug in irq handler and add prefetch Fix bug

[IPV4]: Fix refcount damaging in net/ipv4/route.c

tree 368e85ac0014d203bba15bb8777ffbd94dc2d2e6 parent c921e4c4dbb043f9435414c4e661e7f0a783053d author Julian Anastasov [EMAIL PROTECTED] Fri, 09 Sep 2005 03:34:47 -0700 committer David S. Miller [EMAIL PROTECTED] Fri, 09 Sep 2005 03:34:47 -0700 [IPV4]: Fix refcount damaging in net/ipv4/route.c

[NETFILTER]: ip_conntrack_netbios_ns.c gcc-2.95.x build fix

tree 589361c5beaa2f5887124190e367312a945381ea parent ce723d8e048ef98ea64d12379e3921c933f5b3e0 author Andrew Morton [EMAIL PROTECTED] Fri, 09 Sep 2005 03:36:34 -0700 committer David S. Miller [EMAIL PROTECTED] Fri, 09 Sep 2005 03:36:34 -0700 [NETFILTER]: ip_conntrack_netbios_ns.c gcc-2.95.x build

[IPV6]: Don't redo xfrm_lookup for cached dst entries

tree 271f478173fb6e1d1869320e81779e6c7165cede parent baed16a7ff5194487764db300c2753ac7409c4c5 author Patrick McHardy [EMAIL PROTECTED] Fri, 09 Sep 2005 04:27:47 -0700 committer David S. Miller [EMAIL PROTECTED] Fri, 09 Sep 2005 04:27:47 -0700 [IPV6]: Don't redo xfrm_lookup for cached dst entries

[TCP]: Fix off by one in tcp_fragment() already sent test.

tree 22ec54e42593aefd2d1a5fa07cd6a2f1b0f2f37b parent a57ebc90f1350296edded12d33d7c278831bc3bf author Herbert Xu [EMAIL PROTECTED] Fri, 09 Sep 2005 05:10:52 -0700 committer David S. Miller [EMAIL PROTECTED] Fri, 09 Sep 2005 05:10:52 -0700 [TCP]: Fix off by one in tcp_fragment() already sent test.

[I2C] Clean up i2c-pxa debugging/printks

tree 40e376d9cf3116c5728a6603ac827a89efdc7a6d parent b652b438fcad4c9c079d0774e9d45ee58fae22e2 author Russell King [EMAIL PROTECTED] Thu, 08 Sep 2005 21:04:58 +0100 committer Russell King [EMAIL PROTECTED] Thu, 08 Sep 2005 21:04:58 +0100 [I2C] Clean up i2c-pxa debugging/printks Fix up comments

[SERIAL] Use an enum for serial8250 platform device IDs

tree fbf9c8697c39c587471cbf18736c3692b55d3605 parent caf39e87cc1182f7dae84eefc43ca14d54c78ef9 author Russell King [EMAIL PROTECTED] Thu, 08 Sep 2005 16:04:41 +0100 committer Russell King [EMAIL PROTECTED] Thu, 08 Sep 2005 16:04:41 +0100 [SERIAL] Use an enum for serial8250 platform device IDs

[MMC] Allow detection/removal to be delayed

tree 7fc17315c0d948cd106b89d250355bf59978ae39 parent caf39e87cc1182f7dae84eefc43ca14d54c78ef9 author Richard Purdie [EMAIL PROTECTED] Thu, 08 Sep 2005 17:53:01 +0100 committer Russell King [EMAIL PROTECTED] Thu, 08 Sep 2005 17:53:01 +0100 [MMC] Allow detection/removal to be delayed Change

[MMC] Ensure correct mmc_priv() behaviour

tree 5310047939d79cf5163047fbe1153ae769104fad parent 8dc003359cc3996abad9e53a7b2280b272610283 author Russell King [EMAIL PROTECTED] Thu, 08 Sep 2005 22:46:00 +0100 committer Russell King [EMAIL PROTECTED] Thu, 08 Sep 2005 22:46:00 +0100 [MMC] Ensure correct mmc_priv() behaviour mmc_priv() has

[ARM] Fix ARMv6 VIPT cache = 32K

tree 82751eba321a062ce91af7f0f0bff8c4c5531a1c parent b38d950d3aedf90c8b15b3c7c799b5eb53c47c45 author Russell King [EMAIL PROTECTED] Thu, 08 Sep 2005 15:32:23 +0100 committer Russell King [EMAIL PROTECTED] Thu, 08 Sep 2005 15:32:23 +0100 [ARM] Fix ARMv6 VIPT cache = 32K This adds the necessary

[ARM] 2890/1: OMAP 1/4: Update omap1 specific files, take 2

tree 89c3b807ca90f5c7e5692ddbcd388511dc289530 parent d7b6b3589471c3856f1e6dc9c77abc4af962ffdb author Tony Lindgren [EMAIL PROTECTED] Thu, 08 Sep 2005 23:07:38 +0100 committer Russell King [EMAIL PROTECTED] Thu, 08 Sep 2005 23:07:38 +0100 [ARM] 2890/1: OMAP 1/4: Update omap1 specific files, take 2

[ARM] 2891/1: S3C2410 - update s3c2410_defconfig for 2.6.13

tree 5952760a57474493d408e95af351962355f90d79 parent 7c38cf021b42a4297bc8f860ab627734bdd6c8d1 author Ben Dooks [EMAIL PROTECTED] Thu, 08 Sep 2005 23:07:39 +0100 committer Russell King [EMAIL PROTECTED] Thu, 08 Sep 2005 23:07:39 +0100 [ARM] 2891/1: S3C2410 - update s3c2410_defconfig for 2.6.13

[ARM] 2892/1: remove gcc workaround for direct access to absolute memory addresses

tree 0cc1d9e29d6c799b91802938e4ec054f9082d08b parent 0dffefbf1a26ee0661d47516420d86b485a08e9c author Nicolas Pitre [EMAIL PROTECTED] Thu, 08 Sep 2005 23:07:40 +0100 committer Russell King [EMAIL PROTECTED] Thu, 08 Sep 2005 23:07:40 +0100 [ARM] 2892/1: remove gcc workaround for direct access to

[PATCH] m68knommu: ColdFire 523x processor register definitions

tree 215714e910916197be1de590a595bdb8adaf4178 parent 4fe8a0f4c5d64cbc78227a88df4566c0d0ee4648 author Greg Ungerer [EMAIL PROTECTED] Fri, 09 Sep 2005 09:32:14 +1000 committer Linus Torvalds [EMAIL PROTECTED] Fri, 09 Sep 2005 07:27:35 -0700 [PATCH] m68knommu: ColdFire 523x processor register

[PATCH] m68knommu: defines to support the ColdFire 523x processor

tree c09698f854627d280eeda42e6b25cba67c6fe8b3 parent 910ce396a88b84b99377f7c46888a1ff9a86ded3 author Greg Ungerer [EMAIL PROTECTED] Fri, 09 Sep 2005 09:32:14 +1000 committer Linus Torvalds [EMAIL PROTECTED] Fri, 09 Sep 2005 07:27:35 -0700 [PATCH] m68knommu: defines to support the ColdFire 523x

[PATCH] m68knommu: 523x ColdFire processor init/config Makefile

tree badab9b85448625a5735fa863da26d32fe227df4 parent 1bdd89db117a55c77a854829ff507d6d68ab6485 author Greg Ungerer [EMAIL PROTECTED] Fri, 09 Sep 2005 09:32:14 +1000 committer Linus Torvalds [EMAIL PROTECTED] Fri, 09 Sep 2005 07:27:35 -0700 [PATCH] m68knommu: 523x ColdFire processor init/config

[PATCH] m68knommu: extract common timer code for 68328 processor

tree 1e877930c8301ee7d6149ab5768a745cf0e99a58 parent 8c2b58ce716112cbba167b0abcb9558c118b8c9a author Greg Ungerer [EMAIL PROTECTED] Fri, 09 Sep 2005 09:32:14 +1000 committer Linus Torvalds [EMAIL PROTECTED] Fri, 09 Sep 2005 07:27:36 -0700 [PATCH] m68knommu: extract common timer code for 68328

[PATCH] m68knommu: include support for the ColdFire 523x processor UARTs

tree d7002e67e09d818ac86bcebeeac873a9b7952b21 parent ee721126cae77e66efb470d38cf971ed7b0c506b author Greg Ungerer [EMAIL PROTECTED] Fri, 09 Sep 2005 09:32:14 +1000 committer Linus Torvalds [EMAIL PROTECTED] Fri, 09 Sep 2005 07:27:36 -0700 [PATCH] m68knommu: include support for the ColdFire 523x

[PATCH] m68knommu: add timer support for the 523x ColdFire processor family

tree 5af9b156c46d2a5242f1db641f737895197c2116 parent 7dbdd91fe67e3cd28af36d3853df38b92deec711 author Greg Ungerer [EMAIL PROTECTED] Fri, 09 Sep 2005 09:32:14 +1000 committer Linus Torvalds [EMAIL PROTECTED] Fri, 09 Sep 2005 07:27:37 -0700 [PATCH] m68knommu: add timer support for the 523x ColdFire

[PATCH] m68knommu: register map setup for MOD5272 board

tree 016004dedd6ef5123079ea03ced05892ed98b146 parent a052b7affc193a7937e6791d262addcb82654d5f author Greg Ungerer [EMAIL PROTECTED] Fri, 09 Sep 2005 09:32:14 +1000 committer Linus Torvalds [EMAIL PROTECTED] Fri, 09 Sep 2005 07:27:37 -0700 [PATCH] m68knommu: register map setup for MOD5272 board

[PATCH] m68knommu: include ColdFire 523x processor register definitions

tree 34f2c6dadf53a09471b28fd5fe616187c5d4b54e parent 75003c4812ae23a8a99e9921bbe66ffb0e784c8e author Greg Ungerer [EMAIL PROTECTED] Fri, 09 Sep 2005 09:32:14 +1000 committer Linus Torvalds [EMAIL PROTECTED] Fri, 09 Sep 2005 07:27:37 -0700 [PATCH] m68knommu: include ColdFire 523x processor

[PATCH] m68knommu: extract common timer code for 68EZ328 processor

tree e41794daea2cd8029b79312ee40fc8bc7b96bf64 parent d9b9d5ddb827dc36cc1f7214f5818640e1bc22d5 author Greg Ungerer [EMAIL PROTECTED] Fri, 09 Sep 2005 09:32:14 +1000 committer Linus Torvalds [EMAIL PROTECTED] Fri, 09 Sep 2005 07:27:37 -0700 [PATCH] m68knommu: extract common timer code for 68EZ328

[XFS] Revert recent quota Makefile change, not in a fit state for merging.

tree 80d70431196ff11bf2161601498f819913b6e62b parent 4e1491847ef5ca1c5a661601d5f96dcb7d90d2f0 author Nathan Scott [EMAIL PROTECTED] Fri, 09 Sep 2005 11:38:09 +1000 committer Nathan Scott [EMAIL PROTECTED] Fri, 09 Sep 2005 11:38:09 +1000 [XFS] Revert recent quota Makefile change, not in a fit

Re: [PATCH 0/2] A new merge algorithm, take 3

On Wed, Sep 07, 2005 at 02:33:42PM -0400, Daniel Barkalow wrote: On Wed, 7 Sep 2005, Fredrik Kuivinen wrote: Of the 500 merge commits that currently exists in the kernel repository 19 produces non-clean merges with git-merge-script. The four merge cases listed in [EMAIL PROTECTED] are

Re: gitweb feature request: tarball for each commit

On Thu, Sep 08, 2005 at 04:30:22PM +1200, Martin Langhoff wrote: Actually... should get it done. I'll see if I can sneak it in sometime soon... This has been done at least twice already. See e.g., http://www.liacs.nl/~sverdool/gitweb.cgi?p=gitweb.git;a=summary Check the archives for the other

Re: patches

On Thu, 2005-09-08 at 04:06, Junio C Hamano wrote: I would have appreciated if you said Solaris portability patch or somesuch on the subject line. sorry, of course you're right.. the #ifndef __sun was done because getdomainname() doesn't exist on solaris. (just for clarification) Curious.

Re: [PATCH 0/2] A new merge algorithm, take 3

On Thu, 8 Sep 2005, Fredrik Kuivinen wrote: On Wed, Sep 07, 2005 at 02:33:42PM -0400, Daniel Barkalow wrote: On Wed, 7 Sep 2005, Fredrik Kuivinen wrote: Of the 500 merge commits that currently exists in the kernel repository 19 produces non-clean merges with git-merge-script. The

Re: [PATCH 0/2] A new merge algorithm, take 3

Chuck Lever [EMAIL PROTECTED] writes: Junio C Hamano wrote: Chuck Lever [EMAIL PROTECTED] writes: once the list implementation is working well, i plan to go back and replace it with something more sophisticated which can perform insertion, deletion, and searching efficiently. Well, what

Re: [PATCH 0/2] A new merge algorithm, take 3

On Thu, 8 Sep 2005, Junio C Hamano wrote: Yes, the reading of three trees upfront is probably the culprit in your case However, note that _most_ tree reading just reads one. Merges may take half a second, and yes, when I did it, the fact that we move things around in the array is by far

Re: [PATCH 0/2] A new merge algorithm, take 3

Linus Torvalds [EMAIL PROTECTED] writes: So the data structure is optimized for a different case than reading in trees. Big deal. That optimization is definitely worth it: it allows us to do the read_cache() with the actual index entries being totally read-only (a linked list would have to

Re: [RFC] GIT Repository Annotation Convention

A Large Angry SCM [EMAIL PROTECTED] writes: Naming and Directory Structure -- Annotations are named by appending .txt to the basename of the repository component it describes, and by appending .dir to each directory patch component leading to the repository

Re: Merges without bases

Darrin Thompson wrote: What I'm going to do is actually an inversion of that. Publishing a repository with the _intent_ of being merged into existing history, and observing obvious naming conventions as the prior arrangement. I thought once I got the initial baseless merges done and committed

Re: [PATCH 0/2] A new merge algorithm, take 3

Linus Torvalds wrote: On Thu, 8 Sep 2005, Junio C Hamano wrote: Yes, the reading of three trees upfront is probably the culprit in your case However, note that _most_ tree reading just reads one. Merges may take half a second, and yes, when I did it, the fact that we move things around

Re: [RFC] GIT Repository Annotation Convention

Chuck Lever wrote: yay! are you also proposing some git tools to deal with these? it would be great to have some version control (keep these like generation files so we can see the history of revisions). A Large Angry SCM wrote: GIT Repository Annotation Convention [...] I'm not

Re: [PATCH 0/2] A new merge algorithm, take 3

On Thu, 8 Sep 2005, Chuck Lever wrote: in my case the merges were taking significantly longer than a half second. making this change is certainly not worth it if merges are running fast... Note that in cold-cache cases, all the expense of read-tree is in actually reading the tree

Re: [PATCH 0/2] A new merge algorithm, take 3

Linus Torvalds wrote: On Thu, 8 Sep 2005, Chuck Lever wrote: in my case the merges were taking significantly longer than a half second. making this change is certainly not worth it if merges are running fast... Note that in cold-cache cases, all the expense of read-tree is in actually

Re: [PATCH 0/2] A new merge algorithm, take 3

On Thu, Sep 08, 2005 at 11:27:35AM -0400, Daniel Barkalow wrote: ... The two cases my algorithm merges cleanly and git-resolve-script do not merge cleanly are 0e396ee43e445cb7c215a98da4e76d0ce354d9d7 and 0c168775709faa74c1b87f1e61046e0c51ade7f3. Both of them have two common ancestors.

Re: Multi-ancestor read-tree notes

On Mon, 2005-09-05 at 01:41 -0400, Daniel Barkalow wrote: I've got a version of read-tree which accepts multiple ancestors and does a merge using information from all of them. Do the multiple ancestors have to share a common parent? More to the point, is this read-tree any more friendly to

Re: Multi-ancestor read-tree notes

On Thu, Sep 08, 2005 at 12:16:05PM -0500, Darrin Thompson wrote: On Mon, 2005-09-05 at 01:41 -0400, Daniel Barkalow wrote: I've got a version of read-tree which accepts multiple ancestors and does a merge using information from all of them. Do the multiple ancestors have to share a common

Re: [PATCH 0/2] A new merge algorithm, take 3

Junio C Hamano [EMAIL PROTECTED] writes: ... I'd like to leave what merge strategy to use as an user option, and leave the door open for other merge strategies to emerge later. I know Pasky wants to look into pcdv merge and other alternatives. This is still off-the-top-of-my-head, but the

Re: [PATCH 0/2] A new merge algorithm, take 3

Junio C Hamano wrote: [...] Subject: [PATCH] Multi-backend merge driver. This is just an illustration of concept patch. The new command 'git merge' takes the current head and one or more remote heads, with the commit log message for the automated case. If the heads being merged are simple

Re: [PATCH 0/2] A new merge algorithm, take 3

On Thu, 8 Sep 2005, Fredrik Kuivinen wrote: The first one agrees with what was actually committed. For the second one the difference between the tree produced by the algorithm and what was committed is: diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h ---

Re: Multi-ancestor read-tree notes

On Thu, 8 Sep 2005, Darrin Thompson wrote: On Mon, 2005-09-05 at 01:41 -0400, Daniel Barkalow wrote: I've got a version of read-tree which accepts multiple ancestors and does a merge using information from all of them. Do the multiple ancestors have to share a common parent? More to the

Re: Multi-ancestor read-tree notes

On Thu, 2005-09-08 at 17:39 -0400, Daniel Barkalow wrote: I assume that what you want is something to include everything from two commits, which would give conflicts if a name is reused? Yes. -- Darrin - To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: Multi-ancestor read-tree notes

Daniel Barkalow [EMAIL PROTECTED] writes: I assume that what you want is something to include everything from two commits, which would give conflicts if a name is reused? My understanding is that Darrin wants to do what Linus did when he merged gitk into git.git. Personally I think that is a

Re: Multi-ancestor read-tree notes

On Thu, 8 Sep 2005, Junio C Hamano wrote: Daniel Barkalow [EMAIL PROTECTED] writes: I assume that what you want is something to include everything from two commits, which would give conflicts if a name is reused? My understanding is that Darrin wants to do what Linus did when he

Tool renames and 'ls-files -t' output

The master branch post 0.99.6 already has the renamed tools with backward compatibility symlinks. I'll be sending a patch to address an issue raised by some people separately to see what the list thinks, and also will attempt to send out a patch for the Pasky and Catalin heads later this week.

Re: git-ls-new-files make patch, pull, etc.

On 09/06/2005 02:08 PM, Junio C Hamano wrote: Jeff Carr [EMAIL PROTECTED] writes: ... If I remember correctly, there was some threads at the beginning of git about how datestamps were not accurate so there was no point in setting them(?) Or maybe I mis-understood. The point of those

Re: gitweb feature request: tarball for each commit

Yes, this is nice for smaller projects. But I don't think, that we want to do such a thing on the kernel.org servers. I think this is a very useful feature for for some, but not all, repositories. Default it to off and have a magic file (like git-daemon), or a config variable turn it on.

Re: git applymbox is too anal

On Thu, Sep 08, 2005 at 04:25:35PM -0700, Greg KH wrote: Ick. I'm trying to apply a bunch of patches to a git repo (the kernel tree), using 'git applymbox' and it's just dieing on simple patches that apply with fuzz. Ok, found another one. This time I looked at the patch itself, and it is a

Re: git applymbox is too anal

On Thu, 8 Sep 2005, Greg KH wrote: Or am I missing some option to 'git applymbox' that I can't seem to find? No. git-apply wants an exact bit-for-bit match. Partly because fuzz is hard, but mostly because I don't like it. I apply a _lot_ of patches, and if a unforgiving git-apply works

[RFC/Patch] Tool rename fallout fix

Immediately after I updated the master branch with the tool renames, I got a complaint from somebody telling me that the things do not work anymore without 'make install'. Strictly speaking, git has never worked fully without installation because 'git' wrapper looked for things in the same

Re: git applymbox is too anal

Greg KH [EMAIL PROTECTED] writes: So, the patch shows that there was another line at the end of the file, while in reality it isn't (this is due to me excluding a patch from the series that I'm applying due to other reasons.) Is this something that git can handle without me editing the patch

Re: git-ls-new-files make patch, pull, etc.

In my opinion, setting the file timestamp to the commit time (or any other time other than the time of checkout) tends to screw you up more than help you. Suppose you have the latest checked out in your working tree, you build and test, and find regressions. You'd want to check out from an older

<    1   2