From: Heiko Schocher <hs@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 01/29] Remove some merge markers
Date: Fri, 30 Sep 2016 06:39:11 +0200 [thread overview]
Message-ID: <57EDEC6F.1060803@denx.de> (raw)
In-Reply-To: <1475180609-14716-2-git-send-email-sjg@chromium.org>
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> These two files have patch merge markers in them, within comments or
> strings. Remove then, so that a search for merge markers does not show up
> matches in these files.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
> drivers/net/ax88180.c | 6 +-----
> drivers/usb/host/isp116x-hcd.c | 6 +++---
> 2 files changed, 4 insertions(+), 8 deletions(-)
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
>
> diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
> index 43a67a5..261fde0 100644
> --- a/drivers/net/ax88180.c
> +++ b/drivers/net/ax88180.c
> @@ -698,11 +698,7 @@ static void ax88180_read_mac_addr (struct eth_device *dev)
> }
> }
>
> -/*
> -===========================================================================
> -<<<<<< Exported SubProgram Bodies >>>>>>
> -===========================================================================
> -*/
> +/* Exported SubProgram Bodies */
> int ax88180_initialize (bd_t * bis)
> {
> struct eth_device *dev;
> diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
> index 0556f32..32874d7 100644
> --- a/drivers/usb/host/isp116x-hcd.c
> +++ b/drivers/usb/host/isp116x-hcd.c
> @@ -428,10 +428,10 @@ static int isp116x_interrupt(struct isp116x *isp116x)
> isp116x_write_reg16(isp116x, HCuPINTENB, 0);
> irqstat = isp116x_read_reg16(isp116x, HCuPINT);
> isp116x_write_reg16(isp116x, HCuPINT, irqstat);
> - DBG(">>>>>> irqstat %x <<<<<<", irqstat);
> + DBG("------ irqstat %x ------", irqstat);
>
> if (irqstat & HCuPINT_ATL) {
> - DBG(">>>>>> HCuPINT_ATL <<<<<<");
> + DBG("------ HCuPINT_ATL ------");
> udelay(500);
> ret = 1;
> }
> @@ -439,7 +439,7 @@ static int isp116x_interrupt(struct isp116x *isp116x)
> if (irqstat & HCuPINT_OPR) {
> intstat = isp116x_read_reg32(isp116x, HCINTSTAT);
> isp116x_write_reg32(isp116x, HCINTSTAT, intstat);
> - DBG(">>>>>> HCuPINT_OPR %x <<<<<<", intstat);
> + DBG("------ HCuPINT_OPR %x ------", intstat);
>
> if (intstat & HCINT_UE) {
> ERR("unrecoverable error, controller disabled");
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
next prev parent reply other threads:[~2016-09-30 4:39 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 01/29] Remove some merge markers Simon Glass
2016-09-30 4:39 ` Heiko Schocher [this message]
2016-09-29 20:23 ` [U-Boot] [PATCH v3 02/29] Convert SILENT_CONSOLE options to Kconfig Simon Glass
2016-09-30 4:41 ` Heiko Schocher
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 03/29] Convert CONSOLE_PRE_CONSOLE_BUFFER " Simon Glass
2016-09-30 4:43 ` Heiko Schocher
2016-09-30 6:00 ` Siarhei Siamashka
2016-10-01 2:38 ` Tom Rini
2016-10-01 18:46 ` Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 04/29] Convert CONFIG_SYS_CONSOLE_IS_IN_ENV et al " Simon Glass
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 05/29] config: Drop CONFIG_CONSOLE Simon Glass
2016-09-30 4:44 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 06/29] config: Drop CONFIG_CONSOLE_DEV Simon Glass
2016-09-30 4:46 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 07/29] Convert CONFIG_VIDEO to Kconfig Simon Glass
2016-09-30 4:47 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 08/29] Convert CONFIG_CFB_CONSOLE " Simon Glass
2016-09-30 4:48 ` Heiko Schocher
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 09/29] Convert CONFIG_CFB_CONSOLE_ANSI " Simon Glass
2016-09-30 4:50 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 10/29] Convert CONFIG_VIDEO_CT69000 " Simon Glass
2016-09-30 5:03 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 11/29] Convert CONFIG_SYS_CONSOLE_BG_COL et al " Simon Glass
2016-09-30 5:04 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 12/29] video: Drop the smiLynxEM driver Simon Glass
2016-09-30 5:05 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 13/29] video: Drop the imx25lcdc driver Simon Glass
2016-09-30 5:05 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 14/29] video: Drop the s3c-fb driver Simon Glass
2016-09-30 5:06 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 15/29] video: Drop the sed13806 driver Simon Glass
2016-09-30 5:06 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 16/29] Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig Simon Glass
2016-09-30 5:07 ` Heiko Schocher
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 17/29] video: Drop CONFIG_VIDEO_HW_CURSOR Simon Glass
2016-09-30 5:08 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 18/29] Convert CONFIG_VIDEO_SW_CURSOR to Kconfig Simon Glass
2016-09-30 5:11 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 19/29] video: Drop CONFIG_VIDEO_SW_CURSOR Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 20/29] Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig Simon Glass
2016-09-30 5:15 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 21/29] video: Move video_get_info_str() prototype to a header file Simon Glass
2016-09-30 5:19 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 22/29] video: Drop CONFIG_CONSOLE_INFO_QUIET Simon Glass
2016-09-30 5:20 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 23/29] Convert CONFIG_LCD to Kconfig Simon Glass
2016-09-30 5:21 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 24/29] Convert CONFIG_CONSOLE_SCROLL_LINES " Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 25/29] Convert CONFIG_SYS_CONSOLE_ENV_OVERWRITE " Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 26/29] Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE " Simon Glass
2016-09-30 5:23 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 27/29] Convert CONFIG_SYS_CONSOLE_INFO_QUIET " Simon Glass
2016-09-30 5:24 ` Heiko Schocher
2016-10-01 2:39 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 28/29] Convert CONFIG_USB_KEYBOARD " Simon Glass
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 29/29] Convert CONFIG_SYS_STDIO_DEREGISTER " Simon Glass
2016-10-01 2:38 ` Tom Rini
2016-10-13 14:02 ` [U-Boot] [PATCH v3 00/29] Kconfig: Move console options " Tom Rini
2016-10-13 14:51 ` Simon Glass
2016-10-13 15:09 ` Tom Rini
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=57EDEC6F.1060803@denx.de \
--to=hs@denx.de \
--cc=u-boot@lists.denx.de \
/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.