From: Mauro Carvalho Chehab <mchehab@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: please clean up the v4l-dvb-next tree
Date: Tue, 19 Feb 2019 21:10:33 -0300 [thread overview]
Message-ID: <20190219211007.4a916a62@coco.lan> (raw)
In-Reply-To: <20190220105703.69c9b582@canb.auug.org.au>
Em Wed, 20 Feb 2019 10:57:03 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:
> Hi Mauro,
>
> It seems most (if not all) of the commits in the v4l-dvb-next tree are
> also in the v4l-dvb tree and are now causing lots of conflicts when I
> merge them both. Please clean it up.
>
Yeah, it had some branches that got already merged.
Just updated it to be in sync with v4l-dvb tree.
Sorry for the mess.
Thanks,
Mauro
next prev parent reply other threads:[~2019-02-20 0:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-19 23:57 linux-next: please clean up the v4l-dvb-next tree Stephen Rothwell
2019-02-20 0:10 ` Mauro Carvalho Chehab [this message]
2019-02-20 0:21 ` 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=20190219211007.4a916a62@coco.lan \
--to=mchehab@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.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.