Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1627980

Re: linux-next: manual merge of the pm tree with the arm-soc tree

Show all headers | View raw

On Fri, Apr 21, 2017 at 2:54 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
>   include/dt-bindings/genpd/k2g.h
>
> between commit:
>
>   7cc119f29b19 ("dt-bindings: Add TI SCI PM Domains")
>
> from the arm-soc tree and commit:
>
>   45da8edd1741 ("dt-bindings: Add TI SCI PM Domains")
>
> from the pm tree.
>
> I fixed it up (I just used the pm tree version) 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.

Dave, Santosh,

any idea what happened here? It seems that we picked up the wrong
version of the tree, do we need to drop this from arm-soc?

        Arnd

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the pm tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-21 03:00 +0200
  Re: linux-next: manual merge of the pm tree with the arm-soc tree Arnd Bergmann <arnd@arndb.de> - 2017-04-21 08:00 +0200
    Re: linux-next: manual merge of the pm tree with the arm-soc tree "santosh.shilimkar@oracle.com" <santosh.shilimkar@oracle.com> - 2017-04-21 08:50 +0200
      Re: linux-next: manual merge of the pm tree with the arm-soc tree Arnd Bergmann <arnd@arndb.de> - 2017-04-21 11:40 +0200
        Re: linux-next: manual merge of the pm tree with the arm-soc tree "santosh.shilimkar@oracle.com" <santosh.shilimkar@oracle.com> - 2017-04-21 23:10 +0200
          Re: linux-next: manual merge of the pm tree with the arm-soc tree "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-04-21 23:40 +0200
            Re: linux-next: manual merge of the pm tree with the arm-soc tree Santosh Shilimkar <santosh.shilimkar@oracle.com> - 2017-04-22 00:00 +0200
          Re: linux-next: manual merge of the pm tree with the arm-soc tree Arnd Bergmann <arnd@arndb.de> - 2017-04-21 23:50 +0200
            Re: linux-next: manual merge of the pm tree with the arm-soc tree Santosh Shilimkar <santosh.shilimkar@oracle.com> - 2017-04-22 00:00 +0200
              Re: linux-next: manual merge of the pm tree with the arm-soc tree Dave Gerlach <d-gerlach@ti.com> - 2017-04-24 20:10 +0200
                Re: linux-next: manual merge of the pm tree with the arm-soc tree Santosh Shilimkar <santosh.shilimkar@oracle.com> - 2017-04-24 20:30 +0200

csiph-web