From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Linus <torvalds@linux-foundation.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Subject: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree
Date: Wed, 11 Jan 2012 13:31:46 +1100 [thread overview]
Message-ID: <20120111133146.990e2b7115c9fa80e8fc3234@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 596 bytes --]
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got conflicts in a large
number of files between commits from the arm-soc tree and commits from the
v4l-dvb tree. You have rebased the v4l-dvb tree onto v3.2 while the
arm-soc tree had merged a previous version. you have then added a lot
more commits on top of the result - which produces all the conflicts. :-(
This is exactly the sort of pain I alluded to when I first noted that the
v4l-dvb tree had been merged into the arm-soc tree ...
Not happy.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Linus <torvalds@linux-foundation.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree
Date: Wed, 11 Jan 2012 13:31:46 +1100 [thread overview]
Message-ID: <20120111133146.990e2b7115c9fa80e8fc3234@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 596 bytes --]
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got conflicts in a large
number of files between commits from the arm-soc tree and commits from the
v4l-dvb tree. You have rebased the v4l-dvb tree onto v3.2 while the
arm-soc tree had merged a previous version. you have then added a lot
more commits on top of the result - which produces all the conflicts. :-(
This is exactly the sort of pain I alluded to when I first noted that the
v4l-dvb tree had been merged into the arm-soc tree ...
Not happy.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree
Date: Wed, 11 Jan 2012 13:31:46 +1100 [thread overview]
Message-ID: <20120111133146.990e2b7115c9fa80e8fc3234@canb.auug.org.au> (raw)
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got conflicts in a large
number of files between commits from the arm-soc tree and commits from the
v4l-dvb tree. You have rebased the v4l-dvb tree onto v3.2 while the
arm-soc tree had merged a previous version. you have then added a lot
more commits on top of the result - which produces all the conflicts. :-(
This is exactly the sort of pain I alluded to when I first noted that the
v4l-dvb tree had been merged into the arm-soc tree ...
Not happy.
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120111/3b0aa678/attachment.sig>
next reply other threads:[~2012-01-11 2:32 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-11 2:31 Stephen Rothwell [this message]
2012-01-11 2:31 ` linux-next: manual merge of the v4l-dvb tree with the arm-soc tree Stephen Rothwell
2012-01-11 2:31 ` Stephen Rothwell
2012-01-11 5:08 ` Olof Johansson
2012-01-11 5:08 ` Olof Johansson
2012-01-11 8:36 ` Guennadi Liakhovetski
2012-01-11 8:36 ` Guennadi Liakhovetski
2012-01-11 10:35 ` Mauro Carvalho Chehab
2012-01-11 10:35 ` Mauro Carvalho Chehab
2012-01-11 14:50 ` Arnd Bergmann
2012-01-11 14:50 ` Arnd Bergmann
2012-01-11 15:09 ` Olof Johansson
2012-01-11 15:09 ` Olof Johansson
2012-01-11 15:57 ` Nicolas Ferre
2012-01-11 15:57 ` Nicolas Ferre
2012-01-11 16:44 ` Olof Johansson
2012-01-11 16:44 ` Olof Johansson
2012-01-11 20:47 ` Mauro Carvalho Chehab
2012-01-11 20:47 ` Mauro Carvalho Chehab
2012-01-11 16:46 ` Arnd Bergmann
2012-01-11 16:46 ` Arnd Bergmann
2012-01-11 16:58 ` Olof Johansson
2012-01-11 16:58 ` Olof Johansson
2012-01-11 17:56 ` Guennadi Liakhovetski
2012-01-11 17:56 ` Guennadi Liakhovetski
2012-01-12 11:42 ` [GIT PULL v3] at91: devices and boards files update for 3.3 Nicolas Ferre
2014-11-24 2:22 linux-next: manual merge of the v4l-dvb tree with the arm-soc tree Stephen Rothwell
2014-11-24 2:22 ` Stephen Rothwell
2014-11-24 2:22 ` Stephen Rothwell
2014-11-24 15:28 ` Tony Lindgren
2014-11-24 15:28 ` Tony Lindgren
2014-12-01 2:52 Stephen Rothwell
2014-12-01 2:52 ` Stephen Rothwell
2014-12-01 2:52 ` Stephen Rothwell
2014-12-05 3:03 Stephen Rothwell
2014-12-05 3:03 ` Stephen Rothwell
2014-12-05 3:03 ` Stephen Rothwell
2015-12-02 13:36 Mark Brown
2015-12-02 13:36 ` Mark Brown
2017-08-22 0:55 Stephen Rothwell
2017-08-22 0:55 ` Stephen Rothwell
2017-09-04 5:23 ` Stephen Rothwell
2017-09-04 5:23 ` Stephen Rothwell
2020-12-08 0:04 Stephen Rothwell
2020-12-08 0:04 ` Stephen Rothwell
2020-12-14 20:30 ` Stephen Rothwell
2020-12-14 20:30 ` Stephen Rothwell
2020-12-14 21:05 ` Mauro Carvalho Chehab
2020-12-14 21:05 ` Mauro Carvalho Chehab
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=20120111133146.990e2b7115c9fa80e8fc3234@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=olof@lixom.net \
--cc=torvalds@linux-foundation.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.