Re: linux-next: manual merge of the driver-core tree with the net-next tree

2014-12-04 Thread Arend van Spriel
On 04-12-14 11:19, Jeremiah Mahler wrote: > Arend, > > I haven't heard if you have looked at this bug at all yet. I was > curious so I looked at it some more and I have some more information > that might be helpful. > > On Wed, Dec 03, 2014 at 01:41:28PM -0800, Jeremiah Mahler wrote: >> On Wed,

Re: linux-next: manual merge of the driver-core tree with the net-next tree

2014-12-04 Thread Jeremiah Mahler
Arend, I haven't heard if you have looked at this bug at all yet. I was curious so I looked at it some more and I have some more information that might be helpful. On Wed, Dec 03, 2014 at 01:41:28PM -0800, Jeremiah Mahler wrote: > On Wed, Dec 03, 2014 at 01:06:59PM -0800, Jeremiah Mahler wrote:

Re: linux-next: manual merge of the driver-core tree with the net-next tree

2014-12-03 Thread Jeremiah Mahler
On Wed, Dec 03, 2014 at 01:06:59PM -0800, Jeremiah Mahler wrote: > Arend, > > On Wed, Dec 03, 2014 at 01:49:00PM +0100, Arend van Spriel wrote: > > On 12/03/14 11:51, Jeremiah Mahler wrote: > > >On Wed, Dec 03, 2014 at 12:36:55AM -0800, Jeremiah Mahler wrote: > > >>all, > > >> > > >>On Mon, Dec 01

Re: linux-next: manual merge of the driver-core tree with the net-next tree

2014-12-03 Thread Jeremiah Mahler
Arend, On Wed, Dec 03, 2014 at 01:49:00PM +0100, Arend van Spriel wrote: > On 12/03/14 11:51, Jeremiah Mahler wrote: > >On Wed, Dec 03, 2014 at 12:36:55AM -0800, Jeremiah Mahler wrote: > >>all, > >> > >>On Mon, Dec 01, 2014 at 08:34:05AM +0100, Arend van Spriel wrote: > >>>On 01-12-14 08:19, Steph

Re: linux-next: manual merge of the driver-core tree with the net-next tree

2014-12-03 Thread Arend van Spriel
On 12/03/14 17:21, Greg KH wrote: On Wed, Dec 03, 2014 at 01:49:00PM +0100, Arend van Spriel wrote: On 12/03/14 11:51, Jeremiah Mahler wrote: On Wed, Dec 03, 2014 at 12:36:55AM -0800, Jeremiah Mahler wrote: all, On Mon, Dec 01, 2014 at 08:34:05AM +0100, Arend van Spriel wrote: On 01-12-14 08

Re: linux-next: manual merge of the driver-core tree with the net-next tree

2014-12-03 Thread Greg KH
On Wed, Dec 03, 2014 at 01:49:00PM +0100, Arend van Spriel wrote: > On 12/03/14 11:51, Jeremiah Mahler wrote: > >On Wed, Dec 03, 2014 at 12:36:55AM -0800, Jeremiah Mahler wrote: > >>all, > >> > >>On Mon, Dec 01, 2014 at 08:34:05AM +0100, Arend van Spriel wrote: > >>>On 01-12-14 08:19, Stephen Rothw

Re: linux-next: manual merge of the driver-core tree with the net-next tree

2014-12-03 Thread Arend van Spriel
On 12/03/14 11:51, Jeremiah Mahler wrote: On Wed, Dec 03, 2014 at 12:36:55AM -0800, Jeremiah Mahler wrote: all, On Mon, Dec 01, 2014 at 08:34:05AM +0100, Arend van Spriel wrote: On 01-12-14 08:19, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the driver-core tree got a conflic

Re: linux-next: manual merge of the driver-core tree with the net-next tree

2014-12-03 Thread Jeremiah Mahler
On Wed, Dec 03, 2014 at 12:36:55AM -0800, Jeremiah Mahler wrote: > all, > > On Mon, Dec 01, 2014 at 08:34:05AM +0100, Arend van Spriel wrote: > > On 01-12-14 08:19, Stephen Rothwell wrote: > > > Hi Greg, > > > > > > Today's linux-next merge of the driver-core tree got a conflict in > > > drivers/

Re: linux-next: manual merge of the driver-core tree with the net-next tree

2014-12-03 Thread Jeremiah Mahler
all, On Mon, Dec 01, 2014 at 08:34:05AM +0100, Arend van Spriel wrote: > On 01-12-14 08:19, Stephen Rothwell wrote: > > Hi Greg, > > > > Today's linux-next merge of the driver-core tree got a conflict in > > drivers/net/wireless/ath/ath9k/debug.c between commits 70e535ed0029 > > ("ath9k: clean up

Re: linux-next: manual merge of the driver-core tree with the net-next tree

2014-11-30 Thread Arend van Spriel
On 01-12-14 08:19, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/net/wireless/ath/ath9k/debug.c between commits 70e535ed0029 > ("ath9k: clean up debugfs print of reset causes"), 7b8aaead958e > ("ath9k: restart hardware after noi

Re: linux-next: manual merge of the driver-core tree with the net-next tree

2013-08-01 Thread Greg KH
On Thu, Aug 01, 2013 at 03:21:48PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > net/core/net-sysfs.c between commit ff80e519ab1b ("net: export physical > port id via sysfs") from the net-next tree and commit 6be8aeef348a ("net:

Re: linux-next: manual merge of the driver-core tree with the net-next tree

2013-02-03 Thread Greg KH
On Mon, Feb 04, 2013 at 03:38:31PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/net/wan/Kconfig between commit a786a7c0ad44 ("wanrouter: completely > decouple obsolete code from kernel") from the net-next tree and comm