Johannes Stezenbach wrote: > Hello Uwe, > > I made some mistakes in my handling of patch conflicts. I wouldn't > have thought that you would take this personally, nor could I have > imagined what effects it would have on your views of my person > and linux-dvb development as a whole. > ... > During my creating the patchset for akpm for 2.6.13-mm?, I found > that akpm had already applied a patch from Uwe to > Documentation/dvb/bt8xx.txt, which conflicted with other changes > made by Manu in CVS, and which also deleted some IMHO useful > information from the file. First I tried to merge the two > conflicting changes, but it looked like I would've ended up > rewriting the whole file by doing so. After about 10min I gave up. The real problem is that patches were accepted at akpm which should be discussed here and nowhere else. akpm should reject these and forward them to the appropriate subsystem mailing list or maintainer. Information flow must go from DVB/V4L repository to kernel, not vice versa (there are some exceptions but they do not apply in this case). Anyway, Uwe's behaviour is not acceptable for me. Therefore, I adjusted my killfile, he will never bother me again... Oliver -- -------------------------------------------------------- VDR Remote Plugin available at http://www.escape-edv.de/endriss/vdr/ --------------------------------------------------------