On Fri, Jun 05, 2015 at 06:16:52PM +0100, Mark Brown wrote: > On Fri, Jun 05, 2015 at 07:49:00PM +0900, Greg Kroah-Hartman wrote: > > On Thu, Jun 04, 2015 at 10:20:26AM -0700, Tony Lindgren wrote: > > > > Greg, there's now commit 9809889c708e in tty-linus and commit > > > 9e91597f2423 in tty-next. > > > Yes, I can't go back and remove the one in tty-next, I'm guessing when > > they are merged there is an issue. I'll look into that after Linus > > pulls in my tty-linus tree. > > Yeah, git isn't always spectacularly good at resolving add/add if > there's context changes between two things in a merge - it sometimes > ends up double adding things. Ok, I've now merged these branches together, if someone can verify that my tty-next branch is correct, that would be great. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
