LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the mips tree with Linus' tree
Date: Tue, 18 Aug 2009 18:23:13 +1000	[thread overview]
Message-ID: <20090818182313.3a1d3db1.sfr@canb.auug.org.au> (raw)

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

Hi Ralf,

The linux-next merge of the mips tree gets conflicts between several
commits from Linus' tree and (basically) the same commits from the mips
tree.  I have been getting these for some time.  The mips tree for
linux-next hasn't been updated since June 6 and doing a manula merge with
Linus' tree (or rebasing it on top of Linus' tree) would fix most of these
conflicts:

$ git merge mips
Auto-merging arch/mips/Kconfig
Auto-merging arch/mips/cavium-octeon/dma-octeon.c
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c
Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
Auto-merging arch/mips/cavium-octeon/octeon-irq.c
Auto-merging arch/mips/include/asm/cpu-features.h
Auto-merging arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
Auto-merging arch/mips/mm/c-r4k.c
Auto-merging arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
Auto-merging arch/mips/sibyte/Kconfig
Auto-merging arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
Auto-merging arch/mips/txx9/generic/setup.c
Auto-merging arch/mips/txx9/rbtx4939/setup.c
Auto-merging drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
Auto-merging drivers/char/hw_random/Makefile
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
Auto-merging drivers/dma/Kconfig
Auto-merging drivers/dma/Makefile
Auto-merging drivers/dma/txx9dmac.c
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
Automatic merge failed; fix conflicts and then commit the result.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

             reply	other threads:[~2009-08-18  8:23 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-18  8:23 Stephen Rothwell [this message]
2009-12-14 23:20 Stephen Rothwell
2009-12-15  7:26 ` Michal Simek
2009-12-15 19:27   ` Ralf Baechle
2011-11-07  0:04 Stephen Rothwell
2011-11-07 10:18 ` Ralf Baechle
2011-11-07  0:04 Stephen Rothwell
2012-10-01  3:58 Stephen Rothwell
2012-10-04  0:35 Stephen Rothwell
2014-06-03  0:50 Stephen Rothwell
2015-02-13  0:11 Stephen Rothwell
2015-02-13 10:28 ` Ralf Baechle
2015-02-22  0:15 Stephen Rothwell
2015-02-22  0:22 Stephen Rothwell
2015-10-01  1:13 Stephen Rothwell
2016-01-24 22:25 Stephen Rothwell
2016-01-25  7:42 ` Ralf Baechle
2017-01-03  0:26 Stephen Rothwell
2017-07-11  0:04 Stephen Rothwell
2018-08-23 22:37 Stephen Rothwell
2019-05-12 23:47 Stephen Rothwell
2019-08-07  0:25 Stephen Rothwell
2019-08-07  7:42 ` Arnd Bergmann
2019-08-11 23:19 Stephen Rothwell
2019-09-18 11:33 Mark Brown
2020-05-25  0:05 Stephen Rothwell

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=20090818182313.3a1d3db1.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=ralf@linux-mips.org \
    --subject='Re: linux-next: manual merge of the mips tree with Linus'\'' tree' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).