Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Masahiro Yamada <yamada.masahiro@socionext.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: Re: linux-next: manual merge of the sh tree with Linus' tree
Date: Wed, 4 Dec 2019 15:55:40 +1100
Message-ID: <20191204155540.4d43df45@canb.auug.org.au> (raw)
In-Reply-To: <20190729092510.5e269cac@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 935 bytes --]

Hi all,

On Mon, 29 Jul 2019 09:25:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the sh tree got conflicts in:
> 
>   arch/sh/include/uapi/asm/setup.h
>   arch/sh/include/uapi/asm/types.h
> 
> between commit:
> 
>   d9c525229521 ("treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers")
> 
> from Linus' tree and commit:
> 
>   cd10afbc932d ("sh: remove unneeded uapi asm-generic wrappers")
> 
> from the sh tree.
> 
> I fixed it up (I just removed the files) 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.

Ping?
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply index

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-28 23:25 Stephen Rothwell
2019-12-04  4:55 ` Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-08-08  2:36 Stephen Rothwell
2011-08-08  7:26 ` Paul Mundt
2010-08-19  1:00 Stephen Rothwell

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=20191204155540.4d43df45@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=yamada.masahiro@socionext.com \
    --cc=ysato@users.sourceforge.jp \
    /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