Re: pull request: wireless-next 2014-08-01

2014-08-04 Thread David Miller
From: Marcel Holtmann Date: Mon, 4 Aug 2014 22:39:47 -0700 > Hi Dave, > > Please pull this last(?) batch of wireless change intended for the > 3.17 stream... When I pull this I get tons of conflicts for: CONFLICT (content): Merge conflict in net/6lowpan/iphc.c

Re: pull request: wireless-next 2014-08-01

2014-08-04 Thread Marcel Holtmann
Hi Dave, Please pull this last(?) batch of wireless change intended for the 3.17 stream... >>> >>> When I pull this I get tons of conflicts for: >>> >>> CONFLICT (content): Merge conflict in net/6lowpan/iphc.c >>> >>> I don't feel comfortable fixing these up, where are they coming >>>

Re: pull request: wireless-next 2014-08-01

2014-08-04 Thread John W. Linville
On Sun, Aug 03, 2014 at 10:37:16AM -0700, Marcel Holtmann wrote: > Hi Dave, > > >> Please pull this last(?) batch of wireless change intended for the > >> 3.17 stream... > > > > When I pull this I get tons of conflicts for: > > > > CONFLICT (content): Merge conflict in net/6lowpan/iphc.c > > >

Re: pull request: wireless-next 2014-08-01

2014-08-03 Thread Marcel Holtmann
Hi Dave, >> Please pull this last(?) batch of wireless change intended for the >> 3.17 stream... > > When I pull this I get tons of conflicts for: > > CONFLICT (content): Merge conflict in net/6lowpan/iphc.c > > I don't feel comfortable fixing these up, where are they coming > from? I was shor

Re: pull request: wireless-next 2014-08-01

2014-08-02 Thread Marcel Holtmann
Hi Dave, >> Please pull this last(?) batch of wireless change intended for the >> 3.17 stream... > > When I pull this I get tons of conflicts for: > > CONFLICT (content): Merge conflict in net/6lowpan/iphc.c > > I don't feel comfortable fixing these up, where are they coming > from? they are c

Re: pull request: wireless-next 2014-08-01

2014-08-02 Thread David Miller
From: "John W. Linville" Date: Fri, 1 Aug 2014 12:57:38 -0400 > Please pull this last(?) batch of wireless change intended for the > 3.17 stream... When I pull this I get tons of conflicts for: CONFLICT (content): Merge conflict in net/6lowpan/iphc.c I don't feel comfortable fixing these up, w

pull request: wireless-next 2014-08-01

2014-08-01 Thread John W. Linville
Dave, Please pull this last(?) batch of wireless change intended for the 3.17 stream... For the NFC bits, Samuel says: "This is a rather quiet one, we have: - A new driver from ST Microelectronics for their NCI ST21NFCB, including device tree support. - p2p support for the ST21NFCA driver