From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: "linux-can@vger.kernel.org" <linux-can@vger.kernel.org>
Subject: Re: can-next rebase?
Date: Tue, 15 Jan 2013 10:35:33 +0100 [thread overview]
Message-ID: <50F522E5.4080403@pengutronix.de> (raw)
In-Reply-To: <50F45338.9060301@hartkopp.net>
[-- Attachment #1: Type: text/plain, Size: 2198 bytes --]
On 01/14/2013 07:49 PM, Oliver Hartkopp wrote:
[...]
> But coming back to the mail topic:
>
> I think i would need at least three patches for this change.
>
> When trying to rebase linux-can-next the automatic merge fails ...
>
> $ git rebase
> First, rewinding head to replay your work on top of it...
> Applying: can: add tx/rx LED trigger support
> Applying: can: flexcan: add LED trigger support
> Applying: can: add tx/rx LED trigger support
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> No changes -- Patch already applied.
> Applying: can: flexcan: add LED trigger support
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> No changes -- Patch already applied.
> Applying: can: c_can: Add device tree support to Bosch C_CAN/D_CAN controller
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/net/can/c_can/c_can_platform.c
> CONFLICT (content): Merge conflict in drivers/net/can/c_can/c_can_platform.c
> Auto-merging Documentation/devicetree/bindings/net/can/c_can.txt
> CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/net/can/c_can.txt
> Failed to merge in the changes.
> Patch failed at 0005 can: c_can: Add device tree support to Bosch C_CAN/D_CAN controller
>
> When you have resolved this problem run "git rebase --continue".
> If you would prefer to skip this patch, instead run "git rebase --skip".
> To check out the original branch and stop rebasing run "git rebase --abort".
The LED patches are not yet part or linux-can-next/master,
linux-can-next/master was clean, a parent of net-next/master. However
I've pushed net-next/master to linux-can-next/master.
I hope I'll find time today to pick up all outstanding patches and queue
them.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
prev parent reply other threads:[~2013-01-15 9:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-14 18:49 can-next rebase? Oliver Hartkopp
2013-01-15 9:35 ` Marc Kleine-Budde [this message]
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=50F522E5.4080403@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=socketcan@hartkopp.net \
/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.