Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree

2019-10-18 Thread Greg KH
On Fri, Oct 18, 2019 at 02:26:16PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > drivers/android/binder.c > > between commit: > > 45d02f79b539 ("binder: Don't modify VMA bounds in ->mmap handler") > > from the char-misc.c

linux-next: manual merge of the char-misc tree with the char-misc.current tree

2019-10-17 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the char-misc tree got a conflict in: drivers/android/binder.c between commit: 45d02f79b539 ("binder: Don't modify VMA bounds in ->mmap handler") from the char-misc.current tree and commit: 990be7476485 ("binder: Use common definition of SZ_1K") from

Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree

2019-04-02 Thread Bo YU
On Wed, Apr 3, 2019 at 1:07 PM Srinivas Kandagatla wrote: > > > On 03/04/2019 04:56, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the char-misc tree got a conflict in: > > > >drivers/misc/fastrpc.c > > > > between commit: > > > >01b76c32e3f3 ("misc: fastrpc: add

Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree

2019-04-02 Thread Srinivas Kandagatla
On 03/04/2019 04:56, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the char-misc tree got a conflict in: drivers/misc/fastrpc.c between commit: 01b76c32e3f3 ("misc: fastrpc: add checked value for dma_set_mask") from the char-misc.current tree and commit: 977e6c8d1d1

linux-next: manual merge of the char-misc tree with the char-misc.current tree

2019-04-02 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the char-misc tree got a conflict in: drivers/misc/fastrpc.c between commit: 01b76c32e3f3 ("misc: fastrpc: add checked value for dma_set_mask") from the char-misc.current tree and commit: 977e6c8d1d18 ("misc: fastrpc: use correct spinlock variant") f

RE: linux-next: manual merge of the char-misc tree with the char-misc.current tree

2018-12-10 Thread Dexuan Cui
> From: Greg KH > Sent: Monday, December 10, 2018 1:47 AM > On Tue, Dec 04, 2018 at 08:46:41AM +, Dexuan Cui wrote: > > > From: Greg KH > > > Sent: Monday, December 3, 2018 11:43 PM > > > On Tue, Dec 04, 2018 at 03:35:13PM +1100, Stephen Rothwell wrote: > > > > Hi all, > > > > > > > > Today's

Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree

2018-12-10 Thread Greg KH
On Tue, Dec 04, 2018 at 08:46:41AM +, Dexuan Cui wrote: > > From: Greg KH > > Sent: Monday, December 3, 2018 11:43 PM > > On Tue, Dec 04, 2018 at 03:35:13PM +1100, Stephen Rothwell wrote: > > > Hi all, > > > > > > Today's linux-next merge of the char-misc tree got a conflict in: > > > > > >

RE: linux-next: manual merge of the char-misc tree with the char-misc.current tree

2018-12-04 Thread Dexuan Cui
> From: Greg KH > Sent: Monday, December 3, 2018 11:43 PM > On Tue, Dec 04, 2018 at 03:35:13PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the char-misc tree got a conflict in: > > > > drivers/hv/channel_mgmt.c > > > > between commit: > > > > 37c2578c0c40 ("D

Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree

2018-12-03 Thread Greg KH
On Tue, Dec 04, 2018 at 03:35:13PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > drivers/hv/channel_mgmt.c > > between commit: > > 37c2578c0c40 ("Drivers: hv: vmbus: Offload the handling of channels to two > workqueues")

linux-next: manual merge of the char-misc tree with the char-misc.current tree

2018-12-03 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the char-misc tree got a conflict in: drivers/hv/channel_mgmt.c between commit: 37c2578c0c40 ("Drivers: hv: vmbus: Offload the handling of channels to two workqueues") from the char-misc.current tree and commit: 4d3c5c69191f ("Drivers: hv: vmbus: Rem