From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sean Young <sean@mess.org>
Subject: Re: linux-next: build failure after merge of the v4l-dvb tree
Date: Thu, 2 Feb 2017 21:24:40 -0200 [thread overview]
Message-ID: <20170202212440.5e514ebc@vento.lan> (raw)
In-Reply-To: <20170203095934.2bbbbf45@canb.auug.org.au>
Em Fri, 3 Feb 2017 09:59:34 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:
> Hi Mauro,
>
> On Thu, 2 Feb 2017 20:46:20 -0200 Mauro Carvalho Chehab <mchehab@osg.samsung.com> wrote:
> >
> > Gah, forgot to push the fix on the -next branch. Should be ok now.
>
> What I fetch for the v4l-dvb tree is the master branch of
> git://linuxtv.org/mchehab/media-next.git
I actually push the patches on a different tree:
git://linuxtv.org/media_tree.git
At the branches "master" and "fixes", where
master - for rolling develoment patches
fixes - for bug fixes against current -rc release
My current procedure is to manually merge both branches
at git://linuxtv.org/mchehab/media-next.git, but this is a manual
work, that I use to do by the end of the days I merge patches.
Unfortunately, sometimes, I got side-tracked by something and
I forget to do such manual merge.
--
Thanks,
Mauro
next prev parent reply other threads:[~2017-02-02 23:24 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-31 0:55 linux-next: build failure after merge of the v4l-dvb tree Stephen Rothwell
2017-02-02 22:24 ` Stephen Rothwell
2017-02-02 22:46 ` Mauro Carvalho Chehab
2017-02-02 22:59 ` Stephen Rothwell
2017-02-02 23:24 ` Mauro Carvalho Chehab [this message]
2017-02-03 0:01 ` Stephen Rothwell
2017-02-03 0:24 ` Mauro Carvalho Chehab
2017-02-05 22:19 ` Stephen Rothwell
2017-02-05 22:22 ` Mauro Carvalho Chehab
-- strict thread matches above, loose matches on Subject: below --
2021-02-10 1:46 Stephen Rothwell
2020-09-14 6:24 Stephen Rothwell
2020-09-08 2:11 Stephen Rothwell
2020-04-22 0:41 Stephen Rothwell
2020-04-16 8:27 Stephen Rothwell
2020-03-13 2:19 Stephen Rothwell
2020-03-13 6:48 ` Marco Felsch
2020-03-13 7:05 ` Mauro Carvalho Chehab
2020-03-13 7:14 ` Marco Felsch
2020-03-13 7:07 ` Mauro Carvalho Chehab
2020-03-13 10:29 ` Stephen Rothwell
2020-03-16 6:50 ` Mauro Carvalho Chehab
2019-07-23 0:13 Stephen Rothwell
2019-07-23 15:14 ` Ezequiel Garcia
2019-07-23 15:52 ` Mauro Carvalho Chehab
2019-02-18 23:52 Stephen Rothwell
2018-07-27 1:49 Stephen Rothwell
2017-06-21 1:25 Stephen Rothwell
2017-06-21 8:54 ` Stanimir Varbanov
2016-09-12 5:10 Stephen Rothwell
2016-09-12 6:33 ` Hans Verkuil
2015-08-12 3:24 Stephen Rothwell
2015-06-19 4:47 Michael Ellerman
2015-04-10 10:11 Stephen Rothwell
2015-04-10 12:45 ` Laurent Pinchart
2015-04-10 12:57 ` Stephen Rothwell
2015-04-13 3:05 ` Stephen Rothwell
2015-04-13 8:02 ` Laurent Pinchart
2014-09-09 2:43 Stephen Rothwell
2014-09-09 3:05 ` Mauro Carvalho Chehab
2014-09-17 3:47 ` Stephen Rothwell
2014-07-25 2:23 Stephen Rothwell
[not found] ` <9f4bd671-cbe0-4e11-997e-e369c52589f9@email.android.com>
2014-07-25 21:50 ` Mauro Carvalho Chehab
2014-07-15 3:29 Stephen Rothwell
2014-07-15 5:43 ` Guenter Roeck
2014-07-15 5:55 ` Stephen Rothwell
2014-07-15 9:01 ` Guenter Roeck
2014-07-15 18:08 ` Mauro Carvalho Chehab
2014-07-15 19:08 ` Guenter Roeck
2014-07-16 3:04 ` Stephen Rothwell
2014-07-16 4:29 ` Guenter Roeck
2014-07-16 13:21 ` Ingo Molnar
2014-07-16 13:22 ` Stephen Rothwell
2014-07-16 13:24 ` Ingo Molnar
2014-03-31 2:01 Stephen Rothwell
2014-03-31 10:26 ` Mauro Carvalho Chehab
2013-01-11 0:39 Stephen Rothwell
2013-01-11 15:12 ` Mauro Carvalho Chehab
2012-11-26 2:31 Stephen Rothwell
2012-11-26 12:10 ` Mauro Carvalho Chehab
2012-11-26 13:44 ` Marek Szyprowski
2012-11-12 0:09 Stephen Rothwell
2012-11-13 13:14 ` Mauro Carvalho Chehab
2012-11-07 0:05 Stephen Rothwell
2012-11-07 1:12 ` Mauro Carvalho Chehab
2012-10-29 0:14 Stephen Rothwell
2012-10-29 8:09 ` David Härdeman
2012-10-29 8:43 ` Jiri Kosina
2012-10-29 9:52 ` Mauro Carvalho Chehab
2012-11-05 0:34 ` Stephen Rothwell
2012-11-06 1:26 ` Mauro Carvalho Chehab
2012-08-17 1:10 Stephen Rothwell
2012-08-17 1:46 ` Mauro Carvalho Chehab
2012-07-09 1:50 Stephen Rothwell
2012-04-11 2:10 Stephen Rothwell
2012-04-11 7:32 ` Srinivas KANDAGATLA
2012-04-17 3:25 ` Stephen Rothwell
2011-09-26 4:02 Stephen Rothwell
2011-09-22 3:12 Stephen Rothwell
2011-09-22 12:46 ` Mauro Carvalho Chehab
2011-09-22 20:19 ` Greg KH
2011-09-23 14:27 ` Mauro Carvalho Chehab
2011-09-27 0:49 ` Greg KH
2011-07-04 3:08 Stephen Rothwell
2011-07-04 3:04 Stephen Rothwell
2011-07-05 12:43 ` Jonathan Corbet
2011-03-22 1:14 Stephen Rothwell
2011-03-22 7:54 ` Mauro Carvalho Chehab
2011-02-28 1:05 Stephen Rothwell
2011-02-28 7:28 ` Hans Verkuil
2011-03-01 11:21 ` Mauro Carvalho Chehab
2011-03-03 1:37 ` Stephen Rothwell
2010-11-14 23:25 Stephen Rothwell
2010-11-22 0:43 ` Stephen Rothwell
2010-11-22 12:08 ` Mauro Carvalho Chehab
2010-10-01 1:41 Stephen Rothwell
2010-09-29 1:29 Stephen Rothwell
2010-09-29 1:40 ` Mauro Carvalho Chehab
2010-09-30 3:44 ` Mauro Carvalho Chehab
2010-05-20 1:45 Stephen Rothwell
2010-05-20 1:51 ` Mauro Carvalho Chehab
2010-04-12 2:40 Stephen Rothwell
2010-04-28 1:07 ` Stephen Rothwell
2010-05-03 5:01 ` Stephen Rothwell
2010-05-03 7:58 ` Mauro Carvalho Chehab
2010-05-03 10:25 ` Stephen Rothwell
2010-02-05 5:52 Stephen Rothwell
2010-02-05 15:02 ` 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=20170202212440.5e514ebc@vento.lan \
--to=mchehab@osg.samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sean@mess.org \
--cc=sfr@canb.auug.org.au \
/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.