All of lore.kernel.org
 help / color / mirror / Atom feed
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>,
	Arnd Bergmann <arnd@arndb.de>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Bo YU <tsu.yubo@gmail.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree
Date: Wed, 3 Apr 2019 06:06:54 +0100	[thread overview]
Message-ID: <b5e42db8-a873-5667-f179-78cadf5b2bf5@linaro.org> (raw)
In-Reply-To: <20190403145609.6eda97b6@canb.auug.org.au>


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.
> 

  reply	other threads:[~2019-04-03  5:07 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-03  3:56 linux-next: manual merge of the char-misc tree with the char-misc.current tree Stephen Rothwell
2019-04-03  5:06 ` Srinivas Kandagatla [this message]
2019-04-03  6:39   ` Bo YU
  -- strict thread matches above, loose matches on Subject: below --
2021-12-06  3:49 Stephen Rothwell
2021-12-06 13:43 ` Andy Shevchenko
2021-12-06 16:17   ` Ralph Siemsen
2021-12-06 16:44     ` Andy Shevchenko
2021-12-13  9:18       ` Greg KH
2022-01-07 23:18         ` Kees Cook
2019-10-18  3:26 Stephen Rothwell
2019-10-18 10:06 ` Greg KH
2018-12-04  4:35 Stephen Rothwell
2018-12-04  7:42 ` Greg KH
2018-12-04  8:46   ` Dexuan Cui
2018-12-10  9:47     ` Greg KH
2018-12-10 18:51       ` Dexuan Cui

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b5e42db8-a873-5667-f179-78cadf5b2bf5@linaro.org \
    --to=srinivas.kandagatla@linaro.org \
    --cc=arnd@arndb.de \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tsu.yubo@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.