Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Shuah Khan <skhan@linuxfoundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Andrew Morton <akpm@linux-foundation.org>,
	Brendan Higgins <brendanhiggins@google.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	David Gow <davidgow@google.com>,
	Shuah Khan <skhan@linuxfoundation.org>
Subject: Re: linux-next: manual merge of the akpm tree with the kunit tree
Date: Tue, 5 Nov 2019 07:45:01 -0700
Message-ID: <4dcb9885-3094-88eb-9998-5edb87a3b4bf@linuxfoundation.org> (raw)
In-Reply-To: <20191105204526.32f19975@canb.auug.org.au>

On 11/5/19 2:45 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the akpm tree got conflicts in:
> 
>    MAINTAINERS
>    lib/Kconfig.debug
>    lib/Makefile
>    lib/list-test.c
> 
> between commit:
> 
>    ea2dd7c0875e ("lib/list-test: add a test for the 'list' doubly linked list")
> 
> from the kunit tree and patch:
> 
>    "lib/list-test.c: add a test for the 'list' doubly linked list"
> 
> from the akpm tree.
> 
> I fixed it up (I just assume that these are different versions of the
> same patch, so I just dropped the version in the akpm tree) 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.
> 

Right. Andrew and I discussed this patch and he is in the loop that
there is a new version of this patch and that it will be combined
with the Kunit patches in kselftest tree.

Please drop the patch from akpm and carry the fix if necessary.

thanks,
-- Shuah

      reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-05  9:45 Stephen Rothwell
2019-11-05 14:45 ` Shuah Khan [this message]

Reply instructions:

You may reply publically 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=4dcb9885-3094-88eb-9998-5edb87a3b4bf@linuxfoundation.org \
    --to=skhan@linuxfoundation.org \
    --cc=akpm@linux-foundation.org \
    --cc=brendanhiggins@google.com \
    --cc=davidgow@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git