From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the staging tree
Date: Mon, 17 Sep 2012 13:53:38 -0700 [thread overview]
Message-ID: <20120917205338.GA11762@atomide.com> (raw)
In-Reply-To: <20120917192005.ab08c24f98010107fa855edf@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [120917 02:21]:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/staging/tidspbridge/core/wdt.c between commit c37a1747acbf
> ("staging: tidspbridge: Prepare for irqs.h removal") from the tree and
> commit ec2c0825ca31 ("ARM: OMAP2+: Remove hardcoded IRQs and enable
> SPARSE_IRQ") from the arm-soc tree.
>
> I fixed it up (I guess - see below) and can carry the fix as necessary
> (no action is required).
Yes thanks again. This is the right fix for now, eventually
the numbers should come from platform data or device tree..
Regards,
Tony
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/staging/tidspbridge/core/wdt.c
> index 1ed1474,453ef74..0000000
> --- a/drivers/staging/tidspbridge/core/wdt.c
> +++ b/drivers/staging/tidspbridge/core/wdt.c
> @@@ -25,8 -25,7 +25,8 @@@
> #include <dspbridge/host_os.h>
>
>
> +#define OMAP34XX_WDT3_BASE (0x49000000 + 0x30000)
> - #define INT_34XX_WDT3_IRQ 36
> + #define INT_34XX_WDT3_IRQ (36 + NR_IRQS)
>
> static struct dsp_wdt_setting dsp_wdt;
>
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the staging tree
Date: Mon, 17 Sep 2012 13:53:38 -0700 [thread overview]
Message-ID: <20120917205338.GA11762@atomide.com> (raw)
In-Reply-To: <20120917192005.ab08c24f98010107fa855edf@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [120917 02:21]:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/staging/tidspbridge/core/wdt.c between commit c37a1747acbf
> ("staging: tidspbridge: Prepare for irqs.h removal") from the tree and
> commit ec2c0825ca31 ("ARM: OMAP2+: Remove hardcoded IRQs and enable
> SPARSE_IRQ") from the arm-soc tree.
>
> I fixed it up (I guess - see below) and can carry the fix as necessary
> (no action is required).
Yes thanks again. This is the right fix for now, eventually
the numbers should come from platform data or device tree..
Regards,
Tony
> --
> Cheers,
> Stephen Rothwell sfr at canb.auug.org.au
>
> diff --cc drivers/staging/tidspbridge/core/wdt.c
> index 1ed1474,453ef74..0000000
> --- a/drivers/staging/tidspbridge/core/wdt.c
> +++ b/drivers/staging/tidspbridge/core/wdt.c
> @@@ -25,8 -25,7 +25,8 @@@
> #include <dspbridge/host_os.h>
>
>
> +#define OMAP34XX_WDT3_BASE (0x49000000 + 0x30000)
> - #define INT_34XX_WDT3_IRQ 36
> + #define INT_34XX_WDT3_IRQ (36 + NR_IRQS)
>
> static struct dsp_wdt_setting dsp_wdt;
>
next prev parent reply other threads:[~2012-09-17 20:53 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 9:20 linux-next: manual merge of the arm-soc tree with the staging tree Stephen Rothwell
2012-09-17 9:20 ` Stephen Rothwell
2012-09-17 9:20 ` Stephen Rothwell
2012-09-17 20:53 ` Tony Lindgren [this message]
2012-09-17 20:53 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2012-10-31 5:19 Stephen Rothwell
2012-10-31 5:19 ` Stephen Rothwell
2012-10-31 5:19 ` Stephen Rothwell
2012-10-31 16:16 ` Greg KH
2012-10-31 16:16 ` Greg KH
2012-10-31 16:23 ` Tony Lindgren
2012-10-31 16:23 ` Tony Lindgren
2012-05-16 8:58 Stephen Rothwell
2012-05-16 8:58 ` Stephen Rothwell
2012-05-16 8:58 ` Stephen Rothwell
2012-05-16 10:54 ` Arnd Bergmann
2012-05-16 10:54 ` Arnd Bergmann
2012-05-16 12:48 ` Greg KH
2012-05-16 12:48 ` Greg KH
2012-05-16 13:03 ` Arnd Bergmann
2012-05-16 13:03 ` Arnd Bergmann
2012-05-16 13:10 ` Greg KH
2012-05-16 13:10 ` Greg KH
2012-05-16 13:41 ` Arnd Bergmann
2012-05-16 13:41 ` Arnd Bergmann
2012-05-16 13:56 ` Nicolas Ferre
2012-05-16 13:56 ` Nicolas Ferre
2012-05-16 13:56 ` Nicolas Ferre
2012-05-16 14:33 ` Arnd Bergmann
2012-05-16 14:33 ` Arnd Bergmann
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=20120917205338.GA11762@atomide.com \
--to=tony@atomide.com \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--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.