From: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Date: Fri, 19 Jun 2009 09:04:26 +0200 > Hi David, > > On Thu, 18 Jun 2009 11:19:57 -0700 (PDT) > David Miller <davem@xxxxxxxxxxxxx> wrote: > >> From: Ursula Braun <ubraun@xxxxxxxxxxxxxxxxxx> >> Date: Thu, 18 Jun 2009 14:44:54 +0200 >> >> > sorry, I did a git pull on linux-2.6.git first, and the af_iucv patches >> > applied cleanly on my system. >> >> It couldn't have applied to Linus's tree because all the IUCV >> bits you submitted to me for 2.6.31 are in his tree and that is >> what created the conflicts. > > Now I am confused. I just tested the two patches Uschi sent with todays > upstream tree. The patches apply fine. Where is the problem, wrong tree? Weird, I just retried and they do apply cleanly. I have no idea what happened, sorry. They are in my tree now, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html