All of lore.kernel.org
 help / color / mirror / Atom feed
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL v2] arm64: hisilicon: config changes for 4.7
Date: Mon, 25 Apr 2016 21:21:50 +0200	[thread overview]
Message-ID: <6854260.KJI50JSxh6@wuerfel> (raw)
In-Reply-To: <5714F86A.40001@hisilicon.com>

On Monday 18 April 2016 16:08:26 Wei Xu wrote:
> Please help to pull the following changes.
> 
> I based this pull request on v4.6-rc4 instead of rc1 to avoid the
> duplication that some configurations have been enabled.
> 
> 

Hi Wei,

Unfortunately basing it on top of -rc4 causes us more problems than
it solves. If at all possible, can you rebase on top of -rc3 or earlier?

The problem is backmerging code from mainline into arm-soc, as that
makes it ambiguous later when we send the pull request to Linus regarding
which changes are coming from us or not.

	Arnd

  reply	other threads:[~2016-04-25 19:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-18 15:08 [GIT PULL v2] arm64: hisilicon: config changes for 4.7 Wei Xu
2016-04-25 19:21 ` Arnd Bergmann [this message]
2016-04-26  7:46   ` Wei Xu

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=6854260.KJI50JSxh6@wuerfel \
    --to=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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.