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
Subject: linux-next: manual merge of the v4l-dvb tree
Date: Thu, 13 May 2010 13:00:16 +1000 [thread overview]
Message-ID: <20100513130016.25b76c3f.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 649 bytes --]
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree produced a mountain of
conflicts so I have used the version from next-20100512 for today.
Please either merge Linus' tree into yours or rebase you tree on top of
Linus' tree. There are a large number of commits that are in your tree
that have been rebased before being included into Linus' tree and this
caused conflicts with further changes in your tree.
Please consider changing your work flow so that you don't rebase things
in your tree before sending them to Linus.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-05-13 3:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-13 3:00 Stephen Rothwell [this message]
2010-05-13 5:18 ` linux-next: manual merge of the v4l-dvb tree Mauro Carvalho Chehab
2010-05-13 5:59 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-10-14 7:28 Stephen Rothwell
2008-10-27 7:16 ` Stephen Rothwell
2008-10-28 11:48 ` Mauro Carvalho Chehab
2008-10-28 12:04 ` Stephen Rothwell
2008-09-01 3:22 Stephen Rothwell
2008-09-01 3:14 Stephen Rothwell
2008-09-01 3:42 ` Stephen Rothwell
2008-09-04 4:44 ` Mauro Carvalho Chehab
2008-08-19 4:11 Stephen Rothwell
2008-08-19 5:59 ` Hans Verkuil
2008-08-19 19:55 ` Greg KH
2008-07-29 3:03 Stephen Rothwell
2008-07-04 4:45 Stephen Rothwell
2008-06-30 4:56 Stephen Rothwell
2008-06-30 11:14 ` Mauro Carvalho Chehab
2008-06-30 4:49 Stephen Rothwell
2008-06-30 4:44 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=20100513130016.25b76c3f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox