Messages in this thread | | | From | Rusty Russell <> | Subject | Re: [RFC PATCH V2 0/1] making order in file2alias | Date | Sat, 03 Dec 2011 15:21:43 +1030 |
| |
On Fri, 2 Dec 2011 11:27:01 -0800, Greg KH <greg@kroah.com> wrote: > On Fri, Dec 02, 2011 at 09:42:13AM +0100, Alessandro Rubini wrote: > > > But splitting 15-line functions into separate files? Less compact, less > > > simple. > > > > Personally, I'm more interested in the addition of new busses (as > > drop-in files) than the split up of current ones. But I see your point. > > Yes, that's what me and Linus have asked about having in the past, > making things easier to merge and the like. Now admittedly, this file > isn't all that hard to merge these days given that the addition of new > busses is pretty rare, these complaints might have been from before git > times, when merges were harder than they are now. > > Anyway, I like your patch as well, as it seems to get us to that goal.
But it doesn't :( Trivial conflict in file2alias.c becomes trivial conflict in Makefile.
We could use $(wildcard) in the Makefile, but that's not used much in the kernel so it'd seem a bit weird.
So honestly, I think we should reorder file2alias.c into alphabetical order. In practice, that'll prevent conflicts.
As I said, I'm happy for Alessandro to do the separate file thing *too*, but if that was the only point, there wasn't one.
Cheers, Rusty.
| |