Re: linux-next: manual merge of the gpio tree with the staging tree

2017-01-30 Thread Linus Walleij
On Mon, Jan 30, 2017 at 5:28 AM, Stephen Rothwell wrote: > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree >

Re: linux-next: manual merge of the gpio tree with the staging tree

2017-01-30 Thread Linus Walleij
On Mon, Jan 30, 2017 at 5:28 AM, Stephen Rothwell wrote: > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for

Re: linux-next: manual merge of the gpio tree with the staging tree

2017-01-30 Thread Greg KH
On Mon, Jan 30, 2017 at 03:28:55PM +1100, Stephen Rothwell wrote: > Hi Linus, > > Today's linux-next merge of the gpio tree got a conflict in: > > drivers/staging/greybus/gpio.c > > between commit: > > 1d3dfbd1dd34 ("staging: greybus: fix checkpatch unsigned warnings") > > from the

Re: linux-next: manual merge of the gpio tree with the staging tree

2017-01-30 Thread Greg KH
On Mon, Jan 30, 2017 at 03:28:55PM +1100, Stephen Rothwell wrote: > Hi Linus, > > Today's linux-next merge of the gpio tree got a conflict in: > > drivers/staging/greybus/gpio.c > > between commit: > > 1d3dfbd1dd34 ("staging: greybus: fix checkpatch unsigned warnings") > > from the

linux-next: manual merge of the gpio tree with the staging tree

2017-01-29 Thread Stephen Rothwell
Hi Linus, Today's linux-next merge of the gpio tree got a conflict in: drivers/staging/greybus/gpio.c between commit: 1d3dfbd1dd34 ("staging: greybus: fix checkpatch unsigned warnings") from the staging tree and commit: 2956b5d94a76 ("pinctrl / gpio: Introduce .set_config() callback

linux-next: manual merge of the gpio tree with the staging tree

2017-01-29 Thread Stephen Rothwell
Hi Linus, Today's linux-next merge of the gpio tree got a conflict in: drivers/staging/greybus/gpio.c between commit: 1d3dfbd1dd34 ("staging: greybus: fix checkpatch unsigned warnings") from the staging tree and commit: 2956b5d94a76 ("pinctrl / gpio: Introduce .set_config() callback