Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree
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.current tree and commit:
>
> 990be7476485 ("binder: Use common definition of SZ_1K")
>
> from the char-misc tree.
>
> 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 merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/android/binder.c
> index 265d9dd46a5e,bef788058bc3..
> --- a/drivers/android/binder.c
> +++ b/drivers/android/binder.c
> @@@ -92,11 -93,10 +93,6 @@@ static atomic_t binder_last_id
> static int proc_show(struct seq_file *m, void *unused);
> DEFINE_SHOW_ATTRIBUTE(proc);
>
> - /* This is only defined in include/asm-arm/sizes.h */
> - #ifndef SZ_1K
> - #define SZ_1K 0x400
> -#ifndef SZ_4M
> -#define SZ_4M 0x40
> --#endif
> --
> #define FORBIDDEN_MMAP_FLAGS(VM_WRITE)
>
> enum {
Yeah, sorry about this, I knew it would be a conflict, I'll handle it
when one of these branches gets merged to Linus's tree.
thanks,
greg k-h
linux-next: manual merge of the char-misc tree with the char-misc.current tree
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 the char-misc tree.
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 merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/android/binder.c
index 265d9dd46a5e,bef788058bc3..
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@@ -92,11 -93,10 +93,6 @@@ static atomic_t binder_last_id
static int proc_show(struct seq_file *m, void *unused);
DEFINE_SHOW_ATTRIBUTE(proc);
- /* This is only defined in include/asm-arm/sizes.h */
- #ifndef SZ_1K
- #define SZ_1K 0x400
-#ifndef SZ_4M
-#define SZ_4M 0x40
--#endif
--
#define FORBIDDEN_MMAP_FLAGS(VM_WRITE)
enum {
pgpYHOFt_RnJr.pgp
Description: OpenPGP digital signature
Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree
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 checked value for dma_set_mask")
> >
> > from the char-misc.current tree and commit:
> >
> >977e6c8d1d18 ("misc: fastrpc: use correct spinlock variant")
> >
> > from the char-misc tree.
> >
> > 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
> Greg did request Bo YU to rebase this patch on top of char-misc tree.
Yes.The patch was v2 after rebasing char-misc tree.
>
> That would be a real fix for this conflict, until then this fixup should
> work.
Is there any modifies need me?
Anyway thank everyone!
>
> --srini
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> >
Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree
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:
977e6c8d1d18 ("misc: fastrpc: use correct spinlock variant")
from the char-misc tree.
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
Greg did request Bo YU to rebase this patch on top of char-misc tree.
That would be a real fix for this conflict, until then this fixup should
work.
--srini
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
linux-next: manual merge of the char-misc tree with the char-misc.current tree
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")
from the char-misc tree.
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 merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/misc/fastrpc.c
index 36d0d5c9cfba,c4cc8e53243d..
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@@ -1184,7 -1314,7 +1314,8 @@@ static int fastrpc_cb_probe(struct plat
struct fastrpc_session_ctx *sess;
struct device *dev = &pdev->dev;
int i, sessions = 0;
+ int rc;
+ unsigned long flags;
cctx = dev_get_drvdata(dev->parent);
if (!cctx)
@@@ -1213,12 -1343,8 +1344,12 @@@
}
}
cctx->sesscount++;
- spin_unlock(&cctx->lock);
+ spin_unlock_irqrestore(&cctx->lock, flags);
- dma_set_mask(dev, DMA_BIT_MASK(32));
+ rc = dma_set_mask(dev, DMA_BIT_MASK(32));
+ if (rc) {
+ dev_err(dev, "32-bit DMA enable failed\n");
+ return rc;
+ }
return 0;
}
pgpTTjsQ2sQPL.pgp
Description: OpenPGP digital signature
RE: linux-next: manual merge of the char-misc tree with the char-misc.current tree
> 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 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: Remove the useless API
> > > vmbus_get_outgoing_channel()")
> > > >
> > > > from the char-misc tree.
> > > >
> > > > I fixed it up (I used the former version where they conflicted) and can
> > > > carry the fix as necessary. This is now fixed as far as linux-next is
> > Hi Stephen,
> > Thank you! I can confirm your rebase for next-20181204 is correct:
> > 37c2578c0c40 ("Drivers: hv: vmbus: Offload the handling of channels to two
> workqueues")
> >
> > > > concerned, but any non trivial conflicts should be mentioned to your
> > > > upstream maintainer when your tree is submitted for merging. You may
> > > > also want to consider cooperating with the maintainer of the conflicting
> > > > tree to minimise any particularly complex conflicts.
> > >
> > > Yeah, this is a mess, I'll wait for the hyper-v developers to send me a
> > > fixup patch for handling this merge issue, as they know it is happening
> > > :(
> > >
> > > greg k-h
> >
> > Since Stephen has fixed the merge issue correctly, I guess I may not need to
> send a fixup
> > patch for linux-next.git. If I didn't get it right, please let me know which
> tree/branch I
> > should work on to send a fixup patch.
> >
> > It looks the conflict here happened because the two related patches, which
> modify
> > the same functions, went into different branches of char-misc.git. I didn't
> realize this
> > could happen... Sorry. The lesson I learnt is that I should not submit an
> > urgent
> fix
> > with an unimportant clean-up patch at the same time, when they can cause a
> conflict.
>
> I have done the merge in my char-misc-next branch, can you verify that I
> got it correct?
>
> greg k-h
I checked the branch and everything is correct. Thanks a lot!
Thanks,
-- Dexuan
Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree
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:
> > >
> > > 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: Remove the useless API
> > vmbus_get_outgoing_channel()")
> > >
> > > from the char-misc tree.
> > >
> > > I fixed it up (I used the former version where they conflicted) and can
> > > carry the fix as necessary. This is now fixed as far as linux-next is
> Hi Stephen,
> Thank you! I can confirm your rebase for next-20181204 is correct:
> 37c2578c0c40 ("Drivers: hv: vmbus: Offload the handling of channels to two
> workqueues")
>
> > > concerned, but any non trivial conflicts should be mentioned to your
> > > upstream maintainer when your tree is submitted for merging. You may
> > > also want to consider cooperating with the maintainer of the conflicting
> > > tree to minimise any particularly complex conflicts.
> >
> > Yeah, this is a mess, I'll wait for the hyper-v developers to send me a
> > fixup patch for handling this merge issue, as they know it is happening
> > :(
> >
> > greg k-h
>
> Since Stephen has fixed the merge issue correctly, I guess I may not need to
> send a fixup
> patch for linux-next.git. If I didn't get it right, please let me know which
> tree/branch I
> should work on to send a fixup patch.
>
> It looks the conflict here happened because the two related patches, which
> modify
> the same functions, went into different branches of char-misc.git. I didn't
> realize this
> could happen... Sorry. The lesson I learnt is that I should not submit an
> urgent fix
> with an unimportant clean-up patch at the same time, when they can cause a
> conflict.
I have done the merge in my char-misc-next branch, can you verify that I
got it correct?
thanks,
greg k-h
RE: linux-next: manual merge of the char-misc tree with the char-misc.current tree
> 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 ("Drivers: hv: vmbus: Offload the handling of channels to
> two workqueues")
> >
> > from the char-misc.current tree and commit:
> >
> > 4d3c5c69191f ("Drivers: hv: vmbus: Remove the useless API
> vmbus_get_outgoing_channel()")
> >
> > from the char-misc tree.
> >
> > I fixed it up (I used the former version where they conflicted) and can
> > carry the fix as necessary. This is now fixed as far as linux-next is
Hi Stephen,
Thank you! I can confirm your rebase for next-20181204 is correct:
37c2578c0c40 ("Drivers: hv: vmbus: Offload the handling of channels to two
workqueues")
> > concerned, but any non trivial conflicts should be mentioned to your
> > upstream maintainer when your tree is submitted for merging. You may
> > also want to consider cooperating with the maintainer of the conflicting
> > tree to minimise any particularly complex conflicts.
>
> Yeah, this is a mess, I'll wait for the hyper-v developers to send me a
> fixup patch for handling this merge issue, as they know it is happening
> :(
>
> greg k-h
Since Stephen has fixed the merge issue correctly, I guess I may not need to
send a fixup
patch for linux-next.git. If I didn't get it right, please let me know which
tree/branch I
should work on to send a fixup patch.
It looks the conflict here happened because the two related patches, which
modify
the same functions, went into different branches of char-misc.git. I didn't
realize this
could happen... Sorry. The lesson I learnt is that I should not submit an
urgent fix
with an unimportant clean-up patch at the same time, when they can cause a
conflict.
Thanks,
-- Dexuan
Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree
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")
>
> from the char-misc.current tree and commit:
>
> 4d3c5c69191f ("Drivers: hv: vmbus: Remove the useless API
> vmbus_get_outgoing_channel()")
>
> from the char-misc tree.
>
> I fixed it up (I used the former version where they conflicted) 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 merging. You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.
Yeah, this is a mess, I'll wait for the hyper-v developers to send me a
fixup patch for handling this merge issue, as they know it is happening
:(
thanks,
greg k-h
linux-next: manual merge of the char-misc tree with the char-misc.current tree
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: Remove the useless API
vmbus_get_outgoing_channel()")
from the char-misc tree.
I fixed it up (I used the former version where they conflicted) 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 merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
pgp0vh8f1ZmPD.pgp
Description: OpenPGP digital signature
