Re: linux-next: manual merge of the tty tree with the input tree

2013-01-28 Thread Dmitry Torokhov
Hi Joe, On Mon, Jan 28, 2013 at 10:26:47PM -0800, Joe Millenbach wrote: > On Mon, Jan 28, 2013 at 9:33 PM, Dmitry Torokhov > wrote: > > Please revert the input changes and add *ONE* new dependency to the > > serport driver. > > > > Thanks. > > > > -- > > Dmitry > > Apologies on this. I must hav

Re: linux-next: manual merge of the tty tree with the input tree

2013-01-28 Thread Joe Millenbach
On Mon, Jan 28, 2013 at 9:33 PM, Dmitry Torokhov wrote: > Please revert the input changes and add *ONE* new dependency to the > serport driver. > > Thanks. > > -- > Dmitry Apologies on this. I must have misunderstood the problem originally, and I definitely misunderstood your solution until I lo

Re: linux-next: manual merge of the tty tree with the input tree

2013-01-28 Thread Dmitry Torokhov
On Tue, Jan 29, 2013 at 04:13:21PM +1100, Josh Triplett wrote: > On Mon, Jan 28, 2013 at 04:23:57PM -0800, Dmitry Torokhov wrote: > > On Tue, Jan 29, 2013 at 10:59:17AM +1100, Josh Triplett wrote: > > > On Mon, Jan 28, 2013 at 02:44:43PM -0800, Dmitry Torokhov wrote: > > > > On Mon, Jan 28, 2013 at

Re: linux-next: manual merge of the tty tree with the input tree

2013-01-28 Thread Josh Triplett
On Mon, Jan 28, 2013 at 04:23:57PM -0800, Dmitry Torokhov wrote: > On Tue, Jan 29, 2013 at 10:59:17AM +1100, Josh Triplett wrote: > > On Mon, Jan 28, 2013 at 02:44:43PM -0800, Dmitry Torokhov wrote: > > > On Mon, Jan 28, 2013 at 02:09:31PM -0800, Joe Millenbach wrote: > > > > On Mon, Jan 28, 2013 a

Re: linux-next: manual merge of the tty tree with the input tree

2013-01-28 Thread Dmitry Torokhov
On Tue, Jan 29, 2013 at 10:59:17AM +1100, Josh Triplett wrote: > On Mon, Jan 28, 2013 at 02:44:43PM -0800, Dmitry Torokhov wrote: > > On Mon, Jan 28, 2013 at 02:09:31PM -0800, Joe Millenbach wrote: > > > On Mon, Jan 28, 2013 at 9:33 AM, Dmitry Torokhov > > > wrote: > > > > On Mon, Jan 28, 2013 at

Re: linux-next: manual merge of the tty tree with the input tree

2013-01-28 Thread Josh Triplett
On Mon, Jan 28, 2013 at 02:44:43PM -0800, Dmitry Torokhov wrote: > On Mon, Jan 28, 2013 at 02:09:31PM -0800, Joe Millenbach wrote: > > On Mon, Jan 28, 2013 at 9:33 AM, Dmitry Torokhov > > wrote: > > > On Mon, Jan 28, 2013 at 06:46:15AM -0800, Greg KH wrote: > > >> On Mon, Jan 28, 2013 at 08:44:24P

Re: linux-next: manual merge of the tty tree with the input tree

2013-01-28 Thread Dmitry Torokhov
On Mon, Jan 28, 2013 at 02:09:31PM -0800, Joe Millenbach wrote: > On Mon, Jan 28, 2013 at 9:33 AM, Dmitry Torokhov > wrote: > > On Mon, Jan 28, 2013 at 06:46:15AM -0800, Greg KH wrote: > >> On Mon, Jan 28, 2013 at 08:44:24PM +1100, Stephen Rothwell wrote: > >> > Hi Greg, > >> > > >> > Today's linu

Re: linux-next: manual merge of the tty tree with the input tree

2013-01-28 Thread Joe Millenbach
On Mon, Jan 28, 2013 at 9:33 AM, Dmitry Torokhov wrote: > On Mon, Jan 28, 2013 at 06:46:15AM -0800, Greg KH wrote: >> On Mon, Jan 28, 2013 at 08:44:24PM +1100, Stephen Rothwell wrote: >> > Hi Greg, >> > >> > Today's linux-next merge of the tty tree got a conflict in >> > drivers/input/keyboard/Kco

Re: linux-next: manual merge of the tty tree with the input tree

2013-01-28 Thread Dmitry Torokhov
On Mon, Jan 28, 2013 at 06:46:15AM -0800, Greg KH wrote: > On Mon, Jan 28, 2013 at 08:44:24PM +1100, Stephen Rothwell wrote: > > Hi Greg, > > > > Today's linux-next merge of the tty tree got a conflict in > > drivers/input/keyboard/Kconfig between commit 6f2ac009f29b ("Input: > > goldfish - virtua

Re: linux-next: manual merge of the tty tree with the input tree

2013-01-28 Thread Greg KH
On Mon, Jan 28, 2013 at 08:44:24PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in > drivers/input/keyboard/Kconfig between commit 6f2ac009f29b ("Input: > goldfish - virtual input event driver") from the input tree and commit > 4f73bc4dd3e8