From: Linus Torvalds <[email protected]>
Date: Thu, 11 Oct 2007 19:58:04 -0700 (PDT)
>
>
> On Thu, 11 Oct 2007, David Miller wrote:
> >
> > Even if you're confident there won't be merge issues, could you just
> > wait for the net-2.6 stuff to go in first?
>
> I pulled the net stuff first, and merged the IB stuff afterwards. No
> conflicts in IB, but there *were* conflicts with the networking pull for
> other reasons.
>
> That horrid, horrid mess that is called include/linux/mod_devicetable.h
> and scripts/mod/file2alias.c must go at some point. The thing is
> unmaintainable. Different maintainers add their own structures to both,
> and functions to both, and it's just messy. That's not how maintainable
> and modularized code should be written.
>
> Now it broke on sdio vs ssb, but there was actually a conflict earlier
> with the Kbuild merge (which I aborted for other reasons), so this file
> really is starting to be a problem.
>
> The merge was fairly straightforward and stupid - it's not like the code
> added is *complicated*, but all those small functions and structrues are
> set up to be a maze of very similar lines, so the merge is actually much
> worse than it should be - because there is inherent similarity, some lines
> are automatically auto-merged, making the result just harder to visualize.
>
> So I merged it all, and I don't expect any problems, but I'm hoping
> somebody is thinking about that mod_devicetable.h/file2alias.c mess.
It all looks good from here.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
